Merge branch 'front' into main
# Conflicts: # SchedulerApp/src/main/java/com/example/schedulerapp/Controller.java # SchedulerApp/src/main/resources/com/example/schedulerapp/addShiftPopup.fxml
No related branches found
No related tags found
Showing
- SchedulerApp/src/main/java/com/example/schedulerapp/AvailabilityView.java 140 additions, 1 deletion.../main/java/com/example/schedulerapp/AvailabilityView.java
- SchedulerApp/src/main/java/com/example/schedulerapp/Controller.java 361 additions, 353 deletions...pp/src/main/java/com/example/schedulerapp/Controller.java
- SchedulerApp/src/main/java/com/example/schedulerapp/Employee.java 44 additions, 19 deletions...rApp/src/main/java/com/example/schedulerapp/Employee.java
- SchedulerApp/src/main/java/com/example/schedulerapp/EmployeeDetailsPopUp.java 62 additions, 0 deletions...n/java/com/example/schedulerapp/EmployeeDetailsPopUp.java
- SchedulerApp/src/main/java/com/example/schedulerapp/EmployeeView.java 45 additions, 0 deletions.../src/main/java/com/example/schedulerapp/EmployeeView.java
- SchedulerApp/src/main/java/com/example/schedulerapp/Model.java 69 additions, 25 deletions...ulerApp/src/main/java/com/example/schedulerapp/Model.java
- SchedulerApp/src/main/java/com/example/schedulerapp/ReceiveThread.java 3 additions, 2 deletions...src/main/java/com/example/schedulerapp/ReceiveThread.java
- SchedulerApp/src/main/java/com/example/schedulerapp/ScheduleApp.java 4 additions, 0 deletions...p/src/main/java/com/example/schedulerapp/ScheduleApp.java
- SchedulerApp/src/main/java/com/example/schedulerapp/ScheduleView.java 130 additions, 31 deletions.../src/main/java/com/example/schedulerapp/ScheduleView.java
- SchedulerApp/src/main/resources/com/example/schedulerapp/addShiftPopup.fxml 29 additions, 9 deletions...ain/resources/com/example/schedulerapp/addShiftPopup.fxml
- SchedulerApp/src/main/resources/com/example/schedulerapp/availabilityBottomPanel.fxml 25 additions, 0 deletions...ces/com/example/schedulerapp/availabilityBottomPanel.fxml
- SchedulerApp/src/main/resources/com/example/schedulerapp/availabilityPopup.fxml 53 additions, 0 deletions...resources/com/example/schedulerapp/availabilityPopup.fxml
- SchedulerApp/src/main/resources/com/example/schedulerapp/employeeHeader.fxml 13 additions, 9 deletions...in/resources/com/example/schedulerapp/employeeHeader.fxml
- SchedulerApp/src/main/resources/com/example/schedulerapp/headerManager.fxml 13 additions, 14 deletions...ain/resources/com/example/schedulerapp/headerManager.fxml
- SchedulerApp/src/main/resources/com/example/schedulerapp/login.fxml 3 additions, 7 deletions...pp/src/main/resources/com/example/schedulerapp/login.fxml
- SchedulerApp/src/main/resources/com/example/schedulerapp/schedSidePanel.fxml 4 additions, 3 deletions...in/resources/com/example/schedulerapp/schedSidePanel.fxml
- SchedulerApp/src/main/resources/com/example/schedulerapp/staffManagerSidePanel.fxml 4 additions, 4 deletions...urces/com/example/schedulerapp/staffManagerSidePanel.fxml
- SchedulerApp/src/main/resources/com/example/schedulerapp/timeOffPopup.fxml 51 additions, 0 deletions...main/resources/com/example/schedulerapp/timeOffPopup.fxml
Loading
Please register or sign in to comment