Move Independent Assessments to Tasks

jac-uk · Jun 12, 2020 · 1763c82 · 1763c82
1 parent 4567ce4
commit 1763c82
Showing 1 changed file with 15 additions and 17 deletions.
diff --git a/src/views/Exercises/Show.vue b/src/views/Exercises/Show.vue
@@ -122,29 +122,27 @@ export default {
         },
       ];
       if (this.exercise.applicationsCount || this.hasOpened) {
-        const children = [
-          { page: 'Draft', name: 'exercise-show-applications-in-status', params: { status: STATUS.DRAFT } },
-          { page: 'Applied', name: 'exercise-show-applications-in-status', params: { status: STATUS.APPLIED } },
-          { page: 'Withdrawn', name: 'exercise-show-applications-in-status', params: { status: STATUS.WITHDRAWN } },
-        ];
-        if (this.exercise.applicationRecords) {
-          children.push({ page: 'Independent Assessments', name: 'exercise-show-independent-assessments' });
-        }
-        pages.push({ 
+        pages.push({
           page: 'Applications',
           name: 'exercise-show-applications',
-          children: children,
-        });
-
-        pages.push({
-          page: 'Tasks',
-          name: 'exercise-tasks',
           children: [
-            { page: 'Independent Assessments', name: 'exercise-tasks-independent-assessments' },
-            { page: 'Character Checks', name: 'exercise-tasks-character-checks' },
+            { page: 'Draft', name: 'exercise-show-applications-in-status', params: { status: STATUS.DRAFT } },
+            { page: 'Applied', name: 'exercise-show-applications-in-status', params: { status: STATUS.APPLIED } },
+            { page: 'Withdrawn', name: 'exercise-show-applications-in-status', params: { status: STATUS.WITHDRAWN } },
           ],
         });
 
+        if (this.exercise.applicationRecords) {
+          pages.push({
+            page: 'Tasks',
+            name: 'exercise-tasks',
+            children: [
+              { page: 'Independent Assessments', name: 'exercise-tasks-independent-assessments' },
+              { page: 'Character Checks', name: 'exercise-tasks-character-checks' },
+            ],
+          });
+        }
+
         if (this.exercise.applicationRecords) {
           const review = this.exercise.applicationRecords.review;
           const shortlisted = this.exercise.applicationRecords.shortlisted ? this.exercise.applicationRecords.shortlisted : 0;