fix: update API endpoints and course marks page

apps/dashboard/src/routes/api/courses/exercises/+server.ts

@@ -49,16 +49,9 @@ export const POST: RequestHandler = async ({ request }) => {
       throw new Error('Error fetching exercises');
     }
 
-    const formattedExercises = exercises.map((exercise) => ({
-      lesson_id: exercise.lesson_id,
-      exercise_id: exercise.id,
-      exercise_title: exercise.title,
-      points: exercise.points
-    }));
-
     return json({
       success: true,
-      data: formattedExercises
+      data: exercises
     });
   } catch (error) {
     const message = error instanceof Error ? error.message : 'Internal server error';

apps/dashboard/src/routes/courses/[id]/marks/+page.svelte

@@ -18,7 +18,12 @@
   import { profile } from '$lib/utils/store/user';
   import type { GroupPerson } from '$lib/utils/types';
   import type { CurrentOrg } from '$lib/utils/types/org';
-  import { Loading, OverflowMenu, OverflowMenuItem } from 'carbon-components-svelte';
+  import {
+    Loading,
+    OverflowMenu,
+    OverflowMenuItem,
+    SkeletonPlaceholder
+  } from 'carbon-components-svelte';
   import AudioConsoleIcon from 'carbon-icons-svelte/lib/AudioConsole.svelte';
   import Download from 'carbon-icons-svelte/lib/Download.svelte';
   import jsPDF from 'jspdf';
@@ -33,6 +38,7 @@
   let lessonMapping = {}; // { lessonId: { exerciseId: exerciseTitle, ... }, ... }
   let studentMarksByExerciseId = {}; // { groupMemberId: { exerciseId: `total_gotten/points`, ... }, ... }
   let isDownloading = false;
+  let isLoading = false;
 
   function calculateStudentTotal(studentExerciseData) {
     if (!studentExerciseData) return 0;
@@ -44,14 +50,19 @@
   }
 
   async function firstRender(courseId: string) {
+    isLoading = true;
     const { data: marks, error } = await fetchMarks(courseId);
     if (error) {
+      isLoading = false;
       console.error('Error fetching marks', error);
       snackbar.error('snackbar.marks.error');
       return;
     }
 
-    if (!marks || !Array.isArray(marks)) return;
+    if (!marks || !Array.isArray(marks)) {
+      isLoading = false;
+      return;
+    }
 
     marks.forEach((mark) => {
       const { groupmember_id, exercise_id, total_points_gotten } = mark;
@@ -85,6 +96,8 @@
         };
       }
     });
+
+    isLoading = false;
   }
   // TODO WRITE A REDIRECT FUNCTION FOR THIS THIS PAGE
 
@@ -238,6 +251,14 @@
     </PageNav>
 
     <PageBody width="w-full max-w-6xl md:w-11/12">
+      {#if isLoading}
+        <div class=" h-full w-full">
+          <SkeletonPlaceholder class="mb-4 h-8 w-full" />
+          <SkeletonPlaceholder class="mb-4 h-8 w-full" />
+          <SkeletonPlaceholder class="mb-4 h-8 w-full" />
+          <SkeletonPlaceholder class="mb-4 h-8 w-full" />
+        </div>
+      {:else}
         <div id="tableContainer" class="table w-full rounded-md border border-gray-300">
           <div class="flex items-center {borderBottomGrey}">
             <div class="box flex items-center p-3">
@@ -318,6 +339,7 @@
             </Box>
           {/each}
         </div>
+      {/if}
     </PageBody>
   </RoleBasedSecurity>
 </CourseContainer>