Fix off by one fault

ls1intum · Nov 12, 2024 · b1856f2 · b1856f2
1 parent d73a07f
commit b1856f2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 14 deletions.
diff --git a/playground/src/components/view_mode/evaluation_mode/expert_evaluation/expert_links.tsx b/playground/src/components/view_mode/evaluation_mode/expert_evaluation/expert_links.tsx
@@ -118,7 +118,7 @@ export default function ExpertLinks(props: ExpertLinksProps) {
                       <div className="bg-blue-500 h-2 rounded" style={{ width: `${progressPercentage}%` }} />
                     </div>
                     <span className="text-sm text-gray-700">
-                      {completed === 0 ? 'Not started' : `${completed} / ${total} completed`}
+                      {completed === 0 ? 'Not started' : completed === total ? 'Finished 🏁' : `${completed} / ${total} completed`}
                     </span>
                   </>
                 )}

diff --git a/playground/src/helpers/get_data.ts b/playground/src/helpers/get_data.ts
@@ -427,22 +427,19 @@ export function getProgressStatsFromFileSync(
     return undefined;
   }
 
+  const totalSubmissions = config.exercises.reduce((acc, exercise) => acc + (exercise.submissions?.length || 0), 0);
+
   let progressStats: { [expertId: string]: number } = {};
   for (const expertId of expertIds) {
     let progress = getProgressFromFileSync(dataMode, expertEvaluationId, expertId);
-    if (progress) {
-      let expertProgress = 0;
-      for (let i = 0; i < progress.current_exercise_index; i++) {
-        expertProgress += config.exercises[i]?.submissions?.length || 0;
-      }
-      expertProgress += progress.current_submission_index;
 
-      progressStats[expertId] = expertProgress;
+    if (progress && progress.is_finished_evaluating) {
+      progressStats[expertId] = totalSubmissions;
+    } else if (progress && progress.has_started_evaluating) {
+      progressStats[expertId] = config.exercises.slice(0, progress.current_exercise_index).reduce((sum, exercise) => sum + exercise.submissions!.length, 0) + progress.current_submission_index;
     }
   }
 
-  const totalSubmissions = config.exercises.reduce((acc, exercise) => acc + (exercise.submissions?.length || 0), 0);
-
   return {
     totalSubmissions: totalSubmissions,
     ...progressStats

diff --git a/playground/src/pages/[expert_evaluation_config_id]/[expert_id]/expert_view.tsx b/playground/src/pages/[expert_evaluation_config_id]/[expert_id]/expert_view.tsx
@@ -141,10 +141,8 @@ export default function SideBySideExpertView() {
   };
 
   useEffect(() => {
-    if (currentSubmissionIndex > 0) {
-      saveProgress();
-    }
-  }, [currentSubmissionIndex, isFinishedEvaluating]);
+    saveProgress();
+  }, [currentSubmissionIndex, currentExerciseIndex, isFinishedEvaluating]);
 
   const handlePrevious = () => {
     // If we are not at the first submission, just decrement the submission index