From 41c383dc0666655132cf07463622b32ad965c330 Mon Sep 17 00:00:00 2001
From: HalyconJAC <halcyon@judicialappointments.digital>
Date: Fri, 26 Mar 2021 17:20:16 +0000
Subject: [PATCH 1/3] Bug Fix - Reasonable Adjustments Report - on-screen data
 sometimes does not match download

---
 .../Show/Reports/ReasonableAdjustments.vue    | 29 +++++++++----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/views/Exercises/Show/Reports/ReasonableAdjustments.vue b/src/views/Exercises/Show/Reports/ReasonableAdjustments.vue
index 6c9566d7b..88c58f06d 100644
--- a/src/views/Exercises/Show/Reports/ReasonableAdjustments.vue
+++ b/src/views/Exercises/Show/Reports/ReasonableAdjustments.vue
@@ -34,14 +34,16 @@
       </div>
     </div>
 
-    <div class="govuk-grid-row">
+    <div
+      v-if="report != null"
+      class="govuk-grid-row">
       <div class="govuk-grid-column-one-half">
         <div class="panel govuk-!-margin-bottom-9">
           <span class="govuk-caption-m">
             Total applications
           </span>
           <h2 class="govuk-heading-m govuk-!-margin-bottom-0">
-            {{ reasonableAdjustments.totalCount }}
+            {{ report.totalApplications }}
           </h2>
         </div>
       </div>
@@ -51,14 +53,14 @@
             Reasonable adjustments requests
           </span>
           <h2 class="govuk-heading-m govuk-!-margin-bottom-0">
-            {{ reasonableAdjustments.candidates.length }}
+            {{ report.rows.length }}
           </h2>
         </div>
       </div>
     </div>
 
     <div
-      v-if="reasonableAdjustments.candidates.length"
+      v-if="report != null && report.rows.length"
       class="govuk-grid-column-full"
     >
       <table class="govuk-table">
@@ -92,27 +94,27 @@
         </thead>
         <tbody class="govuk-table__body">
           <tr
-            v-for="candidate in reasonableAdjustments.candidates"
-            :key="candidate.userId"
+            v-for="row in report.rows"
+            :key="row.name + Math.random()"
             class="govuk-table__row"
           >
             <td class="govuk-table__cell">
-              {{ candidate.name }}
+              {{ row.name }}
             </td>
             <td class="govuk-table__cell">
               <a
-                :href="`mailto:${candidate.email}`"
+                :href="`mailto:${row.email}`"
                 class="govuk-link govuk-link--no-visited-state"
                 target="_blank"
               >
-                {{ candidate.email }}
+                {{ row.email }}
               </a>
             </td>
             <td class="govuk-table__cell govuk-table__cell--numeric">
-              {{ candidate.phone }}
+              {{ row.phone }}
             </td>
             <td class="govuk-table__cell">
-              {{ candidate.adjustmentsDetails }}
+              {{ row.details }}
             </td>
           </tr>
         </tbody>
@@ -122,7 +124,7 @@
 </template>
 
 <script>
-import { mapState, mapGetters } from 'vuex';
+import { mapState } from 'vuex';
 import { firestore, functions } from '@/firebase';
 import vuexfireSerialize from '@jac-uk/jac-kit/helpers/vuexfireSerialize';
 import { downloadXLSX } from '@jac-uk/jac-kit/helpers/export';
@@ -138,9 +140,6 @@ export default {
     ...mapState({
       exercise: state => state.exerciseDocument.record,
     }),
-    ...mapGetters('applications', [
-      'reasonableAdjustments',
-    ]),
   },
   created() {
     this.$store.dispatch('applications/bind', { exerciseId: this.exercise.id, status: 'applied' });

From ea8b9d1fec8a63592f340e28d8cfa7fd659e0bbd Mon Sep 17 00:00:00 2001
From: HalyconJAC <halcyon@judicialappointments.digital>
Date: Mon, 29 Mar 2021 10:40:46 +0100
Subject: [PATCH 2/3] Handover Report - now displays report data instead of
 loading it from the database

---
 src/views/Exercises/Show/Reports/Handover.vue | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/views/Exercises/Show/Reports/Handover.vue b/src/views/Exercises/Show/Reports/Handover.vue
index de2678a95..3a6921b9a 100644
--- a/src/views/Exercises/Show/Reports/Handover.vue
+++ b/src/views/Exercises/Show/Reports/Handover.vue
@@ -63,8 +63,9 @@
     </div>
 
     <Table
+      v-if="report != null"
       data-key="id"
-      :data="applicationRecords"
+      :data="report.rows"
       :columns="tableColumns"
       :page-size="1000"
       @change="getTableData"
@@ -72,16 +73,16 @@
       <template #row="{row}">
         <TableCell :title="tableColumns[0].title">
           <RouterLink
-            :to="{ name: 'exercise-application', params: { applicationId: row.id } }"
+            :to="{ name: 'exercise-application', params: { applicationId: row.applicationId } }"
           >
-            {{ row.application.referenceNumber }}
+            {{ row.referenceNumber }}
           </RouterLink>
         </TableCell>
         <TableCell :title="tableColumns[1].title">
           <RouterLink
-            :to="{ name: 'candidates-view', params: { id: row.candidate.id } }"
+            :to="{ name: 'candidates-view', params: { id: row.candidateId } }"
           >
-            {{ row.candidate.fullName }}
+            {{ row.fullName }}
           </RouterLink>
         </TableCell>
       </template>
@@ -121,14 +122,12 @@ export default {
   computed: {
     ...mapState({
       exercise: state => state.exerciseDocument.record,
-      applications: state => state.applications.records,
-      applicationRecords: state => state.stageHandover.records,
     }),
     exerciseType() {
       return this.exercise.typeOfExercise;
     },
     totalApplicationRecords() {
-      return (this.exercise && this.exercise.applicationRecords && this.exercise.applicationRecords.handover) ? this.exercise.applicationRecords.handover : 0;
+      return this.report ? this.report.totalApplications : 0;
     },
   },
   created() {

From 612a4ffcae6746baef3fc33a3c1a3882fcead0d6 Mon Sep 17 00:00:00 2001
From: HalyconJAC <halcyon@judicialappointments.digital>
Date: Wed, 7 Apr 2021 13:27:26 +0100
Subject: [PATCH 3/3] removed redundant unit test

---
 .../Reports/ReasonableAdjustments.spec.js     | 22 +------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/tests/unit/views/Exercises/Show/Reports/ReasonableAdjustments.spec.js b/tests/unit/views/Exercises/Show/Reports/ReasonableAdjustments.spec.js
index a5f0cb9a5..c3ea64ae9 100644
--- a/tests/unit/views/Exercises/Show/Reports/ReasonableAdjustments.spec.js
+++ b/tests/unit/views/Exercises/Show/Reports/ReasonableAdjustments.spec.js
@@ -19,19 +19,6 @@ const mockExercise = {
   applicationCloseDate: 'TestClose',
 };
 
-const mockReport = {
-  totalCount: 3,
-  candidates: [
-    {
-      userId: '234',
-      name: 'mock name 2',
-      email: 'email2@somewhere.com',
-      requiresAdjustments: true,
-      adjustmentsDetails: 'Indexs sunt quadras de barbatus animalis.',
-    }],
-};
-
-const reasonableAdjustmentsGetter = jest.fn().mockReturnValue(mockReport);
 const store = new Vuex.Store({
   modules: {
     applications: {
@@ -42,9 +29,6 @@ const store = new Vuex.Store({
       state: {
         records: [],
       },
-      getters: {
-        reasonableAdjustments: reasonableAdjustmentsGetter,
-      },
     },
     exerciseDocument: {
       namespaced: true,
@@ -89,11 +73,7 @@ describe('@/views/Exercises/Show/Reports/ReasonableAdjustments', () => {
         expect(wrapper.vm.exercise).toEqual(mockExercise);
       });
     });
-    describe('reasonableAdjustments', () => {
-      it('returns generated report object', () => {
-        expect(wrapper.vm.reasonableAdjustments).toEqual(mockReport);
-      });
-    });
+
   });
   describe('methods', () => {
     describe('exportData()', () => {