diff --git a/client/src/components/assignment/AssignmentSubmissionProgress.vue b/client/src/components/assignment/AssignmentSubmissionProgress.vue index c03d91a5..06e8c72e 100644 --- a/client/src/components/assignment/AssignmentSubmissionProgress.vue +++ b/client/src/components/assignment/AssignmentSubmissionProgress.vue @@ -32,7 +32,8 @@ const state = reactive({ }); onMounted(async () => { - const { assignmentSubmittedUsers, gradedUsers, total } = + // eslint-disable-next-line prefer-const + let { assignmentSubmittedUsers, gradedUsers, total } = await loadAssignmentCompletionStatusData( props.learningContent.content_assignment.id, props.courseSession.id, @@ -40,6 +41,10 @@ onMounted(async () => { props.userSelectionIds ); + if (props.userSelectionIds && props.userSelectionIds.length > 0) { + total = props.userSelectionIds.length; + } + state.submissionProgressStatusCount = { SUCCESS: assignmentSubmittedUsers.length, UNKNOWN: total - assignmentSubmittedUsers.length, @@ -57,6 +62,9 @@ const doneCount = (status: StatusCount) => { }; const totalCount = (status: StatusCount) => { + if (props.userSelectionIds && props.userSelectionIds.length > 0) { + return props.userSelectionIds.length; + } return doneCount(status) + status.UNKNOWN || 0; }; diff --git a/client/src/pages/dashboard/agentAssignment/AgentAssignmentDetail.vue b/client/src/pages/dashboard/agentAssignment/AgentAssignmentDetail.vue index 703e370f..cce98a2b 100644 --- a/client/src/pages/dashboard/agentAssignment/AgentAssignmentDetail.vue +++ b/client/src/pages/dashboard/agentAssignment/AgentAssignmentDetail.vue @@ -5,7 +5,6 @@ import * as log from "loglevel"; import { computed } from "vue"; import type { LearningContentAssignment, LearningContentEdoniqTest } from "@/types"; import { useExpertCockpitPageData } from "@/pages/cockpit/cockpitPage/composables"; -import { getPreviousRoute } from "@/router/history"; const props = defineProps<{ courseSlug: string; diff --git a/client/src/pages/dashboard/agentAssignment/AgentAssignmentStatisticPage.vue b/client/src/pages/dashboard/agentAssignment/AgentAssignmentStatisticPage.vue index a6bd9530..99921b27 100644 --- a/client/src/pages/dashboard/agentAssignment/AgentAssignmentStatisticPage.vue +++ b/client/src/pages/dashboard/agentAssignment/AgentAssignmentStatisticPage.vue @@ -24,9 +24,11 @@ const courseId = ref(undefined); const agentAssignmentData = ref(null); const courseSessionName = (courseSessionId: string) => { - return agentAssignmentData.value?.course_session_properties?.sessions.find( - (session) => session.id === courseSessionId - )?.name; + return ( + agentAssignmentData.value?.course_session_properties?.sessions.find( + (session) => session.id === courseSessionId + )?.name ?? "" + ); }; const circleMeta = (circleId: string) => { @@ -71,7 +73,7 @@ onMounted(async () => { v-if="agentAssignmentData" :course-statistics="agentAssignmentData" :course-session-name="courseSessionName" - :circle-meta="circleMeta" + :circle-meta="circleMeta as any" :detail-base-url="`/statistic/${props.agentRole}/${props.courseSlug}/assignment/`" > diff --git a/client/src/pages/dashboard/statistic/AssignmentList.vue b/client/src/pages/dashboard/statistic/AssignmentList.vue index 1501b580..43e64294 100644 --- a/client/src/pages/dashboard/statistic/AssignmentList.vue +++ b/client/src/pages/dashboard/statistic/AssignmentList.vue @@ -59,7 +59,6 @@ const itemDetailUrl = (item: AssignmentStatisticsRecordType) => { } return item.details_url; }; -