From c50e536791db244f4820c6ede4e8d31396d83e1f Mon Sep 17 00:00:00 2001 From: "Ouellette Jonathan (CSC FI SPS MESLEO)" Date: Thu, 20 Mar 2025 21:54:31 +0100 Subject: [PATCH] Merged PR 13428: Added in override logging for test wafer tracking. Refactored Override logging Added in override logging for test wafer tracking. Refactored Override logging --- LSL2/OIWIN/OVERRIDE_REPORT.json | 4456 +++++++++++++++++++----- LSL2/STPROC/OVERRIDE_LOG_SERVICES.txt | 66 +- LSL2/STPROC/OVERRIDE_REPORT_EVENTS.txt | 261 +- LSL2/STPROC/RDS_EVENTS.txt | 19 +- 4 files changed, 3693 insertions(+), 1109 deletions(-) diff --git a/LSL2/OIWIN/OVERRIDE_REPORT.json b/LSL2/OIWIN/OVERRIDE_REPORT.json index aa11838..0c90dd0 100644 --- a/LSL2/OIWIN/OVERRIDE_REPORT.json +++ b/LSL2/OIWIN/OVERRIDE_REPORT.json @@ -6,7 +6,7 @@ "body": { "record1": { "<1>": "1010", - "<2>": "24", + "<2>": "26", "<3>": "" }, "record2": { @@ -17,20 +17,24 @@ "<1,4>": "", "<1,5>": "154", "<1,6>": "11", - "<1,7>": "-1222", + "<1,7>": "-1250", "<1,8>": "-761", "<1,9>": "Override Log", "<1,10>": { "<1,10,1>": "0x84CF0000", - "<1,10,2>": "0x0" + "<1,10,2>": "0x100" }, "<1,11>": { - "<1,11,1>": "0x100", + "<1,11,1>": "0x8100", "<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,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,31 +120,102 @@ "<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": { "<1>": { - "<1,1>": "ITEM_FILTER", + "<1,1>": "EDL_USER_ID", "<1,2>": "", "<1,3>": "EDITFIELD", "<1,4>": "OVERRIDE_REPORT", - "<1,5>": "520", - "<1,6>": "50", - "<1,7>": "150", - "<1,8>": "30", + "<1,5>": "228", + "<1,6>": "140", + "<1,7>": "144", + "<1,8>": "32", "<1,9>": "", "<1,10>": { - "<1,10,1>": "0x5E000080", + "<1,10,1>": "0x56000080", "<1,10,2>": "0x200" }, "<1,11>": { - "<1,11,1>": "0x4", + "<1,11,1>": "0x0", "<1,11,2>": "0x80000000" }, - "<1,12>": "1", - "<1,13>": "-2", - "<1,14>": "0", + "<1,12>": "26", + "<1,13>": { + "<1,13,1>": "-2", + "<1,13,2>": "-2", + "<1,13,3>": "" + }, + "<1,14>": "-2", "<1,15>": { "<1,15,1>": { "<1,15,1,1>": "Segoe UI", @@ -144,9 +229,7 @@ "<1,15,1,9>": "0", "<1,15,1,10>": "3", "<1,15,1,11>": "2", - "<1,15,1,12>": "1", - "<1,15,1,13>": "0", - "<1,15,1,14>": "0" + "<1,15,1,12>": "1" } }, "<1,16>": "", @@ -158,21 +241,21 @@ "<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>": "0xf0016008" - }, + "<1,32>": "", "<1,33>": "", "<1,34>": "", "<1,35>": "", - "<1,36>": "", + "<1,36>": { + "<1,36,1>": "0", + "<1,36,2>": "0" + }, "<1,37>": "", "<1,38>": "", "<1,39>": "", @@ -188,28 +271,88 @@ "<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>": "0", + "<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>": "OVERRIDE_TABLE", + "<2,1>": "GRP_6", "<2,2>": "", - "<2,3>": "EDITTABLE", + "<2,3>": "GROUPBOX", "<2,4>": "OVERRIDE_REPORT", - "<2,5>": "20", - "<2,6>": "350", - "<2,7>": "1189", - "<2,8>": "-18", - "<2,9>": "", + "<2,5>": "212", + "<2,6>": "115", + "<2,7>": "240", + "<2,8>": "60", + "<2,9>": "User Id", "<2,10>": { - "<2,10,1>": "0x560071D1", - "<2,10,2>": "0x200" + "<2,10,1>": "0x56000000", + "<2,10,2>": "0x0" }, "<2,11>": { - "<2,11,1>": "0x68000", - "<2,11,2>": "0x80000003" + "<2,11,1>": "0x0", + "<2,11,2>": "0x80000000" + }, + "<2,12>": "25", + "<2,13>": { + "<2,13,1>": "-1", + "<2,13,2>": "-1", + "<2,13,3>": "" }, - "<2,12>": "2", - "<2,13>": "-2", "<2,14>": "0", "<2,15>": { "<2,15,1>": { @@ -238,151 +381,26 @@ "<2,22>": "", "<2,23>": "", "<2,24>": "", - "<2,25>": "0", - "<2,26>": "0", + "<2,25>": "", + "<2,26>": "", "<2,27>": "", - "<2,28>": { - "<2,28,1>": "<>", - "<2,28,2>": "<>", - "<2,28,3>": "(DT)", - "<2,28,4>": "<>", - "<2,28,5>": "<>", - "<2,28,6>": "<>", - "<2,28,7>": "<>", - "<2,28,8>": "<>", - "<2,28,9>": "<>", - "<2,28,10>": "<>" - }, - "<2,29>": { - "<2,29,1>": "<>", - "<2,29,2>": "<>", - "<2,29,3>": "DT", - "<2,29,4>": "<>", - "<2,29,5>": "<>", - "<2,29,6>": "<>", - "<2,29,7>": "<>", - "<2,29,8>": "<>", - "<2,29,9>": "<>", - "<2,29,10>": "<>" - }, - "<2,30>": { - "<2,30,1>": "<>", - "<2,30,2>": "<>", - "<2,30,3>": "<>", - "<2,30,4>": "<>", - "<2,30,5>": "<>", - "<2,30,6>": "<>", - "<2,30,7>": "<>", - "<2,30,8>": "<>", - "<2,30,9>": "<>", - "<2,30,10>": "<>" - }, - "<2,31>": { - "<2,31,1>": "0", - "<2,31,2>": "0", - "<2,31,3>": "0", - "<2,31,4>": "0", - "<2,31,5>": "0", - "<2,31,6>": "0", - "<2,31,7>": "0", - "<2,31,8>": "0", - "<2,31,9>": "0", - "<2,31,10>": "0" - }, - "<2,32>": { - "<2,32,1>": "0x7e27e", - "<2,32,2>": "0xc001e208" - }, + "<2,28>": "", + "<2,29>": "", + "<2,30>": "", + "<2,31>": "", + "<2,32>": "", "<2,33>": "", "<2,34>": "", - "<2,35>": { - "<2,35,1>": "", - "<2,35,2>": "", - "<2,35,3>": "", - "<2,35,4>": "", - "<2,35,5>": "", - "<2,35,6>": "", - "<2,35,7>": "", - "<2,35,8>": "", - "<2,35,9>": "", - "<2,35,10>": "", - "<2,35,11>": "", - "<2,35,12>": "", - "<2,35,13>": "", - "<2,35,14>": "", - "<2,35,15>": "", - "<2,35,16>": "", - "<2,35,17>": "", - "<2,35,18>": "", - "<2,35,19>": "", - "<2,35,20>": "", - "<2,35,21>": "", - "<2,35,22>": "", - "<2,35,23>": "", - "<2,35,24>": "" - }, + "<2,35>": "", "<2,36>": "", "<2,37>": "", "<2,38>": "", - "<2,39>": { - "<2,39,1>": "80", - "<2,39,2>": "80", - "<2,39,3>": "80", - "<2,39,4>": "80", - "<2,39,5>": "255", - "<2,39,6>": "80", - "<2,39,7>": "80", - "<2,39,8>": "80", - "<2,39,9>": "80", - "<2,39,10>": "80" - }, - "<2,40>": "10", - "<2,41>": { - "<2,41,1>": "0", - "<2,41,2>": "", - "<2,41,3>": "", - "<2,41,4>": "", - "<2,41,5>": "", - "<2,41,6>": "", - "<2,41,7>": "", - "<2,41,8>": "40" - }, - "<2,42>": { - "<2,42,1>": "16384", - "<2,42,2>": "16384", - "<2,42,3>": "16384", - "<2,42,4>": "16384", - "<2,42,5>": "16384", - "<2,42,6>": "16384", - "<2,42,7>": "16384", - "<2,42,8>": "16384", - "<2,42,9>": "16384", - "<2,42,10>": "16384" - }, - "<2,43>": { - "<2,43,1>": "80", - "<2,43,2>": "300", - "<2,43,3>": "150", - "<2,43,4>": "100", - "<2,43,5>": "300", - "<2,43,6>": "80", - "<2,43,7>": "80", - "<2,43,8>": "80", - "<2,43,9>": "80", - "<2,43,10>": "80" - }, - "<2,44>": { - "<2,44,1>": "User", - "<2,44,2>": "Comment", - "<2,44,3>": "Date/Time", - "<2,44,4>": "Override type", - "<2,44,5>": "Override cause", - "<2,44,6>": "", - "<2,44,7>": "", - "<2,44,8>": "", - "<2,44,9>": "", - "<2,44,10>": "" - }, + "<2,39>": "", + "<2,40>": "", + "<2,41>": "", + "<2,42>": "", + "<2,43>": "", + "<2,44>": "", "<2,45>": "", "<2,46>": "", "<2,47>": "", @@ -398,39 +416,93 @@ "<2,57>": "", "<2,58>": "", "<2,59>": "", - "<2,60>": { - "<2,60,1>": "18", - "<2,60,2>": "18", - "<2,60,3>": "18", - "<2,60,4>": "18", - "<2,60,5>": "18", - "<2,60,6>": "18", - "<2,60,7>": "18", - "<2,60,8>": "18", - "<2,60,9>": "18", - "<2,60,10>": "18" - } + "<2,60>": "", + "<2,61>": "", + "<2,62>": "0", + "<2,63>": { + "<2,63,1>": "", + "<2,63,2>": "-2", + "<2,63,3>": "", + "<2,63,4>": "", + "<2,63,5>": "", + "<2,63,6>": "", + "<2,63,7>": "", + "<2,63,8>": "0" + }, + "<2,64>": { + "<2,64,1>": "", + "<2,64,2>": "", + "<2,64,3>": "" + }, + "<2,65>": "-2", + "<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>": "DATE_FROM", + "<3,1>": "ITEM_FILTER", "<3,2>": "", "<3,3>": "EDITFIELD", "<3,4>": "OVERRIDE_REPORT", - "<3,5>": "50", - "<3,6>": "120", - "<3,7>": "150", - "<3,8>": "20", + "<3,5>": "32", + "<3,6>": "140", + "<3,7>": "152", + "<3,8>": "32", "<3,9>": "", "<3,10>": { "<3,10,1>": "0x56000080", "<3,10,2>": "0x200" }, "<3,11>": { - "<3,11,1>": "0x0", + "<3,11,1>": "0x4", "<3,11,2>": "0x80000000" }, - "<3,12>": "3", - "<3,13>": "-2", + "<3,12>": "1", + "<3,13>": { + "<3,13,1>": "-2", + "<3,13,2>": "-2", + "<3,13,3>": "" + }, "<3,14>": "0", "<3,15>": { "<3,15,1>": { @@ -459,21 +531,21 @@ "<3,22>": "", "<3,23>": "", "<3,24>": "", - "<3,25>": "0", - "<3,26>": "0", + "<3,25>": "", + "<3,26>": "", "<3,27>": "", - "<3,28>": "(DT)", - "<3,29>": "DT", + "<3,28>": "<>", + "<3,29>": "<>", "<3,30>": "<>", "<3,31>": "0", - "<3,32>": { - "<3,32,1>": "0x7fffe", - "<3,32,2>": "0xc0016c08" - }, + "<3,32>": "", "<3,33>": "", "<3,34>": "", "<3,35>": "", - "<3,36>": "", + "<3,36>": { + "<3,36,1>": "0", + "<3,36,2>": "0" + }, "<3,37>": "", "<3,38>": "", "<3,39>": "", @@ -489,28 +561,88 @@ "<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,65>": "", + "<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>": "", + "<3,91>": "", + "<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>": "DATE_TO", + "<4,1>": "OVERRIDE_TABLE", "<4,2>": "", - "<4,3>": "EDITFIELD", + "<4,3>": "EDITTABLE", "<4,4>": "OVERRIDE_REPORT", - "<4,5>": "240", - "<4,6>": "120", - "<4,7>": "160", - "<4,8>": "20", + "<4,5>": "20", + "<4,6>": "350", + "<4,7>": "1189", + "<4,8>": "-18", "<4,9>": "", "<4,10>": { - "<4,10,1>": "0x56000080", + "<4,10,1>": "0x560071D1", "<4,10,2>": "0x200" }, "<4,11>": { - "<4,11,1>": "0x0", - "<4,11,2>": "0x80000000" + "<4,11,1>": "0x68020", + "<4,11,2>": "0x80000003" + }, + "<4,12>": "2", + "<4,13>": { + "<4,13,1>": "-2", + "<4,13,2>": "-2", + "<4,13,3>": "" }, - "<4,12>": "4", - "<4,13>": "-2", "<4,14>": "0", "<4,15>": { "<4,15,1>": { @@ -537,31 +669,498 @@ "<4,20>": "", "<4,21>": "", "<4,22>": "", - "<4,23>": "", - "<4,24>": "", - "<4,25>": "0", - "<4,26>": "0", - "<4,27>": "", - "<4,28>": "(DT)", - "<4,29>": "DT", - "<4,30>": "<>", - "<4,31>": "0", - "<4,32>": { - "<4,32,1>": "0x7fffe", - "<4,32,2>": "0xc0016c08" + "<4,23>": { + "<4,23,1>": "", + "<4,23,2>": "", + "<4,23,3>": "", + "<4,23,4>": "", + "<4,23,5>": "", + "<4,23,6>": "" }, + "<4,24>": { + "<4,24,1>": "", + "<4,24,2>": "", + "<4,24,3>": "", + "<4,24,4>": "", + "<4,24,5>": "", + "<4,24,6>": "" + }, + "<4,25>": "", + "<4,26>": "", + "<4,27>": "", + "<4,28>": { + "<4,28,1>": "(DT)", + "<4,28,2>": "<>", + "<4,28,3>": "<>", + "<4,28,4>": "<>", + "<4,28,5>": "<>", + "<4,28,6>": "<>", + "<4,28,7>": "<>", + "<4,28,8>": "<>", + "<4,28,9>": "<>", + "<4,28,10>": "<>", + "<4,28,11>": "<>", + "<4,28,12>": "<>" + }, + "<4,29>": { + "<4,29,1>": "DT4/HS", + "<4,29,2>": "<>", + "<4,29,3>": "<>", + "<4,29,4>": "<>", + "<4,29,5>": "<>", + "<4,29,6>": "<>", + "<4,29,7>": "<>", + "<4,29,8>": "<>", + "<4,29,9>": "<>", + "<4,29,10>": "<>", + "<4,29,11>": "<>", + "<4,29,12>": "<>" + }, + "<4,30>": { + "<4,30,1>": "<>", + "<4,30,2>": "<>", + "<4,30,3>": "<>", + "<4,30,4>": "<>", + "<4,30,5>": "<>", + "<4,30,6>": "<>", + "<4,30,7>": "<>", + "<4,30,8>": "<>", + "<4,30,9>": "<>", + "<4,30,10>": "<>", + "<4,30,11>": "<>", + "<4,30,12>": "<>" + }, + "<4,31>": { + "<4,31,1>": "0", + "<4,31,2>": "0", + "<4,31,3>": "0", + "<4,31,4>": "0", + "<4,31,5>": "0", + "<4,31,6>": "0", + "<4,31,7>": "0", + "<4,31,8>": "0", + "<4,31,9>": "0", + "<4,31,10>": "0", + "<4,31,11>": "0", + "<4,31,12>": "0" + }, + "<4,32>": "", "<4,33>": "", "<4,34>": "", - "<4,35>": "", + "<4,35>": { + "<4,35,1>": { + "<4,35,1,1>": "", + "<4,35,1,2>": "", + "<4,35,1,3>": "", + "<4,35,1,4>": "", + "<4,35,1,5>": "", + "<4,35,1,6>": "", + "<4,35,1,7>": "", + "<4,35,1,8>": "", + "<4,35,1,9>": "", + "<4,35,1,10>": "", + "<4,35,1,11>": "", + "<4,35,1,12>": "" + }, + "<4,35,2>": { + "<4,35,2,1>": "", + "<4,35,2,2>": "", + "<4,35,2,3>": "", + "<4,35,2,4>": "", + "<4,35,2,5>": "", + "<4,35,2,6>": "", + "<4,35,2,7>": "", + "<4,35,2,8>": "", + "<4,35,2,9>": "", + "<4,35,2,10>": "", + "<4,35,2,11>": "", + "<4,35,2,12>": "" + }, + "<4,35,3>": { + "<4,35,3,1>": "", + "<4,35,3,2>": "", + "<4,35,3,3>": "", + "<4,35,3,4>": "", + "<4,35,3,5>": "", + "<4,35,3,6>": "", + "<4,35,3,7>": "", + "<4,35,3,8>": "", + "<4,35,3,9>": "", + "<4,35,3,10>": "", + "<4,35,3,11>": "", + "<4,35,3,12>": "" + }, + "<4,35,4>": { + "<4,35,4,1>": "", + "<4,35,4,2>": "", + "<4,35,4,3>": "", + "<4,35,4,4>": "", + "<4,35,4,5>": "", + "<4,35,4,6>": "", + "<4,35,4,7>": "", + "<4,35,4,8>": "", + "<4,35,4,9>": "", + "<4,35,4,10>": "", + "<4,35,4,11>": "", + "<4,35,4,12>": "" + }, + "<4,35,5>": { + "<4,35,5,1>": "", + "<4,35,5,2>": "", + "<4,35,5,3>": "", + "<4,35,5,4>": "", + "<4,35,5,5>": "", + "<4,35,5,6>": "", + "<4,35,5,7>": "", + "<4,35,5,8>": "", + "<4,35,5,9>": "", + "<4,35,5,10>": "", + "<4,35,5,11>": "", + "<4,35,5,12>": "" + }, + "<4,35,6>": { + "<4,35,6,1>": "", + "<4,35,6,2>": "", + "<4,35,6,3>": "", + "<4,35,6,4>": "", + "<4,35,6,5>": "", + "<4,35,6,6>": "", + "<4,35,6,7>": "", + "<4,35,6,8>": "", + "<4,35,6,9>": "", + "<4,35,6,10>": "", + "<4,35,6,11>": "", + "<4,35,6,12>": "" + }, + "<4,35,7>": { + "<4,35,7,1>": "", + "<4,35,7,2>": "", + "<4,35,7,3>": "", + "<4,35,7,4>": "", + "<4,35,7,5>": "", + "<4,35,7,6>": "", + "<4,35,7,7>": "", + "<4,35,7,8>": "", + "<4,35,7,9>": "", + "<4,35,7,10>": "", + "<4,35,7,11>": "", + "<4,35,7,12>": "" + }, + "<4,35,8>": { + "<4,35,8,1>": "", + "<4,35,8,2>": "", + "<4,35,8,3>": "", + "<4,35,8,4>": "", + "<4,35,8,5>": "", + "<4,35,8,6>": "", + "<4,35,8,7>": "", + "<4,35,8,8>": "", + "<4,35,8,9>": "", + "<4,35,8,10>": "", + "<4,35,8,11>": "", + "<4,35,8,12>": "" + }, + "<4,35,9>": { + "<4,35,9,1>": "", + "<4,35,9,2>": "", + "<4,35,9,3>": "", + "<4,35,9,4>": "", + "<4,35,9,5>": "", + "<4,35,9,6>": "", + "<4,35,9,7>": "", + "<4,35,9,8>": "", + "<4,35,9,9>": "", + "<4,35,9,10>": "", + "<4,35,9,11>": "", + "<4,35,9,12>": "" + }, + "<4,35,10>": { + "<4,35,10,1>": "", + "<4,35,10,2>": "", + "<4,35,10,3>": "", + "<4,35,10,4>": "", + "<4,35,10,5>": "", + "<4,35,10,6>": "", + "<4,35,10,7>": "", + "<4,35,10,8>": "", + "<4,35,10,9>": "", + "<4,35,10,10>": "", + "<4,35,10,11>": "", + "<4,35,10,12>": "" + }, + "<4,35,11>": { + "<4,35,11,1>": "", + "<4,35,11,2>": "", + "<4,35,11,3>": "", + "<4,35,11,4>": "", + "<4,35,11,5>": "", + "<4,35,11,6>": "", + "<4,35,11,7>": "", + "<4,35,11,8>": "", + "<4,35,11,9>": "", + "<4,35,11,10>": "", + "<4,35,11,11>": "", + "<4,35,11,12>": "" + }, + "<4,35,12>": { + "<4,35,12,1>": "", + "<4,35,12,2>": "", + "<4,35,12,3>": "", + "<4,35,12,4>": "", + "<4,35,12,5>": "", + "<4,35,12,6>": "", + "<4,35,12,7>": "", + "<4,35,12,8>": "", + "<4,35,12,9>": "", + "<4,35,12,10>": "", + "<4,35,12,11>": "", + "<4,35,12,12>": "" + }, + "<4,35,13>": { + "<4,35,13,1>": "", + "<4,35,13,2>": "", + "<4,35,13,3>": "", + "<4,35,13,4>": "", + "<4,35,13,5>": "", + "<4,35,13,6>": "", + "<4,35,13,7>": "", + "<4,35,13,8>": "", + "<4,35,13,9>": "", + "<4,35,13,10>": "", + "<4,35,13,11>": "", + "<4,35,13,12>": "" + }, + "<4,35,14>": { + "<4,35,14,1>": "", + "<4,35,14,2>": "", + "<4,35,14,3>": "", + "<4,35,14,4>": "", + "<4,35,14,5>": "", + "<4,35,14,6>": "", + "<4,35,14,7>": "", + "<4,35,14,8>": "", + "<4,35,14,9>": "", + "<4,35,14,10>": "", + "<4,35,14,11>": "", + "<4,35,14,12>": "" + }, + "<4,35,15>": { + "<4,35,15,1>": "", + "<4,35,15,2>": "", + "<4,35,15,3>": "", + "<4,35,15,4>": "", + "<4,35,15,5>": "", + "<4,35,15,6>": "", + "<4,35,15,7>": "", + "<4,35,15,8>": "", + "<4,35,15,9>": "", + "<4,35,15,10>": "", + "<4,35,15,11>": "", + "<4,35,15,12>": "" + }, + "<4,35,16>": { + "<4,35,16,1>": "", + "<4,35,16,2>": "", + "<4,35,16,3>": "", + "<4,35,16,4>": "", + "<4,35,16,5>": "", + "<4,35,16,6>": "", + "<4,35,16,7>": "", + "<4,35,16,8>": "", + "<4,35,16,9>": "", + "<4,35,16,10>": "", + "<4,35,16,11>": "", + "<4,35,16,12>": "" + }, + "<4,35,17>": { + "<4,35,17,1>": "", + "<4,35,17,2>": "", + "<4,35,17,3>": "", + "<4,35,17,4>": "", + "<4,35,17,5>": "", + "<4,35,17,6>": "", + "<4,35,17,7>": "", + "<4,35,17,8>": "", + "<4,35,17,9>": "", + "<4,35,17,10>": "", + "<4,35,17,11>": "", + "<4,35,17,12>": "" + }, + "<4,35,18>": { + "<4,35,18,1>": "", + "<4,35,18,2>": "", + "<4,35,18,3>": "", + "<4,35,18,4>": "", + "<4,35,18,5>": "", + "<4,35,18,6>": "", + "<4,35,18,7>": "", + "<4,35,18,8>": "", + "<4,35,18,9>": "", + "<4,35,18,10>": "", + "<4,35,18,11>": "", + "<4,35,18,12>": "" + }, + "<4,35,19>": { + "<4,35,19,1>": "", + "<4,35,19,2>": "", + "<4,35,19,3>": "", + "<4,35,19,4>": "", + "<4,35,19,5>": "", + "<4,35,19,6>": "", + "<4,35,19,7>": "", + "<4,35,19,8>": "", + "<4,35,19,9>": "", + "<4,35,19,10>": "", + "<4,35,19,11>": "", + "<4,35,19,12>": "" + }, + "<4,35,20>": { + "<4,35,20,1>": "", + "<4,35,20,2>": "", + "<4,35,20,3>": "", + "<4,35,20,4>": "", + "<4,35,20,5>": "", + "<4,35,20,6>": "", + "<4,35,20,7>": "", + "<4,35,20,8>": "", + "<4,35,20,9>": "", + "<4,35,20,10>": "", + "<4,35,20,11>": "", + "<4,35,20,12>": "" + }, + "<4,35,21>": { + "<4,35,21,1>": "", + "<4,35,21,2>": "", + "<4,35,21,3>": "", + "<4,35,21,4>": "", + "<4,35,21,5>": "", + "<4,35,21,6>": "", + "<4,35,21,7>": "", + "<4,35,21,8>": "", + "<4,35,21,9>": "", + "<4,35,21,10>": "", + "<4,35,21,11>": "", + "<4,35,21,12>": "" + }, + "<4,35,22>": { + "<4,35,22,1>": "", + "<4,35,22,2>": "", + "<4,35,22,3>": "", + "<4,35,22,4>": "", + "<4,35,22,5>": "", + "<4,35,22,6>": "", + "<4,35,22,7>": "", + "<4,35,22,8>": "", + "<4,35,22,9>": "", + "<4,35,22,10>": "", + "<4,35,22,11>": "", + "<4,35,22,12>": "" + }, + "<4,35,23>": { + "<4,35,23,1>": "", + "<4,35,23,2>": "", + "<4,35,23,3>": "", + "<4,35,23,4>": "", + "<4,35,23,5>": "", + "<4,35,23,6>": "", + "<4,35,23,7>": "", + "<4,35,23,8>": "", + "<4,35,23,9>": "", + "<4,35,23,10>": "", + "<4,35,23,11>": "", + "<4,35,23,12>": "" + }, + "<4,35,24>": { + "<4,35,24,1>": "", + "<4,35,24,2>": "", + "<4,35,24,3>": "", + "<4,35,24,4>": "", + "<4,35,24,5>": "", + "<4,35,24,6>": "", + "<4,35,24,7>": "", + "<4,35,24,8>": "", + "<4,35,24,9>": "", + "<4,35,24,10>": "", + "<4,35,24,11>": "", + "<4,35,24,12>": "" + } + }, "<4,36>": "", "<4,37>": "", "<4,38>": "", - "<4,39>": "", - "<4,40>": "", - "<4,41>": "", - "<4,42>": "", - "<4,43>": "", - "<4,44>": "", + "<4,39>": { + "<4,39,1>": "80", + "<4,39,2>": "80", + "<4,39,3>": "80", + "<4,39,4>": "80", + "<4,39,5>": "80", + "<4,39,6>": "255", + "<4,39,7>": "80", + "<4,39,8>": "80", + "<4,39,9>": "80", + "<4,39,10>": "80", + "<4,39,11>": "80", + "<4,39,12>": "80" + }, + "<4,40>": "12", + "<4,41>": { + "<4,41,1>": "0", + "<4,41,2>": "0", + "<4,41,3>": "0", + "<4,41,4>": "-2", + "<4,41,5>": "-2", + "<4,41,6>": "", + "<4,41,7>": "", + "<4,41,8>": "40", + "<4,41,9>": "113", + "<4,41,10>": "115", + "<4,41,11>": "0", + "<4,41,12>": "-2", + "<4,41,13>": "-1", + "<4,41,14>": "1" + }, + "<4,42>": { + "<4,42,1>": "2147500032", + "<4,42,2>": "2147500032", + "<4,42,3>": "2147500032", + "<4,42,4>": "2147500032", + "<4,42,5>": "2147500032", + "<4,42,6>": "2147500032", + "<4,42,7>": "16384", + "<4,42,8>": "16384", + "<4,42,9>": "16384", + "<4,42,10>": "16384", + "<4,42,11>": "16384", + "<4,42,12>": "16384" + }, + "<4,43>": { + "<4,43,1>": "150", + "<4,43,2>": "80", + "<4,43,3>": "80", + "<4,43,4>": "80", + "<4,43,5>": "100", + "<4,43,6>": "300", + "<4,43,7>": "300", + "<4,43,8>": "80", + "<4,43,9>": "80", + "<4,43,10>": "80", + "<4,43,11>": "80", + "<4,43,12>": "80" + }, + "<4,44>": { + "<4,44,1>": "Date/Time", + "<4,44,2>": "Entity ID", + "<4,44,3>": "Entity Type", + "<4,44,4>": "User", + "<4,44,5>": "Override type", + "<4,44,6>": "Override cause", + "<4,44,7>": "Comment", + "<4,44,8>": "", + "<4,44,9>": "", + "<4,44,10>": "", + "<4,44,11>": "", + "<4,44,12>": "" + }, "<4,45>": "", "<4,46>": "", "<4,47>": "", @@ -569,28 +1168,514 @@ "<4,49>": "", "<4,50>": "", "<4,51>": "", - "<4,52>": "" + "<4,52>": "", + "<4,53>": "", + "<4,54>": "", + "<4,55>": { + "<4,55,1>": "", + "<4,55,2>": "", + "<4,55,3>": "", + "<4,55,4>": "", + "<4,55,5>": "", + "<4,55,6>": "" + }, + "<4,56>": { + "<4,56,1>": "", + "<4,56,2>": "", + "<4,56,3>": "", + "<4,56,4>": "", + "<4,56,5>": "", + "<4,56,6>": "" + }, + "<4,57>": { + "<4,57,1>": "", + "<4,57,2>": "", + "<4,57,3>": "", + "<4,57,4>": "", + "<4,57,5>": "", + "<4,57,6>": "", + "<4,57,7>": "" + }, + "<4,58>": { + "<4,58,1>": "", + "<4,58,2>": "", + "<4,58,3>": "", + "<4,58,4>": "", + "<4,58,5>": "", + "<4,58,6>": "" + }, + "<4,59>": "", + "<4,60>": { + "<4,60,1>": "18", + "<4,60,2>": "18", + "<4,60,3>": "18", + "<4,60,4>": "18", + "<4,60,5>": "18", + "<4,60,6>": "18", + "<4,60,7>": "18", + "<4,60,8>": "18", + "<4,60,9>": "18", + "<4,60,10>": "18", + "<4,60,11>": "18", + "<4,60,12>": "18" + }, + "<4,61>": "", + "<4,62>": "0", + "<4,63>": "", + "<4,64>": "-2", + "<4,65>": "", + "<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>": "", + "<4,91>": "", + "<4,92>": "", + "<4,93>": "", + "<4,94>": { + "<4,94,1>": "", + "<4,94,2>": "", + "<4,94,3>": "", + "<4,94,4>": "", + "<4,94,5>": "", + "<4,94,6>": "" + }, + "<4,95>": { + "<4,95,1>": "", + "<4,95,2>": "", + "<4,95,3>": "", + "<4,95,4>": "", + "<4,95,5>": "", + "<4,95,6>": "" + }, + "<4,96>": { + "<4,96,1>": { + "<4,96,1,1>": "", + "<4,96,1,2>": "" + }, + "<4,96,2>": { + "<4,96,2,1>": "", + "<4,96,2,2>": "" + }, + "<4,96,3>": { + "<4,96,3,1>": "", + "<4,96,3,2>": "" + }, + "<4,96,4>": "", + "<4,96,5>": { + "<4,96,5,1>": "", + "<4,96,5,2>": "" + }, + "<4,96,6>": { + "<4,96,6,1>": "", + "<4,96,6,2>": "" + }, + "<4,96,7>": "" + }, + "<4,97>": { + "<4,97,1>": { + "<4,97,1,1>": "Segoe UI", + "<4,97,1,2>": "-12", + "<4,97,1,3>": "400", + "<4,97,1,4>": "0", + "<4,97,1,5>": "0", + "<4,97,1,6>": "0", + "<4,97,1,7>": "0", + "<4,97,1,8>": "34", + "<4,97,1,9>": "0", + "<4,97,1,10>": "3", + "<4,97,1,11>": "2", + "<4,97,1,12>": "1" + }, + "<4,97,2>": { + "<4,97,2,1>": "Segoe UI", + "<4,97,2,2>": "-12", + "<4,97,2,3>": "400", + "<4,97,2,4>": "0", + "<4,97,2,5>": "0", + "<4,97,2,6>": "0", + "<4,97,2,7>": "0", + "<4,97,2,8>": "34", + "<4,97,2,9>": "0", + "<4,97,2,10>": "3", + "<4,97,2,11>": "2", + "<4,97,2,12>": "1" + }, + "<4,97,3>": { + "<4,97,3,1>": "Segoe UI", + "<4,97,3,2>": "-12", + "<4,97,3,3>": "400", + "<4,97,3,4>": "0", + "<4,97,3,5>": "0", + "<4,97,3,6>": "0", + "<4,97,3,7>": "0", + "<4,97,3,8>": "34", + "<4,97,3,9>": "0", + "<4,97,3,10>": "3", + "<4,97,3,11>": "2", + "<4,97,3,12>": "1" + }, + "<4,97,4>": "", + "<4,97,5>": { + "<4,97,5,1>": "Segoe UI", + "<4,97,5,2>": "-12", + "<4,97,5,3>": "400", + "<4,97,5,4>": "0", + "<4,97,5,5>": "0", + "<4,97,5,6>": "0", + "<4,97,5,7>": "0", + "<4,97,5,8>": "34", + "<4,97,5,9>": "0", + "<4,97,5,10>": "3", + "<4,97,5,11>": "2", + "<4,97,5,12>": "1" + }, + "<4,97,6>": { + "<4,97,6,1>": "Segoe UI", + "<4,97,6,2>": "-12", + "<4,97,6,3>": "400", + "<4,97,6,4>": "0", + "<4,97,6,5>": "0", + "<4,97,6,6>": "0", + "<4,97,6,7>": "0", + "<4,97,6,8>": "34", + "<4,97,6,9>": "0", + "<4,97,6,10>": "3", + "<4,97,6,11>": "2", + "<4,97,6,12>": "1" + } + }, + "<4,98>": { + "<4,98,1>": { + "<4,98,1,1>": "Segoe UI", + "<4,98,1,2>": "-12", + "<4,98,1,3>": "400", + "<4,98,1,4>": "0", + "<4,98,1,5>": "0", + "<4,98,1,6>": "0", + "<4,98,1,7>": "0", + "<4,98,1,8>": "34", + "<4,98,1,9>": "0", + "<4,98,1,10>": "3", + "<4,98,1,11>": "2", + "<4,98,1,12>": "1" + }, + "<4,98,2>": { + "<4,98,2,1>": "Segoe UI", + "<4,98,2,2>": "-12", + "<4,98,2,3>": "400", + "<4,98,2,4>": "0", + "<4,98,2,5>": "0", + "<4,98,2,6>": "0", + "<4,98,2,7>": "0", + "<4,98,2,8>": "34", + "<4,98,2,9>": "0", + "<4,98,2,10>": "3", + "<4,98,2,11>": "2", + "<4,98,2,12>": "1" + }, + "<4,98,3>": { + "<4,98,3,1>": "Segoe UI", + "<4,98,3,2>": "-12", + "<4,98,3,3>": "400", + "<4,98,3,4>": "0", + "<4,98,3,5>": "0", + "<4,98,3,6>": "0", + "<4,98,3,7>": "0", + "<4,98,3,8>": "34", + "<4,98,3,9>": "0", + "<4,98,3,10>": "3", + "<4,98,3,11>": "2", + "<4,98,3,12>": "1" + }, + "<4,98,4>": "", + "<4,98,5>": { + "<4,98,5,1>": "Segoe UI", + "<4,98,5,2>": "-12", + "<4,98,5,3>": "400", + "<4,98,5,4>": "0", + "<4,98,5,5>": "0", + "<4,98,5,6>": "0", + "<4,98,5,7>": "0", + "<4,98,5,8>": "34", + "<4,98,5,9>": "0", + "<4,98,5,10>": "3", + "<4,98,5,11>": "2", + "<4,98,5,12>": "1" + }, + "<4,98,6>": { + "<4,98,6,1>": "Segoe UI", + "<4,98,6,2>": "-12", + "<4,98,6,3>": "400", + "<4,98,6,4>": "0", + "<4,98,6,5>": "0", + "<4,98,6,6>": "0", + "<4,98,6,7>": "0", + "<4,98,6,8>": "34", + "<4,98,6,9>": "0", + "<4,98,6,10>": "3", + "<4,98,6,11>": "2", + "<4,98,6,12>": "1" + } + }, + "<4,99>": { + "<4,99,1>": { + "<4,99,1,1>": "-2", + "<4,99,1,2>": "-2", + "<4,99,1,3>": "-2", + "<4,99,1,4>": "0", + "<4,99,1,5>": "0", + "<4,99,1,6>": "0", + "<4,99,1,7>": "0" + }, + "<4,99,2>": { + "<4,99,2,1>": "-2", + "<4,99,2,2>": "-2", + "<4,99,2,3>": "-2", + "<4,99,2,4>": "0", + "<4,99,2,5>": "0", + "<4,99,2,6>": "0", + "<4,99,2,7>": "0" + }, + "<4,99,3>": { + "<4,99,3,1>": "-2", + "<4,99,3,2>": "-2", + "<4,99,3,3>": "-2", + "<4,99,3,4>": "0", + "<4,99,3,5>": "0", + "<4,99,3,6>": "0", + "<4,99,3,7>": "0" + }, + "<4,99,4>": { + "<4,99,4,1>": "-2", + "<4,99,4,2>": "-2", + "<4,99,4,3>": "-2", + "<4,99,4,4>": "0", + "<4,99,4,5>": "0", + "<4,99,4,6>": "0", + "<4,99,4,7>": "0" + }, + "<4,99,5>": { + "<4,99,5,1>": "-2", + "<4,99,5,2>": "-2", + "<4,99,5,3>": "-2", + "<4,99,5,4>": "0", + "<4,99,5,5>": "0", + "<4,99,5,6>": "0", + "<4,99,5,7>": "0" + }, + "<4,99,6>": { + "<4,99,6,1>": "-2", + "<4,99,6,2>": "-2", + "<4,99,6,3>": "-2", + "<4,99,6,4>": "0", + "<4,99,6,5>": "0", + "<4,99,6,6>": "0", + "<4,99,6,7>": "0" + }, + "<4,99,7>": { + "<4,99,7,1>": "-2", + "<4,99,7,2>": "-2", + "<4,99,7,3>": "-2", + "<4,99,7,4>": "0", + "<4,99,7,5>": "0", + "<4,99,7,6>": "0", + "<4,99,7,7>": "0" + }, + "<4,99,8>": "", + "<4,99,9>": "", + "<4,99,10>": "", + "<4,99,11>": { + "<4,99,11,1>": "-2", + "<4,99,11,2>": "-2", + "<4,99,11,3>": "-2", + "<4,99,11,4>": "0", + "<4,99,11,5>": "0", + "<4,99,11,6>": "0", + "<4,99,11,7>": "0" + }, + "<4,99,12>": { + "<4,99,12,1>": "-2", + "<4,99,12,2>": "-2", + "<4,99,12,3>": "-2", + "<4,99,12,4>": "0", + "<4,99,12,5>": "0", + "<4,99,12,6>": "0", + "<4,99,12,7>": "0" + }, + "<4,99,13>": { + "<4,99,13,1>": "-2", + "<4,99,13,2>": "-2", + "<4,99,13,3>": "-2", + "<4,99,13,4>": "0", + "<4,99,13,5>": "0", + "<4,99,13,6>": "0", + "<4,99,13,7>": "0" + }, + "<4,99,14>": { + "<4,99,14,1>": "-2", + "<4,99,14,2>": "-2", + "<4,99,14,3>": "-2", + "<4,99,14,4>": "0", + "<4,99,14,5>": "0", + "<4,99,14,6>": "0", + "<4,99,14,7>": "0" + }, + "<4,99,15>": { + "<4,99,15,1>": "-2", + "<4,99,15,2>": "-2", + "<4,99,15,3>": "-2", + "<4,99,15,4>": "0", + "<4,99,15,5>": "0", + "<4,99,15,6>": "0", + "<4,99,15,7>": "0" + }, + "<4,99,16>": { + "<4,99,16,1>": "-2", + "<4,99,16,2>": "-2", + "<4,99,16,3>": "-2", + "<4,99,16,4>": "0", + "<4,99,16,5>": "0", + "<4,99,16,6>": "0", + "<4,99,16,7>": "0" + }, + "<4,99,17>": { + "<4,99,17,1>": "-2", + "<4,99,17,2>": "-2", + "<4,99,17,3>": "-2", + "<4,99,17,4>": "0", + "<4,99,17,5>": "0", + "<4,99,17,6>": "0", + "<4,99,17,7>": "0" + }, + "<4,99,18>": "", + "<4,99,19>": "", + "<4,99,20>": "", + "<4,99,21>": { + "<4,99,21,1>": "-2", + "<4,99,21,2>": "-2", + "<4,99,21,3>": "-2", + "<4,99,21,4>": "0", + "<4,99,21,5>": "0", + "<4,99,21,6>": "0", + "<4,99,21,7>": "0" + }, + "<4,99,22>": { + "<4,99,22,1>": "-2", + "<4,99,22,2>": "-2", + "<4,99,22,3>": "-2", + "<4,99,22,4>": "0", + "<4,99,22,5>": "0", + "<4,99,22,6>": "0", + "<4,99,22,7>": "0" + }, + "<4,99,23>": { + "<4,99,23,1>": "-2", + "<4,99,23,2>": "-2", + "<4,99,23,3>": "-2", + "<4,99,23,4>": "0", + "<4,99,23,5>": "0", + "<4,99,23,6>": "0", + "<4,99,23,7>": "0" + }, + "<4,99,24>": { + "<4,99,24,1>": "-2", + "<4,99,24,2>": "-2", + "<4,99,24,3>": "-2", + "<4,99,24,4>": "0", + "<4,99,24,5>": "0", + "<4,99,24,6>": "0", + "<4,99,24,7>": "0" + }, + "<4,99,25>": { + "<4,99,25,1>": "-2", + "<4,99,25,2>": "-2", + "<4,99,25,3>": "-2", + "<4,99,25,4>": "0", + "<4,99,25,5>": "0", + "<4,99,25,6>": "0", + "<4,99,25,7>": "0" + }, + "<4,99,26>": { + "<4,99,26,1>": "-2", + "<4,99,26,2>": "-2", + "<4,99,26,3>": "-2", + "<4,99,26,4>": "0", + "<4,99,26,5>": "0", + "<4,99,26,6>": "0", + "<4,99,26,7>": "0" + }, + "<4,99,27>": { + "<4,99,27,1>": "-2", + "<4,99,27,2>": "-2", + "<4,99,27,3>": "-2", + "<4,99,27,4>": "0", + "<4,99,27,5>": "0", + "<4,99,27,6>": "0", + "<4,99,27,7>": "0" + } + }, + "<4,100>": { + "<4,100,1>": "", + "<4,100,2>": "", + "<4,100,3>": "", + "<4,100,4>": "", + "<4,100,5>": "", + "<4,100,6>": "" + }, + "<4,101>": "", + "<4,102>": "", + "<4,103>": "", + "<4,104>": "", + "<4,105>": "", + "<4,106>": "", + "<4,107>": "", + "<4,108>": "" }, "<5>": { - "<5,1>": "SEARCH", + "<5,1>": "DATE_FROM", "<5,2>": "", - "<5,3>": "PUSHBUTTON", + "<5,3>": "EDITFIELD", "<5,4>": "OVERRIDE_REPORT", - "<5,5>": "500", - "<5,6>": "180", - "<5,7>": "120", - "<5,8>": "30", - "<5,9>": "Search", + "<5,5>": "28", + "<5,6>": "248", + "<5,7>": "152", + "<5,8>": "20", + "<5,9>": "", "<5,10>": { - "<5,10,1>": "0x56002000", - "<5,10,2>": "0x0" + "<5,10,1>": "0x56000080", + "<5,10,2>": "0x200" }, "<5,11>": { - "<5,11,1>": "0x108", + "<5,11,1>": "0x0", "<5,11,2>": "0x80000000" }, - "<5,12>": "5", - "<5,13>": "-2", + "<5,12>": "3", + "<5,13>": { + "<5,13,1>": "-2", + "<5,13,2>": "-2", + "<5,13,3>": "" + }, "<5,14>": "0", "<5,15>": { "<5,15,1>": { @@ -612,54 +1697,32 @@ }, "<5,16>": "", "<5,17>": "", - "<5,18>": { - "<5,18,1>": { - "<5,18,1,1>": "R", - "<5,18,1,2>": "EXECUTE", - "<5,18,1,3>": "SYSPROG*STPROCEXE**OBJ_CALL_EVENT", - "<5,18,1,4>": { - "<5,18,1,4,1>": "@SELF", - "<5,18,1,4,2>": "@EVENT", - "<5,18,1,4,3>": "@PARAM1", - "<5,18,1,4,4>": "@PARAM2", - "<5,18,1,4,5>": "@PARAM3", - "<5,18,1,4,6>": "@PARAM4", - "<5,18,1,4,7>": "@PARAM5", - "<5,18,1,4,8>": "@PARAM6" - }, - "<5,18,1,5>": "", - "<5,18,1,6>": "" - }, - "<5,18,2>": "" - }, - "<5,19>": { - "<5,19,1>": "CLICK", - "<5,19,2>": "" - }, + "<5,18>": "", + "<5,19>": "", "<5,20>": "", "<5,21>": "", "<5,22>": "", "<5,23>": "", "<5,24>": "", - "<5,25>": "0", - "<5,26>": "0", + "<5,25>": "", + "<5,26>": "", "<5,27>": "", - "<5,28>": "<>", - "<5,29>": "<>", + "<5,28>": "(DT)", + "<5,29>": "DT", "<5,30>": "<>", "<5,31>": "0", - "<5,32>": { - "<5,32,1>": "0x7fffe", - "<5,32,2>": "0xf0016008" - }, + "<5,32>": "", "<5,33>": "", "<5,34>": "", "<5,35>": "", - "<5,36>": "", + "<5,36>": { + "<5,36,1>": "0", + "<5,36,2>": "0" + }, "<5,37>": "", "<5,38>": "", "<5,39>": "", - "<5,40>": "1", + "<5,40>": "", "<5,41>": "", "<5,42>": "", "<5,43>": "", @@ -671,28 +1734,88 @@ "<5,49>": "", "<5,50>": "", "<5,51>": "", - "<5,52>": "" + "<5,52>": "", + "<5,53>": "", + "<5,54>": "", + "<5,55>": "", + "<5,56>": "", + "<5,57>": "", + "<5,58>": "", + "<5,59>": "", + "<5,60>": "", + "<5,61>": "", + "<5,62>": "0", + "<5,63>": "", + "<5,64>": "", + "<5,65>": "", + "<5,66>": "", + "<5,67>": "", + "<5,68>": "", + "<5,69>": "", + "<5,70>": "", + "<5,71>": "", + "<5,72>": "", + "<5,73>": "", + "<5,74>": "", + "<5,75>": "", + "<5,76>": "", + "<5,77>": "", + "<5,78>": "", + "<5,79>": "", + "<5,80>": "", + "<5,81>": "", + "<5,82>": "", + "<5,83>": "", + "<5,84>": "", + "<5,85>": "", + "<5,86>": "", + "<5,87>": "", + "<5,88>": "", + "<5,89>": "", + "<5,90>": "", + "<5,91>": "", + "<5,92>": "", + "<5,93>": "", + "<5,94>": "", + "<5,95>": "", + "<5,96>": "", + "<5,97>": "", + "<5,98>": "", + "<5,99>": "", + "<5,100>": "", + "<5,101>": "", + "<5,102>": "", + "<5,103>": "", + "<5,104>": "", + "<5,105>": "", + "<5,106>": "", + "<5,107>": "", + "<5,108>": "" }, "<6>": { - "<6,1>": "LABEL_FILTER", + "<6,1>": "DATE_TO", "<6,2>": "", - "<6,3>": "STATIC", + "<6,3>": "EDITFIELD", "<6,4>": "OVERRIDE_REPORT", - "<6,5>": "445", - "<6,6>": "60", - "<6,7>": "70", + "<6,5>": "228", + "<6,6>": "249", + "<6,7>": "160", "<6,8>": "20", "<6,9>": "", "<6,10>": { - "<6,10,1>": "0x56000000", - "<6,10,2>": "0x0" + "<6,10,1>": "0x56000080", + "<6,10,2>": "0x200" }, "<6,11>": { "<6,11,1>": "0x0", "<6,11,2>": "0x80000000" }, - "<6,12>": "6", - "<6,13>": "-1", + "<6,12>": "4", + "<6,13>": { + "<6,13,1>": "-2", + "<6,13,2>": "-2", + "<6,13,3>": "" + }, "<6,14>": "0", "<6,15>": { "<6,15,1>": { @@ -721,21 +1844,21 @@ "<6,22>": "", "<6,23>": "", "<6,24>": "", - "<6,25>": "0", - "<6,26>": "0", + "<6,25>": "", + "<6,26>": "", "<6,27>": "", - "<6,28>": "<>", - "<6,29>": "<>", + "<6,28>": "(DT)", + "<6,29>": "DT", "<6,30>": "<>", "<6,31>": "0", - "<6,32>": { - "<6,32,1>": "0x7fffe", - "<6,32,2>": "0xf0016c08" - }, + "<6,32>": "", "<6,33>": "", "<6,34>": "", "<6,35>": "", - "<6,36>": "", + "<6,36>": { + "<6,36,1>": "0", + "<6,36,2>": "0" + }, "<6,37>": "", "<6,38>": "", "<6,39>": "", @@ -751,28 +1874,88 @@ "<6,49>": "", "<6,50>": "", "<6,51>": "", - "<6,52>": "" + "<6,52>": "", + "<6,53>": "", + "<6,54>": "", + "<6,55>": "", + "<6,56>": "", + "<6,57>": "", + "<6,58>": "", + "<6,59>": "", + "<6,60>": "", + "<6,61>": "", + "<6,62>": "0", + "<6,63>": "", + "<6,64>": "", + "<6,65>": "", + "<6,66>": "", + "<6,67>": "", + "<6,68>": "", + "<6,69>": "", + "<6,70>": "", + "<6,71>": "", + "<6,72>": "", + "<6,73>": "", + "<6,74>": "", + "<6,75>": "", + "<6,76>": "", + "<6,77>": "", + "<6,78>": "", + "<6,79>": "", + "<6,80>": "", + "<6,81>": "", + "<6,82>": "", + "<6,83>": "", + "<6,84>": "", + "<6,85>": "", + "<6,86>": "", + "<6,87>": "", + "<6,88>": "", + "<6,89>": "", + "<6,90>": "", + "<6,91>": "", + "<6,92>": "", + "<6,93>": "", + "<6,94>": "", + "<6,95>": "", + "<6,96>": "", + "<6,97>": "", + "<6,98>": "", + "<6,99>": "", + "<6,100>": "", + "<6,101>": "", + "<6,102>": "", + "<6,103>": "", + "<6,104>": "", + "<6,105>": "", + "<6,106>": "", + "<6,107>": "", + "<6,108>": "" }, "<7>": { - "<7,1>": "LABEL_DATE", + "<7,1>": "SEARCH", "<7,2>": "", - "<7,3>": "STATIC", + "<7,3>": "PUSHBUTTON", "<7,4>": "OVERRIDE_REPORT", - "<7,5>": "50", - "<7,6>": "100", - "<7,7>": "100", - "<7,8>": "19", - "<7,9>": "Date From:", + "<7,5>": "28", + "<7,6>": "296", + "<7,7>": "120", + "<7,8>": "32", + "<7,9>": "Search", "<7,10>": { - "<7,10,1>": "0x56000000", + "<7,10,1>": "0x56002300", "<7,10,2>": "0x0" }, "<7,11>": { "<7,11,1>": "0x0", "<7,11,2>": "0x80000000" }, - "<7,12>": "7", - "<7,13>": "-1", + "<7,12>": "5", + "<7,13>": { + "<7,13,1>": "-2", + "<7,13,2>": "-2", + "<7,13,3>": "0" + }, "<7,14>": "0", "<7,15>": { "<7,15,1>": { @@ -794,24 +1977,48 @@ }, "<7,16>": "", "<7,17>": "", - "<7,18>": "", - "<7,19>": "", + "<7,18>": { + "<7,18,1>": { + "<7,18,1,1>": "R", + "<7,18,1,2>": "EXECUTE", + "<7,18,1,3>": "SYSPROG*STPROCEXE**OBJ_CALL_EVENT", + "<7,18,1,4>": { + "<7,18,1,4,1>": "@SELF", + "<7,18,1,4,2>": "@EVENT", + "<7,18,1,4,3>": "@PARAM1", + "<7,18,1,4,4>": "@PARAM2", + "<7,18,1,4,5>": "@PARAM3", + "<7,18,1,4,6>": "@PARAM4", + "<7,18,1,4,7>": "@PARAM5", + "<7,18,1,4,8>": "@PARAM6" + }, + "<7,18,1,5>": "", + "<7,18,1,6>": "", + "<7,18,1,7>": "", + "<7,18,1,8>": "", + "<7,18,1,9>": "", + "<7,18,1,10>": "", + "<7,18,1,11>": "", + "<7,18,1,12>": "", + "<7,18,1,13>": "", + "<7,18,1,14>": "", + "<7,18,1,15>": "STPROC" + } + }, + "<7,19>": "CLICK", "<7,20>": "", "<7,21>": "", "<7,22>": "", "<7,23>": "", "<7,24>": "", - "<7,25>": "0", - "<7,26>": "0", + "<7,25>": "", + "<7,26>": "", "<7,27>": "", - "<7,28>": "<>", - "<7,29>": "<>", - "<7,30>": "<>", - "<7,31>": "0", - "<7,32>": { - "<7,32,1>": "0x7fffe", - "<7,32,2>": "0xf0016d88" - }, + "<7,28>": "", + "<7,29>": "", + "<7,30>": "", + "<7,31>": "", + "<7,32>": "", "<7,33>": "", "<7,34>": "", "<7,35>": "", @@ -819,8 +2026,11 @@ "<7,37>": "", "<7,38>": "", "<7,39>": "", - "<7,40>": "", - "<7,41>": "", + "<7,40>": "1", + "<7,41>": { + "<7,41,1>": "", + "<7,41,2>": "-1" + }, "<7,42>": "", "<7,43>": "", "<7,44>": "", @@ -831,18 +2041,78 @@ "<7,49>": "", "<7,50>": "", "<7,51>": "", - "<7,52>": "" + "<7,52>": "", + "<7,53>": "", + "<7,54>": "", + "<7,55>": "", + "<7,56>": "", + "<7,57>": "", + "<7,58>": "", + "<7,59>": "", + "<7,60>": "", + "<7,61>": "", + "<7,62>": "0", + "<7,63>": "", + "<7,64>": { + "<7,64,1>": "-2", + "<7,64,2>": "-2", + "<7,64,3>": "0" + }, + "<7,65>": "-2", + "<7,66>": "", + "<7,67>": "", + "<7,68>": "", + "<7,69>": "", + "<7,70>": "", + "<7,71>": "", + "<7,72>": "", + "<7,73>": "", + "<7,74>": "", + "<7,75>": "", + "<7,76>": "", + "<7,77>": "", + "<7,78>": "", + "<7,79>": "", + "<7,80>": "", + "<7,81>": "", + "<7,82>": "", + "<7,83>": "", + "<7,84>": "", + "<7,85>": "", + "<7,86>": "", + "<7,87>": "", + "<7,88>": "", + "<7,89>": "", + "<7,90>": "0", + "<7,91>": "0", + "<7,92>": "", + "<7,93>": "", + "<7,94>": "", + "<7,95>": "", + "<7,96>": "", + "<7,97>": "", + "<7,98>": "", + "<7,99>": "", + "<7,100>": "", + "<7,101>": "", + "<7,102>": "", + "<7,103>": "", + "<7,104>": "", + "<7,105>": "", + "<7,106>": "", + "<7,107>": "", + "<7,108>": "" }, "<8>": { - "<8,1>": "LABEL_DATE_TO", + "<8,1>": "LABEL_FILTER", "<8,2>": "", "<8,3>": "STATIC", "<8,4>": "OVERRIDE_REPORT", - "<8,5>": "240", - "<8,6>": "100", - "<8,7>": "100", - "<8,8>": "19", - "<8,9>": "Date To:", + "<8,5>": "445", + "<8,6>": "60", + "<8,7>": "70", + "<8,8>": "20", + "<8,9>": "", "<8,10>": { "<8,10,1>": "0x56000000", "<8,10,2>": "0x0" @@ -851,8 +2121,12 @@ "<8,11,1>": "0x0", "<8,11,2>": "0x80000000" }, - "<8,12>": "8", - "<8,13>": "-1", + "<8,12>": "6", + "<8,13>": { + "<8,13,1>": "-1", + "<8,13,2>": "-1", + "<8,13,3>": "" + }, "<8,14>": "0", "<8,15>": { "<8,15,1>": { @@ -881,17 +2155,14 @@ "<8,22>": "", "<8,23>": "", "<8,24>": "", - "<8,25>": "0", - "<8,26>": "0", + "<8,25>": "", + "<8,26>": "", "<8,27>": "", - "<8,28>": "<>", - "<8,29>": "<>", - "<8,30>": "<>", - "<8,31>": "0", - "<8,32>": { - "<8,32,1>": "0x7fffe", - "<8,32,2>": "0xf0016d88" - }, + "<8,28>": "", + "<8,29>": "", + "<8,30>": "", + "<8,31>": "", + "<8,32>": "", "<8,33>": "", "<8,34>": "", "<8,35>": "", @@ -911,28 +2182,101 @@ "<8,49>": "", "<8,50>": "", "<8,51>": "", - "<8,52>": "" + "<8,52>": "", + "<8,53>": "", + "<8,54>": "", + "<8,55>": "", + "<8,56>": "", + "<8,57>": "", + "<8,58>": "", + "<8,59>": "", + "<8,60>": "", + "<8,61>": "", + "<8,62>": "0", + "<8,63>": { + "<8,63,1>": "", + "<8,63,2>": "", + "<8,63,3>": "", + "<8,63,4>": "", + "<8,63,5>": "", + "<8,63,6>": "", + "<8,63,7>": "", + "<8,63,8>": "" + }, + "<8,64>": { + "<8,64,1>": "", + "<8,64,2>": "", + "<8,64,3>": "" + }, + "<8,65>": "-2", + "<8,66>": "", + "<8,67>": "", + "<8,68>": "", + "<8,69>": "", + "<8,70>": "", + "<8,71>": "", + "<8,72>": "", + "<8,73>": "", + "<8,74>": "", + "<8,75>": "", + "<8,76>": "", + "<8,77>": "", + "<8,78>": "", + "<8,79>": "", + "<8,80>": "", + "<8,81>": "", + "<8,82>": "", + "<8,83>": "", + "<8,84>": "", + "<8,85>": "", + "<8,86>": "", + "<8,87>": "", + "<8,88>": "", + "<8,89>": "", + "<8,90>": "0", + "<8,91>": "0", + "<8,92>": "", + "<8,93>": "", + "<8,94>": "", + "<8,95>": "", + "<8,96>": "", + "<8,97>": "", + "<8,98>": "", + "<8,99>": "", + "<8,100>": "", + "<8,101>": "", + "<8,102>": "", + "<8,103>": "", + "<8,104>": "", + "<8,105>": "", + "<8,106>": "", + "<8,107>": "", + "<8,108>": "" }, "<9>": { - "<9,1>": "OVERRIDE_TYPE", + "<9,1>": "LABEL_DATE", "<9,2>": "", - "<9,3>": "RADIOGROUP", + "<9,3>": "STATIC", "<9,4>": "OVERRIDE_REPORT", - "<9,5>": "40", - "<9,6>": "200", - "<9,7>": "252", - "<9,8>": "18", - "<9,9>": "", + "<9,5>": "33", + "<9,6>": "232", + "<9,7>": "100", + "<9,8>": "20", + "<9,9>": "Date From:", "<9,10>": { - "<9,10,1>": "0x5E000000", + "<9,10,1>": "0x56000000", "<9,10,2>": "0x0" }, "<9,11>": { - "<9,11,1>": "0x210", + "<9,11,1>": "0x0", "<9,11,2>": "0x80000000" }, - "<9,12>": "9", - "<9,13>": "-1", + "<9,12>": "7", + "<9,13>": { + "<9,13,1>": "-1", + "<9,13,2>": "-1", + "<9,13,3>": "" + }, "<9,14>": "0", "<9,15>": { "<9,15,1>": { @@ -961,24 +2305,18 @@ "<9,22>": "", "<9,23>": "", "<9,24>": "", - "<9,25>": "0", - "<9,26>": "0", + "<9,25>": "", + "<9,26>": "", "<9,27>": "", - "<9,28>": "<>", - "<9,29>": "<>", - "<9,30>": "<>", - "<9,31>": "0", - "<9,32>": { - "<9,32,1>": "0x3eff6", - "<9,32,2>": "0x0" - }, + "<9,28>": "", + "<9,29>": "", + "<9,30>": "", + "<9,31>": "", + "<9,32>": "", "<9,33>": "", "<9,34>": "", - "<9,35>": { - "<9,35,1>": "ROTR_BLOCK", - "<9,35,2>": "UNSIGN" - }, - "<9,36>": "ROTR_BLOCK", + "<9,35>": "", + "<9,36>": "", "<9,37>": "", "<9,38>": "", "<9,39>": "", @@ -986,10 +2324,7 @@ "<9,41>": "", "<9,42>": "", "<9,43>": "", - "<9,44>": { - "<9,44,1>": "ROTR Tool Block", - "<9,44,2>": "Load/Unload Unsign" - }, + "<9,44>": "", "<9,45>": "", "<9,46>": "", "<9,47>": "", @@ -997,28 +2332,101 @@ "<9,49>": "", "<9,50>": "", "<9,51>": "", - "<9,52>": "" + "<9,52>": "", + "<9,53>": "", + "<9,54>": "", + "<9,55>": "", + "<9,56>": "", + "<9,57>": "", + "<9,58>": "", + "<9,59>": "", + "<9,60>": "", + "<9,61>": "", + "<9,62>": "0", + "<9,63>": { + "<9,63,1>": "", + "<9,63,2>": "", + "<9,63,3>": "", + "<9,63,4>": "", + "<9,63,5>": "", + "<9,63,6>": "", + "<9,63,7>": "", + "<9,63,8>": "" + }, + "<9,64>": { + "<9,64,1>": "", + "<9,64,2>": "", + "<9,64,3>": "" + }, + "<9,65>": "-2", + "<9,66>": "", + "<9,67>": "", + "<9,68>": "", + "<9,69>": "", + "<9,70>": "", + "<9,71>": "", + "<9,72>": "", + "<9,73>": "", + "<9,74>": "", + "<9,75>": "", + "<9,76>": "", + "<9,77>": "", + "<9,78>": "", + "<9,79>": "", + "<9,80>": "", + "<9,81>": "", + "<9,82>": "", + "<9,83>": "", + "<9,84>": "", + "<9,85>": "", + "<9,86>": "", + "<9,87>": "", + "<9,88>": "", + "<9,89>": "", + "<9,90>": "0", + "<9,91>": "0", + "<9,92>": "", + "<9,93>": "", + "<9,94>": "", + "<9,95>": "", + "<9,96>": "", + "<9,97>": "", + "<9,98>": "", + "<9,99>": "", + "<9,100>": "", + "<9,101>": "", + "<9,102>": "", + "<9,103>": "", + "<9,104>": "", + "<9,105>": "", + "<9,106>": "", + "<9,107>": "", + "<9,108>": "" }, "<10>": { - "<10,1>": "OLE_DATEPICKER_FROM", + "<10,1>": "LABEL_DATE_TO", "<10,2>": "", - "<10,3>": "OLECONTROL.SRP.DatePicker.1", + "<10,3>": "STATIC", "<10,4>": "OVERRIDE_REPORT", - "<10,5>": "50", - "<10,6>": "140", - "<10,7>": "150", - "<10,8>": "180", - "<10,9>": "SRP.DatePicker.1", + "<10,5>": "234", + "<10,6>": "232", + "<10,7>": "100", + "<10,8>": "20", + "<10,9>": "Date To:", "<10,10>": { - "<10,10,1>": "0x46000000", + "<10,10,1>": "0x56000000", "<10,10,2>": "0x0" }, "<10,11>": { "<10,11,1>": "0x0", "<10,11,2>": "0x80000000" }, - "<10,12>": "10", - "<10,13>": "-2", + "<10,12>": "8", + "<10,13>": { + "<10,13,1>": "-1", + "<10,13,2>": "-1", + "<10,13,3>": "" + }, "<10,14>": "0", "<10,15>": { "<10,15,1>": { @@ -1040,46 +2448,21 @@ }, "<10,16>": "", "<10,17>": "", - "<10,18>": { - "<10,18,1>": { - "<10,18,1,1>": "R", - "<10,18,1,2>": "EXECUTE", - "<10,18,1,3>": "SYSPROG*STPROCEXE**OBJ_CALL_EVENT", - "<10,18,1,4>": { - "<10,18,1,4,1>": "@SELF", - "<10,18,1,4,2>": "@EVENT", - "<10,18,1,4,3>": "@PARAM1", - "<10,18,1,4,4>": "@PARAM2", - "<10,18,1,4,5>": "@PARAM3", - "<10,18,1,4,6>": "@PARAM4", - "<10,18,1,4,7>": "@PARAM5", - "<10,18,1,4,8>": "@PARAM6" - }, - "<10,18,1,5>": "", - "<10,18,1,6>": "" - }, - "<10,18,2>": "" - }, - "<10,19>": { - "<10,19,1>": "OLE", - "<10,19,2>": "" - }, + "<10,18>": "", + "<10,19>": "", "<10,20>": "", "<10,21>": "", "<10,22>": "", "<10,23>": "", "<10,24>": "", - "<10,25>": "0", - "<10,26>": "0", + "<10,25>": "", + "<10,26>": "", "<10,27>": "", - "<10,28>": "<>", - "<10,29>": "<>", - "<10,30>": "<>", - "<10,31>": "0", - "<10,32>": { - "<10,32,1>": "0x7fffe", - "<10,32,2>": "0xf0016800" - }, + "<10,28>": "", + "<10,29>": "", + "<10,30>": "", + "<10,31>": "", + "<10,32>": "", "<10,33>": "", "<10,34>": "", "<10,35>": "", @@ -1099,28 +2482,101 @@ "<10,49>": "", "<10,50>": "", "<10,51>": "", - "<10,52>": "" + "<10,52>": "", + "<10,53>": "", + "<10,54>": "", + "<10,55>": "", + "<10,56>": "", + "<10,57>": "", + "<10,58>": "", + "<10,59>": "", + "<10,60>": "", + "<10,61>": "", + "<10,62>": "0", + "<10,63>": { + "<10,63,1>": "", + "<10,63,2>": "", + "<10,63,3>": "", + "<10,63,4>": "", + "<10,63,5>": "", + "<10,63,6>": "", + "<10,63,7>": "", + "<10,63,8>": "" + }, + "<10,64>": { + "<10,64,1>": "", + "<10,64,2>": "", + "<10,64,3>": "" + }, + "<10,65>": "-2", + "<10,66>": "", + "<10,67>": "", + "<10,68>": "", + "<10,69>": "", + "<10,70>": "", + "<10,71>": "", + "<10,72>": "", + "<10,73>": "", + "<10,74>": "", + "<10,75>": "", + "<10,76>": "", + "<10,77>": "", + "<10,78>": "", + "<10,79>": "", + "<10,80>": "", + "<10,81>": "", + "<10,82>": "", + "<10,83>": "", + "<10,84>": "", + "<10,85>": "", + "<10,86>": "", + "<10,87>": "", + "<10,88>": "", + "<10,89>": "", + "<10,90>": "0", + "<10,91>": "0", + "<10,92>": "", + "<10,93>": "", + "<10,94>": "", + "<10,95>": "", + "<10,96>": "", + "<10,97>": "", + "<10,98>": "", + "<10,99>": "", + "<10,100>": "", + "<10,101>": "", + "<10,102>": "", + "<10,103>": "", + "<10,104>": "", + "<10,105>": "", + "<10,106>": "", + "<10,107>": "", + "<10,108>": "" }, "<11>": { - "<11,1>": "OLE_DATEPICKER_TO", + "<11,1>": "OVERRIDE_TYPE", "<11,2>": "", - "<11,3>": "OLECONTROL.SRP.DatePicker.1", + "<11,3>": "RADIOGROUP", "<11,4>": "OVERRIDE_REPORT", - "<11,5>": "240", - "<11,6>": "140", - "<11,7>": "150", - "<11,8>": "180", - "<11,9>": "SRP.DatePicker.1", + "<11,5>": "20", + "<11,6>": "84", + "<11,7>": "472", + "<11,8>": "20", + "<11,9>": "", "<11,10>": { - "<11,10,1>": "0x46000000", + "<11,10,1>": "0x56000000", "<11,10,2>": "0x0" }, "<11,11>": { - "<11,11,1>": "0x0", + "<11,11,1>": "0x210", "<11,11,2>": "0x80000000" }, - "<11,12>": "11", - "<11,13>": "-2", + "<11,12>": "9", + "<11,13>": { + "<11,13,1>": "-1", + "<11,13,2>": "-1", + "<11,13,3>": "" + }, "<11,14>": "0", "<11,15>": { "<11,15,1>": { @@ -1142,50 +2598,30 @@ }, "<11,16>": "", "<11,17>": "", - "<11,18>": { - "<11,18,1>": { - "<11,18,1,1>": "R", - "<11,18,1,2>": "EXECUTE", - "<11,18,1,3>": "SYSPROG*STPROCEXE**OBJ_CALL_EVENT", - "<11,18,1,4>": { - "<11,18,1,4,1>": "@SELF", - "<11,18,1,4,2>": "@EVENT", - "<11,18,1,4,3>": "@PARAM1", - "<11,18,1,4,4>": "@PARAM2", - "<11,18,1,4,5>": "@PARAM3", - "<11,18,1,4,6>": "@PARAM4", - "<11,18,1,4,7>": "@PARAM5", - "<11,18,1,4,8>": "@PARAM6" - }, - "<11,18,1,5>": "", - "<11,18,1,6>": "" - }, - "<11,18,2>": "" - }, - "<11,19>": { - "<11,19,1>": "OLE", - "<11,19,2>": "" - }, + "<11,18>": "", + "<11,19>": "", "<11,20>": "", "<11,21>": "", "<11,22>": "", "<11,23>": "", "<11,24>": "", - "<11,25>": "0", - "<11,26>": "0", + "<11,25>": "", + "<11,26>": "", "<11,27>": "", - "<11,28>": "<>", - "<11,29>": "<>", - "<11,30>": "<>", - "<11,31>": "0", - "<11,32>": { - "<11,32,1>": "0x7fffe", - "<11,32,2>": "0xf0016800" - }, + "<11,28>": "", + "<11,29>": "", + "<11,30>": "", + "<11,31>": "", + "<11,32>": "", "<11,33>": "", "<11,34>": "", - "<11,35>": "", - "<11,36>": "", + "<11,35>": { + "<11,35,1>": "ALL", + "<11,35,2>": "ROTR_BLOCK", + "<11,35,3>": "TW_USAGE", + "<11,35,4>": "UNSIGN" + }, + "<11,36>": "ALL", "<11,37>": "", "<11,38>": "", "<11,39>": "", @@ -1193,7 +2629,12 @@ "<11,41>": "", "<11,42>": "", "<11,43>": "", - "<11,44>": "", + "<11,44>": { + "<11,44,1>": "All Types", + "<11,44,2>": "ROTR Tool Block", + "<11,44,3>": "Test Wafer Logging", + "<11,44,4>": "Load/Unload Unsign" + }, "<11,45>": "", "<11,46>": "", "<11,47>": "", @@ -1201,28 +2642,92 @@ "<11,49>": "", "<11,50>": "", "<11,51>": "", - "<11,52>": "" + "<11,52>": "", + "<11,53>": "", + "<11,54>": "", + "<11,55>": "", + "<11,56>": "", + "<11,57>": "", + "<11,58>": "", + "<11,59>": "", + "<11,60>": "", + "<11,61>": "", + "<11,62>": "0", + "<11,63>": "", + "<11,64>": { + "<11,64,1>": "", + "<11,64,2>": "", + "<11,64,3>": "" + }, + "<11,65>": "-2", + "<11,66>": "", + "<11,67>": "", + "<11,68>": "", + "<11,69>": "", + "<11,70>": "", + "<11,71>": "", + "<11,72>": "", + "<11,73>": "", + "<11,74>": "", + "<11,75>": "", + "<11,76>": "", + "<11,77>": "", + "<11,78>": "", + "<11,79>": "", + "<11,80>": "", + "<11,81>": "", + "<11,82>": "", + "<11,83>": "", + "<11,84>": "", + "<11,85>": "", + "<11,86>": "", + "<11,87>": "", + "<11,88>": "", + "<11,89>": "", + "<11,90>": "0", + "<11,91>": "0", + "<11,92>": "", + "<11,93>": "", + "<11,94>": "", + "<11,95>": "", + "<11,96>": "", + "<11,97>": "", + "<11,98>": "", + "<11,99>": "", + "<11,100>": "", + "<11,101>": "", + "<11,102>": "", + "<11,103>": "", + "<11,104>": "", + "<11,105>": "", + "<11,106>": "", + "<11,107>": "", + "<11,108>": "" }, "<12>": { - "<12,1>": "PUB_DATE_FROM", + "<12,1>": "OLE_DATEPICKER_FROM", "<12,2>": "", - "<12,3>": "PUSHBMP", + "<12,3>": "OLECONTROL.SRP.DatePicker.1", "<12,4>": "OVERRIDE_REPORT", - "<12,5>": "200", - "<12,6>": "120", - "<12,7>": "25", - "<12,8>": "22", - "<12,9>": "", + "<12,5>": "50", + "<12,6>": "140", + "<12,7>": "150", + "<12,8>": "180", + "<12,9>": "SRP.DatePicker.1", "<12,10>": { - "<12,10,1>": "0x5600200B", + "<12,10,1>": "0x46000000", "<12,10,2>": "0x0" }, "<12,11>": { "<12,11,1>": "0x0", "<12,11,2>": "0x80000000" }, - "<12,12>": "12", - "<12,13>": "-2", + "<12,12>": "10", + "<12,13>": { + "<12,13,1>": "-2", + "<12,13,2>": "-2", + "<12,13,3>": "" + }, "<12,14>": "0", "<12,15>": { "<12,15,1>": { @@ -1260,31 +2765,33 @@ "<12,18,1,4,8>": "@PARAM6" }, "<12,18,1,5>": "", - "<12,18,1,6>": "" - }, - "<12,18,2>": "" - }, - "<12,19>": { - "<12,19,1>": "CLICK", - "<12,19,2>": "" + "<12,18,1,6>": "", + "<12,18,1,7>": "", + "<12,18,1,8>": "", + "<12,18,1,9>": "", + "<12,18,1,10>": "", + "<12,18,1,11>": "", + "<12,18,1,12>": "", + "<12,18,1,13>": "", + "<12,18,1,14>": "", + "<12,18,1,15>": "STPROC" + } }, + "<12,19>": "OLE", "<12,20>": "", "<12,21>": "", "<12,22>": "", "<12,23>": "", "<12,24>": "", - "<12,25>": "0", - "<12,26>": "0", + "<12,25>": "", + "<12,26>": "", "<12,27>": "", - "<12,28>": "<>", - "<12,29>": "<>", - "<12,30>": "<>", - "<12,31>": "0", - "<12,32>": { - "<12,32,1>": "0x7fffc", - "<12,32,2>": "0xf0016000" - }, - "<12,33>": "LSL2*IMAGE*BMP*CAL_ICON", + "<12,28>": "", + "<12,29>": "", + "<12,30>": "", + "<12,31>": "", + "<12,32>": "", + "<12,33>": "", "<12,34>": "", "<12,35>": "", "<12,36>": "", @@ -1305,35 +2812,86 @@ "<12,51>": "", "<12,52>": "", "<12,53>": "", - "<12,54>": { - "<12,54,1>": "-5", - "<12,54,2>": "0", - "<12,54,3>": "", - "<12,54,4>": "", - "<12,54,5>": "", - "<12,54,6>": "1" - } + "<12,54>": "", + "<12,55>": "", + "<12,56>": "", + "<12,57>": "", + "<12,58>": "", + "<12,59>": "", + "<12,60>": "", + "<12,61>": "", + "<12,62>": "", + "<12,63>": "", + "<12,64>": "", + "<12,65>": "", + "<12,66>": "", + "<12,67>": "", + "<12,68>": "", + "<12,69>": "", + "<12,70>": "", + "<12,71>": "", + "<12,72>": "", + "<12,73>": "", + "<12,74>": "", + "<12,75>": "", + "<12,76>": "", + "<12,77>": "", + "<12,78>": "", + "<12,79>": "", + "<12,80>": "", + "<12,81>": "", + "<12,82>": "", + "<12,83>": "", + "<12,84>": "", + "<12,85>": "", + "<12,86>": "", + "<12,87>": "", + "<12,88>": "", + "<12,89>": "", + "<12,90>": "", + "<12,91>": "", + "<12,92>": "", + "<12,93>": "", + "<12,94>": "", + "<12,95>": "", + "<12,96>": "", + "<12,97>": "", + "<12,98>": "", + "<12,99>": "", + "<12,100>": "", + "<12,101>": "", + "<12,102>": "", + "<12,103>": "", + "<12,104>": "", + "<12,105>": "", + "<12,106>": "", + "<12,107>": "", + "<12,108>": "" }, "<13>": { - "<13,1>": "PUB_DATE_TO", + "<13,1>": "OLE_DATEPICKER_TO", "<13,2>": "", - "<13,3>": "PUSHBMP", + "<13,3>": "OLECONTROL.SRP.DatePicker.1", "<13,4>": "OVERRIDE_REPORT", - "<13,5>": "400", - "<13,6>": "120", - "<13,7>": "26", - "<13,8>": "24", - "<13,9>": "", + "<13,5>": "240", + "<13,6>": "140", + "<13,7>": "150", + "<13,8>": "180", + "<13,9>": "SRP.DatePicker.1", "<13,10>": { - "<13,10,1>": "0x5600200B", + "<13,10,1>": "0x46000000", "<13,10,2>": "0x0" }, "<13,11>": { "<13,11,1>": "0x0", "<13,11,2>": "0x80000000" }, - "<13,12>": "13", - "<13,13>": "-2", + "<13,12>": "11", + "<13,13>": { + "<13,13,1>": "-2", + "<13,13,2>": "-2", + "<13,13,3>": "" + }, "<13,14>": "0", "<13,15>": { "<13,15,1>": { @@ -1371,31 +2929,33 @@ "<13,18,1,4,8>": "@PARAM6" }, "<13,18,1,5>": "", - "<13,18,1,6>": "" - }, - "<13,18,2>": "" - }, - "<13,19>": { - "<13,19,1>": "CLICK", - "<13,19,2>": "" + "<13,18,1,6>": "", + "<13,18,1,7>": "", + "<13,18,1,8>": "", + "<13,18,1,9>": "", + "<13,18,1,10>": "", + "<13,18,1,11>": "", + "<13,18,1,12>": "", + "<13,18,1,13>": "", + "<13,18,1,14>": "", + "<13,18,1,15>": "STPROC" + } }, + "<13,19>": "OLE", "<13,20>": "", "<13,21>": "", "<13,22>": "", "<13,23>": "", "<13,24>": "", - "<13,25>": "0", - "<13,26>": "0", + "<13,25>": "", + "<13,26>": "", "<13,27>": "", - "<13,28>": "<>", - "<13,29>": "<>", - "<13,30>": "<>", - "<13,31>": "0", - "<13,32>": { - "<13,32,1>": "0x7fffc", - "<13,32,2>": "0xf0016000" - }, - "<13,33>": "LSL2*IMAGE*BMP*CAL_ICON", + "<13,28>": "", + "<13,29>": "", + "<13,30>": "", + "<13,31>": "", + "<13,32>": "", + "<13,33>": "", "<13,34>": "", "<13,35>": "", "<13,36>": "", @@ -1416,35 +2976,86 @@ "<13,51>": "", "<13,52>": "", "<13,53>": "", - "<13,54>": { - "<13,54,1>": "-5", - "<13,54,2>": "0", - "<13,54,3>": "", - "<13,54,4>": "", - "<13,54,5>": "", - "<13,54,6>": "1" - } + "<13,54>": "", + "<13,55>": "", + "<13,56>": "", + "<13,57>": "", + "<13,58>": "", + "<13,59>": "", + "<13,60>": "", + "<13,61>": "", + "<13,62>": "", + "<13,63>": "", + "<13,64>": "", + "<13,65>": "", + "<13,66>": "", + "<13,67>": "", + "<13,68>": "", + "<13,69>": "", + "<13,70>": "", + "<13,71>": "", + "<13,72>": "", + "<13,73>": "", + "<13,74>": "", + "<13,75>": "", + "<13,76>": "", + "<13,77>": "", + "<13,78>": "", + "<13,79>": "", + "<13,80>": "", + "<13,81>": "", + "<13,82>": "", + "<13,83>": "", + "<13,84>": "", + "<13,85>": "", + "<13,86>": "", + "<13,87>": "", + "<13,88>": "", + "<13,89>": "", + "<13,90>": "", + "<13,91>": "", + "<13,92>": "", + "<13,93>": "", + "<13,94>": "", + "<13,95>": "", + "<13,96>": "", + "<13,97>": "", + "<13,98>": "", + "<13,99>": "", + "<13,100>": "", + "<13,101>": "", + "<13,102>": "", + "<13,103>": "", + "<13,104>": "", + "<13,105>": "", + "<13,106>": "", + "<13,107>": "", + "<13,108>": "" }, "<14>": { - "<14,1>": "FILE_PATH", + "<14,1>": "PUB_DATE_FROM", "<14,2>": "", - "<14,3>": "EDITFIELD", + "<14,3>": "PUSHBMP", "<14,4>": "OVERRIDE_REPORT", - "<14,5>": "720", - "<14,6>": "90", - "<14,7>": "225", + "<14,5>": "180", + "<14,6>": "246", + "<14,7>": "24", "<14,8>": "24", - "<14,9>": "V:\\OIReports\\overrideexport.csv", + "<14,9>": "", "<14,10>": { - "<14,10,1>": "0x56000080", - "<14,10,2>": "0x200" + "<14,10,1>": "0x56002300", + "<14,10,2>": "0x0" }, "<14,11>": { "<14,11,1>": "0x0", "<14,11,2>": "0x80000000" }, - "<14,12>": "14", - "<14,13>": "-2", + "<14,12>": "12", + "<14,13>": { + "<14,13,1>": "-2", + "<14,13,2>": "-2", + "<14,13,3>": "0" + }, "<14,14>": "0", "<14,15>": { "<14,15,1>": { @@ -1466,33 +3077,60 @@ }, "<14,16>": "", "<14,17>": "", - "<14,18>": "", - "<14,19>": "", + "<14,18>": { + "<14,18,1>": { + "<14,18,1,1>": "R", + "<14,18,1,2>": "EXECUTE", + "<14,18,1,3>": "SYSPROG*STPROCEXE**OBJ_CALL_EVENT", + "<14,18,1,4>": { + "<14,18,1,4,1>": "@SELF", + "<14,18,1,4,2>": "@EVENT", + "<14,18,1,4,3>": "@PARAM1", + "<14,18,1,4,4>": "@PARAM2", + "<14,18,1,4,5>": "@PARAM3", + "<14,18,1,4,6>": "@PARAM4", + "<14,18,1,4,7>": "@PARAM5", + "<14,18,1,4,8>": "@PARAM6" + }, + "<14,18,1,5>": "", + "<14,18,1,6>": "", + "<14,18,1,7>": "", + "<14,18,1,8>": "", + "<14,18,1,9>": "", + "<14,18,1,10>": "", + "<14,18,1,11>": "", + "<14,18,1,12>": "", + "<14,18,1,13>": "", + "<14,18,1,14>": "", + "<14,18,1,15>": "STPROC" + } + }, + "<14,19>": "CLICK", "<14,20>": "", "<14,21>": "", "<14,22>": "", "<14,23>": "", "<14,24>": "", - "<14,25>": "0", - "<14,26>": "0", + "<14,25>": "", + "<14,26>": "", "<14,27>": "", - "<14,28>": "<>", - "<14,29>": "<>", - "<14,30>": "<>", - "<14,31>": "0", - "<14,32>": { - "<14,32,1>": "0x7fffe", - "<14,32,2>": "0xf0016c08" - }, - "<14,33>": "", + "<14,28>": "", + "<14,29>": "", + "<14,30>": "", + "<14,31>": "", + "<14,32>": "", + "<14,33>": "LSL2*IMAGE*BMP*CAL_ICON", "<14,34>": "", "<14,35>": "", "<14,36>": "", "<14,37>": "", "<14,38>": "", "<14,39>": "", - "<14,40>": "", - "<14,41>": "", + "<14,40>": "-1", + "<14,41>": { + "<14,41,1>": "", + "<14,41,2>": "-1" + }, "<14,42>": "", "<14,43>": "", "<14,44>": "", @@ -1503,28 +3141,103 @@ "<14,49>": "", "<14,50>": "", "<14,51>": "", - "<14,52>": "" + "<14,52>": "", + "<14,53>": "", + "<14,54>": { + "<14,54,1>": "-5", + "<14,54,2>": "0", + "<14,54,3>": "", + "<14,54,4>": "", + "<14,54,5>": "", + "<14,54,6>": "1", + "<14,54,7>": "", + "<14,54,8>": "", + "<14,54,9>": "", + "<14,54,10>": "0" + }, + "<14,55>": "", + "<14,56>": "", + "<14,57>": "", + "<14,58>": "", + "<14,59>": "", + "<14,60>": "", + "<14,61>": "", + "<14,62>": "0", + "<14,63>": "", + "<14,64>": { + "<14,64,1>": "-2", + "<14,64,2>": "-2", + "<14,64,3>": "0" + }, + "<14,65>": "-2", + "<14,66>": "", + "<14,67>": "", + "<14,68>": "", + "<14,69>": "", + "<14,70>": "", + "<14,71>": "", + "<14,72>": "", + "<14,73>": "", + "<14,74>": "", + "<14,75>": "", + "<14,76>": "", + "<14,77>": "", + "<14,78>": "", + "<14,79>": "", + "<14,80>": "", + "<14,81>": "", + "<14,82>": "", + "<14,83>": "", + "<14,84>": "", + "<14,85>": "", + "<14,86>": "", + "<14,87>": "", + "<14,88>": "", + "<14,89>": "", + "<14,90>": "0", + "<14,91>": "0", + "<14,92>": "", + "<14,93>": "", + "<14,94>": "", + "<14,95>": "", + "<14,96>": "", + "<14,97>": "", + "<14,98>": "", + "<14,99>": "", + "<14,100>": "", + "<14,101>": "", + "<14,102>": "", + "<14,103>": "", + "<14,104>": "", + "<14,105>": "", + "<14,106>": "", + "<14,107>": "", + "<14,108>": "" }, "<15>": { - "<15,1>": "PUB_DIR_BROWSE", + "<15,1>": "PUB_DATE_TO", "<15,2>": "", - "<15,3>": "PUSHBUTTON", + "<15,3>": "PUSHBMP", "<15,4>": "OVERRIDE_REPORT", - "<15,5>": "950", - "<15,6>": "90", - "<15,7>": "66", - "<15,8>": "25", - "<15,9>": "Browse", + "<15,5>": "388", + "<15,6>": "247", + "<15,7>": "28", + "<15,8>": "24", + "<15,9>": "", "<15,10>": { - "<15,10,1>": "0x56002000", + "<15,10,1>": "0x56002300", "<15,10,2>": "0x0" }, "<15,11>": { - "<15,11,1>": "0x108", + "<15,11,1>": "0x0", "<15,11,2>": "0x80000000" }, - "<15,12>": "15", - "<15,13>": "-2", + "<15,12>": "13", + "<15,13>": { + "<15,13,1>": "-2", + "<15,13,2>": "-2", + "<15,13,3>": "0" + }, "<15,14>": "0", "<15,15>": { "<15,15,1>": { @@ -1562,39 +3275,44 @@ "<15,18,1,4,8>": "@PARAM6" }, "<15,18,1,5>": "", - "<15,18,1,6>": "" - }, - "<15,18,2>": "" - }, - "<15,19>": { - "<15,19,1>": "CLICK", - "<15,19,2>": "" + "<15,18,1,6>": "", + "<15,18,1,7>": "", + "<15,18,1,8>": "", + "<15,18,1,9>": "", + "<15,18,1,10>": "", + "<15,18,1,11>": "", + "<15,18,1,12>": "", + "<15,18,1,13>": "", + "<15,18,1,14>": "", + "<15,18,1,15>": "STPROC" + } }, + "<15,19>": "CLICK", "<15,20>": "", "<15,21>": "", "<15,22>": "", "<15,23>": "", "<15,24>": "", - "<15,25>": "0", - "<15,26>": "0", + "<15,25>": "", + "<15,26>": "", "<15,27>": "", - "<15,28>": "<>", - "<15,29>": "<>", - "<15,30>": "<>", - "<15,31>": "0", - "<15,32>": { - "<15,32,1>": "0x7fffe", - "<15,32,2>": "0xf0016008" - }, - "<15,33>": "", + "<15,28>": "", + "<15,29>": "", + "<15,30>": "", + "<15,31>": "", + "<15,32>": "", + "<15,33>": "LSL2*IMAGE*BMP*CAL_ICON", "<15,34>": "", "<15,35>": "", "<15,36>": "", "<15,37>": "", "<15,38>": "", "<15,39>": "", - "<15,40>": "1", - "<15,41>": "", + "<15,40>": "-1", + "<15,41>": { + "<15,41,1>": "", + "<15,41,2>": "-1" + }, "<15,42>": "", "<15,43>": "", "<15,44>": "", @@ -1605,28 +3323,103 @@ "<15,49>": "", "<15,50>": "", "<15,51>": "", - "<15,52>": "" + "<15,52>": "", + "<15,53>": "", + "<15,54>": { + "<15,54,1>": "-5", + "<15,54,2>": "0", + "<15,54,3>": "", + "<15,54,4>": "", + "<15,54,5>": "", + "<15,54,6>": "1", + "<15,54,7>": "", + "<15,54,8>": "", + "<15,54,9>": "", + "<15,54,10>": "0" + }, + "<15,55>": "", + "<15,56>": "", + "<15,57>": "", + "<15,58>": "", + "<15,59>": "", + "<15,60>": "", + "<15,61>": "", + "<15,62>": "0", + "<15,63>": "", + "<15,64>": { + "<15,64,1>": "-2", + "<15,64,2>": "-2", + "<15,64,3>": "0" + }, + "<15,65>": "-2", + "<15,66>": "", + "<15,67>": "", + "<15,68>": "", + "<15,69>": "", + "<15,70>": "", + "<15,71>": "", + "<15,72>": "", + "<15,73>": "", + "<15,74>": "", + "<15,75>": "", + "<15,76>": "", + "<15,77>": "", + "<15,78>": "", + "<15,79>": "", + "<15,80>": "", + "<15,81>": "", + "<15,82>": "", + "<15,83>": "", + "<15,84>": "", + "<15,85>": "", + "<15,86>": "", + "<15,87>": "", + "<15,88>": "", + "<15,89>": "", + "<15,90>": "0", + "<15,91>": "0", + "<15,92>": "", + "<15,93>": "", + "<15,94>": "", + "<15,95>": "", + "<15,96>": "", + "<15,97>": "", + "<15,98>": "", + "<15,99>": "", + "<15,100>": "", + "<15,101>": "", + "<15,102>": "", + "<15,103>": "", + "<15,104>": "", + "<15,105>": "", + "<15,106>": "", + "<15,107>": "", + "<15,108>": "" }, "<16>": { - "<16,1>": "LABEL_FILEPATH", + "<16,1>": "FILE_PATH", "<16,2>": "", - "<16,3>": "STATIC", + "<16,3>": "EDITFIELD", "<16,4>": "OVERRIDE_REPORT", - "<16,5>": "730", - "<16,6>": "70", - "<16,7>": "100", - "<16,8>": "19", - "<16,9>": "File Destination", + "<16,5>": "720", + "<16,6>": "90", + "<16,7>": "225", + "<16,8>": "24", + "<16,9>": "V:\\OIReports\\overrideexport.csv", "<16,10>": { - "<16,10,1>": "0x56000000", - "<16,10,2>": "0x0" + "<16,10,1>": "0x56000080", + "<16,10,2>": "0x200" }, "<16,11>": { "<16,11,1>": "0x0", "<16,11,2>": "0x80000000" }, - "<16,12>": "16", - "<16,13>": "-1", + "<16,12>": "14", + "<16,13>": { + "<16,13,1>": "-2", + "<16,13,2>": "-2", + "<16,13,3>": "" + }, "<16,14>": "0", "<16,15>": { "<16,15,1>": { @@ -1655,21 +3448,21 @@ "<16,22>": "", "<16,23>": "", "<16,24>": "", - "<16,25>": "0", - "<16,26>": "0", + "<16,25>": "", + "<16,26>": "", "<16,27>": "", "<16,28>": "<>", "<16,29>": "<>", "<16,30>": "<>", "<16,31>": "0", - "<16,32>": { - "<16,32,1>": "0x7fffe", - "<16,32,2>": "0xf0016d88" - }, + "<16,32>": "", "<16,33>": "", "<16,34>": "", "<16,35>": "", - "<16,36>": "", + "<16,36>": { + "<16,36,1>": "0", + "<16,36,2>": "0" + }, "<16,37>": "", "<16,38>": "", "<16,39>": "", @@ -1685,28 +3478,88 @@ "<16,49>": "", "<16,50>": "", "<16,51>": "", - "<16,52>": "" + "<16,52>": "", + "<16,53>": "", + "<16,54>": "", + "<16,55>": "", + "<16,56>": "", + "<16,57>": "", + "<16,58>": "", + "<16,59>": "", + "<16,60>": "", + "<16,61>": "", + "<16,62>": "0", + "<16,63>": "", + "<16,64>": "", + "<16,65>": "", + "<16,66>": "", + "<16,67>": "", + "<16,68>": "", + "<16,69>": "", + "<16,70>": "", + "<16,71>": "", + "<16,72>": "", + "<16,73>": "", + "<16,74>": "", + "<16,75>": "", + "<16,76>": "", + "<16,77>": "", + "<16,78>": "", + "<16,79>": "", + "<16,80>": "", + "<16,81>": "", + "<16,82>": "", + "<16,83>": "", + "<16,84>": "", + "<16,85>": "", + "<16,86>": "", + "<16,87>": "", + "<16,88>": "", + "<16,89>": "", + "<16,90>": "", + "<16,91>": "", + "<16,92>": "", + "<16,93>": "", + "<16,94>": "", + "<16,95>": "", + "<16,96>": "", + "<16,97>": "", + "<16,98>": "", + "<16,99>": "", + "<16,100>": "", + "<16,101>": "", + "<16,102>": "", + "<16,103>": "", + "<16,104>": "", + "<16,105>": "", + "<16,106>": "", + "<16,107>": "", + "<16,108>": "" }, "<17>": { - "<17,1>": "PUB_EXPORT", + "<17,1>": "PUB_DIR_BROWSE", "<17,2>": "", "<17,3>": "PUSHBUTTON", "<17,4>": "OVERRIDE_REPORT", - "<17,5>": "1030", - "<17,6>": "80", - "<17,7>": "78", - "<17,8>": "33", - "<17,9>": "Export", + "<17,5>": "950", + "<17,6>": "90", + "<17,7>": "66", + "<17,8>": "25", + "<17,9>": "Browse", "<17,10>": { - "<17,10,1>": "0x56002000", + "<17,10,1>": "0x56002300", "<17,10,2>": "0x0" }, "<17,11>": { - "<17,11,1>": "0x100", + "<17,11,1>": "0x0", "<17,11,2>": "0x80000000" }, - "<17,12>": "17", - "<17,13>": "-2", + "<17,12>": "15", + "<17,13>": { + "<17,13,1>": "-2", + "<17,13,2>": "-2", + "<17,13,3>": "0" + }, "<17,14>": "0", "<17,15>": { "<17,15,1>": { @@ -1744,30 +3597,32 @@ "<17,18,1,4,8>": "@PARAM6" }, "<17,18,1,5>": "", - "<17,18,1,6>": "" - }, - "<17,18,2>": "" - }, - "<17,19>": { - "<17,19,1>": "CLICK", - "<17,19,2>": "" + "<17,18,1,6>": "", + "<17,18,1,7>": "", + "<17,18,1,8>": "", + "<17,18,1,9>": "", + "<17,18,1,10>": "", + "<17,18,1,11>": "", + "<17,18,1,12>": "", + "<17,18,1,13>": "", + "<17,18,1,14>": "", + "<17,18,1,15>": "STPROC" + } }, + "<17,19>": "CLICK", "<17,20>": "", "<17,21>": "", "<17,22>": "", "<17,23>": "", "<17,24>": "", - "<17,25>": "0", - "<17,26>": "0", + "<17,25>": "", + "<17,26>": "", "<17,27>": "", - "<17,28>": "<>", - "<17,29>": "<>", - "<17,30>": "<>", - "<17,31>": "0", - "<17,32>": { - "<17,32,1>": "0x7fffe", - "<17,32,2>": "0xf0016008" - }, + "<17,28>": "", + "<17,29>": "", + "<17,30>": "", + "<17,31>": "", + "<17,32>": "", "<17,33>": "", "<17,34>": "", "<17,35>": "", @@ -1776,7 +3631,10 @@ "<17,38>": "", "<17,39>": "", "<17,40>": "1", - "<17,41>": "", + "<17,41>": { + "<17,41,1>": "", + "<17,41,2>": "-1" + }, "<17,42>": "", "<17,43>": "", "<17,44>": "", @@ -1787,28 +3645,92 @@ "<17,49>": "", "<17,50>": "", "<17,51>": "", - "<17,52>": "" + "<17,52>": "", + "<17,53>": "", + "<17,54>": "", + "<17,55>": "", + "<17,56>": "", + "<17,57>": "", + "<17,58>": "", + "<17,59>": "", + "<17,60>": "", + "<17,61>": "", + "<17,62>": "0", + "<17,63>": "", + "<17,64>": { + "<17,64,1>": "-2", + "<17,64,2>": "-2", + "<17,64,3>": "0" + }, + "<17,65>": "-2", + "<17,66>": "", + "<17,67>": "", + "<17,68>": "", + "<17,69>": "", + "<17,70>": "", + "<17,71>": "", + "<17,72>": "", + "<17,73>": "", + "<17,74>": "", + "<17,75>": "", + "<17,76>": "", + "<17,77>": "", + "<17,78>": "", + "<17,79>": "", + "<17,80>": "", + "<17,81>": "", + "<17,82>": "", + "<17,83>": "", + "<17,84>": "", + "<17,85>": "", + "<17,86>": "", + "<17,87>": "", + "<17,88>": "", + "<17,89>": "", + "<17,90>": "0", + "<17,91>": "0", + "<17,92>": "", + "<17,93>": "", + "<17,94>": "", + "<17,95>": "", + "<17,96>": "", + "<17,97>": "", + "<17,98>": "", + "<17,99>": "", + "<17,100>": "", + "<17,101>": "", + "<17,102>": "", + "<17,103>": "", + "<17,104>": "", + "<17,105>": "", + "<17,106>": "", + "<17,107>": "", + "<17,108>": "" }, "<18>": { - "<18,1>": "REPORT_BY", + "<18,1>": "LABEL_FILEPATH", "<18,2>": "", - "<18,3>": "RADIOGROUP", + "<18,3>": "STATIC", "<18,4>": "OVERRIDE_REPORT", - "<18,5>": "49", - "<18,6>": "49", - "<18,7>": "329", - "<18,8>": "18", - "<18,9>": "", + "<18,5>": "730", + "<18,6>": "70", + "<18,7>": "100", + "<18,8>": "19", + "<18,9>": "File Destination", "<18,10>": { "<18,10,1>": "0x56000000", "<18,10,2>": "0x0" }, "<18,11>": { - "<18,11,1>": "0x210", + "<18,11,1>": "0x0", "<18,11,2>": "0x80000000" }, - "<18,12>": "18", - "<18,13>": "-1", + "<18,12>": "16", + "<18,13>": { + "<18,13,1>": "-1", + "<18,13,2>": "-1", + "<18,13,3>": "" + }, "<18,14>": "0", "<18,15>": { "<18,15,1>": { @@ -1830,56 +3752,25 @@ }, "<18,16>": "", "<18,17>": "", - "<18,18>": { - "<18,18,1>": { - "<18,18,1,1>": "R", - "<18,18,1,2>": "EXECUTE", - "<18,18,1,3>": "SYSPROG*STPROCEXE**OBJ_CALL_EVENT", - "<18,18,1,4>": { - "<18,18,1,4,1>": "@SELF", - "<18,18,1,4,2>": "@EVENT", - "<18,18,1,4,3>": "@PARAM1", - "<18,18,1,4,4>": "@PARAM2", - "<18,18,1,4,5>": "@PARAM3", - "<18,18,1,4,6>": "@PARAM4", - "<18,18,1,4,7>": "@PARAM5", - "<18,18,1,4,8>": "@PARAM6" - }, - "<18,18,1,5>": "", - "<18,18,1,6>": "" - }, - "<18,18,2>": "" - }, - "<18,19>": { - "<18,19,1>": "CLICK", - "<18,19,2>": "" - }, + "<18,18>": "", + "<18,19>": "", "<18,20>": "", "<18,21>": "", "<18,22>": "", "<18,23>": "", "<18,24>": "", - "<18,25>": "0", - "<18,26>": "0", + "<18,25>": "", + "<18,26>": "", "<18,27>": "", - "<18,28>": "<>", - "<18,29>": "<>", - "<18,30>": "<>", - "<18,31>": "0", - "<18,32>": { - "<18,32,1>": "0x3eff6", - "<18,32,2>": "0x0" - }, + "<18,28>": "", + "<18,29>": "", + "<18,30>": "", + "<18,31>": "", + "<18,32>": "", "<18,33>": "", "<18,34>": "", - "<18,35>": { - "<18,35,1>": "ALL", - "<18,35,2>": "RDS", - "<18,35,3>": "REACTOR", - "<18,35,4>": "USER", - "<18,35,5>": "OVERRIDE" - }, - "<18,36>": "ALL", + "<18,35>": "", + "<18,36>": "", "<18,37>": "", "<18,38>": "", "<18,39>": "", @@ -1887,13 +3778,7 @@ "<18,41>": "", "<18,42>": "", "<18,43>": "", - "<18,44>": { - "<18,44,1>": "ALL", - "<18,44,2>": "RDS", - "<18,44,3>": "REACTOR", - "<18,44,4>": "USER", - "<18,44,5>": "OVERRIDE" - }, + "<18,44>": "", "<18,45>": "", "<18,46>": "", "<18,47>": "", @@ -1901,28 +3786,101 @@ "<18,49>": "", "<18,50>": "", "<18,51>": "", - "<18,52>": "" + "<18,52>": "", + "<18,53>": "", + "<18,54>": "", + "<18,55>": "", + "<18,56>": "", + "<18,57>": "", + "<18,58>": "", + "<18,59>": "", + "<18,60>": "", + "<18,61>": "", + "<18,62>": "0", + "<18,63>": { + "<18,63,1>": "", + "<18,63,2>": "", + "<18,63,3>": "", + "<18,63,4>": "", + "<18,63,5>": "", + "<18,63,6>": "", + "<18,63,7>": "", + "<18,63,8>": "" + }, + "<18,64>": { + "<18,64,1>": "", + "<18,64,2>": "", + "<18,64,3>": "" + }, + "<18,65>": "-2", + "<18,66>": "", + "<18,67>": "", + "<18,68>": "", + "<18,69>": "", + "<18,70>": "", + "<18,71>": "", + "<18,72>": "", + "<18,73>": "", + "<18,74>": "", + "<18,75>": "", + "<18,76>": "", + "<18,77>": "", + "<18,78>": "", + "<18,79>": "", + "<18,80>": "", + "<18,81>": "", + "<18,82>": "", + "<18,83>": "", + "<18,84>": "", + "<18,85>": "", + "<18,86>": "", + "<18,87>": "", + "<18,88>": "", + "<18,89>": "", + "<18,90>": "0", + "<18,91>": "0", + "<18,92>": "", + "<18,93>": "", + "<18,94>": "", + "<18,95>": "", + "<18,96>": "", + "<18,97>": "", + "<18,98>": "", + "<18,99>": "", + "<18,100>": "", + "<18,101>": "", + "<18,102>": "", + "<18,103>": "", + "<18,104>": "", + "<18,105>": "", + "<18,106>": "", + "<18,107>": "", + "<18,108>": "" }, "<19>": { - "<19,1>": "OVERRIDE_SEARCH", + "<19,1>": "PUB_EXPORT", "<19,2>": "", - "<19,3>": "GROUPBOX", + "<19,3>": "PUSHBUTTON", "<19,4>": "OVERRIDE_REPORT", - "<19,5>": "30", - "<19,6>": "180", - "<19,7>": "286", - "<19,8>": "40", - "<19,9>": "Override Type", + "<19,5>": "1030", + "<19,6>": "80", + "<19,7>": "78", + "<19,8>": "33", + "<19,9>": "Export", "<19,10>": { - "<19,10,1>": "0x56000000", + "<19,10,1>": "0x56002300", "<19,10,2>": "0x0" }, "<19,11>": { "<19,11,1>": "0x0", "<19,11,2>": "0x80000000" }, - "<19,12>": "19", - "<19,13>": "-1", + "<19,12>": "17", + "<19,13>": { + "<19,13,1>": "-2", + "<19,13,2>": "-2", + "<19,13,3>": "0" + }, "<19,14>": "0", "<19,15>": { "<19,15,1>": { @@ -1944,24 +3902,48 @@ }, "<19,16>": "", "<19,17>": "", - "<19,18>": "", - "<19,19>": "", + "<19,18>": { + "<19,18,1>": { + "<19,18,1,1>": "R", + "<19,18,1,2>": "EXECUTE", + "<19,18,1,3>": "SYSPROG*STPROCEXE**OBJ_CALL_EVENT", + "<19,18,1,4>": { + "<19,18,1,4,1>": "@SELF", + "<19,18,1,4,2>": "@EVENT", + "<19,18,1,4,3>": "@PARAM1", + "<19,18,1,4,4>": "@PARAM2", + "<19,18,1,4,5>": "@PARAM3", + "<19,18,1,4,6>": "@PARAM4", + "<19,18,1,4,7>": "@PARAM5", + "<19,18,1,4,8>": "@PARAM6" + }, + "<19,18,1,5>": "", + "<19,18,1,6>": "", + "<19,18,1,7>": "", + "<19,18,1,8>": "", + "<19,18,1,9>": "", + "<19,18,1,10>": "", + "<19,18,1,11>": "", + "<19,18,1,12>": "", + "<19,18,1,13>": "", + "<19,18,1,14>": "", + "<19,18,1,15>": "STPROC" + } + }, + "<19,19>": "CLICK", "<19,20>": "", "<19,21>": "", "<19,22>": "", "<19,23>": "", "<19,24>": "", - "<19,25>": "0", - "<19,26>": "0", + "<19,25>": "", + "<19,26>": "", "<19,27>": "", - "<19,28>": "<>", - "<19,29>": "<>", - "<19,30>": "<>", - "<19,31>": "0", - "<19,32>": { - "<19,32,1>": "0x7fffe", - "<19,32,2>": "0xf0016c08" - }, + "<19,28>": "", + "<19,29>": "", + "<19,30>": "", + "<19,31>": "", + "<19,32>": "", "<19,33>": "", "<19,34>": "", "<19,35>": "", @@ -1969,8 +3951,11 @@ "<19,37>": "", "<19,38>": "", "<19,39>": "", - "<19,40>": "", - "<19,41>": "", + "<19,40>": "1", + "<19,41>": { + "<19,41,1>": "", + "<19,41,2>": "-1" + }, "<19,42>": "", "<19,43>": "", "<19,44>": "", @@ -1981,28 +3966,92 @@ "<19,49>": "", "<19,50>": "", "<19,51>": "", - "<19,52>": "" + "<19,52>": "", + "<19,53>": "", + "<19,54>": "", + "<19,55>": "", + "<19,56>": "", + "<19,57>": "", + "<19,58>": "", + "<19,59>": "", + "<19,60>": "", + "<19,61>": "", + "<19,62>": "0", + "<19,63>": "", + "<19,64>": { + "<19,64,1>": "-2", + "<19,64,2>": "-2", + "<19,64,3>": "0" + }, + "<19,65>": "-2", + "<19,66>": "", + "<19,67>": "", + "<19,68>": "", + "<19,69>": "", + "<19,70>": "", + "<19,71>": "", + "<19,72>": "", + "<19,73>": "", + "<19,74>": "", + "<19,75>": "", + "<19,76>": "", + "<19,77>": "", + "<19,78>": "", + "<19,79>": "", + "<19,80>": "", + "<19,81>": "", + "<19,82>": "", + "<19,83>": "", + "<19,84>": "", + "<19,85>": "", + "<19,86>": "", + "<19,87>": "", + "<19,88>": "", + "<19,89>": "", + "<19,90>": "0", + "<19,91>": "0", + "<19,92>": "", + "<19,93>": "", + "<19,94>": "", + "<19,95>": "", + "<19,96>": "", + "<19,97>": "", + "<19,98>": "", + "<19,99>": "", + "<19,100>": "", + "<19,101>": "", + "<19,102>": "", + "<19,103>": "", + "<19,104>": "", + "<19,105>": "", + "<19,106>": "", + "<19,107>": "", + "<19,108>": "" }, "<20>": { - "<20,1>": "DATE_SELECTIONS", + "<20,1>": "REPORT_BY", "<20,2>": "", - "<20,3>": "GROUPBOX", + "<20,3>": "RADIOGROUP", "<20,4>": "OVERRIDE_REPORT", - "<20,5>": "40", - "<20,6>": "84", - "<20,7>": "570", - "<20,8>": "90", - "<20,9>": "Date Selection", + "<20,5>": "19", + "<20,6>": "49", + "<20,7>": "340", + "<20,8>": "18", + "<20,9>": "", "<20,10>": { "<20,10,1>": "0x56000000", "<20,10,2>": "0x0" }, "<20,11>": { - "<20,11,1>": "0x0", + "<20,11,1>": "0x210", "<20,11,2>": "0x80000000" }, - "<20,12>": "20", - "<20,13>": "-1", + "<20,12>": "18", + "<20,13>": { + "<20,13,1>": "-1", + "<20,13,2>": "-1", + "<20,13,3>": "" + }, "<20,14>": "0", "<20,15>": { "<20,15,1>": { @@ -2024,28 +4073,58 @@ }, "<20,16>": "", "<20,17>": "", - "<20,18>": "", - "<20,19>": "", + "<20,18>": { + "<20,18,1>": { + "<20,18,1,1>": "R", + "<20,18,1,2>": "EXECUTE", + "<20,18,1,3>": "SYSPROG*STPROCEXE**OBJ_CALL_EVENT", + "<20,18,1,4>": { + "<20,18,1,4,1>": "@SELF", + "<20,18,1,4,2>": "@EVENT", + "<20,18,1,4,3>": "@PARAM1", + "<20,18,1,4,4>": "@PARAM2", + "<20,18,1,4,5>": "@PARAM3", + "<20,18,1,4,6>": "@PARAM4", + "<20,18,1,4,7>": "@PARAM5", + "<20,18,1,4,8>": "@PARAM6" + }, + "<20,18,1,5>": "", + "<20,18,1,6>": "", + "<20,18,1,7>": "", + "<20,18,1,8>": "", + "<20,18,1,9>": "", + "<20,18,1,10>": "", + "<20,18,1,11>": "", + "<20,18,1,12>": "", + "<20,18,1,13>": "", + "<20,18,1,14>": "", + "<20,18,1,15>": "STPROC" + } + }, + "<20,19>": "CLICK", "<20,20>": "", "<20,21>": "", "<20,22>": "", "<20,23>": "", "<20,24>": "", - "<20,25>": "0", - "<20,26>": "0", + "<20,25>": "", + "<20,26>": "", "<20,27>": "", - "<20,28>": "<>", - "<20,29>": "<>", - "<20,30>": "<>", - "<20,31>": "0", - "<20,32>": { - "<20,32,1>": "0x7fffe", - "<20,32,2>": "0xf0016c08" - }, + "<20,28>": "", + "<20,29>": "", + "<20,30>": "", + "<20,31>": "", + "<20,32>": "", "<20,33>": "", "<20,34>": "", - "<20,35>": "", - "<20,36>": "", + "<20,35>": { + "<20,35,1>": "ALL", + "<20,35,2>": "RDS", + "<20,35,3>": "REACTOR", + "<20,35,4>": "USER", + "<20,35,5>": "OVERRIDE" + }, + "<20,36>": "ALL", "<20,37>": "", "<20,38>": "", "<20,39>": "", @@ -2053,7 +4132,13 @@ "<20,41>": "", "<20,42>": "", "<20,43>": "", - "<20,44>": "", + "<20,44>": { + "<20,44,1>": "ALL", + "<20,44,2>": "RDS", + "<20,44,3>": "REACTOR", + "<20,44,4>": "USER", + "<20,44,5>": "OVERRIDE" + }, "<20,45>": "", "<20,46>": "", "<20,47>": "", @@ -2061,18 +4146,78 @@ "<20,49>": "", "<20,50>": "", "<20,51>": "", - "<20,52>": "" + "<20,52>": "", + "<20,53>": "", + "<20,54>": "", + "<20,55>": "", + "<20,56>": "", + "<20,57>": "", + "<20,58>": "", + "<20,59>": "", + "<20,60>": "", + "<20,61>": "", + "<20,62>": "0", + "<20,63>": "", + "<20,64>": { + "<20,64,1>": "", + "<20,64,2>": "", + "<20,64,3>": "" + }, + "<20,65>": "-2", + "<20,66>": "", + "<20,67>": "", + "<20,68>": "", + "<20,69>": "", + "<20,70>": "", + "<20,71>": "", + "<20,72>": "", + "<20,73>": "", + "<20,74>": "", + "<20,75>": "", + "<20,76>": "", + "<20,77>": "", + "<20,78>": "", + "<20,79>": "", + "<20,80>": "", + "<20,81>": "", + "<20,82>": "", + "<20,83>": "", + "<20,84>": "", + "<20,85>": "", + "<20,86>": "", + "<20,87>": "", + "<20,88>": "", + "<20,89>": "", + "<20,90>": "0", + "<20,91>": "0", + "<20,92>": "", + "<20,93>": "", + "<20,94>": "", + "<20,95>": "", + "<20,96>": "", + "<20,97>": "", + "<20,98>": "", + "<20,99>": "", + "<20,100>": "", + "<20,101>": "", + "<20,102>": "", + "<20,103>": "", + "<20,104>": "", + "<20,105>": "", + "<20,106>": "", + "<20,107>": "", + "<20,108>": "" }, "<21>": { - "<21,1>": "EXPORT_OPTIONS", + "<21,1>": "OVERRIDE_SEARCH", "<21,2>": "", "<21,3>": "GROUPBOX", "<21,4>": "OVERRIDE_REPORT", - "<21,5>": "710", - "<21,6>": "20", - "<21,7>": "490", - "<21,8>": "120", - "<21,9>": "Export Options", + "<21,5>": "12", + "<21,6>": "70", + "<21,7>": "400", + "<21,8>": "40", + "<21,9>": "Override Type", "<21,10>": { "<21,10,1>": "0x56000000", "<21,10,2>": "0x0" @@ -2081,8 +4226,12 @@ "<21,11,1>": "0x0", "<21,11,2>": "0x80000000" }, - "<21,12>": "21", - "<21,13>": "-1", + "<21,12>": "19", + "<21,13>": { + "<21,13,1>": "-1", + "<21,13,2>": "-1", + "<21,13,3>": "" + }, "<21,14>": "0", "<21,15>": { "<21,15,1>": { @@ -2111,17 +4260,14 @@ "<21,22>": "", "<21,23>": "", "<21,24>": "", - "<21,25>": "0", - "<21,26>": "0", + "<21,25>": "", + "<21,26>": "", "<21,27>": "", - "<21,28>": "<>", - "<21,29>": "<>", - "<21,30>": "<>", - "<21,31>": "0", - "<21,32>": { - "<21,32,1>": "0x7fffe", - "<21,32,2>": "0xf0016c08" - }, + "<21,28>": "", + "<21,29>": "", + "<21,30>": "", + "<21,31>": "", + "<21,32>": "", "<21,33>": "", "<21,34>": "", "<21,35>": "", @@ -2141,18 +4287,87 @@ "<21,49>": "", "<21,50>": "", "<21,51>": "", - "<21,52>": "" + "<21,52>": "", + "<21,53>": "", + "<21,54>": "", + "<21,55>": "", + "<21,56>": "", + "<21,57>": "", + "<21,58>": "", + "<21,59>": "", + "<21,60>": "", + "<21,61>": "", + "<21,62>": "0", + "<21,63>": { + "<21,63,1>": "", + "<21,63,2>": "-2", + "<21,63,3>": "", + "<21,63,4>": "", + "<21,63,5>": "", + "<21,63,6>": "", + "<21,63,7>": "", + "<21,63,8>": "0" + }, + "<21,64>": { + "<21,64,1>": "", + "<21,64,2>": "", + "<21,64,3>": "" + }, + "<21,65>": "-2", + "<21,66>": "", + "<21,67>": "", + "<21,68>": "", + "<21,69>": "", + "<21,70>": "", + "<21,71>": "", + "<21,72>": "", + "<21,73>": "", + "<21,74>": "", + "<21,75>": "", + "<21,76>": "", + "<21,77>": "", + "<21,78>": "", + "<21,79>": "", + "<21,80>": "", + "<21,81>": "", + "<21,82>": "", + "<21,83>": "", + "<21,84>": "", + "<21,85>": "", + "<21,86>": "", + "<21,87>": "", + "<21,88>": "", + "<21,89>": "", + "<21,90>": "", + "<21,91>": "", + "<21,92>": "", + "<21,93>": "", + "<21,94>": "", + "<21,95>": "", + "<21,96>": "", + "<21,97>": "", + "<21,98>": "", + "<21,99>": "", + "<21,100>": "", + "<21,101>": "", + "<21,102>": "", + "<21,103>": "", + "<21,104>": "", + "<21,105>": "", + "<21,106>": "", + "<21,107>": "", + "<21,108>": "" }, "<22>": { - "<22,1>": "GROUP_7", + "<22,1>": "DATE_SELECTIONS", "<22,2>": "", "<22,3>": "GROUPBOX", "<22,4>": "OVERRIDE_REPORT", - "<22,5>": "440", - "<22,6>": "30", - "<22,7>": "240", - "<22,8>": "60", - "<22,9>": "String Search", + "<22,5>": "12", + "<22,6>": "216", + "<22,7>": "444", + "<22,8>": "92", + "<22,9>": "Date Selection", "<22,10>": { "<22,10,1>": "0x56000000", "<22,10,2>": "0x0" @@ -2161,8 +4376,12 @@ "<22,11,1>": "0x0", "<22,11,2>": "0x80000000" }, - "<22,12>": "22", - "<22,13>": "-1", + "<22,12>": "20", + "<22,13>": { + "<22,13,1>": "-1", + "<22,13,2>": "-1", + "<22,13,3>": "" + }, "<22,14>": "0", "<22,15>": { "<22,15,1>": { @@ -2191,17 +4410,14 @@ "<22,22>": "", "<22,23>": "", "<22,24>": "", - "<22,25>": "0", - "<22,26>": "0", + "<22,25>": "", + "<22,26>": "", "<22,27>": "", - "<22,28>": "<>", - "<22,29>": "<>", - "<22,30>": "<>", - "<22,31>": "0", - "<22,32>": { - "<22,32,1>": "0x7fffe", - "<22,32,2>": "0xf0016c08" - }, + "<22,28>": "", + "<22,29>": "", + "<22,30>": "", + "<22,31>": "", + "<22,32>": "", "<22,33>": "", "<22,34>": "", "<22,35>": "", @@ -2221,18 +4437,87 @@ "<22,49>": "", "<22,50>": "", "<22,51>": "", - "<22,52>": "" + "<22,52>": "", + "<22,53>": "", + "<22,54>": "", + "<22,55>": "", + "<22,56>": "", + "<22,57>": "", + "<22,58>": "", + "<22,59>": "", + "<22,60>": "", + "<22,61>": "", + "<22,62>": "0", + "<22,63>": { + "<22,63,1>": "", + "<22,63,2>": "-2", + "<22,63,3>": "", + "<22,63,4>": "", + "<22,63,5>": "", + "<22,63,6>": "", + "<22,63,7>": "", + "<22,63,8>": "0" + }, + "<22,64>": { + "<22,64,1>": "", + "<22,64,2>": "", + "<22,64,3>": "" + }, + "<22,65>": "-2", + "<22,66>": "", + "<22,67>": "", + "<22,68>": "", + "<22,69>": "", + "<22,70>": "", + "<22,71>": "", + "<22,72>": "", + "<22,73>": "", + "<22,74>": "", + "<22,75>": "", + "<22,76>": "", + "<22,77>": "", + "<22,78>": "", + "<22,79>": "", + "<22,80>": "", + "<22,81>": "", + "<22,82>": "", + "<22,83>": "", + "<22,84>": "", + "<22,85>": "", + "<22,86>": "", + "<22,87>": "", + "<22,88>": "", + "<22,89>": "", + "<22,90>": "", + "<22,91>": "", + "<22,92>": "", + "<22,93>": "", + "<22,94>": "", + "<22,95>": "", + "<22,96>": "", + "<22,97>": "", + "<22,98>": "", + "<22,99>": "", + "<22,100>": "", + "<22,101>": "", + "<22,102>": "", + "<22,103>": "", + "<22,104>": "", + "<22,105>": "", + "<22,106>": "", + "<22,107>": "", + "<22,108>": "" }, "<23>": { - "<23,1>": "GROUP_1", + "<23,1>": "EXPORT_OPTIONS", "<23,2>": "", "<23,3>": "GROUPBOX", "<23,4>": "OVERRIDE_REPORT", - "<23,5>": "40", - "<23,6>": "30", - "<23,7>": "380", - "<23,8>": "50", - "<23,9>": "Search By Type", + "<23,5>": "710", + "<23,6>": "20", + "<23,7>": "490", + "<23,8>": "120", + "<23,9>": "Export Options", "<23,10>": { "<23,10,1>": "0x56000000", "<23,10,2>": "0x0" @@ -2241,8 +4526,12 @@ "<23,11,1>": "0x0", "<23,11,2>": "0x80000000" }, - "<23,12>": "23", - "<23,13>": "-1", + "<23,12>": "21", + "<23,13>": { + "<23,13,1>": "-1", + "<23,13,2>": "-1", + "<23,13,3>": "" + }, "<23,14>": "0", "<23,15>": { "<23,15,1>": { @@ -2271,17 +4560,14 @@ "<23,22>": "", "<23,23>": "", "<23,24>": "", - "<23,25>": "0", - "<23,26>": "0", + "<23,25>": "", + "<23,26>": "", "<23,27>": "", - "<23,28>": "<>", - "<23,29>": "<>", - "<23,30>": "<>", - "<23,31>": "0", - "<23,32>": { - "<23,32,1>": "0x7fffe", - "<23,32,2>": "0xf0016c08" - }, + "<23,28>": "", + "<23,29>": "", + "<23,30>": "", + "<23,31>": "", + "<23,32>": "", "<23,33>": "", "<23,34>": "", "<23,35>": "", @@ -2301,18 +4587,87 @@ "<23,49>": "", "<23,50>": "", "<23,51>": "", - "<23,52>": "" + "<23,52>": "", + "<23,53>": "", + "<23,54>": "", + "<23,55>": "", + "<23,56>": "", + "<23,57>": "", + "<23,58>": "", + "<23,59>": "", + "<23,60>": "", + "<23,61>": "", + "<23,62>": "0", + "<23,63>": { + "<23,63,1>": "", + "<23,63,2>": "-2", + "<23,63,3>": "", + "<23,63,4>": "", + "<23,63,5>": "", + "<23,63,6>": "", + "<23,63,7>": "", + "<23,63,8>": "0" + }, + "<23,64>": { + "<23,64,1>": "", + "<23,64,2>": "", + "<23,64,3>": "" + }, + "<23,65>": "-2", + "<23,66>": "", + "<23,67>": "", + "<23,68>": "", + "<23,69>": "", + "<23,70>": "", + "<23,71>": "", + "<23,72>": "", + "<23,73>": "", + "<23,74>": "", + "<23,75>": "", + "<23,76>": "", + "<23,77>": "", + "<23,78>": "", + "<23,79>": "", + "<23,80>": "", + "<23,81>": "", + "<23,82>": "", + "<23,83>": "", + "<23,84>": "", + "<23,85>": "", + "<23,86>": "", + "<23,87>": "", + "<23,88>": "", + "<23,89>": "", + "<23,90>": "", + "<23,91>": "", + "<23,92>": "", + "<23,93>": "", + "<23,94>": "", + "<23,95>": "", + "<23,96>": "", + "<23,97>": "", + "<23,98>": "", + "<23,99>": "", + "<23,100>": "", + "<23,101>": "", + "<23,102>": "", + "<23,103>": "", + "<23,104>": "", + "<23,105>": "", + "<23,106>": "", + "<23,107>": "", + "<23,108>": "" }, "<24>": { - "<24,1>": "SEARCH_OPTIONS", + "<24,1>": "GROUP_7", "<24,2>": "", "<24,3>": "GROUPBOX", "<24,4>": "OVERRIDE_REPORT", - "<24,5>": "20", - "<24,6>": "10", - "<24,7>": "670", - "<24,8>": "220", - "<24,9>": "Search Options", + "<24,5>": "16", + "<24,6>": "116", + "<24,7>": "240", + "<24,8>": "60", + "<24,9>": "Entity Id", "<24,10>": { "<24,10,1>": "0x56000000", "<24,10,2>": "0x0" @@ -2321,8 +4676,12 @@ "<24,11,1>": "0x0", "<24,11,2>": "0x80000000" }, - "<24,12>": "24", - "<24,13>": "-1", + "<24,12>": "22", + "<24,13>": { + "<24,13,1>": "-1", + "<24,13,2>": "-1", + "<24,13,3>": "" + }, "<24,14>": "0", "<24,15>": { "<24,15,1>": { @@ -2351,17 +4710,14 @@ "<24,22>": "", "<24,23>": "", "<24,24>": "", - "<24,25>": "0", - "<24,26>": "0", + "<24,25>": "", + "<24,26>": "", "<24,27>": "", - "<24,28>": "<>", - "<24,29>": "<>", - "<24,30>": "<>", - "<24,31>": "0", - "<24,32>": { - "<24,32,1>": "0x7fffe", - "<24,32,2>": "0xf0016c08" - }, + "<24,28>": "", + "<24,29>": "", + "<24,30>": "", + "<24,31>": "", + "<24,32>": "", "<24,33>": "", "<24,34>": "", "<24,35>": "", @@ -2381,9 +4737,377 @@ "<24,49>": "", "<24,50>": "", "<24,51>": "", - "<24,52>": "" + "<24,52>": "", + "<24,53>": "", + "<24,54>": "", + "<24,55>": "", + "<24,56>": "", + "<24,57>": "", + "<24,58>": "", + "<24,59>": "", + "<24,60>": "", + "<24,61>": "", + "<24,62>": "0", + "<24,63>": { + "<24,63,1>": "", + "<24,63,2>": "-2", + "<24,63,3>": "", + "<24,63,4>": "", + "<24,63,5>": "", + "<24,63,6>": "", + "<24,63,7>": "", + "<24,63,8>": "0" + }, + "<24,64>": { + "<24,64,1>": "", + "<24,64,2>": "", + "<24,64,3>": "" + }, + "<24,65>": "-2", + "<24,66>": "", + "<24,67>": "", + "<24,68>": "", + "<24,69>": "", + "<24,70>": "", + "<24,71>": "", + "<24,72>": "", + "<24,73>": "", + "<24,74>": "", + "<24,75>": "", + "<24,76>": "", + "<24,77>": "", + "<24,78>": "", + "<24,79>": "", + "<24,80>": "", + "<24,81>": "", + "<24,82>": "", + "<24,83>": "", + "<24,84>": "", + "<24,85>": "", + "<24,86>": "", + "<24,87>": "", + "<24,88>": "", + "<24,89>": "", + "<24,90>": "", + "<24,91>": "", + "<24,92>": "", + "<24,93>": "", + "<24,94>": "", + "<24,95>": "", + "<24,96>": "", + "<24,97>": "", + "<24,98>": "", + "<24,99>": "", + "<24,100>": "", + "<24,101>": "", + "<24,102>": "", + "<24,103>": "", + "<24,104>": "", + "<24,105>": "", + "<24,106>": "", + "<24,107>": "", + "<24,108>": "" }, - "<25>": "" + "<25>": { + "<25,1>": "GROUP_1", + "<25,2>": "", + "<25,3>": "GROUPBOX", + "<25,4>": "OVERRIDE_REPORT", + "<25,5>": "12", + "<25,6>": "30", + "<25,7>": "380", + "<25,8>": "50", + "<25,9>": "Search By Entity Type", + "<25,10>": { + "<25,10,1>": "0x56000000", + "<25,10,2>": "0x0" + }, + "<25,11>": { + "<25,11,1>": "0x0", + "<25,11,2>": "0x80000000" + }, + "<25,12>": "23", + "<25,13>": { + "<25,13,1>": "-1", + "<25,13,2>": "-1", + "<25,13,3>": "" + }, + "<25,14>": "0", + "<25,15>": { + "<25,15,1>": { + "<25,15,1,1>": "Segoe UI", + "<25,15,1,2>": "-12", + "<25,15,1,3>": "400", + "<25,15,1,4>": "0", + "<25,15,1,5>": "0", + "<25,15,1,6>": "0", + "<25,15,1,7>": "0", + "<25,15,1,8>": "34", + "<25,15,1,9>": "0", + "<25,15,1,10>": "3", + "<25,15,1,11>": "2", + "<25,15,1,12>": "1", + "<25,15,1,13>": "0", + "<25,15,1,14>": "0" + } + }, + "<25,16>": "", + "<25,17>": "", + "<25,18>": "", + "<25,19>": "", + "<25,20>": "", + "<25,21>": "", + "<25,22>": "", + "<25,23>": "", + "<25,24>": "", + "<25,25>": "", + "<25,26>": "", + "<25,27>": "", + "<25,28>": "", + "<25,29>": "", + "<25,30>": "", + "<25,31>": "", + "<25,32>": "", + "<25,33>": "", + "<25,34>": "", + "<25,35>": "", + "<25,36>": "", + "<25,37>": "", + "<25,38>": "", + "<25,39>": "", + "<25,40>": "", + "<25,41>": "", + "<25,42>": "", + "<25,43>": "", + "<25,44>": "", + "<25,45>": "", + "<25,46>": "", + "<25,47>": "", + "<25,48>": "", + "<25,49>": "", + "<25,50>": "", + "<25,51>": "", + "<25,52>": "", + "<25,53>": "", + "<25,54>": "", + "<25,55>": "", + "<25,56>": "", + "<25,57>": "", + "<25,58>": "", + "<25,59>": "", + "<25,60>": "", + "<25,61>": "", + "<25,62>": "0", + "<25,63>": { + "<25,63,1>": "", + "<25,63,2>": "-2", + "<25,63,3>": "", + "<25,63,4>": "", + "<25,63,5>": "", + "<25,63,6>": "", + "<25,63,7>": "", + "<25,63,8>": "0" + }, + "<25,64>": { + "<25,64,1>": "", + "<25,64,2>": "", + "<25,64,3>": "" + }, + "<25,65>": "-2", + "<25,66>": "", + "<25,67>": "", + "<25,68>": "", + "<25,69>": "", + "<25,70>": "", + "<25,71>": "", + "<25,72>": "", + "<25,73>": "", + "<25,74>": "", + "<25,75>": "", + "<25,76>": "", + "<25,77>": "", + "<25,78>": "", + "<25,79>": "", + "<25,80>": "", + "<25,81>": "", + "<25,82>": "", + "<25,83>": "", + "<25,84>": "", + "<25,85>": "", + "<25,86>": "", + "<25,87>": "", + "<25,88>": "", + "<25,89>": "", + "<25,90>": "", + "<25,91>": "", + "<25,92>": "", + "<25,93>": "", + "<25,94>": "", + "<25,95>": "", + "<25,96>": "", + "<25,97>": "", + "<25,98>": "", + "<25,99>": "", + "<25,100>": "", + "<25,101>": "", + "<25,102>": "", + "<25,103>": "", + "<25,104>": "", + "<25,105>": "", + "<25,106>": "", + "<25,107>": "", + "<25,108>": "" + }, + "<26>": { + "<26,1>": "SEARCH_OPTIONS", + "<26,2>": "", + "<26,3>": "GROUPBOX", + "<26,4>": "OVERRIDE_REPORT", + "<26,5>": "20", + "<26,6>": "9", + "<26,7>": "670", + "<26,8>": "220", + "<26,9>": "Search Options", + "<26,10>": { + "<26,10,1>": "0x56000000", + "<26,10,2>": "0x0" + }, + "<26,11>": { + "<26,11,1>": "0x0", + "<26,11,2>": "0x80000000" + }, + "<26,12>": "24", + "<26,13>": { + "<26,13,1>": "-1", + "<26,13,2>": "-1", + "<26,13,3>": "" + }, + "<26,14>": "0", + "<26,15>": { + "<26,15,1>": { + "<26,15,1,1>": "Segoe UI", + "<26,15,1,2>": "-12", + "<26,15,1,3>": "400", + "<26,15,1,4>": "0", + "<26,15,1,5>": "0", + "<26,15,1,6>": "0", + "<26,15,1,7>": "0", + "<26,15,1,8>": "34", + "<26,15,1,9>": "0", + "<26,15,1,10>": "3", + "<26,15,1,11>": "2", + "<26,15,1,12>": "1", + "<26,15,1,13>": "0", + "<26,15,1,14>": "0" + } + }, + "<26,16>": "", + "<26,17>": "", + "<26,18>": "", + "<26,19>": "", + "<26,20>": "", + "<26,21>": "", + "<26,22>": "", + "<26,23>": "", + "<26,24>": "", + "<26,25>": "", + "<26,26>": "", + "<26,27>": "", + "<26,28>": "", + "<26,29>": "", + "<26,30>": "", + "<26,31>": "", + "<26,32>": "", + "<26,33>": "", + "<26,34>": "", + "<26,35>": "", + "<26,36>": "", + "<26,37>": "", + "<26,38>": "", + "<26,39>": "", + "<26,40>": "", + "<26,41>": "", + "<26,42>": "", + "<26,43>": "", + "<26,44>": "", + "<26,45>": "", + "<26,46>": "", + "<26,47>": "", + "<26,48>": "", + "<26,49>": "", + "<26,50>": "", + "<26,51>": "", + "<26,52>": "", + "<26,53>": "", + "<26,54>": "", + "<26,55>": "", + "<26,56>": "", + "<26,57>": "", + "<26,58>": "", + "<26,59>": "", + "<26,60>": "", + "<26,61>": "", + "<26,62>": "0", + "<26,63>": { + "<26,63,1>": "", + "<26,63,2>": "-2", + "<26,63,3>": "", + "<26,63,4>": "", + "<26,63,5>": "", + "<26,63,6>": "", + "<26,63,7>": "", + "<26,63,8>": "0" + }, + "<26,64>": { + "<26,64,1>": "", + "<26,64,2>": "", + "<26,64,3>": "" + }, + "<26,65>": "-2", + "<26,66>": "", + "<26,67>": "", + "<26,68>": "", + "<26,69>": "", + "<26,70>": "", + "<26,71>": "", + "<26,72>": "", + "<26,73>": "", + "<26,74>": "", + "<26,75>": "", + "<26,76>": "", + "<26,77>": "", + "<26,78>": "", + "<26,79>": "", + "<26,80>": "", + "<26,81>": "", + "<26,82>": "", + "<26,83>": "", + "<26,84>": "", + "<26,85>": "", + "<26,86>": "", + "<26,87>": "", + "<26,88>": "", + "<26,89>": "", + "<26,90>": "", + "<26,91>": "", + "<26,92>": "", + "<26,93>": "", + "<26,94>": "", + "<26,95>": "", + "<26,96>": "", + "<26,97>": "", + "<26,98>": "", + "<26,99>": "", + "<26,100>": "", + "<26,101>": "", + "<26,102>": "", + "<26,103>": "", + "<26,104>": "", + "<26,105>": "", + "<26,106>": "", + "<26,107>": "", + "<26,108>": "" + } }, "record4": { "<1>": { diff --git a/LSL2/STPROC/OVERRIDE_LOG_SERVICES.txt b/LSL2/STPROC/OVERRIDE_LOG_SERVICES.txt index 23b1435..55d7bdc 100644 --- a/LSL2/STPROC/OVERRIDE_LOG_SERVICES.txt +++ b/LSL2/STPROC/OVERRIDE_LOG_SERVICES.txt @@ -4,8 +4,8 @@ Compile function Override_Log_Services(@Service, @Params) $insert LOGICAL $Insert OVERRIDE_LOG_EQUATES -Declare function Datetime, NextKey, Error_Services -Declare subroutine Database_Services +Declare function Datetime, NextKey, Error_Services, SRP_Datetime +Declare subroutine Database_Services, Btree.Extract, Error_Services GoToService @@ -21,18 +21,21 @@ Options OVERRIDE_TYPES = 'ROTR_BLOCK,UNSIGN,CLEAN_INSP,REACTOR_PROVE_IN,REAC //----------------------------------------------------------------------------- Service Create(Table, Key, OverrideUser, OverrideComment, OverrideType=OVERRIDE_TYPES, OverrideCause='') - RecKey = Nextkey('OVERRIDE_LOG') - - orRec = '' - orRec = Table - orRec = Key - orRec = OverrideUser - orRec = OverrideComment - orRec = Datetime() - orRec = OverrideType - orRec = OverrideCause - - Database_Services('WriteDataRow', 'OVERRIDE_LOG', RecKey, orRec) + + RecKey = '' + for each TableName in Table using @VM setting TablePos + RecKey<1,-1> = Nextkey('OVERRIDE_LOG') + orRec = '' + orRec = Table<1, TablePos> + orRec = Key<1, TablePos> + orRec = OverrideUser + orRec = OverrideComment + orRec = Datetime() + orRec = OverrideType + orRec = OverrideCause + + Database_Services('WriteDataRow', 'OVERRIDE_LOG', RecKey, orRec) + Next TablePos If Error_Services('NoError') then Response = RecKey @@ -42,4 +45,39 @@ Service Create(Table, Key, OverrideUser, OverrideComment, OverrideType=OVERRIDE_ End Service +Service GetOverrideLogKeys(EntityId, Table, Type, User, DateTimeFrom, DateTimeTo) + + If DateTimeFrom EQ '' OR Not(Num(DateTimeFrom)) Or DateTimeFrom GT DateTimeTo then + DateTimeFrom = SRP_Datetime('AddDays', Datetime(), -30) + end + If DateTimeTo EQ '' OR Not(Num(DateTimeFrom)) then + DateTimeTo = Datetime() + end + Open 'DICT.OVERRIDE_LOG' To @DICT then + SearchString = '' + SearchString := 'DTM':@VM:DateTimeFrom:'~':DateTimeTo:@FM + if EntityId NE '' then + SearchString := 'KEY':@VM:EntityId:@FM + end + If Table NE '' then + SearchString := 'TABLE':@VM:Table:@FM + end + If Type NE '' then + SearchString := 'CATEGORY':@VM:Type:@FM + end + If User NE '' then + SearchString := 'USER':@VM:User:@FM + end + + keylist = '' + option = '' + flag = '' + Btree.Extract(SearchString, 'OVERRIDE_LOG', @DICT, keylist, option, flag) + end else + Error_Services('Add', 'Error in ' : service : ' unable to open OVERRIDE_LOG dictionary.') + end + Response = keylist +end service + + diff --git a/LSL2/STPROC/OVERRIDE_REPORT_EVENTS.txt b/LSL2/STPROC/OVERRIDE_REPORT_EVENTS.txt index 830a1ce..835a7a1 100644 --- a/LSL2/STPROC/OVERRIDE_REPORT_EVENTS.txt +++ b/LSL2/STPROC/OVERRIDE_REPORT_EVENTS.txt @@ -14,7 +14,7 @@ $insert OVERRIDE_LOG_EQUATES Declare subroutine SRP_Show_Window, Msg -Declare function Utility, Datetime, SRP_DateTime, SRP_SORT_ARRAY +Declare function Utility, Datetime, SRP_DateTime, SRP_SORT_ARRAY, Override_Log_Services, Database_Services // Update the arguments so that the OpenInsight OLE event will treate the ActiveX event as a native event handler. If Event EQ 'OLE' then @@ -74,7 +74,7 @@ Event PUB_DATE_TO.CLICK: return Event PUB_DIR_BROWSE.CLICK - value = "Select a directory" : @fm : "c:\temp" + value = "Select a directory." : @fm : "c:\temp" dir = Utility( "CHOOSEDIR", @window, value) if dir NE '' then @@ -133,242 +133,52 @@ Event SEARCH.CLICK Set_Property(@WINDOW:'.OVERRIDE_TABLE','LABEL','') DynamicFields = 'RDS':@FM:'REACTOR' SearchType = Get_Property(@WINDOW:'.REPORT_BY','DEFPROP') - Filter = Get_Property(@WINDOW:'.ITEM_FILTER','DEFPROP') + EntityId = Get_Property(@WINDOW:'.ITEM_FILTER','DEFPROP') + OverrideType = Get_Property(@Window : '.OVERRIDE_TYPE', 'DEFPROP') + OverrideUser = Get_Property(@WINDOW:'.EDL_USER', 'TEXT') DateFrom = Get_Property(@WINDOW:'.DATE_FROM','DEFPROP') - DateFrom = ICONV(DateFrom,'DT') + DateFrom = ICONV(DateFrom,'DT4/HS') DateTo = Get_Property(@WINDOW:'.DATE_TO','DEFPROP') DateTo = ICONV(DateTo,'DT') - + TableData = '' IF DateTo EQ '' then DateTo = DateTime() end IF DateFrom EQ '' then DateFrom = SRP_DateTime('AddDays', DateTo, -7) end - - dataarray = '' - open "OVERRIDE_LOG" To OverRideTable else - Status = Set_FSError() - return - - end - - select OverRideTable Begin Case - - Case SearchType = 'ALL' - - Done = 0 - Loop - ReadNext @ID else Done = 1 - Until Done Do - read @Record from OverRideTable, @ID else - status = Set_FSError() - - return - end - RecordTime = @RECORD - IF RecordTime GE DateFrom AND RecordTime LE DateTo Then - RecToWrite = @Record - DynamicValues = '' - User = @Record - Comment = @Record - LogTime = OCONV(@Record,'DT4/HS') - Category = @Record - Cause = @Record - keys = @Record - for i = 1 to DCount(keys,@VM) - pairedTable = @RECORD - Locate pairedTable in DynamicFields using @FM setting fPos then - DynamicValues<1,fPos> = keys<1,i> - end - - - Next i - dataarray:= User :@VM:Comment:@VM:LogTime:@VM:Category:@VM:Cause:@VM:DynamicValues :@FM - - end - Repeat - - - swap @VM with @FM in DynamicFields - HeaderText = Get_Property(@WINDOW:'.OVERRIDE_TABLE','LABEL') - HeaderText<6> = DynamicFields - - ////////////////////// - Case SearchType = 'RDS' Or SearchType = 'REACTOR' - if Filter Eq '' then - Msg(@Window, 'No search string entered. Please enter a valid ' : SearchType) - return - end - Done = 0 - Loop - ReadNext @ID else Done = 1 - Until Done Do - read @Record from OverRideTable, @ID else - status = Set_FSError() - - return - end - RecordTables = @RECORD - RecordKeys = @RECORD - Locate SearchType in RecordTables using @VM setting tPos then - - RecordTime = @RECORD - IF RecordTime GE DateFrom AND RecordTime LE DateTo AND RecordKeys<1,tPos> EQ Filter Then - RecToWrite = @Record - DynamicValues = '' - User = @Record - Comment = @Record - LogTime = OCONV(@Record,'DT4/HS') - Category = @Record - Cause = @Record - keys = @Record - for i = 1 to DCount(keys,@VM) - pairedTable = @RECORD - Locate pairedTable in DynamicFields using @FM setting fPos then - DynamicValues<1,fPos> = keys<1,i> - end - - - Next i - dataarray:= User :@VM:Comment:@VM:LogTime:@VM:Category:@VM:Cause:@VM:DynamicValues :@FM - - //swap @VM with @FM in DynamicFields - end - end - - Repeat - //////////////////// - Case SearchType = 'OVERRIDE' - - OverrideFilter = Get_Property(@WINDOW:'.OVERRIDE_TYPE','DEFPROP') - Done = 0 - Loop - ReadNext @ID else Done = 1 - Until Done Do - read @Record from OverRideTable, @ID else - status = Set_FSError() - - return - end - - RecordTime = @RECORD - IF RecordTime GE DateFrom AND RecordTime LE DateTo AND @RECORD EQ OverrideFilter Then - RecToWrite = @Record - DynamicValues = '' - User = @Record - Comment = @Record - LogTime = OCONV(@Record,'DT4/HS') - Category = @Record - Cause = @Record - keys = @Record - for i = 1 to DCount(keys,@VM) - pairedTable = @RECORD - Locate pairedTable in DynamicFields using @FM setting fPos then - DynamicValues<1,fPos> = keys<1,i> - end - - - Next i - dataarray:= User :@VM:Comment:@VM:LogTime:@VM:Category:@VM:Cause:@VM:DynamicValues :@FM - - swap @VM with @FM in DynamicFields - end - - - Repeat - - Case SearchType = 'USER' - - - Done = 0 - Loop - ReadNext @ID else Done = 1 - Until Done Do - read @Record from OverRideTable, @ID else - status = Set_FSError() - - return - end - - RecordTime = @RECORD - IF RecordTime GE DateFrom AND RecordTime LE DateTo AND @RECORD EQ Filter Then - RecToWrite = @Record - DynamicValues = '' - User = @Record - Comment = @Record - LogTime = OCONV(@Record,'DT4/HS') - Category = @Record - Cause = @Record - keys = @Record - for i = 1 to DCount(keys,@VM) - pairedTable = @RECORD - Locate pairedTable in DynamicFields using @FM setting fPos then - DynamicValues<1,fPos> = keys<1,i> - end - - - Next i - dataarray:= User :@VM:Comment:@VM:LogTime:@VM:Category:@VM:Cause:@VM:DynamicValues :@FM - - swap @VM with @FM in DynamicFields - end - - - Repeat + Case SearchType EQ 'ALL' + EntityType = '' + Case Otherwise$ + EntityType = SearchType End Case + If OverrideType = 'ALL' then + OverrideType = '' + end + OverrideLogRecordKeys = Override_Log_Services('GetOverrideLogKeys', EntityId, EntityType, OverrideType, OverrideUser) + for each OverrideLogRecordKey in OverrideLogRecordKeys using @VM - dataarray = SRP_SORT_Array(dataarray, "DR3", 1) + OverrideLogRec = Database_Services('ReadDataRow', 'OVERRIDE_LOG', OverrideLogRecordKey, True$, 0, False$) + //second loop to handle legacy multivalues in Table and Key columns. New overrides shouldn't have multivalues. + for each Table in OverrideLogRec using @VM setting TablePos + OverrideDtm = OverrideLogRec + EntityId = OverrideLogRec + EntityType = OverrideLogRec + OverrideUser = OverrideLogRec + OverrideType = OverrideLogRec + OverrideCause = OverrideLogRec + OverrideComment = OverrideLogRec + TableData<-1> = OverrideDtm : @VM : EntityId : @VM : EntityType : @VM : OverrideUser : @VM : OverrideUser : @VM : OverrideType : @VM : OverrideCause : @VM : OverrideComment + Next Table + + Next OverrideLogRecordKey + TableData = SRP_SORT_Array(TableData, "DR1", 1) + For each line in TableData using @FM + + Next line + Set_Property(@WINDOW:'.OVERRIDE_TABLE','LIST',TableData) - Set_Property(@WINDOW:'.OVERRIDE_TABLE','LIST',dataarray) - HeaderText = 'USER':@FM:'COMMENT':@FM:'DATE/TIME':@FM:'OVERRIDE TYPE':@FM:'CAUSE':@FM:DynamicFields - Set_Property(@WINDOW:'.OVERRIDE_TABLE','LABEL',HeaderText) - - * HeaderText = HeaderText:CHAR(13):'' - * HeaderText = HeaderText:CHAR(13):'' - * HeaderText = HeaderText:CHAR(13):'' - * HeaderText = HeaderText:CHAR(13):'' - * HeaderText = HeaderText:CHAR(13):'' - * - * Set_Property(@WINDOW:'.LS_TABLE','LABEL',HeaderText) - //NewList = SRP_Sort_Array(List, "AL2", 1) - //Set_Property(@Window:".EDT_TEST", "LIST", NewList) - - - -return -end event - -Event REPORT_BY.ALL.CLICK -Set_Property(@Window:'.ITEM_FILTER', 'ENABLED', -1) -Set_Property(@WINDOW:'.LABEL_FILTER','TEXT','') -Set_Property(@Window:'.OVERRIDE_TYPE', 'ENABLED', 0) -return -end event - -Event REPORT_BY.RDS.CLICK -Set_Property(@Window:'.ITEM_FILTER', 'ENABLED', 1) -Set_Property(@WINDOW:'.LABEL_FILTER','TEXT', 'RDS No:') -Set_Property(@Window:'.OVERRIDE_TYPE', 'ENABLED', 0) -end event - -Event REPORT_BY.REACTOR.CLICK -Set_Property(@Window:'.ITEM_FILTER', 'ENABLED', 1) -Set_Property(@WINDOW:'.LABEL_FILTER','TEXT', 'Reactor No:') -Set_Property(@Window:'.OVERRIDE_TYPE', 'ENABLED', 0) -end event - -Event REPORT_BY.OVERRIDE.CLICK -Set_Property(@Window:'.OVERRIDE_TYPE', 'ENABLED', 1) -Set_Property(@Window:'.ITEM_FILTER', 'ENABLED', -1) -Set_Property(@WINDOW:'.LABEL_FILTER','TEXT','') -end event - -Event REPORT_BY.USER.CLICK -Set_Property(@Window:'.ITEM_FILTER', 'ENABLED', 1) -Set_Property(@WINDOW:'.LABEL_FILTER','TEXT', 'User:') -Set_Property(@Window:'.OVERRIDE_TYPE', 'ENABLED', 0) end event Setup_OLE_Controls: @@ -401,3 +211,4 @@ return + diff --git a/LSL2/STPROC/RDS_EVENTS.txt b/LSL2/STPROC/RDS_EVENTS.txt index d70d219..3b1fb12 100644 --- a/LSL2/STPROC/RDS_EVENTS.txt +++ b/LSL2/STPROC/RDS_EVENTS.txt @@ -86,7 +86,7 @@ EQU READONLY_GREEN$ TO 192 + (220*256) + (192*65536) Declare subroutine ErrMsg, Set_Status, obj_WO_Mat, obj_WO_Mat_Log, obj_RDS, Set_Property, Send_Event, Database_Services Declare subroutine Dialog_Box, Qa_Services, Obj_React_Ll, Start_Window, obj_React_Status, Reactor_Services, Rds_Services -Declare subroutine Lot_Services +Declare subroutine Lot_Services, Override_Log_Services Declare function Dialog_Box, Msg, MemberOf, obj_WO_Mat, Database_Services, Get_Property, obj_React_Status, Get_Status Declare function QA_Services, Database_Services, Rds_Services, Obj_Calendar, Override_Log_Services, Max, Supplement_Services Declare function Datetime, Test_Run_Services @@ -370,12 +370,17 @@ Event PUB_SIGN.CLICK() //User has stated that they are using test wafers TWLogResult = Dialog_Box('NDW_LOG_TEST_WAFER_USAGE', @Window, RDSNo : @VM : 'STANDARD' : @VM : 'REACTOR' : @VM : Reactor) If TWLogResult NE True$ then - //User exited the the TW log form without logging anything. + //User exited the the TW log prompt answering that they are not using any test wafers. UserMsg = "Unable to sign load because test wafer logging is required on this run. A supervisor or lead may override." OverrideGroups = 'LEAD':@VM:'SUPERVISOR':@VM:'ENGINEERING':@VM:'ENG_TECH' UserVerification = Dialog_Box('NDW_VERIFY_USER', @WINDOW, @USER4:@FM:OverrideGroups:@FM:'':@FM:UserMsg) Override = UserVerification<1> - If Not(Override) then return + OverrideUser = UserVerification<2> + If Override then + Override_log_services('Create', 'RDS', RDSNo, OverrideUser, '', 'TW_USAGE', '') + end else + return + end end end else //User has stated that they are NOT using test wafers @@ -383,7 +388,12 @@ Event PUB_SIGN.CLICK() OverrideGroups = 'LEAD':@VM:'SUPERVISOR':@VM:'ENGINEERING':@VM:'ENG_TECH' UserVerification = Dialog_Box('NDW_VERIFY_USER', @WINDOW, @USER4:@FM:OverrideGroups:@FM:'':@FM:UserMsg) Override = UserVerification<1> - If Not(Override) then return + OverrideUser = UserVerification<2> + If Override then + Override_log_services('Create', 'RDS', RDSNo, OverrideUser, '', 'TW_USAGE', '') + end else + return + end end end end @@ -726,3 +736,4 @@ return +