view / modify availabilty should work, needs more testing

SchedulerApp/src/main/java/com/example/schedulerapp/AvailabilityView.java

@@ -58,7 +58,7 @@ public class AvailabilityView extends ScrollPane implements ModelSubscriber{
         //clear
         contents.getChildren().clear();
 
-        Label blank = new Label("      ");
+        Label blank = new Label("        ");
         blank.setStyle("-fx-background-color: white");
         contents.add(blank, 0, 0);
 
@@ -103,7 +103,7 @@ public class AvailabilityView extends ScrollPane implements ModelSubscriber{
 
     public int availGetLength(LocalTime[] times){
         //calculate length
-        int length = (times[0].getHour() - times[1].getHour()) * 2;
+        int length = (times[1].getHour() - times[0].getHour()) * 2;
         if (times[0].getMinute() == 30) length--;
         if (times[1].getMinute() == 30) length++;
         return length;
@@ -121,7 +121,7 @@ public class AvailabilityView extends ScrollPane implements ModelSubscriber{
 
     public Button formatButton(LocalTime start, LocalTime end){
         Button rep = new Button(formatTimeLabel(start, end));
-        rep.setMaxHeight(700);                 //so it always fills its region
+        rep.setMaxHeight(1000);                 //so it always fills its region
         rep.setMaxWidth(100);
         GridPane.setFillHeight(rep, true);
         GridPane.setFillWidth(rep, true);

SchedulerApp/src/main/java/com/example/schedulerapp/Employee.java

@@ -208,7 +208,6 @@ public class Employee {
             } else {
                 result[i] = s[i];
             }
-            System.out.println(s[i]);
         }
         return result;
     }

SchedulerApp/src/main/java/com/example/schedulerapp/Model.java

@@ -287,7 +287,7 @@ public class Model {
         return "New shift added";
     }
 
-        boolean hasEmployee(int id){
+    boolean hasEmployee(int id){
             return employees.containsKey(id);
         }
 
@@ -482,15 +482,39 @@ public class Model {
         if (dayOfTheWeek < 0 || dayOfTheWeek > 8){
             return "Invalid day";
         }
-        if (start < 0 || end < 0 || start > 2359 || end > 2359){
+        if (end < start){
+            return "End must be after start";
+        }
+        if (start < 0 || end < 0 || start > 2400 || end > 2400){
             return "Invalid start or end time";
         }
         if (this.employees.containsKey(employeeID)) {
             writer.println("editAvailability/" + employeeID + "/" + dayOfTheWeek + "/" + start + "/" + end);
+            editLocalAvailability(employeeID, dayOfTheWeek, start, end);
+            notifySubscribers();
+            return "Availability changed successfully";
         }
         return "Employee does not exist";
     }
 
+    private void editLocalAvailability(int employeeID, int dayOfTheWeek, int start, int end){
+        employees.get(employeeID).updateAvailability(dayOfTheWeek, intToLocalTime(start), intToLocalTime(end));
+    }
+
+    public LocalTime intToLocalTime(int time){
+        String resultString;
+        String sub = "0000";
+        String timeString = String.valueOf(time);
+        if (timeString.length() < 4){
+            resultString = sub.substring(0, 4-timeString.length()) + timeString;
+        } else {
+            resultString = timeString;
+        }
+        DateTimeFormatter dbTimeFormat = DateTimeFormatter.ofPattern("kkmm");
+        LocalTime result = LocalTime.parse(resultString, dbTimeFormat);
+        return result;
+    }
+
     //"YYYY-MM-DD"
     String addTimeOff(int employeeID, String startDate, String endDate, String reason) {
         if (employeeID <= 0){

SchedulerApp/src/main/resources/com/example/schedulerapp/availabilityBottomPanel.fxml

@@ -16,7 +16,7 @@
         <HBox prefHeight="25.0" prefWidth="800.0">
             <children>
                 <Button mnemonicParsing="false" onMouseClicked="#prevButtonClicked" prefHeight="25.0" prefWidth="200.0" text="Previous" />
-                <Label fx:id="currentDateText" prefHeight="25.0" prefWidth="200.0" text="Current: " />
+                <Label fx:id="currentDateTextAvail" prefHeight="25.0" prefWidth="200.0" text="Current: " />
                 <Button mnemonicParsing="false" onMouseClicked="#jumpButtonClicked" prefHeight="25.0" prefWidth="200.0" text="Jump" />
                 <Button mnemonicParsing="false" onMouseClicked="#nextButtonClicked" prefHeight="25.0" prefWidth="200.0" text="Next" />
             </children>

SchedulerApp/src/main/resources/com/example/schedulerapp/availabilityPopup.fxml

@@ -13,7 +13,7 @@
         <HBox prefHeight="100.0" prefWidth="200.0">
             <children>
                 <Label prefWidth="60.0" text="Day" />
-            <ComboBox fx:id="AvailabilityDayBox" onMouseClicked="#populateDaysOfWeek" prefHeight="26.0" prefWidth="150.0" />
+            <ComboBox fx:id="availabilityDayBox" onMouseClicked="#populateDaysOfWeek" prefHeight="26.0" prefWidth="150.0" />
             </children>
         </HBox>
         <HBox prefHeight="100.0" prefWidth="200.0">
@@ -21,13 +21,13 @@
                 <HBox prefHeight="94.0" prefWidth="256.0">
                     <children>
                         <Label prefWidth="60.0" text="Start Time" />
-                        <ComboBox fx:id="editAvailabilityStartBox" onMouseClicked="#addShiftTimeBoxClicked" prefHeight="26.0" prefWidth="150.0" />
+                        <ComboBox fx:id="editAvailabilityStartBox" onMouseClicked="#availabilityTimeBoxClicked" prefHeight="26.0" prefWidth="150.0" />
                     </children>
                 </HBox>
                 <HBox prefHeight="100.0" prefWidth="200.0">
                     <children>
                         <Label prefWidth="60.0" text="End Time" />
-                        <ComboBox fx:id="editAvailabilityEndBox" onMouseClicked="#addShiftTimeBoxClicked" prefWidth="150.0" />
+                        <ComboBox fx:id="editAvailabilityEndBox" onMouseClicked="#availabilityTimeBoxClicked" prefWidth="150.0" />
                     </children>
                 </HBox>
             </children>
@@ -39,6 +39,9 @@
             <right>
                 <Button fx:id="cancelButton" mnemonicParsing="false" onMouseClicked="#cancelClicked" text="Cancel" BorderPane.alignment="CENTER" />
             </right>
+         <top>
+            <Label fx:id="availabilityResult" BorderPane.alignment="CENTER" />
+         </top>
         </BorderPane>
     </children>
     <opaqueInsets>

SchedulerApp/src/main/resources/com/example/schedulerapp/staffManagerSidePanel.fxml

@@ -5,9 +5,9 @@
 
 <VBox minHeight="-Infinity" minWidth="-Infinity" prefHeight="540.0" prefWidth="100.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" >
    <children>
-      <Button maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" mnemonicParsing="false" onMouseClicked="#staffManagerClicked" prefHeight="135.0" prefWidth="100.0" text="Add Employee" textAlignment="CENTER" wrapText="true" />
+      <Button maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" mnemonicParsing="false" onMouseClicked="#viewAddEmployee" prefHeight="135.0" prefWidth="100.0" text="Add Employee" textAlignment="CENTER" wrapText="true" />
       <Button maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" mnemonicParsing="false" onMouseClicked="#viewEditEmployee" prefHeight="135.0" prefWidth="100.0" text="Edit Employee" textAlignment="CENTER" wrapText="true" />
-      <Button alignment="CENTER" contentDisplay="CENTER" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" mnemonicParsing="false" onMouseClicked="#removeStaffSidePanelClicked" prefHeight="135.0" prefWidth="100.0" text="Remove Employee" textAlignment="CENTER" wrapText="true" />
-      <Button maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" mnemonicParsing="false" onMouseClicked="#viewStaff" prefHeight="135.0" prefWidth="100.0" text="View Employees" textAlignment="CENTER" wrapText="true" />
+      <Button alignment="CENTER" contentDisplay="CENTER" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" mnemonicParsing="false" onMouseClicked="#viewRemoveEmployee" prefHeight="135.0" prefWidth="100.0" text="Remove Employee" textAlignment="CENTER" wrapText="true" />
+      <Button maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" mnemonicParsing="false" onMouseClicked="#viewViewEmployees" prefHeight="135.0" prefWidth="100.0" text="View Employees" textAlignment="CENTER" wrapText="true" />
    </children>
 </VBox>