Merge pull request #309 from cmu15122/skyism_timeformat

sheng time_format fixes + queue update question fix

Author: jacksontromero

client/src/components/home/student/UpdateQuestionOverlay.tsx

@@ -46,6 +46,9 @@ export default function UpdateQuestionOverlay(props) {
             handleClose();
             setIsSubmitting(false);
           });
+    }).catch((error) => {
+      handleClose();
+      setIsSubmitting(false);
     });
   };
 

client/src/components/home/ta/StudentEntries.tsx

@@ -190,7 +190,6 @@ export default function StudentEntries(props) {
           setTempDisabled(false);
         });
   };
-
   const handleCancel = (index) => {
     setTempDisabled(true);
     HomeService.unhelpStudent(

client/src/components/metrics/CumulativeStats.tsx

@@ -49,13 +49,13 @@ export default function CumulativeStats(props) {
         <Divider orientation="vertical" variant="middle" flexItem />
         <Grid sx={{px: 4, py: 4, alignItems: 'center', textAlign: 'center'}}>
           <Typography variant='h6' fontWeight='bold'>Average Time Spent per Question (min)</Typography>
-          <Typography variant='h3' sx={{mt: 2}} fontWeight='bold'>{Number(avgTimePerQuestion).toFixed(2)}</Typography>
+          <Typography variant='h3' sx={{mt: 2}} fontWeight='bold'>{avgTimePerQuestion}</Typography>
         </Grid>
 
         <Divider orientation="vertical" variant="middle" flexItem />
         <Grid sx={{px: 4, py: 4, alignItems: 'center', textAlign: 'center'}}>
           <Typography variant='h6' fontWeight='bold'>Average Wait Time (min)</Typography>
-          <Typography variant='h3' sx={{mt: 2}} fontWeight='bold'>{Number(avgWaitTime).toFixed(2)}</Typography>
+          <Typography variant='h3' sx={{mt: 2}} fontWeight='bold'>{avgWaitTime}</Typography>
         </Grid>
       </Card>
     </div>

client/src/components/metrics/OverallStats.tsx

@@ -59,7 +59,7 @@ export default function OverallStats() {
         <Divider orientation="vertical" variant="middle" flexItem />
         <Grid sx={{px: 4, py: 4, alignItems: 'center', textAlign: 'center'}}>
           <Typography variant='h6' fontWeight='bold'>Average Waiting Time (min)</Typography>
-          <Typography variant='h3' sx={{mt: 2}} fontWeight='bold'>{Number(avgWaitTime).toFixed(2)}</Typography>
+          <Typography variant='h3' sx={{mt: 2}} fontWeight='bold'>{avgWaitTime}</Typography>
         </Grid>
         <Divider orientation="vertical" variant="middle" flexItem />
         <Grid sx={{px: 4, py: 4, alignItems: 'center', textAlign: 'center'}}>

client/src/components/metrics/PersonalStats.tsx

@@ -87,7 +87,7 @@ export default function PersonalStats() {
           </Grid>
           <Grid sx={{textAlign: 'center'}}>
             <Typography variant='h6' fontWeight='bold'>Avg. Time Spent Per Question (min)</Typography>
-            <Typography variant='h3' sx={{mt: 2}} fontWeight='bold'>{Number(averageHelpTime).toFixed(2)}</Typography>
+            <Typography variant='h3' sx={{mt: 2}} fontWeight='bold'>{averageHelpTime}</Typography>
           </Grid>
           <Stack sx={{width: '100%'}}>
             <TableContainer sx={{height: 300}}>

server/controllers/metrics.js

@@ -109,6 +109,10 @@ exports.get_avg_time_per_question = (req, res) => {
 
         if (count != 0) averageTime /= count;
 
+        const minutes = Math.floor(averageTime);
+        const seconds = Math.round((averageTime - minutes) * 60);
+        averageTime = minutes + ":" + seconds.toString().padStart(2, '0');
+
         respond(req, res, "Got average time per question", { averageTime: averageTime }, 200);
     });
 }
@@ -199,6 +203,10 @@ exports.get_avg_wait_time_today = (req, res) => {
 
         if (count != 0) avgWaitTime /= count;
 
+        const minutes = Math.floor(avgWaitTime);
+        const seconds = Math.round((avgWaitTime - minutes) * 60);
+        avgWaitTime = minutes + ":" + seconds.toString().padStart(2, '0');
+
         respond(req, res, "Got average wait time today", { avgWaitTime: avgWaitTime }, 200);
     });
 }
@@ -292,6 +300,10 @@ exports.get_total_avg_time_per_question = (req, res) => {
 
         if (count != 0) averageTime /= count;
 
+        const minutes = Math.floor(averageTime);
+        const seconds = Math.round((averageTime - minutes) * 60);
+        averageTime = minutes + ":" + seconds.toString().padStart(2, '0');
+
         respond(req, res, "Got average time per question", { averageTime: averageTime }, 200);
     });
 }
@@ -320,6 +332,10 @@ exports.get_total_avg_wait_time = (req, res) => {
 
         if (count != 0) avgWaitTime /= count;
 
+        const minutes = Math.floor(avgWaitTime);
+        const seconds = Math.round((avgWaitTime - minutes) * 60);
+        avgWaitTime = minutes + ":" + seconds.toString().padStart(2, '0');
+
         respond(req, res, "Got average wait time", { totalAvgWaitTime: avgWaitTime }, 200);
     });
 }