diff --git a/helpers/lotOccupancyDB/addLotOccupancy.d.ts b/helpers/lotOccupancyDB/addLotOccupancy.d.ts index 0ad517ce..de1e04cb 100644 --- a/helpers/lotOccupancyDB/addLotOccupancy.d.ts +++ b/helpers/lotOccupancyDB/addLotOccupancy.d.ts @@ -4,7 +4,7 @@ interface AddLotOccupancyForm { lotId: string | number; occupancyStartDateString: string; occupancyEndDateString: string; - occupancyTypeFieldIds: string; + occupancyTypeFieldIds?: string; [lotOccupancyFieldValue_occupancyTypeFieldId: string]: unknown; } export declare const addLotOccupancy: (lotOccupancyForm: AddLotOccupancyForm, requestSession: recordTypes.PartialSession) => number; diff --git a/helpers/lotOccupancyDB/addLotOccupancy.js b/helpers/lotOccupancyDB/addLotOccupancy.js index 70400084..67b75273 100644 --- a/helpers/lotOccupancyDB/addLotOccupancy.js +++ b/helpers/lotOccupancyDB/addLotOccupancy.js @@ -22,7 +22,7 @@ export const addLotOccupancy = (lotOccupancyForm, requestSession) => { undefined : dateTimeFunctions.dateStringToInteger(lotOccupancyForm.occupancyEndDateString)), requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis); const lotOccupancyId = result.lastInsertRowid; - const occupancyTypeFieldIds = lotOccupancyForm.occupancyTypeFieldIds.split(","); + const occupancyTypeFieldIds = (lotOccupancyForm.occupancyTypeFieldIds || "").split(","); for (const occupancyTypeFieldId of occupancyTypeFieldIds) { const lotOccupancyFieldValue = lotOccupancyForm["lotOccupancyFieldValue_" + occupancyTypeFieldId]; if (lotOccupancyFieldValue && lotOccupancyFieldValue !== "") { diff --git a/helpers/lotOccupancyDB/addLotOccupancy.ts b/helpers/lotOccupancyDB/addLotOccupancy.ts index cee7078b..1bb2b75a 100644 --- a/helpers/lotOccupancyDB/addLotOccupancy.ts +++ b/helpers/lotOccupancyDB/addLotOccupancy.ts @@ -20,7 +20,7 @@ interface AddLotOccupancyForm { occupancyStartDateString: string; occupancyEndDateString: string; - occupancyTypeFieldIds: string; + occupancyTypeFieldIds?: string; [lotOccupancyFieldValue_occupancyTypeFieldId: string]: unknown; } @@ -60,7 +60,7 @@ export const addLotOccupancy = const lotOccupancyId = result.lastInsertRowid as number; - const occupancyTypeFieldIds = lotOccupancyForm.occupancyTypeFieldIds.split(","); + const occupancyTypeFieldIds = (lotOccupancyForm.occupancyTypeFieldIds || "").split(","); for (const occupancyTypeFieldId of occupancyTypeFieldIds) { diff --git a/helpers/lotOccupancyDB/updateLotOccupancy.d.ts b/helpers/lotOccupancyDB/updateLotOccupancy.d.ts index ed8e7d23..2ca250cf 100644 --- a/helpers/lotOccupancyDB/updateLotOccupancy.d.ts +++ b/helpers/lotOccupancyDB/updateLotOccupancy.d.ts @@ -5,7 +5,7 @@ interface UpdateLotOccupancyForm { lotId: string | number; occupancyStartDateString: string; occupancyEndDateString: string; - occupancyTypeFieldIds: string; + occupancyTypeFieldIds?: string; [lotOccupancyFieldValue_occupancyTypeFieldId: string]: unknown; } export declare function updateLotOccupancy(lotOccupancyForm: UpdateLotOccupancyForm, requestSession: recordTypes.PartialSession): boolean; diff --git a/helpers/lotOccupancyDB/updateLotOccupancy.js b/helpers/lotOccupancyDB/updateLotOccupancy.js index d3f1670a..217208b9 100644 --- a/helpers/lotOccupancyDB/updateLotOccupancy.js +++ b/helpers/lotOccupancyDB/updateLotOccupancy.js @@ -18,7 +18,7 @@ export function updateLotOccupancy(lotOccupancyForm, requestSession) { " and recordDelete_timeMillis is null") .run(lotOccupancyForm.occupancyTypeId, (lotOccupancyForm.lotId === "" ? undefined : lotOccupancyForm.lotId), dateStringToInteger(lotOccupancyForm.occupancyStartDateString), (lotOccupancyForm.occupancyEndDateString === "" ? undefined : dateStringToInteger(lotOccupancyForm.occupancyEndDateString)), requestSession.user.userName, rightNowMillis, lotOccupancyForm.lotOccupancyId); if (result.changes > 0) { - const occupancyTypeFieldIds = lotOccupancyForm.occupancyTypeFieldIds.split(","); + const occupancyTypeFieldIds = (lotOccupancyForm.occupancyTypeFieldIds || "").split(","); for (const occupancyTypeFieldId of occupancyTypeFieldIds) { const lotOccupancyFieldValue = lotOccupancyForm["lotOccupancyFieldValue_" + occupancyTypeFieldId]; if (lotOccupancyFieldValue && lotOccupancyFieldValue !== "") { diff --git a/helpers/lotOccupancyDB/updateLotOccupancy.ts b/helpers/lotOccupancyDB/updateLotOccupancy.ts index e41a4876..c92932e8 100644 --- a/helpers/lotOccupancyDB/updateLotOccupancy.ts +++ b/helpers/lotOccupancyDB/updateLotOccupancy.ts @@ -26,7 +26,7 @@ interface UpdateLotOccupancyForm { occupancyStartDateString: string; occupancyEndDateString: string; - occupancyTypeFieldIds: string; + occupancyTypeFieldIds?: string; [lotOccupancyFieldValue_occupancyTypeFieldId: string]: unknown; } @@ -57,7 +57,7 @@ export function updateLotOccupancy(lotOccupancyForm: UpdateLotOccupancyForm, req if (result.changes > 0) { - const occupancyTypeFieldIds = lotOccupancyForm.occupancyTypeFieldIds.split(","); + const occupancyTypeFieldIds = (lotOccupancyForm.occupancyTypeFieldIds || "").split(","); for (const occupancyTypeFieldId of occupancyTypeFieldIds) {