From 54e2d6c18878ea3697e423ea3352fd1fd975a623 Mon Sep 17 00:00:00 2001 From: Dan Gowans Date: Mon, 2 Dec 2024 14:35:51 -0500 Subject: [PATCH] update pending records in admin --- .../database/getScannerRecords.js | 2 +- .../database/getScannerRecords.ts | 2 +- .../database/updateScannerRecord.d.ts | 12 +- .../database/updateScannerRecord.js | 10 +- .../database/updateScannerRecord.ts | 32 +- .../database/updateScannerRecordField.d.ts | 3 + .../database/updateScannerRecordField.js | 16 + .../database/updateScannerRecordField.ts | 30 ++ .../post-admin/doGetRepairRecords.d.ts | 6 + .../handlers/post-admin/doGetRepairRecords.js | 7 + .../handlers/post-admin/doGetRepairRecords.ts | 24 ++ .../post-admin/doUpdatePendingRecord.d.ts | 3 + .../post-admin/doUpdatePendingRecord.js | 7 + .../post-admin/doUpdatePendingRecord.ts | 21 ++ modules/inventoryScanner/handlers/router.js | 4 + modules/inventoryScanner/handlers/router.ts | 6 + .../updateRecordsFromValidation.js | 8 +- .../updateRecordsFromValidation.ts | 8 +- modules/inventoryScanner/types.js | 3 +- .../html/scannerRecordEdit.html | 130 +++++++- .../javascripts/adminInventory.js | 2 + .../javascripts/adminInventory.ts | 3 + .../javascripts/adminPending.js | 171 ++++++++++- .../javascripts/adminPending.ts | 282 +++++++++++++++++- .../inventoryScanner/javascripts/scanner.js | 2 + .../inventoryScanner/javascripts/scanner.ts | 3 + views/inventoryScanner/admin.ejs | 10 +- 27 files changed, 739 insertions(+), 68 deletions(-) create mode 100644 modules/inventoryScanner/database/updateScannerRecordField.d.ts create mode 100644 modules/inventoryScanner/database/updateScannerRecordField.js create mode 100644 modules/inventoryScanner/database/updateScannerRecordField.ts create mode 100644 modules/inventoryScanner/handlers/post-admin/doGetRepairRecords.d.ts create mode 100644 modules/inventoryScanner/handlers/post-admin/doGetRepairRecords.js create mode 100644 modules/inventoryScanner/handlers/post-admin/doGetRepairRecords.ts create mode 100644 modules/inventoryScanner/handlers/post-admin/doUpdatePendingRecord.d.ts create mode 100644 modules/inventoryScanner/handlers/post-admin/doUpdatePendingRecord.js create mode 100644 modules/inventoryScanner/handlers/post-admin/doUpdatePendingRecord.ts diff --git a/modules/inventoryScanner/database/getScannerRecords.js b/modules/inventoryScanner/database/getScannerRecords.js index 0e5518d..98e452f 100644 --- a/modules/inventoryScanner/database/getScannerRecords.js +++ b/modules/inventoryScanner/database/getScannerRecords.js @@ -64,7 +64,7 @@ export default function getScannerRecords(filters, userOptions = {}) { ${sqlWhereClause} order by s.scanDate desc, s.scanTime desc, s.recordId desc`; if (options.limit !== -1) { - sql += `limit ${options.limit.toString()}`; + sql += ` limit ${options.limit.toString()}`; } /* * Do Query diff --git a/modules/inventoryScanner/database/getScannerRecords.ts b/modules/inventoryScanner/database/getScannerRecords.ts index 4f2807e..d0ec32f 100644 --- a/modules/inventoryScanner/database/getScannerRecords.ts +++ b/modules/inventoryScanner/database/getScannerRecords.ts @@ -93,7 +93,7 @@ export default function getScannerRecords( order by s.scanDate desc, s.scanTime desc, s.recordId desc` if (options.limit !== -1) { - sql += `limit ${options.limit.toString()}` + sql += ` limit ${options.limit.toString()}` } /* diff --git a/modules/inventoryScanner/database/updateScannerRecord.d.ts b/modules/inventoryScanner/database/updateScannerRecord.d.ts index e5af198..8532e87 100644 --- a/modules/inventoryScanner/database/updateScannerRecord.d.ts +++ b/modules/inventoryScanner/database/updateScannerRecord.d.ts @@ -1,3 +1,9 @@ -type ScannerRecordUpdateField = 'repairId' | 'itemStoreroom' | 'unitPrice'; -export declare function updateScannerRecord(recordId: number, fieldToUpdate: ScannerRecordUpdateField, fieldValue: string | number, updateUserName: string): boolean; -export {}; +export interface UpdateScannerRecordForm { + recordId: string; + workOrderNumber: string; + repairId: string; + itemNumber: string; + quantity: string; + unitPrice: string; +} +export declare function updateScannerRecord(recordForm: UpdateScannerRecordForm, updateUser: FasterWebHelperSessionUser): boolean; diff --git a/modules/inventoryScanner/database/updateScannerRecord.js b/modules/inventoryScanner/database/updateScannerRecord.js index c73a3a9..e303ac6 100644 --- a/modules/inventoryScanner/database/updateScannerRecord.js +++ b/modules/inventoryScanner/database/updateScannerRecord.js @@ -1,16 +1,20 @@ import sqlite from 'better-sqlite3'; import { databasePath } from './helpers.database.js'; -export function updateScannerRecord(recordId, fieldToUpdate, fieldValue, updateUserName) { +export function updateScannerRecord(recordForm, updateUser) { const database = sqlite(databasePath); const result = database .prepare(`update InventoryScannerRecords - set ${fieldToUpdate} = ?, + set workOrderNumber = ?, + repairId = ?, + itemNumber = ?, + quantity = ?, + unitPrice = ?, recordUpdate_userName = ?, recordUpdate_timeMillis = ? where recordId = ? and recordDelete_timeMillis is null and recordSync_timeMillis is null`) - .run(fieldValue, updateUserName, Date.now(), recordId); + .run(recordForm.workOrderNumber, recordForm.repairId === '' ? undefined : recordForm.repairId, recordForm.itemNumber, recordForm.quantity, recordForm.unitPrice === '' ? undefined : recordForm.unitPrice, updateUser.userName, Date.now(), recordForm.recordId); database.close(); return result.changes > 0; } diff --git a/modules/inventoryScanner/database/updateScannerRecord.ts b/modules/inventoryScanner/database/updateScannerRecord.ts index fc92840..368ee0c 100644 --- a/modules/inventoryScanner/database/updateScannerRecord.ts +++ b/modules/inventoryScanner/database/updateScannerRecord.ts @@ -2,27 +2,45 @@ import sqlite from 'better-sqlite3' import { databasePath } from './helpers.database.js' -type ScannerRecordUpdateField = 'repairId' | 'itemStoreroom' | 'unitPrice' +export interface UpdateScannerRecordForm { + recordId: string + workOrderNumber: string + repairId: string + itemNumber: string + quantity: string + unitPrice: string +} export function updateScannerRecord( - recordId: number, - fieldToUpdate: ScannerRecordUpdateField, - fieldValue: string | number, - updateUserName: string + recordForm: UpdateScannerRecordForm, + updateUser: FasterWebHelperSessionUser ): boolean { const database = sqlite(databasePath) const result = database .prepare( `update InventoryScannerRecords - set ${fieldToUpdate} = ?, + set workOrderNumber = ?, + repairId = ?, + itemNumber = ?, + quantity = ?, + unitPrice = ?, recordUpdate_userName = ?, recordUpdate_timeMillis = ? where recordId = ? and recordDelete_timeMillis is null and recordSync_timeMillis is null` ) - .run(fieldValue, updateUserName, Date.now(), recordId) + .run( + recordForm.workOrderNumber, + recordForm.repairId === '' ? undefined : recordForm.repairId, + recordForm.itemNumber, + recordForm.quantity, + recordForm.unitPrice === '' ? undefined : recordForm.unitPrice, + updateUser.userName, + Date.now(), + recordForm.recordId + ) database.close() diff --git a/modules/inventoryScanner/database/updateScannerRecordField.d.ts b/modules/inventoryScanner/database/updateScannerRecordField.d.ts new file mode 100644 index 0000000..52d4ccf --- /dev/null +++ b/modules/inventoryScanner/database/updateScannerRecordField.d.ts @@ -0,0 +1,3 @@ +type ScannerRecordUpdateField = 'repairId' | 'itemStoreroom' | 'unitPrice'; +export declare function updateScannerRecordField(recordId: number, fieldToUpdate: ScannerRecordUpdateField, fieldValue: string | number, updateUserName: string): boolean; +export {}; diff --git a/modules/inventoryScanner/database/updateScannerRecordField.js b/modules/inventoryScanner/database/updateScannerRecordField.js new file mode 100644 index 0000000..3a44f5e --- /dev/null +++ b/modules/inventoryScanner/database/updateScannerRecordField.js @@ -0,0 +1,16 @@ +import sqlite from 'better-sqlite3'; +import { databasePath } from './helpers.database.js'; +export function updateScannerRecordField(recordId, fieldToUpdate, fieldValue, updateUserName) { + const database = sqlite(databasePath); + const result = database + .prepare(`update InventoryScannerRecords + set ${fieldToUpdate} = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where recordId = ? + and recordDelete_timeMillis is null + and recordSync_timeMillis is null`) + .run(fieldValue, updateUserName, Date.now(), recordId); + database.close(); + return result.changes > 0; +} diff --git a/modules/inventoryScanner/database/updateScannerRecordField.ts b/modules/inventoryScanner/database/updateScannerRecordField.ts new file mode 100644 index 0000000..07b0c3c --- /dev/null +++ b/modules/inventoryScanner/database/updateScannerRecordField.ts @@ -0,0 +1,30 @@ +import sqlite from 'better-sqlite3' + +import { databasePath } from './helpers.database.js' + +type ScannerRecordUpdateField = 'repairId' | 'itemStoreroom' | 'unitPrice' + +export function updateScannerRecordField( + recordId: number, + fieldToUpdate: ScannerRecordUpdateField, + fieldValue: string | number, + updateUserName: string +): boolean { + const database = sqlite(databasePath) + + const result = database + .prepare( + `update InventoryScannerRecords + set ${fieldToUpdate} = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where recordId = ? + and recordDelete_timeMillis is null + and recordSync_timeMillis is null` + ) + .run(fieldValue, updateUserName, Date.now(), recordId) + + database.close() + + return result.changes > 0 +} diff --git a/modules/inventoryScanner/handlers/post-admin/doGetRepairRecords.d.ts b/modules/inventoryScanner/handlers/post-admin/doGetRepairRecords.d.ts new file mode 100644 index 0000000..64ca1e6 --- /dev/null +++ b/modules/inventoryScanner/handlers/post-admin/doGetRepairRecords.d.ts @@ -0,0 +1,6 @@ +import type { Request, Response } from 'express'; +interface DoGetRepairIdsForm { + workOrderNumber: string; +} +export default function handler(request: Request, response: Response): void; +export {}; diff --git a/modules/inventoryScanner/handlers/post-admin/doGetRepairRecords.js b/modules/inventoryScanner/handlers/post-admin/doGetRepairRecords.js new file mode 100644 index 0000000..e4261a7 --- /dev/null +++ b/modules/inventoryScanner/handlers/post-admin/doGetRepairRecords.js @@ -0,0 +1,7 @@ +import getWorkOrderValidationRecords from '../../database/getWorkOrderValidationRecords.js'; +import { getWorkOrderTypeFromWorkOrderNumber } from '../../helpers/workOrders.js'; +export default function handler(request, response) { + const workOrderType = getWorkOrderTypeFromWorkOrderNumber(request.body.workOrderNumber); + const records = getWorkOrderValidationRecords(request.body.workOrderNumber, workOrderType); + response.json({ records }); +} diff --git a/modules/inventoryScanner/handlers/post-admin/doGetRepairRecords.ts b/modules/inventoryScanner/handlers/post-admin/doGetRepairRecords.ts new file mode 100644 index 0000000..ffdf066 --- /dev/null +++ b/modules/inventoryScanner/handlers/post-admin/doGetRepairRecords.ts @@ -0,0 +1,24 @@ +import type { Request, Response } from 'express' + +import getWorkOrderValidationRecords from '../../database/getWorkOrderValidationRecords.js' +import { getWorkOrderTypeFromWorkOrderNumber } from '../../helpers/workOrders.js' + +interface DoGetRepairIdsForm { + workOrderNumber: string +} + +export default function handler( + request: Request, + response: Response +): void { + const workOrderType = getWorkOrderTypeFromWorkOrderNumber( + request.body.workOrderNumber + ) + + const records = getWorkOrderValidationRecords( + request.body.workOrderNumber, + workOrderType + ) + + response.json({ records }) +} diff --git a/modules/inventoryScanner/handlers/post-admin/doUpdatePendingRecord.d.ts b/modules/inventoryScanner/handlers/post-admin/doUpdatePendingRecord.d.ts new file mode 100644 index 0000000..5f65e4e --- /dev/null +++ b/modules/inventoryScanner/handlers/post-admin/doUpdatePendingRecord.d.ts @@ -0,0 +1,3 @@ +import type { Request, Response } from 'express'; +import { type UpdateScannerRecordForm } from '../../database/updateScannerRecord.js'; +export default function handler(request: Request, response: Response): void; diff --git a/modules/inventoryScanner/handlers/post-admin/doUpdatePendingRecord.js b/modules/inventoryScanner/handlers/post-admin/doUpdatePendingRecord.js new file mode 100644 index 0000000..ebad632 --- /dev/null +++ b/modules/inventoryScanner/handlers/post-admin/doUpdatePendingRecord.js @@ -0,0 +1,7 @@ +import getScannerRecords from '../../database/getScannerRecords.js'; +import { updateScannerRecord } from '../../database/updateScannerRecord.js'; +export default function handler(request, response) { + const success = updateScannerRecord(request.body, request.session.user); + const pendingRecords = getScannerRecords({ isSynced: false }, { limit: -1 }); + response.json({ success, pendingRecords }); +} diff --git a/modules/inventoryScanner/handlers/post-admin/doUpdatePendingRecord.ts b/modules/inventoryScanner/handlers/post-admin/doUpdatePendingRecord.ts new file mode 100644 index 0000000..156fe89 --- /dev/null +++ b/modules/inventoryScanner/handlers/post-admin/doUpdatePendingRecord.ts @@ -0,0 +1,21 @@ +import type { Request, Response } from 'express' + +import getScannerRecords from '../../database/getScannerRecords.js' +import { + type UpdateScannerRecordForm, + updateScannerRecord +} from '../../database/updateScannerRecord.js' + +export default function handler( + request: Request, + response: Response +): void { + const success = updateScannerRecord( + request.body, + request.session.user as FasterWebHelperSessionUser + ) + + const pendingRecords = getScannerRecords({ isSynced: false }, { limit: -1 }) + + response.json({ success, pendingRecords }) +} diff --git a/modules/inventoryScanner/handlers/router.js b/modules/inventoryScanner/handlers/router.js index 141697e..ec24e9b 100644 --- a/modules/inventoryScanner/handlers/router.js +++ b/modules/inventoryScanner/handlers/router.js @@ -2,8 +2,12 @@ import { Router } from 'express'; import handler_inventoryScanner from './get-admin/inventoryScanner.js'; import handler_doGetInventory from './post-admin/doGetInventory.js'; import handler_doGetPendingRecords from './post-admin/doGetPendingRecords.js'; +import handler_doGetRepairRecords from './post-admin/doGetRepairRecords.js'; +import handler_doUpdatePendingRecord from './post-admin/doUpdatePendingRecord.js'; export const router = Router(); router.get('/', handler_inventoryScanner); router.post('/doGetPendingRecords', handler_doGetPendingRecords); +router.post('/doGetRepairRecords', handler_doGetRepairRecords); +router.post('/doUpdatePendingRecord', handler_doUpdatePendingRecord); router.post('/doGetInventory', handler_doGetInventory); export default router; diff --git a/modules/inventoryScanner/handlers/router.ts b/modules/inventoryScanner/handlers/router.ts index 384a96c..c6fa5bd 100644 --- a/modules/inventoryScanner/handlers/router.ts +++ b/modules/inventoryScanner/handlers/router.ts @@ -3,6 +3,8 @@ import { Router } from 'express' import handler_inventoryScanner from './get-admin/inventoryScanner.js' import handler_doGetInventory from './post-admin/doGetInventory.js' import handler_doGetPendingRecords from './post-admin/doGetPendingRecords.js' +import handler_doGetRepairRecords from './post-admin/doGetRepairRecords.js' +import handler_doUpdatePendingRecord from './post-admin/doUpdatePendingRecord.js' export const router = Router() @@ -10,6 +12,10 @@ router.get('/', handler_inventoryScanner) router.post('/doGetPendingRecords', handler_doGetPendingRecords) +router.post('/doGetRepairRecords', handler_doGetRepairRecords) + +router.post('/doUpdatePendingRecord', handler_doUpdatePendingRecord) + router.post('/doGetInventory', handler_doGetInventory) export default router diff --git a/modules/inventoryScanner/tasks/inventoryScanner/updateRecordsFromValidation.js b/modules/inventoryScanner/tasks/inventoryScanner/updateRecordsFromValidation.js index 8792a49..a70d8ce 100644 --- a/modules/inventoryScanner/tasks/inventoryScanner/updateRecordsFromValidation.js +++ b/modules/inventoryScanner/tasks/inventoryScanner/updateRecordsFromValidation.js @@ -6,7 +6,7 @@ import schedule from 'node-schedule'; import { getItemValidationRecordsByItemNumber } from '../../database/getItemValidationRecords.js'; import getScannerRecords from '../../database/getScannerRecords.js'; import getWorkOrderValidationRecords from '../../database/getWorkOrderValidationRecords.js'; -import { updateScannerRecord } from '../../database/updateScannerRecord.js'; +import { updateScannerRecordField } from '../../database/updateScannerRecordField.js'; import { moduleName } from '../../helpers/module.js'; const minimumMillisBetweenRuns = minutesToMillis(2); const lastRunMillis = 0; @@ -30,7 +30,7 @@ function updateRecordsFromValidationTask() { if (workOrderValidationRecords.length > 0 && record.repairId === null) { for (const workOrderValidationRecord of workOrderValidationRecords) { if (workOrderValidationRecord.repairId !== null) { - updateScannerRecord(record.recordId, 'repairId', workOrderValidationRecord.repairId, taskUserName); + updateScannerRecordField(record.recordId, 'repairId', workOrderValidationRecord.repairId, taskUserName); break; } } @@ -40,10 +40,10 @@ function updateRecordsFromValidationTask() { : []; if (itemValidationRecords.length > 0) { if (record.itemStoreroom === null) { - updateScannerRecord(record.recordId, 'itemStoreroom', itemValidationRecords[0].itemStoreroom, taskUserName); + updateScannerRecordField(record.recordId, 'itemStoreroom', itemValidationRecords[0].itemStoreroom, taskUserName); } if (record.unitPrice === null) { - updateScannerRecord(record.recordId, 'unitPrice', itemValidationRecords[0].unitPrice, taskUserName); + updateScannerRecordField(record.recordId, 'unitPrice', itemValidationRecords[0].unitPrice, taskUserName); } } } diff --git a/modules/inventoryScanner/tasks/inventoryScanner/updateRecordsFromValidation.ts b/modules/inventoryScanner/tasks/inventoryScanner/updateRecordsFromValidation.ts index 71838e4..16647f6 100644 --- a/modules/inventoryScanner/tasks/inventoryScanner/updateRecordsFromValidation.ts +++ b/modules/inventoryScanner/tasks/inventoryScanner/updateRecordsFromValidation.ts @@ -7,7 +7,7 @@ import schedule from 'node-schedule' import { getItemValidationRecordsByItemNumber } from '../../database/getItemValidationRecords.js' import getScannerRecords from '../../database/getScannerRecords.js' import getWorkOrderValidationRecords from '../../database/getWorkOrderValidationRecords.js' -import { updateScannerRecord } from '../../database/updateScannerRecord.js' +import { updateScannerRecordField } from '../../database/updateScannerRecordField.js' import { moduleName } from '../../helpers/module.js' const minimumMillisBetweenRuns = minutesToMillis(2) @@ -45,7 +45,7 @@ function updateRecordsFromValidationTask(): void { if (workOrderValidationRecords.length > 0 && record.repairId === null) { for (const workOrderValidationRecord of workOrderValidationRecords) { if (workOrderValidationRecord.repairId !== null) { - updateScannerRecord( + updateScannerRecordField( record.recordId, 'repairId', workOrderValidationRecord.repairId, @@ -63,7 +63,7 @@ function updateRecordsFromValidationTask(): void { if (itemValidationRecords.length > 0) { if (record.itemStoreroom === null) { - updateScannerRecord( + updateScannerRecordField( record.recordId, 'itemStoreroom', itemValidationRecords[0].itemStoreroom, @@ -72,7 +72,7 @@ function updateRecordsFromValidationTask(): void { } if (record.unitPrice === null) { - updateScannerRecord( + updateScannerRecordField( record.recordId, 'unitPrice', itemValidationRecords[0].unitPrice, diff --git a/modules/inventoryScanner/types.js b/modules/inventoryScanner/types.js index cb0ff5c..c8ad2e5 100644 --- a/modules/inventoryScanner/types.js +++ b/modules/inventoryScanner/types.js @@ -1 +1,2 @@ -export {}; +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/public/inventoryScanner/html/scannerRecordEdit.html b/public/inventoryScanner/html/scannerRecordEdit.html index 5619e61..7739c0d 100644 --- a/public/inventoryScanner/html/scannerRecordEdit.html +++ b/public/inventoryScanner/html/scannerRecordEdit.html @@ -16,25 +16,127 @@

+ +
+
+ Scanner Record ID
+ +
+
+ Scan Time
+ +
+
+ +
+
+ + + + +
+
+ +
+
+ + +
+
+
+ +
+ + + +
+
+ +
+
+ +
+
+ + + + +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+
+ +
+
+ + + + +
+
+ +
+
+
+
- +
+ -
-
- -
-
-
- - - Delete Record - + + +
+
+ +
+
+
+ + + Delete Record + +
diff --git a/public/inventoryScanner/javascripts/adminInventory.js b/public/inventoryScanner/javascripts/adminInventory.js index e05ecb8..a401184 100644 --- a/public/inventoryScanner/javascripts/adminInventory.js +++ b/public/inventoryScanner/javascripts/adminInventory.js @@ -1,4 +1,6 @@ "use strict"; +// eslint-disable-next-line @eslint-community/eslint-comments/disable-enable-pair +/* eslint-disable @typescript-eslint/no-unsafe-type-assertion */ Object.defineProperty(exports, "__esModule", { value: true }); (() => { const moduleUrlPrefix = `${document.querySelector('main')?.dataset.urlPrefix ?? ''}/modules/inventoryScanner`; diff --git a/public/inventoryScanner/javascripts/adminInventory.ts b/public/inventoryScanner/javascripts/adminInventory.ts index 5d99132..92fbfa0 100644 --- a/public/inventoryScanner/javascripts/adminInventory.ts +++ b/public/inventoryScanner/javascripts/adminInventory.ts @@ -1,3 +1,6 @@ +// eslint-disable-next-line @eslint-community/eslint-comments/disable-enable-pair +/* eslint-disable @typescript-eslint/no-unsafe-type-assertion */ + import type { cityssmGlobal } from '@cityssm/bulma-webapp-js/src/types.js' import type { ItemValidationRecord } from '../../../modules/inventoryScanner/types.js' diff --git a/public/inventoryScanner/javascripts/adminPending.js b/public/inventoryScanner/javascripts/adminPending.js index 1de7ac8..68d3614 100644 --- a/public/inventoryScanner/javascripts/adminPending.js +++ b/public/inventoryScanner/javascripts/adminPending.js @@ -1,14 +1,136 @@ "use strict"; +// eslint-disable-next-line @eslint-community/eslint-comments/disable-enable-pair +/* eslint-disable @typescript-eslint/no-unsafe-type-assertion */ Object.defineProperty(exports, "__esModule", { value: true }); (() => { const moduleUrlPrefix = `${document.querySelector('main')?.dataset.urlPrefix ?? ''}/modules/inventoryScanner`; let pendingRecords = exports.pendingRecords; + const pendingRecordsUnknownCountElement = document.querySelector('#pending--unknownCount'); const pendingRecordsTbodyElement = document.querySelector('#tbody--pending'); + function unlockField(clickEvent) { + clickEvent.preventDefault(); + const inputOrSelectElement = clickEvent.currentTarget + .closest('.field') + ?.querySelector('input, select'); + inputOrSelectElement.removeAttribute('readonly'); + if (inputOrSelectElement.tagName === 'SELECT') { + const optionElements = inputOrSelectElement.querySelectorAll('option'); + for (const optionElement of optionElements) { + optionElement.classList.remove('is-hidden'); + optionElement.disabled = false; + } + } + inputOrSelectElement.focus(); + } + function renderRepairIds(records) { + const repairIdSelectElement = document.querySelector('#updatePending--repairId'); + if (repairIdSelectElement === null) { + return; + } + for (const record of records) { + if (record.repairId !== null) { + const optionElement = document.createElement('option'); + if (repairIdSelectElement.hasAttribute('readonly')) { + optionElement.classList.add('is-hidden'); + optionElement.disabled = true; + } + optionElement.textContent = record.repairDescription; + optionElement.value = record.repairId.toString(); + repairIdSelectElement.append(optionElement); + } + } + } + let lastSearchedWorkOrderNumber = ''; + function refreshRepairIdSelect(clearOptions = true) { + const workOrderNumberElement = document.querySelector('#updatePending--workOrderNumber'); + const repairIdSelectElement = document.querySelector('#updatePending--repairId'); + if (workOrderNumberElement === null || + repairIdSelectElement === null || + lastSearchedWorkOrderNumber === workOrderNumberElement.value || + (clearOptions && workOrderNumberElement.readOnly)) { + return; + } + lastSearchedWorkOrderNumber = workOrderNumberElement.value; + if (clearOptions) { + repairIdSelectElement.replaceChildren(); + repairIdSelectElement.innerHTML = + ''; + repairIdSelectElement.value = ''; + } + if (lastSearchedWorkOrderNumber === '') { + renderRepairIds([]); + return; + } + cityssm.postJSON(`${moduleUrlPrefix}/doGetRepairRecords`, { + workOrderNumber: lastSearchedWorkOrderNumber + }, (rawResponseJSON) => { + const responseJSON = rawResponseJSON; + renderRepairIds(responseJSON.records); + }); + } + function updatePendingRecord(formElement, callbackFunction) { + cityssm.postJSON(`${moduleUrlPrefix}/doUpdatePendingRecord`, formElement, (rawResponseJSON) => { + const responseJSON = rawResponseJSON; + if (responseJSON.success) { + pendingRecords = responseJSON.pendingRecords; + if (callbackFunction !== undefined) { + callbackFunction(); + } + renderPendingRecords(); + } + else { + bulmaJS.alert({ + title: 'Error Updating Record', + message: 'Please try again.', + contextualColorName: 'danger' + }); + } + }); + } function openUpdateScannerRecord(clickEvent) { + clickEvent.preventDefault(); + const recordIndex = Number.parseInt(clickEvent.currentTarget.closest('tr')?.dataset + .recordIndex ?? ''); + lastSearchedWorkOrderNumber = ''; + const pendingRecord = pendingRecords[recordIndex]; cityssm.openHtmlModal('scannerRecordEdit', { + onshow(modalElement) { + ; + modalElement.querySelector('#updatePending--recordId').value = pendingRecord.recordId.toString(); + modalElement.querySelector('#updatePending--recordIdSpan').textContent = pendingRecord.recordId.toString(); + modalElement.querySelector('#updatePending--scanDateTimeSpan').textContent = + pendingRecord.scanDateString + ' ' + pendingRecord.scanTimeString; + modalElement.querySelector('#updatePending--workOrderNumber').value = pendingRecord.workOrderNumber; + const repairSelectElement = modalElement.querySelector('#updatePending--repairId'); + repairSelectElement.innerHTML = ``; + modalElement.querySelector('#updatePending--itemNumber').value = pendingRecord.itemNumber; + modalElement.querySelector('#updatePending--quantity').value = pendingRecord.quantity.toString(); + modalElement.querySelector('#updatePending--unitPrice').value = + pendingRecord.unitPrice === null + ? '' + : pendingRecord.unitPrice.toPrecision(4); + }, onshown(modalElement, closeModalFunction) { bulmaJS.toggleHtmlClipped(); bulmaJS.init(modalElement); + modalElement + .querySelector('form') + ?.addEventListener('submit', (formEvent) => { + formEvent.preventDefault(); + updatePendingRecord(formEvent.currentTarget, closeModalFunction); + }); + const unlockButtonElements = modalElement.querySelectorAll('.is-unlock-button'); + for (const unlockButtonElement of unlockButtonElements) { + unlockButtonElement.addEventListener('click', unlockField); + } + modalElement + .querySelector('#updatePending--workOrderNumber') + ?.addEventListener('keyup', () => { + refreshRepairIdSelect(true); + }); + refreshRepairIdSelect(false); }, onremoved() { bulmaJS.toggleHtmlClipped(); @@ -17,16 +139,17 @@ Object.defineProperty(exports, "__esModule", { value: true }); } function recordHasUnknowns(record) { return ((record.workOrderType === 'faster' && - (record.repairId === null || record.repairDescription === '')) || + record.repairDescription === null) || record.itemDescription === null || record.unitPrice === null); } function renderPendingRecords() { const rowElements = []; + let unknownCount = 0; for (const [recordIndex, record] of pendingRecords.entries()) { const rowElement = document.createElement('tr'); if (recordHasUnknowns(record)) { - rowElement.classList.add('is-warning'); + unknownCount += 1; } rowElement.dataset.recordId = record.recordId.toString(); rowElement.dataset.recordIndex = recordIndex.toString(); @@ -34,24 +157,40 @@ Object.defineProperty(exports, "__esModule", { value: true }); ${cityssm.escapeHTML(record.scanDateString)} ${cityssm.escapeHTML(record.scanTimeString)}
#${cityssm.escapeHTML(record.recordId.toString())} `; - let workOrderHTML = ''; - workOrderHTML = + const workOrderCellElement = document.createElement('td'); + // eslint-disable-next-line no-unsanitized/property + workOrderCellElement.innerHTML = record.workOrderType === 'faster' ? ` ${cityssm.escapeHTML(record.workOrderNumber)} ` : `${cityssm.escapeHTML(record.workOrderNumber)}
${cityssm.escapeHTML(record.workOrderType)}`; - // eslint-disable-next-line no-unsanitized/method - rowElement.insertAdjacentHTML('beforeend', ` - ${workOrderHTML} - `); + rowElement.append(workOrderCellElement); + const repairCellElement = document.createElement('td'); + if (record.workOrderType === 'faster' && + record.repairDescription === null) { + repairCellElement.classList.add('has-background-warning-light'); + } + if (record.repairId === null) { + repairCellElement.innerHTML = ` + (No Repair Set) + `; + } + else if (record.repairDescription === null) { + repairCellElement.innerHTML = ` + (Unknown Repair ID: ${cityssm.escapeHTML(record.repairId.toString())}) + `; + } + else { + repairCellElement.innerHTML = `${cityssm.escapeHTML(record.repairDescription)}
+ Repair ID: ${cityssm.escapeHTML(record.repairId.toString())}`; + } + rowElement.append(repairCellElement); rowElement.insertAdjacentHTML('beforeend', ` - ${cityssm.escapeHTML(record.repairDescription ?? '(Unknown Repair)')}
- ${cityssm.escapeHTML((record.repairId ?? '').toString())} - ${cityssm.escapeHTML(record.itemNumber)}
${cityssm.escapeHTML(record.itemDescription ?? '(Unknown Item)')} @@ -69,6 +208,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); rowElements.push(rowElement); } pendingRecordsTbodyElement.replaceChildren(...rowElements); + if (unknownCount === 0) { + pendingRecordsUnknownCountElement.classList.add('is-hidden'); + } + else { + ; + pendingRecordsUnknownCountElement.querySelector('span').textContent = unknownCount.toString(); + pendingRecordsUnknownCountElement.classList.remove('is-hidden'); + } } const autoRefreshElement = document.querySelector('#pending--autoRefresh'); function refreshPendingRecords(clickEvent) { diff --git a/public/inventoryScanner/javascripts/adminPending.ts b/public/inventoryScanner/javascripts/adminPending.ts index 83c9c86..b70c5fb 100644 --- a/public/inventoryScanner/javascripts/adminPending.ts +++ b/public/inventoryScanner/javascripts/adminPending.ts @@ -1,7 +1,13 @@ +// eslint-disable-next-line @eslint-community/eslint-comments/disable-enable-pair +/* eslint-disable @typescript-eslint/no-unsafe-type-assertion */ + import type { BulmaJS } from '@cityssm/bulma-js/types.js' import type { cityssmGlobal } from '@cityssm/bulma-webapp-js/src/types.js' -import type { InventoryScannerRecord } from '../../../modules/inventoryScanner/types.js' +import type { + InventoryScannerRecord, + WorkOrderValidationRecord +} from '../../../modules/inventoryScanner/types.js' declare const exports: { pendingRecords: InventoryScannerRecord[] @@ -15,15 +21,231 @@ declare const cityssm: cityssmGlobal let pendingRecords = exports.pendingRecords + const pendingRecordsUnknownCountElement = document.querySelector( + '#pending--unknownCount' + ) as HTMLElement + const pendingRecordsTbodyElement = document.querySelector( '#tbody--pending' ) as HTMLTableSectionElement + function unlockField(clickEvent: Event): void { + clickEvent.preventDefault() + + const inputOrSelectElement = (clickEvent.currentTarget as HTMLElement) + .closest('.field') + ?.querySelector('input, select') as HTMLInputElement | HTMLSelectElement + + inputOrSelectElement.removeAttribute('readonly') + + if (inputOrSelectElement.tagName === 'SELECT') { + const optionElements = inputOrSelectElement.querySelectorAll('option') + + for (const optionElement of optionElements) { + optionElement.classList.remove('is-hidden') + optionElement.disabled = false + } + } + + inputOrSelectElement.focus() + } + + function renderRepairIds(records: WorkOrderValidationRecord[]): void { + const repairIdSelectElement = document.querySelector( + '#updatePending--repairId' + ) as HTMLSelectElement | null + + if (repairIdSelectElement === null) { + return + } + + for (const record of records) { + if (record.repairId !== null) { + const optionElement = document.createElement('option') + + if (repairIdSelectElement.hasAttribute('readonly')) { + optionElement.classList.add('is-hidden') + optionElement.disabled = true + } + + optionElement.textContent = record.repairDescription + optionElement.value = record.repairId.toString() + repairIdSelectElement.append(optionElement) + } + } + } + + let lastSearchedWorkOrderNumber = '' + + function refreshRepairIdSelect(clearOptions = true): void { + const workOrderNumberElement = document.querySelector( + '#updatePending--workOrderNumber' + ) as HTMLInputElement | null + + const repairIdSelectElement = document.querySelector( + '#updatePending--repairId' + ) as HTMLSelectElement | null + + if ( + workOrderNumberElement === null || + repairIdSelectElement === null || + lastSearchedWorkOrderNumber === workOrderNumberElement.value || + (clearOptions && workOrderNumberElement.readOnly) + ) { + return + } + + lastSearchedWorkOrderNumber = workOrderNumberElement.value + + if (clearOptions) { + repairIdSelectElement.replaceChildren() + repairIdSelectElement.innerHTML = + '' + repairIdSelectElement.value = '' + } + + if (lastSearchedWorkOrderNumber === '') { + renderRepairIds([]) + return + } + + cityssm.postJSON( + `${moduleUrlPrefix}/doGetRepairRecords`, + { + workOrderNumber: lastSearchedWorkOrderNumber + }, + (rawResponseJSON) => { + const responseJSON = rawResponseJSON as unknown as { + records: WorkOrderValidationRecord[] + } + + renderRepairIds(responseJSON.records) + } + ) + } + + function updatePendingRecord( + formElement: HTMLFormElement, + callbackFunction?: () => void + ): void { + cityssm.postJSON( + `${moduleUrlPrefix}/doUpdatePendingRecord`, + formElement, + (rawResponseJSON) => { + const responseJSON = rawResponseJSON as unknown as { + success: boolean + pendingRecords: InventoryScannerRecord[] + } + + if (responseJSON.success) { + pendingRecords = responseJSON.pendingRecords + + if (callbackFunction !== undefined) { + callbackFunction() + } + + renderPendingRecords() + } else { + bulmaJS.alert({ + title: 'Error Updating Record', + message: 'Please try again.', + contextualColorName: 'danger' + }) + } + } + ) + } + function openUpdateScannerRecord(clickEvent: Event): void { + clickEvent.preventDefault() + + const recordIndex = Number.parseInt( + (clickEvent.currentTarget as HTMLElement).closest('tr')?.dataset + .recordIndex ?? '' + ) + + lastSearchedWorkOrderNumber = '' + + const pendingRecord = pendingRecords[recordIndex] + cityssm.openHtmlModal('scannerRecordEdit', { + onshow(modalElement) { + ;( + modalElement.querySelector( + '#updatePending--recordId' + ) as HTMLInputElement + ).value = pendingRecord.recordId.toString() + ;( + modalElement.querySelector( + '#updatePending--recordIdSpan' + ) as HTMLElement + ).textContent = pendingRecord.recordId.toString() + ;( + modalElement.querySelector( + '#updatePending--scanDateTimeSpan' + ) as HTMLElement + ).textContent = + pendingRecord.scanDateString + ' ' + pendingRecord.scanTimeString + ;( + modalElement.querySelector( + '#updatePending--workOrderNumber' + ) as HTMLInputElement + ).value = pendingRecord.workOrderNumber + + const repairSelectElement = modalElement.querySelector( + '#updatePending--repairId' + ) as HTMLSelectElement + + repairSelectElement.innerHTML = `` + ;( + modalElement.querySelector( + '#updatePending--itemNumber' + ) as HTMLInputElement + ).value = pendingRecord.itemNumber + ;( + modalElement.querySelector( + '#updatePending--quantity' + ) as HTMLInputElement + ).value = pendingRecord.quantity.toString() + ;( + modalElement.querySelector( + '#updatePending--unitPrice' + ) as HTMLInputElement + ).value = + pendingRecord.unitPrice === null + ? '' + : pendingRecord.unitPrice.toPrecision(4) + }, onshown(modalElement, closeModalFunction) { bulmaJS.toggleHtmlClipped() bulmaJS.init(modalElement) + + modalElement + .querySelector('form') + ?.addEventListener('submit', (formEvent) => { + formEvent.preventDefault() + updatePendingRecord( + formEvent.currentTarget as HTMLFormElement, + closeModalFunction + ) + }) + + const unlockButtonElements = + modalElement.querySelectorAll('.is-unlock-button') + + for (const unlockButtonElement of unlockButtonElements) { + unlockButtonElement.addEventListener('click', unlockField) + } + + modalElement + .querySelector('#updatePending--workOrderNumber') + ?.addEventListener('keyup', () => { + refreshRepairIdSelect(true) + }) + + refreshRepairIdSelect(false) }, onremoved() { bulmaJS.toggleHtmlClipped() @@ -34,7 +256,7 @@ declare const cityssm: cityssmGlobal function recordHasUnknowns(record: InventoryScannerRecord): boolean { return ( (record.workOrderType === 'faster' && - (record.repairId === null || record.repairDescription === '')) || + record.repairDescription === null) || record.itemDescription === null || record.unitPrice === null ) @@ -43,11 +265,13 @@ declare const cityssm: cityssmGlobal function renderPendingRecords(): void { const rowElements: HTMLTableRowElement[] = [] + let unknownCount = 0 + for (const [recordIndex, record] of pendingRecords.entries()) { const rowElement = document.createElement('tr') if (recordHasUnknowns(record)) { - rowElement.classList.add('is-warning') + unknownCount += 1 } rowElement.dataset.recordId = record.recordId.toString() @@ -58,32 +282,49 @@ declare const cityssm: cityssmGlobal #${cityssm.escapeHTML(record.recordId.toString())} ` - let workOrderHTML = '' + const workOrderCellElement = document.createElement('td') - workOrderHTML = + // eslint-disable-next-line no-unsanitized/property + workOrderCellElement.innerHTML = record.workOrderType === 'faster' ? ` ${cityssm.escapeHTML(record.workOrderNumber)} ` : `${cityssm.escapeHTML(record.workOrderNumber)}
${cityssm.escapeHTML(record.workOrderType)}` - // eslint-disable-next-line no-unsanitized/method - rowElement.insertAdjacentHTML( - 'beforeend', - ` - ${workOrderHTML} - ` - ) + rowElement.append(workOrderCellElement) + + const repairCellElement = document.createElement('td') + + if ( + record.workOrderType === 'faster' && + record.repairDescription === null + ) { + repairCellElement.classList.add('has-background-warning-light') + } + + if (record.repairId === null) { + repairCellElement.innerHTML = ` + (No Repair Set) + ` + } else if (record.repairDescription === null) { + repairCellElement.innerHTML = ` + (Unknown Repair ID: ${cityssm.escapeHTML(record.repairId.toString())}) + ` + } else { + repairCellElement.innerHTML = `${cityssm.escapeHTML(record.repairDescription)}
+ Repair ID: ${cityssm.escapeHTML(record.repairId.toString())}` + } + + rowElement.append(repairCellElement) rowElement.insertAdjacentHTML( 'beforeend', ` - ${cityssm.escapeHTML(record.repairDescription ?? '(Unknown Repair)')}
- ${cityssm.escapeHTML((record.repairId ?? '').toString())} - ${cityssm.escapeHTML(record.itemNumber)}
${cityssm.escapeHTML(record.itemDescription ?? '(Unknown Item)')} @@ -105,6 +346,15 @@ declare const cityssm: cityssmGlobal } pendingRecordsTbodyElement.replaceChildren(...rowElements) + + if (unknownCount === 0) { + pendingRecordsUnknownCountElement.classList.add('is-hidden') + } else { + ;( + pendingRecordsUnknownCountElement.querySelector('span') as HTMLElement + ).textContent = unknownCount.toString() + pendingRecordsUnknownCountElement.classList.remove('is-hidden') + } } const autoRefreshElement = document.querySelector( diff --git a/public/inventoryScanner/javascripts/scanner.js b/public/inventoryScanner/javascripts/scanner.js index b43309c..8aad813 100644 --- a/public/inventoryScanner/javascripts/scanner.js +++ b/public/inventoryScanner/javascripts/scanner.js @@ -1,4 +1,6 @@ "use strict"; +// eslint-disable-next-line @eslint-community/eslint-comments/disable-enable-pair +/* eslint-disable @typescript-eslint/no-unsafe-type-assertion */ Object.defineProperty(exports, "__esModule", { value: true }); (() => { const scannerUrlPrefix = `${document.querySelector('main')?.dataset.urlPrefix ?? ''}/apps/inventoryScanner`; diff --git a/public/inventoryScanner/javascripts/scanner.ts b/public/inventoryScanner/javascripts/scanner.ts index c816e30..9603d70 100644 --- a/public/inventoryScanner/javascripts/scanner.ts +++ b/public/inventoryScanner/javascripts/scanner.ts @@ -1,3 +1,6 @@ +// eslint-disable-next-line @eslint-community/eslint-comments/disable-enable-pair +/* eslint-disable @typescript-eslint/no-unsafe-type-assertion */ + import type { BulmaJS } from '@cityssm/bulma-js/types.js' import type { cityssmGlobal } from '@cityssm/bulma-webapp-js/src/types.js' diff --git a/views/inventoryScanner/admin.ejs b/views/inventoryScanner/admin.ejs index 734bb2a..97a518c 100644 --- a/views/inventoryScanner/admin.ejs +++ b/views/inventoryScanner/admin.ejs @@ -5,7 +5,13 @@