deepsource-autofix-76c6eb20
Dan Gowans 2023-01-12 13:53:49 -05:00
parent 984390aaf4
commit 18e05f6c88
27 changed files with 227 additions and 227 deletions

View File

@ -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); 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; export default config;

View File

@ -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; export default config

View File

@ -1,4 +1,4 @@
import sqlite from "better-sqlite3"; import sqlite from 'better-sqlite3';
import type * as recordTypes from "../../types/recordTypes"; import type * as recordTypes from '../../types/recordTypes';
export declare function getLotOccupancyComments(lotOccupancyId: number | string, connectedDatabase?: sqlite.Database): recordTypes.LotOccupancyComment[]; export declare function getLotOccupancyComments(lotOccupancyId: number | string, connectedDatabase?: sqlite.Database): recordTypes.LotOccupancyComment[];
export default getLotOccupancyComments; export default getLotOccupancyComments;

View File

@ -1,13 +1,13 @@
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"; import { dateIntegerToString, timeIntegerToString } from '@cityssm/expressjs-server-js/dateTimeFns.js';
export function getLotOccupancyComments(lotOccupancyId, connectedDatabase) { export function getLotOccupancyComments(lotOccupancyId, connectedDatabase) {
const database = connectedDatabase || const database = connectedDatabase ??
sqlite(databasePath, { sqlite(databasePath, {
readonly: true readonly: true
}); });
database.function("userFn_dateIntegerToString", dateIntegerToString); database.function('userFn_dateIntegerToString', dateIntegerToString);
database.function("userFn_timeIntegerToString", timeIntegerToString); database.function('userFn_timeIntegerToString', timeIntegerToString);
const lotComments = database const lotComments = database
.prepare(`select lotOccupancyCommentId, .prepare(`select lotOccupancyCommentId,
lotOccupancyCommentDate, userFn_dateIntegerToString(lotOccupancyCommentDate) as lotOccupancyCommentDateString, lotOccupancyCommentDate, userFn_dateIntegerToString(lotOccupancyCommentDate) as lotOccupancyCommentDateString,

View File

@ -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 { import {
dateIntegerToString, dateIntegerToString,
timeIntegerToString timeIntegerToString
} from "@cityssm/expressjs-server-js/dateTimeFns.js"; } from '@cityssm/expressjs-server-js/dateTimeFns.js'
import type * as recordTypes from "../../types/recordTypes"; import type * as recordTypes from '../../types/recordTypes'
export function getLotOccupancyComments( export function getLotOccupancyComments(
lotOccupancyId: number | string, lotOccupancyId: number | string,
connectedDatabase?: sqlite.Database connectedDatabase?: sqlite.Database
): recordTypes.LotOccupancyComment[] { ): recordTypes.LotOccupancyComment[] {
const database = const database =
connectedDatabase || connectedDatabase ??
sqlite(databasePath, { sqlite(databasePath, {
readonly: true readonly: true
}); })
database.function("userFn_dateIntegerToString", dateIntegerToString); database.function('userFn_dateIntegerToString', dateIntegerToString)
database.function("userFn_timeIntegerToString", timeIntegerToString); database.function('userFn_timeIntegerToString', timeIntegerToString)
const lotComments = database const lotComments = database
.prepare( .prepare(
`select lotOccupancyCommentId, `select lotOccupancyCommentId,
lotOccupancyCommentDate, userFn_dateIntegerToString(lotOccupancyCommentDate) as lotOccupancyCommentDateString, lotOccupancyCommentDate, userFn_dateIntegerToString(lotOccupancyCommentDate) as lotOccupancyCommentDateString,
lotOccupancyCommentTime, userFn_timeIntegerToString(lotOccupancyCommentTime) as lotOccupancyCommentTimeString, lotOccupancyCommentTime, userFn_timeIntegerToString(lotOccupancyCommentTime) as lotOccupancyCommentTimeString,
lotOccupancyComment, lotOccupancyComment,
@ -33,14 +33,14 @@ export function getLotOccupancyComments(
where recordDelete_timeMillis is null where recordDelete_timeMillis is null
and lotOccupancyId = ? and lotOccupancyId = ?
order by lotOccupancyCommentDate desc, lotOccupancyCommentTime desc, lotOccupancyCommentId desc` order by lotOccupancyCommentDate desc, lotOccupancyCommentTime desc, lotOccupancyCommentId desc`
) )
.all(lotOccupancyId); .all(lotOccupancyId)
if (!connectedDatabase) { if (!connectedDatabase) {
database.close(); database.close()
} }
return lotComments; return lotComments
} }
export default getLotOccupancyComments; export default getLotOccupancyComments

View File

@ -10,14 +10,14 @@ export function getWorkOrderComments(workOrderId, connectedDatabase) {
database.function('userFn_timeIntegerToString', timeIntegerToString); database.function('userFn_timeIntegerToString', timeIntegerToString);
const workOrderComments = database const workOrderComments = database
.prepare(`select workOrderCommentId, .prepare(`select workOrderCommentId,
workOrderCommentDate, userFn_dateIntegerToString(workOrderCommentDate) as workOrderCommentDateString, workOrderCommentDate, userFn_dateIntegerToString(workOrderCommentDate) as workOrderCommentDateString,
workOrderCommentTime, userFn_timeIntegerToString(workOrderCommentTime) as workOrderCommentTimeString, workOrderCommentTime, userFn_timeIntegerToString(workOrderCommentTime) as workOrderCommentTimeString,
workOrderComment, workOrderComment,
recordCreate_userName, recordUpdate_userName recordCreate_userName, recordUpdate_userName
from WorkOrderComments from WorkOrderComments
where recordDelete_timeMillis is null where recordDelete_timeMillis is null
and workOrderId = ? and workOrderId = ?
order by workOrderCommentDate desc, workOrderCommentTime desc, workOrderCommentId desc`) order by workOrderCommentDate desc, workOrderCommentTime desc, workOrderCommentId desc`)
.all(workOrderId); .all(workOrderId);
if (!connectedDatabase) { if (!connectedDatabase) {
database.close(); database.close();

View File

@ -25,14 +25,14 @@ export function getWorkOrderComments(
const workOrderComments = database const workOrderComments = database
.prepare( .prepare(
`select workOrderCommentId, `select workOrderCommentId,
workOrderCommentDate, userFn_dateIntegerToString(workOrderCommentDate) as workOrderCommentDateString, workOrderCommentDate, userFn_dateIntegerToString(workOrderCommentDate) as workOrderCommentDateString,
workOrderCommentTime, userFn_timeIntegerToString(workOrderCommentTime) as workOrderCommentTimeString, workOrderCommentTime, userFn_timeIntegerToString(workOrderCommentTime) as workOrderCommentTimeString,
workOrderComment, workOrderComment,
recordCreate_userName, recordUpdate_userName recordCreate_userName, recordUpdate_userName
from WorkOrderComments from WorkOrderComments
where recordDelete_timeMillis is null where recordDelete_timeMillis is null
and workOrderId = ? and workOrderId = ?
order by workOrderCommentDate desc, workOrderCommentTime desc, workOrderCommentId desc` order by workOrderCommentDate desc, workOrderCommentTime desc, workOrderCommentId desc`
) )
.all(workOrderId) .all(workOrderId)

View File

@ -5,9 +5,9 @@ export function getWorkOrderMilestoneTypes() {
const database = sqlite(databasePath); const database = sqlite(databasePath);
const workOrderMilestoneTypes = database const workOrderMilestoneTypes = database
.prepare(`select workOrderMilestoneTypeId, workOrderMilestoneType, orderNumber .prepare(`select workOrderMilestoneTypeId, workOrderMilestoneType, orderNumber
from WorkOrderMilestoneTypes from WorkOrderMilestoneTypes
where recordDelete_timeMillis is null where recordDelete_timeMillis is null
order by orderNumber, workOrderMilestoneType`) order by orderNumber, workOrderMilestoneType`)
.all(); .all();
let expectedOrderNumber = 0; let expectedOrderNumber = 0;
for (const workOrderMilestoneType of workOrderMilestoneTypes) { for (const workOrderMilestoneType of workOrderMilestoneTypes) {

View File

@ -12,9 +12,9 @@ export function getWorkOrderMilestoneTypes(): recordTypes.WorkOrderMilestoneType
const workOrderMilestoneTypes: recordTypes.WorkOrderMilestoneType[] = database const workOrderMilestoneTypes: recordTypes.WorkOrderMilestoneType[] = database
.prepare( .prepare(
`select workOrderMilestoneTypeId, workOrderMilestoneType, orderNumber `select workOrderMilestoneTypeId, workOrderMilestoneType, orderNumber
from WorkOrderMilestoneTypes from WorkOrderMilestoneTypes
where recordDelete_timeMillis is null where recordDelete_timeMillis is null
order by orderNumber, workOrderMilestoneType` order by orderNumber, workOrderMilestoneType`
) )
.all() .all()

View File

@ -1,4 +1,4 @@
import type * as recordTypes from "../../types/recordTypes"; import type * as recordTypes from '../../types/recordTypes';
interface UpdateFeeCategoryForm { interface UpdateFeeCategoryForm {
feeCategoryId: number | string; feeCategoryId: number | string;
feeCategory: string; feeCategory: string;

View File

@ -1,6 +1,6 @@
import { updateRecord } from "./updateRecord.js"; import { updateRecord } from './updateRecord.js';
export function updateFeeCategory(feeCategoryForm, requestSession) { 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; return success;
} }
export default updateFeeCategory; export default updateFeeCategory;

View File

@ -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 { interface UpdateFeeCategoryForm {
feeCategoryId: number | string; feeCategoryId: number | string
feeCategory: string; feeCategory: string
} }
export function updateFeeCategory( export function updateFeeCategory(
feeCategoryForm: UpdateFeeCategoryForm, feeCategoryForm: UpdateFeeCategoryForm,
requestSession: recordTypes.PartialSession requestSession: recordTypes.PartialSession
): boolean { ): boolean {
const success = updateRecord( const success = updateRecord(
"FeeCategories", 'FeeCategories',
feeCategoryForm.feeCategoryId, feeCategoryForm.feeCategoryId,
feeCategoryForm.feeCategory, feeCategoryForm.feeCategory,
requestSession requestSession
); )
return success; return success
} }
export default updateFeeCategory; export default updateFeeCategory

View File

@ -8,14 +8,14 @@ export function updateLotOccupancy(lotOccupancyForm, requestSession) {
const rightNowMillis = Date.now(); const rightNowMillis = Date.now();
const result = database const result = database
.prepare(`update LotOccupancies .prepare(`update LotOccupancies
set occupancyTypeId = ?, set occupancyTypeId = ?,
lotId = ?, lotId = ?,
occupancyStartDate = ?, occupancyStartDate = ?,
occupancyEndDate = ?, occupancyEndDate = ?,
recordUpdate_userName = ?, recordUpdate_userName = ?,
recordUpdate_timeMillis = ? recordUpdate_timeMillis = ?
where lotOccupancyId = ? where lotOccupancyId = ?
and recordDelete_timeMillis is null`) and recordDelete_timeMillis is null`)
.run(lotOccupancyForm.occupancyTypeId, lotOccupancyForm.lotId === '' ? undefined : lotOccupancyForm.lotId, dateStringToInteger(lotOccupancyForm.occupancyStartDateString), lotOccupancyForm.occupancyEndDateString === '' .run(lotOccupancyForm.occupancyTypeId, lotOccupancyForm.lotId === '' ? undefined : lotOccupancyForm.lotId, dateStringToInteger(lotOccupancyForm.occupancyStartDateString), lotOccupancyForm.occupancyEndDateString === ''
? undefined ? undefined
: dateStringToInteger(lotOccupancyForm.occupancyEndDateString), requestSession.user.userName, rightNowMillis, lotOccupancyForm.lotOccupancyId); : dateStringToInteger(lotOccupancyForm.occupancyEndDateString), requestSession.user.userName, rightNowMillis, lotOccupancyForm.lotOccupancyId);

View File

@ -33,14 +33,14 @@ export function updateLotOccupancy(
const result = database const result = database
.prepare( .prepare(
`update LotOccupancies `update LotOccupancies
set occupancyTypeId = ?, set occupancyTypeId = ?,
lotId = ?, lotId = ?,
occupancyStartDate = ?, occupancyStartDate = ?,
occupancyEndDate = ?, occupancyEndDate = ?,
recordUpdate_userName = ?, recordUpdate_userName = ?,
recordUpdate_timeMillis = ? recordUpdate_timeMillis = ?
where lotOccupancyId = ? where lotOccupancyId = ?
and recordDelete_timeMillis is null` and recordDelete_timeMillis is null`
) )
.run( .run(
lotOccupancyForm.occupancyTypeId, lotOccupancyForm.occupancyTypeId,

View File

@ -6,12 +6,12 @@ export function updateLotOccupantType(lotOccupantTypeForm, requestSession) {
const rightNowMillis = Date.now(); const rightNowMillis = Date.now();
const result = database const result = database
.prepare(`update LotOccupantTypes .prepare(`update LotOccupantTypes
set lotOccupantType = ?, set lotOccupantType = ?,
fontAwesomeIconClass = ?, fontAwesomeIconClass = ?,
recordUpdate_userName = ?, recordUpdate_userName = ?,
recordUpdate_timeMillis = ? recordUpdate_timeMillis = ?
where lotOccupantTypeId = ? where lotOccupantTypeId = ?
and recordDelete_timeMillis is null`) and recordDelete_timeMillis is null`)
.run(lotOccupantTypeForm.lotOccupantType, lotOccupantTypeForm.fontAwesomeIconClass ?? '', requestSession.user.userName, rightNowMillis, lotOccupantTypeForm.lotOccupantTypeId); .run(lotOccupantTypeForm.lotOccupantType, lotOccupantTypeForm.fontAwesomeIconClass ?? '', requestSession.user.userName, rightNowMillis, lotOccupantTypeForm.lotOccupantTypeId);
database.close(); database.close();
clearCacheByTableName('LotOccupantTypes'); clearCacheByTableName('LotOccupantTypes');

View File

@ -23,12 +23,12 @@ export function updateLotOccupantType(
const result = database const result = database
.prepare( .prepare(
`update LotOccupantTypes `update LotOccupantTypes
set lotOccupantType = ?, set lotOccupantType = ?,
fontAwesomeIconClass = ?, fontAwesomeIconClass = ?,
recordUpdate_userName = ?, recordUpdate_userName = ?,
recordUpdate_timeMillis = ? recordUpdate_timeMillis = ?
where lotOccupantTypeId = ? where lotOccupantTypeId = ?
and recordDelete_timeMillis is null` and recordDelete_timeMillis is null`
) )
.run( .run(
lotOccupantTypeForm.lotOccupantType, lotOccupantTypeForm.lotOccupantType,

View File

@ -6,16 +6,16 @@ export function updateLotTypeField(lotTypeFieldForm, requestSession) {
const rightNowMillis = Date.now(); const rightNowMillis = Date.now();
const result = database const result = database
.prepare(`update LotTypeFields .prepare(`update LotTypeFields
set lotTypeField = ?, set lotTypeField = ?,
isRequired = ?, isRequired = ?,
minimumLength = ?, minimumLength = ?,
maximumLength = ?, maximumLength = ?,
pattern = ?, pattern = ?,
lotTypeFieldValues = ?, lotTypeFieldValues = ?,
recordUpdate_userName = ?, recordUpdate_userName = ?,
recordUpdate_timeMillis = ? recordUpdate_timeMillis = ?
where lotTypeFieldId = ? where lotTypeFieldId = ?
and recordDelete_timeMillis is null`) 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); .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(); database.close();
clearCacheByTableName('LotTypeFields'); clearCacheByTableName('LotTypeFields');

View File

@ -27,16 +27,16 @@ export function updateLotTypeField(
const result = database const result = database
.prepare( .prepare(
`update LotTypeFields `update LotTypeFields
set lotTypeField = ?, set lotTypeField = ?,
isRequired = ?, isRequired = ?,
minimumLength = ?, minimumLength = ?,
maximumLength = ?, maximumLength = ?,
pattern = ?, pattern = ?,
lotTypeFieldValues = ?, lotTypeFieldValues = ?,
recordUpdate_userName = ?, recordUpdate_userName = ?,
recordUpdate_timeMillis = ? recordUpdate_timeMillis = ?
where lotTypeFieldId = ? where lotTypeFieldId = ?
and recordDelete_timeMillis is null` and recordDelete_timeMillis is null`
) )
.run( .run(
lotTypeFieldForm.lotTypeField, lotTypeFieldForm.lotTypeField,

View File

@ -6,16 +6,16 @@ export function updateOccupancyTypeField(occupancyTypeFieldForm, requestSession)
const rightNowMillis = Date.now(); const rightNowMillis = Date.now();
const result = database const result = database
.prepare(`update OccupancyTypeFields .prepare(`update OccupancyTypeFields
set occupancyTypeField = ?, set occupancyTypeField = ?,
isRequired = ?, isRequired = ?,
minimumLength = ?, minimumLength = ?,
maximumLength = ?, maximumLength = ?,
pattern = ?, pattern = ?,
occupancyTypeFieldValues = ?, occupancyTypeFieldValues = ?,
recordUpdate_userName = ?, recordUpdate_userName = ?,
recordUpdate_timeMillis = ? recordUpdate_timeMillis = ?
where occupancyTypeFieldId = ? where occupancyTypeFieldId = ?
and recordDelete_timeMillis is null`) 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); .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(); database.close();
clearCacheByTableName('OccupancyTypeFields'); clearCacheByTableName('OccupancyTypeFields');

View File

@ -27,16 +27,16 @@ export function updateOccupancyTypeField(
const result = database const result = database
.prepare( .prepare(
`update OccupancyTypeFields `update OccupancyTypeFields
set occupancyTypeField = ?, set occupancyTypeField = ?,
isRequired = ?, isRequired = ?,
minimumLength = ?, minimumLength = ?,
maximumLength = ?, maximumLength = ?,
pattern = ?, pattern = ?,
occupancyTypeFieldValues = ?, occupancyTypeFieldValues = ?,
recordUpdate_userName = ?, recordUpdate_userName = ?,
recordUpdate_timeMillis = ? recordUpdate_timeMillis = ?
where occupancyTypeFieldId = ? where occupancyTypeFieldId = ?
and recordDelete_timeMillis is null` and recordDelete_timeMillis is null`
) )
.run( .run(
occupancyTypeFieldForm.occupancyTypeField, occupancyTypeFieldForm.occupancyTypeField,

View File

@ -1,4 +1,4 @@
import sqlite from "better-sqlite3"; import sqlite from 'better-sqlite3';
declare type RecordTable = "FeeCategories" | "Fees" | "LotOccupantTypes" | "LotStatuses" | "LotTypes" | "LotTypeFields" | "OccupancyTypes" | "OccupancyTypeFields" | "WorkOrderMilestoneTypes" | "WorkOrderTypes"; 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 declare function updateRecordOrderNumber(recordTable: RecordTable, recordId: number | string, orderNumber: number | string, connectedDatabase: sqlite.Database): boolean;
export {}; export {};

View File

@ -1,20 +1,20 @@
const recordIdColumns = new Map(); const recordIdColumns = new Map();
recordIdColumns.set("FeeCategories", "feeCategoryId"); recordIdColumns.set('FeeCategories', 'feeCategoryId');
recordIdColumns.set("Fees", "feeId"); recordIdColumns.set('Fees', 'feeId');
recordIdColumns.set("LotOccupantTypes", "lotOccupantTypeId"); recordIdColumns.set('LotOccupantTypes', 'lotOccupantTypeId');
recordIdColumns.set("LotStatuses", "lotStatusId"); recordIdColumns.set('LotStatuses', 'lotStatusId');
recordIdColumns.set("LotTypes", "lotTypeId"); recordIdColumns.set('LotTypes', 'lotTypeId');
recordIdColumns.set("LotTypeFields", "lotTypeFieldId"); recordIdColumns.set('LotTypeFields', 'lotTypeFieldId');
recordIdColumns.set("OccupancyTypes", "occupancyTypeId"); recordIdColumns.set('OccupancyTypes', 'occupancyTypeId');
recordIdColumns.set("OccupancyTypeFields", "occupancyTypeFieldId"); recordIdColumns.set('OccupancyTypeFields', 'occupancyTypeFieldId');
recordIdColumns.set("WorkOrderMilestoneTypes", "workOrderMilestoneTypeId"); recordIdColumns.set('WorkOrderMilestoneTypes', 'workOrderMilestoneTypeId');
recordIdColumns.set("WorkOrderTypes", "workOrderTypeId"); recordIdColumns.set('WorkOrderTypes', 'workOrderTypeId');
export function updateRecordOrderNumber(recordTable, recordId, orderNumber, connectedDatabase) { export function updateRecordOrderNumber(recordTable, recordId, orderNumber, connectedDatabase) {
const result = connectedDatabase const result = connectedDatabase
.prepare(`update ${recordTable} .prepare(`update ${recordTable}
set orderNumber = ? set orderNumber = ?
where recordDelete_timeMillis is null where recordDelete_timeMillis is null
and ${recordIdColumns.get(recordTable)} = ?`) and ${recordIdColumns.get(recordTable)} = ?`)
.run(orderNumber, recordId); .run(orderNumber, recordId);
return result.changes > 0; return result.changes > 0;
} }

View File

@ -1,43 +1,43 @@
import sqlite from "better-sqlite3"; import sqlite from 'better-sqlite3'
type RecordTable = type RecordTable =
| "FeeCategories" | 'FeeCategories'
| "Fees" | 'Fees'
| "LotOccupantTypes" | 'LotOccupantTypes'
| "LotStatuses" | 'LotStatuses'
| "LotTypes" | 'LotTypes'
| "LotTypeFields" | 'LotTypeFields'
| "OccupancyTypes" | 'OccupancyTypes'
| "OccupancyTypeFields" | 'OccupancyTypeFields'
| "WorkOrderMilestoneTypes" | 'WorkOrderMilestoneTypes'
| "WorkOrderTypes"; | 'WorkOrderTypes'
const recordIdColumns: Map<RecordTable, string> = new Map(); const recordIdColumns: Map<RecordTable, string> = new Map()
recordIdColumns.set("FeeCategories", "feeCategoryId"); recordIdColumns.set('FeeCategories', 'feeCategoryId')
recordIdColumns.set("Fees", "feeId"); recordIdColumns.set('Fees', 'feeId')
recordIdColumns.set("LotOccupantTypes", "lotOccupantTypeId"); recordIdColumns.set('LotOccupantTypes', 'lotOccupantTypeId')
recordIdColumns.set("LotStatuses", "lotStatusId"); recordIdColumns.set('LotStatuses', 'lotStatusId')
recordIdColumns.set("LotTypes", "lotTypeId"); recordIdColumns.set('LotTypes', 'lotTypeId')
recordIdColumns.set("LotTypeFields", "lotTypeFieldId"); recordIdColumns.set('LotTypeFields', 'lotTypeFieldId')
recordIdColumns.set("OccupancyTypes", "occupancyTypeId"); recordIdColumns.set('OccupancyTypes', 'occupancyTypeId')
recordIdColumns.set("OccupancyTypeFields", "occupancyTypeFieldId"); recordIdColumns.set('OccupancyTypeFields', 'occupancyTypeFieldId')
recordIdColumns.set("WorkOrderMilestoneTypes", "workOrderMilestoneTypeId"); recordIdColumns.set('WorkOrderMilestoneTypes', 'workOrderMilestoneTypeId')
recordIdColumns.set("WorkOrderTypes", "workOrderTypeId"); recordIdColumns.set('WorkOrderTypes', 'workOrderTypeId')
export function updateRecordOrderNumber( export function updateRecordOrderNumber(
recordTable: RecordTable, recordTable: RecordTable,
recordId: number | string, recordId: number | string,
orderNumber: number | string, orderNumber: number | string,
connectedDatabase: sqlite.Database connectedDatabase: sqlite.Database
): boolean { ): boolean {
const result = connectedDatabase const result = connectedDatabase
.prepare( .prepare(
`update ${recordTable} `update ${recordTable}
set orderNumber = ? set orderNumber = ?
where recordDelete_timeMillis is null where recordDelete_timeMillis is null
and ${recordIdColumns.get(recordTable)} = ?` and ${recordIdColumns.get(recordTable)!} = ?`
) )
.run(orderNumber, recordId); .run(orderNumber, recordId)
return result.changes > 0; return result.changes > 0
} }

View File

@ -6,13 +6,13 @@ export function updateWorkOrderComment(commentForm, requestSession) {
const database = sqlite(databasePath); const database = sqlite(databasePath);
const result = database const result = database
.prepare(`update WorkOrderComments .prepare(`update WorkOrderComments
set workOrderCommentDate = ?, set workOrderCommentDate = ?,
workOrderCommentTime = ?, workOrderCommentTime = ?,
workOrderComment = ?, workOrderComment = ?,
recordUpdate_userName = ?, recordUpdate_userName = ?,
recordUpdate_timeMillis = ? recordUpdate_timeMillis = ?
where recordDelete_timeMillis is null where recordDelete_timeMillis is null
and workOrderCommentId = ?`) and workOrderCommentId = ?`)
.run(dateStringToInteger(commentForm.workOrderCommentDateString), timeStringToInteger(commentForm.workOrderCommentTimeString), commentForm.workOrderComment, requestSession.user.userName, rightNowMillis, commentForm.workOrderCommentId); .run(dateStringToInteger(commentForm.workOrderCommentDateString), timeStringToInteger(commentForm.workOrderCommentTimeString), commentForm.workOrderComment, requestSession.user.userName, rightNowMillis, commentForm.workOrderCommentId);
database.close(); database.close();
return result.changes > 0; return result.changes > 0;

View File

@ -27,13 +27,13 @@ export function updateWorkOrderComment(
const result = database const result = database
.prepare( .prepare(
`update WorkOrderComments `update WorkOrderComments
set workOrderCommentDate = ?, set workOrderCommentDate = ?,
workOrderCommentTime = ?, workOrderCommentTime = ?,
workOrderComment = ?, workOrderComment = ?,
recordUpdate_userName = ?, recordUpdate_userName = ?,
recordUpdate_timeMillis = ? recordUpdate_timeMillis = ?
where recordDelete_timeMillis is null where recordDelete_timeMillis is null
and workOrderCommentId = ?` and workOrderCommentId = ?`
) )
.run( .run(
dateStringToInteger(commentForm.workOrderCommentDateString), dateStringToInteger(commentForm.workOrderCommentDateString),

View File

@ -6,13 +6,13 @@ export function updateWorkOrderMilestone(milestoneForm, requestSession) {
const database = sqlite(databasePath); const database = sqlite(databasePath);
const result = database const result = database
.prepare(`update WorkOrderMilestones .prepare(`update WorkOrderMilestones
set workOrderMilestoneTypeId = ?, set workOrderMilestoneTypeId = ?,
workOrderMilestoneDate = ?, workOrderMilestoneDate = ?,
workOrderMilestoneTime = ?, workOrderMilestoneTime = ?,
workOrderMilestoneDescription = ?, workOrderMilestoneDescription = ?,
recordUpdate_userName = ?, recordUpdate_userName = ?,
recordUpdate_timeMillis = ? recordUpdate_timeMillis = ?
where workOrderMilestoneId = ?`) where workOrderMilestoneId = ?`)
.run(milestoneForm.workOrderMilestoneTypeId === '' ? undefined : milestoneForm.workOrderMilestoneTypeId, dateStringToInteger(milestoneForm.workOrderMilestoneDateString), milestoneForm.workOrderMilestoneTimeString .run(milestoneForm.workOrderMilestoneTypeId === '' ? undefined : milestoneForm.workOrderMilestoneTypeId, dateStringToInteger(milestoneForm.workOrderMilestoneDateString), milestoneForm.workOrderMilestoneTimeString
? timeStringToInteger(milestoneForm.workOrderMilestoneTimeString) ? timeStringToInteger(milestoneForm.workOrderMilestoneTimeString)
: 0, milestoneForm.workOrderMilestoneDescription, requestSession.user.userName, rightNow.getTime(), milestoneForm.workOrderMilestoneId); : 0, milestoneForm.workOrderMilestoneDescription, requestSession.user.userName, rightNow.getTime(), milestoneForm.workOrderMilestoneId);

View File

@ -28,13 +28,13 @@ export function updateWorkOrderMilestone(
const result = database const result = database
.prepare( .prepare(
`update WorkOrderMilestones `update WorkOrderMilestones
set workOrderMilestoneTypeId = ?, set workOrderMilestoneTypeId = ?,
workOrderMilestoneDate = ?, workOrderMilestoneDate = ?,
workOrderMilestoneTime = ?, workOrderMilestoneTime = ?,
workOrderMilestoneDescription = ?, workOrderMilestoneDescription = ?,
recordUpdate_userName = ?, recordUpdate_userName = ?,
recordUpdate_timeMillis = ? recordUpdate_timeMillis = ?
where workOrderMilestoneId = ?` where workOrderMilestoneId = ?`
) )
.run( .run(
milestoneForm.workOrderMilestoneTypeId === '' ? undefined : milestoneForm.workOrderMilestoneTypeId, milestoneForm.workOrderMilestoneTypeId === '' ? undefined : milestoneForm.workOrderMilestoneTypeId,