Fix list items not displaying

AY2324S2-CS2103T-W10-4 · Apr 14, 2024 · c68b455 · c68b455
1 parent 564f5c5
commit c68b455
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 39 deletions.
diff --git a/src/main/java/seedu/address/model/person/Person.java b/src/main/java/seedu/address/model/person/Person.java
@@ -139,8 +139,7 @@ public boolean equals(Object other) {
                 && year.equals(otherPerson.year)
                 && telegram.equals(otherPerson.telegram)
                 && major.equals(otherPerson.major)
-                && remark.equals(otherPerson.remark)
-                && groups.equals(otherPerson.groups);
+                && remark.equals(otherPerson.remark);
     }
 
     @Override

diff --git a/src/main/java/seedu/address/ui/PersonAttendanceList.java b/src/main/java/seedu/address/ui/PersonAttendanceList.java
@@ -1,5 +1,8 @@
 package seedu.address.ui;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.DoubleBinding;
 import javafx.beans.property.SimpleStringProperty;
@@ -45,15 +48,15 @@ public class PersonAttendanceList extends UiPart<Region> {
     /**
      * Creates a {@code PersonCode} with the given {@code Person} and index to display.
      */
-    public PersonAttendanceList(Person person, int displayedIndex, String groupName) {
+    public PersonAttendanceList(Person person, int displayedIndex) {
         super(FXML);
         this.person = person;
         id.setText(displayedIndex + ". ");
         name.setText(person.getName().fullName);
 
         populateGroupNameCol();
         createAttendanceCols();
-        populateAttendanceCols(groupName);
+        populateAttendanceCols();
         groups.getChildren().add(attendanceTable);
         setTableHt();
     }
@@ -85,28 +88,13 @@ public void createAttendanceCols() {
     /**
      * Populates columns with weekly attendance data.
      */
-    public void populateAttendanceCols(String groupName) {
-//        for (Group group : person.getGroups()) {
-//            if (group.groupName.equals(groupName)) {
-//                String[] attendanceArray = group.attendance.toArray(new String[0]);
-//                AttendanceRow row = new AttendanceRow(group.groupName, attendanceArray);
-//                attendanceTable.getItems().add(row);
-//                break;
-//            }
-//        }
-        person.getGroups().stream()
-                .filter(group -> group.groupName.equals(groupName))
-                .findFirst()
-                .ifPresent(group -> {
-                    String[] attendanceArray = group.attendance.toArray(new String[0]);
-                    attendanceTable.getItems().add(new AttendanceRow(group.groupName, attendanceArray));
-                });
-//        List<AttendanceRow> attendanceRows = new ArrayList<>();
-//        person.getGroups().forEach(group -> {
-//            String[] attendanceArray = group.attendance.toArray(new String[0]);
-//            attendanceRows.add(new AttendanceRow(group.groupName, attendanceArray));
-//        });
-//        attendanceTable.getItems().addAll(attendanceRows);
+    public void populateAttendanceCols() {
+        List<AttendanceRow> attendanceRows = new ArrayList<>();
+        person.getGroups().forEach(group -> {
+            String[] attendanceArray = group.attendance.toArray(new String[0]);
+            attendanceRows.add(new AttendanceRow(group.groupName, attendanceArray));
+        });
+        attendanceTable.getItems().addAll(attendanceRows);
     }
 
     /**

diff --git a/src/main/java/seedu/address/ui/PersonListPanel.java b/src/main/java/seedu/address/ui/PersonListPanel.java
@@ -3,7 +3,9 @@
 import java.util.HashSet;
 import java.util.Set;
 import java.util.logging.Logger;
+import java.util.stream.Collectors;
 
+import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
@@ -89,7 +91,7 @@ protected void updateItem(Person person, boolean empty) {
                 int absoluteIndex = personList.indexOf(person) + 1;
                 String selectedTabName = (tabPane.getSelectionModel().getSelectedItem() != null)
                         ? tabPane.getSelectionModel().getSelectedItem().getText() : "Results";
-                setGraphic(new PersonAttendanceList(person, absoluteIndex, selectedTabName).getRoot());
+                setGraphic(new PersonAttendanceList(person, absoluteIndex).getRoot());
             }
         }
     }
@@ -117,7 +119,18 @@ private void createEachGroupTab(Set<Group> groups) {
             tab.setContent(groupListView);
 
             // Filter persons based on the group and set them in the ListView
-            groupListView.setItems(personList.filtered(person -> person.getGroups().contains(group)));
+            ObservableList<Person> filteredPersons = personList.filtered(person -> person.getGroups().contains(group));
+            ObservableList<Person> personsWithFilteredGroups = FXCollections.observableArrayList();
+
+            for (Person person : filteredPersons) {
+                Set<Group> filteredGroups = person.getGroups().stream()
+                        .filter(g -> g.equals(group)).collect(Collectors.toSet());
+                Person newPerson = new Person(person.getName(), person.getPhone(), person.getEmail(), person.getYear(),
+                        person.getTelegram(), person.getMajor(), person.getRemark(), filteredGroups);
+                personsWithFilteredGroups.add(newPerson);
+            }
+
+            groupListView.setItems(personsWithFilteredGroups);
             groupListView.setCellFactory(listView -> new PersonAttendanceViewCell());
             tabPane.getTabs().add(tab);
         }

diff --git a/src/test/java/seedu/address/model/person/PersonTest.java b/src/test/java/seedu/address/model/person/PersonTest.java
@@ -89,10 +89,6 @@ public void equals() {
         // different remark -> returns false
         editedAlice = new PersonBuilder(ALICE).withRemark(VALID_REMARK_OUTSPOKEN).build();
         assertFalse(ALICE.equals(editedAlice));
-
-        // different groups -> returns false
-        editedAlice = new PersonBuilder(ALICE).withGroups(VALID_GROUP_LAB).build();
-        assertFalse(ALICE.equals(editedAlice));
     }
 
     @Test

diff --git a/src/test/java/seedu/address/storage/JsonAdaptedPersonTest.java b/src/test/java/seedu/address/storage/JsonAdaptedPersonTest.java
@@ -149,11 +149,4 @@ public void toModelType_nullMajor_throwsIllegalValueException() {
         assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
     }
 
-    @Test
-    public void toModelType_nullGroups_personNotEquals() throws Exception {
-        JsonAdaptedPerson person = new JsonAdaptedPerson(VALID_NAME, VALID_PHONE, VALID_EMAIL, VALID_YEAR,
-                VALID_TELEGRAM, VALID_MAJOR, VALID_REMARK, null);
-        assertNotEquals(BENSON, person.toModelType());
-    }
-
 }