Merge pull request #171 from wyt-sonia/master

Main feature improve:

Author: teikjun

src/main/java/draganddrop/studybuddy/logic/parser/TimeParser.java

@@ -2,6 +2,7 @@
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
 
 import draganddrop.studybuddy.logic.parser.interactivecommandparser.exceptions.InteractiveCommandException;
@@ -12,6 +13,8 @@
  */
 public class TimeParser {
 
+    public static final DateTimeFormatter DATE_FORMAT = DateTimeFormatter.ofPattern("dd/MM/yyyy");
+
     /**
      * Parses valid dateTime string to LocalDateTime variable.
      *
@@ -29,6 +32,23 @@ public static LocalDateTime parseDateTime(String userInput) throws InteractiveCo
         return inputTime;
     }
 
+    /**
+     * Parses valid date string to LocalDate variable.
+     *
+     * @param userInput
+     * @return
+     * @throws InteractiveCommandException
+     */
+    public static LocalDate parseDate(String userInput) throws InteractiveCommandException {
+        LocalDate inputDate = null;
+        try {
+            inputDate = LocalDate.parse(userInput.trim(), DATE_FORMAT);
+        } catch (DateTimeParseException e) {
+            throw new InteractiveCommandException("dataTimeFormatError");
+        }
+        return inputDate;
+    }
+
 
     /**
      * Converts LocalDateTime variable to a String as HH:mm dd/MM/yyyy format.

src/main/java/draganddrop/studybuddy/model/util/SampleDataUtil.java

@@ -58,7 +58,6 @@ public static Module[] getSampleModule() {
         return new Module[]{emptyModule, cs2101};
     }
 
-
     public static ReadOnlyStudyBuddy getSampleStudyBuddy() {
         StudyBuddy sampleSb = new StudyBuddy();
         ArrayList<Task> sampleTasks = new ArrayList<>();

src/main/java/draganddrop/studybuddy/ui/MainWindow.java

@@ -94,7 +94,7 @@ public class MainWindow extends UiPart<Stage> {
     private Label dueListPanelTitle;
 
     @FXML
-    private Pane dueSoonTaskListPanelTitleHolder;
+    private Pane dueListPanelTitleHolder;
 
     @FXML
     private Label mainTitle;
@@ -103,7 +103,6 @@ public class MainWindow extends UiPart<Stage> {
     private Pane mainTitleHolder;
 
 
-
     public MainWindow(Stage primaryStage, Logic logic) {
         super(FXML, primaryStage);
 
@@ -166,7 +165,8 @@ void fillInnerParts() {
         taskListPanelPlaceholder.getChildren().add(taskListPanel.getRoot());
 
         taskSummaryPanel = new TaskSummaryPanel(logic.getFilteredTaskList(),
-            logic.getFilteredArchivedTaskList());
+            logic.getFilteredArchivedTaskList(), logic.getFilteredModuleList(),
+            dueSoonListPanelPlaceholder, dueListPanelTitle);
         taskSummaryHolder.getChildren().add(taskSummaryPanel.getRoot());
         taskSummaryHolder.setVisible(false);
         taskSummaryHolder.setManaged(false);
@@ -226,8 +226,11 @@ public void handleHelp() {
     public void handleShowTaskSummary() {
         toggleAllHoldersInvisible();
         toggleTaskSummaryHolderView(true);
+        toggleTaskListHolderView(false, true);
+        taskSummaryPanel.renderSelectedListPanel();
 
         toggleAllTitle(false);
+        toggleDueSoonTaskListPanelTitleView(true);
         toggleMainTitleView(true);
         setMainTitleText(TASK_SUMMARY);
     }
@@ -249,6 +252,7 @@ private void handleShowProfile() {
         toggleMainTitleView(true);
         setMainTitleText(PROFILE_PAGE);
     }
+
     /**
      * Closes the application.
      */
@@ -267,7 +271,7 @@ private void handleExit() {
     @FXML
     private void handleShowAllTasks() {
         toggleAllHoldersInvisible();
-        toggleTaskListHolderView(true);
+        toggleTaskListHolderView(true, true);
 
         toggleAllTitle(true);
         setMainTitleText(TITLE);
@@ -283,11 +287,13 @@ private void handleShowAllTasks() {
     @FXML
     private void handleDueSoonTasks() {
         toggleAllHoldersInvisible();
-        toggleTaskListHolderView(true);
+        toggleTaskListHolderView(true, true);
 
         toggleAllTitle(true);
         setMainTitleText(TITLE);
         dueListPanelTitle.setText(DUE_SOON_TASK);
+        dueListPanelTitle.getStyleClass().clear();
+        dueListPanelTitle.getStyleClass().add("sub_header");
         dueSoonListPanel = new DueSoonListPanel(logic.getFilteredDueSoonTaskList());
         dueSoonListPanelPlaceholder.getChildren().add(dueSoonListPanel.getRoot());
     }
@@ -298,7 +304,7 @@ private void handleDueSoonTasks() {
     @FXML
     private void handleShowArchivedTasks() {
         toggleAllHoldersInvisible();
-        toggleTaskListHolderView(true);
+        toggleTaskListHolderView(true, true);
 
         toggleAllTitle(true);
         setMainTitleText(TITLE);
@@ -315,6 +321,7 @@ private void handleShowArchivedTasks() {
     private void handleShowModules() {
         toggleAllHoldersInvisible();
         toggleModTabView(true);
+        toggleProfileHolderView(false);
 
         toggleAllTitle(false);
         toggleMainTitleView(true);
@@ -328,14 +335,14 @@ private void handleShowModules() {
     @FXML
     private void handleShowCalendar() {
         toggleAllHoldersInvisible();
-        toggleTaskListHolderView(true);
+        toggleTaskListHolderView(true, true);
 
         toggleAllTitle(true);
         toggleTaskListPanelTitleView(false);
         setMainTitleText(CALENDAR);
 
         CalendarBox calendar = new CalendarBox(logic.getFilteredTaskList(), dueSoonListPanelPlaceholder,
-                dueListPanelTitle);
+            dueListPanelTitle);
         taskListPanelPlaceholder.getChildren().add(calendar.getRoot());
     }
 
@@ -370,12 +377,13 @@ private CommandResult executeCommand(InteractivePrompt currentInteractivePrompt,
 
     /**
      * Toggles list panels according to values assigned. Can add more if there are more windows required for display.
+     *
      * @param val1 toggles TaskListHolder
      * @param val2 toggles TaskSummaryHolder
      * @param val3 toggles ModuleTabHolder
      */
     private void customToggleHolders(boolean val1, boolean val2, boolean val3, boolean val4) {
-        toggleTaskListHolderView(val1);
+        toggleTaskListHolderView(val1, val1);
         toggleTaskSummaryHolderView(val2);
         toggleModTabView(val3);
         toggleProfileHolderView(val4);
@@ -384,6 +392,7 @@ private void customToggleHolders(boolean val1, boolean val2, boolean val3, boole
 
     /**
      * Toggles title according to values assigned. Can add more if there are more windows required for display.
+     *
      * @param val1 toggles MainTitle
      * @param val2 toggles TaskList(Left side)
      */
@@ -407,8 +416,24 @@ private void toggleTaskSummaryHolderView(boolean val) {
         setPaneView(taskSummaryHolder, val);
     }
 
-    private void toggleTaskListHolderView(boolean val) {
-        setPaneView(taskListHolder, val);
+    /**
+     * Toggles the visibility of taskListHolder.
+     *
+     * @param isAllTaskListShow
+     * @param isDueSoonShow
+     */
+    private void toggleTaskListHolderView(boolean isAllTaskListShow, boolean isDueSoonShow) {
+        setPaneView(taskListPanelPlaceholder, isAllTaskListShow);
+        setPaneView(taskListPanelTitleHolder, isAllTaskListShow);
+        setPaneView(dueSoonListPanelPlaceholder, isDueSoonShow);
+        setPaneView(dueListPanelTitleHolder, isDueSoonShow);
+        if (isAllTaskListShow || isDueSoonShow) {
+            taskListHolder.setManaged(true);
+            taskListHolder.setVisible(true);
+        } else {
+            taskListHolder.setManaged(false);
+            taskListHolder.setVisible(false);
+        }
     }
 
     private void toggleModTabView(boolean val) {
@@ -429,7 +454,7 @@ private void toggleTaskListPanelTitleView(boolean val) {
     }
 
     private void toggleDueSoonTaskListPanelTitleView(boolean val) {
-        setPaneView(dueSoonTaskListPanelTitleHolder, val);
+        setPaneView(dueListPanelTitleHolder, val);
     }
 
     private void setTaskListTitleText(String text) {