update pending records in admin

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

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()}`
   }
 
   /*

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;

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;
 }

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()
 

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 {};

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;
+}

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
+}

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<unknown, unknown, DoGetRepairIdsForm>, response: Response): void;
+export {};

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 });
+}

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<unknown, unknown, DoGetRepairIdsForm>,
+  response: Response
+): void {
+  const workOrderType = getWorkOrderTypeFromWorkOrderNumber(
+    request.body.workOrderNumber
+  )
+
+  const records = getWorkOrderValidationRecords(
+    request.body.workOrderNumber,
+    workOrderType
+  )
+
+  response.json({ records })
+}

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<unknown, unknown, UpdateScannerRecordForm>, response: Response): void;

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 });
+}

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<unknown, unknown, UpdateScannerRecordForm>,
+  response: Response
+): void {
+  const success = updateScannerRecord(
+    request.body,
+    request.session.user as FasterWebHelperSessionUser
+  )
+
+  const pendingRecords = getScannerRecords({ isSynced: false }, { limit: -1 })
+
+  response.json({ success, pendingRecords })
+}

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;

modules/inventoryScanner/handlers/router.ts

@@ -3,13 +3,19 @@ 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

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);
             }
         }
     }

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,

modules/inventoryScanner/types.js

@@ -1 +1,2 @@
-export {};
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });