diff --git a/handlers/api-get/milestoneICS.js b/handlers/api-get/milestoneICS.js index e2989344..8ddbc3e3 100644 --- a/handlers/api-get/milestoneICS.js +++ b/handlers/api-get/milestoneICS.js @@ -1,6 +1,7 @@ import ical, { ICalEventStatus } from "ical-generator"; import { getWorkOrderMilestones } from "../../helpers/lotOccupancyDB/getWorkOrderMilestones.js"; import * as configFunctions from "../../helpers/functions.config.js"; +import { getPrintConfig } from "../../helpers/functions.print.js"; const timeStringSplitRegex = /[ :-]/; function escapeHTML(stringToEscape) { return stringToEscape.replace(/[^\d A-Za-z]/g, (c) => "" + c.codePointAt(0) + ";"); @@ -45,9 +46,10 @@ export const handler = (request, response) => { const milestoneDate = new Date(Number.parseInt(milestoneTimePieces[0], 10), Number.parseInt(milestoneTimePieces[1], 10) - 1, Number.parseInt(milestoneTimePieces[2], 10), Number.parseInt(milestoneTimePieces[3], 10), Number.parseInt(milestoneTimePieces[4], 10)); const milestoneEndDate = new Date(milestoneDate.getTime()); milestoneEndDate.setHours(milestoneEndDate.getHours() + 1); - let summary = (milestone.workOrderMilestoneTypeId - ? milestone.workOrderMilestoneType - : milestone.workOrderMilestoneDescription).trim(); + let summary = (milestone.workOrderMilestoneCompletionDate ? "✔ " : "") + + (milestone.workOrderMilestoneTypeId + ? milestone.workOrderMilestoneType + : milestone.workOrderMilestoneDescription).trim(); if (milestone.workOrderLotOccupancies.length > 0) { let occupantCount = 0; for (const lotOccupancy of milestone.workOrderLotOccupancies) { @@ -87,7 +89,7 @@ export const handler = (request, response) => { milestone.workOrderNumber + "" + ("
" + escapeHTML(milestone.workOrderDescription) + "
") + - ('"); + ("" + workOrderURL + "
"); if (milestone.workOrderLotOccupancies.length > 0) { descriptionHTML += "" +
+ escapeHTML(printConfig.title) +
+ "
" +
+ (urlRoot +
+ "/print/" +
+ printName +
+ "/?workOrderId=" +
+ milestone.workOrderId) +
+ "
" + escapeHTML(milestone.workOrderDescription) + "
") + - ('"); + ("" + workOrderURL + "
"); if (milestone.workOrderLotOccupancies.length > 0) { descriptionHTML += @@ -229,6 +231,29 @@ export const handler: RequestHandler = (request, response) => { descriptionHTML += ""; } + const prints = configFunctions.getProperty("settings.workOrders.prints"); + + if (prints.length > 0) { + descriptionHTML += "" +
+ escapeHTML(printConfig.title) +
+ "
" +
+ (urlRoot +
+ "/print/" +
+ printName +
+ "/?workOrderId=" +
+ milestone.workOrderId) +
+ "