Feature/equal merit tie breakers

package.json

@@ -38,6 +38,8 @@
     "jspdf": "^1.5.3",
     "save-file": "^2.3.1",
     "vue": "^2.6.12",
+    "vue-loader": "^15.9.2",
+    "vue-loader-v16": "^16.0.0-beta.5.4",
     "vue-json-pretty": "^1.7.1",
     "vue-router": "^3.5.1",
     "vuex": "^3.6.2",

src/router.js

@@ -59,6 +59,7 @@ import ExerciseReportsAgency from '@/views/Exercise/Reports/Agency';
 import ExerciseReportsHandover from '@/views/Exercise/Reports/Handover';
 import QualifyingTestReportCreate from '@/views/Exercise/Reports/QualifyingTestReports/Create';
 import QualifyingTestReport from '@/views/Exercise/Reports/QualifyingTestReports/QualifyingTestReport';
+import QualifyingTestReports from '@/views/Exercise/Reports/QualifyingTestReports/QualifyingTestReports';
 import QualifyingTestReportEdit from '@/views/Exercise/Reports/QualifyingTestReports/QualifyingTestReport/Edit';
 import QualifyingTestReportView from '@/views/Exercise/Reports/QualifyingTestReports/QualifyingTestReport/View';
 import QualifyingTestReportViewScore from '@/views/Exercise/Reports/QualifyingTestReports/QualifyingTestReport/ViewScore';
@@ -85,6 +86,7 @@ import QualifyingTestReview from '@/views/Exercise/Tasks/QualifyingTests/Qualify
 import QualifyingTestResponses from '@/views/Exercise/Tasks/QualifyingTests/QualifyingTest/Responses';
 import QualifyingTestResponse from '@/views/Exercise/Tasks/QualifyingTests/QualifyingTest/Response';
 import QualifyingTestResponseView from '@/views/Exercise/Tasks/QualifyingTests/QualifyingTest/Response/View';
+import QualifyingTestsCover from '@/views/Exercise/Tasks/QualifyingTests/Cover';
 
 // Exercise stages
 import ExerciseStages from '@/views/Exercise/Stages';
@@ -574,6 +576,105 @@ const router = new Router({
               path: '',
               redirect: 'qualifying-tests',
             },
+            {
+              path: 'equal-merit-tie-breakers',
+              component: QualifyingTestsCover,
+              props: {
+                tieBreakers: true,
+              },
+              name: 'exercise-tasks-equal-merit-tie-breakers',
+              meta: {
+                requiresAuth: true,
+                title: 'Equal Merit Tie-Breakers',
+              },
+            },
+            {
+              path: 'equal-merit-tie-breakers/new',
+              component: QualifyingTestNew,
+              props: {
+                isTieBreaker: true,
+              },
+              name: 'equal-merit-tie-breaker-new',
+              meta: {
+                requiresAuth: true,
+                title: 'Equal Merit Tie-Breakers | New',
+              },
+            },
+            {
+              path: 'equal-merit-tie-breakers/:qualifyingTestId',
+              component: QualifyingTest,
+              children: [
+                {
+                  path: '',
+                  component: QualifyingTestView,
+                  name: 'equal-merit-tie-breaker-view',
+                  meta: {
+                    requiresAuth: true,
+                    title: 'Equal Merit Tie-Breaker | View',
+                  },
+                },
+                {
+                  path: 'edit',
+                  component: QualifyingTestEdit,
+                  name: 'equal-merit-tie-breaker-edit',
+                  meta: {
+                    requiresAuth: true,
+                    title: 'Equal Merit Tie-Breaker | Edit',
+                  },
+                },
+                {
+                  path: 'build',
+                  component: QualifyingTestQuestionBuilder,
+                  name: 'equal-merit-tie-breaker-question-builder',
+                  meta: {
+                    requiresAuth: true,
+                    title: 'Equal Merit Tie-Breaker | Question Builder',
+                  },
+                },
+                {
+                  path: 'dry-run',
+                  component: QualifyingTestDryRun,
+                  name: 'equal-merit-tie-breaker-dry-run',
+                  meta: {
+                    requiresAuth: true,
+                    title: 'Equal Merit Tie-Breaker | Dry Run',
+                  },
+                },
+                {
+                  path: 'review',
+                  component: QualifyingTestReview,
+                  name: 'equal-merit-tie-breaker-review',
+                  meta: {
+                    requiresAuth: true,
+                    title: 'Equal Merit Tie-Breaker | Review',
+                  },
+                },
+                {
+                  path: 'responses/:status',
+                  component: QualifyingTestResponses,
+                  name: 'equal-merit-tie-breaker-responses',
+                  meta: {
+                    requiresAuth: true,
+                    title: 'Equal Merit Tie-Breaker | Responses',
+                  },
+                },
+                {
+                  path: 'response/:responseId',
+                  component: QualifyingTestResponse,
+                  children: [
+                    {
+                      path: '',
+                      component: QualifyingTestResponseView,
+                      name: 'equal-merit-tie-breaker-response-view',
+                      meta: {
+                        requiresAuth: true,
+                        title: 'Equal Merit Tie-Breaker | Response View',
+                      },
+                    },
+                  ],
+                },
+              ],
+            },
             {
               path: 'independent-assessments',
               component: ExerciseTasksIndependentAssessments,
@@ -604,6 +705,9 @@ const router = new Router({
             {
               path: 'qualifying-tests',
               component: QualifyingTests,
+              props: {
+                tieBreakers: false,
+              },
               name: 'exercise-tasks-qualifying-tests',
               meta: {
                 requiresAuth: true,
@@ -613,6 +717,9 @@ const router = new Router({
             {
               path: 'qualifying-tests/new',
               component: QualifyingTestNew,
+              props: {
+                isTieBreaker: false,
+              },
               name: 'qualifying-test-new',
               meta: {
                 requiresAuth: true,
@@ -955,6 +1062,9 @@ const router = new Router({
                 {
                   path: '',
                   component: ExerciseReportsQualifyingTestReports,
+                  props: {
+                    tieBreakers: false,
+                  },
                   meta: {
                     requiresAuth: true,
                     title: 'Qualifying Test Reports | Exercise Reports',
@@ -964,6 +1074,9 @@ const router = new Router({
                   path: 'create',
                   name: 'qualifying-test-report-create',
                   component: QualifyingTestReportCreate,
+                  props: {
+                    tieBreakers: false,
+                  },
                   meta: {
                     requiresAuth: true,
                     title: 'Create Qualifying Test Report | Exercise Reports',
@@ -1002,8 +1115,66 @@ const router = new Router({
                     },
                   ],
                 },
-             ],
+              ],
+            },
+            {
+              path: 'equal-merit-tie-breaker-reports',
+              component: QualifyingTestReports,
+              props: {
+                tieBreakers: true,
+              },
+              name: 'equal-merit-tie-breaker-reports',
+              meta: {
+                requiresAuth: true,
+                title: 'Equal Merit Tie-breaker Reports',
+              },
             },
+            {
+              path: 'equal-merit-tie-breaker-report-create',
+              component: QualifyingTestReportCreate,
+              props: {
+                tieBreakers: true,
+              },
+              name: 'equal-merit-tie-breaker-report-create',
+              meta: {
+                requiresAuth: true,
+                title: 'Equal Merit Tie-breaker Report | New',
+              },
+            },
+            {
+              path: 'equal-merit-tie-breaker-reports/:qualifyingTestReportId',
+              component: QualifyingTestReport,
+              children: [
+                {
+                  path: '',
+                  component: QualifyingTestReportView,
+                  name: 'equal-merit-tie-breaker-report-view',
+                  meta: {
+                    requiresAuth: true,
+                    title: 'Equal Merit Tie-breaker Report | View',
+                  },
+                },
+                {
+                  path: 'edit',
+                  component: QualifyingTestReportEdit,
+                  name: 'equal-merit-tie-breaker-report-edit',
+                  meta: {
+                    requiresAuth: true,
+                    title: 'Equal Merit Tie-breaker Report | Edit',
+                  },
+                },
+                {
+                  path: ':score',
+                  component: QualifyingTestReportViewScore,
+                  name: 'equal-merit-tie-breaker-report-view-score',
+                  meta: {
+                    requiresAuth: true,
+                    title: 'Equal Merit Tie-breaker Report | View Score',
+                  },
+                },
+              ],
+            },
+
             {
               path: 'agency',
               component: ExerciseReportsAgency,

src/store/qualifyingTest/qualifyingTest.js

@@ -90,5 +90,10 @@ export default {
           && qualifyingTest.mode !== QUALIFYING_TEST.MODE.MOP_UP;
       });
     },
+    getActivatedQTs: (state) => {
+      return state.records.filter(qualifyingTest => {
+        return qualifyingTest.status === QUALIFYING_TEST.STATUS.ACTIVATED;
+      });
+    },
   },
 };

src/views/Exercise/Reports/QualifyingTestReports/Create.vue

@@ -2,7 +2,7 @@
   <div class="govuk-grid-column-two-thirds">
     <form @submit.prevent="validateAndSave">
       <h2 class="govuk-heading-l">
-        Create a qualifying test
+        Create a {{ tieBreakers ? 'an equal merit tie-breaker' : 'a qualifying test' }} report
       </h2>
 
       <ErrorSummary
@@ -45,6 +45,12 @@ export default {
     CheckboxItem,
   },
   extends: Form,
+  props: {
+    tieBreakers: {
+      required: true,
+      type: Boolean,
+    },
+  },
   data(){
     return {
       qualifyingTestIds: [],
@@ -55,7 +61,12 @@ export default {
       return this.$route.params.id;
     },
     qualifyingTests() {
-      return this.$store.getters['qualifyingTest/getCompletedQTs'];
+      return this.$store.getters['qualifyingTest/getCompletedQTs'].filter(row => {
+        return this.tieBreakers == (row.isTieBreaker == true); // to cater for the isTieBreaker field being absent
+      });
+    },
+    routeNamePrefix() {
+      return this.tieBreakers ? 'equal-merit-tie-breaker' : 'qualifying-test';
     },
   },
   created() {
@@ -81,11 +92,12 @@ export default {
           exercise: {
             id: this.exerciseId,
           },
+          tieBreakers: this.tieBreakers,
           qualifyingTests: qualifyingTests,
         };
         await this.$store.dispatch('qualifyingTestReport/create', data);
         this.$router.push({
-          name: 'qualifying-test-reports',
+          name: `${this.routeNamePrefix}-reports`,
         });
       }
     },

src/views/Exercise/Reports/QualifyingTestReports/QualifyingTestReport/Edit.vue

@@ -2,7 +2,7 @@
   <div class="govuk-grid-column-two-thirds">
     <form @submit.prevent="validateAndSave">
       <h2 class="govuk-heading-m govuk-!-margin-bottom-0">
-        Qualifying Test Report
+        {{ tieBreakers ? 'Equal Merit Tie-breaker' : 'Qualifying Test' }} Report
       </h2>
       <h3 class="govuk-heading-l ">
         {{ qualifyingTestReport.title }}
@@ -96,11 +96,19 @@ export default {
       return this.$store.state.exerciseDocument.record;
     },
     qualifyingTests() {
-      return this.$store.getters['qualifyingTest/getCompletedQTs'];
+      return this.$store.getters['qualifyingTest/getCompletedQTs'].filter(row => {
+        return this.tieBreakers == (row.isTieBreaker == true); // to cater for the isTieBreaker field being absent
+      });
     },
     qualifyingTestReport() {
       return this.$store.getters['qualifyingTestReport/data'];
     },
+    tieBreakers() {
+      return this.qualifyingTestReport.tieBreakers;
+    },
+    routeNamePrefix() {
+      return this.tieBreakers ? 'equal-merit-tie-breaker' : 'qualifying-test';
+    },
   },
   created() {
     if (this.$store.state.qualifyingTest.records.length === 0) {
@@ -128,7 +136,7 @@ export default {
 
         await this.$store.dispatch('qualifyingTestReport/save', data);
         this.$router.push({
-          name: 'qualifying-test-report-view',
+          name: `${this.routeNamePrefix}-report-view`,
           params: {
             qualifyingTestReportId: this.qualifyingTestReportId,
           },

src/views/Exercise/Reports/QualifyingTestReports/QualifyingTestReport/View.vue

@@ -4,7 +4,7 @@
       <div class="moj-page-header-actions">
         <div class="moj-page-header-actions__title">
           <h2 class="govuk-heading-m">
-            Qualifying Test Report
+            {{ tieBreakers ? 'Equal Merit Tie-breaker' : 'Qualifying Test' }} Report
           </h2>
           <h3 class="govuk-heading-l govuk-!-margin-bottom-0">
             {{ qualifyingTestReport.title }}
@@ -67,7 +67,7 @@
           </TableCell>
           <TableCell :title="tableColumns[2].title">
             <RouterLink
-              :to="{ name: 'qualifying-test-report-view-score', params: { qualifyingTestReportId: qualifyingTestReportId, score: row.score } }"
+              :to="{ name: `${routeNamePrefix}-report-view-score`, params: { qualifyingTestReportId: qualifyingTestReportId, score: row.score } }"
               class="govuk-link"
             >
               {{ row.score }}
@@ -151,6 +151,12 @@ export default {
       });
       return score;
     },
+    tieBreakers() {
+      return this.qualifyingTestReport.tieBreakers;
+    },
+    routeNamePrefix() {
+      return this.tieBreakers ? 'equal-merit-tie-breaker' : 'qualifying-test';
+    },
     applicationIds() {
       const ids = [];
       this.qualifyingTestReport.rawData.forEach(data => {
@@ -174,7 +180,7 @@ export default {
     },
     btnEdit() {
       this.$router.push({
-        name: 'qualifying-test-report-edit',
+        name: `${this.routeNamePrefix}-report-edit`,
         params: {
           qualifyingTestReportId: this.qualifyingTestReportId,
         },
@@ -233,7 +239,7 @@ export default {
       ];
     },
     downloadData() {
-      const title = 'Qualifying Test Report';
+      const title = `${this.tieBreakers ? 'Equal Merit Tie-breaker' : 'Qualifying Test'} Report`;
       const data = this.gatherReportData();
       downloadXLSX(
         data,