Hotfix/1.0.6 - main (#144)

Co-authored-by: Kevin Lan <[email protected]>
Co-authored-by: Austin-X <[email protected]>
Co-authored-by: minhhaitran08 <[email protected]>
Co-authored-by: Masahisa Sekita <[email protected]>
Co-authored-by: Austin-X <[email protected]>
Co-authored-by: dawangk <[email protected]>
Co-authored-by: kevin-lann <[email protected]>
Co-authored-by: MasahisaSekita <[email protected]>
Co-authored-by: Dmitriy Prokopchuk <[email protected]>

Author: 7 people

.github/workflows/autodeploy.yml

@@ -124,8 +124,8 @@ jobs:
             sudo docker pull ${{ secrets.DOCKERHUB_USERNAME }}/course-matrix-backend:master
 
             # Step 15: Run the docker containers
-            sudo docker run -d -p 5173:5173 ${{ secrets.DOCKERHUB_USERNAME }}/course-matrix-frontend:master
-            sudo docker run -d -p 8081:8081 ${{ secrets.DOCKERHUB_USERNAME }}/course-matrix-backend:master
+            sudo docker run -d -p 5173:5173 -e TZ=America/Toronto -v /etc/timezone:/etc/timezone:ro -v /etc/localtime:/etc/localtime:ro ${{ secrets.DOCKERHUB_USERNAME }}/course-matrix-frontend:master
+            sudo docker run -d -p 8081:8081 -e TZ=America/Toronto -v /etc/timezone:/etc/timezone:ro -v /etc/localtime:/etc/localtime:ro ${{ secrets.DOCKERHUB_USERNAME }}/course-matrix-backend:master
 
             # Step 16: Run post deployment tests
             sudo docker ps 

course-matrix/backend/src/utils/convert-time-string.ts

@@ -16,5 +16,16 @@ export function convertTimeStringToDate(timeString: string): Date {
   date.setSeconds(seconds);
   date.setMilliseconds(0);
 
-  return date;
+  // Convert to EDT (GMT-4)
+  // First get the UTC time by adding the local timezone offset
+  const utcDate = new Date(date.getTime() + date.getTimezoneOffset() * 60000);
+
+  // Then subtract 4 hours for EDT
+  const edtOffset = -4 * 60 * 60000;
+  const edtDate = new Date(utcDate.getTime() + edtOffset);
+
+  console.log("Original date:", date);
+  console.log("EDT date:", edtDate);
+
+  return edtDate;
 }

course-matrix/frontend/src/pages/TimetableBuilder/CreateCustomSetting.tsx

@@ -175,6 +175,7 @@ const CreateCustomSetting = ({
                             restrictionForm.setValue("maxGap", undefined);
                             restrictionForm.setValue("numDays", undefined);
                           }}
+                          value={field.value}
                           defaultValue={""}
                         >
                           <SelectTrigger className="w-[320px]">