Merged PR 31131: Rename PM/PM_SPEC tables
This commit is contained in:
parent
9749af69cf
commit
2ab25e05a3
@ -13,13 +13,13 @@ DECLARE SUBROUTINE obj_Notes, Security_Err_Msg, End_Window, Forward_Event, Start
|
||||
|
||||
DECLARE FUNCTION Get_Property, Get_Status, Dialog_Box, Utility, Popup, Collect.Ixvals, Admin_User, Printer_Select
|
||||
DECLARE FUNCTION Send_Message, Msg, Security_Check, obj_React_Run_CI, MemberOf, Get_Printer, obj_Install,Set_Printer
|
||||
DECLARE FUNCTION obj_PM_Spec, NextKey, Popup, GaN_Services, Set_Property
|
||||
DECLARE FUNCTION obj_RECURRING_TASK_SPEC, NextKey, Popup, GaN_Services, Set_Property
|
||||
|
||||
$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 TOOL_EQUATES
|
||||
$INSERT RTI_STYLE_EQUATES
|
||||
@ -133,8 +133,8 @@ Refresh:
|
||||
GaNToolList = Get_Property(@WINDOW, 'GANTOOLLIST@')
|
||||
ToolFilter = Get_Property(@WINDOW :'.COMBO_FILTER', 'TEXT')
|
||||
|
||||
OPEN 'PM_SPEC' TO TableIn ELSE
|
||||
ErrorMsg = 'Unable to open "PM_SPEC" table.'
|
||||
OPEN 'RECURRING_TASK_SPEC' TO TableIn ELSE
|
||||
ErrorMsg = 'Unable to open "RECURRING_TASK_SPEC" table.'
|
||||
PrevCursor = Set_Property("SYSTEM", "CURSOR", "A")
|
||||
Yield()
|
||||
RETURN
|
||||
@ -159,9 +159,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') ) then
|
||||
|
||||
@ -182,9 +182,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>
|
||||
@ -214,10 +214,10 @@ Refresh:
|
||||
|
||||
END CASE
|
||||
|
||||
LastPM = OCONV(obj_PM_Spec('LastPMCompDTM',PMSId),'DT4/^H')
|
||||
LastPM = OCONV(obj_RECURRING_TASK_SPEC('LastPMCompDTM',PMSId),'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')
|
||||
|
||||
@ -245,7 +245,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)
|
||||
|
||||
@ -279,7 +279,7 @@ SchedDC:
|
||||
|
||||
PMSId = RowData<COL$PMS_ID>
|
||||
|
||||
obj_AppWindow('ViewRelated','PM_SPEC':@RM:PMSId)
|
||||
obj_AppWindow('ViewRelated','RECURRING_TASK_SPEC':@RM:PMSId)
|
||||
|
||||
GOSUB Refresh
|
||||
|
||||
@ -305,7 +305,7 @@ SchedOptions:
|
||||
|
||||
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)
|
||||
|
||||
|
||||
RETURN
|
||||
@ -486,3 +486,5 @@ ClearFilter:
|
||||
return
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user