Merge branch 'mainline' of github.com:cmurp25/unified-makerspace into…

… mainline
clemsonMakerspace · Dec 13, 2024 · edec283 · edec283
2 parents ea643fa + 78f2ebe
commit edec283
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/site/visitor-console/src/pages/EquipmentForm.tsx b/site/visitor-console/src/pages/EquipmentForm.tsx
@@ -154,7 +154,7 @@ const EquipmentForm = () => {
         print_status: form_data.print_status || "In Progress",
         print_notes: form_data.print_notes || "",
       }),
-      timestamp: new Date().toISOString(),
+      timestamp: new Date().toISOString().split(".")[0],
     };
     console.log("Form Submission:", JSON.stringify(dataWithDefaults, null, 2));
 

diff --git a/site/visitor-console/src/pages/EquipmentUsage.tsx b/site/visitor-console/src/pages/EquipmentUsage.tsx
@@ -62,8 +62,12 @@ const EquipmentUsage = () => {
           );
         }
 
-        const data: EquipmentLog[] = await response.json();
-        setEquipmentLogs(Array.isArray(data) ? data : []);
+        const data = await response.json();
+        console.log(data);
+        const logs = Array.isArray(data.equipment_logs)
+          ? data.equipment_logs
+          : [];
+        setEquipmentLogs(logs);
       } catch (error) {
         console.error("Error fetching equipment logs:", error);
         setEquipmentLogs([]);

diff --git a/site/visitor-console/src/pages/Registration.tsx b/site/visitor-console/src/pages/Registration.tsx
@@ -210,8 +210,7 @@ const Registration = () => {
                 <label htmlFor="class" className="form-label">
                   Class standing
                 </label>
-                <FormMultiselect
-                  id="class"
+                <FormSelect
                   name="class"
                   control={control}
                   values={class_list}