Add CSS to view

src/main/java/seedu/address/logic/commands/CommandResult.java

@@ -19,21 +19,24 @@ public class CommandResult {
     /** The application should exit. */
     private final boolean exit;
 
+    private String state;
+
     /**
      * Constructs a {@code CommandResult} with the specified fields.
      */
-    public CommandResult(String feedbackToUser, boolean showHelp, boolean exit) {
+    public CommandResult(String feedbackToUser, boolean showHelp, boolean exit, String state) {
         this.feedbackToUser = requireNonNull(feedbackToUser);
         this.showHelp = showHelp;
         this.exit = exit;
+        this.state = state;
     }
 
     /**
      * Constructs a {@code CommandResult} with the specified {@code feedbackToUser},
      * and other fields set to their default value.
      */
     public CommandResult(String feedbackToUser) {
-        this(feedbackToUser, false, false);
+        this(feedbackToUser, false, false, "null");
     }
 
     public String getFeedbackToUser() {
@@ -48,6 +51,10 @@ public boolean isExit() {
         return exit;
     }
 
+    public String checkState() {
+        return state;
+    }
+
     @Override
     public boolean equals(Object other) {
         if (other == this) {

src/main/java/seedu/address/logic/commands/ExitCommand.java

@@ -13,7 +13,7 @@ public class ExitCommand extends Command {
 
     @Override
     public CommandResult execute(Model model) {
-        return new CommandResult(MESSAGE_EXIT_ACKNOWLEDGEMENT, false, true);
+        return new CommandResult(MESSAGE_EXIT_ACKNOWLEDGEMENT, false, true, "exit");
     }
 
 }

src/main/java/seedu/address/logic/commands/HelpCommand.java

@@ -16,6 +16,6 @@ public class HelpCommand extends Command {
 
     @Override
     public CommandResult execute(Model model) {
-        return new CommandResult(SHOWING_HELP_MESSAGE, true, false);
+        return new CommandResult(SHOWING_HELP_MESSAGE, true, false, "help");
     }
 }

src/main/java/seedu/address/logic/commands/ListCommand.java

@@ -14,6 +14,7 @@ public class ListCommand extends Command {
 
     public static final String MESSAGE_SUCCESS = "Listed all persons";
 
+    public static final String state = "list";
 
     @Override
     public CommandResult execute(Model model) {

src/main/java/seedu/address/logic/commands/ViewCommand.java

@@ -17,6 +17,8 @@
 public class ViewCommand extends Command {
 
     public static final String COMMAND_WORD = "view";
+    public static final String state = "view";
+
 
     public static final String MESSAGE_USAGE = COMMAND_WORD
             + ": Views the person identified by the index number used.\n"
@@ -39,6 +41,7 @@ public CommandResult execute(Model model) throws CommandException {
 
 
         if (targetIndex.getZeroBased() < 0 || targetIndex.getZeroBased() >= model.getFilteredPersonList().size()) {
+            logger.info(targetIndex.getZeroBased() + "+ " + model.getFilteredPersonList().size());
             throw new CommandException(Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
         }
 
@@ -47,7 +50,7 @@ public CommandResult execute(Model model) throws CommandException {
 
         logger.info("Target Index: " + targetIndex.getZeroBased());
         logger.info("Client to View: " + personToView);
-        return new CommandResult(MESSAGE_SUCCESS);
+        return new CommandResult(MESSAGE_SUCCESS, false, false, "view");
     }
     @Override
     public boolean equals(Object other) {

src/main/java/seedu/address/ui/MainWindow.java

@@ -2,17 +2,22 @@
 
 import java.util.logging.Logger;
 
+import javafx.collections.ObservableList;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.MenuItem;
 import javafx.scene.control.TextInputControl;
 import javafx.scene.input.KeyCombination;
 import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.StackPane;
+import javafx.stage.Modality;
 import javafx.stage.Stage;
+import javafx.scene.Scene;
 import seedu.address.commons.core.GuiSettings;
+import seedu.address.model.person.Person;
 import seedu.address.commons.core.LogsCenter;
 import seedu.address.logic.Logic;
+import javafx.stage.StageStyle;
 import seedu.address.logic.commands.CommandResult;
 import seedu.address.logic.commands.exceptions.CommandException;
 import seedu.address.logic.parser.exceptions.ParseException;
@@ -28,12 +33,17 @@ public class MainWindow extends UiPart<Stage> {
     private final Logger logger = LogsCenter.getLogger(getClass());
 
     private Stage primaryStage;
+
     private Logic logic;
 
     // Independent Ui parts residing in this Ui container
     private PersonListPanel personListPanel;
     private ResultDisplay resultDisplay;
     private HelpWindow helpWindow;
+    private ViewWindow viewWindow;
+    @FXML
+    private StackPane viewWindowPlaceholder;
+
 
     @FXML
     private StackPane commandBoxPlaceholder;
@@ -64,14 +74,15 @@ public MainWindow(Stage primaryStage, Logic logic) {
         this.primaryStage = primaryStage;
         this.logic = logic;
 
+
         // Configure the UI
         setWindowDefaultSize(logic.getGuiSettings());
 
         setAccelerators();
-
         helpWindow = new HelpWindow();
     }
 
+
     public Stage getPrimaryStage() {
         return primaryStage;
     }
@@ -109,7 +120,6 @@ private void setAccelerator(MenuItem menuItem, KeyCombination keyCombination) {
             }
         });
     }
-
     /**
      * Fills up all the placeholders of this window.
      */
@@ -166,7 +176,40 @@ private void handleExit() {
         helpWindow.hide();
         primaryStage.hide();
     }
+    @FXML
+    public void handleView(Person selectedPerson, int displayedIndex) {
+        logger.info("handleView");
+        showViewWindow(selectedPerson, displayedIndex);
+    }
+
+
+    private void showViewWindow(Person selectedPerson, int displayedIndex) {
+        try {
+            if (viewWindow != null && viewWindowPlaceholder != null) {
+                clearViewContent();
+                viewWindowPlaceholder.getChildren().add(viewWindow.getRoot());
+                personListPanelPlaceholder.setVisible(false);
+                personListPanelPlaceholder.setManaged(false);
+                viewWindowPlaceholder.setVisible(true);
+                viewWindowPlaceholder.setManaged(true);
+            } else {
+
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void clearViewContent() {
+        viewWindowPlaceholder.getChildren().clear();
+    }
 
+    private void hideViewWindow() {
+        if (viewWindow != null && viewWindowPlaceholder != null) {
+            viewWindowPlaceholder.setVisible(false);
+            personListPanelPlaceholder.setVisible(true);
+        }
+    }
     public PersonListPanel getPersonListPanel() {
         return personListPanel;
     }
@@ -177,9 +220,11 @@ public PersonListPanel getPersonListPanel() {
      * @see seedu.address.logic.Logic#execute(String)
      */
     private CommandResult executeCommand(String commandText) throws CommandException, ParseException {
+
         try {
             CommandResult commandResult = logic.execute(commandText);
             logger.info("Result: " + commandResult.getFeedbackToUser());
+            logger.info("reached here: " + logic.getFilteredPersonList());
             resultDisplay.setFeedbackToUser(commandResult.getFeedbackToUser());
 
             if (commandResult.isShowHelp()) {
@@ -190,12 +235,20 @@ private CommandResult executeCommand(String commandText) throws CommandException
                 handleExit();
             }
 
+            if (commandResult.checkState().equals("view")) {
+                ObservableList<Person> allPersons = logic.getFilteredPersonList();
+                Person selectedPerson = allPersons.get(0);
+                viewWindow = new ViewWindow(selectedPerson, 1);
+
+                handleView(selectedPerson, 0);
+            } else {
+                hideViewWindow();
+            }
             return commandResult;
         } catch (CommandException | ParseException e) {
             logger.info("An error occurred while executing command: " + commandText);
             resultDisplay.setFeedbackToUser(e.getMessage());
             throw e;
         }
     }
-
 }

src/main/java/seedu/address/ui/ViewWindow.java

@@ -0,0 +1,74 @@
+package seedu.address.ui;
+
+import java.util.Comparator;
+import java.util.logging.Logger;
+
+import javafx.fxml.FXML;
+import javafx.scene.control.Label;
+import javafx.scene.layout.FlowPane;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Region;
+import seedu.address.commons.core.LogsCenter;
+import seedu.address.logic.commands.ViewCommand;
+import seedu.address.model.person.Person;
+
+/**
+ * An UI component that displays information of a {@code Person}.
+ */
+public class ViewWindow extends UiPart<Region> {
+
+    private static final String FXML = "ViewWindow.fxml";
+
+    /**
+     * Note: Certain keywords such as "location" and "resources" are reserved keywords in JavaFX.
+     * As a consequence, UI elements' variable names cannot be set to such keywords
+     * or an exception will be thrown by JavaFX during runtime.
+     *
+     * @see <a href="https://github.com/se-edu/addressbook-level4/issues/336">The issue on AddressBook level 4</a>
+     */
+
+    public final Person person;
+
+    @FXML
+    private HBox cardPane;
+    @FXML
+    private Label name;
+    @FXML
+    private Label id;
+    @FXML
+    private Label phone;
+    @FXML
+    private Label address;
+    @FXML
+    private Label email;
+    @FXML
+    private FlowPane tags;
+
+    @FXML
+    private Label otherInfo;
+    private static final Logger logger = LogsCenter.getLogger(ViewWindow.class);
+
+    /**
+     * Creates a {@code PersonCode} with the given {@code Person} and index to display.
+     */
+    public ViewWindow(Person person, int displayedIndex) {
+        super(FXML);
+        this.person = person;
+        id.setText(displayedIndex + ".");
+        name.setText(person.getName().fullName);
+        phone.setText(person.getPhone().value);
+        address.setText(person.getAddress().value);
+        email.setText(person.getEmail().value);
+
+        Label label = new Label(person.getType().value);
+        if (person.isClient()) {
+            label.getStyleClass().add("client-label");
+        } else {
+            label.getStyleClass().add("lead-label");
+        }
+        tags.getChildren().add(label);
+        person.getTags().stream()
+                .sorted(Comparator.comparing(tag -> tag.tagName))
+                .forEach(tag -> tags.getChildren().add(new Label(tag.tagName)));
+    }
+}

src/main/resources/view/MainWindow.fxml

@@ -51,8 +51,8 @@
             <Insets top="10" right="10" bottom="10" left="10" />
           </padding>
           <StackPane fx:id="personListPanelPlaceholder" VBox.vgrow="ALWAYS"/>
+          <StackPane fx:id="viewWindowPlaceholder" visible= "false"/>
         </VBox>
-
         <StackPane fx:id="statusbarPlaceholder" VBox.vgrow="NEVER" />
       </VBox>
     </Scene>

src/main/resources/view/ViewWindow.css

@@ -0,0 +1,21 @@
+#cardPane {
+    -fx-background-color: #FBFBD4;
+}
+.label {
+    -fx-font-family: "Arial";
+    -fx-font-size: 18px;
+}
+.cell_big_label {
+    -fx-font-size: 24px;
+    -fx-font-weight: bold;
+    -fx-text-fill: #666;
+    -fx-padding: 10px;
+}
+
+
+.cell_small_label {
+    -fx-font-size: 18px;
+    -fx-text-fill: #999;
+    -fx-padding: 5px;
+}
+