From 1c69c61d16ae8fb19cf616c1d86cff20b56fce49 Mon Sep 17 00:00:00 2001 From: "Infineon\\StieberD" Date: Wed, 18 Sep 2024 14:38:58 -0700 Subject: [PATCH] fixed psn and reactor log query forms --- .../PROD_SPEC_QUERY.PERFORM_QUERY_BUTTON.json | 2 +- .../PROD_SPEC_QUERY.CUSTOMER_INFO.json | 2 +- .../REACTOR_LOG_SRPT1.REACT_PROBS_CAT.json | 2 +- .../REACTOR_LOG_SRPT1.REACT_SERVS.json | 2 +- LSL2/OIWIN/REACTOR_LOG_SRPT1.json | 204 +++++++++++++++--- LSL2/POPUP/PSN_QUERY.json | 16 +- LSL2/STPROC/PROD_SPEC_EVENTS.txt | 12 +- 7 files changed, 200 insertions(+), 40 deletions(-) diff --git a/LSL2/OIEVENT/CLICK/PROD_SPEC_QUERY.PERFORM_QUERY_BUTTON.json b/LSL2/OIEVENT/CLICK/PROD_SPEC_QUERY.PERFORM_QUERY_BUTTON.json index aaa8ed9..85ad54c 100644 --- a/LSL2/OIEVENT/CLICK/PROD_SPEC_QUERY.PERFORM_QUERY_BUTTON.json +++ b/LSL2/OIEVENT/CLICK/PROD_SPEC_QUERY.PERFORM_QUERY_BUTTON.json @@ -5,7 +5,7 @@ }, "body": { "record1": { - "<1>": "declare subroutine btree.extract, update_index, rlist, end_dialog\r\ndeclare function msg, key_sort, utility, ex_vm_rem\r\n\r\n$insert lsl_users_equ\r\n$insert msg_equates\r\n\r\n\r\nopen 'DICT.PROD_SPEC' to DictProdSpecTable else\r\n Void = msg( '', 'Unable to open DICT.PROD_SPEC...' )\r\n return 0\r\nend\r\n\r\nSearchStr = ''\r\nCustIds\t\t= .customer_info->array<1>\r\nPartNums\t= .part_nums->array\r\nActive\t\t= .active_check->check\r\nInactive\t= .inactive_check->check\r\nHold\t\t= Get_Property(@WINDOW:'.HOLD_CHECK','CHECK')\r\n\r\n*\r\nPreProd = .preprod->check\r\nProd = .prod->check\r\nQual = .qual->check\r\nPreQual = .prequal->check\r\n*\r\nSiGe = .rt_sige->check\r\nEpsilon = .rt_epsilon->check\r\nASMPlus\t= .rt_asm_plus->check\r\nEpiPro = .rt_epipro->check\r\nHTR = .rt_htr->check\r\n*\r\n\r\nCustIds = ex_vm_rem(CustIds)\r\nPartNums = ex_vm_rem(PartNums)\r\nif CustIds then\r\n *SearchStr<-1> = 'CUST_NO_USAGE':@vm:CustIds\r\n SearchStr<-1> = 'PROD_VER_CUST_NO':@vm:CustIds\t\t;* Changed from 'CUST_NO' on 12/18/2014 jch\r\nend\r\nif PartNums then\r\n SearchStr<-1> = 'CUST_PART_NO':@vm:PartNums\r\nend\r\nStatusVar = ''\r\nif Active then\r\n StatusVar<1,-1> = 'A'\r\nend\r\nif Inactive then\r\n StatusVar<1,-1> = 'I'\r\nend\r\n\r\nIF Hold THEN\r\n\tStatusVar<1,-1> = 'H'\r\nEND\r\n\r\nif StatusVar <> '' then\r\n SearchStr<-1> = 'STATUS':@vm:StatusVar\r\nend\r\n*\r\nSpecTypeVar = ''\r\nif PreProd then\r\n SpecTypeVar<1,-1> = 'E'\r\nend\r\nif Prod then\r\n SpecTypeVar<1,-1> = 'P'\r\nend\r\nif Qual then\r\n SpecTypeVar<1,-1> = 'Q'\r\nend\r\nif PreQual then\r\n SpecTypeVar<1,-1> = 'U'\r\nend\r\nif SpecTypeVar <> '' then\r\n SearchStr<-1> = 'SPEC_TYPE':@vm:SpecTypeVar\r\nend\r\n*\r\nRTypeVar = ''\r\n\r\nif SiGe then\tRTypeVar<1,-1> = 'SIG'\r\nif Epsilon then\tRTypeVar<1,-1> = 'ASM'\r\nIF ASMPlus THEN\tRTypeVar<1,-1> = 'ASM+'\r\nif EpiPro then\tRTypeVar<1,-1> = 'EPP'\r\nif HTR then\t\tRTypeVar<1,-1> = 'HTR'\r\n\r\nif RTypeVar <> '' then\r\n\tSearchStr<-1> = 'REACTOR_TYPE':@vm:RTypeVar\r\nend\r\n\r\nif SearchStr then\r\n SearchStr := @fm\r\n Void = utility( 'CURSOR', 'H' )\r\n \r\n * do a btree.extract\r\n\r\n \r\n btree.extract( SearchStr, 'PROD_SPEC', DictProdSpecTable, Keys, '', Flag )\r\n if Flag <> 0 then\r\n Void = msg( '', 'Error while extracting PROD_SPEC records...' )\r\n return 0\r\n end\r\n \r\n if Keys then\r\n convert @vm to @fm in Keys\r\n * Keys = key_sort( Keys, 'PROD_SPEC', 'CUST_NAME':@fm:'#REV_DATE', 1 )\r\n Keys = key_sort( Keys, 'PROD_SPEC', 'CUST_NAME', 1 )\r\n \r\n end_dialog( @window, Keys )\r\n \r\n end else\r\n MsgInfo = ''\r\n MsgInfo = 'No records found meeting your criteria...' \r\n MsgInfo = '!'\r\n Void = msg( '', MsgInfo )\r\n end\r\n \r\n Void = utility( 'CURSOR', 'A' )\r\nend else\r\n MsgInfo = ''\r\n MsgInfo = 'You have not entered any search criteria...' \r\n MsgInfo = '!'\r\n Void = msg( '', MsgInfo )\r\nend\r\nreturn 0\r\n\r\n" + "<1>": "declare subroutine btree.extract, update_index, rlist, end_dialog\r\ndeclare function msg, key_sort, utility, ex_vm_rem\r\n\r\n$insert lsl_users_equ\r\n$insert msg_equates\r\n\r\nopen 'DICT.PROD_SPEC' to DictProdSpecTable else\r\n Void = msg( '', 'Unable to open DICT.PROD_SPEC...' )\r\n return 0\r\nend\r\n\r\nSearchStr = ''\r\nCustIds\t\t= .customer_info->array<1>\r\nPartNums\t= .part_nums->array\r\nActive\t\t= .active_check->check\r\nInactive\t= .inactive_check->check\r\nHold\t\t= Get_Property(@WINDOW:'.HOLD_CHECK','CHECK')\r\n\r\n*\r\nPreProd = .preprod->check\r\nProd = .prod->check\r\nQual = .qual->check\r\nPreQual = .prequal->check\r\n*\r\nSiGe = .rt_sige->check\r\nEpsilon = .rt_epsilon->check\r\nASMPlus\t= .rt_asm_plus->check\r\nEpiPro = .rt_epipro->check\r\nHTR = .rt_htr->check\r\n*\r\n\r\nCustIds = ex_vm_rem(CustIds)\r\nPartNums = ex_vm_rem(PartNums)\r\nif CustIds then\r\n *SearchStr<-1> = 'CUST_NO_USAGE':@vm:CustIds\r\n SearchStr<-1> = 'PROD_VER_CUST_NO':@vm:CustIds\t\t;* Changed from 'CUST_NO' on 12/18/2014 jch\r\nend\r\nif PartNums then\r\n SearchStr<-1> = 'CUST_PART_NO':@vm:PartNums\r\nend\r\nStatusVar = ''\r\nif Active then\r\n StatusVar<1,-1> = 'A'\r\nend\r\nif Inactive then\r\n StatusVar<1,-1> = 'I'\r\nend\r\n\r\nIF Hold THEN\r\n\tStatusVar<1,-1> = 'H'\r\nEND\r\n\r\nif StatusVar <> '' then\r\n SearchStr<-1> = 'STATUS':@vm:StatusVar\r\nend\r\n*\r\nSpecTypeVar = ''\r\nif PreProd then\r\n SpecTypeVar<1,-1> = 'E'\r\nend\r\nif Prod then\r\n SpecTypeVar<1,-1> = 'P'\r\nend\r\nif Qual then\r\n SpecTypeVar<1,-1> = 'Q'\r\nend\r\nif PreQual then\r\n SpecTypeVar<1,-1> = 'U'\r\nend\r\nif SpecTypeVar <> '' then\r\n SearchStr<-1> = 'SPEC_TYPE':@vm:SpecTypeVar\r\nend\r\n*\r\nRTypeVar = ''\r\n\r\nif SiGe then\tRTypeVar<1,-1> = 'SIG'\r\nif Epsilon then\tRTypeVar<1,-1> = 'ASM'\r\nIF ASMPlus THEN\tRTypeVar<1,-1> = 'ASM+'\r\nif EpiPro then\tRTypeVar<1,-1> = 'EPP'\r\nif HTR then\t\tRTypeVar<1,-1> = 'HTR'\r\n\r\nif RTypeVar <> '' then\r\n\tSearchStr<-1> = 'REACTOR_TYPE':@vm:RTypeVar\r\nend\r\n\r\nif SearchStr then\r\n SearchStr := @fm\r\n Void = utility( 'CURSOR', 'H' )\r\n \r\n * do a btree.extract\r\n\r\n \r\n btree.extract( SearchStr, 'PROD_SPEC', DictProdSpecTable, Keys, '', Flag )\r\n if Flag <> 0 then\r\n Void = msg( '', 'Error while extracting PROD_SPEC records...' )\r\n return 0\r\n end\r\n \r\n if Keys then\r\n convert @vm to @fm in Keys\r\n * Keys = key_sort( Keys, 'PROD_SPEC', 'CUST_NAME':@fm:'#REV_DATE', 1 )\r\n Keys = key_sort( Keys, 'PROD_SPEC', 'CUST_NAME', 1 )\r\n \r\n end_dialog( @window, Keys )\r\n \r\n end else\r\n MsgInfo = ''\r\n MsgInfo = 'No records found meeting your criteria...' \r\n MsgInfo = '!'\r\n Void = msg( '', MsgInfo )\r\n end\r\n \r\n Void = utility( 'CURSOR', 'A' )\r\nend else\r\n MsgInfo = ''\r\n MsgInfo = 'You have not entered any search criteria...' \r\n MsgInfo = '!'\r\n Void = msg( '', MsgInfo )\r\nend\r\nreturn 0\r\n\r\n" } } } \ No newline at end of file diff --git a/LSL2/OIEVENT/POSCHANGED/PROD_SPEC_QUERY.CUSTOMER_INFO.json b/LSL2/OIEVENT/POSCHANGED/PROD_SPEC_QUERY.CUSTOMER_INFO.json index 9b143c3..9c70619 100644 --- a/LSL2/OIEVENT/POSCHANGED/PROD_SPEC_QUERY.CUSTOMER_INFO.json +++ b/LSL2/OIEVENT/POSCHANGED/PROD_SPEC_QUERY.CUSTOMER_INFO.json @@ -5,7 +5,7 @@ }, "body": { "record1": { - "<1>": "declare subroutine forward_event\r\ndeclare function editcell\r\n\r\nforward_event( NextColumn, NextRow )\r\nCurRow = .customer_info->rowdata\r\nCurRow<1,2> = oconv( CurRow<1,1>, '[XLATE_CONV,COMPANY*CO_NAME]' )\r\n.customer_info->rowdata = CurRow\r\nif NextColumn = 2 then\r\n NextRow += 1\r\n NextColumn = 1\r\n .customer_info->selpos = NextColumn:@fm:NextRow\r\nend\r\nif get_property( @window, '@JustClicked' ) then\r\n Void = editcell( CtrlEntId, '' )\r\n Void = set_property( @window, '@JustClicked' )\r\nend\r\nreturn 0\r\n" + "<1>": "declare subroutine forward_event\r\ndeclare function editcell\r\n\r\nforward_event( NextColumn, NextRow )\r\nCurRow = .customer_info->rowdata\r\nCurRow<1,2> = oconv( CurRow<1,1>, '[XLATE_CONV,COMPANY*CO_NAME]' )\r\n.customer_info->rowdata = CurRow<1,1> : @FM : CurRow<1,2>\r\nif NextColumn = 2 then\r\n NextRow += 1\r\n NextColumn = 1\r\n .customer_info->selpos = NextColumn:@fm:NextRow\r\nend\r\nif get_property( @window, '@JustClicked' ) then\r\n Void = editcell( CtrlEntId, '' )\r\n Void = set_property( @window, '@JustClicked' )\r\nend\r\nreturn 0\r\n" } } } \ No newline at end of file diff --git a/LSL2/OIEVENT/POSCHANGED/REACTOR_LOG_SRPT1.REACT_PROBS_CAT.json b/LSL2/OIEVENT/POSCHANGED/REACTOR_LOG_SRPT1.REACT_PROBS_CAT.json index b583e69..eae4893 100644 --- a/LSL2/OIEVENT/POSCHANGED/REACTOR_LOG_SRPT1.REACT_PROBS_CAT.json +++ b/LSL2/OIEVENT/POSCHANGED/REACTOR_LOG_SRPT1.REACT_PROBS_CAT.json @@ -5,7 +5,7 @@ }, "body": { "record1": { - "<1>": "declare subroutine forward_event\r\ndeclare function editcell\r\n\r\nforward_event( NextColumn, NextRow )\r\nCurRow = .react_probs_cat->rowdata\r\nCurRow<1,2> = oconv( CurRow<1,1>, '[XLATE_CONV,REACT_PROB_CAT*REACTOR_PROBLEM_CATEGORY]' )\r\n.react_probs_cat->rowdata = CurRow\r\nif NextColumn = 2 then\r\n NextRow += 1\r\n NextColumn = 1\r\n .react_probs_cat->selpos = NextColumn:@fm:NextRow\r\nend\r\nif get_property( @window, '@JustClicked' ) then\r\n Void = editcell( CtrlEntId, '' )\r\n Void = set_property( @window, '@JustClicked' )\r\nend\r\nRETURN 0" + "<1>": "declare subroutine forward_event\r\ndeclare function editcell\r\n\r\nforward_event( NextColumn, NextRow )\r\nCurRow = .react_probs_cat->rowdata\r\nCurRow<1,2> = oconv( CurRow<1,1>, '[XLATE_CONV,REACT_PROB_CAT*REACTOR_PROBLEM_CATEGORY]' )\r\n.react_probs_cat->rowdata = CurRow<1,1> : @FM : CurRow<1,2>\r\nif NextColumn = 2 then\r\n NextRow += 1\r\n NextColumn = 1\r\n .react_probs_cat->selpos = NextColumn:@fm:NextRow\r\nend\r\nif get_property( @window, '@JustClicked' ) then\r\n Void = editcell( CtrlEntId, '' )\r\n Void = set_property( @window, '@JustClicked' )\r\nend\r\nRETURN 0" } } } \ No newline at end of file diff --git a/LSL2/OIEVENT/POSCHANGED/REACTOR_LOG_SRPT1.REACT_SERVS.json b/LSL2/OIEVENT/POSCHANGED/REACTOR_LOG_SRPT1.REACT_SERVS.json index 30cea38..d733cf3 100644 --- a/LSL2/OIEVENT/POSCHANGED/REACTOR_LOG_SRPT1.REACT_SERVS.json +++ b/LSL2/OIEVENT/POSCHANGED/REACTOR_LOG_SRPT1.REACT_SERVS.json @@ -5,7 +5,7 @@ }, "body": { "record1": { - "<1>": "declare subroutine forward_event\r\ndeclare function editcell\r\n\r\nforward_event( NextColumn, NextRow )\r\nCurRow = .react_servs->rowdata\r\nCurRow<1,2> = oconv( CurRow<1,1>, '[XLATE_CONV,REACT_SERVS*DESCRIPTION]' )\r\n.react_servs->rowdata = CurRow\r\nif NextColumn = 2 then\r\n NextRow += 1\r\n NextColumn = 1\r\n .react_servs->selpos = NextColumn:@fm:NextRow\r\nend\r\nif get_property( @window, '@JustClicked' ) then\r\n Void = editcell( CtrlEntId, '' )\r\n Void = set_property( @window, '@JustClicked' )\r\nend\r\nRETURN 0" + "<1>": "declare subroutine forward_event\r\ndeclare function editcell\r\n\r\nforward_event( NextColumn, NextRow )\r\nCurRow = .react_servs->rowdata\r\nCurRow<1,2> = oconv( CurRow<1,1>, '[XLATE_CONV,REACT_SERVS*DESCRIPTION]' )\r\n.react_servs->rowdata = CurRow<1,1> : @FM : CurRow<1,2>\r\nif NextColumn = 2 then\r\n NextRow += 1\r\n NextColumn = 1\r\n .react_servs->selpos = NextColumn:@fm:NextRow\r\nend\r\nif get_property( @window, '@JustClicked' ) then\r\n Void = editcell( CtrlEntId, '' )\r\n Void = set_property( @window, '@JustClicked' )\r\nend\r\nRETURN 0" } } } \ No newline at end of file diff --git a/LSL2/OIWIN/REACTOR_LOG_SRPT1.json b/LSL2/OIWIN/REACTOR_LOG_SRPT1.json index 8dd8ca5..80d64d3 100644 --- a/LSL2/OIWIN/REACTOR_LOG_SRPT1.json +++ b/LSL2/OIWIN/REACTOR_LOG_SRPT1.json @@ -2195,9 +2195,9 @@ "<13,3>": "EDITTABLE", "<13,4>": "REACTOR_LOG_SRPT1", "<13,5>": "36", - "<13,6>": "165", + "<13,6>": "164", "<13,7>": "390", - "<13,8>": "31", + "<13,8>": "48", "<13,9>": "", "<13,10>": { "<13,10,1>": "0x560001C1", @@ -2264,17 +2264,23 @@ "<13,20>": "", "<13,21>": "", "<13,22>": "", - "<13,23>": "", - "<13,24>": "", + "<13,23>": { + "<13,23,1>": "", + "<13,23,2>": "" + }, + "<13,24>": { + "<13,24,1>": "", + "<13,24,2>": "" + }, "<13,25>": "", "<13,26>": "", "<13,27>": "", "<13,28>": { - "<13,28,1>": "[KEY_CONV,REACT_PROB_CAT|REACTOR_PROBLEM_CATEGORY_XREF|SHOW_REACT_PROB_CAT]", + "<13,28,1>": "[KEY_CONV,REACT_PROB_CAT~REACTOR_PROBLEM_CATEGORY_XREF~SHOW_REACT_PROB_CAT]", "<13,28,2>": "<>" }, "<13,29>": { - "<13,29,1>": "[KEY_CONV,REACT_PROB_CAT|REACTOR_PROBLEM_CATEGORY_XREF|SHOW_REACT_PROB_CAT]", + "<13,29,1>": "[KEY_CONV,REACT_PROB_CAT~REACTOR_PROBLEM_CATEGORY_XREF~SHOW_REACT_PROB_CAT]", "<13,29,2>": "<>" }, "<13,30>": { @@ -2296,6 +2302,14 @@ "<13,35,2>": { "<13,35,2,1>": "", "<13,35,2,2>": "" + }, + "<13,35,3>": { + "<13,35,3,1>": "", + "<13,35,3,2>": "" + }, + "<13,35,4>": { + "<13,35,4,1>": "", + "<13,35,4,2>": "" } }, "<13,36>": "", @@ -2323,8 +2337,8 @@ "<13,41,14>": "1" }, "<13,42>": { - "<13,42,1>": "16384", - "<13,42,2>": "16386" + "<13,42,1>": "2147500032", + "<13,42,2>": "2147500034" }, "<13,43>": { "<13,43,1>": "116", @@ -2344,10 +2358,22 @@ "<13,52>": "", "<13,53>": "", "<13,54>": "", - "<13,55>": "", - "<13,56>": "", - "<13,57>": "", - "<13,58>": "", + "<13,55>": { + "<13,55,1>": "", + "<13,55,2>": "" + }, + "<13,56>": { + "<13,56,1>": "", + "<13,56,2>": "" + }, + "<13,57>": { + "<13,57,1>": "", + "<13,57,2>": "" + }, + "<13,58>": { + "<13,58,1>": "", + "<13,58,2>": "" + }, "<13,59>": "", "<13,60>": { "<13,60,1>": "16", @@ -2386,11 +2412,84 @@ "<13,91>": "", "<13,92>": "", "<13,93>": "", - "<13,94>": "", - "<13,95>": "", - "<13,96>": "", - "<13,97>": "", - "<13,98>": "", + "<13,94>": { + "<13,94,1>": "", + "<13,94,2>": "" + }, + "<13,95>": { + "<13,95,1>": "", + "<13,95,2>": "" + }, + "<13,96>": { + "<13,96,1>": { + "<13,96,1,1>": "", + "<13,96,1,2>": "" + }, + "<13,96,2>": { + "<13,96,2,1>": "", + "<13,96,2,2>": "" + } + }, + "<13,97>": { + "<13,97,1>": { + "<13,97,1,1>": "MS Dialog", + "<13,97,1,2>": "-11", + "<13,97,1,3>": "700", + "<13,97,1,4>": "0", + "<13,97,1,5>": "0", + "<13,97,1,6>": "0", + "<13,97,1,7>": "0", + "<13,97,1,8>": "34", + "<13,97,1,9>": "0", + "<13,97,1,10>": "1", + "<13,97,1,11>": "2", + "<13,97,1,12>": "1" + }, + "<13,97,2>": { + "<13,97,2,1>": "MS Dialog", + "<13,97,2,2>": "-11", + "<13,97,2,3>": "700", + "<13,97,2,4>": "0", + "<13,97,2,5>": "0", + "<13,97,2,6>": "0", + "<13,97,2,7>": "0", + "<13,97,2,8>": "34", + "<13,97,2,9>": "0", + "<13,97,2,10>": "1", + "<13,97,2,11>": "2", + "<13,97,2,12>": "1" + } + }, + "<13,98>": { + "<13,98,1>": { + "<13,98,1,1>": "MS Dialog", + "<13,98,1,2>": "-11", + "<13,98,1,3>": "700", + "<13,98,1,4>": "0", + "<13,98,1,5>": "0", + "<13,98,1,6>": "0", + "<13,98,1,7>": "0", + "<13,98,1,8>": "34", + "<13,98,1,9>": "0", + "<13,98,1,10>": "1", + "<13,98,1,11>": "2", + "<13,98,1,12>": "1" + }, + "<13,98,2>": { + "<13,98,2,1>": "MS Dialog", + "<13,98,2,2>": "-11", + "<13,98,2,3>": "700", + "<13,98,2,4>": "0", + "<13,98,2,5>": "0", + "<13,98,2,6>": "0", + "<13,98,2,7>": "0", + "<13,98,2,8>": "34", + "<13,98,2,9>": "0", + "<13,98,2,10>": "1", + "<13,98,2,11>": "2", + "<13,98,2,12>": "1" + } + }, "<13,99>": { "<13,99,1>": { "<13,99,1,1>": "-2", @@ -2604,7 +2703,7 @@ "<14,3>": "PUSHBMP", "<14,4>": "REACTOR_LOG_SRPT1", "<14,5>": "12", - "<14,6>": "166", + "<14,6>": "164", "<14,7>": "22", "<14,8>": "22", "<14,9>": "", @@ -2758,10 +2857,10 @@ "<15,2>": "", "<15,3>": "EDITTABLE", "<15,4>": "REACTOR_LOG_SRPT1", - "<15,5>": "34", - "<15,6>": "220", - "<15,7>": "390", - "<15,8>": "31", + "<15,5>": "36", + "<15,6>": "242", + "<15,7>": "392", + "<15,8>": "48", "<15,9>": "", "<15,10>": { "<15,10,1>": "0x560001C1", @@ -2834,11 +2933,11 @@ "<15,26>": "", "<15,27>": "", "<15,28>": { - "<15,28,1>": "[KEY_CONV,REACT_SERVS|DESCRIPTION_XREF|SHOW_REACT_SERVS]", + "<15,28,1>": "[KEY_CONV,REACT_SERVS~DESCRIPTION_XREF~SHOW_REACT_SERVS]", "<15,28,2>": "<>" }, "<15,29>": { - "<15,29,1>": "[KEY_CONV,REACT_SERVS|DESCRIPTION_XREF|SHOW_REACT_SERVS]", + "<15,29,1>": "[KEY_CONV,REACT_SERVS~DESCRIPTION_XREF~SHOW_REACT_SERVS]", "<15,29,2>": "<>" }, "<15,30>": { @@ -2860,6 +2959,14 @@ "<15,35,2>": { "<15,35,2,1>": "", "<15,35,2,2>": "" + }, + "<15,35,3>": { + "<15,35,3,1>": "", + "<15,35,3,2>": "" + }, + "<15,35,4>": { + "<15,35,4,1>": "", + "<15,35,4,2>": "" } }, "<15,36>": "", @@ -2887,7 +2994,7 @@ "<15,41,14>": "1" }, "<15,42>": { - "<15,42,1>": "16384", + "<15,42,1>": "2147500032", "<15,42,2>": "16386" }, "<15,43>": { @@ -2952,9 +3059,44 @@ "<15,93>": "", "<15,94>": "", "<15,95>": "", - "<15,96>": "", - "<15,97>": "", - "<15,98>": "", + "<15,96>": { + "<15,96,1>": { + "<15,96,1,1>": "", + "<15,96,1,2>": "" + } + }, + "<15,97>": { + "<15,97,1>": { + "<15,97,1,1>": "MS Dialog", + "<15,97,1,2>": "-11", + "<15,97,1,3>": "700", + "<15,97,1,4>": "0", + "<15,97,1,5>": "0", + "<15,97,1,6>": "0", + "<15,97,1,7>": "0", + "<15,97,1,8>": "34", + "<15,97,1,9>": "0", + "<15,97,1,10>": "1", + "<15,97,1,11>": "2", + "<15,97,1,12>": "1" + } + }, + "<15,98>": { + "<15,98,1>": { + "<15,98,1,1>": "MS Dialog", + "<15,98,1,2>": "-11", + "<15,98,1,3>": "700", + "<15,98,1,4>": "0", + "<15,98,1,5>": "0", + "<15,98,1,6>": "0", + "<15,98,1,7>": "0", + "<15,98,1,8>": "34", + "<15,98,1,9>": "0", + "<15,98,1,10>": "1", + "<15,98,1,11>": "2", + "<15,98,1,12>": "1" + } + }, "<15,99>": { "<15,99,1>": { "<15,99,1,1>": "-2", @@ -3168,7 +3310,7 @@ "<16,3>": "PUSHBMP", "<16,4>": "REACTOR_LOG_SRPT1", "<16,5>": "12", - "<16,6>": "221", + "<16,6>": "242", "<16,7>": "22", "<16,8>": "22", "<16,9>": "", @@ -3623,7 +3765,7 @@ "<19,3>": "STATIC", "<19,4>": "REACTOR_LOG_SRPT1", "<19,5>": "64", - "<19,6>": "205", + "<19,6>": "226", "<19,7>": "62", "<19,8>": "13", "<19,9>": "Serv ID(s):", @@ -3773,7 +3915,7 @@ "<20,3>": "STATIC", "<20,4>": "REACTOR_LOG_SRPT1", "<20,5>": "198", - "<20,6>": "204", + "<20,6>": "225", "<20,7>": "132", "<20,8>": "13", "<20,9>": "Service(s) Description:", diff --git a/LSL2/POPUP/PSN_QUERY.json b/LSL2/POPUP/PSN_QUERY.json index 27eb4a0..3887e91 100644 --- a/LSL2/POPUP/PSN_QUERY.json +++ b/LSL2/POPUP/PSN_QUERY.json @@ -9,7 +9,7 @@ "<2>": "-2", "<3>": "-1", "<4>": "40", - "<5>": "16777215", + "<5>": "-2", "<6>": { "<6,1>": { "<6,1,1>": "Tahoma", @@ -95,11 +95,21 @@ "<28>": "", "<29>": "0", "<30>": "1", - "<31>": "0", + "<31>": "1", "<32>": "0", "<33>": "1", "<34>": "16777215", - "<35>": "16777215" + "<35>": "16777215", + "<36>": "", + "<37>": "", + "<38>": "", + "<39>": "", + "<40>": "-2", + "<41>": "1000", + "<42>": "", + "<43>": "", + "<44>": "", + "<45>": "" } } } \ No newline at end of file diff --git a/LSL2/STPROC/PROD_SPEC_EVENTS.txt b/LSL2/STPROC/PROD_SPEC_EVENTS.txt index a2308da..1cea964 100644 --- a/LSL2/STPROC/PROD_SPEC_EVENTS.txt +++ b/LSL2/STPROC/PROD_SPEC_EVENTS.txt @@ -37,6 +37,7 @@ $Insert APP_INSERTS $Insert EVENT_SETUP $Insert PROD_SPEC_EQUATES $Insert SECURITY_RIGHTS_EQU +$Insert MSG_EQUATES Declare function NextKey, Error_Services, Security_Check Declare subroutine Database_Services, Comm_Prod_Spec, Security_Err_Msg @@ -88,8 +89,15 @@ end event Event PUB_LU_PSN.CLICK() - - SelPSN = Popup(@Window, '', 'PSN_QUERY') + + Def = "" + Def = '-2' + Def = '-2' + Def = "Loading all PSNs. Please wait..." + Def = "U" + MsgUp = Msg(@window, Def) ;* display the processing message + SelPSN = Popup(@Window, '', 'PSN_QUERY') + Msg(@window, MsgUp) ;* take down the processing message If SelPSN NE '' then Set_Property(@Window:'.PROD_SPEC_ID', 'TEXT', SelPSN) Post_Event(@Window, 'READ')