Merge pull request #199 from SeaHogs/branch-sync-timetable

Branch sync timetable

src/main/java/vitalconnect/model/ModelManager.java

@@ -161,10 +161,6 @@ public ObservableList<Appointment> findAppointmentsByNric(Nric nric) {
     }
     @Override
     public ObservableList<Appointment> getFoundAppointmentList() {
-        System.out.println("found apt list");
-        for (Appointment a: foundApt) {
-            System.out.println(a);
-        }
         FXCollections.sort(foundApt, Comparator.comparing(Appointment::getDateTime));
         return foundApt;
     }

src/main/java/vitalconnect/ui/MainWindow.java

@@ -152,7 +152,7 @@ void fillInnerParts() {
         CommandBox commandBox = new CommandBox(this::executeCommand);
         commandBoxPlaceholder.getChildren().add(commandBox.getRoot());
 
-        timetable = new Timetable(logic.getFilteredAppointmentList());
+        timetable = new Timetable(logic.getFilteredAppointmentList(), logic.getFilteredPersonList());
         calendarViewPlaceholder.getChildren().add(timetable.getCalendarView());
         calendarViewPlaceholder.addEventFilter(MouseEvent.MOUSE_DRAGGED , new EventHandler<MouseEvent>() {
             @Override

src/main/java/vitalconnect/ui/Timetable.java

@@ -16,6 +16,7 @@
 import javafx.scene.control.Label;
 import javafx.scene.layout.Region;
 import vitalconnect.model.Appointment;
+import vitalconnect.model.person.Person;
 
 /**
  * A custom UI component representing a timetable view with appointments displayed using a calendar view.
@@ -28,9 +29,11 @@ public class Timetable extends UiPart<Region> {
 
     /**
      * Constructs a new Timetable instance.
-     * @param appointmentList The list of appointments to be displayed in the timetable.
+     *
+     * @param appointmentList    The list of appointments to be displayed in the timetable.
+     * @param personList        The list of persons to be displayed in the timetable.
      */
-    public Timetable(ObservableList<Appointment> appointmentList) {
+    public Timetable(ObservableList<Appointment> appointmentList, ObservableList<Person> personList) {
         super(FXML);
         this.appointmentList = appointmentList;
         calendarView = new CalendarView();
@@ -48,13 +51,29 @@ public Timetable(ObservableList<Appointment> appointmentList) {
                     for (Appointment removedAppointment : change.getRemoved()) {
                         removeAppointmentFromCalendar(removedAppointment);
                     }
-                } else if (change.wasUpdated()) {
-                    // dummy code to test where edit is going
-                    // edita does not go through model as expected
-                    // calendarView.getCalendarSources().get(0).getCalendars().get(0).clear();
-                    // for (Appointment updatedAppointment : appointmentList) {
-                        // addAppointmentToCalendar(updatedAppointment);
-                    // }
+                } else if (change.wasReplaced() || change.wasUpdated()
+                        || change.wasPermutated() || change.wasUpdated()) {
+                    calendarView.getCalendarSources().get(0).getCalendars().get(0).clear();
+                    for (Appointment updatedAppointment : appointmentList) {
+                        addAppointmentToCalendar(updatedAppointment);
+                    }
+                }
+            }
+        });
+
+        // A listener to update the calendar view when the person list changes
+        // because someone's code need lista to update appointment list  (ಠ_ಠ)
+        personList.addListener((ListChangeListener<Person>) change -> {
+            while (change.next()) {
+                if (change.wasReplaced()) {
+                    for (Person person : change.getAddedSubList()) {
+                        calendarView.getCalendarSources().get(0).getCalendars().get(0)
+                                .findEntries(person.getIdentificationInformation().getNric().nric)
+                                .forEach(entry -> {
+                                    entry.setTitle(person.getIdentificationInformation().getName().fullName
+                                            + " " + person.getIdentificationInformation().getNric().nric);
+                                });
+                    }
                 }
             }
         });
@@ -160,8 +179,6 @@ private void addEntriesToCalendar(Calendar appointmentOfTheDay) {
             entry.changeEndDate(app.getDateTime().toLocalDate());
             entry.changeStartTime(app.getDateTime().toLocalTime());
             entry.changeEndTime(app.getDateTime().toLocalTime().plusMinutes(app.getDuration() * 15L));
-            System.out.println(app.getDateTime().toLocalTime());
-            System.out.println(entry);
             appointmentOfTheDay.addEntries(entry);
         }
     }