Skip to content

Commit 20d9b8f

Browse files
committed
Remove unnecessary rows in attendance
1 parent fd7adc6 commit 20d9b8f

2 files changed

Lines changed: 27 additions & 14 deletions

File tree

‎src/main/java/seedu/address/ui/PersonAttendanceList.java‎

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
package seedu.address.ui;
22

3-
import java.util.ArrayList;
4-
import java.util.List;
5-
63
import javafx.beans.binding.Bindings;
74
import javafx.beans.binding.DoubleBinding;
85
import javafx.beans.property.SimpleStringProperty;
@@ -48,15 +45,15 @@ public class PersonAttendanceList extends UiPart<Region> {
4845
/**
4946
* Creates a {@code PersonCode} with the given {@code Person} and index to display.
5047
*/
51-
public PersonAttendanceList(Person person, int displayedIndex) {
48+
public PersonAttendanceList(Person person, int displayedIndex, String groupName) {
5249
super(FXML);
5350
this.person = person;
5451
id.setText(displayedIndex + ". ");
5552
name.setText(person.getName().fullName);
5653

5754
populateGroupNameCol();
5855
createAttendanceCols();
59-
populateAttendanceCols();
56+
populateAttendanceCols(groupName);
6057
groups.getChildren().add(attendanceTable);
6158
setTableHt();
6259
}
@@ -88,14 +85,28 @@ public void createAttendanceCols() {
8885
/**
8986
* Populates columns with weekly attendance data.
9087
*/
91-
public void populateAttendanceCols() {
92-
// Add attendance data to the table
93-
List<AttendanceRow> attendanceRows = new ArrayList<>();
94-
person.getGroups().forEach(group -> {
95-
String[] attendanceArray = group.attendance.toArray(new String[0]);
96-
attendanceRows.add(new AttendanceRow(group.groupName, attendanceArray));
97-
});
98-
attendanceTable.getItems().addAll(attendanceRows);
88+
public void populateAttendanceCols(String groupName) {
89+
// for (Group group : person.getGroups()) {
90+
// if (group.groupName.equals(groupName)) {
91+
// String[] attendanceArray = group.attendance.toArray(new String[0]);
92+
// AttendanceRow row = new AttendanceRow(group.groupName, attendanceArray);
93+
// attendanceTable.getItems().add(row);
94+
// break;
95+
// }
96+
// }
97+
person.getGroups().stream()
98+
.filter(group -> group.groupName.equals(groupName))
99+
.findFirst()
100+
.ifPresent(group -> {
101+
String[] attendanceArray = group.attendance.toArray(new String[0]);
102+
attendanceTable.getItems().add(new AttendanceRow(group.groupName, attendanceArray));
103+
});
104+
// List<AttendanceRow> attendanceRows = new ArrayList<>();
105+
// person.getGroups().forEach(group -> {
106+
// String[] attendanceArray = group.attendance.toArray(new String[0]);
107+
// attendanceRows.add(new AttendanceRow(group.groupName, attendanceArray));
108+
// });
109+
// attendanceTable.getItems().addAll(attendanceRows);
99110
}
100111

101112
/**

‎src/main/java/seedu/address/ui/PersonListPanel.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,9 @@ protected void updateItem(Person person, boolean empty) {
8787
setText(null);
8888
} else {
8989
int absoluteIndex = personList.indexOf(person) + 1;
90-
setGraphic(new PersonAttendanceList(person, absoluteIndex).getRoot());
90+
String selectedTabName = (tabPane.getSelectionModel().getSelectedItem() != null)
91+
? tabPane.getSelectionModel().getSelectedItem().getText() : "Results";
92+
setGraphic(new PersonAttendanceList(person, absoluteIndex, selectedTabName).getRoot());
9193
}
9294
}
9395
}

0 commit comments

Comments
 (0)