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

This commit is contained in:
Rotimi Best
2023-10-02 04:15:01 +01:00
parent 21305c5d65
commit 93f674b04b
8 changed files with 48 additions and 41 deletions
@@ -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
@@ -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)
})) || [];
}
+2 -5
View File
@@ -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