diff --git a/.eslintrc.json b/.eslintrc.json index 4802c2fe..fc6314a8 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -34,6 +34,7 @@ ], "@typescript-eslint/no-extra-semi": "off", "@typescript-eslint/no-non-null-assertion": "off", + "@typescript-eslint/no-misused-promises": "warn", "@typescript-eslint/restrict-plus-operands": "warn", "@typescript-eslint/space-before-function-paren": "off", "@typescript-eslint/strict-boolean-expressions": "warn", diff --git a/handlers/maps-get/edit.d.ts b/handlers/maps-get/edit.d.ts index 9621c611..7151ed90 100644 --- a/handlers/maps-get/edit.d.ts +++ b/handlers/maps-get/edit.d.ts @@ -1,3 +1,3 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express'; export declare const handler: RequestHandler; export default handler; diff --git a/handlers/maps-get/edit.js b/handlers/maps-get/edit.js index d7a04bbf..9ad29a7e 100644 --- a/handlers/maps-get/edit.js +++ b/handlers/maps-get/edit.js @@ -1,12 +1,14 @@ -import * as configFunctions from "../../helpers/functions.config.js"; -import { getMap } from "../../helpers/lotOccupancyDB/getMap.js"; -import { getMapSVGs } from "../../helpers/functions.map.js"; -import { getLotTypeSummary } from "../../helpers/lotOccupancyDB/getLotTypeSummary.js"; -import { getLotStatusSummary } from "../../helpers/lotOccupancyDB/getLotStatusSummary.js"; +import * as configFunctions from '../../helpers/functions.config.js'; +import { getMap } from '../../helpers/lotOccupancyDB/getMap.js'; +import { getMapSVGs } from '../../helpers/functions.map.js'; +import { getLotTypeSummary } from '../../helpers/lotOccupancyDB/getLotTypeSummary.js'; +import { getLotStatusSummary } from '../../helpers/lotOccupancyDB/getLotStatusSummary.js'; export const handler = async (request, response) => { const map = getMap(request.params.mapId); if (!map) { - return response.redirect(configFunctions.getProperty("reverseProxy.urlPrefix") + "/maps/?error=mapIdNotFound"); + response.redirect(configFunctions.getProperty('reverseProxy.urlPrefix') + + '/maps/?error=mapIdNotFound'); + return; } const mapSVGs = await getMapSVGs(); const lotTypeSummary = getLotTypeSummary({ @@ -15,7 +17,7 @@ export const handler = async (request, response) => { const lotStatusSummary = getLotStatusSummary({ mapId: map.mapId }); - response.render("map-edit", { + response.render('map-edit', { headTitle: map.mapName, isCreate: false, map, diff --git a/handlers/maps-get/edit.ts b/handlers/maps-get/edit.ts index ba43b4fc..059077ee 100644 --- a/handlers/maps-get/edit.ts +++ b/handlers/maps-get/edit.ts @@ -1,40 +1,42 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express' -import * as configFunctions from "../../helpers/functions.config.js"; +import * as configFunctions from '../../helpers/functions.config.js' -import { getMap } from "../../helpers/lotOccupancyDB/getMap.js"; +import { getMap } from '../../helpers/lotOccupancyDB/getMap.js' -import { getMapSVGs } from "../../helpers/functions.map.js"; -import { getLotTypeSummary } from "../../helpers/lotOccupancyDB/getLotTypeSummary.js"; -import { getLotStatusSummary } from "../../helpers/lotOccupancyDB/getLotStatusSummary.js"; +import { getMapSVGs } from '../../helpers/functions.map.js' +import { getLotTypeSummary } from '../../helpers/lotOccupancyDB/getLotTypeSummary.js' +import { getLotStatusSummary } from '../../helpers/lotOccupancyDB/getLotStatusSummary.js' export const handler: RequestHandler = async (request, response) => { - const map = getMap(request.params.mapId); + const map = getMap(request.params.mapId) - if (!map) { - return response.redirect( - configFunctions.getProperty("reverseProxy.urlPrefix") + "/maps/?error=mapIdNotFound" - ); - } + if (!map) { + response.redirect( + configFunctions.getProperty('reverseProxy.urlPrefix') + + '/maps/?error=mapIdNotFound' + ) + return + } - const mapSVGs = await getMapSVGs(); + const mapSVGs = await getMapSVGs() - const lotTypeSummary = getLotTypeSummary({ - mapId: map.mapId - }); + const lotTypeSummary = getLotTypeSummary({ + mapId: map.mapId + }) - const lotStatusSummary = getLotStatusSummary({ - mapId: map.mapId - }); + const lotStatusSummary = getLotStatusSummary({ + mapId: map.mapId + }) - response.render("map-edit", { - headTitle: map.mapName, - isCreate: false, - map, - mapSVGs, - lotTypeSummary, - lotStatusSummary - }); -}; + response.render('map-edit', { + headTitle: map.mapName, + isCreate: false, + map, + mapSVGs, + lotTypeSummary, + lotStatusSummary + }) +} -export default handler; +export default handler diff --git a/handlers/maps-get/new.d.ts b/handlers/maps-get/new.d.ts index 9621c611..7151ed90 100644 --- a/handlers/maps-get/new.d.ts +++ b/handlers/maps-get/new.d.ts @@ -1,3 +1,3 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express'; export declare const handler: RequestHandler; export default handler; diff --git a/handlers/maps-get/new.js b/handlers/maps-get/new.js index 3fca5bf0..4eb980f3 100644 --- a/handlers/maps-get/new.js +++ b/handlers/maps-get/new.js @@ -1,13 +1,13 @@ -import * as configFunctions from "../../helpers/functions.config.js"; -import { getMapSVGs } from "../../helpers/functions.map.js"; +import * as configFunctions from '../../helpers/functions.config.js'; +import { getMapSVGs } from '../../helpers/functions.map.js'; export const handler = async (_request, response) => { const map = { - mapCity: configFunctions.getProperty("settings.map.mapCityDefault"), - mapProvince: configFunctions.getProperty("settings.map.mapProvinceDefault") + mapCity: configFunctions.getProperty('settings.map.mapCityDefault'), + mapProvince: configFunctions.getProperty('settings.map.mapProvinceDefault') }; const mapSVGs = await getMapSVGs(); - response.render("map-edit", { - headTitle: configFunctions.getProperty("aliases.map") + " Create", + response.render('map-edit', { + headTitle: configFunctions.getProperty('aliases.map') + ' Create', isCreate: true, map, mapSVGs diff --git a/handlers/maps-get/new.ts b/handlers/maps-get/new.ts index 116f436c..23e07341 100644 --- a/handlers/maps-get/new.ts +++ b/handlers/maps-get/new.ts @@ -1,25 +1,25 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express' -import * as configFunctions from "../../helpers/functions.config.js"; +import * as configFunctions from '../../helpers/functions.config.js' -import { getMapSVGs } from "../../helpers/functions.map.js"; +import { getMapSVGs } from '../../helpers/functions.map.js' -import * as recordTypes from "../../types/recordTypes"; +import * as recordTypes from '../../types/recordTypes' export const handler: RequestHandler = async (_request, response) => { - const map: recordTypes.Map = { - mapCity: configFunctions.getProperty("settings.map.mapCityDefault"), - mapProvince: configFunctions.getProperty("settings.map.mapProvinceDefault") - }; + const map: recordTypes.Map = { + mapCity: configFunctions.getProperty('settings.map.mapCityDefault'), + mapProvince: configFunctions.getProperty('settings.map.mapProvinceDefault') + } - const mapSVGs = await getMapSVGs(); + const mapSVGs = await getMapSVGs() - response.render("map-edit", { - headTitle: configFunctions.getProperty("aliases.map") + " Create", - isCreate: true, - map, - mapSVGs - }); -}; + response.render('map-edit', { + headTitle: configFunctions.getProperty('aliases.map') + ' Create', + isCreate: true, + map, + mapSVGs + }) +} -export default handler; +export default handler diff --git a/handlers/maps-get/search.d.ts b/handlers/maps-get/search.d.ts index 9621c611..7151ed90 100644 --- a/handlers/maps-get/search.d.ts +++ b/handlers/maps-get/search.d.ts @@ -1,3 +1,3 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express'; export declare const handler: RequestHandler; export default handler; diff --git a/handlers/maps-get/search.js b/handlers/maps-get/search.js index f6495414..24a44107 100644 --- a/handlers/maps-get/search.js +++ b/handlers/maps-get/search.js @@ -1,9 +1,9 @@ -import * as configFunctions from "../../helpers/functions.config.js"; -import { getMaps } from "../../helpers/lotOccupancyDB/getMaps.js"; +import * as configFunctions from '../../helpers/functions.config.js'; +import { getMaps } from '../../helpers/lotOccupancyDB/getMaps.js'; export const handler = (_request, response) => { const maps = getMaps(); - response.render("map-search", { - headTitle: configFunctions.getProperty("aliases.map") + " Search", + response.render('map-search', { + headTitle: configFunctions.getProperty('aliases.map') + ' Search', maps }); }; diff --git a/handlers/maps-get/search.ts b/handlers/maps-get/search.ts index a6e8275e..72ab91ec 100644 --- a/handlers/maps-get/search.ts +++ b/handlers/maps-get/search.ts @@ -1,16 +1,16 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express' -import * as configFunctions from "../../helpers/functions.config.js"; +import * as configFunctions from '../../helpers/functions.config.js' -import { getMaps } from "../../helpers/lotOccupancyDB/getMaps.js"; +import { getMaps } from '../../helpers/lotOccupancyDB/getMaps.js' export const handler: RequestHandler = (_request, response) => { - const maps = getMaps(); + const maps = getMaps() - response.render("map-search", { - headTitle: configFunctions.getProperty("aliases.map") + " Search", - maps - }); -}; + response.render('map-search', { + headTitle: configFunctions.getProperty('aliases.map') + ' Search', + maps + }) +} -export default handler; +export default handler diff --git a/handlers/maps-get/view.d.ts b/handlers/maps-get/view.d.ts index 9621c611..7151ed90 100644 --- a/handlers/maps-get/view.d.ts +++ b/handlers/maps-get/view.d.ts @@ -1,3 +1,3 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express'; export declare const handler: RequestHandler; export default handler; diff --git a/handlers/maps-get/view.js b/handlers/maps-get/view.js index 30f0da8a..9655cd05 100644 --- a/handlers/maps-get/view.js +++ b/handlers/maps-get/view.js @@ -1,11 +1,13 @@ -import * as configFunctions from "../../helpers/functions.config.js"; -import { getMap } from "../../helpers/lotOccupancyDB/getMap.js"; -import { getLotStatusSummary } from "../../helpers/lotOccupancyDB/getLotStatusSummary.js"; -import { getLotTypeSummary } from "../../helpers/lotOccupancyDB/getLotTypeSummary.js"; +import * as configFunctions from '../../helpers/functions.config.js'; +import { getMap } from '../../helpers/lotOccupancyDB/getMap.js'; +import { getLotStatusSummary } from '../../helpers/lotOccupancyDB/getLotStatusSummary.js'; +import { getLotTypeSummary } from '../../helpers/lotOccupancyDB/getLotTypeSummary.js'; export const handler = (request, response) => { const map = getMap(request.params.mapId); if (!map) { - return response.redirect(configFunctions.getProperty("reverseProxy.urlPrefix") + "/maps/?error=mapIdNotFound"); + response.redirect(configFunctions.getProperty('reverseProxy.urlPrefix') + + '/maps/?error=mapIdNotFound'); + return; } const lotTypeSummary = getLotTypeSummary({ mapId: map.mapId @@ -13,7 +15,7 @@ export const handler = (request, response) => { const lotStatusSummary = getLotStatusSummary({ mapId: map.mapId }); - response.render("map-view", { + response.render('map-view', { headTitle: map.mapName, map, lotTypeSummary, diff --git a/handlers/maps-get/view.ts b/handlers/maps-get/view.ts index 0cbfa909..e151ea2d 100644 --- a/handlers/maps-get/view.ts +++ b/handlers/maps-get/view.ts @@ -1,34 +1,36 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express' -import * as configFunctions from "../../helpers/functions.config.js"; +import * as configFunctions from '../../helpers/functions.config.js' -import { getMap } from "../../helpers/lotOccupancyDB/getMap.js"; -import { getLotStatusSummary } from "../../helpers/lotOccupancyDB/getLotStatusSummary.js"; -import { getLotTypeSummary } from "../../helpers/lotOccupancyDB/getLotTypeSummary.js"; +import { getMap } from '../../helpers/lotOccupancyDB/getMap.js' +import { getLotStatusSummary } from '../../helpers/lotOccupancyDB/getLotStatusSummary.js' +import { getLotTypeSummary } from '../../helpers/lotOccupancyDB/getLotTypeSummary.js' export const handler: RequestHandler = (request, response) => { - const map = getMap(request.params.mapId); + const map = getMap(request.params.mapId) - if (!map) { - return response.redirect( - configFunctions.getProperty("reverseProxy.urlPrefix") + "/maps/?error=mapIdNotFound" - ); - } + if (!map) { + response.redirect( + configFunctions.getProperty('reverseProxy.urlPrefix') + + '/maps/?error=mapIdNotFound' + ) + return + } - const lotTypeSummary = getLotTypeSummary({ - mapId: map.mapId - }); + const lotTypeSummary = getLotTypeSummary({ + mapId: map.mapId + }) - const lotStatusSummary = getLotStatusSummary({ - mapId: map.mapId - }); + const lotStatusSummary = getLotStatusSummary({ + mapId: map.mapId + }) - response.render("map-view", { - headTitle: map.mapName, - map, - lotTypeSummary, - lotStatusSummary - }); -}; + response.render('map-view', { + headTitle: map.mapName, + map, + lotTypeSummary, + lotStatusSummary + }) +} -export default handler; +export default handler diff --git a/handlers/maps-post/doCreateMap.d.ts b/handlers/maps-post/doCreateMap.d.ts index 9621c611..7151ed90 100644 --- a/handlers/maps-post/doCreateMap.d.ts +++ b/handlers/maps-post/doCreateMap.d.ts @@ -1,3 +1,3 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express'; export declare const handler: RequestHandler; export default handler; diff --git a/handlers/maps-post/doCreateMap.js b/handlers/maps-post/doCreateMap.js index c3839d32..5a6ec9c8 100644 --- a/handlers/maps-post/doCreateMap.js +++ b/handlers/maps-post/doCreateMap.js @@ -1,5 +1,5 @@ -import { addMap } from "../../helpers/lotOccupancyDB/addMap.js"; -export const handler = async (request, response) => { +import { addMap } from '../../helpers/lotOccupancyDB/addMap.js'; +export const handler = (request, response) => { const mapId = addMap(request.body, request.session); response.json({ success: true, diff --git a/handlers/maps-post/doCreateMap.ts b/handlers/maps-post/doCreateMap.ts index 90616616..b83fe29c 100644 --- a/handlers/maps-post/doCreateMap.ts +++ b/handlers/maps-post/doCreateMap.ts @@ -1,14 +1,14 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express' -import { addMap } from "../../helpers/lotOccupancyDB/addMap.js"; +import { addMap } from '../../helpers/lotOccupancyDB/addMap.js' -export const handler: RequestHandler = async (request, response) => { - const mapId = addMap(request.body, request.session); +export const handler: RequestHandler = (request, response) => { + const mapId = addMap(request.body, request.session) - response.json({ - success: true, - mapId - }); -}; + response.json({ + success: true, + mapId + }) +} -export default handler; +export default handler diff --git a/handlers/maps-post/doDeleteMap.d.ts b/handlers/maps-post/doDeleteMap.d.ts index 9621c611..7151ed90 100644 --- a/handlers/maps-post/doDeleteMap.d.ts +++ b/handlers/maps-post/doDeleteMap.d.ts @@ -1,3 +1,3 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express'; export declare const handler: RequestHandler; export default handler; diff --git a/handlers/maps-post/doDeleteMap.js b/handlers/maps-post/doDeleteMap.js index 5a63b500..666e2636 100644 --- a/handlers/maps-post/doDeleteMap.js +++ b/handlers/maps-post/doDeleteMap.js @@ -1,6 +1,6 @@ -import { deleteRecord } from "../../helpers/lotOccupancyDB/deleteRecord.js"; -export const handler = async (request, response) => { - const success = deleteRecord("Maps", request.body.mapId, request.session); +import { deleteRecord } from '../../helpers/lotOccupancyDB/deleteRecord.js'; +export const handler = (request, response) => { + const success = deleteRecord('Maps', request.body.mapId, request.session); response.json({ success }); diff --git a/handlers/maps-post/doDeleteMap.ts b/handlers/maps-post/doDeleteMap.ts index 5284e4fa..22f340bd 100644 --- a/handlers/maps-post/doDeleteMap.ts +++ b/handlers/maps-post/doDeleteMap.ts @@ -1,13 +1,13 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express' -import { deleteRecord } from "../../helpers/lotOccupancyDB/deleteRecord.js"; +import { deleteRecord } from '../../helpers/lotOccupancyDB/deleteRecord.js' -export const handler: RequestHandler = async (request, response) => { - const success = deleteRecord("Maps", request.body.mapId, request.session); +export const handler: RequestHandler = (request, response) => { + const success = deleteRecord('Maps', request.body.mapId, request.session) - response.json({ - success - }); -}; + response.json({ + success + }) +} -export default handler; +export default handler diff --git a/handlers/maps-post/doUpdateMap.d.ts b/handlers/maps-post/doUpdateMap.d.ts index 9621c611..7151ed90 100644 --- a/handlers/maps-post/doUpdateMap.d.ts +++ b/handlers/maps-post/doUpdateMap.d.ts @@ -1,3 +1,3 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express'; export declare const handler: RequestHandler; export default handler; diff --git a/handlers/maps-post/doUpdateMap.js b/handlers/maps-post/doUpdateMap.js index 466774be..defa8e7e 100644 --- a/handlers/maps-post/doUpdateMap.js +++ b/handlers/maps-post/doUpdateMap.js @@ -1,5 +1,5 @@ -import { updateMap } from "../../helpers/lotOccupancyDB/updateMap.js"; -export const handler = async (request, response) => { +import { updateMap } from '../../helpers/lotOccupancyDB/updateMap.js'; +export const handler = (request, response) => { const success = updateMap(request.body, request.session); response.json({ success, diff --git a/handlers/maps-post/doUpdateMap.ts b/handlers/maps-post/doUpdateMap.ts index b40b95d1..4467fd84 100644 --- a/handlers/maps-post/doUpdateMap.ts +++ b/handlers/maps-post/doUpdateMap.ts @@ -1,14 +1,14 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express' -import { updateMap } from "../../helpers/lotOccupancyDB/updateMap.js"; +import { updateMap } from '../../helpers/lotOccupancyDB/updateMap.js' -export const handler: RequestHandler = async (request, response) => { - const success = updateMap(request.body, request.session); +export const handler: RequestHandler = (request, response) => { + const success = updateMap(request.body, request.session) - response.json({ - success, - mapId: request.body.mapId - }); -}; + response.json({ + success, + mapId: request.body.mapId + }) +} -export default handler; +export default handler diff --git a/handlers/permissions.d.ts b/handlers/permissions.d.ts index f5e80762..b1fab625 100644 --- a/handlers/permissions.d.ts +++ b/handlers/permissions.d.ts @@ -1,4 +1,4 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express'; export declare const adminGetHandler: RequestHandler; export declare const adminPostHandler: RequestHandler; export declare const updateGetHandler: RequestHandler; diff --git a/handlers/permissions.js b/handlers/permissions.js index f608132e..1508e578 100644 --- a/handlers/permissions.js +++ b/handlers/permissions.js @@ -1,39 +1,44 @@ -import * as configFunctions from "../helpers/functions.config.js"; -import * as userFunctions from "../helpers/functions.user.js"; -const urlPrefix = configFunctions.getProperty("reverseProxy.urlPrefix"); +import * as configFunctions from '../helpers/functions.config.js'; +import * as userFunctions from '../helpers/functions.user.js'; +const urlPrefix = configFunctions.getProperty('reverseProxy.urlPrefix'); const forbiddenStatus = 403; const forbiddenJSON = { success: false, - message: "Forbidden" + message: 'Forbidden' }; -const forbiddenRedirectURL = urlPrefix + "/dashboard/?error=accessDenied"; +const forbiddenRedirectURL = urlPrefix + '/dashboard/?error=accessDenied'; export const adminGetHandler = (request, response, next) => { if (userFunctions.userIsAdmin(request)) { - return next(); + next(); + return; } - return response.redirect(forbiddenRedirectURL); + response.redirect(forbiddenRedirectURL); }; export const adminPostHandler = (request, response, next) => { if (userFunctions.userIsAdmin(request)) { - return next(); + next(); + return; } return response.status(forbiddenStatus).json(forbiddenJSON); }; export const updateGetHandler = (request, response, next) => { if (userFunctions.userCanUpdate(request)) { - return next(); + next(); + return; } - return response.redirect(forbiddenRedirectURL); + response.redirect(forbiddenRedirectURL); }; export const updatePostHandler = (request, response, next) => { if (userFunctions.userCanUpdate(request)) { - return next(); + next(); + return; } return response.status(forbiddenStatus).json(forbiddenJSON); }; export const apiGetHandler = async (request, response, next) => { if (await userFunctions.apiKeyIsValid(request)) { - return next(); + next(); + return; } - return response.redirect(urlPrefix + "/login"); + response.redirect(urlPrefix + '/login'); }; diff --git a/handlers/permissions.ts b/handlers/permissions.ts index 466bad6e..a367909b 100644 --- a/handlers/permissions.ts +++ b/handlers/permissions.ts @@ -1,56 +1,65 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express' -import * as configFunctions from "../helpers/functions.config.js"; +import * as configFunctions from '../helpers/functions.config.js' -import * as userFunctions from "../helpers/functions.user.js"; +import * as userFunctions from '../helpers/functions.user.js' -const urlPrefix = configFunctions.getProperty("reverseProxy.urlPrefix"); +const urlPrefix = configFunctions.getProperty('reverseProxy.urlPrefix') -const forbiddenStatus = 403; +const forbiddenStatus = 403 const forbiddenJSON = { - success: false, - message: "Forbidden" -}; + success: false, + message: 'Forbidden' +} -const forbiddenRedirectURL = urlPrefix + "/dashboard/?error=accessDenied"; +const forbiddenRedirectURL = urlPrefix + '/dashboard/?error=accessDenied' export const adminGetHandler: RequestHandler = (request, response, next) => { - if (userFunctions.userIsAdmin(request)) { - return next(); - } + if (userFunctions.userIsAdmin(request)) { + next() + return + } - return response.redirect(forbiddenRedirectURL); -}; + response.redirect(forbiddenRedirectURL) +} export const adminPostHandler: RequestHandler = (request, response, next) => { - if (userFunctions.userIsAdmin(request)) { - return next(); - } + if (userFunctions.userIsAdmin(request)) { + next() + return + } - return response.status(forbiddenStatus).json(forbiddenJSON); -}; + return response.status(forbiddenStatus).json(forbiddenJSON) +} export const updateGetHandler: RequestHandler = (request, response, next) => { - if (userFunctions.userCanUpdate(request)) { - return next(); - } + if (userFunctions.userCanUpdate(request)) { + next() + return + } - return response.redirect(forbiddenRedirectURL); -}; + response.redirect(forbiddenRedirectURL) +} export const updatePostHandler: RequestHandler = (request, response, next) => { - if (userFunctions.userCanUpdate(request)) { - return next(); - } + if (userFunctions.userCanUpdate(request)) { + next() + return + } - return response.status(forbiddenStatus).json(forbiddenJSON); -}; + return response.status(forbiddenStatus).json(forbiddenJSON) +} -export const apiGetHandler: RequestHandler = async (request, response, next) => { - if (await userFunctions.apiKeyIsValid(request)) { - return next(); - } +export const apiGetHandler: RequestHandler = async ( + request, + response, + next +) => { + if (await userFunctions.apiKeyIsValid(request)) { + next() + return + } - return response.redirect(urlPrefix + "/login"); -}; + response.redirect(urlPrefix + '/login') +} diff --git a/handlers/print-get/pdf.d.ts b/handlers/print-get/pdf.d.ts index 9621c611..7151ed90 100644 --- a/handlers/print-get/pdf.d.ts +++ b/handlers/print-get/pdf.d.ts @@ -1,3 +1,3 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express'; export declare const handler: RequestHandler; export default handler; diff --git a/handlers/print-get/pdf.js b/handlers/print-get/pdf.js index 05c1c075..17be5228 100644 --- a/handlers/print-get/pdf.js +++ b/handlers/print-get/pdf.js @@ -1,45 +1,51 @@ -import path from "path"; -import * as ejs from "ejs"; -import * as configFunctions from "../../helpers/functions.config.js"; -import * as dateTimeFunctions from "@cityssm/expressjs-server-js/dateTimeFns.js"; -import * as lotOccupancyFunctions from "../../helpers/functions.lotOccupancy.js"; -import { getReportData, getPdfPrintConfig } from "../../helpers/functions.print.js"; -import { convertHTMLToPDF } from "@cityssm/pdf-puppeteer"; -import camelcase from "camelcase"; -const attachmentOrInline = configFunctions.getProperty("settings.printPdf.contentDisposition"); +import path from 'node:path'; +import * as ejs from 'ejs'; +import * as configFunctions from '../../helpers/functions.config.js'; +import * as dateTimeFunctions from '@cityssm/expressjs-server-js/dateTimeFns.js'; +import * as lotOccupancyFunctions from '../../helpers/functions.lotOccupancy.js'; +import { getReportData, getPdfPrintConfig } from '../../helpers/functions.print.js'; +import { convertHTMLToPDF } from '@cityssm/pdf-puppeteer'; +import camelcase from 'camelcase'; +const attachmentOrInline = configFunctions.getProperty('settings.printPdf.contentDisposition'); export const handler = async (request, response, next) => { const printName = request.params.printName; - if (!configFunctions.getProperty("settings.lotOccupancy.prints").includes("pdf/" + printName) && - !configFunctions.getProperty("settings.workOrders.prints").includes("pdf/" + printName)) { - return response.redirect(configFunctions.getProperty("reverseProxy.urlPrefix") + - "/dashboard/?error=printConfigNotAllowed"); + if (!configFunctions + .getProperty('settings.lotOccupancy.prints') + .includes('pdf/' + printName) && + !configFunctions + .getProperty('settings.workOrders.prints') + .includes('pdf/' + printName)) { + response.redirect(configFunctions.getProperty('reverseProxy.urlPrefix') + + '/dashboard/?error=printConfigNotAllowed'); + return; } const printConfig = getPdfPrintConfig(printName); if (!printConfig) { - return response.redirect(configFunctions.getProperty("reverseProxy.urlPrefix") + - "/dashboard/?error=printConfigNotFound"); + response.redirect(configFunctions.getProperty('reverseProxy.urlPrefix') + + '/dashboard/?error=printConfigNotFound'); + return; } const reportData = getReportData(printConfig, request.query); - const reportPath = path.join("views", "print", "pdf", printName + ".ejs"); - const pdfCallbackFunction = (pdf) => { - response.setHeader("Content-Disposition", attachmentOrInline + ";" + " filename=" + camelcase(printConfig.title) + ".pdf"); - response.setHeader("Content-Type", "application/pdf"); + const reportPath = path.join('views', 'print', 'pdf', printName + '.ejs'); + function pdfCallbackFunction(pdf) { + response.setHeader('Content-Disposition', `${attachmentOrInline}; filename=${camelcase(printConfig.title)}.pdf`); + response.setHeader('Content-Type', 'application/pdf'); response.send(pdf); - }; - const ejsCallbackFunction = async (ejsError, ejsData) => { + } + async function ejsCallbackFunction(ejsError, ejsData) { if (ejsError) { - return next(ejsError); + next(ejsError); + return; } await convertHTMLToPDF(ejsData, pdfCallbackFunction, { - format: "letter", + format: 'letter', printBackground: true, preferCSSPageSize: true }, undefined, { cacheBrowser: true, remoteContent: false }); - return; - }; + } reportData.configFunctions = configFunctions; reportData.dateTimeFunctions = dateTimeFunctions; reportData.lotOccupancyFunctions = lotOccupancyFunctions; diff --git a/handlers/print-get/pdf.ts b/handlers/print-get/pdf.ts index 98f07464..08b69075 100644 --- a/handlers/print-get/pdf.ts +++ b/handlers/print-get/pdf.ts @@ -1,84 +1,97 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express' -import path from "path"; -import * as ejs from "ejs"; +import path from 'node:path' +import * as ejs from 'ejs' -import * as configFunctions from "../../helpers/functions.config.js"; -import * as dateTimeFunctions from "@cityssm/expressjs-server-js/dateTimeFns.js"; -import * as lotOccupancyFunctions from "../../helpers/functions.lotOccupancy.js"; +import * as configFunctions from '../../helpers/functions.config.js' +import * as dateTimeFunctions from '@cityssm/expressjs-server-js/dateTimeFns.js' +import * as lotOccupancyFunctions from '../../helpers/functions.lotOccupancy.js' -import { getReportData, getPdfPrintConfig } from "../../helpers/functions.print.js"; +import { + getReportData, + getPdfPrintConfig +} from '../../helpers/functions.print.js' -import { convertHTMLToPDF } from "@cityssm/pdf-puppeteer"; -import camelcase from "camelcase"; +import { convertHTMLToPDF } from '@cityssm/pdf-puppeteer' +import camelcase from 'camelcase' -const attachmentOrInline = configFunctions.getProperty("settings.printPdf.contentDisposition"); +const attachmentOrInline = configFunctions.getProperty( + 'settings.printPdf.contentDisposition' +) export const handler: RequestHandler = async (request, response, next) => { - const printName = request.params.printName; + const printName = request.params.printName - if ( - !configFunctions.getProperty("settings.lotOccupancy.prints").includes("pdf/" + printName) && - !configFunctions.getProperty("settings.workOrders.prints").includes("pdf/" + printName) - ) { - return response.redirect( - configFunctions.getProperty("reverseProxy.urlPrefix") + - "/dashboard/?error=printConfigNotAllowed" - ); + if ( + !configFunctions + .getProperty('settings.lotOccupancy.prints') + .includes('pdf/' + printName) && + !configFunctions + .getProperty('settings.workOrders.prints') + .includes('pdf/' + printName) + ) { + response.redirect( + configFunctions.getProperty('reverseProxy.urlPrefix') + + '/dashboard/?error=printConfigNotAllowed' + ) + return + } + + const printConfig = getPdfPrintConfig(printName) + + if (!printConfig) { + response.redirect( + configFunctions.getProperty('reverseProxy.urlPrefix') + + '/dashboard/?error=printConfigNotFound' + ) + return + } + + const reportData = getReportData(printConfig, request.query) + + const reportPath = path.join('views', 'print', 'pdf', printName + '.ejs') + + function pdfCallbackFunction(pdf: Buffer): void { + response.setHeader( + 'Content-Disposition', + `${attachmentOrInline}; filename=${camelcase(printConfig.title)}.pdf` + ) + + response.setHeader('Content-Type', 'application/pdf') + + response.send(pdf) + } + + async function ejsCallbackFunction( + ejsError: Error, + ejsData: string + ): Promise { + if (ejsError) { + next(ejsError) + return } - const printConfig = getPdfPrintConfig(printName); + await convertHTMLToPDF( + ejsData, + pdfCallbackFunction, + { + format: 'letter', + printBackground: true, + preferCSSPageSize: true + }, + undefined, + { + cacheBrowser: true, + remoteContent: false + } + ) + } - if (!printConfig) { - return response.redirect( - configFunctions.getProperty("reverseProxy.urlPrefix") + - "/dashboard/?error=printConfigNotFound" - ); - } + reportData.configFunctions = configFunctions + reportData.dateTimeFunctions = dateTimeFunctions + reportData.lotOccupancyFunctions = lotOccupancyFunctions - const reportData = getReportData(printConfig, request.query); + await ejs.renderFile(reportPath, reportData, {}, ejsCallbackFunction) +} - const reportPath = path.join("views", "print", "pdf", printName + ".ejs"); - - const pdfCallbackFunction = (pdf: Buffer) => { - response.setHeader( - "Content-Disposition", - attachmentOrInline + ";" + " filename=" + camelcase(printConfig.title) + ".pdf" - ); - - response.setHeader("Content-Type", "application/pdf"); - - response.send(pdf); - }; - - const ejsCallbackFunction = async (ejsError: Error, ejsData: string) => { - if (ejsError) { - return next(ejsError); - } - - await convertHTMLToPDF( - ejsData, - pdfCallbackFunction, - { - format: "letter", - printBackground: true, - preferCSSPageSize: true - }, - undefined, - { - cacheBrowser: true, - remoteContent: false - } - ); - - return; - }; - - reportData.configFunctions = configFunctions; - reportData.dateTimeFunctions = dateTimeFunctions; - reportData.lotOccupancyFunctions = lotOccupancyFunctions; - - await ejs.renderFile(reportPath, reportData, {}, ejsCallbackFunction); -}; - -export default handler; +export default handler diff --git a/handlers/reports-get/search.d.ts b/handlers/reports-get/search.d.ts index 9621c611..7151ed90 100644 --- a/handlers/reports-get/search.d.ts +++ b/handlers/reports-get/search.d.ts @@ -1,3 +1,3 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express'; export declare const handler: RequestHandler; export default handler; diff --git a/handlers/reports-get/search.js b/handlers/reports-get/search.js index d1415bf1..bbc7c253 100644 --- a/handlers/reports-get/search.js +++ b/handlers/reports-get/search.js @@ -1,13 +1,13 @@ -import * as dateTimeFunctions from "@cityssm/expressjs-server-js/dateTimeFns.js"; -import { getMaps } from "../../helpers/lotOccupancyDB/getMaps.js"; -import { getLotStatuses, getLotTypes } from "../../helpers/functions.cache.js"; +import * as dateTimeFunctions from '@cityssm/expressjs-server-js/dateTimeFns.js'; +import { getMaps } from '../../helpers/lotOccupancyDB/getMaps.js'; +import { getLotStatuses, getLotTypes } from '../../helpers/functions.cache.js'; export const handler = (_request, response) => { const rightNow = new Date(); const maps = getMaps(); const lotTypes = getLotTypes(); const lotStatuses = getLotStatuses(); - response.render("report-search", { - headTitle: "Reports", + response.render('report-search', { + headTitle: 'Reports', todayDateString: dateTimeFunctions.dateToString(rightNow), maps, lotTypes, diff --git a/handlers/reports-get/search.ts b/handlers/reports-get/search.ts index 57419f0d..0cdb8a8c 100644 --- a/handlers/reports-get/search.ts +++ b/handlers/reports-get/search.ts @@ -1,24 +1,24 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express' -import * as dateTimeFunctions from "@cityssm/expressjs-server-js/dateTimeFns.js"; +import * as dateTimeFunctions from '@cityssm/expressjs-server-js/dateTimeFns.js' -import { getMaps } from "../../helpers/lotOccupancyDB/getMaps.js"; -import { getLotStatuses, getLotTypes } from "../../helpers/functions.cache.js"; +import { getMaps } from '../../helpers/lotOccupancyDB/getMaps.js' +import { getLotStatuses, getLotTypes } from '../../helpers/functions.cache.js' export const handler: RequestHandler = (_request, response) => { - const rightNow = new Date(); + const rightNow = new Date() - const maps = getMaps(); - const lotTypes = getLotTypes(); - const lotStatuses = getLotStatuses(); + const maps = getMaps() + const lotTypes = getLotTypes() + const lotStatuses = getLotStatuses() - response.render("report-search", { - headTitle: "Reports", - todayDateString: dateTimeFunctions.dateToString(rightNow), - maps, - lotTypes, - lotStatuses - }); -}; + response.render('report-search', { + headTitle: 'Reports', + todayDateString: dateTimeFunctions.dateToString(rightNow), + maps, + lotTypes, + lotStatuses + }) +} -export default handler; +export default handler diff --git a/handlers/workOrders-get/milestoneCalendar.d.ts b/handlers/workOrders-get/milestoneCalendar.d.ts index 9621c611..7151ed90 100644 --- a/handlers/workOrders-get/milestoneCalendar.d.ts +++ b/handlers/workOrders-get/milestoneCalendar.d.ts @@ -1,3 +1,3 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express'; export declare const handler: RequestHandler; export default handler; diff --git a/handlers/workOrders-get/milestoneCalendar.js b/handlers/workOrders-get/milestoneCalendar.js index 359b4ed8..8cbf5683 100644 --- a/handlers/workOrders-get/milestoneCalendar.js +++ b/handlers/workOrders-get/milestoneCalendar.js @@ -1,6 +1,6 @@ export const handler = (request, response) => { - response.render("workOrder-milestoneCalendar", { - headTitle: "Work Order Milestone Calendar" + response.render('workOrder-milestoneCalendar', { + headTitle: 'Work Order Milestone Calendar' }); }; export default handler; diff --git a/handlers/workOrders-get/milestoneCalendar.ts b/handlers/workOrders-get/milestoneCalendar.ts index a8fd8670..3ff2f036 100644 --- a/handlers/workOrders-get/milestoneCalendar.ts +++ b/handlers/workOrders-get/milestoneCalendar.ts @@ -1,9 +1,9 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express' export const handler: RequestHandler = (request, response) => { - response.render("workOrder-milestoneCalendar", { - headTitle: "Work Order Milestone Calendar" - }); -}; + response.render('workOrder-milestoneCalendar', { + headTitle: 'Work Order Milestone Calendar' + }) +} -export default handler; +export default handler diff --git a/handlers/workOrders-get/new.d.ts b/handlers/workOrders-get/new.d.ts index 9621c611..7151ed90 100644 --- a/handlers/workOrders-get/new.d.ts +++ b/handlers/workOrders-get/new.d.ts @@ -1,3 +1,3 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express'; export declare const handler: RequestHandler; export default handler; diff --git a/handlers/workOrders-get/new.js b/handlers/workOrders-get/new.js index 84409fb1..f46723c5 100644 --- a/handlers/workOrders-get/new.js +++ b/handlers/workOrders-get/new.js @@ -1,5 +1,5 @@ -import { dateToInteger, dateToString } from "@cityssm/expressjs-server-js/dateTimeFns.js"; -import { getWorkOrderTypes } from "../../helpers/functions.cache.js"; +import { dateToInteger, dateToString } from '@cityssm/expressjs-server-js/dateTimeFns.js'; +import { getWorkOrderTypes } from '../../helpers/functions.cache.js'; export const handler = (request, response) => { const currentDate = new Date(); const workOrder = { @@ -7,8 +7,8 @@ export const handler = (request, response) => { workOrderOpenDateString: dateToString(currentDate) }; const workOrderTypes = getWorkOrderTypes(); - response.render("workOrder-edit", { - headTitle: "New Work Order", + response.render('workOrder-edit', { + headTitle: 'New Work Order', workOrder, isCreate: true, workOrderTypes diff --git a/handlers/workOrders-get/new.ts b/handlers/workOrders-get/new.ts index 208fcb58..6ba6c6ee 100644 --- a/handlers/workOrders-get/new.ts +++ b/handlers/workOrders-get/new.ts @@ -1,26 +1,29 @@ -import { dateToInteger, dateToString } from "@cityssm/expressjs-server-js/dateTimeFns.js"; -import type { RequestHandler } from "express"; +import { + dateToInteger, + dateToString +} from '@cityssm/expressjs-server-js/dateTimeFns.js' +import type { RequestHandler } from 'express' -import { getWorkOrderTypes } from "../../helpers/functions.cache.js"; +import { getWorkOrderTypes } from '../../helpers/functions.cache.js' -import * as recordTypes from "../../types/recordTypes"; +import * as recordTypes from '../../types/recordTypes' export const handler: RequestHandler = (request, response) => { - const currentDate = new Date(); + const currentDate = new Date() - const workOrder: recordTypes.WorkOrder = { - workOrderOpenDate: dateToInteger(currentDate), - workOrderOpenDateString: dateToString(currentDate) - }; + const workOrder: recordTypes.WorkOrder = { + workOrderOpenDate: dateToInteger(currentDate), + workOrderOpenDateString: dateToString(currentDate) + } - const workOrderTypes = getWorkOrderTypes(); + const workOrderTypes = getWorkOrderTypes() - response.render("workOrder-edit", { - headTitle: "New Work Order", - workOrder, - isCreate: true, - workOrderTypes - }); -}; + response.render('workOrder-edit', { + headTitle: 'New Work Order', + workOrder, + isCreate: true, + workOrderTypes + }) +} -export default handler; +export default handler diff --git a/handlers/workOrders-get/outlook.d.ts b/handlers/workOrders-get/outlook.d.ts index 9621c611..7151ed90 100644 --- a/handlers/workOrders-get/outlook.d.ts +++ b/handlers/workOrders-get/outlook.d.ts @@ -1,3 +1,3 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express'; export declare const handler: RequestHandler; export default handler; diff --git a/handlers/workOrders-get/outlook.js b/handlers/workOrders-get/outlook.js index 8cef92a2..418b0e63 100644 --- a/handlers/workOrders-get/outlook.js +++ b/handlers/workOrders-get/outlook.js @@ -1,9 +1,9 @@ -import { getWorkOrderMilestoneTypes, getWorkOrderTypes } from "../../helpers/functions.cache.js"; +import { getWorkOrderMilestoneTypes, getWorkOrderTypes } from '../../helpers/functions.cache.js'; export const handler = (request, response) => { const workOrderTypes = getWorkOrderTypes(); const workOrderMilestoneTypes = getWorkOrderMilestoneTypes(); - response.render("workOrder-outlook", { - headTitle: "Work Order Outlook Integration", + response.render('workOrder-outlook', { + headTitle: 'Work Order Outlook Integration', workOrderTypes, workOrderMilestoneTypes }); diff --git a/handlers/workOrders-get/outlook.ts b/handlers/workOrders-get/outlook.ts index 68ef16f2..51392f41 100644 --- a/handlers/workOrders-get/outlook.ts +++ b/handlers/workOrders-get/outlook.ts @@ -1,16 +1,19 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express' -import { getWorkOrderMilestoneTypes, getWorkOrderTypes } from "../../helpers/functions.cache.js"; +import { + getWorkOrderMilestoneTypes, + getWorkOrderTypes +} from '../../helpers/functions.cache.js' export const handler: RequestHandler = (request, response) => { - const workOrderTypes = getWorkOrderTypes(); - const workOrderMilestoneTypes = getWorkOrderMilestoneTypes(); + const workOrderTypes = getWorkOrderTypes() + const workOrderMilestoneTypes = getWorkOrderMilestoneTypes() - response.render("workOrder-outlook", { - headTitle: "Work Order Outlook Integration", - workOrderTypes, - workOrderMilestoneTypes - }); -}; + response.render('workOrder-outlook', { + headTitle: 'Work Order Outlook Integration', + workOrderTypes, + workOrderMilestoneTypes + }) +} -export default handler; +export default handler diff --git a/handlers/workOrders-get/search.d.ts b/handlers/workOrders-get/search.d.ts index 9621c611..7151ed90 100644 --- a/handlers/workOrders-get/search.d.ts +++ b/handlers/workOrders-get/search.d.ts @@ -1,3 +1,3 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express'; export declare const handler: RequestHandler; export default handler; diff --git a/handlers/workOrders-get/search.js b/handlers/workOrders-get/search.js index 4601bda3..1a4d7205 100644 --- a/handlers/workOrders-get/search.js +++ b/handlers/workOrders-get/search.js @@ -1,9 +1,9 @@ -import { getWorkOrderTypes } from "../../helpers/functions.cache.js"; +import { getWorkOrderTypes } from '../../helpers/functions.cache.js'; export const handler = (request, response) => { const workOrderOpenDateString = request.query.workOrderOpenDateString; const workOrderTypes = getWorkOrderTypes(); - response.render("workOrder-search", { - headTitle: "Work Order Search", + response.render('workOrder-search', { + headTitle: 'Work Order Search', workOrderTypes, workOrderOpenDateString }); diff --git a/handlers/workOrders-get/search.ts b/handlers/workOrders-get/search.ts index 3da4b3bc..dc1af914 100644 --- a/handlers/workOrders-get/search.ts +++ b/handlers/workOrders-get/search.ts @@ -1,17 +1,17 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express' -import { getWorkOrderTypes } from "../../helpers/functions.cache.js"; +import { getWorkOrderTypes } from '../../helpers/functions.cache.js' export const handler: RequestHandler = (request, response) => { - const workOrderOpenDateString = request.query.workOrderOpenDateString; + const workOrderOpenDateString = request.query.workOrderOpenDateString - const workOrderTypes = getWorkOrderTypes(); + const workOrderTypes = getWorkOrderTypes() - response.render("workOrder-search", { - headTitle: "Work Order Search", - workOrderTypes, - workOrderOpenDateString - }); -}; + response.render('workOrder-search', { + headTitle: 'Work Order Search', + workOrderTypes, + workOrderOpenDateString + }) +} -export default handler; +export default handler diff --git a/handlers/workOrders-get/view.d.ts b/handlers/workOrders-get/view.d.ts index 9621c611..7151ed90 100644 --- a/handlers/workOrders-get/view.d.ts +++ b/handlers/workOrders-get/view.d.ts @@ -1,3 +1,3 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express'; export declare const handler: RequestHandler; export default handler; diff --git a/handlers/workOrders-get/view.js b/handlers/workOrders-get/view.js index 2c1af188..a52f5b83 100644 --- a/handlers/workOrders-get/view.js +++ b/handlers/workOrders-get/view.js @@ -1,5 +1,5 @@ -import * as configFunctions from "../../helpers/functions.config.js"; -import { getWorkOrder } from "../../helpers/lotOccupancyDB/getWorkOrder.js"; +import * as configFunctions from '../../helpers/functions.config.js'; +import { getWorkOrder } from '../../helpers/lotOccupancyDB/getWorkOrder.js'; export const handler = (request, response) => { const workOrder = getWorkOrder(request.params.workOrderId, { includeLotsAndLotOccupancies: true, @@ -7,11 +7,12 @@ export const handler = (request, response) => { includeMilestones: true }); if (!workOrder) { - return response.redirect(configFunctions.getProperty("reverseProxy.urlPrefix") + - "/workOrders/?error=workOrderIdNotFound"); + response.redirect(configFunctions.getProperty('reverseProxy.urlPrefix') + + '/workOrders/?error=workOrderIdNotFound'); + return; } - response.render("workOrder-view", { - headTitle: "Work Order #" + workOrder.workOrderNumber, + response.render('workOrder-view', { + headTitle: `Work Order #${workOrder.workOrderNumber}`, workOrder }); }; diff --git a/handlers/workOrders-get/view.ts b/handlers/workOrders-get/view.ts index 4ea9eb04..581d5ac5 100644 --- a/handlers/workOrders-get/view.ts +++ b/handlers/workOrders-get/view.ts @@ -1,27 +1,28 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express' -import * as configFunctions from "../../helpers/functions.config.js"; +import * as configFunctions from '../../helpers/functions.config.js' -import { getWorkOrder } from "../../helpers/lotOccupancyDB/getWorkOrder.js"; +import { getWorkOrder } from '../../helpers/lotOccupancyDB/getWorkOrder.js' export const handler: RequestHandler = (request, response) => { - const workOrder = getWorkOrder(request.params.workOrderId, { - includeLotsAndLotOccupancies: true, - includeComments: true, - includeMilestones: true - }); + const workOrder = getWorkOrder(request.params.workOrderId, { + includeLotsAndLotOccupancies: true, + includeComments: true, + includeMilestones: true + }) - if (!workOrder) { - return response.redirect( - configFunctions.getProperty("reverseProxy.urlPrefix") + - "/workOrders/?error=workOrderIdNotFound" - ); - } + if (!workOrder) { + response.redirect( + configFunctions.getProperty('reverseProxy.urlPrefix') + + '/workOrders/?error=workOrderIdNotFound' + ) + return + } - response.render("workOrder-view", { - headTitle: "Work Order #" + workOrder.workOrderNumber, - workOrder - }); -}; + response.render('workOrder-view', { + headTitle: `Work Order #${workOrder.workOrderNumber!}`, + workOrder + }) +} -export default handler; +export default handler diff --git a/handlers/workOrders-post/doAddWorkOrderComment.d.ts b/handlers/workOrders-post/doAddWorkOrderComment.d.ts index 9621c611..7151ed90 100644 --- a/handlers/workOrders-post/doAddWorkOrderComment.d.ts +++ b/handlers/workOrders-post/doAddWorkOrderComment.d.ts @@ -1,3 +1,3 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express'; export declare const handler: RequestHandler; export default handler; diff --git a/handlers/workOrders-post/doAddWorkOrderComment.js b/handlers/workOrders-post/doAddWorkOrderComment.js index 12d77ef5..ba34a3fb 100644 --- a/handlers/workOrders-post/doAddWorkOrderComment.js +++ b/handlers/workOrders-post/doAddWorkOrderComment.js @@ -1,6 +1,6 @@ -import { addWorkOrderComment } from "../../helpers/lotOccupancyDB/addWorkOrderComment.js"; -import { getWorkOrderComments } from "../../helpers/lotOccupancyDB/getWorkOrderComments.js"; -export const handler = async (request, response) => { +import { addWorkOrderComment } from '../../helpers/lotOccupancyDB/addWorkOrderComment.js'; +import { getWorkOrderComments } from '../../helpers/lotOccupancyDB/getWorkOrderComments.js'; +export const handler = (request, response) => { addWorkOrderComment(request.body, request.session); const workOrderComments = getWorkOrderComments(request.body.workOrderId); response.json({ diff --git a/handlers/workOrders-post/doAddWorkOrderComment.ts b/handlers/workOrders-post/doAddWorkOrderComment.ts index d0d65cf9..e5bcd2dc 100644 --- a/handlers/workOrders-post/doAddWorkOrderComment.ts +++ b/handlers/workOrders-post/doAddWorkOrderComment.ts @@ -1,18 +1,18 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express' -import { addWorkOrderComment } from "../../helpers/lotOccupancyDB/addWorkOrderComment.js"; +import { addWorkOrderComment } from '../../helpers/lotOccupancyDB/addWorkOrderComment.js' -import { getWorkOrderComments } from "../../helpers/lotOccupancyDB/getWorkOrderComments.js"; +import { getWorkOrderComments } from '../../helpers/lotOccupancyDB/getWorkOrderComments.js' -export const handler: RequestHandler = async (request, response) => { - addWorkOrderComment(request.body, request.session); +export const handler: RequestHandler = (request, response) => { + addWorkOrderComment(request.body, request.session) - const workOrderComments = getWorkOrderComments(request.body.workOrderId); + const workOrderComments = getWorkOrderComments(request.body.workOrderId) - response.json({ - success: true, - workOrderComments - }); -}; + response.json({ + success: true, + workOrderComments + }) +} -export default handler; +export default handler diff --git a/handlers/workOrders-post/doAddWorkOrderLot.d.ts b/handlers/workOrders-post/doAddWorkOrderLot.d.ts index 9621c611..7151ed90 100644 --- a/handlers/workOrders-post/doAddWorkOrderLot.d.ts +++ b/handlers/workOrders-post/doAddWorkOrderLot.d.ts @@ -1,3 +1,3 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express'; export declare const handler: RequestHandler; export default handler; diff --git a/handlers/workOrders-post/doAddWorkOrderLot.js b/handlers/workOrders-post/doAddWorkOrderLot.js index cc05bbdb..199aba7a 100644 --- a/handlers/workOrders-post/doAddWorkOrderLot.js +++ b/handlers/workOrders-post/doAddWorkOrderLot.js @@ -1,6 +1,6 @@ -import { addWorkOrderLot } from "../../helpers/lotOccupancyDB/addWorkOrderLot.js"; -import { getLots } from "../../helpers/lotOccupancyDB/getLots.js"; -export const handler = async (request, response) => { +import { addWorkOrderLot } from '../../helpers/lotOccupancyDB/addWorkOrderLot.js'; +import { getLots } from '../../helpers/lotOccupancyDB/getLots.js'; +export const handler = (request, response) => { const success = addWorkOrderLot({ workOrderId: request.body.workOrderId, lotId: request.body.lotId diff --git a/handlers/workOrders-post/doAddWorkOrderLot.ts b/handlers/workOrders-post/doAddWorkOrderLot.ts index d671e381..0d089fb2 100644 --- a/handlers/workOrders-post/doAddWorkOrderLot.ts +++ b/handlers/workOrders-post/doAddWorkOrderLot.ts @@ -1,31 +1,31 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express' -import { addWorkOrderLot } from "../../helpers/lotOccupancyDB/addWorkOrderLot.js"; -import { getLots } from "../../helpers/lotOccupancyDB/getLots.js"; +import { addWorkOrderLot } from '../../helpers/lotOccupancyDB/addWorkOrderLot.js' +import { getLots } from '../../helpers/lotOccupancyDB/getLots.js' -export const handler: RequestHandler = async (request, response) => { - const success = addWorkOrderLot( - { - workOrderId: request.body.workOrderId, - lotId: request.body.lotId - }, - request.session - ); +export const handler: RequestHandler = (request, response) => { + const success = addWorkOrderLot( + { + workOrderId: request.body.workOrderId, + lotId: request.body.lotId + }, + request.session + ) - const workOrderLots = getLots( - { - workOrderId: request.body.workOrderId - }, - { - limit: -1, - offset: 0 - } - ).lots; + const workOrderLots = getLots( + { + workOrderId: request.body.workOrderId + }, + { + limit: -1, + offset: 0 + } + ).lots - response.json({ - success, - workOrderLots - }); -}; + response.json({ + success, + workOrderLots + }) +} -export default handler; +export default handler diff --git a/handlers/workOrders-post/doAddWorkOrderLotOccupancy.d.ts b/handlers/workOrders-post/doAddWorkOrderLotOccupancy.d.ts index 9621c611..7151ed90 100644 --- a/handlers/workOrders-post/doAddWorkOrderLotOccupancy.d.ts +++ b/handlers/workOrders-post/doAddWorkOrderLotOccupancy.d.ts @@ -1,3 +1,3 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express'; export declare const handler: RequestHandler; export default handler; diff --git a/handlers/workOrders-post/doAddWorkOrderLotOccupancy.js b/handlers/workOrders-post/doAddWorkOrderLotOccupancy.js index e6e3b2af..9b4b4a78 100644 --- a/handlers/workOrders-post/doAddWorkOrderLotOccupancy.js +++ b/handlers/workOrders-post/doAddWorkOrderLotOccupancy.js @@ -1,6 +1,6 @@ -import { addWorkOrderLotOccupancy } from "../../helpers/lotOccupancyDB/addWorkOrderLotOccupancy.js"; -import { getLotOccupancies } from "../../helpers/lotOccupancyDB/getLotOccupancies.js"; -export const handler = async (request, response) => { +import { addWorkOrderLotOccupancy } from '../../helpers/lotOccupancyDB/addWorkOrderLotOccupancy.js'; +import { getLotOccupancies } from '../../helpers/lotOccupancyDB/getLotOccupancies.js'; +export const handler = (request, response) => { const success = addWorkOrderLotOccupancy({ workOrderId: request.body.workOrderId, lotOccupancyId: request.body.lotOccupancyId diff --git a/handlers/workOrders-post/doAddWorkOrderLotOccupancy.ts b/handlers/workOrders-post/doAddWorkOrderLotOccupancy.ts index d8fc276a..c5712eb8 100644 --- a/handlers/workOrders-post/doAddWorkOrderLotOccupancy.ts +++ b/handlers/workOrders-post/doAddWorkOrderLotOccupancy.ts @@ -1,32 +1,32 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express' -import { addWorkOrderLotOccupancy } from "../../helpers/lotOccupancyDB/addWorkOrderLotOccupancy.js"; -import { getLotOccupancies } from "../../helpers/lotOccupancyDB/getLotOccupancies.js"; +import { addWorkOrderLotOccupancy } from '../../helpers/lotOccupancyDB/addWorkOrderLotOccupancy.js' +import { getLotOccupancies } from '../../helpers/lotOccupancyDB/getLotOccupancies.js' -export const handler: RequestHandler = async (request, response) => { - const success = addWorkOrderLotOccupancy( - { - workOrderId: request.body.workOrderId, - lotOccupancyId: request.body.lotOccupancyId - }, - request.session - ); +export const handler: RequestHandler = (request, response) => { + const success = addWorkOrderLotOccupancy( + { + workOrderId: request.body.workOrderId, + lotOccupancyId: request.body.lotOccupancyId + }, + request.session + ) - const workOrderLotOccupancies = getLotOccupancies( - { - workOrderId: request.body.workOrderId - }, - { - limit: -1, - offset: 0, - includeOccupants: true - } - ).lotOccupancies; + const workOrderLotOccupancies = getLotOccupancies( + { + workOrderId: request.body.workOrderId + }, + { + limit: -1, + offset: 0, + includeOccupants: true + } + ).lotOccupancies - response.json({ - success, - workOrderLotOccupancies - }); -}; + response.json({ + success, + workOrderLotOccupancies + }) +} -export default handler; +export default handler diff --git a/handlers/workOrders-post/doAddWorkOrderMilestone.d.ts b/handlers/workOrders-post/doAddWorkOrderMilestone.d.ts index 9621c611..7151ed90 100644 --- a/handlers/workOrders-post/doAddWorkOrderMilestone.d.ts +++ b/handlers/workOrders-post/doAddWorkOrderMilestone.d.ts @@ -1,3 +1,3 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express'; export declare const handler: RequestHandler; export default handler; diff --git a/handlers/workOrders-post/doAddWorkOrderMilestone.js b/handlers/workOrders-post/doAddWorkOrderMilestone.js index 719a64d7..409a742e 100644 --- a/handlers/workOrders-post/doAddWorkOrderMilestone.js +++ b/handlers/workOrders-post/doAddWorkOrderMilestone.js @@ -1,11 +1,11 @@ -import { addWorkOrderMilestone } from "../../helpers/lotOccupancyDB/addWorkOrderMilestone.js"; -import { getWorkOrderMilestones } from "../../helpers/lotOccupancyDB/getWorkOrderMilestones.js"; -export const handler = async (request, response) => { +import { addWorkOrderMilestone } from '../../helpers/lotOccupancyDB/addWorkOrderMilestone.js'; +import { getWorkOrderMilestones } from '../../helpers/lotOccupancyDB/getWorkOrderMilestones.js'; +export const handler = (request, response) => { const success = addWorkOrderMilestone(request.body, request.session); const workOrderMilestones = getWorkOrderMilestones({ workOrderId: request.body.workOrderId }, { - orderBy: "completion" + orderBy: 'completion' }); response.json({ success, diff --git a/handlers/workOrders-post/doAddWorkOrderMilestone.ts b/handlers/workOrders-post/doAddWorkOrderMilestone.ts index 4d30aadd..28ccc1bf 100644 --- a/handlers/workOrders-post/doAddWorkOrderMilestone.ts +++ b/handlers/workOrders-post/doAddWorkOrderMilestone.ts @@ -1,24 +1,24 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express' -import { addWorkOrderMilestone } from "../../helpers/lotOccupancyDB/addWorkOrderMilestone.js"; -import { getWorkOrderMilestones } from "../../helpers/lotOccupancyDB/getWorkOrderMilestones.js"; +import { addWorkOrderMilestone } from '../../helpers/lotOccupancyDB/addWorkOrderMilestone.js' +import { getWorkOrderMilestones } from '../../helpers/lotOccupancyDB/getWorkOrderMilestones.js' -export const handler: RequestHandler = async (request, response) => { - const success = addWorkOrderMilestone(request.body, request.session); +export const handler: RequestHandler = (request, response) => { + const success = addWorkOrderMilestone(request.body, request.session) - const workOrderMilestones = getWorkOrderMilestones( - { - workOrderId: request.body.workOrderId - }, - { - orderBy: "completion" - } - ); + const workOrderMilestones = getWorkOrderMilestones( + { + workOrderId: request.body.workOrderId + }, + { + orderBy: 'completion' + } + ) - response.json({ - success, - workOrderMilestones - }); -}; + response.json({ + success, + workOrderMilestones + }) +} -export default handler; +export default handler diff --git a/handlers/workOrders-post/doCloseWorkOrder.d.ts b/handlers/workOrders-post/doCloseWorkOrder.d.ts index 9621c611..7151ed90 100644 --- a/handlers/workOrders-post/doCloseWorkOrder.d.ts +++ b/handlers/workOrders-post/doCloseWorkOrder.d.ts @@ -1,3 +1,3 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express'; export declare const handler: RequestHandler; export default handler; diff --git a/handlers/workOrders-post/doCloseWorkOrder.js b/handlers/workOrders-post/doCloseWorkOrder.js index c4c1a095..1fb44ea4 100644 --- a/handlers/workOrders-post/doCloseWorkOrder.js +++ b/handlers/workOrders-post/doCloseWorkOrder.js @@ -1,5 +1,5 @@ -import { closeWorkOrder } from "../../helpers/lotOccupancyDB/closeWorkOrder.js"; -export const handler = async (request, response) => { +import { closeWorkOrder } from '../../helpers/lotOccupancyDB/closeWorkOrder.js'; +export const handler = (request, response) => { const success = closeWorkOrder(request.body, request.session); response.json({ success diff --git a/handlers/workOrders-post/doCloseWorkOrder.ts b/handlers/workOrders-post/doCloseWorkOrder.ts index d4b798fd..306994ba 100644 --- a/handlers/workOrders-post/doCloseWorkOrder.ts +++ b/handlers/workOrders-post/doCloseWorkOrder.ts @@ -1,16 +1,13 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express' -import { closeWorkOrder } from "../../helpers/lotOccupancyDB/closeWorkOrder.js"; +import { closeWorkOrder } from '../../helpers/lotOccupancyDB/closeWorkOrder.js' -export const handler: RequestHandler = async (request, response) => { - const success = closeWorkOrder( - request.body, - request.session - ); +export const handler: RequestHandler = (request, response) => { + const success = closeWorkOrder(request.body, request.session) - response.json({ - success - }); -}; + response.json({ + success + }) +} -export default handler; +export default handler diff --git a/handlers/workOrders-post/doCompleteWorkOrderMilestone.d.ts b/handlers/workOrders-post/doCompleteWorkOrderMilestone.d.ts index 9621c611..7151ed90 100644 --- a/handlers/workOrders-post/doCompleteWorkOrderMilestone.d.ts +++ b/handlers/workOrders-post/doCompleteWorkOrderMilestone.d.ts @@ -1,3 +1,3 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express'; export declare const handler: RequestHandler; export default handler; diff --git a/handlers/workOrders-post/doCompleteWorkOrderMilestone.js b/handlers/workOrders-post/doCompleteWorkOrderMilestone.js index fc91eb08..136cade6 100644 --- a/handlers/workOrders-post/doCompleteWorkOrderMilestone.js +++ b/handlers/workOrders-post/doCompleteWorkOrderMilestone.js @@ -1,13 +1,13 @@ -import { completeWorkOrderMilestone } from "../../helpers/lotOccupancyDB/completeWorkOrderMilestone.js"; -import { getWorkOrderMilestones } from "../../helpers/lotOccupancyDB/getWorkOrderMilestones.js"; -export const handler = async (request, response) => { +import { completeWorkOrderMilestone } from '../../helpers/lotOccupancyDB/completeWorkOrderMilestone.js'; +import { getWorkOrderMilestones } from '../../helpers/lotOccupancyDB/getWorkOrderMilestones.js'; +export const handler = (request, response) => { const success = completeWorkOrderMilestone({ workOrderMilestoneId: request.body.workOrderMilestoneId }, request.session); const workOrderMilestones = getWorkOrderMilestones({ workOrderId: request.body.workOrderId }, { - orderBy: "completion" + orderBy: 'completion' }); response.json({ success, diff --git a/handlers/workOrders-post/doCompleteWorkOrderMilestone.ts b/handlers/workOrders-post/doCompleteWorkOrderMilestone.ts index a02d1050..9c55c6c5 100644 --- a/handlers/workOrders-post/doCompleteWorkOrderMilestone.ts +++ b/handlers/workOrders-post/doCompleteWorkOrderMilestone.ts @@ -1,30 +1,30 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express' -import { completeWorkOrderMilestone } from "../../helpers/lotOccupancyDB/completeWorkOrderMilestone.js"; +import { completeWorkOrderMilestone } from '../../helpers/lotOccupancyDB/completeWorkOrderMilestone.js' -import { getWorkOrderMilestones } from "../../helpers/lotOccupancyDB/getWorkOrderMilestones.js"; +import { getWorkOrderMilestones } from '../../helpers/lotOccupancyDB/getWorkOrderMilestones.js' -export const handler: RequestHandler = async (request, response) => { - const success = completeWorkOrderMilestone( - { - workOrderMilestoneId: request.body.workOrderMilestoneId - }, - request.session - ); +export const handler: RequestHandler = (request, response) => { + const success = completeWorkOrderMilestone( + { + workOrderMilestoneId: request.body.workOrderMilestoneId + }, + request.session + ) - const workOrderMilestones = getWorkOrderMilestones( - { - workOrderId: request.body.workOrderId - }, - { - orderBy: "completion" - } - ); + const workOrderMilestones = getWorkOrderMilestones( + { + workOrderId: request.body.workOrderId + }, + { + orderBy: 'completion' + } + ) - response.json({ - success, - workOrderMilestones - }); -}; + response.json({ + success, + workOrderMilestones + }) +} -export default handler; +export default handler diff --git a/handlers/workOrders-post/doCreateWorkOrder.d.ts b/handlers/workOrders-post/doCreateWorkOrder.d.ts index 9621c611..7151ed90 100644 --- a/handlers/workOrders-post/doCreateWorkOrder.d.ts +++ b/handlers/workOrders-post/doCreateWorkOrder.d.ts @@ -1,3 +1,3 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express'; export declare const handler: RequestHandler; export default handler; diff --git a/handlers/workOrders-post/doCreateWorkOrder.js b/handlers/workOrders-post/doCreateWorkOrder.js index 2946e597..563f11b4 100644 --- a/handlers/workOrders-post/doCreateWorkOrder.js +++ b/handlers/workOrders-post/doCreateWorkOrder.js @@ -1,5 +1,5 @@ -import { addWorkOrder } from "../../helpers/lotOccupancyDB/addWorkOrder.js"; -export const handler = async (request, response) => { +import { addWorkOrder } from '../../helpers/lotOccupancyDB/addWorkOrder.js'; +export const handler = (request, response) => { const workOrderId = addWorkOrder(request.body, request.session); response.json({ success: true, diff --git a/handlers/workOrders-post/doCreateWorkOrder.ts b/handlers/workOrders-post/doCreateWorkOrder.ts index 3da2da52..f50067ba 100644 --- a/handlers/workOrders-post/doCreateWorkOrder.ts +++ b/handlers/workOrders-post/doCreateWorkOrder.ts @@ -1,14 +1,14 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express' -import { addWorkOrder } from "../../helpers/lotOccupancyDB/addWorkOrder.js"; +import { addWorkOrder } from '../../helpers/lotOccupancyDB/addWorkOrder.js' -export const handler: RequestHandler = async (request, response) => { - const workOrderId = addWorkOrder(request.body, request.session); +export const handler: RequestHandler = (request, response) => { + const workOrderId = addWorkOrder(request.body, request.session) - response.json({ - success: true, - workOrderId - }); -}; + response.json({ + success: true, + workOrderId + }) +} -export default handler; +export default handler diff --git a/handlers/workOrders-post/doDeleteWorkOrder.d.ts b/handlers/workOrders-post/doDeleteWorkOrder.d.ts index 9621c611..7151ed90 100644 --- a/handlers/workOrders-post/doDeleteWorkOrder.d.ts +++ b/handlers/workOrders-post/doDeleteWorkOrder.d.ts @@ -1,3 +1,3 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express'; export declare const handler: RequestHandler; export default handler; diff --git a/handlers/workOrders-post/doDeleteWorkOrder.js b/handlers/workOrders-post/doDeleteWorkOrder.js index 19037f87..e1a9e289 100644 --- a/handlers/workOrders-post/doDeleteWorkOrder.js +++ b/handlers/workOrders-post/doDeleteWorkOrder.js @@ -1,6 +1,6 @@ -import { deleteRecord } from "../../helpers/lotOccupancyDB/deleteRecord.js"; -export const handler = async (request, response) => { - const success = deleteRecord("WorkOrders", request.body.workOrderId, request.session); +import { deleteRecord } from '../../helpers/lotOccupancyDB/deleteRecord.js'; +export const handler = (request, response) => { + const success = deleteRecord('WorkOrders', request.body.workOrderId, request.session); response.json({ success }); diff --git a/handlers/workOrders-post/doDeleteWorkOrder.ts b/handlers/workOrders-post/doDeleteWorkOrder.ts index bad5877d..ce56d0b2 100644 --- a/handlers/workOrders-post/doDeleteWorkOrder.ts +++ b/handlers/workOrders-post/doDeleteWorkOrder.ts @@ -1,13 +1,17 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express' -import { deleteRecord } from "../../helpers/lotOccupancyDB/deleteRecord.js"; +import { deleteRecord } from '../../helpers/lotOccupancyDB/deleteRecord.js' -export const handler: RequestHandler = async (request, response) => { - const success = deleteRecord("WorkOrders", request.body.workOrderId, request.session); +export const handler: RequestHandler = (request, response) => { + const success = deleteRecord( + 'WorkOrders', + request.body.workOrderId, + request.session + ) - response.json({ - success - }); -}; + response.json({ + success + }) +} -export default handler; +export default handler diff --git a/handlers/workOrders-post/doDeleteWorkOrderComment.d.ts b/handlers/workOrders-post/doDeleteWorkOrderComment.d.ts index 9621c611..7151ed90 100644 --- a/handlers/workOrders-post/doDeleteWorkOrderComment.d.ts +++ b/handlers/workOrders-post/doDeleteWorkOrderComment.d.ts @@ -1,3 +1,3 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express'; export declare const handler: RequestHandler; export default handler; diff --git a/handlers/workOrders-post/doDeleteWorkOrderComment.js b/handlers/workOrders-post/doDeleteWorkOrderComment.js index 152ad528..5f4edc1a 100644 --- a/handlers/workOrders-post/doDeleteWorkOrderComment.js +++ b/handlers/workOrders-post/doDeleteWorkOrderComment.js @@ -1,7 +1,7 @@ -import { deleteRecord } from "../../helpers/lotOccupancyDB/deleteRecord.js"; -import { getWorkOrderComments } from "../../helpers/lotOccupancyDB/getWorkOrderComments.js"; -export const handler = async (request, response) => { - const success = deleteRecord("WorkOrderComments", request.body.workOrderCommentId, request.session); +import { deleteRecord } from '../../helpers/lotOccupancyDB/deleteRecord.js'; +import { getWorkOrderComments } from '../../helpers/lotOccupancyDB/getWorkOrderComments.js'; +export const handler = (request, response) => { + const success = deleteRecord('WorkOrderComments', request.body.workOrderCommentId, request.session); const workOrderComments = getWorkOrderComments(request.body.workOrderId); response.json({ success, diff --git a/handlers/workOrders-post/doDeleteWorkOrderComment.ts b/handlers/workOrders-post/doDeleteWorkOrderComment.ts index 9043252c..810bd44c 100644 --- a/handlers/workOrders-post/doDeleteWorkOrderComment.ts +++ b/handlers/workOrders-post/doDeleteWorkOrderComment.ts @@ -1,18 +1,22 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express' -import { deleteRecord } from "../../helpers/lotOccupancyDB/deleteRecord.js"; +import { deleteRecord } from '../../helpers/lotOccupancyDB/deleteRecord.js' -import { getWorkOrderComments } from "../../helpers/lotOccupancyDB/getWorkOrderComments.js"; +import { getWorkOrderComments } from '../../helpers/lotOccupancyDB/getWorkOrderComments.js' -export const handler: RequestHandler = async (request, response) => { - const success = deleteRecord("WorkOrderComments", request.body.workOrderCommentId, request.session); +export const handler: RequestHandler = (request, response) => { + const success = deleteRecord( + 'WorkOrderComments', + request.body.workOrderCommentId, + request.session + ) - const workOrderComments = getWorkOrderComments(request.body.workOrderId); + const workOrderComments = getWorkOrderComments(request.body.workOrderId) - response.json({ - success, - workOrderComments - }); -}; + response.json({ + success, + workOrderComments + }) +} -export default handler; +export default handler diff --git a/handlers/workOrders-post/doDeleteWorkOrderLot.d.ts b/handlers/workOrders-post/doDeleteWorkOrderLot.d.ts index 9621c611..7151ed90 100644 --- a/handlers/workOrders-post/doDeleteWorkOrderLot.d.ts +++ b/handlers/workOrders-post/doDeleteWorkOrderLot.d.ts @@ -1,3 +1,3 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express'; export declare const handler: RequestHandler; export default handler; diff --git a/handlers/workOrders-post/doDeleteWorkOrderLot.js b/handlers/workOrders-post/doDeleteWorkOrderLot.js index 0fa5719c..3cccaf70 100644 --- a/handlers/workOrders-post/doDeleteWorkOrderLot.js +++ b/handlers/workOrders-post/doDeleteWorkOrderLot.js @@ -1,6 +1,6 @@ -import { deleteWorkOrderLot } from "../../helpers/lotOccupancyDB/deleteWorkOrderLot.js"; -import { getLots } from "../../helpers/lotOccupancyDB/getLots.js"; -export const handler = async (request, response) => { +import { deleteWorkOrderLot } from '../../helpers/lotOccupancyDB/deleteWorkOrderLot.js'; +import { getLots } from '../../helpers/lotOccupancyDB/getLots.js'; +export const handler = (request, response) => { const success = deleteWorkOrderLot(request.body.workOrderId, request.body.lotId, request.session); const workOrderLots = getLots({ workOrderId: request.body.workOrderId diff --git a/handlers/workOrders-post/doDeleteWorkOrderLot.ts b/handlers/workOrders-post/doDeleteWorkOrderLot.ts index 806c9cbf..ab0ce7aa 100644 --- a/handlers/workOrders-post/doDeleteWorkOrderLot.ts +++ b/handlers/workOrders-post/doDeleteWorkOrderLot.ts @@ -1,29 +1,29 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express' -import { deleteWorkOrderLot } from "../../helpers/lotOccupancyDB/deleteWorkOrderLot.js"; -import { getLots } from "../../helpers/lotOccupancyDB/getLots.js"; +import { deleteWorkOrderLot } from '../../helpers/lotOccupancyDB/deleteWorkOrderLot.js' +import { getLots } from '../../helpers/lotOccupancyDB/getLots.js' -export const handler: RequestHandler = async (request, response) => { - const success = deleteWorkOrderLot( - request.body.workOrderId, - request.body.lotId, - request.session - ); +export const handler: RequestHandler = (request, response) => { + const success = deleteWorkOrderLot( + request.body.workOrderId, + request.body.lotId, + request.session + ) - const workOrderLots = getLots( - { - workOrderId: request.body.workOrderId - }, - { - limit: -1, - offset: 0 - } - ).lots; + const workOrderLots = getLots( + { + workOrderId: request.body.workOrderId + }, + { + limit: -1, + offset: 0 + } + ).lots - response.json({ - success, - workOrderLots - }); -}; + response.json({ + success, + workOrderLots + }) +} -export default handler; +export default handler diff --git a/handlers/workOrders-post/doDeleteWorkOrderLotOccupancy.d.ts b/handlers/workOrders-post/doDeleteWorkOrderLotOccupancy.d.ts index 9621c611..7151ed90 100644 --- a/handlers/workOrders-post/doDeleteWorkOrderLotOccupancy.d.ts +++ b/handlers/workOrders-post/doDeleteWorkOrderLotOccupancy.d.ts @@ -1,3 +1,3 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express'; export declare const handler: RequestHandler; export default handler; diff --git a/handlers/workOrders-post/doDeleteWorkOrderLotOccupancy.js b/handlers/workOrders-post/doDeleteWorkOrderLotOccupancy.js index c2f0c675..52c2af12 100644 --- a/handlers/workOrders-post/doDeleteWorkOrderLotOccupancy.js +++ b/handlers/workOrders-post/doDeleteWorkOrderLotOccupancy.js @@ -1,6 +1,6 @@ -import { deleteWorkOrderLotOccupancy } from "../../helpers/lotOccupancyDB/deleteWorkOrderLotOccupancy.js"; -import { getLotOccupancies } from "../../helpers/lotOccupancyDB/getLotOccupancies.js"; -export const handler = async (request, response) => { +import { deleteWorkOrderLotOccupancy } from '../../helpers/lotOccupancyDB/deleteWorkOrderLotOccupancy.js'; +import { getLotOccupancies } from '../../helpers/lotOccupancyDB/getLotOccupancies.js'; +export const handler = (request, response) => { const success = deleteWorkOrderLotOccupancy(request.body.workOrderId, request.body.lotOccupancyId, request.session); const workOrderLotOccupancies = getLotOccupancies({ workOrderId: request.body.workOrderId diff --git a/handlers/workOrders-post/doDeleteWorkOrderLotOccupancy.ts b/handlers/workOrders-post/doDeleteWorkOrderLotOccupancy.ts index a96c74ac..9a0dbe41 100644 --- a/handlers/workOrders-post/doDeleteWorkOrderLotOccupancy.ts +++ b/handlers/workOrders-post/doDeleteWorkOrderLotOccupancy.ts @@ -1,30 +1,30 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express' -import { deleteWorkOrderLotOccupancy } from "../../helpers/lotOccupancyDB/deleteWorkOrderLotOccupancy.js"; -import { getLotOccupancies } from "../../helpers/lotOccupancyDB/getLotOccupancies.js"; +import { deleteWorkOrderLotOccupancy } from '../../helpers/lotOccupancyDB/deleteWorkOrderLotOccupancy.js' +import { getLotOccupancies } from '../../helpers/lotOccupancyDB/getLotOccupancies.js' -export const handler: RequestHandler = async (request, response) => { - const success = deleteWorkOrderLotOccupancy( - request.body.workOrderId, - request.body.lotOccupancyId, - request.session - ); +export const handler: RequestHandler = (request, response) => { + const success = deleteWorkOrderLotOccupancy( + request.body.workOrderId, + request.body.lotOccupancyId, + request.session + ) - const workOrderLotOccupancies = getLotOccupancies( - { - workOrderId: request.body.workOrderId - }, - { - limit: -1, - offset: 0, - includeOccupants: true - } - ).lotOccupancies; + const workOrderLotOccupancies = getLotOccupancies( + { + workOrderId: request.body.workOrderId + }, + { + limit: -1, + offset: 0, + includeOccupants: true + } + ).lotOccupancies - response.json({ - success, - workOrderLotOccupancies - }); -}; + response.json({ + success, + workOrderLotOccupancies + }) +} -export default handler; +export default handler diff --git a/handlers/workOrders-post/doDeleteWorkOrderMilestone.d.ts b/handlers/workOrders-post/doDeleteWorkOrderMilestone.d.ts index 9621c611..7151ed90 100644 --- a/handlers/workOrders-post/doDeleteWorkOrderMilestone.d.ts +++ b/handlers/workOrders-post/doDeleteWorkOrderMilestone.d.ts @@ -1,3 +1,3 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express'; export declare const handler: RequestHandler; export default handler; diff --git a/handlers/workOrders-post/doDeleteWorkOrderMilestone.js b/handlers/workOrders-post/doDeleteWorkOrderMilestone.js index fd158746..b2d9e78f 100644 --- a/handlers/workOrders-post/doDeleteWorkOrderMilestone.js +++ b/handlers/workOrders-post/doDeleteWorkOrderMilestone.js @@ -1,11 +1,11 @@ -import { deleteRecord } from "../../helpers/lotOccupancyDB/deleteRecord.js"; -import { getWorkOrderMilestones } from "../../helpers/lotOccupancyDB/getWorkOrderMilestones.js"; -export const handler = async (request, response) => { - const success = deleteRecord("WorkOrderMilestones", request.body.workOrderMilestoneId, request.session); +import { deleteRecord } from '../../helpers/lotOccupancyDB/deleteRecord.js'; +import { getWorkOrderMilestones } from '../../helpers/lotOccupancyDB/getWorkOrderMilestones.js'; +export const handler = (request, response) => { + const success = deleteRecord('WorkOrderMilestones', request.body.workOrderMilestoneId, request.session); const workOrderMilestones = getWorkOrderMilestones({ workOrderId: request.body.workOrderId }, { - orderBy: "completion" + orderBy: 'completion' }); response.json({ success, diff --git a/handlers/workOrders-post/doDeleteWorkOrderMilestone.ts b/handlers/workOrders-post/doDeleteWorkOrderMilestone.ts index fb64b6a6..4bd729cc 100644 --- a/handlers/workOrders-post/doDeleteWorkOrderMilestone.ts +++ b/handlers/workOrders-post/doDeleteWorkOrderMilestone.ts @@ -1,25 +1,29 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express' -import { deleteRecord } from "../../helpers/lotOccupancyDB/deleteRecord.js"; +import { deleteRecord } from '../../helpers/lotOccupancyDB/deleteRecord.js' -import { getWorkOrderMilestones } from "../../helpers/lotOccupancyDB/getWorkOrderMilestones.js"; +import { getWorkOrderMilestones } from '../../helpers/lotOccupancyDB/getWorkOrderMilestones.js' -export const handler: RequestHandler = async (request, response) => { - const success = deleteRecord("WorkOrderMilestones", request.body.workOrderMilestoneId, request.session); +export const handler: RequestHandler = (request, response) => { + const success = deleteRecord( + 'WorkOrderMilestones', + request.body.workOrderMilestoneId, + request.session + ) - const workOrderMilestones = getWorkOrderMilestones( - { - workOrderId: request.body.workOrderId - }, - { - orderBy: "completion" - } - ); + const workOrderMilestones = getWorkOrderMilestones( + { + workOrderId: request.body.workOrderId + }, + { + orderBy: 'completion' + } + ) - response.json({ - success, - workOrderMilestones - }); -}; + response.json({ + success, + workOrderMilestones + }) +} -export default handler; +export default handler diff --git a/handlers/workOrders-post/doGetWorkOrderMilestones.d.ts b/handlers/workOrders-post/doGetWorkOrderMilestones.d.ts index 9621c611..7151ed90 100644 --- a/handlers/workOrders-post/doGetWorkOrderMilestones.d.ts +++ b/handlers/workOrders-post/doGetWorkOrderMilestones.d.ts @@ -1,3 +1,3 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express'; export declare const handler: RequestHandler; export default handler; diff --git a/handlers/workOrders-post/doGetWorkOrderMilestones.js b/handlers/workOrders-post/doGetWorkOrderMilestones.js index f24fe58f..366415b1 100644 --- a/handlers/workOrders-post/doGetWorkOrderMilestones.js +++ b/handlers/workOrders-post/doGetWorkOrderMilestones.js @@ -1,8 +1,8 @@ -import { getWorkOrderMilestones } from "../../helpers/lotOccupancyDB/getWorkOrderMilestones.js"; -export const handler = async (request, response) => { +import { getWorkOrderMilestones } from '../../helpers/lotOccupancyDB/getWorkOrderMilestones.js'; +export const handler = (request, response) => { const workOrderMilestones = getWorkOrderMilestones(request.body, { includeWorkOrders: true, - orderBy: "date" + orderBy: 'date' }); response.json({ workOrderMilestones diff --git a/handlers/workOrders-post/doGetWorkOrderMilestones.ts b/handlers/workOrders-post/doGetWorkOrderMilestones.ts index d7750869..8cfe20f2 100644 --- a/handlers/workOrders-post/doGetWorkOrderMilestones.ts +++ b/handlers/workOrders-post/doGetWorkOrderMilestones.ts @@ -1,16 +1,16 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express' -import { getWorkOrderMilestones } from "../../helpers/lotOccupancyDB/getWorkOrderMilestones.js"; +import { getWorkOrderMilestones } from '../../helpers/lotOccupancyDB/getWorkOrderMilestones.js' -export const handler: RequestHandler = async (request, response) => { - const workOrderMilestones = getWorkOrderMilestones(request.body, { - includeWorkOrders: true, - orderBy: "date" - }); +export const handler: RequestHandler = (request, response) => { + const workOrderMilestones = getWorkOrderMilestones(request.body, { + includeWorkOrders: true, + orderBy: 'date' + }) - response.json({ - workOrderMilestones - }); -}; + response.json({ + workOrderMilestones + }) +} -export default handler; +export default handler diff --git a/handlers/workOrders-post/doReopenWorkOrder.d.ts b/handlers/workOrders-post/doReopenWorkOrder.d.ts index 9621c611..7151ed90 100644 --- a/handlers/workOrders-post/doReopenWorkOrder.d.ts +++ b/handlers/workOrders-post/doReopenWorkOrder.d.ts @@ -1,3 +1,3 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express'; export declare const handler: RequestHandler; export default handler; diff --git a/handlers/workOrders-post/doReopenWorkOrder.js b/handlers/workOrders-post/doReopenWorkOrder.js index 56c0f7a0..9967ff3e 100644 --- a/handlers/workOrders-post/doReopenWorkOrder.js +++ b/handlers/workOrders-post/doReopenWorkOrder.js @@ -1,5 +1,5 @@ -import { reopenWorkOrder } from "../../helpers/lotOccupancyDB/reopenWorkOrder.js"; -export const handler = async (request, response) => { +import { reopenWorkOrder } from '../../helpers/lotOccupancyDB/reopenWorkOrder.js'; +export const handler = (request, response) => { const success = reopenWorkOrder(request.body.workOrderId, request.session); response.json({ success, diff --git a/handlers/workOrders-post/doReopenWorkOrder.ts b/handlers/workOrders-post/doReopenWorkOrder.ts index d0644749..13dbd82f 100644 --- a/handlers/workOrders-post/doReopenWorkOrder.ts +++ b/handlers/workOrders-post/doReopenWorkOrder.ts @@ -1,14 +1,14 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express' -import { reopenWorkOrder } from "../../helpers/lotOccupancyDB/reopenWorkOrder.js"; +import { reopenWorkOrder } from '../../helpers/lotOccupancyDB/reopenWorkOrder.js' -export const handler: RequestHandler = async (request, response) => { - const success = reopenWorkOrder(request.body.workOrderId, request.session); +export const handler: RequestHandler = (request, response) => { + const success = reopenWorkOrder(request.body.workOrderId, request.session) - response.json({ - success, - workOrderId: request.body.workOrderId - }); -}; + response.json({ + success, + workOrderId: request.body.workOrderId + }) +} -export default handler; +export default handler diff --git a/handlers/workOrders-post/doReopenWorkOrderMilestone.d.ts b/handlers/workOrders-post/doReopenWorkOrderMilestone.d.ts index 9621c611..7151ed90 100644 --- a/handlers/workOrders-post/doReopenWorkOrderMilestone.d.ts +++ b/handlers/workOrders-post/doReopenWorkOrderMilestone.d.ts @@ -1,3 +1,3 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express'; export declare const handler: RequestHandler; export default handler; diff --git a/handlers/workOrders-post/doReopenWorkOrderMilestone.js b/handlers/workOrders-post/doReopenWorkOrderMilestone.js index 740ae963..0bebc352 100644 --- a/handlers/workOrders-post/doReopenWorkOrderMilestone.js +++ b/handlers/workOrders-post/doReopenWorkOrderMilestone.js @@ -1,11 +1,11 @@ -import { reopenWorkOrderMilestone } from "../../helpers/lotOccupancyDB/reopenWorkOrderMilestone.js"; -import { getWorkOrderMilestones } from "../../helpers/lotOccupancyDB/getWorkOrderMilestones.js"; -export const handler = async (request, response) => { +import { reopenWorkOrderMilestone } from '../../helpers/lotOccupancyDB/reopenWorkOrderMilestone.js'; +import { getWorkOrderMilestones } from '../../helpers/lotOccupancyDB/getWorkOrderMilestones.js'; +export const handler = (request, response) => { const success = reopenWorkOrderMilestone(request.body.workOrderMilestoneId, request.session); const workOrderMilestones = getWorkOrderMilestones({ workOrderId: request.body.workOrderId }, { - orderBy: "completion" + orderBy: 'completion' }); response.json({ success, diff --git a/handlers/workOrders-post/doReopenWorkOrderMilestone.ts b/handlers/workOrders-post/doReopenWorkOrderMilestone.ts index 8aa83a3b..6d99859b 100644 --- a/handlers/workOrders-post/doReopenWorkOrderMilestone.ts +++ b/handlers/workOrders-post/doReopenWorkOrderMilestone.ts @@ -1,28 +1,28 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express' -import { reopenWorkOrderMilestone } from "../../helpers/lotOccupancyDB/reopenWorkOrderMilestone.js"; +import { reopenWorkOrderMilestone } from '../../helpers/lotOccupancyDB/reopenWorkOrderMilestone.js' -import { getWorkOrderMilestones } from "../../helpers/lotOccupancyDB/getWorkOrderMilestones.js"; +import { getWorkOrderMilestones } from '../../helpers/lotOccupancyDB/getWorkOrderMilestones.js' -export const handler: RequestHandler = async (request, response) => { - const success = reopenWorkOrderMilestone( - request.body.workOrderMilestoneId, - request.session - ); +export const handler: RequestHandler = (request, response) => { + const success = reopenWorkOrderMilestone( + request.body.workOrderMilestoneId, + request.session + ) - const workOrderMilestones = getWorkOrderMilestones( - { - workOrderId: request.body.workOrderId - }, - { - orderBy: "completion" - } - ); + const workOrderMilestones = getWorkOrderMilestones( + { + workOrderId: request.body.workOrderId + }, + { + orderBy: 'completion' + } + ) - response.json({ - success, - workOrderMilestones - }); -}; + response.json({ + success, + workOrderMilestones + }) +} -export default handler; +export default handler diff --git a/handlers/workOrders-post/doSearchWorkOrders.d.ts b/handlers/workOrders-post/doSearchWorkOrders.d.ts index 9621c611..7151ed90 100644 --- a/handlers/workOrders-post/doSearchWorkOrders.d.ts +++ b/handlers/workOrders-post/doSearchWorkOrders.d.ts @@ -1,3 +1,3 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express'; export declare const handler: RequestHandler; export default handler; diff --git a/handlers/workOrders-post/doSearchWorkOrders.js b/handlers/workOrders-post/doSearchWorkOrders.js index ece6d706..9ee79df9 100644 --- a/handlers/workOrders-post/doSearchWorkOrders.js +++ b/handlers/workOrders-post/doSearchWorkOrders.js @@ -1,5 +1,5 @@ -import { getWorkOrders } from "../../helpers/lotOccupancyDB/getWorkOrders.js"; -export const handler = async (request, response) => { +import { getWorkOrders } from '../../helpers/lotOccupancyDB/getWorkOrders.js'; +export const handler = (request, response) => { const result = getWorkOrders(request.body, { limit: request.body.limit, offset: request.body.offset, diff --git a/handlers/workOrders-post/doSearchWorkOrders.ts b/handlers/workOrders-post/doSearchWorkOrders.ts index 024e1f9a..78773336 100644 --- a/handlers/workOrders-post/doSearchWorkOrders.ts +++ b/handlers/workOrders-post/doSearchWorkOrders.ts @@ -1,19 +1,19 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express' -import { getWorkOrders } from "../../helpers/lotOccupancyDB/getWorkOrders.js"; +import { getWorkOrders } from '../../helpers/lotOccupancyDB/getWorkOrders.js' -export const handler: RequestHandler = async (request, response) => { - const result = getWorkOrders(request.body, { - limit: request.body.limit, - offset: request.body.offset, - includeLotsAndLotOccupancies: true - }); +export const handler: RequestHandler = (request, response) => { + const result = getWorkOrders(request.body, { + limit: request.body.limit, + offset: request.body.offset, + includeLotsAndLotOccupancies: true + }) - response.json({ - count: result.count, - offset: Number.parseInt(request.body.offset, 10), - workOrders: result.workOrders - }); -}; + response.json({ + count: result.count, + offset: Number.parseInt(request.body.offset, 10), + workOrders: result.workOrders + }) +} -export default handler; +export default handler diff --git a/handlers/workOrders-post/doUpdateLotStatus.d.ts b/handlers/workOrders-post/doUpdateLotStatus.d.ts index 9621c611..7151ed90 100644 --- a/handlers/workOrders-post/doUpdateLotStatus.d.ts +++ b/handlers/workOrders-post/doUpdateLotStatus.d.ts @@ -1,3 +1,3 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express'; export declare const handler: RequestHandler; export default handler; diff --git a/handlers/workOrders-post/doUpdateLotStatus.js b/handlers/workOrders-post/doUpdateLotStatus.js index 0f5796c9..bbbc07e9 100644 --- a/handlers/workOrders-post/doUpdateLotStatus.js +++ b/handlers/workOrders-post/doUpdateLotStatus.js @@ -1,6 +1,6 @@ -import { updateLotStatus } from "../../helpers/lotOccupancyDB/updateLot.js"; -import { getLots } from "../../helpers/lotOccupancyDB/getLots.js"; -export const handler = async (request, response) => { +import { updateLotStatus } from '../../helpers/lotOccupancyDB/updateLot.js'; +import { getLots } from '../../helpers/lotOccupancyDB/getLots.js'; +export const handler = (request, response) => { const success = updateLotStatus(request.body.lotId, request.body.lotStatusId, request.session); const workOrderLots = getLots({ workOrderId: request.body.workOrderId diff --git a/handlers/workOrders-post/doUpdateLotStatus.ts b/handlers/workOrders-post/doUpdateLotStatus.ts index 233f8ae5..9ca6918b 100644 --- a/handlers/workOrders-post/doUpdateLotStatus.ts +++ b/handlers/workOrders-post/doUpdateLotStatus.ts @@ -1,26 +1,29 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express' -import { updateLotStatus } from "../../helpers/lotOccupancyDB/updateLot.js"; -import { getLots } from "../../helpers/lotOccupancyDB/getLots.js"; +import { updateLotStatus } from '../../helpers/lotOccupancyDB/updateLot.js' +import { getLots } from '../../helpers/lotOccupancyDB/getLots.js' -export const handler: RequestHandler = async (request, response) => { - - const success = updateLotStatus(request.body.lotId, request.body.lotStatusId, request.session); +export const handler: RequestHandler = (request, response) => { + const success = updateLotStatus( + request.body.lotId, + request.body.lotStatusId, + request.session + ) - const workOrderLots = getLots( - { - workOrderId: request.body.workOrderId - }, - { - limit: -1, - offset: 0 - } - ).lots; + const workOrderLots = getLots( + { + workOrderId: request.body.workOrderId + }, + { + limit: -1, + offset: 0 + } + ).lots - response.json({ - success, - workOrderLots - }); -}; + response.json({ + success, + workOrderLots + }) +} -export default handler; +export default handler diff --git a/handlers/workOrders-post/doUpdateWorkOrder.d.ts b/handlers/workOrders-post/doUpdateWorkOrder.d.ts index 9621c611..7151ed90 100644 --- a/handlers/workOrders-post/doUpdateWorkOrder.d.ts +++ b/handlers/workOrders-post/doUpdateWorkOrder.d.ts @@ -1,3 +1,3 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express'; export declare const handler: RequestHandler; export default handler; diff --git a/handlers/workOrders-post/doUpdateWorkOrder.js b/handlers/workOrders-post/doUpdateWorkOrder.js index e25716d4..3c93bda3 100644 --- a/handlers/workOrders-post/doUpdateWorkOrder.js +++ b/handlers/workOrders-post/doUpdateWorkOrder.js @@ -1,5 +1,5 @@ -import { updateWorkOrder } from "../../helpers/lotOccupancyDB/updateWorkOrder.js"; -export const handler = async (request, response) => { +import { updateWorkOrder } from '../../helpers/lotOccupancyDB/updateWorkOrder.js'; +export const handler = (request, response) => { const success = updateWorkOrder(request.body, request.session); response.json({ success, diff --git a/handlers/workOrders-post/doUpdateWorkOrder.ts b/handlers/workOrders-post/doUpdateWorkOrder.ts index 7765c282..b6a84b64 100644 --- a/handlers/workOrders-post/doUpdateWorkOrder.ts +++ b/handlers/workOrders-post/doUpdateWorkOrder.ts @@ -1,14 +1,14 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express' -import { updateWorkOrder } from "../../helpers/lotOccupancyDB/updateWorkOrder.js"; +import { updateWorkOrder } from '../../helpers/lotOccupancyDB/updateWorkOrder.js' -export const handler: RequestHandler = async (request, response) => { - const success = updateWorkOrder(request.body, request.session); +export const handler: RequestHandler = (request, response) => { + const success = updateWorkOrder(request.body, request.session) - response.json({ - success, - workOrderId: request.body.workOrderId - }); -}; + response.json({ + success, + workOrderId: request.body.workOrderId + }) +} -export default handler; +export default handler diff --git a/handlers/workOrders-post/doUpdateWorkOrderComment.d.ts b/handlers/workOrders-post/doUpdateWorkOrderComment.d.ts index 9621c611..7151ed90 100644 --- a/handlers/workOrders-post/doUpdateWorkOrderComment.d.ts +++ b/handlers/workOrders-post/doUpdateWorkOrderComment.d.ts @@ -1,3 +1,3 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express'; export declare const handler: RequestHandler; export default handler; diff --git a/handlers/workOrders-post/doUpdateWorkOrderComment.js b/handlers/workOrders-post/doUpdateWorkOrderComment.js index 838e43fb..694a7352 100644 --- a/handlers/workOrders-post/doUpdateWorkOrderComment.js +++ b/handlers/workOrders-post/doUpdateWorkOrderComment.js @@ -1,6 +1,6 @@ -import { updateWorkOrderComment } from "../../helpers/lotOccupancyDB/updateWorkOrderComment.js"; -import { getWorkOrderComments } from "../../helpers/lotOccupancyDB/getWorkOrderComments.js"; -export const handler = async (request, response) => { +import { updateWorkOrderComment } from '../../helpers/lotOccupancyDB/updateWorkOrderComment.js'; +import { getWorkOrderComments } from '../../helpers/lotOccupancyDB/getWorkOrderComments.js'; +export const handler = (request, response) => { const success = updateWorkOrderComment(request.body, request.session); const workOrderComments = getWorkOrderComments(request.body.workOrderId); response.json({ diff --git a/handlers/workOrders-post/doUpdateWorkOrderComment.ts b/handlers/workOrders-post/doUpdateWorkOrderComment.ts index 6f088248..9f56f42e 100644 --- a/handlers/workOrders-post/doUpdateWorkOrderComment.ts +++ b/handlers/workOrders-post/doUpdateWorkOrderComment.ts @@ -1,18 +1,18 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express' -import { updateWorkOrderComment } from "../../helpers/lotOccupancyDB/updateWorkOrderComment.js"; +import { updateWorkOrderComment } from '../../helpers/lotOccupancyDB/updateWorkOrderComment.js' -import { getWorkOrderComments } from "../../helpers/lotOccupancyDB/getWorkOrderComments.js"; +import { getWorkOrderComments } from '../../helpers/lotOccupancyDB/getWorkOrderComments.js' -export const handler: RequestHandler = async (request, response) => { - const success = updateWorkOrderComment(request.body, request.session); +export const handler: RequestHandler = (request, response) => { + const success = updateWorkOrderComment(request.body, request.session) - const workOrderComments = getWorkOrderComments(request.body.workOrderId); + const workOrderComments = getWorkOrderComments(request.body.workOrderId) - response.json({ - success, - workOrderComments - }); -}; + response.json({ + success, + workOrderComments + }) +} -export default handler; +export default handler diff --git a/handlers/workOrders-post/doUpdateWorkOrderMilestone.d.ts b/handlers/workOrders-post/doUpdateWorkOrderMilestone.d.ts index 9621c611..7151ed90 100644 --- a/handlers/workOrders-post/doUpdateWorkOrderMilestone.d.ts +++ b/handlers/workOrders-post/doUpdateWorkOrderMilestone.d.ts @@ -1,3 +1,3 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express'; export declare const handler: RequestHandler; export default handler; diff --git a/handlers/workOrders-post/doUpdateWorkOrderMilestone.js b/handlers/workOrders-post/doUpdateWorkOrderMilestone.js index 0a146036..40ff2f72 100644 --- a/handlers/workOrders-post/doUpdateWorkOrderMilestone.js +++ b/handlers/workOrders-post/doUpdateWorkOrderMilestone.js @@ -1,11 +1,11 @@ -import { updateWorkOrderMilestone } from "../../helpers/lotOccupancyDB/updateWorkOrderMilestone.js"; -import { getWorkOrderMilestones } from "../../helpers/lotOccupancyDB/getWorkOrderMilestones.js"; -export const handler = async (request, response) => { +import { updateWorkOrderMilestone } from '../../helpers/lotOccupancyDB/updateWorkOrderMilestone.js'; +import { getWorkOrderMilestones } from '../../helpers/lotOccupancyDB/getWorkOrderMilestones.js'; +export const handler = (request, response) => { const success = updateWorkOrderMilestone(request.body, request.session); const workOrderMilestones = getWorkOrderMilestones({ workOrderId: request.body.workOrderId }, { - orderBy: "completion" + orderBy: 'completion' }); response.json({ success, diff --git a/handlers/workOrders-post/doUpdateWorkOrderMilestone.ts b/handlers/workOrders-post/doUpdateWorkOrderMilestone.ts index 0de1bb89..68baf1a8 100644 --- a/handlers/workOrders-post/doUpdateWorkOrderMilestone.ts +++ b/handlers/workOrders-post/doUpdateWorkOrderMilestone.ts @@ -1,24 +1,24 @@ -import type { RequestHandler } from "express"; +import type { RequestHandler } from 'express' -import { updateWorkOrderMilestone } from "../../helpers/lotOccupancyDB/updateWorkOrderMilestone.js"; -import { getWorkOrderMilestones } from "../../helpers/lotOccupancyDB/getWorkOrderMilestones.js"; +import { updateWorkOrderMilestone } from '../../helpers/lotOccupancyDB/updateWorkOrderMilestone.js' +import { getWorkOrderMilestones } from '../../helpers/lotOccupancyDB/getWorkOrderMilestones.js' -export const handler: RequestHandler = async (request, response) => { - const success = updateWorkOrderMilestone(request.body, request.session); +export const handler: RequestHandler = (request, response) => { + const success = updateWorkOrderMilestone(request.body, request.session) - const workOrderMilestones = getWorkOrderMilestones( - { - workOrderId: request.body.workOrderId - }, - { - orderBy: "completion" - } - ); + const workOrderMilestones = getWorkOrderMilestones( + { + workOrderId: request.body.workOrderId + }, + { + orderBy: 'completion' + } + ) - response.json({ - success, - workOrderMilestones - }); -}; + response.json({ + success, + workOrderMilestones + }) +} -export default handler; +export default handler