diff --git a/data/config.cemetery.ontario.js b/data/config.cemetery.ontario.js index ee321fe3..b788099e 100644 --- a/data/config.cemetery.ontario.js +++ b/data/config.cemetery.ontario.js @@ -1,6 +1,6 @@ -import { config as cemeteryConfig } from "./config.cemetery.js"; +import { config as cemeteryConfig } from './config.cemetery.js'; export const config = Object.assign({}, cemeteryConfig); -config.settings.lotOccupancy.occupantProvinceDefault = "ON"; -config.settings.map.mapProvinceDefault = "ON"; +config.settings.lotOccupancy.occupantProvinceDefault = 'ON'; +config.settings.map.mapProvinceDefault = 'ON'; config.settings.fees.taxPercentageDefault = 13; export default config; diff --git a/data/config.cemetery.ontario.ts b/data/config.cemetery.ontario.ts index 1eeae569..59d36276 100644 --- a/data/config.cemetery.ontario.ts +++ b/data/config.cemetery.ontario.ts @@ -1,11 +1,11 @@ -import { config as cemeteryConfig } from "./config.cemetery.js"; +import { config as cemeteryConfig } from './config.cemetery.js' -export const config = Object.assign({}, cemeteryConfig); +export const config = Object.assign({}, cemeteryConfig) -config.settings.lotOccupancy.occupantProvinceDefault = "ON"; +config.settings.lotOccupancy.occupantProvinceDefault = 'ON' -config.settings.map.mapProvinceDefault = "ON"; +config.settings.map.mapProvinceDefault = 'ON' -config.settings.fees.taxPercentageDefault = 13; +config.settings.fees.taxPercentageDefault = 13 -export default config; \ No newline at end of file +export default config diff --git a/helpers/lotOccupancyDB/getLotOccupancyComments.d.ts b/helpers/lotOccupancyDB/getLotOccupancyComments.d.ts index f4898195..bb8be353 100644 --- a/helpers/lotOccupancyDB/getLotOccupancyComments.d.ts +++ b/helpers/lotOccupancyDB/getLotOccupancyComments.d.ts @@ -1,4 +1,4 @@ -import sqlite from "better-sqlite3"; -import type * as recordTypes from "../../types/recordTypes"; +import sqlite from 'better-sqlite3'; +import type * as recordTypes from '../../types/recordTypes'; export declare function getLotOccupancyComments(lotOccupancyId: number | string, connectedDatabase?: sqlite.Database): recordTypes.LotOccupancyComment[]; export default getLotOccupancyComments; diff --git a/helpers/lotOccupancyDB/getLotOccupancyComments.js b/helpers/lotOccupancyDB/getLotOccupancyComments.js index 8c95c8fd..39e8b2a1 100644 --- a/helpers/lotOccupancyDB/getLotOccupancyComments.js +++ b/helpers/lotOccupancyDB/getLotOccupancyComments.js @@ -1,13 +1,13 @@ -import sqlite from "better-sqlite3"; -import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -import { dateIntegerToString, timeIntegerToString } from "@cityssm/expressjs-server-js/dateTimeFns.js"; +import sqlite from 'better-sqlite3'; +import { lotOccupancyDB as databasePath } from '../../data/databasePaths.js'; +import { dateIntegerToString, timeIntegerToString } from '@cityssm/expressjs-server-js/dateTimeFns.js'; export function getLotOccupancyComments(lotOccupancyId, connectedDatabase) { - const database = connectedDatabase || + const database = connectedDatabase ?? sqlite(databasePath, { readonly: true }); - database.function("userFn_dateIntegerToString", dateIntegerToString); - database.function("userFn_timeIntegerToString", timeIntegerToString); + database.function('userFn_dateIntegerToString', dateIntegerToString); + database.function('userFn_timeIntegerToString', timeIntegerToString); const lotComments = database .prepare(`select lotOccupancyCommentId, lotOccupancyCommentDate, userFn_dateIntegerToString(lotOccupancyCommentDate) as lotOccupancyCommentDateString, diff --git a/helpers/lotOccupancyDB/getLotOccupancyComments.ts b/helpers/lotOccupancyDB/getLotOccupancyComments.ts index 5fdcc35c..2419f95b 100644 --- a/helpers/lotOccupancyDB/getLotOccupancyComments.ts +++ b/helpers/lotOccupancyDB/getLotOccupancyComments.ts @@ -1,30 +1,30 @@ -import sqlite from "better-sqlite3"; +import sqlite from 'better-sqlite3' -import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; +import { lotOccupancyDB as databasePath } from '../../data/databasePaths.js' import { - dateIntegerToString, - timeIntegerToString -} from "@cityssm/expressjs-server-js/dateTimeFns.js"; + dateIntegerToString, + timeIntegerToString +} from '@cityssm/expressjs-server-js/dateTimeFns.js' -import type * as recordTypes from "../../types/recordTypes"; +import type * as recordTypes from '../../types/recordTypes' export function getLotOccupancyComments( - lotOccupancyId: number | string, - connectedDatabase?: sqlite.Database + lotOccupancyId: number | string, + connectedDatabase?: sqlite.Database ): recordTypes.LotOccupancyComment[] { - const database = - connectedDatabase || - sqlite(databasePath, { - readonly: true - }); + const database = + connectedDatabase ?? + sqlite(databasePath, { + readonly: true + }) - database.function("userFn_dateIntegerToString", dateIntegerToString); - database.function("userFn_timeIntegerToString", timeIntegerToString); + database.function('userFn_dateIntegerToString', dateIntegerToString) + database.function('userFn_timeIntegerToString', timeIntegerToString) - const lotComments = database - .prepare( - `select lotOccupancyCommentId, + const lotComments = database + .prepare( + `select lotOccupancyCommentId, lotOccupancyCommentDate, userFn_dateIntegerToString(lotOccupancyCommentDate) as lotOccupancyCommentDateString, lotOccupancyCommentTime, userFn_timeIntegerToString(lotOccupancyCommentTime) as lotOccupancyCommentTimeString, lotOccupancyComment, @@ -33,14 +33,14 @@ export function getLotOccupancyComments( where recordDelete_timeMillis is null and lotOccupancyId = ? order by lotOccupancyCommentDate desc, lotOccupancyCommentTime desc, lotOccupancyCommentId desc` - ) - .all(lotOccupancyId); + ) + .all(lotOccupancyId) - if (!connectedDatabase) { - database.close(); - } + if (!connectedDatabase) { + database.close() + } - return lotComments; + return lotComments } -export default getLotOccupancyComments; +export default getLotOccupancyComments diff --git a/helpers/lotOccupancyDB/getWorkOrderComments.js b/helpers/lotOccupancyDB/getWorkOrderComments.js index 2b42e324..99ac6da1 100644 --- a/helpers/lotOccupancyDB/getWorkOrderComments.js +++ b/helpers/lotOccupancyDB/getWorkOrderComments.js @@ -10,14 +10,14 @@ export function getWorkOrderComments(workOrderId, connectedDatabase) { database.function('userFn_timeIntegerToString', timeIntegerToString); const workOrderComments = database .prepare(`select workOrderCommentId, - workOrderCommentDate, userFn_dateIntegerToString(workOrderCommentDate) as workOrderCommentDateString, - workOrderCommentTime, userFn_timeIntegerToString(workOrderCommentTime) as workOrderCommentTimeString, - workOrderComment, - recordCreate_userName, recordUpdate_userName - from WorkOrderComments - where recordDelete_timeMillis is null - and workOrderId = ? - order by workOrderCommentDate desc, workOrderCommentTime desc, workOrderCommentId desc`) + workOrderCommentDate, userFn_dateIntegerToString(workOrderCommentDate) as workOrderCommentDateString, + workOrderCommentTime, userFn_timeIntegerToString(workOrderCommentTime) as workOrderCommentTimeString, + workOrderComment, + recordCreate_userName, recordUpdate_userName + from WorkOrderComments + where recordDelete_timeMillis is null + and workOrderId = ? + order by workOrderCommentDate desc, workOrderCommentTime desc, workOrderCommentId desc`) .all(workOrderId); if (!connectedDatabase) { database.close(); diff --git a/helpers/lotOccupancyDB/getWorkOrderComments.ts b/helpers/lotOccupancyDB/getWorkOrderComments.ts index 8e0c03bd..f39d0837 100644 --- a/helpers/lotOccupancyDB/getWorkOrderComments.ts +++ b/helpers/lotOccupancyDB/getWorkOrderComments.ts @@ -25,14 +25,14 @@ export function getWorkOrderComments( const workOrderComments = database .prepare( `select workOrderCommentId, - workOrderCommentDate, userFn_dateIntegerToString(workOrderCommentDate) as workOrderCommentDateString, - workOrderCommentTime, userFn_timeIntegerToString(workOrderCommentTime) as workOrderCommentTimeString, - workOrderComment, - recordCreate_userName, recordUpdate_userName - from WorkOrderComments - where recordDelete_timeMillis is null - and workOrderId = ? - order by workOrderCommentDate desc, workOrderCommentTime desc, workOrderCommentId desc` + workOrderCommentDate, userFn_dateIntegerToString(workOrderCommentDate) as workOrderCommentDateString, + workOrderCommentTime, userFn_timeIntegerToString(workOrderCommentTime) as workOrderCommentTimeString, + workOrderComment, + recordCreate_userName, recordUpdate_userName + from WorkOrderComments + where recordDelete_timeMillis is null + and workOrderId = ? + order by workOrderCommentDate desc, workOrderCommentTime desc, workOrderCommentId desc` ) .all(workOrderId) diff --git a/helpers/lotOccupancyDB/getWorkOrderMilestoneTypes.js b/helpers/lotOccupancyDB/getWorkOrderMilestoneTypes.js index 31f87871..4319fe1c 100644 --- a/helpers/lotOccupancyDB/getWorkOrderMilestoneTypes.js +++ b/helpers/lotOccupancyDB/getWorkOrderMilestoneTypes.js @@ -5,9 +5,9 @@ export function getWorkOrderMilestoneTypes() { const database = sqlite(databasePath); const workOrderMilestoneTypes = database .prepare(`select workOrderMilestoneTypeId, workOrderMilestoneType, orderNumber - from WorkOrderMilestoneTypes - where recordDelete_timeMillis is null - order by orderNumber, workOrderMilestoneType`) + from WorkOrderMilestoneTypes + where recordDelete_timeMillis is null + order by orderNumber, workOrderMilestoneType`) .all(); let expectedOrderNumber = 0; for (const workOrderMilestoneType of workOrderMilestoneTypes) { diff --git a/helpers/lotOccupancyDB/getWorkOrderMilestoneTypes.ts b/helpers/lotOccupancyDB/getWorkOrderMilestoneTypes.ts index d603eff5..ef22898e 100644 --- a/helpers/lotOccupancyDB/getWorkOrderMilestoneTypes.ts +++ b/helpers/lotOccupancyDB/getWorkOrderMilestoneTypes.ts @@ -12,9 +12,9 @@ export function getWorkOrderMilestoneTypes(): recordTypes.WorkOrderMilestoneType const workOrderMilestoneTypes: recordTypes.WorkOrderMilestoneType[] = database .prepare( `select workOrderMilestoneTypeId, workOrderMilestoneType, orderNumber - from WorkOrderMilestoneTypes - where recordDelete_timeMillis is null - order by orderNumber, workOrderMilestoneType` + from WorkOrderMilestoneTypes + where recordDelete_timeMillis is null + order by orderNumber, workOrderMilestoneType` ) .all() diff --git a/helpers/lotOccupancyDB/updateFeeCategory.d.ts b/helpers/lotOccupancyDB/updateFeeCategory.d.ts index 919c14f8..85cc4932 100644 --- a/helpers/lotOccupancyDB/updateFeeCategory.d.ts +++ b/helpers/lotOccupancyDB/updateFeeCategory.d.ts @@ -1,4 +1,4 @@ -import type * as recordTypes from "../../types/recordTypes"; +import type * as recordTypes from '../../types/recordTypes'; interface UpdateFeeCategoryForm { feeCategoryId: number | string; feeCategory: string; diff --git a/helpers/lotOccupancyDB/updateFeeCategory.js b/helpers/lotOccupancyDB/updateFeeCategory.js index 12397bf5..8566a6f7 100644 --- a/helpers/lotOccupancyDB/updateFeeCategory.js +++ b/helpers/lotOccupancyDB/updateFeeCategory.js @@ -1,6 +1,6 @@ -import { updateRecord } from "./updateRecord.js"; +import { updateRecord } from './updateRecord.js'; export function updateFeeCategory(feeCategoryForm, requestSession) { - const success = updateRecord("FeeCategories", feeCategoryForm.feeCategoryId, feeCategoryForm.feeCategory, requestSession); + const success = updateRecord('FeeCategories', feeCategoryForm.feeCategoryId, feeCategoryForm.feeCategory, requestSession); return success; } export default updateFeeCategory; diff --git a/helpers/lotOccupancyDB/updateFeeCategory.ts b/helpers/lotOccupancyDB/updateFeeCategory.ts index fb020365..33495af6 100644 --- a/helpers/lotOccupancyDB/updateFeeCategory.ts +++ b/helpers/lotOccupancyDB/updateFeeCategory.ts @@ -1,23 +1,23 @@ -import { updateRecord } from "./updateRecord.js"; +import { updateRecord } from './updateRecord.js' -import type * as recordTypes from "../../types/recordTypes"; +import type * as recordTypes from '../../types/recordTypes' interface UpdateFeeCategoryForm { - feeCategoryId: number | string; - feeCategory: string; + feeCategoryId: number | string + feeCategory: string } export function updateFeeCategory( - feeCategoryForm: UpdateFeeCategoryForm, - requestSession: recordTypes.PartialSession + feeCategoryForm: UpdateFeeCategoryForm, + requestSession: recordTypes.PartialSession ): boolean { - const success = updateRecord( - "FeeCategories", - feeCategoryForm.feeCategoryId, - feeCategoryForm.feeCategory, - requestSession - ); - return success; + const success = updateRecord( + 'FeeCategories', + feeCategoryForm.feeCategoryId, + feeCategoryForm.feeCategory, + requestSession + ) + return success } -export default updateFeeCategory; +export default updateFeeCategory diff --git a/helpers/lotOccupancyDB/updateLotOccupancy.js b/helpers/lotOccupancyDB/updateLotOccupancy.js index cc65224b..182e722d 100644 --- a/helpers/lotOccupancyDB/updateLotOccupancy.js +++ b/helpers/lotOccupancyDB/updateLotOccupancy.js @@ -8,14 +8,14 @@ export function updateLotOccupancy(lotOccupancyForm, requestSession) { const rightNowMillis = Date.now(); const result = database .prepare(`update LotOccupancies - set occupancyTypeId = ?, - lotId = ?, - occupancyStartDate = ?, - occupancyEndDate = ?, - recordUpdate_userName = ?, - recordUpdate_timeMillis = ? - where lotOccupancyId = ? - and recordDelete_timeMillis is null`) + set occupancyTypeId = ?, + lotId = ?, + occupancyStartDate = ?, + occupancyEndDate = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where lotOccupancyId = ? + 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); diff --git a/helpers/lotOccupancyDB/updateLotOccupancy.ts b/helpers/lotOccupancyDB/updateLotOccupancy.ts index 09bc72ba..2d042c0d 100644 --- a/helpers/lotOccupancyDB/updateLotOccupancy.ts +++ b/helpers/lotOccupancyDB/updateLotOccupancy.ts @@ -33,14 +33,14 @@ export function updateLotOccupancy( const result = database .prepare( `update LotOccupancies - set occupancyTypeId = ?, - lotId = ?, - occupancyStartDate = ?, - occupancyEndDate = ?, - recordUpdate_userName = ?, - recordUpdate_timeMillis = ? - where lotOccupancyId = ? - and recordDelete_timeMillis is null` + set occupancyTypeId = ?, + lotId = ?, + occupancyStartDate = ?, + occupancyEndDate = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where lotOccupancyId = ? + and recordDelete_timeMillis is null` ) .run( lotOccupancyForm.occupancyTypeId, diff --git a/helpers/lotOccupancyDB/updateLotOccupantType.js b/helpers/lotOccupancyDB/updateLotOccupantType.js index 2c91e80d..5b30130b 100644 --- a/helpers/lotOccupancyDB/updateLotOccupantType.js +++ b/helpers/lotOccupancyDB/updateLotOccupantType.js @@ -6,12 +6,12 @@ export function updateLotOccupantType(lotOccupantTypeForm, requestSession) { const rightNowMillis = Date.now(); const result = database .prepare(`update LotOccupantTypes - set lotOccupantType = ?, - fontAwesomeIconClass = ?, - recordUpdate_userName = ?, - recordUpdate_timeMillis = ? - where lotOccupantTypeId = ? - and recordDelete_timeMillis is null`) + set lotOccupantType = ?, + fontAwesomeIconClass = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where lotOccupantTypeId = ? + and recordDelete_timeMillis is null`) .run(lotOccupantTypeForm.lotOccupantType, lotOccupantTypeForm.fontAwesomeIconClass ?? '', requestSession.user.userName, rightNowMillis, lotOccupantTypeForm.lotOccupantTypeId); database.close(); clearCacheByTableName('LotOccupantTypes'); diff --git a/helpers/lotOccupancyDB/updateLotOccupantType.ts b/helpers/lotOccupancyDB/updateLotOccupantType.ts index 81ebc672..2a6ee59f 100644 --- a/helpers/lotOccupancyDB/updateLotOccupantType.ts +++ b/helpers/lotOccupancyDB/updateLotOccupantType.ts @@ -23,12 +23,12 @@ export function updateLotOccupantType( const result = database .prepare( `update LotOccupantTypes - set lotOccupantType = ?, - fontAwesomeIconClass = ?, - recordUpdate_userName = ?, - recordUpdate_timeMillis = ? - where lotOccupantTypeId = ? - and recordDelete_timeMillis is null` + set lotOccupantType = ?, + fontAwesomeIconClass = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where lotOccupantTypeId = ? + and recordDelete_timeMillis is null` ) .run( lotOccupantTypeForm.lotOccupantType, diff --git a/helpers/lotOccupancyDB/updateLotTypeField.js b/helpers/lotOccupancyDB/updateLotTypeField.js index e6388371..c6de8c62 100644 --- a/helpers/lotOccupancyDB/updateLotTypeField.js +++ b/helpers/lotOccupancyDB/updateLotTypeField.js @@ -6,16 +6,16 @@ export function updateLotTypeField(lotTypeFieldForm, requestSession) { const rightNowMillis = Date.now(); const result = database .prepare(`update LotTypeFields - set lotTypeField = ?, - isRequired = ?, - minimumLength = ?, - maximumLength = ?, - pattern = ?, - lotTypeFieldValues = ?, - recordUpdate_userName = ?, - recordUpdate_timeMillis = ? - where lotTypeFieldId = ? - and recordDelete_timeMillis is null`) + set lotTypeField = ?, + isRequired = ?, + minimumLength = ?, + maximumLength = ?, + pattern = ?, + lotTypeFieldValues = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where lotTypeFieldId = ? + and recordDelete_timeMillis is null`) .run(lotTypeFieldForm.lotTypeField, Number.parseInt(lotTypeFieldForm.isRequired, 10), lotTypeFieldForm.minimumLength ?? 0, lotTypeFieldForm.maximumLength ?? 100, lotTypeFieldForm.pattern ?? '', lotTypeFieldForm.lotTypeFieldValues, requestSession.user.userName, rightNowMillis, lotTypeFieldForm.lotTypeFieldId); database.close(); clearCacheByTableName('LotTypeFields'); diff --git a/helpers/lotOccupancyDB/updateLotTypeField.ts b/helpers/lotOccupancyDB/updateLotTypeField.ts index f9e36b2c..a6c96af4 100644 --- a/helpers/lotOccupancyDB/updateLotTypeField.ts +++ b/helpers/lotOccupancyDB/updateLotTypeField.ts @@ -27,16 +27,16 @@ export function updateLotTypeField( const result = database .prepare( `update LotTypeFields - set lotTypeField = ?, - isRequired = ?, - minimumLength = ?, - maximumLength = ?, - pattern = ?, - lotTypeFieldValues = ?, - recordUpdate_userName = ?, - recordUpdate_timeMillis = ? - where lotTypeFieldId = ? - and recordDelete_timeMillis is null` + set lotTypeField = ?, + isRequired = ?, + minimumLength = ?, + maximumLength = ?, + pattern = ?, + lotTypeFieldValues = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where lotTypeFieldId = ? + and recordDelete_timeMillis is null` ) .run( lotTypeFieldForm.lotTypeField, diff --git a/helpers/lotOccupancyDB/updateOccupancyTypeField.js b/helpers/lotOccupancyDB/updateOccupancyTypeField.js index a1808d60..bbfed8bb 100644 --- a/helpers/lotOccupancyDB/updateOccupancyTypeField.js +++ b/helpers/lotOccupancyDB/updateOccupancyTypeField.js @@ -6,16 +6,16 @@ export function updateOccupancyTypeField(occupancyTypeFieldForm, requestSession) const rightNowMillis = Date.now(); const result = database .prepare(`update OccupancyTypeFields - set occupancyTypeField = ?, - isRequired = ?, - minimumLength = ?, - maximumLength = ?, - pattern = ?, - occupancyTypeFieldValues = ?, - recordUpdate_userName = ?, - recordUpdate_timeMillis = ? - where occupancyTypeFieldId = ? - and recordDelete_timeMillis is null`) + set occupancyTypeField = ?, + isRequired = ?, + minimumLength = ?, + maximumLength = ?, + pattern = ?, + occupancyTypeFieldValues = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where occupancyTypeFieldId = ? + and recordDelete_timeMillis is null`) .run(occupancyTypeFieldForm.occupancyTypeField, Number.parseInt(occupancyTypeFieldForm.isRequired, 10), occupancyTypeFieldForm.minimumLength ?? 0, occupancyTypeFieldForm.maximumLength ?? 100, occupancyTypeFieldForm.pattern ?? '', occupancyTypeFieldForm.occupancyTypeFieldValues, requestSession.user.userName, rightNowMillis, occupancyTypeFieldForm.occupancyTypeFieldId); database.close(); clearCacheByTableName('OccupancyTypeFields'); diff --git a/helpers/lotOccupancyDB/updateOccupancyTypeField.ts b/helpers/lotOccupancyDB/updateOccupancyTypeField.ts index 14fb9afd..1755d939 100644 --- a/helpers/lotOccupancyDB/updateOccupancyTypeField.ts +++ b/helpers/lotOccupancyDB/updateOccupancyTypeField.ts @@ -27,16 +27,16 @@ export function updateOccupancyTypeField( const result = database .prepare( `update OccupancyTypeFields - set occupancyTypeField = ?, - isRequired = ?, - minimumLength = ?, - maximumLength = ?, - pattern = ?, - occupancyTypeFieldValues = ?, - recordUpdate_userName = ?, - recordUpdate_timeMillis = ? - where occupancyTypeFieldId = ? - and recordDelete_timeMillis is null` + set occupancyTypeField = ?, + isRequired = ?, + minimumLength = ?, + maximumLength = ?, + pattern = ?, + occupancyTypeFieldValues = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where occupancyTypeFieldId = ? + and recordDelete_timeMillis is null` ) .run( occupancyTypeFieldForm.occupancyTypeField, diff --git a/helpers/lotOccupancyDB/updateRecordOrderNumber.d.ts b/helpers/lotOccupancyDB/updateRecordOrderNumber.d.ts index 374fb182..34cae063 100644 --- a/helpers/lotOccupancyDB/updateRecordOrderNumber.d.ts +++ b/helpers/lotOccupancyDB/updateRecordOrderNumber.d.ts @@ -1,4 +1,4 @@ -import sqlite from "better-sqlite3"; -declare type RecordTable = "FeeCategories" | "Fees" | "LotOccupantTypes" | "LotStatuses" | "LotTypes" | "LotTypeFields" | "OccupancyTypes" | "OccupancyTypeFields" | "WorkOrderMilestoneTypes" | "WorkOrderTypes"; +import sqlite from 'better-sqlite3'; +declare type RecordTable = 'FeeCategories' | 'Fees' | 'LotOccupantTypes' | 'LotStatuses' | 'LotTypes' | 'LotTypeFields' | 'OccupancyTypes' | 'OccupancyTypeFields' | 'WorkOrderMilestoneTypes' | 'WorkOrderTypes'; export declare function updateRecordOrderNumber(recordTable: RecordTable, recordId: number | string, orderNumber: number | string, connectedDatabase: sqlite.Database): boolean; export {}; diff --git a/helpers/lotOccupancyDB/updateRecordOrderNumber.js b/helpers/lotOccupancyDB/updateRecordOrderNumber.js index 76b79b63..b321aaa6 100644 --- a/helpers/lotOccupancyDB/updateRecordOrderNumber.js +++ b/helpers/lotOccupancyDB/updateRecordOrderNumber.js @@ -1,20 +1,20 @@ const recordIdColumns = new Map(); -recordIdColumns.set("FeeCategories", "feeCategoryId"); -recordIdColumns.set("Fees", "feeId"); -recordIdColumns.set("LotOccupantTypes", "lotOccupantTypeId"); -recordIdColumns.set("LotStatuses", "lotStatusId"); -recordIdColumns.set("LotTypes", "lotTypeId"); -recordIdColumns.set("LotTypeFields", "lotTypeFieldId"); -recordIdColumns.set("OccupancyTypes", "occupancyTypeId"); -recordIdColumns.set("OccupancyTypeFields", "occupancyTypeFieldId"); -recordIdColumns.set("WorkOrderMilestoneTypes", "workOrderMilestoneTypeId"); -recordIdColumns.set("WorkOrderTypes", "workOrderTypeId"); +recordIdColumns.set('FeeCategories', 'feeCategoryId'); +recordIdColumns.set('Fees', 'feeId'); +recordIdColumns.set('LotOccupantTypes', 'lotOccupantTypeId'); +recordIdColumns.set('LotStatuses', 'lotStatusId'); +recordIdColumns.set('LotTypes', 'lotTypeId'); +recordIdColumns.set('LotTypeFields', 'lotTypeFieldId'); +recordIdColumns.set('OccupancyTypes', 'occupancyTypeId'); +recordIdColumns.set('OccupancyTypeFields', 'occupancyTypeFieldId'); +recordIdColumns.set('WorkOrderMilestoneTypes', 'workOrderMilestoneTypeId'); +recordIdColumns.set('WorkOrderTypes', 'workOrderTypeId'); export function updateRecordOrderNumber(recordTable, recordId, orderNumber, connectedDatabase) { const result = connectedDatabase .prepare(`update ${recordTable} - set orderNumber = ? - where recordDelete_timeMillis is null - and ${recordIdColumns.get(recordTable)} = ?`) + set orderNumber = ? + where recordDelete_timeMillis is null + and ${recordIdColumns.get(recordTable)} = ?`) .run(orderNumber, recordId); return result.changes > 0; } diff --git a/helpers/lotOccupancyDB/updateRecordOrderNumber.ts b/helpers/lotOccupancyDB/updateRecordOrderNumber.ts index 8a780b1d..f62bcd31 100644 --- a/helpers/lotOccupancyDB/updateRecordOrderNumber.ts +++ b/helpers/lotOccupancyDB/updateRecordOrderNumber.ts @@ -1,43 +1,43 @@ -import sqlite from "better-sqlite3"; +import sqlite from 'better-sqlite3' type RecordTable = - | "FeeCategories" - | "Fees" - | "LotOccupantTypes" - | "LotStatuses" - | "LotTypes" - | "LotTypeFields" - | "OccupancyTypes" - | "OccupancyTypeFields" - | "WorkOrderMilestoneTypes" - | "WorkOrderTypes"; + | 'FeeCategories' + | 'Fees' + | 'LotOccupantTypes' + | 'LotStatuses' + | 'LotTypes' + | 'LotTypeFields' + | 'OccupancyTypes' + | 'OccupancyTypeFields' + | 'WorkOrderMilestoneTypes' + | 'WorkOrderTypes' -const recordIdColumns: Map = new Map(); -recordIdColumns.set("FeeCategories", "feeCategoryId"); -recordIdColumns.set("Fees", "feeId"); -recordIdColumns.set("LotOccupantTypes", "lotOccupantTypeId"); -recordIdColumns.set("LotStatuses", "lotStatusId"); -recordIdColumns.set("LotTypes", "lotTypeId"); -recordIdColumns.set("LotTypeFields", "lotTypeFieldId"); -recordIdColumns.set("OccupancyTypes", "occupancyTypeId"); -recordIdColumns.set("OccupancyTypeFields", "occupancyTypeFieldId"); -recordIdColumns.set("WorkOrderMilestoneTypes", "workOrderMilestoneTypeId"); -recordIdColumns.set("WorkOrderTypes", "workOrderTypeId"); +const recordIdColumns: Map = new Map() +recordIdColumns.set('FeeCategories', 'feeCategoryId') +recordIdColumns.set('Fees', 'feeId') +recordIdColumns.set('LotOccupantTypes', 'lotOccupantTypeId') +recordIdColumns.set('LotStatuses', 'lotStatusId') +recordIdColumns.set('LotTypes', 'lotTypeId') +recordIdColumns.set('LotTypeFields', 'lotTypeFieldId') +recordIdColumns.set('OccupancyTypes', 'occupancyTypeId') +recordIdColumns.set('OccupancyTypeFields', 'occupancyTypeFieldId') +recordIdColumns.set('WorkOrderMilestoneTypes', 'workOrderMilestoneTypeId') +recordIdColumns.set('WorkOrderTypes', 'workOrderTypeId') export function updateRecordOrderNumber( - recordTable: RecordTable, - recordId: number | string, - orderNumber: number | string, - connectedDatabase: sqlite.Database + recordTable: RecordTable, + recordId: number | string, + orderNumber: number | string, + connectedDatabase: sqlite.Database ): boolean { - const result = connectedDatabase - .prepare( - `update ${recordTable} - set orderNumber = ? - where recordDelete_timeMillis is null - and ${recordIdColumns.get(recordTable)} = ?` - ) - .run(orderNumber, recordId); + const result = connectedDatabase + .prepare( + `update ${recordTable} + set orderNumber = ? + where recordDelete_timeMillis is null + and ${recordIdColumns.get(recordTable)!} = ?` + ) + .run(orderNumber, recordId) - return result.changes > 0; + return result.changes > 0 } diff --git a/helpers/lotOccupancyDB/updateWorkOrderComment.js b/helpers/lotOccupancyDB/updateWorkOrderComment.js index 69914aa6..8ded64d7 100644 --- a/helpers/lotOccupancyDB/updateWorkOrderComment.js +++ b/helpers/lotOccupancyDB/updateWorkOrderComment.js @@ -6,13 +6,13 @@ export function updateWorkOrderComment(commentForm, requestSession) { const database = sqlite(databasePath); const result = database .prepare(`update WorkOrderComments - set workOrderCommentDate = ?, - workOrderCommentTime = ?, - workOrderComment = ?, - recordUpdate_userName = ?, - recordUpdate_timeMillis = ? - where recordDelete_timeMillis is null - and workOrderCommentId = ?`) + set workOrderCommentDate = ?, + workOrderCommentTime = ?, + workOrderComment = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where recordDelete_timeMillis is null + and workOrderCommentId = ?`) .run(dateStringToInteger(commentForm.workOrderCommentDateString), timeStringToInteger(commentForm.workOrderCommentTimeString), commentForm.workOrderComment, requestSession.user.userName, rightNowMillis, commentForm.workOrderCommentId); database.close(); return result.changes > 0; diff --git a/helpers/lotOccupancyDB/updateWorkOrderComment.ts b/helpers/lotOccupancyDB/updateWorkOrderComment.ts index 2ea36c73..b5c5a263 100644 --- a/helpers/lotOccupancyDB/updateWorkOrderComment.ts +++ b/helpers/lotOccupancyDB/updateWorkOrderComment.ts @@ -27,13 +27,13 @@ export function updateWorkOrderComment( const result = database .prepare( `update WorkOrderComments - set workOrderCommentDate = ?, - workOrderCommentTime = ?, - workOrderComment = ?, - recordUpdate_userName = ?, - recordUpdate_timeMillis = ? - where recordDelete_timeMillis is null - and workOrderCommentId = ?` + set workOrderCommentDate = ?, + workOrderCommentTime = ?, + workOrderComment = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where recordDelete_timeMillis is null + and workOrderCommentId = ?` ) .run( dateStringToInteger(commentForm.workOrderCommentDateString), diff --git a/helpers/lotOccupancyDB/updateWorkOrderMilestone.js b/helpers/lotOccupancyDB/updateWorkOrderMilestone.js index f6dbd070..ff7124a6 100644 --- a/helpers/lotOccupancyDB/updateWorkOrderMilestone.js +++ b/helpers/lotOccupancyDB/updateWorkOrderMilestone.js @@ -6,13 +6,13 @@ export function updateWorkOrderMilestone(milestoneForm, requestSession) { const database = sqlite(databasePath); const result = database .prepare(`update WorkOrderMilestones - set workOrderMilestoneTypeId = ?, - workOrderMilestoneDate = ?, - workOrderMilestoneTime = ?, - workOrderMilestoneDescription = ?, - recordUpdate_userName = ?, - recordUpdate_timeMillis = ? - where workOrderMilestoneId = ?`) + set workOrderMilestoneTypeId = ?, + workOrderMilestoneDate = ?, + workOrderMilestoneTime = ?, + workOrderMilestoneDescription = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where workOrderMilestoneId = ?`) .run(milestoneForm.workOrderMilestoneTypeId === '' ? undefined : milestoneForm.workOrderMilestoneTypeId, dateStringToInteger(milestoneForm.workOrderMilestoneDateString), milestoneForm.workOrderMilestoneTimeString ? timeStringToInteger(milestoneForm.workOrderMilestoneTimeString) : 0, milestoneForm.workOrderMilestoneDescription, requestSession.user.userName, rightNow.getTime(), milestoneForm.workOrderMilestoneId); diff --git a/helpers/lotOccupancyDB/updateWorkOrderMilestone.ts b/helpers/lotOccupancyDB/updateWorkOrderMilestone.ts index ec7f3d94..8c2740da 100644 --- a/helpers/lotOccupancyDB/updateWorkOrderMilestone.ts +++ b/helpers/lotOccupancyDB/updateWorkOrderMilestone.ts @@ -28,13 +28,13 @@ export function updateWorkOrderMilestone( const result = database .prepare( `update WorkOrderMilestones - set workOrderMilestoneTypeId = ?, - workOrderMilestoneDate = ?, - workOrderMilestoneTime = ?, - workOrderMilestoneDescription = ?, - recordUpdate_userName = ?, - recordUpdate_timeMillis = ? - where workOrderMilestoneId = ?` + set workOrderMilestoneTypeId = ?, + workOrderMilestoneDate = ?, + workOrderMilestoneTime = ?, + workOrderMilestoneDescription = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where workOrderMilestoneId = ?` ) .run( milestoneForm.workOrderMilestoneTypeId === '' ? undefined : milestoneForm.workOrderMilestoneTypeId,