Commit to save progress.

Feature complete. Ready for UAT.

Minor changes to ZPL Hold header and darkness.

Implement post UAT changes.

fixed small bug in WMO reprint event logic

formatted code and removed commented out code
This commit is contained in:
Infineon\Mitchem
2025-03-06 12:24:06 -07:00
committed by Infineon\StieberD
parent 6050b346a5
commit 507c6bffba
18 changed files with 5440 additions and 2331 deletions

View File

@ -14,6 +14,7 @@ EQU CRLF$ TO \0D0A\
$INSERT POPUP_EQUATES
$INSERT APPCOLORS
$Insert LOGICAL
ErrTitle = 'Error in Comm_Dialog_Hold'
@ -41,49 +42,59 @@ RETURN Result
* * * * * * *
Create:
* * * * * * *
obj_AppWindow('Create')
Transition = Parm1<1>
TableName = Parm1<2>
HoldType = Parm1<3>
IF HoldType = '' THEN HoldType = 'HOLD'
BEGIN CASE
CASE Transition = 'ON' AND HoldType = 'HOLD'
Set_Property(@WINDOW:'.WINDOW_LABEL_FIX','TEXT','Hold On')
WinText = 'Hold Change'
CASE Transition = 'OFF' AND HoldType = 'HOLD'
Set_Property(@WINDOW:'.WINDOW_LABEL_FIX','TEXT','Hold Off')
WinText = 'Hold Change'
CASE Transition = 'ON' AND HoldType = 'SHOLD'
Set_Property(@WINDOW:'.WINDOW_LABEL_FIX','TEXT','Ship Hold On')
WinText = 'Ship Hold Change'
CASE Transition = 'OFF' AND HoldType = 'SHOLD'
Set_Property(@WINDOW:'.WINDOW_LABEL_FIX','TEXT','Ship Hold Off')
WinText = 'Ship Hold Change'
CASE Transition = 'ESC'
Set_Property(@WINDOW:'.WINDOW_LABEL_FIX','TEXT','Start Escalation')
WinText = TableName:' Escalation Change'
CASE Transition = 'D-ESC'
Set_Property(@WINDOW:'.WINDOW_LABEL_FIX','TEXT','Stop Escalation')
WinText = TableName:' Escalation Change'
END CASE
Set_Property(@WINDOW,'TEXT',WinText) ; * Window title in top bar
UserName = OCONV(@USER4,'[XLATE_CONV,LSL_USERS*FIRST_LAST]')
Set_Property(@WINDOW:'.USER_ID','DEFPROP',@USER4)
Set_Property(@WINDOW:'.USER_NAME','DEFPROP',UserName)
Set_Property(@WINDOW:'.REASON','FOCUS',1)
obj_AppWindow('Create')
Transition = Parm1<1>
TableName = Parm1<2>
HoldType = Parm1<3>
Stage = Parm1<4>
Interrupted = Parm1<5>
IF HoldType = '' THEN HoldType = 'HOLD'
BEGIN CASE
CASE Transition = False$ AND HoldType = 'HOLD'
Set_Property(@WINDOW:'.WINDOW_LABEL_FIX','TEXT','Hold On')
WinText = 'Hold Change'
Set_Property(@Window : '.RAD_STAGE', 'ENABLED', True$)
Set_Property(@Window : '.CHK_INTERRUPTED', 'ENABLED', True$)
CASE Transition = True$ AND HoldType = 'HOLD'
Set_Property(@WINDOW:'.WINDOW_LABEL_FIX','TEXT','Hold Off')
WinText = 'Hold Change'
Set_Property(@Window : '.RAD_STAGE', 'VALUE', Stage)
Set_Property(@Window : '.CHK_INTERRUPTED', 'CHECK', Interrupted)
CASE Transition = False$ AND HoldType = 'SHOLD'
Set_Property(@WINDOW:'.WINDOW_LABEL_FIX','TEXT','Ship Hold On')
WinText = 'Ship Hold Change'
Set_Property(@Window : '.RAD_STAGE', 'ENABLED', True$)
Set_Property(@Window : '.CHK_INTERRUPTED', 'ENABLED', True$)
CASE Transition = True$ AND HoldType = 'SHOLD'
Set_Property(@WINDOW:'.WINDOW_LABEL_FIX','TEXT','Ship Hold Off')
WinText = 'Ship Hold Change'
Set_Property(@Window : '.RAD_STAGE', 'Value', Stage)
Set_Property(@Window : '.CHK_INTERRUPTED', 'CHECK', Interrupted)
CASE Transition = 'ESC'
Set_Property(@WINDOW:'.WINDOW_LABEL_FIX','TEXT','Start Escalation')
WinText = TableName:' Escalation Change'
CASE Transition = 'D-ESC'
Set_Property(@WINDOW:'.WINDOW_LABEL_FIX','TEXT','Stop Escalation')
WinText = TableName:' Escalation Change'
END CASE
Set_Property(@WINDOW,'TEXT',WinText) ; * Window title in top bar
UserName = OCONV(@USER4,'[XLATE_CONV,LSL_USERS*FIRST_LAST]')
Set_Property(@WINDOW:'.USER_ID','DEFPROP',@USER4)
Set_Property(@WINDOW:'.USER_NAME','DEFPROP',UserName)
Set_Property(@WINDOW:'.REASON','FOCUS',1)
RETURN
@ -91,68 +102,75 @@ RETURN
* * * * * * *
LU_UserID:
* * * * * * *
TypeOver = ''
TypeOver<PSELECT$> = 1
TypeOver<PDISPLAY$> = 'BY LAST_FIRST'
UserID = Popup(@WINDOW,TypeOver,'SHOW_USERS')
IF UserID NE '' THEN
Set_Property(@WINDOW:'.USER_ID','DEFPROP',UserID)
END ELSE
RETURN
END
TypeOver = ''
TypeOver<PSELECT$> = 1
TypeOver<PDISPLAY$> = 'BY LAST_FIRST'
UserID = Popup(@WINDOW,TypeOver,'SHOW_USERS')
IF UserID NE '' THEN
Set_Property(@WINDOW:'.USER_ID','DEFPROP',UserID)
END ELSE
RETURN
END
* * * * * * *
UserIDLF:
* * * * * * *
UserID = Get_Property(@WINDOW:'.USER_ID','DEFPROP')
UserName = OCONV(UserID,'[XLATE_CONV,LSL_USERS*FIRST_LAST]')
Set_Property(@WINDOW:'.USER_NAME','DEFPROP',UserName)
UserID = Get_Property(@WINDOW:'.USER_ID','DEFPROP')
UserName = OCONV(UserID,'[XLATE_CONV,LSL_USERS*FIRST_LAST]')
Set_Property(@WINDOW:'.USER_NAME','DEFPROP',UserName)
RETURN
* * * * * * *
Refresh:
* * * * * * *
RETURN
* * * * * * *
Close:
* * * * * * *
* * * * * * *
Cancel:
* * * * * * *
End_Dialog(@WINDOW,'Cancel')
End_Dialog(@WINDOW,'Cancel')
RETURN
* * * * * * *
OK:
* * * * * * *
UserID = Get_Property(@WINDOW:'.USER_ID','DEFPROP')
Reason = Get_Property(@WINDOW:'.REASON','DEFPROP')
Extended = Get_Property(@WINDOW:'.HOLD_EXTENDED','CHECK')
Result = UserID:@FM:Reason:@FM:Extended
End_Dialog(@WINDOW,Result)
StageEnabled = Get_Property(@WINDOW:'.RAD_STAGE','ENABLED')
Stage = Get_Property(@WINDOW:'.RAD_STAGE','VALUE')
If (Stage NE '') OR (StageEnabled EQ False$) then
UserID = Get_Property(@WINDOW:'.USER_ID','DEFPROP')
Reason = Get_Property(@WINDOW:'.REASON','DEFPROP')
Extended = Get_Property(@WINDOW:'.HOLD_EXTENDED','CHECK')
Interrupted = Get_Property(@WINDOW:'.CHK_INTERRUPTED','CHECK')
If (Reason NE '') then
Result = UserID:@FM:Reason:@FM:Extended:@FM:Stage:@FM:Interrupted
End_Dialog(@WINDOW,Result)
end else
Errmsg('A reason is required to change hold status.')
end
end else
Errmsg('Please select either PRE or POST.')
end
RETURN