|
@@ -26,16 +29,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
${burialSite.cemeteryId === null
? '(No Cemetery)'
: `
- ${burialSite.cemeteryName === ''
- ? '(No Name)'
- : cityssm.escapeHTML(burialSite.cemeteryName)}
- `}
+ ${cemeteryNameHtml}
+ `}
|
${cityssm.escapeHTML(burialSite.burialSiteType ?? '')}
|
- ${burialSite.burialSiteStatusId
- ? cityssm.escapeHTML(burialSite.burialSiteStatus ?? '')
- : '(No Status)'}
+ ${burialSite.burialSiteStatusId === null ||
+ burialSite.burialSiteStatusId === undefined
+ ? '(No Status)'
+ : cityssm.escapeHTML(burialSite.burialSiteStatus ?? '')}
${(burialSite.contractCount ?? 0) > 0
? 'Has Current Contracts'
: ''}
diff --git a/public/javascripts/burialSite.search.ts b/public/javascripts/burialSite.search.ts
index cddf17f9..fb3fd9cd 100644
--- a/public/javascripts/burialSite.search.ts
+++ b/public/javascripts/burialSite.search.ts
@@ -44,6 +44,11 @@ declare const exports: Record
const resultsTbodyElement = document.createElement('tbody')
for (const burialSite of responseJSON.burialSites) {
+ const cemeteryNameHtml =
+ burialSite.cemeteryName === ''
+ ? '(No Name)'
+ : cityssm.escapeHTML(burialSite.cemeteryName ?? '')
+
// eslint-disable-next-line no-unsanitized/method
resultsTbodyElement.insertAdjacentHTML(
'beforeend',
@@ -57,20 +62,17 @@ declare const exports: Record
burialSite.cemeteryId === null
? '(No Cemetery)'
: `
- ${
- burialSite.cemeteryName === ''
- ? '(No Name)'
- : cityssm.escapeHTML(burialSite.cemeteryName)
- }
- `
+ ${cemeteryNameHtml}
+ `
}
|
${cityssm.escapeHTML(burialSite.burialSiteType ?? '')}
|
${
- burialSite.burialSiteStatusId
- ? cityssm.escapeHTML(burialSite.burialSiteStatus ?? '')
- : '(No Status)'
+ burialSite.burialSiteStatusId === null ||
+ burialSite.burialSiteStatusId === undefined
+ ? '(No Status)'
+ : cityssm.escapeHTML(burialSite.burialSiteStatus ?? '')
}
${
(burialSite.contractCount ?? 0) > 0
diff --git a/temp/legacyImportFromCsv/data.cemeteries.ts b/temp/legacyImportFromCsv/data.cemeteries.ts
index 3427354e..2120edb6 100644
--- a/temp/legacyImportFromCsv/data.cemeteries.ts
+++ b/temp/legacyImportFromCsv/data.cemeteries.ts
@@ -243,7 +243,7 @@ const cemeteryKeyToCemetery: Record = {
},
WS: {
cemeteryName: 'West Section',
-
+
cemeteryDescription: 'At Old Greenwood Cemetery',
cemeteryKey: 'WS',
cemeterySvg: '',
@@ -282,7 +282,7 @@ export function getCemeteryIdByKey(
}
console.log(`Cemetery cache miss: ${cemeteryKey}`)
-
+
const cemetery = getCemeteryByKey(cemeteryKey)
console.log(`Cemetery found: ${cemeteryKey}`)
@@ -295,6 +295,7 @@ export function getCemeteryIdByKey(
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
addForm ??= {
cemeteryName: cemeteryKey,
+
cemeteryDescription: '',
cemeteryKey,
diff --git a/temp/legacyImportFromCsv/index.js b/temp/legacyImportFromCsv/index.js
index 8ce80510..fdb91286 100644
--- a/temp/legacyImportFromCsv/index.js
+++ b/temp/legacyImportFromCsv/index.js
@@ -373,8 +373,8 @@ async function importFromPrepaidCSV() {
deceasedName: prepaidRow.CMPP_PREPAID_FOR_NAME,
contractStartDateString
}, {
- includeInterments: false,
includeFees: false,
+ includeInterments: false,
includeTransactions: false,
limit: -1,
offset: 0
@@ -386,15 +386,15 @@ async function importFromPrepaidCSV() {
contractId ||= addContract({
burialSiteId: burialSite ? burialSite.burialSiteId : '',
contractTypeId: importIds.preneedContractType.contractTypeId,
- contractStartDateString,
contractEndDateString: '',
+ contractStartDateString,
purchaserName: prepaidRow.CMPP_ARRANGED_BY_NAME,
deceasedName: prepaidRow.CMPP_PREPAID_FOR_NAME,
deceasedAddress1: prepaidRow.CMPP_ADDRESS,
deceasedAddress2: '',
deceasedCity: prepaidRow.CMPP_CITY,
- deceasedProvince: prepaidRow.CMPP_PROV.slice(0, 2),
- deceasedPostalCode: `${prepaidRow.CMPP_POSTAL1} ${prepaidRow.CMPP_POSTAL2}`
+ deceasedPostalCode: `${prepaidRow.CMPP_POSTAL1} ${prepaidRow.CMPP_POSTAL2}`,
+ deceasedProvince: prepaidRow.CMPP_PROV.slice(0, 2)
}, user);
if (prepaidRow.CMPP_FEE_GRAV_SD !== '0.0') {
await addContractFee({
@@ -499,15 +499,15 @@ async function importFromPrepaidCSV() {
if (prepaidRow.CMPP_REMARK1 !== '') {
addContractComment({
contractId,
- commentDateString: contractStartDateString,
- comment: prepaidRow.CMPP_REMARK1
+ comment: prepaidRow.CMPP_REMARK1,
+ commentDateString: contractStartDateString
}, user);
}
if (prepaidRow.CMPP_REMARK2 !== '') {
addContractComment({
contractId,
- commentDateString: contractStartDateString,
- comment: prepaidRow.CMPP_REMARK2
+ comment: prepaidRow.CMPP_REMARK2,
+ commentDateString: contractStartDateString
}, user);
}
}
@@ -602,10 +602,10 @@ async function importFromWorkOrderCSV() {
const workOrderContainsBurialSite = workOrder?.workOrderBurialSites?.find((possibleLot) => possibleLot.burialSiteId === burialSite?.burialSiteId);
if (!workOrderContainsBurialSite) {
addWorkOrderBurialSite({
- workOrderId: workOrder.workOrderId,
- burialSiteId: burialSite.burialSiteId
+ workOrderId: workOrder?.workOrderId,
+ burialSiteId: burialSite?.burialSiteId
}, user);
- workOrder.workOrderBurialSites.push(burialSite);
+ workOrder?.workOrderBurialSites?.push(burialSite);
}
}
let contractStartDateString = workOrderOpenDateString;
@@ -655,7 +655,7 @@ async function importFromWorkOrderCSV() {
intermentContainerTypeId
}, user);
addWorkOrderContract({
- workOrderId: workOrder.workOrderId,
+ workOrderId: workOrder?.workOrderId,
contractId
}, user);
// Milestones
@@ -663,7 +663,7 @@ async function importFromWorkOrderCSV() {
let maxMilestoneCompletionDateString = workOrderOpenDateString;
if (importIds.acknowledgedWorkOrderMilestoneTypeId) {
addWorkOrderMilestone({
- workOrderId: workOrder.workOrderId,
+ workOrderId: workOrder?.workOrderId,
workOrderMilestoneTypeId: importIds.acknowledgedWorkOrderMilestoneTypeId,
workOrderMilestoneDateString: workOrderOpenDateString,
workOrderMilestoneDescription: '',
@@ -677,7 +677,7 @@ async function importFromWorkOrderCSV() {
const workOrderMilestoneDateString = formatDateString(workOrderRow.WO_DEATH_YR, workOrderRow.WO_DEATH_MON, workOrderRow.WO_DEATH_DAY);
if (importIds.deathWorkOrderMilestoneTypeId) {
addWorkOrderMilestone({
- workOrderId: workOrder.workOrderId,
+ workOrderId: workOrder?.workOrderId,
workOrderMilestoneTypeId: importIds.deathWorkOrderMilestoneTypeId,
workOrderMilestoneDateString,
workOrderMilestoneDescription: `Death Place: ${workOrderRow.WO_DEATH_PLACE}`,
@@ -705,7 +705,7 @@ async function importFromWorkOrderCSV() {
const workOrderMilestoneTimeString = formatTimeString(funeralHour.toString(), workOrderRow.WO_FUNERAL_MIN === '' ? '0' : workOrderRow.WO_FUNERAL_MIN);
if (importIds.funeralWorkOrderMilestoneTypeId) {
addWorkOrderMilestone({
- workOrderId: workOrder.workOrderId,
+ workOrderId: workOrder?.workOrderId,
workOrderMilestoneTypeId: importIds.funeralWorkOrderMilestoneTypeId,
workOrderMilestoneDateString,
workOrderMilestoneTimeString,
@@ -728,7 +728,7 @@ async function importFromWorkOrderCSV() {
if (workOrderRow.WO_CREMATION === 'Y' &&
importIds.cremationWorkOrderMilestoneTypeId) {
addWorkOrderMilestone({
- workOrderId: workOrder.workOrderId,
+ workOrderId: workOrder?.workOrderId,
workOrderMilestoneTypeId: importIds.cremationWorkOrderMilestoneTypeId,
workOrderMilestoneDateString: maxMilestoneCompletionDateString,
workOrderMilestoneDescription: '',
@@ -744,7 +744,7 @@ async function importFromWorkOrderCSV() {
const workOrderMilestoneDateString = formatDateString(workOrderRow.WO_INTERMENT_YR, workOrderRow.WO_INTERMENT_MON, workOrderRow.WO_INTERMENT_DAY);
if (importIds.intermentWorkOrderMilestoneTypeId) {
addWorkOrderMilestone({
- workOrderId: workOrder.workOrderId,
+ workOrderId: workOrder?.workOrderId,
workOrderMilestoneTypeId: importIds.intermentWorkOrderMilestoneTypeId,
workOrderMilestoneDateString,
workOrderMilestoneDescription: `Depth: ${workOrderRow.WO_DEPTH}`,
@@ -765,7 +765,7 @@ async function importFromWorkOrderCSV() {
}
if (!hasIncompleteMilestones) {
closeWorkOrder({
- workOrderId: workOrder.workOrderId,
+ workOrderId: workOrder?.workOrderId,
workOrderCloseDateString: maxMilestoneCompletionDateString
}, user);
}
diff --git a/temp/legacyImportFromCsv/index.ts b/temp/legacyImportFromCsv/index.ts
index 8451854d..de3b83e9 100644
--- a/temp/legacyImportFromCsv/index.ts
+++ b/temp/legacyImportFromCsv/index.ts
@@ -612,8 +612,8 @@ async function importFromPrepaidCSV(): Promise {
contractStartDateString
},
{
- includeInterments: false,
includeFees: false,
+ includeInterments: false,
includeTransactions: false,
limit: -1,
offset: 0
@@ -629,17 +629,19 @@ async function importFromPrepaidCSV(): Promise {
{
burialSiteId: burialSite ? burialSite.burialSiteId : '',
contractTypeId: importIds.preneedContractType.contractTypeId,
- contractStartDateString,
+
contractEndDateString: '',
+ contractStartDateString,
purchaserName: prepaidRow.CMPP_ARRANGED_BY_NAME,
deceasedName: prepaidRow.CMPP_PREPAID_FOR_NAME,
+
deceasedAddress1: prepaidRow.CMPP_ADDRESS,
deceasedAddress2: '',
deceasedCity: prepaidRow.CMPP_CITY,
- deceasedProvince: prepaidRow.CMPP_PROV.slice(0, 2),
- deceasedPostalCode: `${prepaidRow.CMPP_POSTAL1} ${prepaidRow.CMPP_POSTAL2}`
+ deceasedPostalCode: `${prepaidRow.CMPP_POSTAL1} ${prepaidRow.CMPP_POSTAL2}`,
+ deceasedProvince: prepaidRow.CMPP_PROV.slice(0, 2)
},
user
)
@@ -801,8 +803,8 @@ async function importFromPrepaidCSV(): Promise {
{
contractId,
- commentDateString: contractStartDateString,
- comment: prepaidRow.CMPP_REMARK1
+ comment: prepaidRow.CMPP_REMARK1,
+ commentDateString: contractStartDateString
},
user
)
@@ -813,8 +815,8 @@ async function importFromPrepaidCSV(): Promise {
{
contractId,
- commentDateString: contractStartDateString,
- comment: prepaidRow.CMPP_REMARK2
+ comment: prepaidRow.CMPP_REMARK2,
+ commentDateString: contractStartDateString
},
user
)
@@ -956,13 +958,15 @@ async function importFromWorkOrderCSV(): Promise {
if (!workOrderContainsBurialSite) {
addWorkOrderBurialSite(
{
- workOrderId: workOrder.workOrderId!,
- burialSiteId: burialSite.burialSiteId
+ workOrderId: workOrder?.workOrderId as number,
+ burialSiteId: burialSite?.burialSiteId as number
},
user
)
- workOrder.workOrderBurialSites!.push(burialSite)
+ workOrder?.workOrderBurialSites?.push(
+ burialSite as recordTypes.BurialSite
+ )
}
}
@@ -1047,7 +1051,7 @@ async function importFromWorkOrderCSV(): Promise {
addWorkOrderContract(
{
- workOrderId: workOrder.workOrderId!,
+ workOrderId: workOrder?.workOrderId as number,
contractId
},
user
@@ -1061,7 +1065,7 @@ async function importFromWorkOrderCSV(): Promise {
if (importIds.acknowledgedWorkOrderMilestoneTypeId) {
addWorkOrderMilestone(
{
- workOrderId: workOrder.workOrderId!,
+ workOrderId: workOrder?.workOrderId as number,
workOrderMilestoneTypeId:
importIds.acknowledgedWorkOrderMilestoneTypeId,
workOrderMilestoneDateString: workOrderOpenDateString,
@@ -1087,7 +1091,7 @@ async function importFromWorkOrderCSV(): Promise {
if (importIds.deathWorkOrderMilestoneTypeId) {
addWorkOrderMilestone(
{
- workOrderId: workOrder.workOrderId!,
+ workOrderId: workOrder?.workOrderId as number,
workOrderMilestoneTypeId: importIds.deathWorkOrderMilestoneTypeId,
workOrderMilestoneDateString,
workOrderMilestoneDescription: `Death Place: ${workOrderRow.WO_DEATH_PLACE}`,
@@ -1136,7 +1140,7 @@ async function importFromWorkOrderCSV(): Promise {
if (importIds.funeralWorkOrderMilestoneTypeId) {
addWorkOrderMilestone(
{
- workOrderId: workOrder.workOrderId!,
+ workOrderId: workOrder?.workOrderId as number,
workOrderMilestoneTypeId:
importIds.funeralWorkOrderMilestoneTypeId,
workOrderMilestoneDateString,
@@ -1170,7 +1174,7 @@ async function importFromWorkOrderCSV(): Promise {
) {
addWorkOrderMilestone(
{
- workOrderId: workOrder.workOrderId!,
+ workOrderId: workOrder?.workOrderId as number,
workOrderMilestoneTypeId:
importIds.cremationWorkOrderMilestoneTypeId,
workOrderMilestoneDateString: maxMilestoneCompletionDateString,
@@ -1198,7 +1202,7 @@ async function importFromWorkOrderCSV(): Promise {
if (importIds.intermentWorkOrderMilestoneTypeId) {
addWorkOrderMilestone(
{
- workOrderId: workOrder.workOrderId!,
+ workOrderId: workOrder?.workOrderId as number,
workOrderMilestoneTypeId:
importIds.intermentWorkOrderMilestoneTypeId,
workOrderMilestoneDateString,
@@ -1228,7 +1232,8 @@ async function importFromWorkOrderCSV(): Promise {
if (!hasIncompleteMilestones) {
closeWorkOrder(
{
- workOrderId: workOrder.workOrderId!,
+ workOrderId: workOrder?.workOrderId as number,
+
workOrderCloseDateString: maxMilestoneCompletionDateString
},
user
diff --git a/types/record.types.d.ts b/types/record.types.d.ts
index ba259e37..8ac7fec1 100644
--- a/types/record.types.d.ts
+++ b/types/record.types.d.ts
@@ -21,7 +21,7 @@ export interface BurialSite extends Record {
burialSiteLatitude?: number;
burialSiteLongitude?: number;
burialSiteStatus?: string;
- burialSiteStatusId?: number;
+ burialSiteStatusId?: number | null;
burialSiteFields?: BurialSiteField[];
contractCount?: number;
contracts?: Contract[];
@@ -306,8 +306,8 @@ export interface WorkOrderComment extends Record {
commentDate?: number;
commentDateString?: string;
commentTime?: number;
- commentTimeString?: string;
commentTimePeriodString?: string;
+ commentTimeString?: string;
comment?: string;
}
export interface WorkOrderMilestone extends Record, WorkOrder {
@@ -317,23 +317,23 @@ export interface WorkOrderMilestone extends Record, WorkOrder {
workOrderMilestoneDate?: number;
workOrderMilestoneDateString?: string;
workOrderMilestoneTime?: number;
- workOrderMilestoneTimeString?: string;
workOrderMilestoneTimePeriodString?: string;
+ workOrderMilestoneTimeString?: string;
workOrderMilestoneDescription?: string;
workOrderMilestoneCompletionDate?: number;
workOrderMilestoneCompletionDateString?: string;
workOrderMilestoneCompletionTime?: number;
- workOrderMilestoneCompletionTimeString?: string;
workOrderMilestoneCompletionTimePeriodString?: string;
+ workOrderMilestoneCompletionTimeString?: string;
workOrderRecordUpdate_timeMillis?: number;
}
export interface WorkOrderMilestoneType extends Record {
- workOrderMilestoneTypeId: number;
workOrderMilestoneType: string;
+ workOrderMilestoneTypeId: number;
orderNumber?: number;
}
export interface WorkOrderType extends Record {
- workOrderTypeId: number;
workOrderType?: string;
+ workOrderTypeId: number;
orderNumber?: number;
}
diff --git a/types/record.types.ts b/types/record.types.ts
index 4f7d8fc9..608f6f3b 100644
--- a/types/record.types.ts
+++ b/types/record.types.ts
@@ -30,7 +30,7 @@ export interface BurialSite extends Record {
burialSiteLongitude?: number
burialSiteStatus?: string
- burialSiteStatusId?: number
+ burialSiteStatusId?: number | null
burialSiteFields?: BurialSiteField[]
@@ -427,8 +427,8 @@ export interface WorkOrderComment extends Record {
commentDateString?: string
commentTime?: number
- commentTimeString?: string
commentTimePeriodString?: string
+ commentTimeString?: string
comment?: string
}
@@ -443,8 +443,8 @@ export interface WorkOrderMilestone extends Record, WorkOrder {
workOrderMilestoneDateString?: string
workOrderMilestoneTime?: number
- workOrderMilestoneTimeString?: string
workOrderMilestoneTimePeriodString?: string
+ workOrderMilestoneTimeString?: string
workOrderMilestoneDescription?: string
@@ -452,22 +452,22 @@ export interface WorkOrderMilestone extends Record, WorkOrder {
workOrderMilestoneCompletionDateString?: string
workOrderMilestoneCompletionTime?: number
- workOrderMilestoneCompletionTimeString?: string
workOrderMilestoneCompletionTimePeriodString?: string
+ workOrderMilestoneCompletionTimeString?: string
workOrderRecordUpdate_timeMillis?: number
}
export interface WorkOrderMilestoneType extends Record {
- workOrderMilestoneTypeId: number
workOrderMilestoneType: string
+ workOrderMilestoneTypeId: number
orderNumber?: number
}
export interface WorkOrderType extends Record {
- workOrderTypeId: number
workOrderType?: string
+ workOrderTypeId: number
orderNumber?: number
}
|