diff --git a/SchedulerApp/src/main/java/com/example/schedulerapp/Model.java b/SchedulerApp/src/main/java/com/example/schedulerapp/Model.java index 58d299ebebb1099e76bfb9b30590c96efbf42010..105170384564bf6767ec194fdac3bad9ac7030db 100644 --- a/SchedulerApp/src/main/java/com/example/schedulerapp/Model.java +++ b/SchedulerApp/src/main/java/com/example/schedulerapp/Model.java @@ -227,9 +227,13 @@ public class Model { end = date.plusDays(6 - today).toString(); } printAllShifts(); - System.out.println("start: " + start + " end: " + end + " shifts returned " + getShiftsByWeek(start, end).size()); + System.out.println("getShiftsByWeek start: " + start + " end: " + end + " shifts returned " + + getShiftsByWeek(start, end).size()); + System.out.println("getEmployeeShiftsByWeek id: " + selectedEmployee + " start: " + start + " end: " + end + + " shifts returned: " + getEmployeeShiftsByWeek(selectedEmployee, start, end).size()); - return convertToShift(getShiftsByWeek(start, end)); + + return convertToShift(getEmployeeShiftsByWeek(selectedEmployee, start, end)); } //for view diff --git a/SchedulerApp/target/classes/com/example/schedulerapp/Model.class b/SchedulerApp/target/classes/com/example/schedulerapp/Model.class index 6edec89acd1c914db5dac40da3df7816900449f4..a2cc4bb616cb045b3400e196ddf04361768886bf 100644 Binary files a/SchedulerApp/target/classes/com/example/schedulerapp/Model.class and b/SchedulerApp/target/classes/com/example/schedulerapp/Model.class differ