haxala1r/Se302
1
0
Fork 0
mirror of https://github.com/sabazadam/Se302.git synced 2025-12-31 12:21:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Task 2.3 Step 2: Add sorting by date/time to Course Schedule View

Browse Source
This commit is contained in:
Omnicscient
2025-12-16 22:10:04 +03:00
parent 6726f129a0
commit e9f4d2a45a
1 changed files with 54 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/main/java/org/example/se302/controller/ScheduleCourseController.java
View File

@@ -14,11 +14,13 @@ import org.example.se302.service.DataManager;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.Comparator;
import java.util.Map; import java.util.Map;
/** /**
* Controller for the Course Schedule view. * Controller for the Course Schedule view.
* Displays courses with their exam date, time, and assigned classroom. * Displays courses with their exam date, time, and assigned classroom.
* Supports sorting by date/time.
*/ */
public class ScheduleCourseController { public class ScheduleCourseController {
@@ -56,6 +58,31 @@ public class ScheduleCourseController {
classroomColumn.setCellValueFactory( classroomColumn.setCellValueFactory(
cellData -> new SimpleStringProperty(cellData.getValue().getClassroom())); cellData -> new SimpleStringProperty(cellData.getValue().getClassroom()));
// Enable custom sorting by day and slot (not alphabetical by string)
dateColumn.setComparator((date1, date2) -> {
// "Not Scheduled" should always be last
if (date1.equals("Not Scheduled"))
return 1;
if (date2.equals("Not Scheduled"))
return -1;
return date1.compareTo(date2);
});
timeColumn.setComparator((time1, time2) -> {
// Extract slot number for proper numeric sorting
if (time1.equals("-"))
return 1;
if (time2.equals("-"))
return -1;
try {
int slot1 = Integer.parseInt(time1.replace("Slot ", ""));
int slot2 = Integer.parseInt(time2.replace("Slot ", ""));
return Integer.compare(slot1, slot2);
} catch (NumberFormatException e) {
return time1.compareTo(time2);
}
});
// Load data // Load data
loadScheduleData(); loadScheduleData();
@@ -84,24 +111,28 @@ public class ScheduleCourseController {
String dateStr = "Not Scheduled"; String dateStr = "Not Scheduled";
String timeStr = "-"; String timeStr = "-";
String classroomStr = "-"; String classroomStr = "-";
int dayIndex = Integer.MAX_VALUE; // For sorting unscheduled items last
int slotIndex = Integer.MAX_VALUE;
// Check if we have an assignment for this course // Check if we have an assignment for this course
if (currentAssignments != null && currentAssignments.containsKey(courseCode)) { if (currentAssignments != null && currentAssignments.containsKey(courseCode)) {
ExamAssignment assignment = currentAssignments.get(courseCode); ExamAssignment assignment = currentAssignments.get(courseCode);
if (assignment.isAssigned()) { if (assignment.isAssigned()) {
dayIndex = assignment.getDay();
slotIndex = assignment.getTimeSlotIndex();
// Format date based on configuration start date + day offset // Format date based on configuration start date + day offset
if (configuration != null && configuration.getStartDate() != null) { if (configuration != null && configuration.getStartDate() != null) {
LocalDate examDate = configuration.getStartDate() LocalDate examDate = configuration.getStartDate().plusDays(dayIndex);
.plusDays(assignment.getDay());
dateStr = examDate.format( dateStr = examDate.format(
DateTimeFormatter.ofPattern("dd/MM/yyyy (EEEE)")); DateTimeFormatter.ofPattern("dd/MM/yyyy (EEEE)"));
} else { } else {
dateStr = "Day " + (assignment.getDay() + 1); dateStr = "Day " + (dayIndex + 1);
} }
// Format time slot // Format time slot
timeStr = "Slot " + (assignment.getTimeSlotIndex() + 1); timeStr = "Slot " + (slotIndex + 1);
// Classroom // Classroom
classroomStr = assignment.getClassroomId() != null ? assignment.getClassroomId() classroomStr = assignment.getClassroomId() != null ? assignment.getClassroomId()
@@ -109,9 +140,14 @@ public class ScheduleCourseController {
} }
} }
entries.add(new CourseScheduleEntry(courseCode, enrolled, dateStr, timeStr, classroomStr)); entries.add(new CourseScheduleEntry(courseCode, enrolled, dateStr, timeStr, classroomStr,
dayIndex, slotIndex));
} }
// Sort by day first, then by slot
entries.sort(Comparator.comparingInt(CourseScheduleEntry::getDayIndex)
.thenComparingInt(CourseScheduleEntry::getSlotIndex));
courseScheduleTable.setItems(entries); courseScheduleTable.setItems(entries);
} }
@@ -122,14 +158,18 @@ public class ScheduleCourseController {
private final String date; private final String date;
private final String time; private final String time;
private final String classroom; private final String classroom;
private final int dayIndex;
private final int slotIndex;
public CourseScheduleEntry(String courseCode, int enrolledCount, String date, String time, public CourseScheduleEntry(String courseCode, int enrolledCount, String date, String time,
String classroom) { String classroom, int dayIndex, int slotIndex) {
this.courseCode = courseCode; this.courseCode = courseCode;
this.enrolledCount = enrolledCount; this.enrolledCount = enrolledCount;
this.date = date; this.date = date;
this.time = time; this.time = time;
this.classroom = classroom; this.classroom = classroom;
this.dayIndex = dayIndex;
this.slotIndex = slotIndex;
} }
public String getCourseCode() { public String getCourseCode() {
@@ -151,5 +191,13 @@ public class ScheduleCourseController {
public String getClassroom() { public String getClassroom() {
return classroom; return classroom;
} }
public int getDayIndex() {
return dayIndex;
}
public int getSlotIndex() {
return slotIndex;
}
} }
} }