Merged PR 16582: RDS Query List, default sort order

Added in a default sort order using the cassette number to RDS list. This is to facilitate 7 digit RDS numbers.

Related work items: #227112
This commit is contained in:
Ouellette Jonathan (CSC FI SPS MESLEO) 2025-05-14 00:21:59 +02:00
parent 770a1de95b
commit e13f2df003

View File

@ -418,8 +418,9 @@ end service
// Rows are @FM delimted while columns are @VM delimited. // Rows are @FM delimted while columns are @VM delimited.
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
Service GetRDSData(WorkOrderNo, Columns, ShowGasGauge, RDSOverrideList) Service GetRDSData(WorkOrderNo, Columns, ShowGasGauge, RDSOverrideList)
RDSList = ''
RDSList = ''
If ( (WorkOrderNo NE '') or (RDSOverrideList NE '') ) then If ( (WorkOrderNo NE '') or (RDSOverrideList NE '') ) then
If ShowGasGauge NE True$ then ShowGasGauge = False$ If ShowGasGauge NE True$ then ShowGasGauge = False$
rv = Set_Status(0) rv = Set_Status(0)
@ -431,6 +432,7 @@ Service GetRDSData(WorkOrderNo, Columns, ShowGasGauge, RDSOverrideList)
Swap @FM with @VM in RDSOverrideList Swap @FM with @VM in RDSOverrideList
RDSKeys = RDSOverrideList RDSKeys = RDSOverrideList
end end
StatusCode = '' StatusCode = ''
If Get_Status(StatusCode) then If Get_Status(StatusCode) then
Error_Services('Add', 'Error calling Extract_SI_Keys in the ' : Service : ' service. StatusCode: ' : StatusCode) Error_Services('Add', 'Error calling Extract_SI_Keys in the ' : Service : ' service. StatusCode: ' : StatusCode)
@ -489,7 +491,9 @@ Service GetRDSData(WorkOrderNo, Columns, ShowGasGauge, RDSOverrideList)
end else end else
Error_Services('Add', 'WorkOrderNo or RDSOverrideList argument was missing from the ' : Service : ' service.') Error_Services('Add', 'WorkOrderNo or RDSOverrideList argument was missing from the ' : Service : ' service.')
end end
//Sort based on cassette number
Locate 'RUN_ORDER_NUM' in Columns using @VM setting ColNoCassNo else ColNoCassNo = 1
RDSList = SRP_Sort_Array(RDSList, 'AR' : ColNoCassNo, True$, @FM)
Response = RDSList Response = RDSList
end service end service
@ -1800,3 +1804,4 @@ return