Skip to content

Commit

Permalink
Update field names of new fields used in a brand new 2024 PRF submission
Browse files Browse the repository at this point in the history
  • Loading branch information
@courtneymyers
courtneymyers committed Nov 7, 2024
1 parent c1eb1c2 commit 0f5c114
Show file tree
Hide file tree
Showing 2 changed files with 80 additions and 74 deletions.
77 changes: 39 additions & 38 deletions app/client/src/types.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@ type FormioFRF2024Data = {
type FormioPRF2024Data = {
[field: string]: unknown;
// fields injected upon a new draft PRF submission creation:
_application_form_modified: string;
_frf_modified: string;
_bap_entity_combo_key: string;
_bap_rebate_id: string;
_user_email: string;
Expand Down Expand Up @@ -546,60 +546,61 @@ type FormioPRF2024Data = {
_bap_district_contact_email: string;
_bap_district_contact_phone: string;
org_organizations: {
_bap_org_frf: boolean;
org_number: number;
org_type: {
existingBusOwner: boolean;
newBusOwner: boolean;
privateFleet: boolean;
existing_bus_owner: boolean;
new_bus_owner: boolean;
private_fleet: boolean;
};
_org_id: string;
org_name: string;
_org_contact_id: string;
org_contact_fname: string;
org_contact_lname: string;
org_contact_title: string;
org_contact_email: string;
org_contact_phone: string;
org_address_1: string;
org_address_2: string;
org_county: string;
org_city: string;
org_state: { name: string };
org_zip: string;
_bap_org_id: string;
_bap_org_name: string;
_bap_org_contact_id: string;
_bap_org_contact_fname: string;
_bap_org_contact_lname: string;
_bap_org_contact_title: string;
_bap_org_contact_email: string;
_bap_org_contact_phone: string;
_bap_org_address_1: string;
_bap_org_address_2: string;
_bap_org_county: string;
_bap_org_city: string;
_bap_org_state: { name: string };
_bap_org_zip: string;
}[];
bus_buses: {
bus_busNumber: number;
bus_existingOwner: {
bus_number: number;
bus_existing_owner: {
org_id: string;
org_name: string;
org_contact_id: string;
org_contact_fname: string;
org_contact_lname: string;
};
bus_existingVin: string;
bus_existingFuelType: string;
bus_existingGvwr: number;
bus_existingOdometer: number;
bus_existingModel: string;
bus_existingModelYear: string;
bus_existingNcesId: string;
bus_existingManufacturer: string;
bus_existingManufacturerOther: string | null;
bus_existingAnnualFuelConsumption: number;
bus_existingAnnualMileage: number;
bus_existingRemainingLife: number;
bus_existingIdlingHours: number;
bus_newOwner: {
bus_existing_vin: string;
bus_existing_fuel_type: string;
bus_existing_gvwr: number;
bus_existing_odometer: number;
bus_existing_model: string;
bus_existing_model_year: string;
bus_existing_nces_id: string;
bus_existing_manufacturer: string;
bus_existing_manufacturer_other: string | null;
bus_existing_annual_fuel_consumption: number;
bus_existing_annual_mileage: number;
bus_existing_remaining_life: number;
bus_existing_idling_hours: number;
bus_new_owner: {
org_id: string;
org_name: string;
org_contact_id: string;
org_contact_fname: string;
org_contact_lname: string;
};
bus_newFuelType: string;
bus_newGvwr: number;
_bus_maxRebate: number;
_bus_newADAfromFRF: boolean;
bus_new_fuel_type: string;
bus_new_gvwr: number;
_bus_new_max_rebate: number;
_bus_new_ada_from_frf: boolean;
}[];
};

Expand Down
77 changes: 41 additions & 36 deletions app/server/app/utilities/formio.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -573,22 +573,27 @@ function fetchDataForPRFSubmission({ rebateYear, req, res }) {
).split("\n");

array.push({
_bap_org_frf: true,
org_number: jsonOrg.org_number,
org_type: jsonOrg.org_type,
_org_id: orgId,
org_name: orgName,
_org_contact_id: contactId,
org_contact_fname: FirstName,
org_contact_lname: LastName,
org_contact_title: Title,
org_contact_email: Email,
org_contact_phone: Phone,
org_address_1: orgStreetAddress1,
org_address_2: orgStreetAddress2,
org_county: County__c,
org_city: BillingCity,
org_state: { name: BillingState },
org_zip: BillingPostalCode,
org_type: {
existing_bus_owner: jsonOrg.org_type.existingBusOwner,
new_bus_owner: jsonOrg.org_type.newBusOwner,
private_fleet: jsonOrg.org_type.privateFleet,
},
_bap_org_id: orgId,
_bap_org_name: orgName,
_bap_org_contact_id: contactId,
_bap_org_contact_fname: FirstName,
_bap_org_contact_lname: LastName,
_bap_org_contact_title: Title,
_bap_org_contact_email: Email,
_bap_org_contact_phone: Phone,
_bap_org_address_1: orgStreetAddress1,
_bap_org_address_2: orgStreetAddress2,
_bap_org_county: County__c,
_bap_org_city: BillingCity,
_bap_org_state: { name: BillingState },
_bap_org_zip: BillingPostalCode,
});
}

Expand Down Expand Up @@ -633,44 +638,44 @@ function fetchDataForPRFSubmission({ rebateYear, req, res }) {
);

return {
bus_busNumber: Rebate_Item_num__c,
bus_existingOwner: {
bus_number: Rebate_Item_num__c,
bus_existing_owner: {
org_id: existingOwnerRecord?.Contact__r?.Account?.Id,
org_name: existingOwnerRecord?.Contact__r?.Account?.Name,
org_contact_id: existingOwnerRecord?.Contact__r?.Id,
org_contact_fname: existingOwnerRecord?.Contact__r?.FirstName,
org_contact_lname: existingOwnerRecord?.Contact__r?.LastName,
},
bus_existingVin: CSB_VIN__c,
bus_existingFuelType: CSB_Fuel_Type__c,
bus_existingGvwr: CSB_GVWR__c,
bus_existingOdometer: Old_Bus_Odometer_miles__c,
bus_existingModel: CSB_Model__c,
bus_existingModelYear: CSB_Model_Year__c,
bus_existingNcesId: Old_Bus_NCES_District_ID__c,
bus_existingManufacturer: CSB_Manufacturer__c,
bus_existingManufacturerOther: CSB_Manufacturer_if_Other__c,
bus_existingAnnualFuelConsumption: CSB_Annual_Fuel_Consumption__c,
bus_existingAnnualMileage: Annual_Mileage__c,
bus_existingRemainingLife: Old_Bus_Estimated_Remaining_Life__c,
bus_existingIdlingHours: Old_Bus_Annual_Idling_Hours__c,
bus_newOwner: {
bus_existing_vin: CSB_VIN__c,
bus_existing_fuel_type: CSB_Fuel_Type__c,
bus_existing_gvwr: CSB_GVWR__c,
bus_existing_odometer: Old_Bus_Odometer_miles__c,
bus_existing_model: CSB_Model__c,
bus_existing_model_year: CSB_Model_Year__c,
bus_existing_nces_id: Old_Bus_NCES_District_ID__c,
bus_existing_manufacturer: CSB_Manufacturer__c,
bus_existing_manufacturer_other: CSB_Manufacturer_if_Other__c,
bus_existing_annual_fuel_consumption: CSB_Annual_Fuel_Consumption__c, // prettier-ignore
bus_existing_annual_mileage: Annual_Mileage__c,
bus_existing_remaining_life: Old_Bus_Estimated_Remaining_Life__c,
bus_existing_idling_hours: Old_Bus_Annual_Idling_Hours__c,
bus_new_owner: {
org_id: newOwnerRecord?.Contact__r?.Account?.Id,
org_name: newOwnerRecord?.Contact__r?.Account?.Name,
org_contact_id: newOwnerRecord?.Contact__r?.Id,
org_contact_fname: newOwnerRecord?.Contact__r?.FirstName,
org_contact_lname: newOwnerRecord?.Contact__r?.LastName,
},
bus_newFuelType: New_Bus_Fuel_Type__c,
bus_newGvwr: New_Bus_GVWR__c,
_bus_maxRebate: New_Bus_Infra_Rebate_Requested__c,
_bus_newADAfromFRF: New_Bus_ADA_Compliant__c,
bus_new_fuel_type: New_Bus_Fuel_Type__c,
bus_new_gvwr: New_Bus_GVWR__c,
_bus_new_max_rebate: New_Bus_Infra_Rebate_Requested__c,
_bus_new_ada_from_frf: New_Bus_ADA_Compliant__c,
};
});

return {
data: {
_application_form_modified: frfModified,
_frf_modified: frfModified,
_bap_entity_combo_key: comboKey,
_bap_rebate_id: rebateId,
_user_email: email,
Expand Down

0 comments on commit 0f5c114

Please sign in to comment.