diff --git a/app/controllers/report.controller.js b/app/controllers/report.controller.js index 2cb644e..886d6e3 100644 --- a/app/controllers/report.controller.js +++ b/app/controllers/report.controller.js @@ -96,11 +96,14 @@ const formatUtcToLocalHm = (dateLike) => { return parsed.tz(TARGET_TIMEZONE).format("HH:mm"); }; -const safeSetField = (form, fieldName, value) => { +const safeSetField = (form, fieldName, value, options = {}) => { if (!fieldName || value === undefined || value === null) return; const text = `${value}`; try { const field = form.getTextField(fieldName); + if (typeof options.fontSize === "number") { + field.setFontSize(options.fontSize); + } field.setText(text); return; } catch (_textErr) {} @@ -146,7 +149,8 @@ const buildRoutePdfBuffer = async (templateBytes, route, seqNum, driversMap, veh safeSetField(form, `name_${row}`, customer?.customer_name || ""); safeSetField(form, `addr_${row}`, customer?.customer_address || ""); safeSetField(form, `phone_${row}`, customer?.customer_phone || ""); - safeSetField(form, `note_${row}`, customer?.customer_note || ""); + const customerNoteText = customer?.customer_note || customer?.customer_special_needs || ""; + safeSetField(form, `note_${row}`, customerNoteText); const pickupTime = formatUtcToLocalHm(customer?.customer_pickup_time); if (pickupTime) safeSetField(form, `pick_${row}`, pickupTime); @@ -157,14 +161,14 @@ const buildRoutePdfBuffer = async (templateBytes, route, seqNum, driversMap, veh if (enterCenterTime) { safeSetField(form, `arrive_${row}`, enterCenterTime); } - safeSetField(form, `y_${row}`, "✓"); - safeSetField(form, `n_${row}`, ""); + safeSetField(form, `y_${row}`, "✓", { fontSize: 11 }); + safeSetField(form, `n_${row}`, "", { fontSize: 11 }); } else if (customer?.customer_route_status === "inCenter") { - safeSetField(form, `y_${row}`, "✓"); - safeSetField(form, `n_${row}`, ""); + safeSetField(form, `y_${row}`, "✓", { fontSize: 11 }); + safeSetField(form, `n_${row}`, "", { fontSize: 11 }); } else { - safeSetField(form, `y_${row}`, ""); - safeSetField(form, `n_${row}`, "✕"); + safeSetField(form, `y_${row}`, "", { fontSize: 11 }); + safeSetField(form, `n_${row}`, "✕", { fontSize: 11 }); } const outboundStatus = findOutboundStatusByCustomerId(outboundCustomerStatuses, customer?.customer_id); diff --git a/client/src/components/trans-routes/RouteReportWithSignature.js b/client/src/components/trans-routes/RouteReportWithSignature.js index 590f276..051e7b7 100644 --- a/client/src/components/trans-routes/RouteReportWithSignature.js +++ b/client/src/components/trans-routes/RouteReportWithSignature.js @@ -185,7 +185,7 @@ const RouteReportWithSignature = () => { const getRouteNoteText = (...customerCandidates) => { for (const item of customerCandidates) { - const noteText = (item?.customer_note || '').toString().trim(); + const noteText = (item?.customer_note || item?.customer_special_needs || '').toString().trim(); if (noteText) return noteText; } return '';