added two properties to reactor api response
This commit is contained in:
committed by
Stieber Daniel (CSC FI SPS MESLEO)
parent
05340fc53a
commit
7eacacec8c
@ -2775,12 +2775,21 @@ Service ConvertRecordToJSON(ReactorNo, ItemURL, CurrUser, FullObject=BOOLEAN)
|
|||||||
SRP_JSON(objReactor, 'SetValue', 'ArmsCnt', Xlate('REACTOR', ReactorNo, REACTOR_ARMS_WFR_CNT$, 'X'))
|
SRP_JSON(objReactor, 'SetValue', 'ArmsCnt', Xlate('REACTOR', ReactorNo, REACTOR_ARMS_WFR_CNT$, 'X'))
|
||||||
|
|
||||||
// Add Current Run Status (Current Loaded Cassettes)
|
// Add Current Run Status (Current Loaded Cassettes)
|
||||||
LoadedRDS = Xlate('REACT_STATUS', ReactorNo, 'LOAD_RDS', 'X')
|
LoadLockLeftRDS = ''
|
||||||
|
LoadLockRightRDS = ''
|
||||||
|
LoadedRDS = Xlate('REACT_STATUS', ReactorNo, 'LOAD_RDS', 'X')
|
||||||
If LoadedRDS NE '' then
|
If LoadedRDS NE '' then
|
||||||
objLoadedRDS = ''
|
objLoadedRDS = ''
|
||||||
If SRP_JSON(objLoadedRDS, 'New', 'Array') then
|
If SRP_JSON(objLoadedRDS, 'New', 'Array') then
|
||||||
For each RDS in LoadedRDS using @VM setting vPos
|
For each RDS in LoadedRDS using @VM setting vPos
|
||||||
SRP_JSON(objLoadedRDS, 'AddValue', RDS)
|
SRP_JSON(objLoadedRDS, 'AddValue', RDS)
|
||||||
|
LoadLockSide = Xlate('RDS', RDS, 'LOAD_LOCK_SIDE', 'X')
|
||||||
|
Begin Case
|
||||||
|
Case LoadLockSide EQ 'L'
|
||||||
|
LoadLockLeftRDS = RDS
|
||||||
|
Case LoadLockSide EQ 'R'
|
||||||
|
LoadLockRightRDS = RDS
|
||||||
|
End Case
|
||||||
Next RDS
|
Next RDS
|
||||||
SRP_JSON(objReactor, 'Set', 'loadedRDS', objLoadedRDS)
|
SRP_JSON(objReactor, 'Set', 'loadedRDS', objLoadedRDS)
|
||||||
SRP_JSON(objLoadedRDS, 'Release')
|
SRP_JSON(objLoadedRDS, 'Release')
|
||||||
@ -2788,6 +2797,8 @@ Service ConvertRecordToJSON(ReactorNo, ItemURL, CurrUser, FullObject=BOOLEAN)
|
|||||||
end else
|
end else
|
||||||
SRP_JSON(objReactor, 'SetValue', 'loadedRDS', '')
|
SRP_JSON(objReactor, 'SetValue', 'loadedRDS', '')
|
||||||
end
|
end
|
||||||
|
SRP_JSON(objReactor, 'SetValue', 'loadLockLeftRDS', LoadLockLeftRDS)
|
||||||
|
SRP_JSON(objReactor, 'SetValue', 'loadLockRightRDS', LoadLockRightRDS)
|
||||||
|
|
||||||
// Add new reactor items here
|
// Add new reactor items here
|
||||||
InstItems = Xlate('REACTOR', ReactorNo, REACTOR_CURR_INST_ITEMS$, 'X')
|
InstItems = Xlate('REACTOR', ReactorNo, REACTOR_CURR_INST_ITEMS$, 'X')
|
||||||
@ -4420,4 +4431,3 @@ ClearCursors:
|
|||||||
|
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user