Merge branch 'main' of git.cs.usask.ca:esc568/cmpt-370-group-project into main

SchedulerApp/src/main/java/com/example/scheduler_server/Availability.java

@@ -105,7 +105,7 @@ public class Availability {
                     ", " + dayOfTheWeekString + "End=" + endTime + " where employeeID=" + employeeID);
 
             ResultSet myRs = myStatement.executeQuery("select * from Availabilities where employeeID=" + employeeID);
-
+            myRs.next();
             editedAvailability = myRs.getString("employeeID" ) + "," + dayOfTheWeek + "," +
                     myRs.getString(dayOfTheWeekString+"Start") +
                     "," + myRs.getString(dayOfTheWeekString+"End");

SchedulerApp/src/main/java/com/example/scheduler_server/Schedule.java

@@ -94,6 +94,7 @@ public class Schedule {
             myStatement.executeUpdate("update shifts set full_date='" + newDate + "',start_time=" + start + ",end_time=" + end
                     + ",availability=" + available +",employee_ID=" + employeeID + " where shift_id=" + shiftID);
             ResultSet myRs = myStatement.executeQuery("select * from Shifts where shift_id=" + shiftID);
+            myRs.next();
             editedShift = myRs.getString("employee_id" ) + "," + myRs.getString("full_date") +
                     "," + myRs.getString("start_time") + "," + myRs.getString("end_time") +
                     "," + myRs.getString("shift_id") + "," + myRs.getString("availability") +