Merge pull request nus-cs2103-AY2021S1#77 from claraadora/autosort

Implement Autosort for Meeting
chrystalquek · Oct 18, 2020 · 41da9ff · 41da9ff
2 parents 0e05660 + c423567
commit 41da9ff
Show file tree

Hide file tree

Showing 7 changed files with 69 additions and 10 deletions.
diff --git a/src/main/java/seedu/address/model/meeting/MeetingBook.java b/src/main/java/seedu/address/model/meeting/MeetingBook.java
@@ -27,6 +27,14 @@ public MeetingBook() {}
     public MeetingBook(ReadOnlyMeetingBook toBeCopied) {
         this();
         resetData(toBeCopied);
+        sortMeetings();
+    }
+
+    /**
+     * Sorts the content of the meeting list by From in ascending order.
+     */
+    public void sortMeetings() {
+        this.meetings.sortList();
     }
 
     /**

diff --git a/src/main/java/seedu/address/model/meeting/meeting/Meeting.java b/src/main/java/seedu/address/model/meeting/meeting/Meeting.java
@@ -2,6 +2,7 @@
 
 import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
 
+import java.time.LocalDateTime;
 import java.util.Objects;
 
 import seedu.address.model.util.Contacts;
@@ -47,6 +48,10 @@ public From getFrom() {
         return from;
     }
 
+    public LocalDateTime getFromLocalDateTime() {
+        return from.getLocalDateTime().get();
+    }
+
     public To getTo() {
         return to;
     }
@@ -106,18 +111,18 @@ public int hashCode() {
     @Override
     public String toString() {
         final StringBuilder builder = new StringBuilder();
-        builder.append(getTitle())
-                .append(" Title: ")
-                .append(getDescription())
+        builder.append(" Title: ")
+                .append(getTitle())
                 .append(" Description: ")
-                .append(getFrom())
+                .append(getDescription())
                 .append(" From: ")
-                .append(getTo())
+                .append(getFrom())
                 .append(" To: ")
-                .append(getContacts())
+                .append(getTo())
                 .append(" Contacts: ")
-                .append(getLocation())
-                .append(" Location: ");
+                .append(getContacts())
+                .append(" Location: ")
+                .append(getLocation());
         return builder.toString();
     }
 

diff --git a/src/main/java/seedu/address/model/meeting/meeting/UniqueMeetingList.java b/src/main/java/seedu/address/model/meeting/meeting/UniqueMeetingList.java
@@ -3,19 +3,22 @@
 import static java.util.Objects.requireNonNull;
 import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
 
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import seedu.address.model.meeting.meeting.exceptions.DuplicateMeetingException;
 import seedu.address.model.meeting.meeting.exceptions.MeetingNotFoundException;
+import seedu.address.model.meeting.util.MeetingComparator;
 
 public class UniqueMeetingList implements Iterable<Meeting> {
 
     private final ObservableList<Meeting> internalList = FXCollections.observableArrayList();
     private final ObservableList<Meeting> internalUnmodifiableList =
             FXCollections.unmodifiableObservableList(internalList);
+    private final MeetingComparator meetingComparator = new MeetingComparator();
 
     /**
      * Returns true if the list contains an equivalent meeting as the given argument.
@@ -35,6 +38,7 @@ public void add(Meeting toAdd) {
             throw new DuplicateMeetingException();
         }
         internalList.add(toAdd);
+        sortList();
     }
 
     /**
@@ -56,6 +60,7 @@ public void setMeeting(Meeting target, Meeting editedMeeting) {
         }
 
         internalList.set(index, editedMeeting);
+        sortList();
     }
 
     /**
@@ -72,6 +77,7 @@ public void remove(Meeting toRemove) {
     public void setMeetings(UniqueMeetingList replacement) {
         requireNonNull(replacement);
         internalList.setAll(replacement.internalList);
+        sortList();
     }
 
     /**
@@ -85,6 +91,7 @@ public void setMeetings(List<Meeting> meetings) {
         }
 
         internalList.setAll(meetings);
+        sortList();
     }
 
     /**
@@ -94,8 +101,17 @@ public ObservableList<Meeting> asUnmodifiableObservableList() {
         return internalUnmodifiableList;
     }
 
+    /**
+     * Sort the list by From's value
+     *
+     */
+    public void sortList() {
+        Collections.sort(internalList, meetingComparator);
+    }
+
     @Override
     public Iterator<Meeting> iterator() {
+        sortList();
         return internalList.iterator();
     }
 

diff --git a/src/main/java/seedu/address/model/meeting/util/MeetingComparator.java b/src/main/java/seedu/address/model/meeting/util/MeetingComparator.java
@@ -0,0 +1,21 @@
+package seedu.address.model.meeting.util;
+
+import java.time.LocalDateTime;
+import java.util.Comparator;
+
+import seedu.address.model.meeting.meeting.Meeting;
+
+/**
+ * Represents a Comparator for Meeting which sorts by From.
+ */
+public class MeetingComparator implements Comparator<Meeting> {
+    /**
+     * Compares Meetings by From in ascending order.
+     */
+    public int compare(Meeting a, Meeting b) {
+        LocalDateTime aFrom = a.getFromLocalDateTime();
+        LocalDateTime bFrom = b.getFromLocalDateTime();
+
+        return aFrom.compareTo(bFrom);
+    }
+}
diff --git a/src/main/java/seedu/address/model/util/DateTime.java b/src/main/java/seedu/address/model/util/DateTime.java
@@ -87,6 +87,15 @@ public DateTime(Optional<String> date) {
 
     }
 
+    /**
+     * Returns the LocalDateTime value object.
+     *
+     * @return the value of DateTime.
+     */
+    public Optional<LocalDateTime> getLocalDateTime() {
+        return value;
+    }
+
     /**
      * Returns true if a given string is a valid DateTime.
      *

diff --git a/src/main/resources/view/MeetingListCard.fxml b/src/main/resources/view/MeetingListCard.fxml
@@ -27,8 +27,8 @@
                 <Label fx:id="title" text="\$title" styleClass="cell_big_label" />
             </HBox>
             <Label fx:id="description" styleClass="cell_small_label" text="\$description" />
-            <Label fx:id="to" styleClass="cell_small_label" text="\$to" />
             <Label fx:id="from" styleClass="cell_small_label" text="\$from" />
+            <Label fx:id="to" styleClass="cell_small_label" text="\$to" />
             <Label fx:id="contacts" styleClass="cell_small_label" text="\$contacts" />
             <Label fx:id="loc" styleClass="cell_small_label" text="\$loc" />
         </VBox>

diff --git a/src/test/java/seedu/address/testutil/TypicalMeetings.java b/src/test/java/seedu/address/testutil/TypicalMeetings.java
@@ -83,6 +83,6 @@ public static MeetingBook getTypicalMeetingBook() {
     }
 
     public static List<Meeting> getTypicalMeeting() {
-        return new ArrayList<>(Arrays.asList(MEETING_A, MEETING_B));
+        return new ArrayList<>(Arrays.asList(MEETING_B, MEETING_A));
     }
 }