Merge branch 'main' into front
# Conflicts: # SchedulerApp/src/main/java/com/example/schedulerapp/Controller.java # SchedulerApp/src/main/java/com/example/schedulerapp/Employee.java
Showing
- SchedulerApp/src/main/java/com/example/scheduler_server/Availability.java 5 additions, 0 deletions.../main/java/com/example/scheduler_server/Availability.java
- SchedulerApp/src/main/java/com/example/scheduler_server/Positions.java 4 additions, 2 deletions...src/main/java/com/example/scheduler_server/Positions.java
- SchedulerApp/src/main/java/com/example/scheduler_server/Schedule.java 2 additions, 1 deletion.../src/main/java/com/example/scheduler_server/Schedule.java
- SchedulerApp/src/main/java/com/example/scheduler_server/Staff.java 135 additions, 16 deletions...App/src/main/java/com/example/scheduler_server/Staff.java
- SchedulerApp/src/main/java/com/example/scheduler_server/UserThread.java 4 additions, 2 deletions...rc/main/java/com/example/scheduler_server/UserThread.java
- SchedulerApp/src/main/java/com/example/schedulerapp/Controller.java 25 additions, 1 deletion...pp/src/main/java/com/example/schedulerapp/Controller.java
- SchedulerApp/src/main/java/com/example/schedulerapp/Employee.java 2 additions, 2 deletions...rApp/src/main/java/com/example/schedulerapp/Employee.java
- SchedulerApp/src/main/java/com/example/schedulerapp/Model.java 31 additions, 19 deletions...ulerApp/src/main/java/com/example/schedulerapp/Model.java
- SchedulerApp/src/main/java/com/example/schedulerapp/ModelTestSuite.java 219 additions, 0 deletions...rc/main/java/com/example/schedulerapp/ModelTestSuite.java
- SchedulerApp/src/main/java/com/example/schedulerapp/Shift.java 1 addition, 1 deletion...ulerApp/src/main/java/com/example/schedulerapp/Shift.java
- SchedulerApp/src/main/resources/com/example/schedulerapp/editEmployee.fxml 100 additions, 48 deletions...main/resources/com/example/schedulerapp/editEmployee.fxml
Loading
Please register or sign in to comment