From 92b0094f308370051d60aadcfb1363f1d55309e7 Mon Sep 17 00:00:00 2001 From: halcyonjac Date: Tue, 12 Sep 2023 12:19:30 +0100 Subject: [PATCH 1/7] add missing fields to custom report --- src/views/Exercise/Reports/Custom.vue | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/views/Exercise/Reports/Custom.vue b/src/views/Exercise/Reports/Custom.vue index e954ea30a..8859958ff 100644 --- a/src/views/Exercise/Reports/Custom.vue +++ b/src/views/Exercise/Reports/Custom.vue @@ -444,6 +444,7 @@ export default { keys: [ 'referenceNumber', 'personalDetails.dateOfBirth', + 'personalDetails.placeOfBirth', 'personalDetails.title', 'personalDetails.citizenship', 'personalDetails.firstName', @@ -525,10 +526,12 @@ export default { { name: 'Assessor', keys: [ + 'firstAssessorType', 'firstAssessorEmail', 'firstAssessorTitle', 'firstAssessorFullName', 'firstAssessorPhone', + 'secondAssessorType', 'secondAssessorEmail', 'secondAssessorTitle', 'secondAssessorFullName', @@ -542,10 +545,12 @@ export default { canReadAndWriteWelsh: { label: 'Can read and write Welsh?', type: Boolean }, canSpeakWelsh: { label: 'Can speak Welsh?', type: Boolean }, employmentGaps: { label: 'Employment gaps', type: 'Array of objects' }, + firstAssessorType: { label: 'First Assessor Type', type: String }, firstAssessorEmail: { label: 'First Assessor Email', type: String }, firstAssessorTitle: { label: 'First Assessor Title', type: String }, firstAssessorFullName: { label: 'First Assessor Full Name', type: String }, firstAssessorPhone: { label: 'First Assessor Phone', type: String }, + secondAssessorType: { label: 'Second Assessor Type', type: String }, secondAssessorEmail: { label: 'Second Assessor Email', type: String }, secondAssessorTitle: { label: 'Second Assessor Title', type: String }, secondAssessorFullName: { label: 'Second Assessor Full Name', type: String }, @@ -584,6 +589,7 @@ export default { 'personalDetails.email': { label: 'Email', type: String }, 'personalDetails.reasonableAdjustments': { label: 'Reasonable adjustments', type: Boolean }, 'personalDetails.dateOfBirth': { label: 'Date of birth', type: Date }, + 'personalDetails.placeOfBirth': { label: 'Place of birth', type: String }, 'personalDetails.title': { label: 'Title', type: String }, 'personalDetails.citizenship': { label: 'Citizenship', type: String }, 'personalDetails.firstName': { label: 'First Name', type: String }, @@ -591,7 +597,7 @@ export default { 'personalDetails.lastName': { label: 'Last Name', type: String }, 'personalDetails.fullName': { label: 'Full Name', type: String }, 'personalDetails.suffix': { label: 'Suffix', type: String }, - 'personalDetails.previousNames': { label: 'Previously known name(s)', type: String }, + 'personalDetails.previousNames': { label: 'Previous known name(s)', type: String }, 'personalDetails.professionalName': { label: 'Professional name', type: String }, qualifications: { label: 'Qualifications', type: 'Array of objects' }, feePaidOrSalariedJudge: { label: 'Fee paid or salaried judge?', type: Boolean }, From e0b9bc239956cde03a39ef6a389a23c5971c4692 Mon Sep 17 00:00:00 2001 From: halcyonjac Date: Wed, 13 Sep 2023 11:56:12 +0100 Subject: [PATCH 2/7] add address and vat number to custom report --- src/views/Exercise/Reports/Custom.vue | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/views/Exercise/Reports/Custom.vue b/src/views/Exercise/Reports/Custom.vue index 8859958ff..540160984 100644 --- a/src/views/Exercise/Reports/Custom.vue +++ b/src/views/Exercise/Reports/Custom.vue @@ -459,6 +459,10 @@ export default { 'personalDetails.reasonableAdjustmentsDetails', 'personalDetails.email', 'personalDetails.reasonableAdjustments', + 'personalDetails.address.current', + 'personalDetails.address.currentMoreThan5Years', + 'personalDetails.address.previous', + 'personalDetails.VATNumbers', 'status', 'appliedAt', 'interestedInPartTime', @@ -599,6 +603,10 @@ export default { 'personalDetails.suffix': { label: 'Suffix', type: String }, 'personalDetails.previousNames': { label: 'Previous known name(s)', type: String }, 'personalDetails.professionalName': { label: 'Professional name', type: String }, + 'personalDetails.address.current': { label: 'Current Address', type: String }, + 'personalDetails.address.currentMoreThan5Years': { label: 'Has lived at this address for more than 5 years', type: Boolean }, + 'personalDetails.address.previous': { label: 'Previous Addresses', type: String }, + 'personalDetails.VATNumbers': { label: 'VAT registration number', type: String }, qualifications: { label: 'Qualifications', type: 'Array of objects' }, feePaidOrSalariedJudge: { label: 'Fee paid or salaried judge?', type: Boolean }, feePaidOrSalariedSatForThirtyDays: { label: 'Fee paid or salaried sat for thirty days?', type: Boolean }, From b3df5779d4de17fb0171b582e02721250d375025 Mon Sep 17 00:00:00 2001 From: halcyonjac Date: Thu, 14 Sep 2023 10:15:03 +0100 Subject: [PATCH 3/7] add equality and diversity to custom report --- src/views/Exercise/Reports/Custom.vue | 39 +++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/src/views/Exercise/Reports/Custom.vue b/src/views/Exercise/Reports/Custom.vue index 540160984..23b3948b3 100644 --- a/src/views/Exercise/Reports/Custom.vue +++ b/src/views/Exercise/Reports/Custom.vue @@ -481,6 +481,28 @@ export default { 'canSpeakWelsh', ], }, + { + name: 'Equality and Diversity', + keys: [ + 'equalityAndDiversitySurvey.shareData', + 'equalityAndDiversitySurvey.professionalBackground', + 'equalityAndDiversitySurvey.currentLegalRole', + 'equalityAndDiversitySurvey.feePaidJudicialRole', + 'equalityAndDiversitySurvey.stateOrFeeSchool', + 'equalityAndDiversitySurvey.oxbridgeUni', + 'equalityAndDiversitySurvey.firstGenerationStudent', + 'equalityAndDiversitySurvey.ethnicGroup', + 'equalityAndDiversitySurvey.gender', + 'equalityAndDiversitySurvey.changedGender', + 'equalityAndDiversitySurvey.sexualOrientation', + 'equalityAndDiversitySurvey.disability', + 'equalityAndDiversitySurvey.disabilityDetails', + 'equalityAndDiversitySurvey.religionFaith', + 'equalityAndDiversitySurvey.attendedOutreachEvents', + 'equalityAndDiversitySurvey.participatedInJudicialWorkshadowingScheme', + 'equalityAndDiversitySurvey.hasTakenPAJE', + ], + }, { name: 'Qualifications and Experience', keys: [ @@ -619,6 +641,23 @@ export default { experienceUnderSchedule2Three: { label: 'Experience under schedule 2 three?', type: Boolean }, // jurisdictionPreferences: { label: 'Jurisdiction Preferences', type: String }, // locationPreferences: { label: 'Location Preferences', type: String }, + 'equalityAndDiversitySurvey.shareData': { label: 'Agreed to share data', type: Boolean }, + 'equalityAndDiversitySurvey.professionalBackground': { label: 'Professional background', type: String }, + 'equalityAndDiversitySurvey.currentLegalRole': { label: 'Current legal role', type: String }, + 'equalityAndDiversitySurvey.feePaidJudicialRole': { label: 'Held fee-paid judicial role', type: String }, + 'equalityAndDiversitySurvey.stateOrFeeSchool': { label: 'Attended state or fee-paying school', type: String }, + 'equalityAndDiversitySurvey.oxbridgeUni': { label: 'Attended Oxbridge universities', type: String }, + 'equalityAndDiversitySurvey.firstGenerationStudent': { label: 'First generation to go to university', type: String }, + 'equalityAndDiversitySurvey.ethnicGroup': { label: 'Ethnic group', type: String }, + 'equalityAndDiversitySurvey.gender': { label: 'Sex', type: String }, + 'equalityAndDiversitySurvey.changedGender': { label: 'Gender is the same as sex assigned at birth', type: String }, + 'equalityAndDiversitySurvey.sexualOrientation': { label: 'Sexual orientation', type: String }, + 'equalityAndDiversitySurvey.disability': { label: 'Disability', type: String }, + 'equalityAndDiversitySurvey.disabilityDetails': { label: 'Disability details', type: String }, + 'equalityAndDiversitySurvey.religionFaith': { label: 'Religion', type: String }, + 'equalityAndDiversitySurvey.attendedOutreachEvents': { label: 'Attended outreach events', type: String }, + 'equalityAndDiversitySurvey.participatedInJudicialWorkshadowingScheme': { label: 'Participated In judicial workshadowing Scheme', type: String }, + 'equalityAndDiversitySurvey.hasTakenPAJE': { label: 'Participated in Pre-Application Judicial Education Programme', type: String }, }, }; }, From ed31b034a4bcf51065384bd8e4457b4c610b71cb Mon Sep 17 00:00:00 2001 From: halcyonjac Date: Thu, 14 Sep 2023 10:15:50 +0100 Subject: [PATCH 4/7] show user friendly text on UI --- src/views/Exercise/Reports/Custom.vue | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/views/Exercise/Reports/Custom.vue b/src/views/Exercise/Reports/Custom.vue index 23b3948b3..b83c6f14a 100644 --- a/src/views/Exercise/Reports/Custom.vue +++ b/src/views/Exercise/Reports/Custom.vue @@ -298,7 +298,7 @@ :key="columnIndex" class="govuk-table__cell" > - {{ isUsingFilter(column) ? $filters.lookup(row[column]) : row[column] }} + {{ $filters.lookup(row[column]) }} @@ -844,10 +844,6 @@ export default { console.log(`${item}-key = ${i}`); return i; }, - isUsingFilter(key) { - // return true if the column is a filter column - return ['_processing.stage', '_processing.status'].includes(key); - }, }, }; From 9d2f2f0110e882b6b401baa3e70474ee7b27b5f2 Mon Sep 17 00:00:00 2001 From: halcyonjac Date: Thu, 14 Sep 2023 10:55:45 +0100 Subject: [PATCH 5/7] tidy up --- src/views/Exercise/Reports/Custom.vue | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/views/Exercise/Reports/Custom.vue b/src/views/Exercise/Reports/Custom.vue index b83c6f14a..d0041d45e 100644 --- a/src/views/Exercise/Reports/Custom.vue +++ b/src/views/Exercise/Reports/Custom.vue @@ -298,7 +298,7 @@ :key="columnIndex" class="govuk-table__cell" > - {{ $filters.lookup(row[column]) }} + {{ isUsingFilter(column) ? $filters.lookup(row[column]) : row[column] }} @@ -456,9 +456,9 @@ export default { 'personalDetails.professionalName', 'personalDetails.phone', 'personalDetails.nationalInsuranceNumber', - 'personalDetails.reasonableAdjustmentsDetails', 'personalDetails.email', 'personalDetails.reasonableAdjustments', + 'personalDetails.reasonableAdjustmentsDetails', 'personalDetails.address.current', 'personalDetails.address.currentMoreThan5Years', 'personalDetails.address.previous', @@ -611,9 +611,9 @@ export default { '_processing.stage': { label: 'Stage', type: String }, 'personalDetails.phone': { label: 'Phone', type: String }, 'personalDetails.nationalInsuranceNumber': { label: 'National insurance number', type: String }, - 'personalDetails.reasonableAdjustmentsDetails': { label: 'reasonable adjustments details', type: String }, 'personalDetails.email': { label: 'Email', type: String }, 'personalDetails.reasonableAdjustments': { label: 'Reasonable adjustments', type: Boolean }, + 'personalDetails.reasonableAdjustmentsDetails': { label: 'Reasonable adjustments details', type: String }, 'personalDetails.dateOfBirth': { label: 'Date of birth', type: Date }, 'personalDetails.placeOfBirth': { label: 'Place of birth', type: String }, 'personalDetails.title': { label: 'Title', type: String }, @@ -844,6 +844,10 @@ export default { console.log(`${item}-key = ${i}`); return i; }, + isUsingFilter(key) { + // return true if the column is a filter column + return ['_processing.stage', '_processing.status'].includes(key); + }, }, }; From 82abfe9bca9abe690feb24be177445c1e17af3b1 Mon Sep 17 00:00:00 2001 From: halcyonjac Date: Tue, 19 Sep 2023 00:59:23 +0100 Subject: [PATCH 6/7] add part time work preferences to custom report --- src/views/Exercise/Reports/Custom.vue | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/views/Exercise/Reports/Custom.vue b/src/views/Exercise/Reports/Custom.vue index d0041d45e..f027d7794 100644 --- a/src/views/Exercise/Reports/Custom.vue +++ b/src/views/Exercise/Reports/Custom.vue @@ -465,7 +465,6 @@ export default { 'personalDetails.VATNumbers', 'status', 'appliedAt', - 'interestedInPartTime', 'applyingUnderSchedule2d', 'canGiveReasonableLOS', 'applyingUnderSchedule2Three', @@ -503,6 +502,13 @@ export default { 'equalityAndDiversitySurvey.hasTakenPAJE', ], }, + { + name: 'Part Time Working Preferences', + keys: [ + 'interestedInPartTime', + 'partTimeWorkingPreferencesDetails', + ], + }, { name: 'Qualifications and Experience', keys: [ @@ -604,6 +610,7 @@ export default { status: { label: 'Application status', type: String }, appliedAt: { label: 'Application date', type: Date }, interestedInPartTime: { label: 'Interested in part time?', type: Boolean }, + partTimeWorkingPreferencesDetails: { label: 'Salaried part-time work (SPTW) - Details', type: String }, applyingUnderSchedule2d: { label: 'Applying under schedule 2d?', type: Boolean }, canGiveReasonableLOS: { label: 'Can give reasonable LOS?', type: Boolean }, applyingUnderSchedule2Three: { label: 'Applying under schedule 2 3?', type: Boolean }, From 101a2d245d33c7a04e39a6bf104a32d64c124555 Mon Sep 17 00:00:00 2001 From: halcyonjac Date: Tue, 19 Sep 2023 08:55:10 +0100 Subject: [PATCH 7/7] add missing fields to custom report --- src/views/Exercise/Reports/Custom.vue | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/views/Exercise/Reports/Custom.vue b/src/views/Exercise/Reports/Custom.vue index f027d7794..9d8963bb6 100644 --- a/src/views/Exercise/Reports/Custom.vue +++ b/src/views/Exercise/Reports/Custom.vue @@ -466,7 +466,6 @@ export default { 'status', 'appliedAt', 'applyingUnderSchedule2d', - 'canGiveReasonableLOS', 'applyingUnderSchedule2Three', '_processing.status', '_processing.stage', @@ -525,7 +524,7 @@ export default { ], }, { - name: 'Character Issues', + name: 'Gaps in Employment', keys: [ 'employmentGaps', ], @@ -555,6 +554,13 @@ export default { 'charteredInstituteEnvironmentalHealthDate', ], }, + { + name: 'Reasonable Length of Service', + keys: [ + 'canGiveReasonableLOS', + 'cantGiveReasonableLOSDetails', + ], + }, { name: 'Assessor', keys: [ @@ -612,7 +618,8 @@ export default { interestedInPartTime: { label: 'Interested in part time?', type: Boolean }, partTimeWorkingPreferencesDetails: { label: 'Salaried part-time work (SPTW) - Details', type: String }, applyingUnderSchedule2d: { label: 'Applying under schedule 2d?', type: Boolean }, - canGiveReasonableLOS: { label: 'Can give reasonable LOS?', type: Boolean }, + canGiveReasonableLOS: { label: 'Can work a reasonable length of service', type: Boolean }, + cantGiveReasonableLOSDetails: { label: 'Can work a reasonable length of service (details)', type: String }, applyingUnderSchedule2Three: { label: 'Applying under schedule 2 3?', type: Boolean }, '_processing.status': { label: 'Status (admin)', type: String }, '_processing.stage': { label: 'Stage', type: String },