diff --git a/frontend/src/components/BatchStudents.vue b/frontend/src/components/BatchStudents.vue index 3d898d21..8717306b 100644 --- a/frontend/src/components/BatchStudents.vue +++ b/frontend/src/components/BatchStudents.vue @@ -52,7 +52,7 @@ {{ row[column.key] }}
- {{ Math.ceil(row.courses[column.key]) }}% + {{ Math.ceil(row.courses[column.key]) }}
{{ row.assessments[column.key] }} -
{{ parseInt(row.assessments[column.key]) }}%
+
{{ parseInt(row.assessments[column.key]) }}
@@ -134,22 +134,10 @@ const getStudentColumns = () => { { label: 'Full Name', key: 'full_name', - width: '10rem', + width: '15rem', }, ] - if (students.data?.[0].courses) { - Object.keys(students.data?.[0].courses).forEach((course) => { - columns.push({ - label: course, - key: course, - width: '10rem', - icon: 'book-open', - align: 'center', - }) - }) - } - if (students.data?.[0].assessments) { Object.keys(students.data?.[0].assessments).forEach((assessment) => { columns.push({ @@ -163,6 +151,19 @@ const getStudentColumns = () => { }) }) } + + if (students.data?.[0].courses) { + Object.keys(students.data?.[0].courses).forEach((course) => { + columns.push({ + label: course, + key: course, + width: '10rem', + icon: 'book-open', + align: 'center', + }) + }) + } + return columns } diff --git a/frontend/src/pages/QuizSubmissionList.vue b/frontend/src/pages/QuizSubmissionList.vue index 6aeea286..e9a06fdb 100644 --- a/frontend/src/pages/QuizSubmissionList.vue +++ b/frontend/src/pages/QuizSubmissionList.vue @@ -5,6 +5,9 @@
+
+ {{ submissions.data[0].quiz_title }} +
+
+ +