Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#2133 Additional application fields in custom report #2134

Merged
merged 7 commits into from
Oct 17, 2023
Merged

#2133 Additional application fields in custom report #2134

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
92b0094
add missing fields to custom report
HalcyonJAC Sep 12, 2023
e0b9bc2
add address and vat number to custom report
HalcyonJAC Sep 13, 2023
b3df577
add equality and diversity to custom report
HalcyonJAC Sep 14, 2023
ed31b03
show user friendly text on UI
HalcyonJAC Sep 14, 2023
9d2f2f0
tidy up
HalcyonJAC Sep 14, 2023
82abfe9
add part time work preferences to custom report
HalcyonJAC Sep 18, 2023
101a2d2
add missing fields to custom report
HalcyonJAC Sep 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 74 additions & 7 deletions src/views/Exercise/Reports/Custom.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,6 +444,7 @@ export default {
keys: [
'referenceNumber',
'personalDetails.dateOfBirth',
'personalDetails.placeOfBirth',
'personalDetails.title',
'personalDetails.citizenship',
'personalDetails.firstName',
Expand All @@ -455,14 +456,16 @@ 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',
'personalDetails.VATNumbers',
'status',
'appliedAt',
'interestedInPartTime',
'applyingUnderSchedule2d',
'canGiveReasonableLOS',
'applyingUnderSchedule2Three',
'_processing.status',
'_processing.stage',
Expand All @@ -476,6 +479,35 @@ 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: 'Part Time Working Preferences',
keys: [
'interestedInPartTime',
'partTimeWorkingPreferencesDetails',
],
},
{
name: 'Qualifications and Experience',
keys: [
Expand All @@ -492,7 +524,7 @@ export default {
],
},
{
name: 'Character Issues',
name: 'Gaps in Employment',
keys: [
'employmentGaps',
],
Expand Down Expand Up @@ -522,13 +554,22 @@ export default {
'charteredInstituteEnvironmentalHealthDate',
],
},
{
name: 'Reasonable Length of Service',
keys: [
'canGiveReasonableLOS',
'cantGiveReasonableLOSDetails',
],
},
{
name: 'Assessor',
keys: [
'firstAssessorType',
'firstAssessorEmail',
'firstAssessorTitle',
'firstAssessorFullName',
'firstAssessorPhone',
'secondAssessorType',
'secondAssessorEmail',
'secondAssessorTitle',
'secondAssessorFullName',
Expand All @@ -542,10 +583,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 },
Expand Down Expand Up @@ -573,26 +616,33 @@ 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 },
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 },
'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 },
'personalDetails.citizenship': { label: 'Citizenship', type: String },
'personalDetails.firstName': { label: 'First Name', type: String },
'personalDetails.middleNames': { label: 'Middle name(s)', type: String },
'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 },
'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 },
Expand All @@ -605,6 +655,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 },
},
};
},
Expand Down