Add isAuthorizedToOverrideROTR flag
This commit is contained in:
parent
5e917e65ac
commit
4fc7eb189b
@ -335,6 +335,18 @@ Service ProcessScanData(ScanID, ScanJSON)
|
|||||||
Error_Services('Add', 'Inactive employee.')
|
Error_Services('Add', 'Inactive employee.')
|
||||||
Case Otherwise$
|
Case Otherwise$
|
||||||
ScansRow<SCANS.EMPLOYEE_ID$> = {EMPLOYEE_ID}
|
ScansRow<SCANS.EMPLOYEE_ID$> = {EMPLOYEE_ID}
|
||||||
|
|
||||||
|
Username = {EMPLOYEE_ID}
|
||||||
|
|
||||||
|
Member = False$
|
||||||
|
Groups = 'LEAD':@VM:'SUPERVISOR':@VM:'ENGINEER':@VM:'ENG_TECH':@VM:'ROTR_OVERRIDE'
|
||||||
|
|
||||||
|
For each Group in Groups using @VM
|
||||||
|
Member = MemberOf(Username, Group)
|
||||||
|
Until Member EQ True$
|
||||||
|
Next Group
|
||||||
|
|
||||||
|
ScansRow<SCANS.IS_AUTHORIZED_TO_OVERRIDE_ROTR$> = Member
|
||||||
End Case
|
End Case
|
||||||
|
|
||||||
Case ScanData[1, 3] EQ '10S'
|
Case ScanData[1, 3] EQ '10S'
|
||||||
@ -520,6 +532,9 @@ Service ProcessScanData(ScanID, ScanJSON)
|
|||||||
Database_Services('WriteDataRow', 'REACTOR', Reactor, ReactorRec, True$, False$, True$)
|
Database_Services('WriteDataRow', 'REACTOR', Reactor, ReactorRec, True$, False$, True$)
|
||||||
Database_Services('WriteDataRow', 'RDS', RDSNo, RDSRec, True$, False$, True$)
|
Database_Services('WriteDataRow', 'RDS', RDSNo, RDSRec, True$, False$, True$)
|
||||||
|
|
||||||
|
ScansRow<SCANS.OVERRIDE_REQD$> = 0
|
||||||
|
ScansRow<SCANS.OVERRIDE_TYPE$> = ''
|
||||||
|
ScansRow<SCANS.OVERRIDE_REASON$> = ''
|
||||||
ScansRow<SCANS.EMPLOYEE_ID$>= ''
|
ScansRow<SCANS.EMPLOYEE_ID$>= ''
|
||||||
Result = 'Override Performed successfully'
|
Result = 'Override Performed successfully'
|
||||||
end
|
end
|
||||||
@ -1674,6 +1689,7 @@ Service ConvertMVScanToJSON(ScanID, mvScan, itemURL)
|
|||||||
SRP_JSON(objEmployee, 'SetValue', 'authorized', {EMPLOYEE_AUTHORIZED}, 'Boolean')
|
SRP_JSON(objEmployee, 'SetValue', 'authorized', {EMPLOYEE_AUTHORIZED}, 'Boolean')
|
||||||
SRP_JSON(objEmployee, 'SetValue', 'notAuthorizedReason', {EMPLOYEE_NOT_AUTHORIZED_REASON}, 'String')
|
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', '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)
|
SRP_JSON(objJSONScan, 'Set', 'employee', objEmployee)
|
||||||
SRP_JSON(objEmployee, 'Release')
|
SRP_JSON(objEmployee, 'Release')
|
||||||
|
|
||||||
@ -2355,3 +2371,6 @@ return
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -40,6 +40,9 @@ compile insert SCANS_EQUATES
|
|||||||
equ SCANS.TW_LOT_QTY$ to 31
|
equ SCANS.TW_LOT_QTY$ to 31
|
||||||
equ SCANS.TEST_RUN_TYPE_ID$ to 32
|
equ SCANS.TEST_RUN_TYPE_ID$ to 32
|
||||||
equ SCANS.TEST_RUN_TYPE_NAME$ to 33
|
equ SCANS.TEST_RUN_TYPE_NAME$ to 33
|
||||||
|
equ SCANS.IS_AUTHORIZED_TO_OVERRIDE_ROTR$ to 34
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user