diff --git a/frontend/src/components/BatchStudents.vue b/frontend/src/components/BatchStudents.vue index 445b525c..31d4290a 100644 --- a/frontend/src/components/BatchStudents.vue +++ b/frontend/src/components/BatchStudents.vue @@ -266,7 +266,8 @@ const students = createResource({ onSuccess(data) { chartData.value = getChartData() showProgressChart.value = - data.length && (props.batch?.data?.courses?.length || assessmentCount.value) + data.length && + (props.batch?.data?.courses?.length || assessmentCount.value) }, }) diff --git a/frontend/src/components/Controls/Autocomplete.vue b/frontend/src/components/Controls/Autocomplete.vue index 63368668..6427bf8a 100644 --- a/frontend/src/components/Controls/Autocomplete.vue +++ b/frontend/src/components/Controls/Autocomplete.vue @@ -92,7 +92,10 @@ {{ option.label }}
diff --git a/frontend/src/components/Modals/AssessmentModal.vue b/frontend/src/components/Modals/AssessmentModal.vue index 3ff4ed19..b0a64d69 100644 --- a/frontend/src/components/Modals/AssessmentModal.vue +++ b/frontend/src/components/Modals/AssessmentModal.vue @@ -25,21 +25,23 @@ v-model="assessment" :doctype="assessmentType" :label="__('Assessment')" - :onCreate="(value, close) => { - close() - if (assessmentType === 'LMS Quiz') { - router.push({ - name: 'QuizForm', - params: { - quizID: 'new', - }, - }) - } else if (assessmentType === 'LMS Assignment') { - router.push({ - name: 'Assignments' - }) + :onCreate=" + (value, close) => { + close() + if (assessmentType === 'LMS Quiz') { + router.push({ + name: 'QuizForm', + params: { + quizID: 'new', + }, + }) + } else if (assessmentType === 'LMS Assignment') { + router.push({ + name: 'Assignments', + }) + } } - }" + " /> diff --git a/frontend/src/components/Modals/BatchCourseModal.vue b/frontend/src/components/Modals/BatchCourseModal.vue index 6eb4471a..ee6fd583 100644 --- a/frontend/src/components/Modals/BatchCourseModal.vue +++ b/frontend/src/components/Modals/BatchCourseModal.vue @@ -19,15 +19,17 @@ v-model="course" :label="__('Course')" :required="true" - :onCreate="(value, close) => { - close() - router.push({ - name: 'CourseForm', - params: { - courseName: 'new' - } - }) - }" + :onCreate=" + (value, close) => { + close() + router.push({ + name: 'CourseForm', + params: { + courseName: 'new', + }, + }) + } + " /> {{ student.full_name }} - + {{ student.progress }}% {{ __('Complete') }} @@ -26,7 +32,10 @@
-
+
{{ __('Assessment') }} @@ -73,7 +82,10 @@
-
+
{{ __('Courses') }} diff --git a/frontend/src/components/Modals/StudentModal.vue b/frontend/src/components/Modals/StudentModal.vue index ba355f38..df3acc3d 100644 --- a/frontend/src/components/Modals/StudentModal.vue +++ b/frontend/src/components/Modals/StudentModal.vue @@ -19,9 +19,11 @@ doctype="User" v-model="student" :filters="{ ignore_user_type: 1 }" - :onCreate="(value, close) => { - openSettings('Members', close) - }" + :onCreate=" + (value, close) => { + openSettings('Members', close) + } + " />
diff --git a/frontend/src/pages/Batch.vue b/frontend/src/pages/Batch.vue index b07aa13a..cf0b31fb 100644 --- a/frontend/src/pages/Batch.vue +++ b/frontend/src/pages/Batch.vue @@ -358,9 +358,8 @@ watch(tabIndex, () => { const canMakeAnnouncement = () => { if (readOnlyMode) return false - if (!batch.data?.students?.length) - return false - + if (!batch.data?.students?.length) return false + return user.data?.is_moderator || user.data?.is_evaluator } diff --git a/frontend/src/pages/BatchForm.vue b/frontend/src/pages/BatchForm.vue index 044af154..60415e81 100644 --- a/frontend/src/pages/BatchForm.vue +++ b/frontend/src/pages/BatchForm.vue @@ -499,8 +499,6 @@ const validateFile = (file) => { } } - - const breadcrumbs = computed(() => { let crumbs = [ { diff --git a/frontend/src/pages/CertifiedParticipants.vue b/frontend/src/pages/CertifiedParticipants.vue index 7767dc94..b7d0de83 100644 --- a/frontend/src/pages/CertifiedParticipants.vue +++ b/frontend/src/pages/CertifiedParticipants.vue @@ -3,7 +3,7 @@ class="sticky flex items-center justify-between top-0 z-10 border-b bg-surface-white px-3 py-2.5 sm:px-5" > - +