fix: make variable names same as in constants.ts

bcgov · Feb 27, 2025 · 7e6a9f0 · 7e6a9f0
1 parent 24dda64
commit 7e6a9f0
Showing 1 changed file with 47 additions and 52 deletions.
diff --git a/frontend/src/pages/intake-form/fields.ts b/frontend/src/pages/intake-form/fields.ts
@@ -1,4 +1,5 @@
-import { Program } from '@/common';
+// common
+import { BcwsRoleInterface, Languages, PersonnelTool, Program } from '@/common';
 
 export interface ProgramFields {
   program?: Program;
@@ -11,11 +12,11 @@ export const programFields: ProgramFields = {
 // acknowledgement for selected program stream(s)
 export interface AcknowledgementEmcr {
   expectations: boolean;
-  supervisorApproval: boolean;
+  approvedBySupervisor: boolean;
 }
 
 export type AcknowledgementBcws = AcknowledgementEmcr & {
-  training: boolean;
+  orientation: boolean;
   willingnessStatement: boolean;
   parQ: boolean;
 };
@@ -24,21 +25,21 @@ export type AcknowledgementBoth = AcknowledgementEmcr & AcknowledgementBcws;
 
 export const acknowledgementEmcr: AcknowledgementEmcr = {
   expectations: false,
-  supervisorApproval: false,
+  approvedBySupervisor: false,
 };
 
 export const acknowledgementBcws: AcknowledgementBcws = {
   expectations: false,
-  supervisorApproval: false,
-  training: false,
+  approvedBySupervisor: false,
+  orientation: false,
   willingnessStatement: false,
   parQ: false,
 };
 
 export const acknowledgementBoth: AcknowledgementBoth = {
   expectations: false,
-  supervisorApproval: false,
-  training: false,
+  approvedBySupervisor: false,
+  orientation: false,
   willingnessStatement: false,
   parQ: false,
 };
@@ -66,24 +67,24 @@ export const personalDetails: PersonalDetails = {
 
 export interface EmploymentDetails {
   jobTitle: string;
-  bcGovEmployeeNumber: string;
-  bcGovEmail: string;
+  employeeId: string;
+  email: string;
   workPhone: string;
   ministry: string;
   division: string;
-  deptId: string;
-  purchaseCardHolder: string;
+  paylistId: string;
+  purchaseCardHolder: boolean;
 }
 
 export const employmentDetails: EmploymentDetails = {
   jobTitle: '',
-  bcGovEmployeeNumber: '',
-  bcGovEmail: '',
+  employeeId: '',
+  email: '',
   workPhone: '',
   ministry: '',
   division: '',
-  deptId: '',
-  purchaseCardHolder: '',
+  paylistId: '',
+  purchaseCardHolder: false,
 };
 
 // supervisor and liaison details, travel preferences
@@ -99,7 +100,7 @@ export interface LiaisonDetails {
   liaisonFirstName?: string;
   liaisonLastName?: string;
   liaisonEmail?: string;
-  liaisonPhone?: string;
+  liaisonPhoneNumber?: string;
 }
 export interface TravelDetails {
   travelPreferences: string;
@@ -117,7 +118,7 @@ export const liaisonDetails: LiaisonDetails = {
   liaisonFirstName: '',
   liaisonLastName: '',
   liaisonEmail: '',
-  liaisonPhone: '',
+  liaisonPhoneNumber: '',
 };
 
 export const travelDetails: TravelDetails = {
@@ -127,17 +128,17 @@ export const travelDetails: TravelDetails = {
 // emergency contact details
 
 export interface EmergencyContactDetails {
-  emergencyFirstName: string;
-  emergencyLastName: string;
-  emergencyPhone: string;
-  emergencyRelationship: string;
+  emergencyContactFirstName: string;
+  emergencyContactLastName: string;
+  emergencyContactPhoneNumber: string;
+  emergencyContactRelationship: string;
 }
 
 export const emergencyContactDetails: EmergencyContactDetails = {
-  emergencyFirstName: '',
-  emergencyLastName: '',
-  emergencyPhone: '',
-  emergencyRelationship: '',
+  emergencyContactFirstName: '',
+  emergencyContactLastName: '',
+  emergencyContactPhoneNumber: '',
+  emergencyContactRelationship: '',
 };
 
 // experience and section interests
@@ -160,15 +161,15 @@ export const generalEmergencyManagementExperience: GeneralEmergencyManagementExp
   };
 
 export interface SectionChoiceEmcr {
-  firstChoiceEmcr: string;
-  secondChoiceEmcr?: string;
-  thirdChoiceEmcr?: string;
+  firstChoiceFunction: string;
+  secondChoiceFunction?: string;
+  thirdChoiceFunction?: string;
 }
 
 export const sectionChoiceEmcr: SectionChoiceEmcr = {
-  firstChoiceEmcr: '',
-  secondChoiceEmcr: '',
-  thirdChoiceEmcr: '',
+  firstChoiceFunction: '',
+  secondChoiceFunction: '',
+  thirdChoiceFunction: '',
 };
 
 export interface SectionInterestEmcr {
@@ -200,30 +201,24 @@ export const sectionInterestEmcr: SectionInterestEmcr = {
 // bcws section(s) & role(s) interest
 
 export interface SectionChoiceBcws {
-  firstChoiceBcws: string;
-  secondChoiceBcws?: string;
-  thirdChoiceBcws?: string;
+  firstChoiceSection: string;
+  secondChoiceSection?: string;
+  thirdChoiceSection?: string;
 }
 
 export const sectionChoiceBcws: SectionChoiceBcws = {
-  firstChoiceBcws: '',
-  secondChoiceBcws: '',
-  thirdChoiceBcws: '',
+  firstChoiceSection: '',
+  secondChoiceSection: '',
+  thirdChoiceSection: '',
 };
 
-export interface BcwsRole {
-  id: string;
-  name: string;
-  section: string;
-}
-
 export interface SectionRolesBcws {
-  planning?: BcwsRole[];
-  logistics?: BcwsRole[];
-  finance?: BcwsRole[];
-  operations?: BcwsRole[];
-  command?: BcwsRole[];
-  aviation?: BcwsRole[];
+  planning?: BcwsRoleInterface[];
+  logistics?: BcwsRoleInterface[];
+  finance?: BcwsRoleInterface[];
+  operations?: BcwsRoleInterface[];
+  command?: BcwsRoleInterface[];
+  aviation?: BcwsRoleInterface[];
 }
 
 export const sectionRolesBcws: SectionRolesBcws = {
@@ -238,15 +233,15 @@ export const sectionRolesBcws: SectionRolesBcws = {
 // other skills & qualifications
 
 export interface LanguageSkills {
-  languages?: { language: string; proficiencyLevel: string }[];
+  languages?: Languages[];
 }
 
 export const languageSkills: LanguageSkills = {
   languages: [],
 };
 
 export interface SoftwareSkills {
-  tools?: { tool: string; proficiencyLevel: string }[];
+  tools?: PersonnelTool[];
 }
 
 export const softwareSkills: SoftwareSkills = {