multiple migration issue fixed

bcgov · Aug 21, 2024 · 21917e8 · 21917e8
1 parent f63b3e4
commit 21917e8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/forms-flow-web/src/components/FOI/customComponents/ContactApplicant/util.tsx b/forms-flow-web/src/components/FOI/customComponents/ContactApplicant/util.tsx
@@ -79,7 +79,7 @@ export const getTemplateVariables = (requestDetails: any, requestExtensions: any
     {name: "{{assignedToFirstName}}", value: requestDetails.assignedToFirstName || ""},
     {name: "{{assignedToLastName}}", value: requestDetails.assignedToLastName || ""},
     {name: "{{assignedGroup}}", value: requestDetails.assignedGroup},
-    {name: "{{assignedGroupEmail}}", value: requestDetails.assignedGroupEmail},
+    {name: "{{assignedGroupEmail}}", value: requestDetails.assignedGroupEmail || ""},
     {name: "{{ffaurl}}", value: requestDetails.ffaurl},
     {name: "{{description}}", value: requestDetails.description},
     {name: "{{selectedMinistry}}", value: requestDetails?.selectedMinistries[0].name},
@@ -520,9 +520,9 @@ const displayOIPCExtensionSection = async (extensionId: number, requestDetails:
 
 const renderOnlineFormHTML = (requestDetails:any): string => {
   if (requestDetails.receivedMode !== "Online Form") {
-    // Return the HTML content when the request mode is "Online Form".
+    // Return the HTML content when the request mode is NOT "Online Form".
     return `
-        <p><span style='font-size:13px;font-family:"BC Sans";'>You submitted your request outside of our online process. For future reference, you can submit both personal and general requests at: <a href="https://www2.gov.bc.ca/gov/content/governments/about-the-bc-government/open-government/open-information/freedom-of-information"><span style="font-size: 13px; ">https://www2.gov.bc.ca/gov/content/governments/about-the-bc-government/open-government/open-information/freedom-of-information.</span></a>Using the online process is a fast, easy and secure way to submit your Freedom of Information (FOI) request. It also ensures that we receive the information required to open your request. The webpage also includes frequently asked questions, additional information regarding the FOI process, and links to previously completed FOI requests and proactively released government records. </span></p>
+        <p style="text-align: center;"><span style="font-size: 13px; ">&nbsp;</span></p><p><span style='font-size:13px;font-family:"BC Sans";'>You submitted your request outside of our online process. For future reference, you can submit both personal and general requests at: <a href="https://www2.gov.bc.ca/gov/content/governments/about-the-bc-government/open-government/open-information/freedom-of-information"><span style="font-size: 13px; ">https://www2.gov.bc.ca/gov/content/governments/about-the-bc-government/open-government/open-information/freedom-of-information.</span></a>Using the online process is a fast, easy and secure way to submit your Freedom of Information (FOI) request. It also ensures that we receive the information required to open your request. The webpage also includes frequently asked questions, additional information regarding the FOI process, and links to previously completed FOI requests and proactively released government records. </span></p>
     `;
   } 
   return ''

diff --git a/forms-flow-web/src/helper/FOI/helper.js b/forms-flow-web/src/helper/FOI/helper.js
@@ -44,9 +44,8 @@ const formatDateInPst = (d, formatString = "yyyy-MM-dd") => {
 
 
 const convertDate = (dateString, outputFormat = 'MMMM D, YYYY') => {
-  console.log("date: ",dateString)
+
   if (!dateString) {
-    console.error('Invalid date string provided.');
     return '';
   }
 

diff --git a/request-management-api/migrations/versions/516fbf1b13d9_acknowledgement_letter.py b/request-management-api/migrations/versions/516fbf1b13d9_acknowledgement_letter.py
@@ -11,7 +11,9 @@
 
 # revision identifiers, used by Alembic.
 revision = '516fbf1b13d9'
-down_revision = '5b9b19213803'
+down_revision = '0982b9dca5f2'
+# revision = '516fbf1b13d9'
+# down_revision = '5b9b19213803'
 branch_labels = None
 depends_on = None
 

diff --git a/request-management-api/request_api/email_templates/acknowledgement_letter.html b/request-management-api/request_api/email_templates/acknowledgement_letter.html
@@ -8,7 +8,7 @@
 <p><span style="font-size: 13px; ">Dear <span style="font-size: 13px;">{{firstName}} {{lastName}}</span></span></p>
 <p style="text-align: center;"><span style="font-size: 13px; ">&nbsp;</span></p>
 <p><span style="font-size: 13px; "><span style="font-size: 13px;">Re:  Request for Access to Records</span></span></p>
-<p><span style="font-size: 13px; "><span style="font-size: 13px;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Freedom of Information and Protection of Privacy Act (FOIPPA)</span></span></p>
+<p><span style="font-size: 13px; "><span style="font-size: 13px;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Freedom of Information and Protection of Privacy Act (FOIPPA)</span></span></p>
 <p style="text-align: center;"><span style="font-size: 13px; ">&nbsp;</span></p>
 <p><span style="font-size: 13px; ">The</span><span style="font-size: 13px;">&nbsp;{{selectedMinistry}}&nbsp; received your request for access to information under FOIPPA on {{receivedDate}}. &nbsp;We understand your request to be for:</span>. &nbsp;<br/></span></p>
 <p style="text-align: center;"><span style="font-size: 13px; ">&nbsp;</span></p>