Merged PR 31131: Rename PM/PM_SPEC tables
This commit is contained in:
parent
9749af69cf
commit
2ab25e05a3
@ -38,7 +38,7 @@ $Insert MSG_EQUATES
|
||||
$Insert APPCOLORS
|
||||
$Insert LSL_USERS_EQU
|
||||
$Insert SECURITY_RIGHTS_EQU
|
||||
$Insert PM_SPEC_EQUATES
|
||||
$Insert RECURRING_TASK_SPEC_EQUATES
|
||||
$Insert POPUP_EQUATES
|
||||
$INSERT LOGICAL
|
||||
$Insert TOOL_EQUATES
|
||||
@ -60,7 +60,7 @@ EQU COL$PM_STATUS TO 11
|
||||
|
||||
Declare subroutine obj_Appwindow, Set_Property, Yield, Send_Message, End_Dialog, Send_Event, ErrMsg, Set_Status
|
||||
Declare subroutine Start_Window
|
||||
Declare function MemberOf, Tool_Services, Send_Message, obj_PM_Spec, SRP_Array
|
||||
Declare function MemberOf, Tool_Services, Send_Message, obj_RECURRING_TASK_SPEC, SRP_Array
|
||||
|
||||
// Update the arguments so that the OpenInsight OLE event will treate the ActiveX event as a native event handler.
|
||||
If Event EQ 'OLE' then
|
||||
@ -141,7 +141,7 @@ Event SCHED.DBLCLK(CtrlKey, ShiftKey, MouseButton)
|
||||
|
||||
PMSId = RowData<COL$PMS_ID>
|
||||
|
||||
obj_AppWindow('ViewRelated','PM_SPEC':@RM:PMSId)
|
||||
obj_AppWindow('ViewRelated','RECURRING_TASK_SPEC':@RM:PMSId)
|
||||
|
||||
end event
|
||||
|
||||
@ -162,7 +162,7 @@ Event SCHED.OPTIONS()
|
||||
|
||||
IF PMKeys = '' OR PMKeys = CHAR(27) THEN RETURN
|
||||
|
||||
obj_Appwindow('ViewRelated','PM':@RM:PMKeys:@RM:@RM)
|
||||
obj_Appwindow('ViewRelated','RECURRING_TASK':@RM:PMKeys:@RM:@RM)
|
||||
|
||||
end event
|
||||
|
||||
@ -184,7 +184,7 @@ end event
|
||||
|
||||
Event PUB_NEW_PM_SPEC.CLICK()
|
||||
|
||||
Start_Window('PM_SPEC', @Window, '')
|
||||
Start_Window('RECURRING_TASK_SPEC', @Window, '')
|
||||
|
||||
end event
|
||||
|
||||
@ -209,14 +209,14 @@ Refresh:
|
||||
ShowOOS = Get_Property(@Window:'.CHK_SHOW_OOS', 'CHECK')
|
||||
ShowScrubbers = Get_Property(@Window:'.CHK_SHOW_SCRUBBERS', 'CHECK')
|
||||
|
||||
Query = 'SELECT PM_SPEC WITH FIVE_S_FLAG NE 1 '
|
||||
Query = 'SELECT RECURRING_TASK_SPEC WITH FIVE_S_FLAG NE 1 '
|
||||
If Not(ShowArchived) then Query := 'AND WITH ARCHIVED NE 1 '
|
||||
If Not(ShowScrubbers) then Query := 'AND WITH PM_CLASS NE ' : Quote('SCRUBBER')
|
||||
ErrCode = ''
|
||||
Set_Status(0)
|
||||
RList(Query, TARGET_ACTIVELIST$, '', '', '')
|
||||
If Not(Get_Status(ErrCode)) then
|
||||
Open 'PM_SPEC' to TableIn then
|
||||
Open 'RECURRING_TASK_SPEC' to TableIn then
|
||||
Done = False$
|
||||
SchedList = ''
|
||||
SchedColors = ''
|
||||
@ -228,9 +228,9 @@ Refresh:
|
||||
Until Done
|
||||
READ PMSpecRec FROM TableIn,PMSId THEN
|
||||
|
||||
ActPMKeys = PMSpecRec<PM_SPEC_PM_KEYS$>
|
||||
Units = PMSpecRec<PM_SPEC_UNITS$>
|
||||
ToolID = PMSpecRec<PM_SPEC_TOOL_ID$>
|
||||
ActPMKeys = PMSpecRec<RECURRING_TASK_SPEC_PM_KEYS$>
|
||||
Units = PMSpecRec<RECURRING_TASK_SPEC_UNITS$>
|
||||
ToolID = PMSpecRec<RECURRING_TASK_SPEC_TOOL_ID$>
|
||||
ToolStatus = XLATE('TOOL',ToolID,'CURR_MODE_DESC','X')
|
||||
|
||||
If ( ( (ToolID _EQC ToolFilter) or (ToolFilter EQ '') ) and ( (ToolStatus NE 'Out of Service') or ShowOOS ) ) then
|
||||
@ -252,9 +252,9 @@ Refresh:
|
||||
|
||||
IF pmCnt = 0 THEN pmCnt = 1
|
||||
|
||||
SchedStarts = obj_PM_Spec('SchedStart',PMSId:@RM:PMSpecRec)
|
||||
EarlyStarts = obj_PM_Spec('EarlyStart',PMSId:@RM:PMSpecRec)
|
||||
LateStarts = obj_PM_Spec('LateStart',PMSId:@RM:PMSpecRec)
|
||||
SchedStarts = obj_RECURRING_TASK_SPEC('SchedStart',PMSId:@RM:PMSpecRec)
|
||||
EarlyStarts = obj_RECURRING_TASK_SPEC('EarlyStart',PMSId:@RM:PMSpecRec)
|
||||
LateStarts = obj_RECURRING_TASK_SPEC('LateStart',PMSId:@RM:PMSpecRec)
|
||||
|
||||
FOR I = 1 TO pmCnt
|
||||
SchedStart = SchedStarts<1,I>
|
||||
@ -284,10 +284,10 @@ Refresh:
|
||||
|
||||
END CASE
|
||||
|
||||
LastPM = OConv(Xlate('PM_SPEC', PMSId, 'LAST_PM_COMP_DTM', 'X'), 'DT4/^H')
|
||||
LastPM = OConv(Xlate('RECURRING_TASK_SPEC', PMSId, 'LAST_PM_COMP_DTM', 'X'), 'DT4/^H')
|
||||
|
||||
PMDesc = PMSpecRec<PM_SPEC_DESC$>
|
||||
ToolID = PMSpecRec<PM_SPEC_TOOL_ID$>
|
||||
PMDesc = PMSpecRec<RECURRING_TASK_SPEC_DESC$>
|
||||
ToolID = PMSpecRec<RECURRING_TASK_SPEC_TOOL_ID$>
|
||||
ToolDesc = XLATE('TOOL',ToolID,TOOL_TOOL_DESC$,'X')
|
||||
ToolLocation = XLATE('TOOL',ToolID,'LOCATION','X')
|
||||
|
||||
@ -315,7 +315,7 @@ Refresh:
|
||||
SchedLine<1,COL$EARLY_START> = EarlyStart
|
||||
SchedLine<1,COL$SCHED_START> = SchedStart
|
||||
SchedLine<1,COL$LATE_START> = LateStart
|
||||
SchedLine<1,COL$PM_STATUS> = XLATE('PM',ActPMKeys<1,I>,'STATUS','X') ;*PMStatus
|
||||
SchedLine<1,COL$PM_STATUS> = XLATE('RECURRING_TASK',ActPMKeys<1,I>,'STATUS','X') ;*PMStatus
|
||||
SchedList = INSERT(SchedList,Pos,0,0,SchedLine)
|
||||
SchedColors = INSERT(SchedColors,Pos,0,0,LineColor)
|
||||
|
||||
@ -332,7 +332,7 @@ Refresh:
|
||||
stat = Send_Message(@WINDOW:'.SCHED','COLOR_BY_POS',0,I,SchedColors<I>)
|
||||
NEXT I
|
||||
end else
|
||||
ErrorMsg = 'Unable to open "PM_SPEC" table.'
|
||||
ErrorMsg = 'Unable to open "RECURRING_TASK_SPEC" table.'
|
||||
ErrMsg(ErrorMsg)
|
||||
end
|
||||
end else
|
||||
@ -347,3 +347,5 @@ return
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user