Merged PR 13428: Added in override logging for test wafer tracking. Refactored Override logging
Added in override logging for test wafer tracking. Refactored Override logging
This commit is contained in:
Ouellette Jonathan (CSC FI SPS MESLEO)
parent
61435345ad
commit
c50e536791
@ -14,7 +14,7 @@ $insert OVERRIDE_LOG_EQUATES
|
||||
|
||||
Declare subroutine SRP_Show_Window, Msg
|
||||
|
||||
Declare function Utility, Datetime, SRP_DateTime, SRP_SORT_ARRAY
|
||||
Declare function Utility, Datetime, SRP_DateTime, SRP_SORT_ARRAY, Override_Log_Services, Database_Services
|
||||
|
||||
// Update the arguments so that the OpenInsight OLE event will treate the ActiveX event as a native event handler.
|
||||
If Event EQ 'OLE' then
|
||||
@ -74,7 +74,7 @@ Event PUB_DATE_TO.CLICK:
|
||||
return
|
||||
|
||||
Event PUB_DIR_BROWSE.CLICK
|
||||
value = "Select a directory" : @fm : "c:\temp"
|
||||
value = "Select a directory." : @fm : "c:\temp"
|
||||
dir = Utility( "CHOOSEDIR", @window, value)
|
||||
|
||||
if dir NE '' then
|
||||
@ -133,242 +133,52 @@ Event SEARCH.CLICK
|
||||
Set_Property(@WINDOW:'.OVERRIDE_TABLE','LABEL','')
|
||||
DynamicFields = 'RDS':@FM:'REACTOR'
|
||||
SearchType = Get_Property(@WINDOW:'.REPORT_BY','DEFPROP')
|
||||
Filter = Get_Property(@WINDOW:'.ITEM_FILTER','DEFPROP')
|
||||
EntityId = Get_Property(@WINDOW:'.ITEM_FILTER','DEFPROP')
|
||||
OverrideType = Get_Property(@Window : '.OVERRIDE_TYPE', 'DEFPROP')
|
||||
OverrideUser = Get_Property(@WINDOW:'.EDL_USER', 'TEXT')
|
||||
DateFrom = Get_Property(@WINDOW:'.DATE_FROM','DEFPROP')
|
||||
DateFrom = ICONV(DateFrom,'DT')
|
||||
DateFrom = ICONV(DateFrom,'DT4/HS')
|
||||
DateTo = Get_Property(@WINDOW:'.DATE_TO','DEFPROP')
|
||||
DateTo = ICONV(DateTo,'DT')
|
||||
|
||||
TableData = ''
|
||||
IF DateTo EQ '' then
|
||||
DateTo = DateTime()
|
||||
end
|
||||
IF DateFrom EQ '' then
|
||||
DateFrom = SRP_DateTime('AddDays', DateTo, -7)
|
||||
end
|
||||
|
||||
dataarray = ''
|
||||
open "OVERRIDE_LOG" To OverRideTable else
|
||||
Status = Set_FSError()
|
||||
return
|
||||
|
||||
end
|
||||
|
||||
select OverRideTable
|
||||
Begin Case
|
||||
|
||||
Case SearchType = 'ALL'
|
||||
|
||||
Done = 0
|
||||
Loop
|
||||
ReadNext @ID else Done = 1
|
||||
Until Done Do
|
||||
read @Record from OverRideTable, @ID else
|
||||
status = Set_FSError()
|
||||
|
||||
return
|
||||
end
|
||||
RecordTime = @RECORD<OVERRIDE_LOG_DTM$>
|
||||
IF RecordTime GE DateFrom AND RecordTime LE DateTo Then
|
||||
RecToWrite = @Record
|
||||
DynamicValues = ''
|
||||
User = @Record<OVERRIDE_LOG_USER$>
|
||||
Comment = @Record<OVERRIDE_LOG_COMMENT$>
|
||||
LogTime = OCONV(@Record<OVERRIDE_LOG_DTM$>,'DT4/HS')
|
||||
Category = @Record<OVERRIDE_LOG_CATEGORY$>
|
||||
Cause = @Record<OVERRIDE_LOG_CAUSE$>
|
||||
keys = @Record<OVERRIDE_LOG_KEY$>
|
||||
for i = 1 to DCount(keys,@VM)
|
||||
pairedTable = @RECORD<OVERRIDE_LOG_TABLE$, i>
|
||||
Locate pairedTable in DynamicFields using @FM setting fPos then
|
||||
DynamicValues<1,fPos> = keys<1,i>
|
||||
end
|
||||
|
||||
|
||||
Next i
|
||||
dataarray:= User :@VM:Comment:@VM:LogTime:@VM:Category:@VM:Cause:@VM:DynamicValues :@FM
|
||||
|
||||
end
|
||||
Repeat
|
||||
|
||||
|
||||
swap @VM with @FM in DynamicFields
|
||||
HeaderText = Get_Property(@WINDOW:'.OVERRIDE_TABLE','LABEL')
|
||||
HeaderText<6> = DynamicFields
|
||||
|
||||
//////////////////////
|
||||
Case SearchType = 'RDS' Or SearchType = 'REACTOR'
|
||||
if Filter Eq '' then
|
||||
Msg(@Window, 'No search string entered. Please enter a valid ' : SearchType)
|
||||
return
|
||||
end
|
||||
Done = 0
|
||||
Loop
|
||||
ReadNext @ID else Done = 1
|
||||
Until Done Do
|
||||
read @Record from OverRideTable, @ID else
|
||||
status = Set_FSError()
|
||||
|
||||
return
|
||||
end
|
||||
RecordTables = @RECORD<OVERRIDE_LOG_TABLE$>
|
||||
RecordKeys = @RECORD<OVERRIDE_LOG_KEY$>
|
||||
Locate SearchType in RecordTables using @VM setting tPos then
|
||||
|
||||
RecordTime = @RECORD<OVERRIDE_LOG_DTM$>
|
||||
IF RecordTime GE DateFrom AND RecordTime LE DateTo AND RecordKeys<1,tPos> EQ Filter Then
|
||||
RecToWrite = @Record
|
||||
DynamicValues = ''
|
||||
User = @Record<OVERRIDE_LOG_USER$>
|
||||
Comment = @Record<OVERRIDE_LOG_COMMENT$>
|
||||
LogTime = OCONV(@Record<OVERRIDE_LOG_DTM$>,'DT4/HS')
|
||||
Category = @Record<OVERRIDE_LOG_CATEGORY$>
|
||||
Cause = @Record<OVERRIDE_LOG_CAUSE$>
|
||||
keys = @Record<OVERRIDE_LOG_KEY$>
|
||||
for i = 1 to DCount(keys,@VM)
|
||||
pairedTable = @RECORD<OVERRIDE_LOG_TABLE$, i>
|
||||
Locate pairedTable in DynamicFields using @FM setting fPos then
|
||||
DynamicValues<1,fPos> = keys<1,i>
|
||||
end
|
||||
|
||||
|
||||
Next i
|
||||
dataarray:= User :@VM:Comment:@VM:LogTime:@VM:Category:@VM:Cause:@VM:DynamicValues :@FM
|
||||
|
||||
//swap @VM with @FM in DynamicFields
|
||||
end
|
||||
end
|
||||
|
||||
Repeat
|
||||
////////////////////
|
||||
Case SearchType = 'OVERRIDE'
|
||||
|
||||
OverrideFilter = Get_Property(@WINDOW:'.OVERRIDE_TYPE','DEFPROP')
|
||||
Done = 0
|
||||
Loop
|
||||
ReadNext @ID else Done = 1
|
||||
Until Done Do
|
||||
read @Record from OverRideTable, @ID else
|
||||
status = Set_FSError()
|
||||
|
||||
return
|
||||
end
|
||||
|
||||
RecordTime = @RECORD<OVERRIDE_LOG_DTM$>
|
||||
IF RecordTime GE DateFrom AND RecordTime LE DateTo AND @RECORD<OVERRIDE_LOG_CATEGORY$> EQ OverrideFilter Then
|
||||
RecToWrite = @Record
|
||||
DynamicValues = ''
|
||||
User = @Record<OVERRIDE_LOG_USER$>
|
||||
Comment = @Record<OVERRIDE_LOG_COMMENT$>
|
||||
LogTime = OCONV(@Record<OVERRIDE_LOG_DTM$>,'DT4/HS')
|
||||
Category = @Record<OVERRIDE_LOG_CATEGORY$>
|
||||
Cause = @Record<OVERRIDE_LOG_CAUSE$>
|
||||
keys = @Record<OVERRIDE_LOG_KEY$>
|
||||
for i = 1 to DCount(keys,@VM)
|
||||
pairedTable = @RECORD<OVERRIDE_LOG_TABLE$, i>
|
||||
Locate pairedTable in DynamicFields using @FM setting fPos then
|
||||
DynamicValues<1,fPos> = keys<1,i>
|
||||
end
|
||||
|
||||
|
||||
Next i
|
||||
dataarray:= User :@VM:Comment:@VM:LogTime:@VM:Category:@VM:Cause:@VM:DynamicValues :@FM
|
||||
|
||||
swap @VM with @FM in DynamicFields
|
||||
end
|
||||
|
||||
|
||||
Repeat
|
||||
|
||||
Case SearchType = 'USER'
|
||||
|
||||
|
||||
Done = 0
|
||||
Loop
|
||||
ReadNext @ID else Done = 1
|
||||
Until Done Do
|
||||
read @Record from OverRideTable, @ID else
|
||||
status = Set_FSError()
|
||||
|
||||
return
|
||||
end
|
||||
|
||||
RecordTime = @RECORD<OVERRIDE_LOG_DTM$>
|
||||
IF RecordTime GE DateFrom AND RecordTime LE DateTo AND @RECORD<OVERRIDE_LOG_USER$> EQ Filter Then
|
||||
RecToWrite = @Record
|
||||
DynamicValues = ''
|
||||
User = @Record<OVERRIDE_LOG_USER$>
|
||||
Comment = @Record<OVERRIDE_LOG_COMMENT$>
|
||||
LogTime = OCONV(@Record<OVERRIDE_LOG_DTM$>,'DT4/HS')
|
||||
Category = @Record<OVERRIDE_LOG_CATEGORY$>
|
||||
Cause = @Record<OVERRIDE_LOG_CAUSE$>
|
||||
keys = @Record<OVERRIDE_LOG_KEY$>
|
||||
for i = 1 to DCount(keys,@VM)
|
||||
pairedTable = @RECORD<OVERRIDE_LOG_TABLE$, i>
|
||||
Locate pairedTable in DynamicFields using @FM setting fPos then
|
||||
DynamicValues<1,fPos> = keys<1,i>
|
||||
end
|
||||
|
||||
|
||||
Next i
|
||||
dataarray:= User :@VM:Comment:@VM:LogTime:@VM:Category:@VM:Cause:@VM:DynamicValues :@FM
|
||||
|
||||
swap @VM with @FM in DynamicFields
|
||||
end
|
||||
|
||||
|
||||
Repeat
|
||||
Case SearchType EQ 'ALL'
|
||||
EntityType = ''
|
||||
Case Otherwise$
|
||||
EntityType = SearchType
|
||||
End Case
|
||||
If OverrideType = 'ALL' then
|
||||
OverrideType = ''
|
||||
end
|
||||
OverrideLogRecordKeys = Override_Log_Services('GetOverrideLogKeys', EntityId, EntityType, OverrideType, OverrideUser)
|
||||
for each OverrideLogRecordKey in OverrideLogRecordKeys using @VM
|
||||
|
||||
dataarray = SRP_SORT_Array(dataarray, "DR3", 1)
|
||||
OverrideLogRec = Database_Services('ReadDataRow', 'OVERRIDE_LOG', OverrideLogRecordKey, True$, 0, False$)
|
||||
//second loop to handle legacy multivalues in Table and Key columns. New overrides shouldn't have multivalues.
|
||||
for each Table in OverrideLogRec<OVERRIDE_LOG_TABLE$> using @VM setting TablePos
|
||||
OverrideDtm = OverrideLogRec<OVERRIDE_LOG_DTM$>
|
||||
EntityId = OverrideLogRec<OVERRIDE_LOG_KEY$, TablePos>
|
||||
EntityType = OverrideLogRec<OVERRIDE_LOG_TABLE$, TablePos>
|
||||
OverrideUser = OverrideLogRec<OVERRIDE_LOG_USER$>
|
||||
OverrideType = OverrideLogRec<OVERRIDE_LOG_CATEGORY$>
|
||||
OverrideCause = OverrideLogRec<OVERRIDE_LOG_CAUSE$>
|
||||
OverrideComment = OverrideLogRec<OVERRIDE_LOG_COMMENT$>
|
||||
TableData<-1> = OverrideDtm : @VM : EntityId : @VM : EntityType : @VM : OverrideUser : @VM : OverrideUser : @VM : OverrideType : @VM : OverrideCause : @VM : OverrideComment
|
||||
Next Table
|
||||
|
||||
Next OverrideLogRecordKey
|
||||
TableData = SRP_SORT_Array(TableData, "DR1", 1)
|
||||
For each line in TableData using @FM
|
||||
|
||||
Next line
|
||||
Set_Property(@WINDOW:'.OVERRIDE_TABLE','LIST',TableData)
|
||||
|
||||
Set_Property(@WINDOW:'.OVERRIDE_TABLE','LIST',dataarray)
|
||||
HeaderText = 'USER':@FM:'COMMENT':@FM:'DATE/TIME':@FM:'OVERRIDE TYPE':@FM:'CAUSE':@FM:DynamicFields
|
||||
Set_Property(@WINDOW:'.OVERRIDE_TABLE','LABEL',HeaderText)
|
||||
|
||||
* HeaderText<COL$REC_NO> = HeaderText<COL$REC_NO>:CHAR(13):'<dc>'
|
||||
* HeaderText<COL$THK_UNITS> = HeaderText<COL$THK_UNITS>:CHAR(13):'<dc>'
|
||||
* HeaderText<COL$RES_UNITS> = HeaderText<COL$RES_UNITS>:CHAR(13):'<dc>'
|
||||
* HeaderText<COL$CON_UNITS> = HeaderText<COL$CON_UNITS>:CHAR(13):'<dc>'
|
||||
* HeaderText<COL$CRES_UNITS> = HeaderText<COL$CRES_UNITS>:CHAR(13):'<dc>'
|
||||
*
|
||||
* Set_Property(@WINDOW:'.LS_TABLE','LABEL',HeaderText)
|
||||
//NewList = SRP_Sort_Array(List, "AL2", 1)
|
||||
//Set_Property(@Window:".EDT_TEST", "LIST", NewList)
|
||||
|
||||
|
||||
|
||||
return
|
||||
end event
|
||||
|
||||
Event REPORT_BY.ALL.CLICK
|
||||
Set_Property(@Window:'.ITEM_FILTER', 'ENABLED', -1)
|
||||
Set_Property(@WINDOW:'.LABEL_FILTER','TEXT','')
|
||||
Set_Property(@Window:'.OVERRIDE_TYPE', 'ENABLED', 0)
|
||||
return
|
||||
end event
|
||||
|
||||
Event REPORT_BY.RDS.CLICK
|
||||
Set_Property(@Window:'.ITEM_FILTER', 'ENABLED', 1)
|
||||
Set_Property(@WINDOW:'.LABEL_FILTER','TEXT', 'RDS No:')
|
||||
Set_Property(@Window:'.OVERRIDE_TYPE', 'ENABLED', 0)
|
||||
end event
|
||||
|
||||
Event REPORT_BY.REACTOR.CLICK
|
||||
Set_Property(@Window:'.ITEM_FILTER', 'ENABLED', 1)
|
||||
Set_Property(@WINDOW:'.LABEL_FILTER','TEXT', 'Reactor No:')
|
||||
Set_Property(@Window:'.OVERRIDE_TYPE', 'ENABLED', 0)
|
||||
end event
|
||||
|
||||
Event REPORT_BY.OVERRIDE.CLICK
|
||||
Set_Property(@Window:'.OVERRIDE_TYPE', 'ENABLED', 1)
|
||||
Set_Property(@Window:'.ITEM_FILTER', 'ENABLED', -1)
|
||||
Set_Property(@WINDOW:'.LABEL_FILTER','TEXT','')
|
||||
end event
|
||||
|
||||
Event REPORT_BY.USER.CLICK
|
||||
Set_Property(@Window:'.ITEM_FILTER', 'ENABLED', 1)
|
||||
Set_Property(@WINDOW:'.LABEL_FILTER','TEXT', 'User:')
|
||||
Set_Property(@Window:'.OVERRIDE_TYPE', 'ENABLED', 0)
|
||||
end event
|
||||
|
||||
Setup_OLE_Controls:
|
||||
@ -401,3 +211,4 @@ return
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user