diff --git a/LSL2/OIWIN/NDW_5S.json b/LSL2/OIWIN/NDW_5S.json index eb1e98b..a995bf0 100644 --- a/LSL2/OIWIN/NDW_5S.json +++ b/LSL2/OIWIN/NDW_5S.json @@ -17,8 +17,8 @@ "<1,4>": "", "<1,5>": "136", "<1,6>": "201", - "<1,7>": "-831", - "<1,8>": "-522", + "<1,7>": "-869", + "<1,8>": "-498", "<1,9>": "5S", "<1,10>": { "<1,10,1>": "0x84CF0000", @@ -725,17 +725,17 @@ "<4,2>": "", "<4,3>": "OLECONTROL.SRP.EditTable.1", "<4,4>": "NDW_5S", - "<4,5>": "10", + "<4,5>": "11", "<4,6>": "50", - "<4,7>": "810", - "<4,8>": "460", + "<4,7>": "-10", + "<4,8>": "-12", "<4,9>": "SRP.EditTable.1", "<4,10>": { "<4,10,1>": "0x56000000", "<4,10,2>": "0x0" }, "<4,11>": { - "<4,11,1>": "0x0", + "<4,11,1>": "0xC000", "<4,11,2>": "0x80000000" }, "<4,12>": "2", diff --git a/LSL2/OIWIN/NDW_PM_HISTORY.json b/LSL2/OIWIN/NDW_PM_HISTORY.json index 1898c60..302ea47 100644 --- a/LSL2/OIWIN/NDW_PM_HISTORY.json +++ b/LSL2/OIWIN/NDW_PM_HISTORY.json @@ -17,20 +17,24 @@ "<1,4>": "", "<1,5>": "468", "<1,6>": "145", - "<1,7>": "-661", + "<1,7>": "-776", "<1,8>": "-581", "<1,9>": "PM History", "<1,10>": { - "<1,10,1>": "0x94CF0000", - "<1,10,2>": "0x0" + "<1,10,1>": "0x84CF0000", + "<1,10,2>": "0x100" }, "<1,11>": { - "<1,11,1>": "0x0", + "<1,11,1>": "0x8000", "<1,11,2>": "0x80000000" }, - "<1,12>": "0", - "<1,13>": "-2", - "<1,14>": "0", + "<1,12>": "", + "<1,13>": { + "<1,13,1>": "-2", + "<1,13,2>": "-2", + "<1,13,3>": "" + }, + "<1,14>": "", "<1,15>": "", "<1,16>": "", "<1,17>": "", @@ -50,51 +54,61 @@ "<1,18,1,4,8>": "@PARAM6" }, "<1,18,1,5>": "", - "<1,18,1,6>": "" - }, - "<1,18,2>": "" - }, - "<1,19>": { - "<1,19,1>": "CREATE", - "<1,19,2>": "" + "<1,18,1,6>": "", + "<1,18,1,7>": "", + "<1,18,1,8>": "", + "<1,18,1,9>": "", + "<1,18,1,10>": "", + "<1,18,1,11>": "", + "<1,18,1,12>": "", + "<1,18,1,13>": "", + "<1,18,1,14>": "", + "<1,18,1,15>": "STPROC" + } }, + "<1,19>": "CREATE", "<1,20>": "", "<1,21>": "", "<1,22>": "", "<1,23>": "", "<1,24>": { - "<1,24,1>": "0", + "<1,24,1>": "", "<1,24,2>": "0", "<1,24,3>": "0", "<1,24,4>": "0", - "<1,24,5>": "0", - "<1,24,6>": "0" + "<1,24,5>": "", + "<1,24,6>": "0", + "<1,24,7>": "", + "<1,24,8>": "", + "<1,24,9>": "", + "<1,24,10>": "0", + "<1,24,11>": "0", + "<1,24,12>": "0", + "<1,24,13>": "0", + "<1,24,14>": "0", + "<1,24,15>": "0", + "<1,24,16>": "0", + "<1,24,17>": "0" }, - "<1,25>": "0", - "<1,26>": "0", + "<1,25>": "", + "<1,26>": "", "<1,27>": "", "<1,28>": "", "<1,29>": "", "<1,30>": "", "<1,31>": "", - "<1,32>": { - "<1,32,1>": "0x7FFFE", - "<1,32,2>": "0xF001E808" - }, + "<1,32>": "", "<1,33>": "", - "<1,34>": "", + "<1,34>": "LSL2*IMAGE*ICO*INFINEON", "<1,35>": "", "<1,36>": "", "<1,37>": { - "<1,37,1>": "0x10001", - "<1,37,2>": "0x10001" - }, - "<1,38>": { - "<1,38,1>": "1", - "<1,38,2>": "1" + "<1,37,1>": "0X10001", + "<1,37,2>": "0X10001" }, + "<1,38>": "", "<1,39>": "", - "<1,40>": "0", + "<1,40>": "", "<1,41>": "", "<1,42>": "", "<1,43>": "", @@ -106,7 +120,74 @@ "<1,49>": "", "<1,50>": "", "<1,51>": "", - "<1,52>": "" + "<1,52>": "", + "<1,53>": "", + "<1,54>": "", + "<1,55>": "", + "<1,56>": "", + "<1,57>": "", + "<1,58>": "", + "<1,59>": "", + "<1,60>": "", + "<1,61>": "", + "<1,62>": { + "<1,62,1>": "0", + "<1,62,2>": "", + "<1,62,3>": "", + "<1,62,4>": "0", + "<1,62,5>": "0", + "<1,62,6>": "0", + "<1,62,7>": "", + "<1,62,8>": "0.50", + "<1,62,9>": "5.00", + "<1,62,10>": "0.00" + }, + "<1,63>": "", + "<1,64>": "", + "<1,65>": "", + "<1,66>": "", + "<1,67>": "", + "<1,68>": "", + "<1,69>": "", + "<1,70>": "", + "<1,71>": "", + "<1,72>": "", + "<1,73>": "", + "<1,74>": "", + "<1,75>": "", + "<1,76>": "", + "<1,77>": "", + "<1,78>": "", + "<1,79>": "", + "<1,80>": "", + "<1,81>": "", + "<1,82>": "", + "<1,83>": "", + "<1,84>": "", + "<1,85>": "", + "<1,86>": "", + "<1,87>": "", + "<1,88>": "", + "<1,89>": "", + "<1,90>": "", + "<1,91>": "", + "<1,92>": "", + "<1,93>": "", + "<1,94>": "", + "<1,95>": "", + "<1,96>": "", + "<1,97>": "", + "<1,98>": "", + "<1,99>": "", + "<1,100>": "", + "<1,101>": "", + "<1,102>": "", + "<1,103>": "", + "<1,104>": "", + "<1,105>": "", + "<1,106>": "0", + "<1,107>": "", + "<1,108>": "" } }, "record3": { @@ -117,19 +198,23 @@ "<1,4>": "NDW_PM_HISTORY", "<1,5>": "10", "<1,6>": "50", - "<1,7>": "640", - "<1,8>": "520", + "<1,7>": "-14", + "<1,8>": "-11", "<1,9>": "SRP.EditTable.1", "<1,10>": { "<1,10,1>": "0x56000000", "<1,10,2>": "0x0" }, "<1,11>": { - "<1,11,1>": "0x4", + "<1,11,1>": "0xC004", "<1,11,2>": "0x80000000" }, "<1,12>": "1", - "<1,13>": "-2", + "<1,13>": { + "<1,13,1>": "-2", + "<1,13,2>": "-2", + "<1,13,3>": "" + }, "<1,14>": "0", "<1,15>": { "<1,15,1>": { @@ -158,17 +243,14 @@ "<1,22>": "", "<1,23>": "", "<1,24>": "", - "<1,25>": "0", - "<1,26>": "0", + "<1,25>": "", + "<1,26>": "", "<1,27>": "", - "<1,28>": "<>", - "<1,29>": "<>", - "<1,30>": "<>", - "<1,31>": "0", - "<1,32>": { - "<1,32,1>": "0x7fffe", - "<1,32,2>": "0xf0016400" - }, + "<1,28>": "", + "<1,29>": "", + "<1,30>": "", + "<1,31>": "", + "<1,32>": "", "<1,33>": "", "<1,34>": "", "<1,35>": "", @@ -188,7 +270,89 @@ "<1,49>": "", "<1,50>": "", "<1,51>": "", - "<1,52>": "" + "<1,52>": "", + "<1,53>": "", + "<1,54>": "", + "<1,55>": { + "<1,55,1>": "OLE.AllowXPTheme", + "<1,55,2>": "OLE.ComboDropDown", + "<1,55,3>": "OLE.DblClickToEdit", + "<1,55,4>": "OLE.EditContextMenu", + "<1,55,5>": "OLE.EditText", + "<1,55,6>": "OLE.Focus", + "<1,55,7>": "OLE.HeaderRowCount", + "<1,55,8>": "OLE.Modified", + "<1,55,9>": "OLE.PassEnterKey", + "<1,55,10>": "OLE.ScrollBarsVisible", + "<1,55,11>": "OLE.SingleEscape", + "<1,55,12>": "OLE.TextRenderStyle" + }, + "<1,56>": { + "<1,56,1>": "0", + "<1,56,2>": "0", + "<1,56,3>": "1", + "<1,56,4>": "1", + "<1,56,5>": "", + "<1,56,6>": "0", + "<1,56,7>": "1", + "<1,56,8>": "0", + "<1,56,9>": "0", + "<1,56,10>": "Auto|Auto", + "<1,56,11>": "0", + "<1,56,12>": "EditField|Ellipses" + }, + "<1,57>": "", + "<1,58>": "", + "<1,59>": "", + "<1,60>": "", + "<1,61>": "", + "<1,62>": "", + "<1,63>": "", + "<1,64>": "", + "<1,65>": "", + "<1,66>": "", + "<1,67>": "", + "<1,68>": "", + "<1,69>": "", + "<1,70>": "", + "<1,71>": "", + "<1,72>": "", + "<1,73>": "", + "<1,74>": "", + "<1,75>": "", + "<1,76>": "", + "<1,77>": "", + "<1,78>": "", + "<1,79>": "", + "<1,80>": "", + "<1,81>": "", + "<1,82>": "", + "<1,83>": "", + "<1,84>": "", + "<1,85>": "", + "<1,86>": "", + "<1,87>": "", + "<1,88>": "", + "<1,89>": "", + "<1,90>": "", + "<1,91>": "", + "<1,92>": "", + "<1,93>": "", + "<1,94>": "", + "<1,95>": "", + "<1,96>": "", + "<1,97>": "", + "<1,98>": "", + "<1,99>": "", + "<1,100>": "", + "<1,101>": "", + "<1,102>": "", + "<1,103>": "", + "<1,104>": "", + "<1,105>": "", + "<1,106>": "", + "<1,107>": "", + "<1,108>": "" }, "<2>": { "<2,1>": "EDL_PM_SPEC", @@ -209,7 +373,11 @@ "<2,11,2>": "0x80000000" }, "<2,12>": "2", - "<2,13>": "-2", + "<2,13>": { + "<2,13,1>": "-2", + "<2,13,2>": "-2", + "<2,13,3>": "" + }, "<2,14>": "0", "<2,15>": { "<2,15,1>": { @@ -238,21 +406,21 @@ "<2,22>": "", "<2,23>": "", "<2,24>": "", - "<2,25>": "0", - "<2,26>": "0", + "<2,25>": "", + "<2,26>": "", "<2,27>": "", "<2,28>": "<>", "<2,29>": "<>", "<2,30>": "<>", "<2,31>": "0", - "<2,32>": { - "<2,32,1>": "0x7fffe", - "<2,32,2>": "0xf0016c08" - }, + "<2,32>": "", "<2,33>": "", "<2,34>": "", "<2,35>": "", - "<2,36>": "", + "<2,36>": { + "<2,36,1>": "0", + "<2,36,2>": "0" + }, "<2,37>": "", "<2,38>": "", "<2,39>": "", @@ -268,7 +436,63 @@ "<2,49>": "", "<2,50>": "", "<2,51>": "", - "<2,52>": "" + "<2,52>": "", + "<2,53>": "", + "<2,54>": "", + "<2,55>": "", + "<2,56>": "", + "<2,57>": "", + "<2,58>": "", + "<2,59>": "", + "<2,60>": "", + "<2,61>": "", + "<2,62>": "0", + "<2,63>": "", + "<2,64>": "", + "<2,65>": "", + "<2,66>": "", + "<2,67>": "", + "<2,68>": "", + "<2,69>": "", + "<2,70>": "", + "<2,71>": "", + "<2,72>": "", + "<2,73>": "", + "<2,74>": "", + "<2,75>": "", + "<2,76>": "", + "<2,77>": "", + "<2,78>": "", + "<2,79>": "", + "<2,80>": "", + "<2,81>": "", + "<2,82>": "", + "<2,83>": "", + "<2,84>": "", + "<2,85>": "", + "<2,86>": "", + "<2,87>": "", + "<2,88>": "", + "<2,89>": "", + "<2,90>": "", + "<2,91>": "", + "<2,92>": "", + "<2,93>": "", + "<2,94>": "", + "<2,95>": "", + "<2,96>": "", + "<2,97>": "", + "<2,98>": "", + "<2,99>": "", + "<2,100>": "", + "<2,101>": "", + "<2,102>": "", + "<2,103>": "", + "<2,104>": "", + "<2,105>": "", + "<2,106>": "", + "<2,107>": "", + "<2,108>": "" }, "<3>": { "<3,1>": "PUB_EXPORT_TO_EXCEL", @@ -281,15 +505,19 @@ "<3,8>": "30", "<3,9>": "Export To Excel", "<3,10>": { - "<3,10,1>": "0x56002000", + "<3,10,1>": "0x56002300", "<3,10,2>": "0x0" }, "<3,11>": { - "<3,11,1>": "0x100", + "<3,11,1>": "0x0", "<3,11,2>": "0x80000000" }, "<3,12>": "3", - "<3,13>": "-2", + "<3,13>": { + "<3,13,1>": "-2", + "<3,13,2>": "-2", + "<3,13,3>": "0" + }, "<3,14>": "0", "<3,15>": { "<3,15,1>": { @@ -327,30 +555,32 @@ "<3,18,1,4,8>": "@PARAM6" }, "<3,18,1,5>": "", - "<3,18,1,6>": "" - }, - "<3,18,2>": "" - }, - "<3,19>": { - "<3,19,1>": "CLICK", - "<3,19,2>": "" + "<3,18,1,6>": "", + "<3,18,1,7>": "", + "<3,18,1,8>": "", + "<3,18,1,9>": "", + "<3,18,1,10>": "", + "<3,18,1,11>": "", + "<3,18,1,12>": "", + "<3,18,1,13>": "", + "<3,18,1,14>": "", + "<3,18,1,15>": "STPROC" + } }, + "<3,19>": "CLICK", "<3,20>": "", "<3,21>": "", "<3,22>": "", "<3,23>": "", "<3,24>": "", - "<3,25>": "0", - "<3,26>": "0", + "<3,25>": "", + "<3,26>": "", "<3,27>": "", - "<3,28>": "<>", - "<3,29>": "<>", - "<3,30>": "<>", - "<3,31>": "0", - "<3,32>": { - "<3,32,1>": "0x7fffe", - "<3,32,2>": "0xf0016008" - }, + "<3,28>": "", + "<3,29>": "", + "<3,30>": "", + "<3,31>": "", + "<3,32>": "", "<3,33>": "", "<3,34>": "", "<3,35>": "", @@ -359,7 +589,10 @@ "<3,38>": "", "<3,39>": "", "<3,40>": "1", - "<3,41>": "", + "<3,41>": { + "<3,41,1>": "", + "<3,41,2>": "-1" + }, "<3,42>": "", "<3,43>": "", "<3,44>": "", @@ -370,7 +603,67 @@ "<3,49>": "", "<3,50>": "", "<3,51>": "", - "<3,52>": "" + "<3,52>": "", + "<3,53>": "", + "<3,54>": "", + "<3,55>": "", + "<3,56>": "", + "<3,57>": "", + "<3,58>": "", + "<3,59>": "", + "<3,60>": "", + "<3,61>": "", + "<3,62>": "0", + "<3,63>": "", + "<3,64>": { + "<3,64,1>": "-2", + "<3,64,2>": "-2", + "<3,64,3>": "0" + }, + "<3,65>": "-2", + "<3,66>": "", + "<3,67>": "", + "<3,68>": "", + "<3,69>": "", + "<3,70>": "", + "<3,71>": "", + "<3,72>": "", + "<3,73>": "", + "<3,74>": "", + "<3,75>": "", + "<3,76>": "", + "<3,77>": "", + "<3,78>": "", + "<3,79>": "", + "<3,80>": "", + "<3,81>": "", + "<3,82>": "", + "<3,83>": "", + "<3,84>": "", + "<3,85>": "", + "<3,86>": "", + "<3,87>": "", + "<3,88>": "", + "<3,89>": "", + "<3,90>": "0", + "<3,91>": "0", + "<3,92>": "", + "<3,93>": "", + "<3,94>": "", + "<3,95>": "", + "<3,96>": "", + "<3,97>": "", + "<3,98>": "", + "<3,99>": "", + "<3,100>": "", + "<3,101>": "", + "<3,102>": "", + "<3,103>": "", + "<3,104>": "", + "<3,105>": "", + "<3,106>": "", + "<3,107>": "", + "<3,108>": "" }, "<4>": { "<4,1>": "PUB_SEARCH", @@ -383,15 +676,19 @@ "<4,8>": "30", "<4,9>": "Search", "<4,10>": { - "<4,10,1>": "0x56002000", + "<4,10,1>": "0x56002300", "<4,10,2>": "0x0" }, "<4,11>": { - "<4,11,1>": "0x100", + "<4,11,1>": "0x0", "<4,11,2>": "0x80000000" }, "<4,12>": "4", - "<4,13>": "-2", + "<4,13>": { + "<4,13,1>": "-2", + "<4,13,2>": "-2", + "<4,13,3>": "0" + }, "<4,14>": "0", "<4,15>": { "<4,15,1>": { @@ -429,30 +726,32 @@ "<4,18,1,4,8>": "@PARAM6" }, "<4,18,1,5>": "", - "<4,18,1,6>": "" - }, - "<4,18,2>": "" - }, - "<4,19>": { - "<4,19,1>": "CLICK", - "<4,19,2>": "" + "<4,18,1,6>": "", + "<4,18,1,7>": "", + "<4,18,1,8>": "", + "<4,18,1,9>": "", + "<4,18,1,10>": "", + "<4,18,1,11>": "", + "<4,18,1,12>": "", + "<4,18,1,13>": "", + "<4,18,1,14>": "", + "<4,18,1,15>": "STPROC" + } }, + "<4,19>": "CLICK", "<4,20>": "", "<4,21>": "", "<4,22>": "", "<4,23>": "", "<4,24>": "", - "<4,25>": "0", - "<4,26>": "0", + "<4,25>": "", + "<4,26>": "", "<4,27>": "", - "<4,28>": "<>", - "<4,29>": "<>", - "<4,30>": "<>", - "<4,31>": "0", - "<4,32>": { - "<4,32,1>": "0x7fffe", - "<4,32,2>": "0xf0016008" - }, + "<4,28>": "", + "<4,29>": "", + "<4,30>": "", + "<4,31>": "", + "<4,32>": "", "<4,33>": "", "<4,34>": "", "<4,35>": "", @@ -461,7 +760,10 @@ "<4,38>": "", "<4,39>": "", "<4,40>": "1", - "<4,41>": "", + "<4,41>": { + "<4,41,1>": "", + "<4,41,2>": "-1" + }, "<4,42>": "", "<4,43>": "", "<4,44>": "", @@ -472,18 +774,71 @@ "<4,49>": "", "<4,50>": "", "<4,51>": "", - "<4,52>": "" - }, - "<5>": "" + "<4,52>": "", + "<4,53>": "", + "<4,54>": "", + "<4,55>": "", + "<4,56>": "", + "<4,57>": "", + "<4,58>": "", + "<4,59>": "", + "<4,60>": "", + "<4,61>": "", + "<4,62>": "0", + "<4,63>": "", + "<4,64>": { + "<4,64,1>": "-2", + "<4,64,2>": "-2", + "<4,64,3>": "0" + }, + "<4,65>": "-2", + "<4,66>": "", + "<4,67>": "", + "<4,68>": "", + "<4,69>": "", + "<4,70>": "", + "<4,71>": "", + "<4,72>": "", + "<4,73>": "", + "<4,74>": "", + "<4,75>": "", + "<4,76>": "", + "<4,77>": "", + "<4,78>": "", + "<4,79>": "", + "<4,80>": "", + "<4,81>": "", + "<4,82>": "", + "<4,83>": "", + "<4,84>": "", + "<4,85>": "", + "<4,86>": "", + "<4,87>": "", + "<4,88>": "", + "<4,89>": "", + "<4,90>": "0", + "<4,91>": "0", + "<4,92>": "", + "<4,93>": "", + "<4,94>": "", + "<4,95>": "", + "<4,96>": "", + "<4,97>": "", + "<4,98>": "", + "<4,99>": "", + "<4,100>": "", + "<4,101>": "", + "<4,102>": "", + "<4,103>": "", + "<4,104>": "", + "<4,105>": "", + "<4,106>": "", + "<4,107>": "", + "<4,108>": "" + } }, "record4": { - "<1>": "", - "<2>": { - "<2,1>": "", - "<2,2>": "", - "<2,3>": "", - "<2,4>": "0" - } + "<1>": "" } } } \ No newline at end of file diff --git a/LSL2/STPROC/NDW_5S_EVENTS.txt b/LSL2/STPROC/NDW_5S_EVENTS.txt index 4c4d622..493f3da 100644 --- a/LSL2/STPROC/NDW_5S_EVENTS.txt +++ b/LSL2/STPROC/NDW_5S_EVENTS.txt @@ -1,8 +1,38 @@ Compile function NDW_5S_EVENTS(CtrlEntId, Event, @PARAMS) +/*********************************************************************************************************************** + + This program is proprietary and is not to be used by or disclosed to others, nor is it to be copied without written + permission from Infineon. + + Name : NDW_5S_Events + + Description : This function acts as a commuter module for all events related to this window. + + Notes : Commuter Modules are automatically called from the Promoted_Events function which is called by the + application-specific promoted event handler. This makes it possible to add QuickEvents that need to + execute Basic+ logic without having use the Form Designer to make the association, although this is + limited to the events which are currently promoted. + + If the form needs to call the commuter module directly then the QuickEvent parameters should be + formatted like this: + + '@SELF','@EVENT',['@PARAM1','@PARAMx'] + + Parameters : + CtrlEntId [in] -- The fully qualified name of the control calling the promoted event + Event [in] -- The event being executed. See the Notes section regarding "PRE" events + Param1-15 [in] -- Additional event parameter holders + EventFlow [out] -- Set to 1 or 0 so the calling event knows whether or not to chain forward. See comments in + EVENT_SETUP insert + + History : (Date, Initials, Notes) + 05/14/2025 djs Modified edit table properties to fit longer descriptions + +***********************************************************************************************************************/ #pragma precomp SRP_PreCompiler #window NDW_5S - +$Insert EVENT_SETUP $Insert APP_INSERTS $Insert PM_SPEC_EQUATES $Insert PM_EQUATES @@ -21,7 +51,6 @@ EQU COL$SCHED_START TO 5 EQU COL$LATE_START TO 6 EQU COL$ACTION TO 7 - // Form colors EQU RED$FIVES TO '5924072' EQU GREEN$FIVES TO '7596927' @@ -34,11 +63,11 @@ If Event EQ 'OLE' then Transfer Param1 to Event Transfer Param2 to Param1 Transfer Param3 to Param2 - * Transfer Param4 to Param3 - * Transfer Param5 to Param4 - * Transfer Param6 to Param5 - * Transfer Param7 to Param6 - * Transfer Param8 to Param7 + Transfer Param4 to Param3 + Transfer Param5 to Param4 + Transfer Param6 to Param5 + Transfer Param7 to Param6 + Transfer Param8 to Param7 end GoToEvent Event for CtrlEntId else @@ -79,8 +108,11 @@ Event CHK_ARCHIVED.CLICK() end event + Event CMB_AREA.CHANGED(NewData) + GoSub GetKeys + end event @@ -144,9 +176,9 @@ Event EDT_5S_TABLE.OnButtonClick(Cell, Point, Button, Shift, Ctrl) GoSub GetKeys end Case ColClicked EQ COL$PM_ID - + Null Case Otherwise$ - + Null End Case end event @@ -169,20 +201,12 @@ Event EDT_5S_TABLE.OnDblClick(Cell, Point, Button, Shift, Ctrl) Start_Window('NDW_PM_HISTORY', @Window, PMSID) Case Otherwise$ - + Null End Case end event -Event EDT_5S_TABLE.OnLostFocus() - - //Set_Property(@Window : '.EDT_SEL_ROW', 'TEXT', ''); *Clear out selected row. - //Set_Property(@Window : '.PUB_VIEW_SELECTED', 'ENABLED', 0) - -end event - - Event PUB_ADD_NEW_PM_SPEC.CLICK() Start_Window('PM_SPEC', @Window, '') @@ -217,11 +241,12 @@ end event //----------------------------------------------------------------------------- GetKeys: + ShowArchived = Get_Property(@Window : '.CHK_ARCHIVED', 'CHECK') SelectedArea = Get_Property(@Window : '.CMB_AREA', 'TEXT') - FiveSPMKeys = Pm_Services('Get5SPMs', ShowArchived, SelectedArea) + FormatData: TableData = '' @@ -250,17 +275,17 @@ FormatData: TableData = LateStarts Next PMKey + PopulateTable: EdtTableCtrl = @Window : '.EDT_5S_TABLE' TableData = SRP_Array("Rotate", TableData) Set_Property(EdtTableCtrl, "OLE.ARRAY", TableData) - //Set last column in row to a PUB + // Set last column in row to a PUB Set_Property(EdtTableCtrl, "OLE.CellType[7; ALL]", "Push Button") Set_Property(EdtTableCtrl, "OLE.CellText[7; ALL]", "Click To Complete") Set_Property(EdtTableCtrl, "OLE.CellImage[7; ALL]", 1) - - //Get All Cell Settings + // Get All Cell Settings ColumnSettings = Get_Property(EdtTableCtrl, "OLE.CellType[3; ALL]") ColumnSettings<2,3> = 0; *Turns off data from cell 7 of each row. Set_Property(EdtTableCtrl, "OLE.CellType[7; ALL]", ColumnSettings) @@ -268,7 +293,7 @@ PopulateTable: ColorCodeRows: - //Here we color code all the rows based on whether they're not due, due, or overdue. + // Here we color code all the rows based on whether they're not due, due, or overdue. TableData = Get_Property(EdtTableCtrl, "OLE.ARRAY") TableData = SRP_Array('Rotate', TableData) CurrDTM = SRP_Datetime('Now') @@ -318,7 +343,6 @@ SetupForm: Set_Property(@Window : '.PUB_ADD_NEW_PM_SPEC', 'VISIBLE', 0) Set_Property(@Window : '.PUB_VIEW_SELECTED', 'VISIBLE', 0) end - Set_Property(@Window : '.PUB_VIEW_SELECTED', 'ENABLED', 0) return @@ -327,51 +351,44 @@ return Setup_OLE_Controls: EdtTableCtrl = @Window : '.EDT_5S_TABLE' - //Row Selection Settings + // Row Selection Settings RowSelArray = Get_Property(EdtTableCtrl, "OLE.SelectionStyle") RowSelArray<7> = 'Header' RowSelArray<8> = True$;*Always show row selection Set_Property(EdtTableCtrl, "OLE.SelectionStyle", RowSelArray) Set_Property(EdtTableCtrl, 'OLE.Redraw', False$) - //Set up columns + // Set up columns Set_Property(EdtTableCtrl, "OLE.Dimension", 7);*Define number of columns HeaderTitles = 'PM ID':@VM:'Desc':@VM:'Last PM':@VM:'Early Start':@VM:'Sched Start':@VM:'Late Start':@VM:'Action'; *Define the column header titles Set_Property(EdtTableCtrl, "OLE.TitleList", HeaderTitles); *Set the column titles - //Set the column Sizes + // Set the column Sizes + Set_Property(EdtTableCtrl, "OLE.HeaderColumn[1]", '':@FM:False$) ColSize = Get_Property(EdtTableCtrl, "OLE.DataColumn[1]") - - //Column 1 + // Column 1 ColSize<1> = 45 Set_Property(EdtTableCtrl, "OLE.DataColumn[":COL$PM_ID:"]", ColSize) - - //Column 2 - ColSize<1> = 160 - //ColSize<4> = True$ + // Column 2 + ColSize<1> = 200 + ColSize<4> = True$ Set_Property(EdtTableCtrl, "OLE.DataColumn[":COL$DESC:"]", ColSize) - //Set_Property(Ctrl, "OLE.DataColumn[":COL$ELAP_HRS:"]", ColSize) - - //Column 3 + ColSize<4> = False$ + // Column 3 ColSize<1> = 110 Set_Property(EdtTableCtrl, "OLE.DataColumn[":COL$LAST_PM:"]", ColSize) - - //Column 4 + // Column 4 ColSize<1> = 110 Set_Property(EdtTableCtrl, "OLE.DataColumn[":COL$EARLY_START:"]", ColSize) - - //Column 5 + // Column 5 ColSize<1> = 110 Set_Property(EdtTableCtrl, "OLE.DataColumn[":COL$SCHED_START:"]", ColSize) - //Column 6 ColSize<1> = 110 Set_Property(EdtTableCtrl, "OLE.DataColumn[":COL$LATE_START:"]", ColSize) - //Column 7 ColSize<1> = 110 Set_Property(EdtTableCtrl, "OLE.DataColumn[":COL$ACTION:"]", ColSize) - Set_Property(EdtTableCtrl, 'OLE.Border', 'XP Flat') Set_Property(EdtTableCtrl, 'OLE.Font', 'Segoe UI' : @SVM : '15') Set_Property(EdtTableCtrl, "OLE.CellProtection[All; All]", 'RO') @@ -388,5 +405,3 @@ Setup_OLE_Controls: return - - diff --git a/LSL2/STPROC/NDW_PM_HISTORY_EVENTS.txt b/LSL2/STPROC/NDW_PM_HISTORY_EVENTS.txt index 3963ca1..5964ac3 100644 --- a/LSL2/STPROC/NDW_PM_HISTORY_EVENTS.txt +++ b/LSL2/STPROC/NDW_PM_HISTORY_EVENTS.txt @@ -1,10 +1,41 @@ Compile function NDW_PM_HISTORY_EVENTS(CtrlEntId, Event, @PARAMS) +/*********************************************************************************************************************** + + This program is proprietary and is not to be used by or disclosed to others, nor is it to be copied without written + permission from Infineon. + + Name : NDW_PM_History_Events + + Description : This function acts as a commuter module for all events related to this window. + + Notes : Commuter Modules are automatically called from the Promoted_Events function which is called by the + application-specific promoted event handler. This makes it possible to add QuickEvents that need to + execute Basic+ logic without having use the Form Designer to make the association, although this is + limited to the events which are currently promoted. + + If the form needs to call the commuter module directly then the QuickEvent parameters should be + formatted like this: + + '@SELF','@EVENT',['@PARAM1','@PARAMx'] + + Parameters : + CtrlEntId [in] -- The fully qualified name of the control calling the promoted event + Event [in] -- The event being executed. See the Notes section regarding "PRE" events + Param1-15 [in] -- Additional event parameter holders + EventFlow [out] -- Set to 1 or 0 so the calling event knows whether or not to chain forward. See comments in + EVENT_SETUP insert + + History : (Date, Initials, Notes) + 05/14/2025 djs Modified edit table properties to fit longer descriptions + +***********************************************************************************************************************/ #pragma precomp SRP_PreCompiler #window NDW_PM_HISTORY Declare function Get_Property, Obj_Pm_Spec, Database_Services, SRP_Array, SRP_Datetime, Utility, OConv, Datetime -Declare subroutine Set_Property, Send_Message, Msg +Declare subroutine Set_Property, Send_Message, Msg, PlaceDialog +$Insert EVENT_SETUP $Insert PM_EQUATES $Insert PM_SPEC_EQUATES $Insert APP_INSERTS @@ -17,6 +48,19 @@ EQU COL$DATEDUE to 4 EQU COL$LATE to 5 EQU COL$USER to 6 +// Update the arguments so that the OpenInsight OLE event will treate the ActiveX event as a native event handler. +If Event EQ 'OLE' then + Transfer Event to OIEvent + Transfer Param1 to Event + Transfer Param2 to Param1 + Transfer Param3 to Param2 + Transfer Param4 to Param3 + Transfer Param5 to Param4 + Transfer Param6 to Param5 + Transfer Param7 to Param6 + Transfer Param8 to Param7 +end + GoToEvent Event for CtrlEntId else // Event not implemented end @@ -35,12 +79,17 @@ Event WINDOW.CREATE(CreateParam) IF PMSpecID NE '' then GoSub RunReport end + PlaceDialog(-2, -2) + End Event Event PUB_SEARCH.CLICK() + GoSub RunReport + end event + Event PUB_EXPORT_TO_EXCEL.CLICK() PmsId = Get_Property(@Window : '.EDL_PM_SPEC', 'TEXT') If PmsId NE '' then @@ -80,8 +129,6 @@ Event PUB_EXPORT_TO_EXCEL.CLICK() End end end - - end event @@ -96,41 +143,53 @@ RunReport: PMDescription = XLATE('PM_SPEC', PMSpecId, PM_SPEC_DESC$, 'X') PMHistory = obj_pm_spec('GetHistory', PMSpecId);*Returns list of PM Keys delimited by @VM PMHistoryArray = '' - for each PMId in PMHistory using @VM setting pPos + Def = "" + Def = "Loading PM History..." + Def = "GC" + Def = DCount(PMHistory, @VM) + MsgUp = Msg(@window, Def) + For each PMId in PMHistory using @VM setting pPos PMRec = Database_Services('ReadDataRow', 'PM', PMId) SchedDtm = SRP_Datetime('Combine', PMRec, PMRec) DueByDTM = obj_PM_Spec('LateStart',PMId:@RM:PMSpecRecord) Late = Xlate('PM', PMId, 'LATE', 'X') If Late then Late = 'Yes' else Late = 'No' - PMHistoryArray = PMId PMHistoryArray = PMDescription PMHistoryArray = OCONV(PMRec, 'DT') PMHistoryArray = OCONV(SchedDtm, 'DT') PMHistoryArray = Late - PMHistoryArray = PMRec + PMHistoryArray = OConv(PMRec, '[XLATE_CONV,LSL_USERS*FIRST_LAST]') + While Msg(@window, MsgUp, pPos, MSGINSTUPDATE$) ; * update the gauge and check if cancel was pressed Next PMId + Msg(@window, MsgUp) ;* take down the gauge PMHistoryArray = SRP_Array('Rotate',PMHistoryArray) PMHistoryArray = SRP_Array('SortRows', PMHistoryArray, 'D1', 'ARRAY', '', '') Set_Property(@Window : '.OLE_HIST_TABLE', "OLE.ARRAY", PMHistoryArray) return + ColorCode: + PMHistoryArray = Get_Property(@Window : '.OLE_HIST_TABLE', "OLE.ARRAY") PMHistoryArray = SRP_Array('Rotate',PMHistoryArray) +return + + +SETUP_CONTROLS: + + Set_Property(@Window : '.EDL_PM_SPEC', 'TEXT', PMSpecID) + GoSub Setup_OLE_Controls return -SETUP_CONTROLS: - Set_Property(@Window : '.EDL_PM_SPEC', 'TEXT', PMSpecID) - GoSub Setup_OLE_Controls -return Setup_OLE_Controls: + EdtTableCtrl = @Window : '.OLE_HIST_TABLE' - Set_Property(EdtTableCtrl, 'OLE.Redraw', False$) + Set_Property(EdtTableCtrl, 'OLE.Redraw', False$) //Set up columns Set_Property(EdtTableCtrl, "OLE.Dimension", 6);*Define number of columns @@ -138,39 +197,32 @@ Setup_OLE_Controls: Set_Property(EdtTableCtrl, "OLE.TitleList", HeaderTitles); *Set the column titles //Set the column Sizes - ColSize = Get_Property(EdtTableCtrl, "OLE.DataColumn[1]") + Set_Property(EdtTableCtrl, "OLE.HeaderColumn[1]", '':@FM:False$) + ColSize = Get_Property(EdtTableCtrl, "OLE.DataColumn[1]") //Column 1 ColSize<1> = 45 Set_Property(EdtTableCtrl, "OLE.DataColumn[":COL$PMID:"]", ColSize) //Column 2 - ColSize<1> = 45 - Set_Property(EdtTableCtrl, "OLE.DataColumn[":COL$PMID:"]", ColSize) + ColSize<1> = 200 + ColSize<4> = True$ + Set_Property(EdtTableCtrl, "OLE.DataColumn[":COL$DESC:"]", ColSize) + ColSize<4> = False$ //Column 3 - ColSize<1> = 160 + ColSize<1> = 120 Set_Property(EdtTableCtrl, "OLE.DataColumn[":COL$DATECOMP:"]", ColSize) //Column 4 ColSize<1> = 110 Set_Property(EdtTableCtrl, "OLE.DataColumn[":COL$DATEDUE:"]", ColSize) //Column 5 - ColSize<1> = 110 + ColSize<1> = 50 Set_Property(EdtTableCtrl, "OLE.DataColumn[":COL$LATE:"]", ColSize) //Column 6 - ColSize<1> = 110 + ColSize<1> = 160 Set_Property(EdtTableCtrl, "OLE.DataColumn[":COL$USER:"]", ColSize) Set_Property(EdtTableCtrl, 'OLE.Border', 'XP Flat') Set_Property(EdtTableCtrl, 'OLE.Font', 'Segoe UI' : @SVM : '15') Set_Property(EdtTableCtrl, "OLE.CellProtection[All; All]", 'RO') - - // Set rows to resizeable and to expand when selected. - //DataRow = Get_Property(EdtTableCtrl, "OLE.DataRow[1]") - //DataRow<3> = True$ - //DataRow<4> = False$ - //DataRow<5> = 160 - - - //Set_Property(EdtTableCtrl, "OLE.DataRow[All]", DataRow) - Set_Property(EdtTableCtrl, 'OLE.Redraw', True$) // Qualify OLE events that we want to intercept @@ -179,6 +231,6 @@ Setup_OLE_Controls: Qualifier<4> = 0 ; * process synchronously (i.e. immediately) Send_Message(EdtTableCtrl, 'QUALIFY_EVENT', 'OLE.OnButtonClick', Qualifier) Send_Message(EdtTableCtrl, 'QUALIFY_EVENT', 'OLE.OnDblClick', Qualifier) + return -