Safety training

ITPNYU · Mar 14, 2024 · ce69883 · ce69883
1 parent 708698d
commit ce69883
Showing 1 changed file with 22 additions and 17 deletions.
diff --git a/media_commons_booking_app/src/client/booking/components/SheetEditor.tsx b/media_commons_booking_app/src/client/booking/components/SheetEditor.tsx
@@ -185,23 +185,28 @@ const SheetEditor = () => {
   // safety training users
   const getSafetyTrainingStudents = () => {
     if (!isSafetyTrained) {
-      serverFunctions.getSheetRows(SAFTY_TRAINING_SHEET_NAME).then((rows) => {
-        const emails = rows.reduce(
-          (accumulator, value) => accumulator.concat(value),
-          []
-        );
-        const trained = emails.includes(userEmail);
-        setIsSafetyTrained(trained);
-      });
-      serverFunctions.getOldSafetyTrainingEmails().then((rows) => {
-        console.log('old emails', rows);
-        const emails = rows.reduce(
-          (accumulator, value) => accumulator.concat(value),
-          []
-        );
-        const trained = emails.includes(userEmail);
-        setIsSafetyTrained(trained);
-      });
+      const trained = serverFunctions
+        .getSheetRows(SAFTY_TRAINING_SHEET_NAME)
+        .then((rows) => {
+          const emails = rows.reduce(
+            (accumulator, value) => accumulator.concat(value),
+            []
+          );
+          const trained = emails.includes(userEmail);
+          setIsSafetyTrained(trained);
+          return trained;
+        });
+      if (!trained) {
+        serverFunctions.getOldSafetyTrainingEmails().then((rows) => {
+          console.log('old emails', rows);
+          const emails = rows.reduce(
+            (accumulator, value) => accumulator.concat(value),
+            []
+          );
+          const trained = emails.includes(userEmail);
+          setIsSafetyTrained(trained);
+        });
+      }
     }
   };