Merge pull request #66 from justinlengch/updated-lesson-class

Change MainWindow to update student and schedule list after each command

src/main/java/seedu/address/logic/Logic.java

@@ -32,7 +32,6 @@ public interface Logic {
 
     /** Returns an unmodifiable view of the filtered list of students */
     ObservableList<Student> getFilteredStudentList();
-
     /**
      * Returns the user prefs' address book file path.
      */

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

@@ -79,6 +79,6 @@ public CommandResult execute(Model model) throws CommandException {
     }
 
     private String generateSuccessMessage(Student editedStudent) {
-        return String.format(MESSAGE_ADD_LESSON_SUCCESS, editedStudent);
+        return String.format(MESSAGE_ADD_LESSON_SUCCESS, Messages.format(editedStudent));
     }
 }

src/main/java/seedu/address/logic/parser/AddLessonCommandParser.java

@@ -48,7 +48,7 @@ public AddLessonCommand parse(String args) throws ParseException {
         LocalTime timeDetail = LocalTime.parse(lessonDetails[1], TIME_FORMATTER);
         int isCompleted;
         if (lessonDetails.length == 3) {
-            isCompleted = Integer.parseInt(lessonDetails[3]);
+            isCompleted = Integer.parseInt(lessonDetails[2]);
             return new AddLessonCommand(index, dateDetail, timeDetail, isCompleted);
         } else {
             return new AddLessonCommand(index, dateDetail, timeDetail);

src/main/java/seedu/address/model/ModelManager.java

@@ -7,6 +7,7 @@
 import java.util.function.Predicate;
 import java.util.logging.Logger;
 
+import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.collections.transformation.FilteredList;
 import seedu.address.commons.core.GuiSettings;
@@ -119,7 +120,7 @@ public void setStudent(Student target, Student editedStudent) {
      */
     @Override
     public ObservableList<Student> getFilteredStudentList() {
-        return filteredStudents;
+        return FXCollections.unmodifiableObservableList(filteredStudents);
     }
 
     @Override

src/main/java/seedu/address/model/student/Lesson.java

@@ -163,6 +163,6 @@ public int hashCode() {
      * Format state as text for viewing.
      */
     public String toString() {
-        return this.subject + "  " + this.date.toString() + "  " + this.time;
+        return this.subject + "  " + this.date.toString() + "  " + this.time + " ";
     }
 }

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

@@ -175,8 +175,21 @@ private void handleExit() {
         primaryStage.hide();
     }
 
-    public StudentListPanel getStudentListPanel() {
-        return studentListPanel;
+    /**
+     * Updates Schedule List Panel.
+     */
+    public void updateScheduleListPanel() {
+        scheduleListPanelPlaceholder.getChildren().clear();
+        scheduleListPanel = new ScheduleListPanel(logic.getFilteredStudentList());
+        scheduleListPanelPlaceholder.getChildren().add(scheduleListPanel.getRoot());
+    }
+    /**
+     * Updates Student List Panel.
+     */
+    public void updateStudentListPanel() {
+        studentListPanelPlaceholder.getChildren().clear();
+        studentListPanel = new StudentListPanel(logic.getFilteredStudentList());
+        studentListPanelPlaceholder.getChildren().add(studentListPanel.getRoot());
     }
 
     /**
@@ -197,6 +210,8 @@ private CommandResult executeCommand(String commandText) throws CommandException
             if (commandResult.isExit()) {
                 handleExit();
             }
+            updateStudentListPanel();
+            updateScheduleListPanel();
 
             return commandResult;
         } catch (CommandException | ParseException e) {

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

@@ -23,6 +23,7 @@
 public class ScheduleListPanel extends UiPart<Region> {
     private static final String FXML = "ScheduleListPanel.fxml";
     private final Logger logger = LogsCenter.getLogger(ScheduleListPanel.class);
+    private ObservableList<Student> studentList;
 
     @FXML
     private ListView<Pair<Student, Lesson>> scheduleListView;
@@ -32,8 +33,9 @@ public class ScheduleListPanel extends UiPart<Region> {
      */
     public ScheduleListPanel(ObservableList<Student> studentList) {
         super(FXML);
+        this.studentList = studentList;
 
-        scheduleListView.setItems(transformList(studentList));
+        scheduleListView.setItems(transformList(this.studentList));
         scheduleListView.setCellFactory(listView -> new ScheduleListViewCell());
     }
 
@@ -48,7 +50,9 @@ public ObservableList<Pair<Student, Lesson>> transformList(ObservableList<Studen
         for (Student student : studentList) {
             List<Lesson> studentLesson = student.getLessons();
             for (Lesson l : studentLesson) {
-                scheduleList.add(new Pair(student, l));
+                if (l.getLessonStatus() == 0) {
+                    scheduleList.add(new Pair(student, l));
+                }
             }
         }
 
@@ -78,7 +82,6 @@ class SortDate implements Comparator<Pair<Student, Lesson>> {
 
         @Override
         public int compare(Pair<Student, Lesson> o1, Pair<Student, Lesson> o2) {
-            // TODO: implement your logic here
             return o1.getValue().getDate().compareTo(o2.getValue().getDate());
         }
     }