phares3757/open-insight
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Final changes post UAT.

Browse Source
This commit is contained in:
Infineon\Mitchem
2025-04-17 11:41:48 -07:00
committed by Stieber Daniel (CSC FI SPS MESLEO)
parent b334574cac
commit 5d31e6f84c
3 changed files with 5189 additions and 955 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
LSL2/STPROC/CALIB_LIST.txt
View File

@ -7,7 +7,7 @@ COMPILE FUNCTION Calib_List(EntID,Event,Parm1,Parm2,Parm3,Parm4,Parm5)
*/
DECLARE SUBROUTINE Set_Property, End_Dialog, Send_Event, Set_Status, Center_Window, Post_Event, Set_List_Box_Data
DECLARE SUBROUTINE ErrMsg, Send_Message, Set_Property, Send_Event, Btree.Extract, obj_AppWindow
DECLARE SUBROUTINE ErrMsg, Send_Message, Set_Property, Send_Event, Btree.Extract, obj_AppWindow, Labeling_Services
DECLARE SUBROUTINE obj_Notes, Security_Err_Msg, End_Window, Forward_Event, Start_Window, Create_Note
DECLARE FUNCTION Get_Property, Get_Status, Dialog_Box, Utility, Popup, Collect.Ixvals
@ -21,6 +21,7 @@ $INSERT LSL_USERS_EQU
$INSERT SECURITY_RIGHTS_EQU
$INSERT CALIB_LIST_EQUATES
$INSERT POPUP_EQUATES
$Insert Logical
EQU CRLF$ TO \0D0A\
EQU TAB$ TO \09\
@ -35,7 +36,6 @@ ErrorMsg = ''
Result = ''
BEGIN CASE
CASE EntID = @WINDOW
BEGIN CASE
@ -46,6 +46,7 @@ BEGIN CASE
CASE Event[1,3] = 'QBF' ; GOSUB Refresh
END CASE
CASE EntID = @WINDOW:'.MENU.PRINT.RE-PRINT_CALIBRATION_LABEL' AND Event = 'MENU'; Gosub PrintMostRecentLabel
CASE EntID = @WINDOW:'.NEW_ITEM' AND Event = 'CLICK' ; GOSUB NewItem
CASE EntID = @WINDOW:'.LU_CL_NO' AND Event = 'CLICK' ; GOSUB LUCalibItem
CASE EntID = @WINDOW:'.LU_CL_TYPE' AND Event = 'CLICK' ; GOSUB LUCalibItemType
@ -82,7 +83,8 @@ END
obj_Appwindow('Create',@WINDOW)
Set_List_Box_Data( @WINDOW )
// Use to determine whether or not the New Calibration label was just clicked
Set_Property(@Window : '.CALIBRATIONS', '@PrintLabel', False$)
GOSUB Refresh
RETURN
@ -139,6 +141,7 @@ FOR I = 1 TO COUNT(ETCtrls,@VM) + (ETCtrls NE '')
NEXT Line
NEXT I
RETURN
@ -149,18 +152,24 @@ RETURN
Read:
* * * * * * *
CLNo = Get_Property(@WINDOW:'.CL_NO','DEFPROP')
IF RowExists('CALIB_LIST',CLNo) ELSE
IF Get_Property(@WINDOW:'.ENTER_DTM','DEFPROP') = '' THEN
CurrDTM = OCONV(Date(),'D4/'):' ':OCONV(Time(),'MTH')
Set_Property(@WINDOW:'.ENTER_DTM','DEFPROP',CurrDTM)
END
END
GOSUB Refresh
// Use to determine whether or not the New Calibration button was just clicked and print if it was
PrintCheck = Get_Property(@Window : '.CALIBRATIONS', '@PrintLabel')
If PrintCheck EQ True$ then
Gosub PrintMostRecentLabel
end
// Reset flag after read regardless
Set_Property(@Window : '.CALIBRATIONS', '@PrintLabel', False$)
RETURN
@ -334,12 +343,31 @@ IF CLNo NE '' THEN
oaParms := 1:@FM:1
obj_Appwindow('ViewNewDetail', oaParms)
// New Calibration label was just clicked, set to true
Set_Property(@Window : '.CALIBRATIONS', '@PrintLabel', True$)
END
RETURN
*********************
PrintMostRecentLabel:
*********************
CLNo = Get_Property(@WINDOW:'.CL_NO','DEFPROP')
IF CLNo NE '' THEN
TableList = Get_Property(@WINDOW:'.CALIBRATIONS', 'LIST')
EquipmentID = Get_Property(@WINDOW:'.EQ_DESC', 'TEXT')
LastCalibration = Get_Property(@WINDOW:'.LAST_CAL_DT', 'TEXT')
FrequencyVal = Get_Property(@WINDOW:'.CAL_INTERVAL', 'TEXT')
FrequencyUnit = 'Months'
NextCalibration = Get_Property(@WINDOW:'.NEXT_CAL_DT', 'TEXT')
CalibratedBy = TableList<1,2>
Labeling_Services('PrintCalibrationLabel', EquipmentID, LastCalibration, NextCalibration, CalibratedBy, FrequencyVal, FrequencyUnit, '')
end
return