From b720941ed795eb1eb87d297c68a925eaa244df57 Mon Sep 17 00:00:00 2001
From: halcyonjac <halcyon@judicialappointments.digital>
Date: Wed, 2 Oct 2024 11:44:45 +0100
Subject: [PATCH] add changes from other PR

---
 src/filters.js                                 | 12 +++++++++++-
 src/helpers/constants.js                       | 12 ++++++++++++
 src/views/Exercise/Reports/CharacterIssues.vue | 12 +++++++++---
 3 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/src/filters.js b/src/filters.js
index 6e1ca5e12..e0eeb5c44 100644
--- a/src/filters.js
+++ b/src/filters.js
@@ -1,5 +1,5 @@
 import * as filters from '@jac-uk/jac-kit/filters/filters';
-import { ADVERT_TYPES, EXERCISE_STAGE, APPLICATION_STATUS, TASK_TYPE, OFFENCE_CATEGORY, GUIDANCE_REFERENCE, INDEPENDENT_ASSESSMENTS_STATUS, ASSESSOR_TYPES, ASSESSMENT_METHOD, APPLICATION_FORM_PARTS, WORKING_BASIS } from '@/helpers/constants';
+import { ADVERT_TYPES, EXERCISE_STAGE, APPLICATION_STATUS, TASK_TYPE, OFFENCE_CATEGORY, GUIDANCE_REFERENCE, GUIDANCE_REFERENCE_V2, INDEPENDENT_ASSESSMENTS_STATUS, ASSESSOR_TYPES, ASSESSMENT_METHOD, APPLICATION_FORM_PARTS, WORKING_BASIS } from '@/helpers/constants';
 
 const lookup = (value) => {
   let returnValue;
@@ -293,6 +293,7 @@ const lookup = (value) => {
   lookup[OFFENCE_CATEGORY.MIXED] = 'Mixed';
 
   // character issues guide reference
+  // V1
   lookup[GUIDANCE_REFERENCE.CRIMINAL_OFFENCES] = 'Criminal offences: paras 21-24';
   lookup[GUIDANCE_REFERENCE.MOTERING_OFFENCES] = 'Motoring offences: paras 25-30';
   lookup[GUIDANCE_REFERENCE.FIXED_PENALTY_NOTICES] = 'Fixed penalty notices: paras 31-34';
@@ -300,6 +301,15 @@ const lookup = (value) => {
   lookup[GUIDANCE_REFERENCE.FINANCIAL_VAT_TAX] = 'Financial VAT and Tax: paras 39-43';
   lookup[GUIDANCE_REFERENCE.PROFESSIONAL_CONDUCT] = 'Professional conduct: paras 44-57';
   lookup[GUIDANCE_REFERENCE.FURTHER_DISCLOSURES] = 'Further disclosures: paras 58-65';
+  // V2
+  lookup[GUIDANCE_REFERENCE_V2.CRIMINAL_OFFENCES] = 'Criminal offences: paras 15-17';
+  lookup[GUIDANCE_REFERENCE_V2.MOTERING_OFFENCES] = 'Motoring offences: paras 18-23';
+  lookup[GUIDANCE_REFERENCE_V2.FIXED_PENALTY_NOTICES] = 'Fixed penalty notices: paras 24-26';
+  lookup[GUIDANCE_REFERENCE_V2.FINANCIAL_INSOLVENCY_DEBT] = 'Financial insolvency and debt: paras 28-32';
+  lookup[GUIDANCE_REFERENCE_V2.FINANCIAL_VAT_TAX] = 'Financial VAT and Tax: paras 33-38';
+  lookup[GUIDANCE_REFERENCE_V2.PROFESSIONAL_CONDUCT] = 'Professional conduct: paras 39-51';
+  lookup[GUIDANCE_REFERENCE_V2.CIVIL_PROCEEDINGS] = 'Civil proceedings: paras 52-53';
+  lookup[GUIDANCE_REFERENCE_V2.FURTHER_DISCLOSURES] = 'Further disclosures: paras 56-60';
 
   // assessment methods
   lookup[ASSESSMENT_METHOD.SELF_ASSESSMENT_WITH_COMPETENCIES] = 'Self Assessment with competencies';
diff --git a/src/helpers/constants.js b/src/helpers/constants.js
index 0fb22ec8d..e54fde3b4 100644
--- a/src/helpers/constants.js
+++ b/src/helpers/constants.js
@@ -187,6 +187,17 @@ const GUIDANCE_REFERENCE = {
   PROFESSIONAL_CONDUCT: 'professionalConduct',
   FURTHER_DISCLOSURES: 'furtherDisclosures',
 };
+// for exercises launched after 15/10/2024
+const GUIDANCE_REFERENCE_V2 = {
+  CRIMINAL_OFFENCES: 'criminalOffencesV2',
+  MOTERING_OFFENCES: 'moteringOffencesV2',
+  FIXED_PENALTY_NOTICES: 'fixedPenaltyNoticesV2',
+  FINANCIAL_INSOLVENCY_DEBT: 'financialInsolvencyDebtV2',
+  FINANCIAL_VAT_TAX: 'financialVatTaxV2',
+  PROFESSIONAL_CONDUCT: 'professionalConductV2',
+  CIVIL_PROCEEDINGS: 'civilProceedingsV2',
+  FURTHER_DISCLOSURES: 'furtherDisclosuresV2',
+};
 
 const TASK_QT_MAP = {};
 TASK_QT_MAP[TASK_TYPE.CRITICAL_ANALYSIS] = QUALIFYING_TEST.TYPE.CRITICAL_ANALYSIS;
@@ -276,6 +287,7 @@ export {
   ASSESSOR_TYPES,
   OFFENCE_CATEGORY,
   GUIDANCE_REFERENCE,
+  GUIDANCE_REFERENCE_V2,
   ASSESSMENT_METHOD,
   APPLICATION_FORM_PARTS,
   DEFAULT_WORD_COUNT,
diff --git a/src/views/Exercise/Reports/CharacterIssues.vue b/src/views/Exercise/Reports/CharacterIssues.vue
index 58f474b08..140035e93 100644
--- a/src/views/Exercise/Reports/CharacterIssues.vue
+++ b/src/views/Exercise/Reports/CharacterIssues.vue
@@ -444,7 +444,7 @@
 
               <div class="govuk-grid-column-full">
                 <h4 class="govuk-!-margin-top-0 govuk-!-margin-bottom-1">
-                  Guidance reference
+                  Guidance reference {{ applicationOpenDatePost15102024 ? '2024' : '2020' }}
                 </h4>
                 <CheckboxGroup
                   id="guidance-reference"
@@ -532,6 +532,7 @@
 import { httpsCallable } from '@firebase/functions';
 import { query, collection, doc, onSnapshot, where, getDocs } from '@firebase/firestore';
 import { firestore, functions } from '@/firebase';
+import { mapGetters } from 'vuex';
 import vuexfireSerialize from '@jac-uk/jac-kit/helpers/vuexfireSerialize';
 import Table from '@jac-uk/jac-kit/components/Table/Table.vue';
 import TableCell from '@jac-uk/jac-kit/components/Table/TableCell.vue';
@@ -540,7 +541,7 @@ import { tableAsyncQuery } from '@jac-uk/jac-kit/components/Table/tableQuery';
 import { downloadXLSX } from '@jac-uk/jac-kit/helpers/export';
 import Select from '@jac-uk/jac-kit/draftComponents/Form/Select.vue';
 import permissionMixin from '@/permissionMixin';
-import { EXERCISE_STAGE, OFFENCE_CATEGORY, GUIDANCE_REFERENCE, APPLICATION_STATUS } from '@/helpers/constants';
+import { EXERCISE_STAGE, OFFENCE_CATEGORY, GUIDANCE_REFERENCE, GUIDANCE_REFERENCE_V2, APPLICATION_STATUS } from '@/helpers/constants';
 import ActionButton from '@jac-uk/jac-kit/draftComponents/ActionButton.vue';
 import { downloadBase64File } from '@/helpers/file';
 import CheckboxGroup from '@jac-uk/jac-kit/draftComponents/Form/CheckboxGroup.vue';
@@ -577,11 +578,16 @@ export default {
       otherApplicationRecords: [], // used to store other application records for the same candidate (format: "[ { candidateId: '', otherRecords: [] }")
       open: [],
       offenceCategory: OFFENCE_CATEGORY,
-      guidanceReference: GUIDANCE_REFERENCE,
       editMode: false,
     };
   },
   computed: {
+    ...mapGetters({
+      applicationOpenDatePost15102024: 'exerciseDocument/applicationOpenDatePost15102024',
+    }),
+    guidanceReference() {
+      return this.applicationOpenDatePost15102024 ? GUIDANCE_REFERENCE_V2 : GUIDANCE_REFERENCE;
+    },
     exercise() {
       return this.$store.state.exerciseDocument.record;
     },