Merge pull request #2312 from bcgov/release/R3.3.0

R3.3.0->master
bcgov · Jun 25, 2024 · dc2e8da · dc2e8da
2 parents 493b28c + 5d505f6
commit dc2e8da
Show file tree

Hide file tree

Showing 51 changed files with 170 additions and 97 deletions.
diff --git a/...pporting/SupportGeneration/ReferralPrinting/Views/Billeting/BilletingChecklistPartial.hbs b/...pporting/SupportGeneration/ReferralPrinting/Views/Billeting/BilletingChecklistPartial.hbs
@@ -2,7 +2,7 @@
     <div class="col-12">
         <div class="info-block">
             <h3 class="with-icon clipboard">Invoice Checklist</h3>
-            <p>The following checklist is provided for your convenience to ensure your invoice documentation is complete and accurate prior to forwarding to Emergency Management BC (EMBC) for payment.</p>
+            <p>The following checklist is provided for your convenience to ensure your invoice documentation is complete and accurate prior to forwarding to Ministry of Emergency Management and Climate Readiness (EMCR) for payment.</p>
         </div>
     </div>
 </div>
@@ -17,6 +17,6 @@
     </div>
     <div class="row">
         <div class="col-5"><span class="print-checkbox"> </span> Write referral # on upper right hand corner of all invoices &amp; documents.</div>
-        <div class="col-6"><span class="print-checkbox"> </span> Any exceptions have been authorized by Emergency Management BC &amp; documented.</div>
+        <div class="col-6"><span class="print-checkbox"> </span> Any exceptions have been authorized by Ministry of Emergency Management and Climate Readiness &amp; documented.</div>
     </div>
 </div>
diff --git a/...upporting/SupportGeneration/ReferralPrinting/Views/Billeting/BilletingSupplierPartial.hbs b/...upporting/SupportGeneration/ReferralPrinting/Views/Billeting/BilletingSupplierPartial.hbs
@@ -18,7 +18,7 @@
 <br />
 <p><strong>Send original referral form and itemized receipts to:</strong></p>
 <p>
-    Emergency Management Climate Readiness<br />
+    Ministry of Emergency Management and Climate Readiness<br />
     PO Box 9201, STN PROV GOVT<br />
     Victoria BC V8W 9J1<br />
 </p>

diff --git a/...Supporting/SupportGeneration/ReferralPrinting/Views/Clothing/ClothingChecklistPartial.hbs b/...Supporting/SupportGeneration/ReferralPrinting/Views/Clothing/ClothingChecklistPartial.hbs
@@ -2,7 +2,7 @@
     <div class="col-12">
         <div class="info-block">
             <h3 class="with-icon clipboard">Invoice Checklist</h3>
-            <p>The following checklist is provided for your convenience to ensure your invoice documentation is complete and accurate prior to forwarding to Emergency Management BC (EMBC) for payment.</p>
+            <p>The following checklist is provided for your convenience to ensure your invoice documentation is complete and accurate prior to forwarding to Ministry of Emergency Management and Climate Readiness (EMCR) for payment.</p>
         </div>
     </div>
 </div>
@@ -21,6 +21,6 @@
     </div>
     <div class="row">
         <div class="col-5"><span class="print-checkbox"> </span> Write referral # on upper right hand corner of all invoices &amp; documents.</div>
-        <div class="col-6"><span class="print-checkbox"> </span> Any exceptions have been authorized by Emergency Management BC &amp; documented.</div>
+        <div class="col-6"><span class="print-checkbox"> </span> Any exceptions have been authorized by Ministry of Emergency Management and Climate Readiness &amp; documented.</div>
     </div>
 </div>
diff --git a/.../Supporting/SupportGeneration/ReferralPrinting/Views/Clothing/ClothingSupplierPartial.hbs b/.../Supporting/SupportGeneration/ReferralPrinting/Views/Clothing/ClothingSupplierPartial.hbs
@@ -18,7 +18,7 @@
 <br />
 <p><strong>Send original referral form and itemized receipts to:</strong></p>
 <p>
-    Emergency Management Climate Readiness<br />
+    Ministry of Emergency Management and Climate Readiness<br />
     PO Box 9201, STN PROV GOVT<br />
     Victoria BC V8W 9J1<br />
 </p>

diff --git a/...pporting/SupportGeneration/ReferralPrinting/Views/Groceries/GroceriesChecklistPartial.hbs b/...pporting/SupportGeneration/ReferralPrinting/Views/Groceries/GroceriesChecklistPartial.hbs
@@ -2,7 +2,7 @@
     <div class="col-12">
         <div class="info-block">
             <h3 class="with-icon clipboard">Invoice Checklist</h3>
-            <p>The following checklist is provided for your convenience to ensure your invoice documentation is complete and accurate prior to forwarding to Emergency Management BC (EMBC) for payment.</p>
+            <p>The following checklist is provided for your convenience to ensure your invoice documentation is complete and accurate prior to forwarding to Ministry of Emergency Management and Climate Readiness (EMCR) for payment.</p>
         </div>
     </div>
 </div>
@@ -21,6 +21,6 @@
     </div>
     <div class="row">
         <div class="col-5"><span class="print-checkbox"> </span> Write referral # on upper right hand corner of all invoices &amp; documents.</div>
-        <div class="col-6"><span class="print-checkbox"> </span> Any exceptions have been authorized by Emergency Management BC &amp; documented.</div>
+        <div class="col-6"><span class="print-checkbox"> </span> Any exceptions have been authorized by Ministry of Emergency Management and Climate Readiness &amp; documented.</div>
     </div>
 </div>
diff --git a/...upporting/SupportGeneration/ReferralPrinting/Views/Groceries/GroceriesSupplierPartial.hbs b/...upporting/SupportGeneration/ReferralPrinting/Views/Groceries/GroceriesSupplierPartial.hbs
@@ -18,7 +18,7 @@
 <br />
 <p><strong>Send original referral form and itemized receipts to:</strong></p>
 <p>
-    Emergency Management Climate Readiness<br />
+    Ministry of Emergency Management and Climate Readiness<br />
     PO Box 9201, STN PROV GOVT<br />
     Victoria BC V8W 9J1<br />
 </p>

diff --git a/...ing/SupportGeneration/ReferralPrinting/Views/GroupLodging/GroupLodgingSupplierPartial.hbs b/...ing/SupportGeneration/ReferralPrinting/Views/GroupLodging/GroupLodgingSupplierPartial.hbs
@@ -18,7 +18,7 @@
 <br />
 <p><strong>Send original referral form and itemized receipts to:</strong></p>
 <p>
-    Emergency Management Climate Readiness<br />
+    Ministry of Emergency Management and Climate Readiness<br />
     PO Box 9201, STN PROV GOVT<br />
     Victoria BC V8W 9J1<br />
 </p>

diff --git a/...gines/Supporting/SupportGeneration/ReferralPrinting/Views/Hotel/HotelChecklistPartial.hbs b/...gines/Supporting/SupportGeneration/ReferralPrinting/Views/Hotel/HotelChecklistPartial.hbs
@@ -2,7 +2,7 @@
     <div class="col-12">
         <div class="info-block">
             <h3 class="with-icon clipboard">Invoice Checklist</h3>
-            <p>The following checklist is provided for your convenience to ensure your invoice documentation is complete and accurate prior to forwarding to Emergency Management BC (EMBC) for payment.</p>
+            <p>The following checklist is provided for your convenience to ensure your invoice documentation is complete and accurate prior to forwarding to Ministry of Emergency Management and Climate Readiness (EMCR) for payment.</p>
         </div>
     </div>
 </div>
@@ -21,6 +21,6 @@
     </div>
     <div class="row">
         <div class="col-5"><span class="print-checkbox"> </span> Write referral # on upper right hand corner of all invoices &amp; documents.</div>
-        <div class="col-6"><span class="print-checkbox"> </span> Any exceptions have been authorized by Emergency Management BC &amp; documented.</div>
+        <div class="col-6"><span class="print-checkbox"> </span> Any exceptions have been authorized by Ministry of Emergency Management and Climate Readiness &amp; documented.</div>
     </div>
 </div>
diff --git a/...ngines/Supporting/SupportGeneration/ReferralPrinting/Views/Hotel/HotelSupplierPartial.hbs b/...ngines/Supporting/SupportGeneration/ReferralPrinting/Views/Hotel/HotelSupplierPartial.hbs
@@ -18,7 +18,7 @@
 <br />
 <p><strong>Send original referral form and itemized receipts to:</strong></p>
 <p>
-    Emergency Management Climate Readiness<br />
+    Ministry of Emergency Management and Climate Readiness<br />
     PO Box 9201, STN PROV GOVT<br />
     Victoria BC V8W 9J1<br />
 </p>

diff --git a/...ting/SupportGeneration/ReferralPrinting/Views/Incidentals/IncidentalsChecklistPartial.hbs b/...ting/SupportGeneration/ReferralPrinting/Views/Incidentals/IncidentalsChecklistPartial.hbs
@@ -2,7 +2,7 @@
     <div class="col-12">
         <div class="info-block">
             <h3 class="with-icon clipboard">Invoice Checklist</h3>
-            <p>The following checklist is provided for your convenience to ensure your invoice documentation is complete and accurate prior to forwarding to Emergency Management BC (EMBC) for payment.</p>
+            <p>The following checklist is provided for your convenience to ensure your invoice documentation is complete and accurate prior to forwarding to Ministry of Emergency Management and Climate Readiness (EMCR) for payment.</p>
         </div>
     </div>
 </div>
@@ -21,6 +21,6 @@
     </div>
     <div class="row">
         <div class="col-5"><span class="print-checkbox"> </span> Write referral # on upper right hand corner of all invoices &amp; documents.</div>
-        <div class="col-6"><span class="print-checkbox"> </span> Any exceptions have been authorized by Emergency Management BC &amp; documented.</div>
+        <div class="col-6"><span class="print-checkbox"> </span> Any exceptions have been authorized by Ministry of Emergency Management and Climate Readiness &amp; documented.</div>
     </div>
 </div>
diff --git a/...rting/SupportGeneration/ReferralPrinting/Views/Incidentals/IncidentalsSupplierPartial.hbs b/...rting/SupportGeneration/ReferralPrinting/Views/Incidentals/IncidentalsSupplierPartial.hbs
@@ -18,7 +18,7 @@
 <br />
 <p><strong>Send original referral form and itemized receipts to:</strong></p>
 <p>
-    Emergency Management Climate Readiness<br />
+    Ministry of Emergency Management and Climate Readiness<br />
     PO Box 9201, STN PROV GOVT<br />
     Victoria BC V8W 9J1<br />
 </p>

diff --git a/...gines/Supporting/SupportGeneration/ReferralPrinting/Views/Meals/MealsChecklistPartial.hbs b/...gines/Supporting/SupportGeneration/ReferralPrinting/Views/Meals/MealsChecklistPartial.hbs
@@ -2,7 +2,7 @@
     <div class="col-12">
         <div class="info-block">
             <h3 class="with-icon clipboard">Invoice Checklist</h3>
-            <p>The following checklist is provided for your convenience to ensure your invoice documentation is complete and accurate prior to forwarding to Emergency Management BC (EMBC) for payment.</p>
+            <p>The following checklist is provided for your convenience to ensure your invoice documentation is complete and accurate prior to forwarding to Ministry of Emergency Management and Climate Readiness (EMCR) for payment.</p>
         </div>
     </div>
 </div>
@@ -21,6 +21,6 @@
     </div>
     <div class="row">
         <div class="col-5"><span class="print-checkbox"> </span> Write referral # on upper right hand corner of all invoices &amp; documents.</div>
-        <div class="col-6"><span class="print-checkbox"> </span> Any exceptions have been authorized by Emergency Management BC &amp; documented.</div>
+        <div class="col-6"><span class="print-checkbox"> </span> Any exceptions have been authorized by Ministry of Emergency Management and Climate Readiness &amp; documented.</div>
     </div>
 </div>
diff --git a/...ngines/Supporting/SupportGeneration/ReferralPrinting/Views/Meals/MealsSupplierPartial.hbs b/...ngines/Supporting/SupportGeneration/ReferralPrinting/Views/Meals/MealsSupplierPartial.hbs
@@ -20,5 +20,5 @@
     <li>Services to meet immediate needs should be provided in the most cost-effective manner. Extra costs incurred by the evacuee beyond the approved items listed are the responsibility of the evacuee.</li>
     <li>Charges for goods and services, including all applicable taxes, <strong>must not exceed</strong> the Emergency Support Services rates.</li>
     <li>Alcohol, tobacco and gratuities are not eligible expenses.</li>
-    <li>Maximum meal allowances are set <strong>per meal</strong>, not per day. Meal allowances for the entire day cannot be combined into one large food order, unless prior authorization is obtained from Emergency Management BC.</li>
+    <li>Maximum meal allowances are set <strong>per meal</strong>, not per day. Meal allowances for the entire day cannot be combined into one large food order, unless prior authorization is obtained from Ministry of Emergency Management and Climate Readiness.</li>
 </ul>
diff --git a/...eration/ReferralPrinting/Views/ShelterAllowance/ShelterAllowanceAdditionalInfoPartial.hbs b/...eration/ReferralPrinting/Views/ShelterAllowance/ShelterAllowanceAdditionalInfoPartial.hbs
@@ -2,7 +2,7 @@
     <div class="col-12">
         <div class="info-block">
             <h3 class="with-icon person">Payee information</h3>
-            <p>Please complete before sending to Emergency Management Climate Readiness (EMCR).</p>
+            <p>Please complete before sending to Ministry of Emergency Management and Climate Readiness (EMCR).</p>
             <br />
             <p><strong>{{ ContactName }}</strong></p>
             <p>{{ ContactPhone }}</p>

diff --git a/...ortGeneration/ReferralPrinting/Views/ShelterAllowance/ShelterAllowanceSupplierPartial.hbs b/...ortGeneration/ReferralPrinting/Views/ShelterAllowance/ShelterAllowanceSupplierPartial.hbs
@@ -6,7 +6,7 @@
     <li>
         <p><strong>MAIL the ORIGINAL Shelter Allowance Referral form to:</strong></p>
         <p>
-            Emergency Management Climate Readiness<br />
+            Ministry of Emergency Management and Climate Readiness<br />
             PO Box 9201, STN PROV GOVT<br />
             Victoria BC V8W 9J1<br />
         </p>

diff --git a/.../API/EMBC.ESS/Engines/Supporting/SupportGeneration/ReferralPrinting/Views/SummaryItem.hbs b/.../API/EMBC.ESS/Engines/Supporting/SupportGeneration/ReferralPrinting/Views/SummaryItem.hbs
@@ -52,7 +52,7 @@
                         <li>Please allow for up to 4 hours to receive your e-Transfer Notification.</li>
                         <li>Please contact the ESS Call Centre on 1-800-585-9559 should you not receive your e-Transfer.
                         </li>
-                        <li>You are being provided with a one-time digital payment for supports. EMBC has a
+                        <li>You are being provided with a one-time digital payment for supports. EMCR has a
                             responsibility to ensure that funds are used for the sole purpose of meeting essential needs
                             of individuals and their household members. By your acceptance of the digital payment, you
                             agree to only spend these funds to meet your basic needs, such as food, clothing, or

diff --git a/...Engines/Supporting/SupportGeneration/ReferralPrinting/Views/Taxi/TaxiChecklistPartial.hbs b/...Engines/Supporting/SupportGeneration/ReferralPrinting/Views/Taxi/TaxiChecklistPartial.hbs
@@ -2,7 +2,7 @@
     <div class="col-12">
         <div class="info-block">
             <h3 class="with-icon clipboard">Invoice Checklist</h3>
-            <p>The following checklist is provided for your convenience to ensure your invoice documentation is complete and accurate prior to forwarding to Emergency Management BC (EMBC) for payment.</p>
+            <p>The following checklist is provided for your convenience to ensure your invoice documentation is complete and accurate prior to forwarding to Ministry of Emergency Management and Climate Readiness (EMCR) for payment.</p>
         </div>
     </div>
 </div>
@@ -22,7 +22,7 @@
     </div>
     <div class="row">
         <div class="col-5"><span class="print-checkbox"> </span> Write referral # on upper right hand corner of all invoices &amp; documents.</div>
-        <div class="col-6"><span class="print-checkbox"> </span> Any exceptions have been authorized by Emergency Management BC &amp; documented.</div>
+        <div class="col-6"><span class="print-checkbox"> </span> Any exceptions have been authorized by Ministry of Emergency Management and Climate Readiness &amp; documented.</div>
     </div>
     <!--<div class="row">
         <div class="col-5"><span class="print-checkbox"> </span> Make copies of invoices and receipts for your records.</div>

diff --git a/...upportGeneration/ReferralPrinting/Views/Transportation/TransportationChecklistPartial.hbs b/...upportGeneration/ReferralPrinting/Views/Transportation/TransportationChecklistPartial.hbs
@@ -2,7 +2,7 @@
     <div class="col-12">
         <div class="info-block">
             <h3 class="with-icon clipboard">Invoice Checklist</h3>
-            <p>The following checklist is provided for your convenience to ensure your invoice documentation is complete and accurate prior to forwarding to Emergency Management BC (EMBC) for payment.</p>
+            <p>The following checklist is provided for your convenience to ensure your invoice documentation is complete and accurate prior to forwarding to Ministry of Emergency Management and Climate Readiness (EMCR) for payment.</p>
         </div>
     </div>
 </div>
@@ -17,7 +17,7 @@
     </div>
     <div class="row">
         <div class="col-5"><span class="print-checkbox"> </span> Write referral # on upper right hand corner of all invoices &amp; documents.</div>
-        <div class="col-6"><span class="print-checkbox"> </span> Any exceptions have been authorized by Emergency Management BC &amp; documented.</div>
+        <div class="col-6"><span class="print-checkbox"> </span> Any exceptions have been authorized by Ministry of Emergency Management and Climate Readiness &amp; documented.</div>
     </div>
     <div class="row">
         <div class="col-5"><span class="print-checkbox"> </span> Make copies of invoices and receipts for your records.</div>

diff --git a/.../API/EMBC.ESS/Engines/Supporting/SupportProcessing/SelfServeSupportEligibilityStrategy.cs b/.../API/EMBC.ESS/Engines/Supporting/SupportProcessing/SelfServeSupportEligibilityStrategy.cs
@@ -96,10 +96,10 @@ private async Task<SelfServeSupportEligibility> ValidateEligibility(ValidateSelf
         }
 
         // filter supports enabled for extensions
-        var oneTimeSupportTypes = GetOnetimeEnabledSupportTypesForTask(task).Cast<int>().ToArray();
+        var oneTimeSupportTypes = GetOnetimeEnabledSupportTypesForTask(task).SelectMany(s => GetMatchingTypesByCategory(s)).Distinct().Cast<int>().ToArray();
         var oneTimeReceivedSupportTypes = (await currentNeedsAssessment.era_era_householdmember_era_needassessment
             .SelectManyAsync(async hm => await GetPreviousOnetimeSupportsForHouseholdMember(ctx, hm, oneTimeSupportTypes, task.era_taskstartdate.Value, ct)))
-            .Select(s => s.era_supporttype).Cast<SupportType>().Distinct().ToList();
+            .Select(s => s.era_supporttype).Cast<SupportType>().SelectMany(s => GetMatchingTypesByCategory(s)).Distinct().ToList();
 
         var receivedSupportTypes = receivedSupports.Select(s => s.era_supporttype).Distinct().Cast<SupportType>().ToArray();
         receivedSupportTypes = receivedSupportTypes.Concat(oneTimeReceivedSupportTypes).Distinct().ToArray();
@@ -337,6 +337,18 @@ private static async Task<IEnumerable<era_evacueesupport>> GetPreviousOnetimeSup
             .GetAllPagesAsync(ct);
     }
 
+    private static IEnumerable<SupportType> GetMatchingTypesByCategory(SupportType supportType)
+    {
+        switch (supportType)
+        {
+            case SupportType.FoodGroceries:
+            case SupportType.FoodRestaurant:
+                return new[] { SupportType.FoodGroceries, SupportType.FoodRestaurant };
+            default:
+                return new[] { supportType };
+        }
+    }
+
     private static (SupportType[] unusedSupportTypes, SupportType[] onetimeUsedSupportTypes) MapEligibleSupportTypesByUsage(SupportType[] eligibleSupportTypes, SupportType[] receivedSupportTypes, SupportType[] enabledSupportTypesForExtensions)
     {
         if (receivedSupportTypes.Length == 0) return (eligibleSupportTypes, []);

diff --git a/ess/src/API/EMBC.ESS/Managers/Events/Notifications/Templates/InviteTemplate.hbs b/ess/src/API/EMBC.ESS/Managers/Events/Notifications/Templates/InviteTemplate.hbs
@@ -23,7 +23,7 @@
                 </p>
                 <p>
                     Sincerely,<br />
-                    <strong>Emergency Management of British Columbia</strong>
+                    <strong>Ministry of Emergency Management and Climate Readiness</strong>
                 </p>
             </td>
         </tr>

diff --git a/ess/src/API/EMBC.ESS/Resources/Teams/Mappings.cs b/ess/src/API/EMBC.ESS/Resources/Teams/Mappings.cs
@@ -1,6 +1,7 @@
 using System;
 using AutoMapper;
 using EMBC.ESS.Utilities.Dynamics.Microsoft.Dynamics.CRM;
+using EMBC.Utilities.Extensions;
 
 namespace EMBC.ESS.Resources.Teams
 {
@@ -48,7 +49,7 @@ public Mappings()
                 .ForMember(d => d.era_externalsystemtype, opts => opts.MapFrom(s => (int)ExternalSystemOptionSet.Bceid))
                 .ForMember(d => d.era_externalsystemusername, opts => opts.MapFrom(s => s.UserName))
                 .ForMember(d => d.era_electronicaccessagreementaccepteddate, opts => opts.MapFrom(s => s.AgreementSignDate.HasValue ?
-                    new DateTime(s.AgreementSignDate.Value.Year, s.AgreementSignDate.Value.Month, s.AgreementSignDate.Value.Day, 0, 0, 0, 0, DateTimeKind.Utc)
+                new DateTime(s.AgreementSignDate.Value.Year, s.AgreementSignDate.Value.Month, s.AgreementSignDate.Value.Day, 0, 0, 0, 0, DateTimeKind.Utc)
                     : (DateTime?)null))
                 .ForMember(d => d.era_label, opts => opts.MapFrom(s => string.IsNullOrEmpty(s.Label) ? -1 : (int)Enum.Parse<TeamUserLabelOptionSet>(s.Label)))
                 .ForMember(d => d.era_role, opts => opts.MapFrom(s => string.IsNullOrEmpty(s.Role) ? (int?)null : (int)Enum.Parse<TeamUserRoleOptionSet>(s.Role)))