diff --git a/Server/HetsApi/HetsApi.csproj b/Server/HetsApi/HetsApi.csproj index e63d45fc9..637bc385b 100644 --- a/Server/HetsApi/HetsApi.csproj +++ b/Server/HetsApi/HetsApi.csproj @@ -12,7 +12,7 @@ 1.0.0.0 sprint1 - 1.10.13.0 + 1.10.14.0 diff --git a/Server/HetsApi/appsettings.json b/Server/HetsApi/appsettings.json index 64f7210d4..67cf0fdf5 100644 --- a/Server/HetsApi/appsettings.json +++ b/Server/HetsApi/appsettings.json @@ -13,7 +13,7 @@ "LogoffUrl-Training": "https://logontest.gov.bc.ca/clp-cgi/logoff.cgi?returl=https://trn-hets.th.gov.bc.ca&retnow=1", "LogoffUrl-UAT": "https://logontest.gov.bc.ca/clp-cgi/logoff.cgi?returl=https://uat-hets.th.gov.bc.ca&retnow=1", "LogoffUrl-Production": "https://logon.gov.bc.ca/clp-cgi/logoff.cgi?returl=https://hets.th.gov.bc.ca&retnow=1", - "Version-Application": "Release 1.10.13.0", + "Version-Application": "Release 1.10.14.0", "Version-Database": "Release 1.10.10.0", "Maximum-Blank-Agreements": "3", "ExceptionDescriptions": { diff --git a/Server/HetsData/Repositories/OwnerRepository.cs b/Server/HetsData/Repositories/OwnerRepository.cs index d7f185be4..6a067ff33 100644 --- a/Server/HetsData/Repositories/OwnerRepository.cs +++ b/Server/HetsData/Repositories/OwnerRepository.cs @@ -201,6 +201,8 @@ public OwnerVerificationReportModel GetOwnerVerificationLetterData( // get address and contact info string address = ownerList[0].LocalArea.ServiceArea.Address; + address = address.Replace("Ministry of Transportation and Infrastructure", "Ministry of Transportation and Transit"); + if (!string.IsNullOrEmpty(address)) { address = address.Replace(" ", " "); diff --git a/Server/HetsImport/Import/Mapping.txt b/Server/HetsImport/Import/Mapping.txt index 26062129f..872e1149d 100644 --- a/Server/HetsImport/Import/Mapping.txt +++ b/Server/HetsImport/Import/Mapping.txt @@ -159,7 +159,7 @@ Mapping from XML files to the HETS_Database in PostGreSQL: South Island CA 1 2016 -
Ministry of Transportation and Infrastructure|Saanich Area Office|Suite 240 4460 Chatterton Way|Victoria, B.C.|V8X 5J2
+
Ministry of Transportation and Transit|Saanich Area Office|Suite 240 4460 Chatterton Way|Victoria, B.C.|V8X 5J2
(250) 952-4515 (250) 952-4508 Proof of Ownership (e.g., Copy of current Vehicle Registration, Lease to Purchase Agreement, Bill of Sale, Insurance Documents)|WCB Registration Number diff --git a/Server/HetsReport/Templates/OwnerVerification-Template.docx b/Server/HetsReport/Templates/OwnerVerification-Template.docx index f326683c9..858e47d07 100644 Binary files a/Server/HetsReport/Templates/OwnerVerification-Template.docx and b/Server/HetsReport/Templates/OwnerVerification-Template.docx differ diff --git a/Server/HetsReport/Templates/RentalAgreement-Template.docx b/Server/HetsReport/Templates/RentalAgreement-Template.docx index b31b144a9..fa55f1064 100644 Binary files a/Server/HetsReport/Templates/RentalAgreement-Template.docx and b/Server/HetsReport/Templates/RentalAgreement-Template.docx differ diff --git a/client/src/js/mock/api/getServiceAreas.js b/client/src/js/mock/api/getServiceAreas.js index 0631925d9..05518eda1 100644 --- a/client/src/js/mock/api/getServiceAreas.js +++ b/client/src/js/mock/api/getServiceAreas.js @@ -7,7 +7,7 @@ export const getServiceAreas = () => ({ ministryServiceAreaId: 1, fiscalStartDate: "2018-04-01T00:00:00Z", fiscalEndDate: "2019-03-31T00:00:00Z", - address: "Ministry of Transportation and Infrastructure|District 1|#101 - 10001 101st Ave|District 1, B.C.|V1A 1M1", + address: "Ministry of Transportation and Transit|District 1|#101 - 10001 101st Ave|District 1, B.C.|V1A 1M1", phone: "(250) 456-7890", fax: "(250) 456-7891", supportingDocuments: "Document 1|Document 2", @@ -40,7 +40,7 @@ export const getServiceAreas = () => ({ ministryServiceAreaId: 2, fiscalStartDate: "2018-04-01T00:00:00Z", fiscalEndDate: "2019-03-31T00:00:00Z", - address: "Ministry of Transportation and Infrastructure|District 1|#102 - 10001 101st Ave|District 1, B.C.|V1A 1M2", + address: "Ministry of Transportation and Transit|District 1|#102 - 10001 101st Ave|District 1, B.C.|V1A 1M2", phone: "(250) 456-7892", fax: "(250) 456-7893", supportingDocuments: "Document 1|Document 2", @@ -73,7 +73,7 @@ export const getServiceAreas = () => ({ ministryServiceAreaId: 3, fiscalStartDate: "2018-04-01T00:00:00Z", fiscalEndDate: "2019-03-31T00:00:00Z", - address: "Ministry of Transportation and Infrastructure|District 1|#103 - 10001 101st Ave|District 1, B.C.|V1A 1M3", + address: "Ministry of Transportation and Transit|District 1|#103 - 10001 101st Ave|District 1, B.C.|V1A 1M3", phone: "(250) 456-7894", fax: "(250) 456-7895", supportingDocuments: "Document 1|Document 2", @@ -106,7 +106,7 @@ export const getServiceAreas = () => ({ ministryServiceAreaId: 4, fiscalStartDate: "2018-04-01T00:00:00Z", fiscalEndDate: "2019-03-31T00:00:00Z", - address: "Ministry of Transportation and Infrastructure|District 1|#104 - 10001 101st Ave|District 1, B.C.|V1A 1M4", + address: "Ministry of Transportation and Transit|District 1|#104 - 10001 101st Ave|District 1, B.C.|V1A 1M4", phone: "(250) 456-7896", fax: "(250) 456-7897", supportingDocuments: "Document 1|Document 2", @@ -139,7 +139,7 @@ export const getServiceAreas = () => ({ ministryServiceAreaId: 5, fiscalStartDate: "2018-04-01T00:00:00Z", fiscalEndDate: "2019-03-31T00:00:00Z", - address: "Ministry of Transportation and Infrastructure|District 2|#205 - 20001 201st Ave|District 2, B.C.|V2A 1N5", + address: "Ministry of Transportation and Transit|District 2|#205 - 20001 201st Ave|District 2, B.C.|V2A 1N5", phone: "(250) 456-7898", fax: "(250) 456-7899", supportingDocuments: "Document 1|Document 2|Document 3|Document 4", @@ -172,7 +172,7 @@ export const getServiceAreas = () => ({ ministryServiceAreaId: 6, fiscalStartDate: "2018-04-01T00:00:00Z", fiscalEndDate: "2019-03-31T00:00:00Z", - address: "Ministry of Transportation and Infrastructure|District 2|#206 - 20001 201st Ave|District 2, B.C.|V2A 1N6", + address: "Ministry of Transportation and Transit|District 2|#206 - 20001 201st Ave|District 2, B.C.|V2A 1N6", phone: "(250) 456-7900", fax: "(250) 456-7901", supportingDocuments: "Document 1|Document 2|Document 3|Document 4", @@ -205,7 +205,7 @@ export const getServiceAreas = () => ({ ministryServiceAreaId: 7, fiscalStartDate: "2018-04-01T00:00:00Z", fiscalEndDate: "2019-03-31T00:00:00Z", - address: "Ministry of Transportation and Infrastructure|District 2|#207 - 20001 201st Ave|District 2, B.C.|V2A 1N7", + address: "Ministry of Transportation and Transit|District 2|#207 - 20001 201st Ave|District 2, B.C.|V2A 1N7", phone: "(250) 456-7902", fax: "(250) 456-7903", supportingDocuments: "Document 1|Document 2", @@ -238,7 +238,7 @@ export const getServiceAreas = () => ({ ministryServiceAreaId: 8, fiscalStartDate: "2018-04-01T00:00:00Z", fiscalEndDate: "2019-03-31T00:00:00Z", - address: "Ministry of Transportation and Infrastructure|District 3|#308 - 30001 301st Ave|District 3, B.C.|V3A 1O8", + address: "Ministry of Transportation and Transit|District 3|#308 - 30001 301st Ave|District 3, B.C.|V3A 1O8", phone: "(250) 456-7904", fax: "(250) 456-7905", supportingDocuments: "Document 1|Document 2", @@ -271,7 +271,7 @@ export const getServiceAreas = () => ({ ministryServiceAreaId: 9, fiscalStartDate: "2018-04-01T00:00:00Z", fiscalEndDate: "2019-03-31T00:00:00Z", - address: "Ministry of Transportation and Infrastructure|District 3|#309 - 30001 301st Ave|District 3, B.C.|V3A 1O9", + address: "Ministry of Transportation and Transit|District 3|#309 - 30001 301st Ave|District 3, B.C.|V3A 1O9", phone: "(250) 456-7906", fax: "(250) 456-7907", supportingDocuments: "Document 1|Document 2|Document 3|Document 4", @@ -304,7 +304,7 @@ export const getServiceAreas = () => ({ ministryServiceAreaId: 10, fiscalStartDate: "2018-04-01T00:00:00Z", fiscalEndDate: "2019-03-31T00:00:00Z", - address: "Ministry of Transportation and Infrastructure|District 4|#410 - 40001 401st Ave|District 4, B.C.|V4A 2P0", + address: "Ministry of Transportation and Transit|District 4|#410 - 40001 401st Ave|District 4, B.C.|V4A 2P0", phone: "(250) 456-7908", fax: "(250) 456-7909", supportingDocuments: "Document 1|Document 2|Document 3|Document 4|Document 5", @@ -337,7 +337,7 @@ export const getServiceAreas = () => ({ ministryServiceAreaId: 11, fiscalStartDate: "2018-04-01T00:00:00Z", fiscalEndDate: "2019-03-31T00:00:00Z", - address: "Ministry of Transportation and Infrastructure|District 4|#411 - 40001 401st Ave|District 4, B.C.|V4A 2P1", + address: "Ministry of Transportation and Transit|District 4|#411 - 40001 401st Ave|District 4, B.C.|V4A 2P1", phone: "(250) 456-7910", fax: "(250) 456-7911", supportingDocuments: "Document 1|Document 2|Document 3|Document 4", @@ -370,7 +370,7 @@ export const getServiceAreas = () => ({ ministryServiceAreaId: 12, fiscalStartDate: "2018-04-01T00:00:00Z", fiscalEndDate: "2019-03-31T00:00:00Z", - address: "Ministry of Transportation and Infrastructure|District 5|#512 - 50001 501st Ave|District 5, B.C.|V5A 2Q2", + address: "Ministry of Transportation and Transit|District 5|#512 - 50001 501st Ave|District 5, B.C.|V5A 2Q2", phone: "(250) 456-7912", fax: "(250) 456-7913", supportingDocuments: "Document 1|Document 2", @@ -403,7 +403,7 @@ export const getServiceAreas = () => ({ ministryServiceAreaId: 13, fiscalStartDate: "2018-04-01T00:00:00Z", fiscalEndDate: "2019-03-31T00:00:00Z", - address: "Ministry of Transportation and Infrastructure|District 5|#513 - 50001 501st Ave|District 5, B.C.|V5A 2Q3", + address: "Ministry of Transportation and Transit|District 5|#513 - 50001 501st Ave|District 5, B.C.|V5A 2Q3", phone: "(250) 456-7914", fax: "(250) 456-7915", supportingDocuments: "Document 1|Document 2", @@ -436,7 +436,7 @@ export const getServiceAreas = () => ({ ministryServiceAreaId: 14, fiscalStartDate: "2018-04-01T00:00:00Z", fiscalEndDate: "2019-03-31T00:00:00Z", - address: "Ministry of Transportation and Infrastructure|District 6|#614 - 60001 601st Ave|District 6, B.C.|V6A 2R4", + address: "Ministry of Transportation and Transit|District 6|#614 - 60001 601st Ave|District 6, B.C.|V6A 2R4", phone: "(604) 456-7916", fax: "(604) 456-7917", supportingDocuments: "Document 1|Document 2|Document 3|Document 4", @@ -469,7 +469,7 @@ export const getServiceAreas = () => ({ ministryServiceAreaId: 15, fiscalStartDate: "2018-04-01T00:00:00Z", fiscalEndDate: "2019-03-31T00:00:00Z", - address: "Ministry of Transportation and Infrastructure|District 6|#615 - 60001 601st Ave|District 6, B.C.|V6A 2R5", + address: "Ministry of Transportation and Transit|District 6|#615 - 60001 601st Ave|District 6, B.C.|V6A 2R5", phone: "(604) 456-7918", fax: "(604) 456-7919", supportingDocuments: "Document 1|Document 2|Document 3|Document 4|Document 5", @@ -502,7 +502,7 @@ export const getServiceAreas = () => ({ ministryServiceAreaId: 16, fiscalStartDate: "2018-04-01T00:00:00Z", fiscalEndDate: "2019-03-31T00:00:00Z", - address: "Ministry of Transportation and Infrastructure|District 7|#716 - 70001 701st Ave|District 7, B.C.|V7A 2S6", + address: "Ministry of Transportation and Transit|District 7|#716 - 70001 701st Ave|District 7, B.C.|V7A 2S6", phone: "(604) 456-7920", fax: "(604) 456-7921", supportingDocuments: "Document 1|Document 2|Document 3|Document 4|Document 5", @@ -535,7 +535,7 @@ export const getServiceAreas = () => ({ ministryServiceAreaId: 17, fiscalStartDate: "2018-04-01T00:00:00Z", fiscalEndDate: "2019-03-31T00:00:00Z", - address: "Ministry of Transportation and Infrastructure|District 8|#817 - 80001 801st Ave|District 8, B.C.|V8A 2T7", + address: "Ministry of Transportation and Transit|District 8|#817 - 80001 801st Ave|District 8, B.C.|V8A 2T7", phone: "(604) 456-7922", fax: "(604) 456-7923", supportingDocuments: "Document 1|Document 2|Document 3|Document 4|Document 5", @@ -568,7 +568,7 @@ export const getServiceAreas = () => ({ ministryServiceAreaId: 18, fiscalStartDate: "2018-04-01T00:00:00Z", fiscalEndDate: "2019-03-31T00:00:00Z", - address: "Ministry of Transportation and Infrastructure|District 9|#918 - 90001 901st Ave|District 9, B.C.|V9A 2U8", + address: "Ministry of Transportation and Transit|District 9|#918 - 90001 901st Ave|District 9, B.C.|V9A 2U8", phone: "(250) 456-7924", fax: "(250) 456-7925", supportingDocuments: "Document 1|Document 2|Document 3|Document 4", @@ -601,7 +601,7 @@ export const getServiceAreas = () => ({ ministryServiceAreaId: 19, fiscalStartDate: "2018-04-01T00:00:00Z", fiscalEndDate: "2019-03-31T00:00:00Z", - address: "Ministry of Transportation and Infrastructure|District 10|#1019 - 10001 101st Ave|District 10, B.C.|V0B 2V9", + address: "Ministry of Transportation and Transit|District 10|#1019 - 10001 101st Ave|District 10, B.C.|V0B 2V9", phone: "(250) 456-7926", fax: "(250) 456-7927", supportingDocuments: "Document 1|Document 2|Document 3|Document 4", @@ -634,7 +634,7 @@ export const getServiceAreas = () => ({ ministryServiceAreaId: 20, fiscalStartDate: "2018-04-01T00:00:00Z", fiscalEndDate: "2019-03-31T00:00:00Z", - address: "Ministry of Transportation and Infrastructure|District 11|#1120 - 11001 111th Ave|District 11, B.C.|V1B 2W0", + address: "Ministry of Transportation and Transit|District 11|#1120 - 11001 111th Ave|District 11, B.C.|V1B 2W0", phone: "(250) 456-7928", fax: "(250) 456-7929", supportingDocuments: "Document 1|Document 2|Document 3|Document 4", @@ -667,7 +667,7 @@ export const getServiceAreas = () => ({ ministryServiceAreaId: 21, fiscalStartDate: "2018-04-01T00:00:00Z", fiscalEndDate: "2019-03-31T00:00:00Z", - address: "Ministry of Transportation and Infrastructure|District 12|#1221 - 12001 121st Ave|District 12, B.C.|V2B 2X1", + address: "Ministry of Transportation and Transit|District 12|#1221 - 12001 121st Ave|District 12, B.C.|V2B 2X1", phone: "(250) 456-7930", fax: "(250) 456-7931", supportingDocuments: "Document 1|Document 2|Document 3|Document 4", @@ -700,7 +700,7 @@ export const getServiceAreas = () => ({ ministryServiceAreaId: 22, fiscalStartDate: "2018-04-01T00:00:00Z", fiscalEndDate: "2019-03-31T00:00:00Z", - address: "Ministry of Transportation and Infrastructure|District 13|#1322 - 13001 131st Ave|District 13, B.C.|V3B 2Y2", + address: "Ministry of Transportation and Transit|District 13|#1322 - 13001 131st Ave|District 13, B.C.|V3B 2Y2", phone: "(250) 456-7932", fax: "(250) 456-7933", supportingDocuments: "Document 1|Document 2|Document 3|Document 4|Document 5", @@ -733,7 +733,7 @@ export const getServiceAreas = () => ({ ministryServiceAreaId: 23, fiscalStartDate: "2018-04-01T00:00:00Z", fiscalEndDate: "2019-03-31T00:00:00Z", - address: "Ministry of Transportation and Infrastructure|District 13|#1323 - 13001 131st Ave|District 13, B.C.|V3B 2Y3", + address: "Ministry of Transportation and Transit|District 13|#1323 - 13001 131st Ave|District 13, B.C.|V3B 2Y3", phone: "(250) 456-7934", fax: "(250) 456-7935", supportingDocuments: "Document 1|Document 2|Document 3|Document 4", @@ -766,7 +766,7 @@ export const getServiceAreas = () => ({ ministryServiceAreaId: 24, fiscalStartDate: "2018-04-01T00:00:00Z", fiscalEndDate: "2019-03-31T00:00:00Z", - address: "Ministry of Transportation and Infrastructure|District 13|#1324 - 13001 131st Ave|District 13, B.C.|V3B 2Y4", + address: "Ministry of Transportation and Transit|District 13|#1324 - 13001 131st Ave|District 13, B.C.|V3B 2Y4", phone: "(250) 456-7936", fax: "(250) 456-7937", supportingDocuments: "Document 1|Document 2|Document 3|Document 4", @@ -799,7 +799,7 @@ export const getServiceAreas = () => ({ ministryServiceAreaId: 25, fiscalStartDate: "2018-04-01T00:00:00Z", fiscalEndDate: "2019-03-31T00:00:00Z", - address: "Ministry of Transportation and Infrastructure|District 13|#1325 - 13001 131st Ave|District 13, B.C.|V3B 2Y5", + address: "Ministry of Transportation and Transit|District 13|#1325 - 13001 131st Ave|District 13, B.C.|V3B 2Y5", phone: "(250) 456-7938", fax: "(250) 456-7939", supportingDocuments: "Document 1|Document 2", @@ -832,7 +832,7 @@ export const getServiceAreas = () => ({ ministryServiceAreaId: 26, fiscalStartDate: "2018-04-01T00:00:00Z", fiscalEndDate: "2019-03-31T00:00:00Z", - address: "Ministry of Transportation and Infrastructure|District 13|#1326 - 13001 131st Ave|District 13, B.C.|V3B 2Y6", + address: "Ministry of Transportation and Transit|District 13|#1326 - 13001 131st Ave|District 13, B.C.|V3B 2Y6", phone: "(250) 456-7940", fax: "(250) 456-7941", supportingDocuments: "Document 1|Document 2", @@ -865,7 +865,7 @@ export const getServiceAreas = () => ({ ministryServiceAreaId: 27, fiscalStartDate: "2018-04-01T00:00:00Z", fiscalEndDate: "2019-03-31T00:00:00Z", - address: "Ministry of Transportation and Infrastructure|District 13|#1327 - 13001 131st Ave|District 13, B.C.|V3B 2Y7", + address: "Ministry of Transportation and Transit|District 13|#1327 - 13001 131st Ave|District 13, B.C.|V3B 2Y7", phone: "(250) 456-7942", fax: "(250) 456-7943", supportingDocuments: "Document 1|Document 2|Document 3", @@ -898,7 +898,7 @@ export const getServiceAreas = () => ({ ministryServiceAreaId: 28, fiscalStartDate: "2018-04-01T00:00:00Z", fiscalEndDate: "2019-03-31T00:00:00Z", - address: "Ministry of Transportation and Infrastructure|District 13|#1328 - 13001 131st Ave|District 13, B.C.|V3B 2Y8", + address: "Ministry of Transportation and Transit|District 13|#1328 - 13001 131st Ave|District 13, B.C.|V3B 2Y8", phone: "(250) 456-7944", fax: "(250) 456-7945", supportingDocuments: "Document 1|Document 2|Document 3", diff --git a/client/src/js/views/BusinessPortal.jsx b/client/src/js/views/BusinessPortal.jsx index c2794d7ec..1cb346677 100644 --- a/client/src/js/views/BusinessPortal.jsx +++ b/client/src/js/views/BusinessPortal.jsx @@ -196,7 +196,7 @@ class BusinessPortal extends React.Component { />

The Hired Equipment Program is for owners/operators who have a dump truck, bulldozer, backhoe or other - piece of equipment they want to hire out to the Ministry Transportation and Infrastructure for day + piece of equipment they want to hire out to the Ministry Transportation and Transit for day labour and emergency projects.