Merge pull request #276 from Anant1902/branch-FixAttendanceToString

Improved attendance display on result screen
AY2324S2-CS2103T-F13-1 · Apr 10, 2024 · 92775d6 · 92775d6
2 parents 1c88cca + e1dcec6
commit 92775d6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/src/main/java/seedu/address/logic/Messages.java b/src/main/java/seedu/address/logic/Messages.java
@@ -102,7 +102,13 @@ public static String format(Person person) {
                 .append("; Major: ")
                 .append(person.getMajor())
                 .append("; Attendance: ");
-        person.getAttendance().forEach(builder::append);
+        String combinedString = person.getAttendance().stream()
+                .map(weekNumber -> weekNumber.toString() + ", ")
+                .collect(Collectors.joining());
+        if (!combinedString.isEmpty()) {
+            combinedString = combinedString.substring(0, combinedString.length() - 2);
+        }
+        builder.append(combinedString);
         builder.append("; Tags: ");
         person.getTags().forEach(builder::append);
         return builder.toString();

diff --git a/src/main/java/seedu/address/logic/commands/EditPersonCommand.java b/src/main/java/seedu/address/logic/commands/EditPersonCommand.java
@@ -116,7 +116,6 @@ private static Person createEditedPerson(Person personToEdit, EditPersonDescript
         return new Person(updatedName, updatedPhone, updatedEmail, updatedNusNet,
                 updatedMajor, updatedAttendance, updatedTags);
     }
-
     @Override
     public boolean equals(Object other) {
         if (other == this) {
@@ -169,7 +168,6 @@ public EditPersonDescriptor(EditPersonDescriptor toCopy) {
             setAttendance(toCopy.attendance);
             setTags(toCopy.tags);
         }
-
         /**
          * Returns true if at least one field is edited.
          */

diff --git a/src/main/java/seedu/address/model/weeknumber/WeekNumber.java b/src/main/java/seedu/address/model/weeknumber/WeekNumber.java
@@ -31,12 +31,6 @@ public WeekNumber(String weekNumber) {
     public static boolean isValidWeekNumber(String test) {
         return test.matches(VALIDATION_REGEX);
     }
-
-    @Override
-    public String toString() {
-        return value.toString();
-    }
-
     @Override
     public boolean equals(Object other) {
         if (other == this) {
@@ -55,4 +49,8 @@ public boolean equals(Object other) {
     public int hashCode() {
         return value.hashCode();
     }
+    @Override
+    public String toString() {
+        return value.toString();
+    }
 }