Scanner employee caching

LSL2/STPROC/SCAN_SERVICES.txt

@@ -366,6 +366,7 @@ Service ProcessScanData(ScanID, ScanJSON)
 								Next Group
 								
 								ScansRow<SCANS.IS_AUTHORIZED_TO_OVERRIDE_ROTR$> = Member
+								ScansRow<SCANS.EMPLOYEE_CHANGED$> = True$
 						End Case                       
 						
 					Case ScanData[1, 3] EQ '10S'
@@ -491,6 +492,7 @@ Service ProcessScanData(ScanID, ScanJSON)
 									ScansRow<SCANS.AUTHENTICATED$> = 0
 									Error_Services('Add', 'Invalid password for user ':EmployeeID:'.')
 								end
+								ScansRow<SCANS.EMPLOYEE_CHANGED$> = True$
 							end else
 								Error_Services('Add', 'An employee ID must be scanned before scanning a password.')
 							end
@@ -555,6 +557,9 @@ Service ProcessScanData(ScanID, ScanJSON)
 									ScansRow<SCANS.OVERRIDE_TYPE$> = ''
 									ScansRow<SCANS.OVERRIDE_REASON$> = ''
 									ScansRow<SCANS.EMPLOYEE_ID$>= ''
+									ScansRow<SCANS.AUTHENTICATED$> = False$
+									ScansRow<SCANS.IS_AUTHORIZED_TO_OVERRIDE_ROTR$> = False$
+									ScansRow<SCANS.EMPLOYEE_CHANGED$> = True$
 									Result = 'Override Performed successfully'
 								end
 								
@@ -1820,19 +1825,36 @@ Service ConvertMVScanToJSON(ScanID, mvScan, itemURL)
 					SRP_JSON(hTestRunTypeArray, 'Release')
 				end
 				// Employee object
-				objEmployee = ''
+				EmployeeChanged = {EMPLOYEE_CHANGED}
-				If SRP_JSON(objEmployee, 'New', 'Object') then
+				EmployeeJson = {EMPLOYEE_JSON}
-					
+				ParsingResult = ''
-					SRP_JSON(objEmployee, 'SetValue', 'ID', {EMPLOYEE_ID}, 'String')
+				If EmployeeChanged NE True$ and EmployeeJson NE '' then
-					SRP_JSON(objEmployee, 'SetValue', 'name', {EMPLOYEE_NAME}, 'String')
+					ParsingResult = SRP_JSON(hEmployeeJson, 'Parse', EmployeeJson)
-					SRP_JSON(objEmployee, 'SetValue', 'authorized', {EMPLOYEE_AUTHORIZED}, 'Boolean')
+					If ParsingResult EQ '' then
-					SRP_JSON(objEmployee, 'SetValue', 'notAuthorizedReason', {EMPLOYEE_NOT_AUTHORIZED_REASON}, 'String')
+						SRP_JSON(objJSONScan, 'Set', 'employee', hEmployeeJson)
-					SRP_JSON(objEmployee, 'SetValue', 'authenticated'       , @Record<SCANS.AUTHENTICATED$>            , 'Boolean');//JRO Change
+					end
-					SRP_JSON(objEmployee, 'SetValue', 'isAuthorizedToOverrideROTR', @Record<SCANS.IS_AUTHORIZED_TO_OVERRIDE_ROTR$>, 'Boolean')
-					SRP_JSON(objJSONScan, 'Set', 'employee', objEmployee)
-					SRP_JSON(objEmployee, 'Release')
-					
 				end
+				
+				If EmployeeJson EQ '' or EmployeeChanged EQ True$ or ParsingResult NE '' then
+					objEmployee = ''
+					If SRP_JSON(objEmployee, 'New', 'Object') then
+						SRP_JSON(objEmployee, 'SetValue', 'ID', {EMPLOYEE_ID}, 'String')
+						SRP_JSON(objEmployee, 'SetValue', 'name', {EMPLOYEE_NAME}, 'String')
+						SRP_JSON(objEmployee, 'SetValue', 'authorized', {EMPLOYEE_AUTHORIZED}, 'Boolean')
+						SRP_JSON(objEmployee, 'SetValue', 'notAuthorizedReason', {EMPLOYEE_NOT_AUTHORIZED_REASON}, 'String')
+						SRP_JSON(objEmployee, 'SetValue', 'authenticated'       , @Record<SCANS.AUTHENTICATED$>            , 'Boolean');//JRO Change
+						SRP_JSON(objEmployee, 'SetValue', 'isAuthorizedToOverrideROTR', @Record<SCANS.IS_AUTHORIZED_TO_OVERRIDE_ROTR$>, 'Boolean')
+						SRP_JSON(objJSONScan, 'Set', 'employee', objEmployee)
+						
+						EmployeeJson = SRP_JSON(objEmployee, 'Stringify', 'Fast')
+						mvScan<SCANS.EMPLOYEE_JSON$> = EmployeeJson
+						mvScan<SCANS.EMPLOYEE_CHANGED$> = False$
+						mvScanChanged = True$
+						
+						SRP_JSON(objEmployee, 'Release')
+					end
+				end
+				
 				// Cassettes object.
 				arrayCassetteIDs = ''
 				If SRP_JSON(arrayCassetteIDs, 'New', 'Array') then
@@ -2383,3 +2405,4 @@ return
 
 
 
+

LSL2/STPROCINS/SCANS_EQUATES.txt

@@ -43,6 +43,8 @@ compile insert SCANS_EQUATES
    equ SCANS.IS_AUTHORIZED_TO_OVERRIDE_ROTR$ to 34
    equ SCANS.TW_LOT_CHANGED$		to 35
    equ SCANS.TW_LOT_JSON$			to 36
+   equ SCANS.EMPLOYEE_CHANGED$		to 37
+   equ SCANS.EMPLOYEE_JSON$			to 38
 
 #endif