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

fixed tab order. stopped report generation when printer selection is canceled. cleaned up printer select code

Browse Source
This commit is contained in:
Infineon\StieberD 2024-09-09 16:27:59 -07:00
parent 93fb3477b8
commit bd08d486a1
4 changed files with 35 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
LSL2/OIWIN/REACTOR_LOG_SRPT1.json
View File

@ -482,7 +482,7 @@
"<3,11,1>": "0x0", "<3,11,1>": "0x0",
"<3,11,2>": "0x80000000" "<3,11,2>": "0x80000000"
}, },
"<3,12>": "18", "<3,12>": "2",
"<3,13>": { "<3,13>": {
"<3,13,1>": "-2", "<3,13,1>": "-2",
"<3,13,2>": "-2", "<3,13,2>": "-2",
@ -640,7 +640,7 @@
"<4,11,1>": "0x0", "<4,11,1>": "0x0",
"<4,11,2>": "0x80000000" "<4,11,2>": "0x80000000"
}, },
"<4,12>": "17", "<4,12>": "3",
"<4,13>": { "<4,13>": {
"<4,13,1>": "-2", "<4,13,1>": "-2",
"<4,13,2>": "-2", "<4,13,2>": "-2",
@ -795,10 +795,10 @@
"<5,10,2>": "0x0" "<5,10,2>": "0x0"
}, },
"<5,11>": { "<5,11>": {
"<5,11,1>": "0x4", "<5,11,1>": "0x0",
"<5,11,2>": "0x80000000" "<5,11,2>": "0x80000000"
}, },
"<5,12>": "1", "<5,12>": "5",
"<5,13>": { "<5,13>": {
"<5,13,1>": "-1", "<5,13,1>": "-1",
"<5,13,2>": "-1", "<5,13,2>": "-1",
@ -945,10 +945,10 @@
"<6,10,2>": "0x200" "<6,10,2>": "0x200"
}, },
"<6,11>": { "<6,11>": {
"<6,11,1>": "0x60000", "<6,11,1>": "0x60004",
"<6,11,2>": "0x80000002" "<6,11,2>": "0x80000002"
}, },
"<6,12>": "2", "<6,12>": "1",
"<6,13>": { "<6,13>": {
"<6,13,1>": "-2", "<6,13,1>": "-2",
"<6,13,2>": "-2", "<6,13,2>": "-2",
@ -1306,7 +1306,7 @@
"<7,11,1>": "0x0", "<7,11,1>": "0x0",
"<7,11,2>": "0x80000000" "<7,11,2>": "0x80000000"
}, },
"<7,12>": "3", "<7,12>": "4",
"<7,13>": { "<7,13>": {
"<7,13,1>": "-2", "<7,13,1>": "-2",
"<7,13,2>": "-2", "<7,13,2>": "-2",
@ -1450,7 +1450,7 @@
"<8,11,1>": "0x0", "<8,11,1>": "0x0",
"<8,11,2>": "0x80000000" "<8,11,2>": "0x80000000"
}, },
"<8,12>": "4", "<8,12>": "6",
"<8,13>": { "<8,13>": {
"<8,13,1>": "-2", "<8,13,1>": "-2",
"<8,13,2>": "-2", "<8,13,2>": "-2",
@ -1612,7 +1612,7 @@
"<9,11,1>": "0x0", "<9,11,1>": "0x0",
"<9,11,2>": "0x80000000" "<9,11,2>": "0x80000000"
}, },
"<9,12>": "5", "<9,12>": "7",
"<9,13>": { "<9,13>": {
"<9,13,1>": "-1", "<9,13,1>": "-1",
"<9,13,2>": "-1", "<9,13,2>": "-1",
@ -1762,7 +1762,7 @@
"<10,11,1>": "0x0", "<10,11,1>": "0x0",
"<10,11,2>": "0x80000C00" "<10,11,2>": "0x80000C00"
}, },
"<10,12>": "6", "<10,12>": "8",
"<10,13>": { "<10,13>": {
"<10,13,1>": "-2", "<10,13,1>": "-2",
"<10,13,2>": "-2", "<10,13,2>": "-2",
@ -1907,7 +1907,7 @@
"<11,11,1>": "0x0", "<11,11,1>": "0x0",
"<11,11,2>": "0x80000000" "<11,11,2>": "0x80000000"
}, },
"<11,12>": "7", "<11,12>": "9",
"<11,13>": { "<11,13>": {
"<11,13,1>": "-1", "<11,13,1>": "-1",
"<11,13,2>": "-1", "<11,13,2>": "-1",
@ -2057,7 +2057,7 @@
"<12,11,1>": "0x0", "<12,11,1>": "0x0",
"<12,11,2>": "0x80000000" "<12,11,2>": "0x80000000"
}, },
"<12,12>": "8", "<12,12>": "10",
"<12,13>": { "<12,13>": {
"<12,13,1>": "-1", "<12,13,1>": "-1",
"<12,13,2>": "-1", "<12,13,2>": "-1",
@ -2207,7 +2207,7 @@
"<13,11,1>": "0x60000", "<13,11,1>": "0x60000",
"<13,11,2>": "0x80000002" "<13,11,2>": "0x80000002"
}, },
"<13,12>": "9", "<13,12>": "11",
"<13,13>": { "<13,13>": {
"<13,13,1>": "-2", "<13,13,1>": "-2",
"<13,13,2>": "-2", "<13,13,2>": "-2",
@ -2616,7 +2616,7 @@
"<14,11,1>": "0x0", "<14,11,1>": "0x0",
"<14,11,2>": "0x80000000" "<14,11,2>": "0x80000000"
}, },
"<14,12>": "10", "<14,12>": "12",
"<14,13>": { "<14,13>": {
"<14,13,1>": "-2", "<14,13,1>": "-2",
"<14,13,2>": "-2", "<14,13,2>": "-2",
@ -2771,7 +2771,7 @@
"<15,11,1>": "0x60000", "<15,11,1>": "0x60000",
"<15,11,2>": "0x80000002" "<15,11,2>": "0x80000002"
}, },
"<15,12>": "11", "<15,12>": "13",
"<15,13>": { "<15,13>": {
"<15,13,1>": "-2", "<15,13,1>": "-2",
"<15,13,2>": "-2", "<15,13,2>": "-2",
@ -3180,7 +3180,7 @@
"<16,11,1>": "0x0", "<16,11,1>": "0x0",
"<16,11,2>": "0x80000000" "<16,11,2>": "0x80000000"
}, },
"<16,12>": "12", "<16,12>": "14",
"<16,13>": { "<16,13>": {
"<16,13,1>": "-2", "<16,13,1>": "-2",
"<16,13,2>": "-2", "<16,13,2>": "-2",
@ -3335,7 +3335,7 @@
"<17,11,1>": "0x0", "<17,11,1>": "0x0",
"<17,11,2>": "0x80000000" "<17,11,2>": "0x80000000"
}, },
"<17,12>": "13", "<17,12>": "15",
"<17,13>": { "<17,13>": {
"<17,13,1>": "-1", "<17,13,1>": "-1",
"<17,13,2>": "-1", "<17,13,2>": "-1",
@ -3485,7 +3485,7 @@
"<18,11,1>": "0x0", "<18,11,1>": "0x0",
"<18,11,2>": "0x80000000" "<18,11,2>": "0x80000000"
}, },
"<18,12>": "14", "<18,12>": "16",
"<18,13>": { "<18,13>": {
"<18,13,1>": "-1", "<18,13,1>": "-1",
"<18,13,2>": "-1", "<18,13,2>": "-1",
@ -3635,7 +3635,7 @@
"<19,11,1>": "0x0", "<19,11,1>": "0x0",
"<19,11,2>": "0x80000000" "<19,11,2>": "0x80000000"
}, },
"<19,12>": "15", "<19,12>": "17",
"<19,13>": { "<19,13>": {
"<19,13,1>": "-1", "<19,13,1>": "-1",
"<19,13,2>": "-1", "<19,13,2>": "-1",
@ -3785,7 +3785,7 @@
"<20,11,1>": "0x0", "<20,11,1>": "0x0",
"<20,11,2>": "0x80000000" "<20,11,2>": "0x80000000"
}, },
"<20,12>": "16", "<20,12>": "18",
"<20,13>": { "<20,13>": {
"<20,13,1>": "-1", "<20,13,1>": "-1",
"<20,13,2>": "-1", "<20,13,2>": "-1",

3
LSL2/STPROC/PRINT_REACTOR_MAINT1.txt
View File

@ -34,6 +34,7 @@ END
Params = Dialog_Box( 'REACTOR_LOG_SRPT1', @WINDOW, '*CENTER' ) Params = Dialog_Box( 'REACTOR_LOG_SRPT1', @WINDOW, '*CENTER' )
IF Params = 'CANCEL' OR Params = '' THEN IF Params = 'CANCEL' OR Params = '' THEN
RETURN RETURN
END END
@ -129,6 +130,8 @@ PageSetup = '1' ;* Landscape = 1
PrintSetup = '2' ;* Preview Normal PrintSetup = '2' ;* Preview Normal
PrintPath = Printer_Select() PrintPath = Printer_Select()
If PrintPath EQ '' then return
stat = Set_Printer('INIT',FileName,Title,PageInfo,PageSetup,PrintSetup,PrintPath) stat = Set_Printer('INIT',FileName,Title,PageInfo,PageSetup,PrintSetup,PrintPath)
IF stat < 0 THEN GOTO OIPrintErr IF stat < 0 THEN GOTO OIPrintErr

10
LSL2/STPROC/TEST_DANIEL3.txt
View File

@ -93,9 +93,17 @@ $Insert PS_EQUATES
* equ REV_CREATE_ENGINE_NO_UI$ to 0x040 * equ REV_CREATE_ENGINE_NO_UI$ to 0x040
Main: Main:
* Messaging_Services('SendMessage', 'RunProcedure', 'Request', '', 'All', 'RTP27,REACTOR_SERVICES', '', '', '')
debug debug
* LoadInstAckReq = Xlate('RDS', 646209, 'LOAD_INST_ACK_REQ', 'X')
DefPrinter = Get_Printer( "CURRENTDEVICE")
Printers = Get_Printer( "DEVICES" )
* SelPrinter = Printer_Select()
TaskID = RTI_Task_Submit('', 'TEST_DANIEL2', '', '', '') * Stage = Rds_Services('GetCurrentStage', 646209)
* CurrStage = Xlate('RDS', 646209, 'CURR_STAGE', 'X')
*TaskID = RTI_Task_Submit('', 'TEST_DANIEL2', '', '', '')
* Slots = Xlate('WM_OUT', '173011*1*2', 'SLOT_WAFER_ID', 'X') * Slots = Xlate('WM_OUT', '173011*1*2', 'SLOT_WAFER_ID', 'X')
* RDSNos = Xlate('WM_OUT', '173011*1*3', 'RDS', 'X') * RDSNos = Xlate('WM_OUT', '173011*1*3', 'RDS', 'X')

27
SYSPROG/STPROC/PRINTSETUP.txt
View File

@ -15,7 +15,7 @@ function PrintSetup(Instruction, p1, p2, p3)
* *
****************************************************************************** ******************************************************************************
declare function Get_Property, SRP_Get_Printers, SRP_Array, Database_Services declare function Get_Property, SRP_Get_Printers, SRP_Array, Database_Services, Get_Printer
declare subroutine Set_Property, SendMessage, Dialog_Box, Start_Window declare subroutine Set_Property, SendMessage, Dialog_Box, Start_Window
declare subroutine WritePrivateProfileString, DefPrtr, SetupP declare subroutine WritePrivateProfileString, DefPrtr, SetupP
declare subroutine GetPrivateProfileSection, GetPrivateProfileString declare subroutine GetPrivateProfileSection, GetPrivateProfileString
@ -33,7 +33,6 @@ equ WM_WININICHANGE$ to 26
equ HWND_BROADCAST$ to 65535 equ HWND_BROADCAST$ to 65535
equ MAX_SIZE$ to 4096 equ MAX_SIZE$ to 4096
if assigned(Instruction) then if assigned(Instruction) then
if len(Instruction) and num(Instruction) else if len(Instruction) and num(Instruction) else
Instruction = 1 Instruction = 1
@ -71,25 +70,10 @@ return
* get the list of printers * get the list of printers
************************** **************************
Get: Get:
//TODO - flag used at cutover on 6/7/22. Once sure all is working properly, remove flag from APP_INFO
//as well as all references and old code below
UseSRPGetPrinters = Database_Services('ReadDataRow', 'APP_INFO', 'USE_SRP_GET_PRINTERS') UseSRPGetPrinters = Database_Services('ReadDataRow', 'APP_INFO', 'USE_SRP_GET_PRINTERS')
If @User4 EQ 'DAN_CR' then If UseSRPGetPrinters then
result = SRP_Get_Printers('Local')
result2 = SRP_Get_Printers('Remote')
result3 = SRP_Get_Printers('Connect')
result4 = SRP_Get_Printers('Default')
List = ''
Current = ''
Printers = result:@fm:result2:@fm:result3:@fm:result4
Printers = SRP_Array('Clean', Printers, 'TrimAndMakeUnique', @FM)
//Printers = SRP_Array('SortSimpleList', Printers, 'AscendingText', @FM)
Ret = count(Printers, @fm) + (Printers # "")
Default = result4
transfer Printers to p2
transfer Default to p3
end else if UseSRPGetPrinters then
result = SRP_Get_Printers('Local') result = SRP_Get_Printers('Local')
result2 = SRP_Get_Printers('Remote') result2 = SRP_Get_Printers('Remote')
result3 = SRP_Get_Printers('Connect') result3 = SRP_Get_Printers('Connect')
@ -156,10 +140,6 @@ return
********************* *********************
Create: Create:
* get list of printers and the current (ie. default) printer * get list of printers and the current (ie. default) printer
* IF @User4 NE 'DAN_CR' then
* cPrinters = PrintSetup(PRN_GET$, "", List, Current)
* Printers = List
* end else
result = SRP_Get_Printers('Local') result = SRP_Get_Printers('Local')
result2 = SRP_Get_Printers('Remote') result2 = SRP_Get_Printers('Remote')
result3 = SRP_Get_Printers('Connect') result3 = SRP_Get_Printers('Connect')
@ -169,7 +149,6 @@ Create:
Current = '' Current = ''
cPrinters = result:@fm:result2:@fm:result3:@fm:result4 cPrinters = result:@fm:result2:@fm:result3:@fm:result4
* end
for i = 1 to cPrinters for i = 1 to cPrinters
List<i> = field(List<i>, ",", 1): " on ": field(List<i>, ",", 3) List<i> = field(List<i>, ",", 1): " on ": field(List<i>, ",", 3)
next i next i