steve
/
sunrise-cms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linting

pull/11/head
Dan Gowans 2025-04-28 14:05:18 -04:00
parent 78cae2f964
commit f440a35df7
7 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
database/getBurialSite.js
View File

@ -30,7 +30,7 @@ export async function getBurialSiteByBurialSiteName(burialSiteName) {
return await _getBurialSite(`${baseSQL} and l.burialSiteName = ?`, burialSiteName); return await _getBurialSite(`${baseSQL} and l.burialSiteName = ?`, burialSiteName);
} }
async function _getBurialSite(sql, burialSiteIdOrLotName) { async function _getBurialSite(sql, burialSiteIdOrLotName) {
const database = sqlite(sunriseDB); const database = sqlite(sunriseDB, { readonly: true });
const burialSite = database.prepare(sql).get(burialSiteIdOrLotName); const burialSite = database.prepare(sql).get(burialSiteIdOrLotName);
if (burialSite !== undefined) { if (burialSite !== undefined) {
const contracts = await getContracts({ const contracts = await getContracts({

2
database/getBurialSite.ts
View File

@ -47,7 +47,7 @@ async function _getBurialSite(
sql: string, sql: string,
burialSiteIdOrLotName: number | string burialSiteIdOrLotName: number | string
): Promise<BurialSite | undefined> { ): Promise<BurialSite | undefined> {
const database = sqlite(sunriseDB) const database = sqlite(sunriseDB, { readonly: true })
const burialSite = database.prepare(sql).get(burialSiteIdOrLotName) as const burialSite = database.prepare(sql).get(burialSiteIdOrLotName) as
| BurialSite | BurialSite

22
database/getBurialSiteFields.js
View File

@ -4,30 +4,30 @@ export default function getBurialSiteFields(burialSiteId, connectedDatabase) {
const database = connectedDatabase ?? sqlite(sunriseDB, { readonly: true }); const database = connectedDatabase ?? sqlite(sunriseDB, { readonly: true });
const burialSiteFields = database const burialSiteFields = database
.prepare(`select l.burialSiteId, l.burialSiteTypeFieldId, .prepare(`select l.burialSiteId, l.burialSiteTypeFieldId,
l.fieldValue, l.fieldValue,
f.burialSiteTypeField, f.fieldType, f.fieldValues, f.burialSiteTypeField, f.fieldType, f.fieldValues,
f.isRequired, f.pattern, f.minLength, f.maxLength, f.isRequired, f.pattern, f.minLength, f.maxLength,
f.orderNumber, t.orderNumber as burialSiteTypeOrderNumber f.orderNumber, t.orderNumber as burialSiteTypeOrderNumber
from BurialSiteFields l from BurialSiteFields l
left join BurialSiteTypeFields f on l.burialSiteTypeFieldId = f.burialSiteTypeFieldId left join BurialSiteTypeFields f on l.burialSiteTypeFieldId = f.burialSiteTypeFieldId
left join BurialSiteTypes t on f.burialSiteTypeId = t.burialSiteTypeId left join BurialSiteTypes t on f.burialSiteTypeId = t.burialSiteTypeId
where l.recordDelete_timeMillis is null where l.recordDelete_timeMillis is null
and l.burialSiteId = ? and l.burialSiteId = ?
union union
select ? as burialSiteId, f.burialSiteTypeFieldId, select ? as burialSiteId, f.burialSiteTypeFieldId,
'' as fieldValue, '' as fieldValue,
f.burialSiteTypeField, f.fieldType, f.fieldValues, f.burialSiteTypeField, f.fieldType, f.fieldValues,
f.isRequired, f.pattern, f.minLength, f.maxLength, f.isRequired, f.pattern, f.minLength, f.maxLength,
f.orderNumber, t.orderNumber as burialSiteTypeOrderNumber f.orderNumber, t.orderNumber as burialSiteTypeOrderNumber
from BurialSiteTypeFields f from BurialSiteTypeFields f
left join BurialSiteTypes t on f.burialSiteTypeId = t.burialSiteTypeId left join BurialSiteTypes t on f.burialSiteTypeId = t.burialSiteTypeId
where f.recordDelete_timeMillis is null where f.recordDelete_timeMillis is null
and ( and (
f.burialSiteTypeId is null f.burialSiteTypeId is null
or f.burialSiteTypeId in (select burialSiteTypeId from BurialSites where burialSiteId = ?)) or f.burialSiteTypeId in (select burialSiteTypeId from BurialSites where burialSiteId = ?))
and f.burialSiteTypeFieldId not in (select burialSiteTypeFieldId from BurialSiteFields where burialSiteId = ? and recordDelete_timeMillis is null) and f.burialSiteTypeFieldId not in (select burialSiteTypeFieldId from BurialSiteFields where burialSiteId = ? and recordDelete_timeMillis is null)
order by burialSiteTypeOrderNumber, f.orderNumber, f.burialSiteTypeField`) order by burialSiteTypeOrderNumber, f.orderNumber, f.burialSiteTypeField`)
.all(burialSiteId, burialSiteId, burialSiteId, burialSiteId); .all(burialSiteId, burialSiteId, burialSiteId, burialSiteId);
if (connectedDatabase === undefined) { if (connectedDatabase === undefined) {

22
database/getBurialSiteFields.ts
View File

@ -12,30 +12,30 @@ export default function getBurialSiteFields(
const burialSiteFields = database const burialSiteFields = database
.prepare( .prepare(
`select l.burialSiteId, l.burialSiteTypeFieldId, `select l.burialSiteId, l.burialSiteTypeFieldId,
l.fieldValue, l.fieldValue,
f.burialSiteTypeField, f.fieldType, f.fieldValues, f.burialSiteTypeField, f.fieldType, f.fieldValues,
f.isRequired, f.pattern, f.minLength, f.maxLength, f.isRequired, f.pattern, f.minLength, f.maxLength,
f.orderNumber, t.orderNumber as burialSiteTypeOrderNumber f.orderNumber, t.orderNumber as burialSiteTypeOrderNumber
from BurialSiteFields l from BurialSiteFields l
left join BurialSiteTypeFields f on l.burialSiteTypeFieldId = f.burialSiteTypeFieldId left join BurialSiteTypeFields f on l.burialSiteTypeFieldId = f.burialSiteTypeFieldId
left join BurialSiteTypes t on f.burialSiteTypeId = t.burialSiteTypeId left join BurialSiteTypes t on f.burialSiteTypeId = t.burialSiteTypeId
where l.recordDelete_timeMillis is null where l.recordDelete_timeMillis is null
and l.burialSiteId = ? and l.burialSiteId = ?
union union
select ? as burialSiteId, f.burialSiteTypeFieldId, select ? as burialSiteId, f.burialSiteTypeFieldId,
'' as fieldValue, '' as fieldValue,
f.burialSiteTypeField, f.fieldType, f.fieldValues, f.burialSiteTypeField, f.fieldType, f.fieldValues,
f.isRequired, f.pattern, f.minLength, f.maxLength, f.isRequired, f.pattern, f.minLength, f.maxLength,
f.orderNumber, t.orderNumber as burialSiteTypeOrderNumber f.orderNumber, t.orderNumber as burialSiteTypeOrderNumber
from BurialSiteTypeFields f from BurialSiteTypeFields f
left join BurialSiteTypes t on f.burialSiteTypeId = t.burialSiteTypeId left join BurialSiteTypes t on f.burialSiteTypeId = t.burialSiteTypeId
where f.recordDelete_timeMillis is null where f.recordDelete_timeMillis is null
and ( and (
f.burialSiteTypeId is null f.burialSiteTypeId is null
or f.burialSiteTypeId in (select burialSiteTypeId from BurialSites where burialSiteId = ?)) or f.burialSiteTypeId in (select burialSiteTypeId from BurialSites where burialSiteId = ?))
and f.burialSiteTypeFieldId not in (select burialSiteTypeFieldId from BurialSiteFields where burialSiteId = ? and recordDelete_timeMillis is null) and f.burialSiteTypeFieldId not in (select burialSiteTypeFieldId from BurialSiteFields where burialSiteId = ? and recordDelete_timeMillis is null)
order by burialSiteTypeOrderNumber, f.orderNumber, f.burialSiteTypeField` order by burialSiteTypeOrderNumber, f.orderNumber, f.burialSiteTypeField`
) )
.all( .all(

8
package-lock.json generated
View File

@ -60,7 +60,7 @@
"@types/http-errors": "^2.0.4", "@types/http-errors": "^2.0.4",
"@types/leaflet": "^1.9.17", "@types/leaflet": "^1.9.17",
"@types/mssql": "^9.1.7", "@types/mssql": "^9.1.7",
"@types/node": "^22.14.1", "@types/node": "^22.15.3",
"@types/node-windows": "^0.1.6", "@types/node-windows": "^0.1.6",
"@types/papaparse": "^5.3.15", "@types/papaparse": "^5.3.15",
"@types/randomcolor": "^0.5.9", "@types/randomcolor": "^0.5.9",
@ -2038,9 +2038,9 @@
} }
}, },
"node_modules/@types/node": { "node_modules/@types/node": {
"version": "22.14.1", "version": "22.15.3",
"resolved": "https://registry.npmjs.org/@types/node/-/node-22.14.1.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.3.tgz",
"integrity": "sha512-u0HuPQwe/dHrItgHHpmw3N2fYCR6x4ivMNbPHRkBVP4CvN+kiRrKHWk3i8tXiO/joPwXLMYvF9TTF0eqgHIuOw==", "integrity": "sha512-lX7HFZeHf4QG/J7tBZqrCAXwz9J5RD56Y6MpP0eJkka8p+K0RY/yBTW7CYFJ4VGCclxqOLKmiGP5juQc6MKgcw==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"undici-types": "~6.21.0" "undici-types": "~6.21.0"

2
package.json
View File

@ -86,7 +86,7 @@
"@types/http-errors": "^2.0.4", "@types/http-errors": "^2.0.4",
"@types/leaflet": "^1.9.17", "@types/leaflet": "^1.9.17",
"@types/mssql": "^9.1.7", "@types/mssql": "^9.1.7",
"@types/node": "^22.14.1", "@types/node": "^22.15.3",
"@types/node-windows": "^0.1.6", "@types/node-windows": "^0.1.6",
"@types/papaparse": "^5.3.15", "@types/papaparse": "^5.3.15",
"@types/randomcolor": "^0.5.9", "@types/randomcolor": "^0.5.9",

1
public/javascripts/contract.edit.ts
View File

@ -14,7 +14,6 @@ import type {
} from '../../types/record.types.js' } from '../../types/record.types.js'
import type { Sunrise } from './types.js' import type { Sunrise } from './types.js'
import { ref } from 'process'
declare const cityssm: cityssmGlobal declare const cityssm: cityssmGlobal
declare const bulmaJS: BulmaJS declare const bulmaJS: BulmaJS