#1160 Handover Report. Fix column order.

jac-uk · Feb 13, 2021 · 8112b09 · 8112b09
1 parent d5c677f
commit 8112b09
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "apply-admin",
-  "version": "0.55.0",
+  "version": "0.55.1",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve --mode develop",

diff --git a/release-notes.md b/release-notes.md
@@ -1,5 +1,9 @@
 # Release Notes #
 
+0.55.1
+1 issue / 2sp
+ #1160 Handover Report. Fix column order
+
 0.55.0
 7 issues / 16sp
  #1130 Create Panel

diff --git a/src/views/Exercises/Show/Reports/Handover.vue b/src/views/Exercises/Show/Reports/Handover.vue
@@ -49,7 +49,7 @@
       data-key="id"
       :data="applicationRecords"
       :columns="tableColumns"
-      :page-size="50"
+      :page-size="1000"
       @change="getTableData"
     >
       <template #row="{row}">
@@ -87,8 +87,6 @@ export default {
   },
   data() {
     return {
-      page: 1,
-      pageSize: 25,
       tableColumns: [
         {
           title: 'Reference number',
@@ -108,7 +106,7 @@ export default {
       return this.exercise.typeOfExercise;
     },
     totalApplicationRecords() {
-      return this.applicationRecords.length;
+      return (this.exercise && this.exercise.applicationRecords && this.exercise.applicationRecords.handover) ? this.exercise.applicationRecords.handover : 0;
     },
   },
   methods: {
@@ -167,16 +165,16 @@ export default {
       }
 
       const formattedDiversityData = [
-        survey.shareData,
+        filters.toYesNo(survey.shareData),
         share(survey.professionalBackground.map(position => filters.lookup(position)).join(', ')),
         formattedFeePaidJudicialRole,
         share(filters.lookup(survey.stateOrFeeSchool)),
         share(filters.toYesNo(filters.lookup(survey.firstGenerationStudent))),
+        share(filters.lookup(survey.ethnicGroup)),
         share(filters.lookup(survey.gender)),
         share(filters.lookup(survey.sexualOrientation)),
-        share(filters.lookup(survey.ethnicGroup)),
-        share(filters.lookup(survey.religionFaith)),
         share(survey.disability ? survey.disabilityDetails : filters.toYesNo(survey.disability)),
+        share(filters.lookup(survey.religionFaith)),
         share(filters.toYesNo(filters.lookup(survey.attendedOutreachEvents))),
       ];
 
@@ -248,7 +246,7 @@ export default {
           professionalMemberships,
         ];
       } else {
-        return [];
+        return [''];
       }
     },
     gatherReportData() {
@@ -300,6 +298,9 @@ export default {
           'non-legal': [
             'JAC Presentation',
           ],
+          'leadership-non-legal': [
+            'JAC Presentation',
+          ],
           leadership: [
             'JAC Presentation',
             'Judicial workshadowing',