From 58113cc460a98039ddfa05e4e384e4ad488219d5 Mon Sep 17 00:00:00 2001 From: ArktikHunter <81192324+ArktikHunter@users.noreply.github.com> Date: Fri, 11 Mar 2022 17:46:28 -0600 Subject: [PATCH] commit before pull --- .../java/com/example/schedulerapp/Model.java | 8 ++++++-- .../com/example/schedulerapp/Model.class | Bin 11973 -> 12859 bytes 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/SchedulerApp/src/main/java/com/example/schedulerapp/Model.java b/SchedulerApp/src/main/java/com/example/schedulerapp/Model.java index 58d299e..1051703 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 GIT binary patch delta 5322 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 E0_5yYd;kCd delta 4575 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 a2le=(9uMpB7xGIg^itW&@@sh&IsXIx2c@R~ -- GitLab