From 1763c82f677f6a5edb0d1ee19591c77f6e20086b Mon Sep 17 00:00:00 2001
From: YaaL <YaaL@users.noreply.github.com>
Date: Fri, 12 Jun 2020 11:03:21 +0100
Subject: [PATCH] Move Independent Assessments to Tasks

---
 src/views/Exercises/Show.vue | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/views/Exercises/Show.vue b/src/views/Exercises/Show.vue
index 6b46277cb..36220147f 100644
--- 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;