fixed reported bugs

Author: andynullwong

login_activity.txt

@@ -3,3 +3,19 @@ FAILED: andy: 2020-12-09 22:38:14.242406 UTC
 SUCCESS: test: 2020-12-09 22:38:15.851063 UTC
 SUCCESS: admin: 2020-12-09 22:39:00.038085 UTC
 SUCCESS: test: 2020-12-09 23:30:40.755351 UTC
+SUCCESS: test: 2020-12-11 02:24:19.28528 UTC
+SUCCESS: test: 2020-12-11 02:31:13.060535 UTC
+SUCCESS: test: 2020-12-11 02:35:35.291397 UTC
+SUCCESS: test: 2020-12-11 02:37:20.580016 UTC
+SUCCESS: test: 2020-12-11 02:38:38.742227 UTC
+SUCCESS: test: 2020-12-11 02:38:56.486514 UTC
+SUCCESS: test: 2020-12-11 02:40:25.990002 UTC
+SUCCESS: test: 2020-12-11 02:42:27.941055 UTC
+SUCCESS: test: 2020-12-11 02:43:55.0606 UTC
+SUCCESS: test: 2020-12-11 02:54:11.910866 UTC
+SUCCESS: test: 2020-12-11 02:57:03.052757 UTC
+SUCCESS: test: 2020-12-11 02:59:38.517233 UTC
+SUCCESS: test: 2020-12-11 03:02:03.230233 UTC
+SUCCESS: test: 2020-12-11 03:04:57.864894 UTC
+SUCCESS: test: 2020-12-11 03:10:22.106951 UTC
+SUCCESS: test: 2020-12-11 03:11:08.167803 UTC

out/production/scheduling-desktop-application/dao/AppointmentDao.class

@@ -0,0 +1,6 @@
+titleLabel=Application de bureau de planification
+usernameLabel=Nom d'utilisateur
+passwordLabel=Mot de passe
+loginButton=Se connecter
+resetButton=Réinitialiser
+messageText=Le pseudo ou mot de passe est incorect.

out/production/scheduling-desktop-application/i18n/Login_fr.properties

@@ -188,21 +188,25 @@ public void setAppointmentList(ObservableList<Appointment> appointmentList) {
      */
     private static Boolean hasAppointmentConflicts(Appointment appointment) {
         String selectStatement = "SELECT Local_Start, Local_End " +
-                "FROM (SELECT Start + INTERVAL ? HOUR as Local_Start, End + INTERVAL ? HOUR as Local_End " +
+                "FROM (SELECT Appointment_ID, Start + INTERVAL ? HOUR as Local_Start, End + INTERVAL ? HOUR as Local_End " +
                 "FROM appointments " +
-                "WHERE Customer_ID = ?) LocalTimeTable " +
-                "WHERE Local_Start < ? " +
-                "AND Local_End > ?";
+                "WHERE Customer_ID = ? " +
+                "AND Appointment_ID != ?) LocalTimeTable " +
+                "WHERE ? BETWEEN Local_Start AND Local_End " +
+                "OR ? BETWEEN Local_Start AND Local_End";
 
         try {
             DBQuery.setPreparedStatement(connection, selectStatement);
             PreparedStatement preparedStatement = DBQuery.getPreparedStatement();
 
-            preparedStatement.setInt(1, TimezoneUtil.getOffsetToLocalTime());
-            preparedStatement.setInt(2, TimezoneUtil.getOffsetToLocalTime());
+            preparedStatement.setInt(1, 0);
+            preparedStatement.setInt(2, 0);
+//            preparedStatement.setInt(1, TimezoneUtil.getOffsetToLocalTime());
+//            preparedStatement.setInt(2, TimezoneUtil.getOffsetToLocalTime());
             preparedStatement.setInt(3, appointment.getCustomerId());
-            preparedStatement.setTimestamp(4, appointment.getEnd());
+            preparedStatement.setInt(4, appointment.getId());
             preparedStatement.setTimestamp(5, appointment.getStart());
+            preparedStatement.setTimestamp(6, appointment.getEnd());
 
             preparedStatement.execute();
             ResultSet resultSet = preparedStatement.getResultSet();
@@ -245,7 +249,7 @@ public static void getUpcomingAppointment() {
                 int id = resultSet.getInt("Appointment_ID");
                 Timestamp start = resultSet.getTimestamp("Start");
 
-                String appointmentNotification = String.format("Appointment! ID: %s Starts: %s",id, start.toString());
+                String appointmentNotification = String.format("Appointment! ID: %s Starts: %s", id, start.toString());
                 Warning.generateMessage(appointmentNotification, Alert.AlertType.INFORMATION);
             } else {
                 Warning.generateMessage("No Appointments Coming Up in 15 Minutes", Alert.AlertType.INFORMATION);