Merge 76ae24f into 076f692

CS2103-AY1819S2-W10-3 · Apr 15, 2019 · 0c809a2 · 0c809a2
2 parents 076f692 + 76ae24f
commit 0c809a2
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 14 deletions.
diff --git a/src/main/java/seedu/equipment/logic/commands/AddWorkListCommand.java b/src/main/java/seedu/equipment/logic/commands/AddWorkListCommand.java
@@ -23,7 +23,7 @@ public class AddWorkListCommand extends Command {
             + CliSyntax.PREFIX_ID + "ID \n"
             + "Example: " + COMMAND_WORD + " "
             + CliSyntax.PREFIX_DATE + "12-12-2019 "
-            + CliSyntax.PREFIX_ASSIGNEE + "Mei Yen "
+            + CliSyntax.PREFIX_ASSIGNEE + "Mary "
             + CliSyntax.PREFIX_ID + "13 ";
 
     public static final String MESSAGE_SUCCESS = "New WorkList created: %1$s";

diff --git a/src/main/java/seedu/equipment/model/UniqueWorkListList.java b/src/main/java/seedu/equipment/model/UniqueWorkListList.java
@@ -50,6 +50,12 @@ public void add(WorkList toAdd) {
             throw new DuplicateEquipmentException();
         }
         internalList.add(toAdd);
+        internalList.sort(new Comparator<WorkList>() {
+            @Override
+            public int compare(WorkList o1, WorkList o2) {
+                return Integer.compare(Integer.valueOf(o1.getId().value), Integer.valueOf(o2.getId().value));
+            }
+        });
     }
 
     /**

diff --git a/src/main/java/seedu/equipment/ui/EquipmentCard.java b/src/main/java/seedu/equipment/ui/EquipmentCard.java
@@ -53,11 +53,11 @@ public EquipmentCard(Equipment equipment, int displayedIndex) {
         super(FXML);
         this.equipment = equipment;
         id.setText(displayedIndex + ". ");
-        name.setText(equipment.getName().name);
-        phone.setText(equipment.getPhone().value);
-        address.setText(equipment.getAddress().value);
-        serialNumber.setText(equipment.getSerialNumber().serialNumber);
-        date.setText(equipment.getDate().toString());
+        name.setText("Client Name: " + equipment.getName().name);
+        phone.setText("Phone: " + equipment.getPhone().value);
+        address.setText("Address: " + equipment.getAddress().value);
+        serialNumber.setText("Serial Number: " + equipment.getSerialNumber().serialNumber);
+        date.setText("Date: " + equipment.getDate().toString());
         equipment.getTags().forEach(tag -> {
             String tagName = tag.tagName;
             tags.getChildren().add(new Label(tagName));

diff --git a/src/test/java/guitests/guihandles/EquipmentCardHandle.java b/src/test/java/guitests/guihandles/EquipmentCardHandle.java
@@ -20,12 +20,14 @@ public class EquipmentCardHandle extends NodeHandle<Node> {
     private static final String PHONE_FIELD_ID = "#phone";
     private static final String DATE_FIELD_ID = "#date";
     private static final String TAGS_FIELD_ID = "#tags";
+    private static final String SERIALNUMBER_FIELD_ID = "#serialNumber";
 
     private final Label idLabel;
     private final Label nameLabel;
     private final Label addressLabel;
     private final Label phoneLabel;
     private final Label dateLabel;
+    private final Label serialNumberLabel;
     private final List<Label> tagLabels;
 
     public EquipmentCardHandle(Node cardNode) {
@@ -35,6 +37,7 @@ public EquipmentCardHandle(Node cardNode) {
         nameLabel = getChildNode(NAME_FIELD_ID);
         addressLabel = getChildNode(ADDRESS_FIELD_ID);
         phoneLabel = getChildNode(PHONE_FIELD_ID);
+        serialNumberLabel = getChildNode(SERIALNUMBER_FIELD_ID);
         dateLabel = getChildNode(DATE_FIELD_ID);
 
         Region tagsContainer = getChildNode(TAGS_FIELD_ID);
@@ -70,6 +73,10 @@ public String getPhone() {
         return phoneLabel.getText();
     }
 
+    public String getSerialNumber() {
+        return serialNumberLabel.getText();
+    }
+
     public String getDate() {
         return dateLabel.getText();
     }
@@ -85,10 +92,11 @@ public List<String> getTags() {
      * Returns true if this handle contains {@code equipment}.
      */
     public boolean equals(Equipment equipment) {
-        return getName().equals(equipment.getName().name)
-                && getAddress().equals(equipment.getAddress().value)
-                && getPhone().equals(equipment.getPhone().value)
-                && getDate().equals(equipment.getDate().toString())
+        return getName().equals("Client Name: " + equipment.getName().name)
+                && getAddress().equals("Address: " + equipment.getAddress().value)
+                && getPhone().equals("Phone: " + equipment.getPhone().value)
+                && getDate().equals("Date: " + equipment.getDate().toString())
+                && getSerialNumber().equals("Serial Number: " + equipment.getSerialNumber().serialNumber)
                 && ImmutableMultiset.copyOf(getTags()).equals(ImmutableMultiset.copyOf(equipment.getTags().stream()
                         .map(tag -> tag.tagName)
                         .collect(Collectors.toList())));

diff --git a/src/test/java/seedu/equipment/ui/testutil/GuiTestAssert.java b/src/test/java/seedu/equipment/ui/testutil/GuiTestAssert.java
@@ -27,6 +27,7 @@ public static void assertCardEquals(EquipmentCardHandle expectedCard, EquipmentC
         assertEquals(expectedCard.getDate(), actualCard.getDate());
         assertEquals(expectedCard.getName(), actualCard.getName());
         assertEquals(expectedCard.getPhone(), actualCard.getPhone());
+        assertEquals(expectedCard.getSerialNumber(), actualCard.getSerialNumber());
         assertEquals(expectedCard.getTags(), actualCard.getTags());
         assertEquals(expectedCard.getTags(), actualCard.getTags());
     }
@@ -47,10 +48,12 @@ public static void assertCardEquals(WorkListCardHandle expectedCard, WorkListCar
      * Asserts that {@code actualCard} displays the details of {@code expectedEquipment}.
      */
     public static void assertCardDisplaysPerson(Equipment expectedEquipment, EquipmentCardHandle actualCard) {
-        assertEquals(expectedEquipment.getName().name, actualCard.getName());
-        assertEquals(expectedEquipment.getPhone().value, actualCard.getPhone());
-        assertEquals(expectedEquipment.getDate().toString(), actualCard.getDate());
-        assertEquals(expectedEquipment.getAddress().value, actualCard.getAddress());
+        assertEquals("Client Name: " + expectedEquipment.getName().name, actualCard.getName());
+        assertEquals("Phone: " + expectedEquipment.getPhone().value, actualCard.getPhone());
+        assertEquals("Date: " + expectedEquipment.getDate().toString(), actualCard.getDate());
+        assertEquals("Address: " + expectedEquipment.getAddress().value, actualCard.getAddress());
+        assertEquals("Serial Number: " + expectedEquipment.getSerialNumber().serialNumber,
+                actualCard.getSerialNumber());
         assertTagsEqual(expectedEquipment, actualCard);
     }