From 58230ae65ded7611810e1118d958fc2450879b36 Mon Sep 17 00:00:00 2001
From: Dan Gowans <d.gowans@cityssm.on.ca>
Date: Fri, 14 Oct 2022 10:33:48 -0400
Subject: [PATCH] use "death place" field on burial permit

---
 helpers/initializer.database.cemetery.js      | 12 +++++++++++-
 helpers/initializer.database.cemetery.ts      | 16 +++++++++++++++-
 temp/legacy.importFromCSV.js                  |  9 +++++++++
 temp/legacy.importFromCSV.ts                  | 15 +++++++++++++++
 views/print/pdf/ssm.cemetery.burialPermit.ejs | 16 +++++++++++-----
 5 files changed, 61 insertions(+), 7 deletions(-)

diff --git a/helpers/initializer.database.cemetery.js b/helpers/initializer.database.cemetery.js
index ee54cdbd..4ba35533 100644
--- a/helpers/initializer.database.cemetery.js
+++ b/helpers/initializer.database.cemetery.js
@@ -114,13 +114,23 @@ const initializeCemeteryDatabase = () => {
     addOccupancyTypeField({
         occupancyTypeId: intermentOccupancyTypeId,
         occupancyTypeField: "Death Age Period",
-        occupancyTypeFieldValues: "Years,Months,Days,Stillborn",
+        occupancyTypeFieldValues: "Years\nMonths\nDays\nStillborn",
         pattern: "",
         isRequired: "",
         minimumLength: 1,
         maximumLength: 10,
         orderNumber: 3
     }, session);
+    addOccupancyTypeField({
+        occupancyTypeId: intermentOccupancyTypeId,
+        occupancyTypeField: "Death Place",
+        occupancyTypeFieldValues: "",
+        pattern: "",
+        isRequired: "",
+        minimumLength: 1,
+        maximumLength: 100,
+        orderNumber: 4
+    }, session);
     addOccupancyTypeField({
         occupancyTypeId: intermentOccupancyTypeId,
         occupancyTypeField: "Funeral Home",
diff --git a/helpers/initializer.database.cemetery.ts b/helpers/initializer.database.cemetery.ts
index 23227792..85aa5d23 100644
--- a/helpers/initializer.database.cemetery.ts
+++ b/helpers/initializer.database.cemetery.ts
@@ -225,7 +225,7 @@ const initializeCemeteryDatabase = () => {
         {
             occupancyTypeId: intermentOccupancyTypeId,
             occupancyTypeField: "Death Age Period",
-            occupancyTypeFieldValues: "Years,Months,Days,Stillborn",
+            occupancyTypeFieldValues: "Years\nMonths\nDays\nStillborn",
             pattern: "",
             isRequired: "",
             minimumLength: 1,
@@ -235,6 +235,20 @@ const initializeCemeteryDatabase = () => {
         session
     );
 
+    addOccupancyTypeField(
+        {
+            occupancyTypeId: intermentOccupancyTypeId,
+            occupancyTypeField: "Death Place",
+            occupancyTypeFieldValues: "",
+            pattern: "",
+            isRequired: "",
+            minimumLength: 1,
+            maximumLength: 100,
+            orderNumber: 4
+        },
+        session
+    );
+
     addOccupancyTypeField(
         {
             occupancyTypeId: intermentOccupancyTypeId,
diff --git a/temp/legacy.importFromCSV.js b/temp/legacy.importFromCSV.js
index e6b1d603..b4a19a74 100644
--- a/temp/legacy.importFromCSV.js
+++ b/temp/legacy.importFromCSV.js
@@ -827,6 +827,15 @@ function importFromWorkOrderCSV() {
                     lotOccupancyFieldValue
                 }, user);
             }
+            if (workOrderRow.WO_DEATH_PLACE !== "") {
+                addOrUpdateLotOccupancyField({
+                    lotOccupancyId: lotOccupancyId,
+                    occupancyTypeFieldId: allOccupancyTypeFields.find((occupancyTypeField) => {
+                        return occupancyTypeField.occupancyTypeField === "Death Place";
+                    }).occupancyTypeFieldId,
+                    lotOccupancyFieldValue: workOrderRow.WO_DEATH_PLACE
+                }, user);
+            }
             if (workOrderRow.WO_AGE !== "") {
                 addOrUpdateLotOccupancyField({
                     lotOccupancyId: lotOccupancyId,
diff --git a/temp/legacy.importFromCSV.ts b/temp/legacy.importFromCSV.ts
index 3f048b93..c9c7b80a 100644
--- a/temp/legacy.importFromCSV.ts
+++ b/temp/legacy.importFromCSV.ts
@@ -1387,6 +1387,21 @@ function importFromWorkOrderCSV() {
                 );
             }
 
+            if (workOrderRow.WO_DEATH_PLACE !== "") {
+
+                addOrUpdateLotOccupancyField(
+                    {
+                        lotOccupancyId: lotOccupancyId,
+                        occupancyTypeFieldId: allOccupancyTypeFields.find((occupancyTypeField) => {
+                            return occupancyTypeField.occupancyTypeField === "Death Place";
+                        }).occupancyTypeFieldId,
+                        lotOccupancyFieldValue: workOrderRow.WO_DEATH_PLACE
+                    },
+                    user
+                );
+            }
+
+
             if (workOrderRow.WO_AGE !== "") {
                 addOrUpdateLotOccupancyField(
                     {
diff --git a/views/print/pdf/ssm.cemetery.burialPermit.ejs b/views/print/pdf/ssm.cemetery.burialPermit.ejs
index 9b9491ff..c3f0b08c 100644
--- a/views/print/pdf/ssm.cemetery.burialPermit.ejs
+++ b/views/print/pdf/ssm.cemetery.burialPermit.ejs
@@ -6,6 +6,7 @@
     const deceasedOccupants = lotOccupancyFunctions.filterOccupantsByLotOccupantType(lotOccupancy, deceasedLotOccupantType);
 
     const deathDateOccupantTypeField = "Death Date";
+    const deathPlaceOccupantTypeField = "Death Place";
 %>
 <html>
     <head>
@@ -49,10 +50,16 @@
 
         <p>
             who died at
-            <span class="field has-text-centered" style="width:300px">&nbsp;</span>
+            <span class="field has-text-centered" style="width:300px">
+                &nbsp;
+                <%= lotOccupancyFunctions.getFieldValueByOccupancyTypeField(lotOccupancy, deathPlaceOccupantTypeField); %>
+                &nbsp;
+            </span>
             in Ontario on
             <span class="field has-text-centered" style="width:150px">
+                &nbsp;
                 <%= lotOccupancyFunctions.getFieldValueByOccupancyTypeField(lotOccupancy, deathDateOccupantTypeField); %>
+                &nbsp;
             </span>
             .
         </p>
@@ -70,10 +77,9 @@
             5724
         </p>
 
-        <p class="has-text-right">
-            <span class="field" style="width:150px">
-                <%= dateTimeFunctions.dateToString(new Date(lotOccupancy.recordUpdate_timeMillis)) %>
-            </span>
+        <p class="has-text-right mt-4">
+            <span class="field mb-1" style="width:150px">&nbsp;</span><br />
+            <span class="is-8pt">(Year Month Day)</span>
         </p>
     </body>
 </html>
\ No newline at end of file