diff --git a/helpers/functions.config.js b/helpers/functions.config.js index 1dd1d142..14dd4bd7 100644 --- a/helpers/functions.config.js +++ b/helpers/functions.config.js @@ -37,7 +37,7 @@ configFallbackValues.set("settings.workOrders.workOrderNumberLength", 6); configFallbackValues.set("settings.workOrders.workOrderMilestoneDateRecentBeforeDays", 5); configFallbackValues.set("settings.workOrders.workOrderMilestoneDateRecentAfterDays", 60); configFallbackValues.set("settings.workOrders.calendarEmailAddress", "no-reply@127.0.0.1"); -configFallbackValues.set("settings.workOrders.prints", ["pdf/workOrder"]); +configFallbackValues.set("settings.workOrders.prints", ["pdf/workOrder", "pdf/workOrder-commentLog"]); configFallbackValues.set("settings.adminCleanup.recordDeleteAgeDays", 60); export function getProperty(propertyName) { const propertyNameSplit = propertyName.split("."); diff --git a/helpers/functions.config.ts b/helpers/functions.config.ts index c00fa76c..5bcbbef2 100644 --- a/helpers/functions.config.ts +++ b/helpers/functions.config.ts @@ -56,7 +56,7 @@ configFallbackValues.set("settings.workOrders.workOrderNumberLength", 6); configFallbackValues.set("settings.workOrders.workOrderMilestoneDateRecentBeforeDays", 5); configFallbackValues.set("settings.workOrders.workOrderMilestoneDateRecentAfterDays", 60); configFallbackValues.set("settings.workOrders.calendarEmailAddress", "no-reply@127.0.0.1"); -configFallbackValues.set("settings.workOrders.prints", ["pdf/workOrder"]); +configFallbackValues.set("settings.workOrders.prints", ["pdf/workOrder", "pdf/workOrder-commentLog"]); configFallbackValues.set("settings.adminCleanup.recordDeleteAgeDays", 60); diff --git a/helpers/functions.print.js b/helpers/functions.print.js index 0bfda04f..c5dea290 100644 --- a/helpers/functions.print.js +++ b/helpers/functions.print.js @@ -19,6 +19,10 @@ const pdfPrintConfigs = { title: "Work Order Field Sheet", params: ["workOrderId"] }, + "workOrder-commentLog": { + title: "Work Order Field Sheet - Comment Log", + params: ["workOrderId"] + }, "ssm.cemetery.burialPermit": { title: "Burial Permit", params: ["lotOccupancyId"] diff --git a/helpers/functions.print.ts b/helpers/functions.print.ts index 6d14fffc..8e804381 100644 --- a/helpers/functions.print.ts +++ b/helpers/functions.print.ts @@ -31,6 +31,10 @@ const pdfPrintConfigs: { [printName: string]: PrintConfig } = { title: "Work Order Field Sheet", params: ["workOrderId"] }, + "workOrder-commentLog": { + title: "Work Order Field Sheet - Comment Log", + params: ["workOrderId"] + }, // Occupancy "ssm.cemetery.burialPermit": { diff --git a/views/lotOccupancy-edit.ejs b/views/lotOccupancy-edit.ejs index 6f3caaf9..37c877b9 100644 --- a/views/lotOccupancy-edit.ejs +++ b/views/lotOccupancy-edit.ejs @@ -67,7 +67,7 @@
+ Work Order #<%= workOrder.workOrderNumber %>+ |
+
+
+ <% if (workOrder.workOrderCloseDate) { %>
+ CLOSED + <% } %> + <%= workOrder.workOrderType %> + + |
+
|
+
+
+ Description |
+
+
+ Open Date
+ Close Date |
+
There are no comments associated with this work order.
+ <% } else { %> +| Commentor | +Comment Time | +Comment | +
|---|---|---|
| <%= comment.recordUpdate_userName %> | +<%= comment.workOrderCommentDateString %> <%= comment.workOrderCommentTimeString %> | +<%= comment.workOrderComment %> | +
+ <%
+ const recordCreateDate = new Date(workOrder.recordCreate_timeMillis);
+ const currentDate = new Date();
+ %>
+ Work order created <%= dateTimeFunctions.dateToString(recordCreateDate) %> at <%= dateTimeFunctions.dateToTimeString(recordCreateDate) %>.
+ Printed <%= dateTimeFunctions.dateToString(currentDate) %> at <%= dateTimeFunctions.dateToTimeString(currentDate) %>.
+ workOrderId = <%= workOrder.workOrderId %>
+