CLASSROOMIO-T-108: Add grading score to Graded column

src/lib/components/CourseLandingPage/index.svelte

@@ -1,12 +1,9 @@
 <script lang="ts">
-  // import paystack from 'paystack';
   import get from 'lodash/get';
   import { observeIntersection } from './components/IntersectionObserver';
   import { onMount, onDestroy } from 'svelte';
   import pluralize from 'pluralize';
   import { page } from '$app/stores';
-  import dayjs from 'dayjs';
-  import relativeTime from 'dayjs/plugin/relativeTime';
   import Notebook from 'carbon-icons-svelte/lib/Notebook.svelte'; //note
   import PresentationFile from 'carbon-icons-svelte/lib/PresentationFile.svelte'; // exercise
   import Video from 'carbon-icons-svelte/lib/Video.svelte'; //video
@@ -24,8 +21,7 @@
   import { reviewsModalStore } from './store';
   import { VARIANTS } from '$lib/components/PrimaryButton/constants';
   import HtmlRender from '$lib/components/HTMLRender/HTMLRender.svelte';
-
-  dayjs.extend(relativeTime);
+  import { calDateDiff } from '$lib/utils/functions/date';
 
   export let editMode = false;
   export let courseData: Course;
@@ -378,7 +374,7 @@
                         <div class="flex flex-row">
                           <img src="/images/rating-full.svg" alt="" class="mr-2" />
                           <p class="text-xs text-gray-600">
-                            {dayjs(review.created_at).fromNow(true)} ago
+                            {calDateDiff(review.created_at)}
                           </p>
                         </div>
                         <div

src/lib/components/Org/Community/index.svelte

@@ -1,7 +1,5 @@
 <script>
   import { goto } from '$app/navigation';
-  import dayjs from 'dayjs';
-  import relativeTime from 'dayjs/plugin/relativeTime';
   import AddCommentIcon from 'carbon-icons-svelte/lib/AddComment.svelte';
   import CommunityLoader from './Loader.svelte';
   import Vote from '$lib/components/Vote/index.svelte';
@@ -10,14 +8,13 @@
   import Space from '$lib/components/Space/index.svelte';
   import { currentOrgPath, currentOrg } from '$lib/utils/store/org';
   import { supabase } from '$lib/utils/functions/supabase';
+  import { calDateDiff } from '$lib/utils/functions/date';
 
   export let isLMS = false;
 
   let isLoading = false;
   let discussions = [];
 
-  dayjs.extend(relativeTime);
-
   async function fetchCommunityQuestions(orgId) {
     if (!orgId) return;
     isLoading = true;
@@ -54,7 +51,7 @@
         author: discussion?.author?.profile?.fullname,
         comments: discussion.comments?.[0]?.count || 0,
         votes: discussion.votes,
-        createdAt: dayjs(discussion.created_at).fromNow(true)
+        createdAt: calDateDiff(discussion.created_at)
       })) || [];
   }
 

src/lib/components/Org/Quiz/QuizCard.svelte

@@ -2,16 +2,13 @@
   import pluralize from 'pluralize';
   import { ImageLoader } from 'carbon-components-svelte';
   import OverflowMenuHorizontalIcon from 'carbon-icons-svelte/lib/OverflowMenuHorizontal.svelte';
-  import dayjs from 'dayjs';
-  import relativeTime from 'dayjs/plugin/relativeTime';
   import { currentOrgPath } from '$lib/utils/store/org';
   import Dropdown from '$lib/components/Dropdown/index.svelte';
   import PrimaryButton from '$lib/components/PrimaryButton/index.svelte';
   import { VARIANTS } from '$lib/components/PrimaryButton/constants';
   import { onRename, onDelete } from '$lib/utils/services/org/quiz';
   import { themeImages } from '$lib/utils/constants/quiz';
-
-  dayjs.extend(relativeTime);
+  import { calDateDiff } from '$lib/utils/functions/date';
 
   export let quiz;
   export let totalQuestions;
@@ -80,7 +77,7 @@
       <div class="flex md:flex-row flex-col justify-between">
         <div>
           <p class="mb-2">{pluralize('question', totalQuestions, true)}</p>
-          <p class="mb-2 md:mb-0">Updated {dayjs(quiz.updated_at).fromNow(true)} ago</p>
+          <p class="mb-2 md:mb-0">Updated {calDateDiff(quiz.updated_at)}</p>
         </div>
 
         <PrimaryButton

src/lib/utils/functions/date.ts

@@ -0,0 +1,8 @@
+import dayjs from 'dayjs';
+import relativeTime from 'dayjs/plugin/relativeTime';
+
+dayjs.extend(relativeTime);
+
+export const calDateDiff = (date: string | number | Date): string => {
+  return dayjs(date).fromNow(true) + ` ago`;
+};

src/lib/utils/services/lms/exercises.ts

@@ -5,9 +5,13 @@ export interface LMSExercise {
   id: string;
   title: string;
   updated_at: string;
+  questions: {
+    points: number;
+  }[];
   submission: {
     status_id: number;
     updated_at: string;
+    total: number;
     groupmember: {
       id: string;
       profile: {
@@ -53,9 +57,11 @@ export async function fetchLMSExercises(
       id,
       title,
       updated_at,
+      questions:question(points),
       submission (
         status_id,
         updated_at,
+        total,
         groupmember:submitted_by!inner (
           id,
           profile!inner (
@@ -90,7 +96,7 @@ export async function fetchLMSExercises(
     .eq('submission.groupmember.profile.id', profileId);
 
   return {
-    exercises: data,
+    exercises: data as LMSExercise[] | null,
     error
   };
 }