From d4b119faf85acf47dbb59086eb7695f4adaaed67 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 9 Aug 2023 15:43:36 +0200 Subject: [PATCH] Update conf code + pagine x usare NE03 --- NKC_WF/Reports/queueConf.json | 60 +++++++++++++++++++ .../WebUserControls/cmp_DailyStatsList.ascx | 1 + .../WebUserControls/cmp_DailyStatsPlot.ascx | 8 +++ .../WebUserControls/cmp_MachSelSmart.ascx.cs | 4 ++ NKC_WF/WebUserControls/cmp_MachSem.ascx | 1 + 5 files changed, 74 insertions(+) diff --git a/NKC_WF/Reports/queueConf.json b/NKC_WF/Reports/queueConf.json index 194ac1b..32ff2af 100644 --- a/NKC_WF/Reports/queueConf.json +++ b/NKC_WF/Reports/queueConf.json @@ -29,6 +29,21 @@ "xmlParam": "EMF8.5in11in0.5in0.5in0.5in0.5in" } }, + { + "name": "queueUnloadBinNE03", + "template": "Bin.rdlc", + "printerName": "Microsoft Print to PDF", + "deviceInfoParam": { + "OutputFormat": "EMF", + "PageHeight": "11in", + "PageWidth": "8.5in", + "MarginLeft": "0.5in", + "MarginRight": "0.5in", + "MarginTop": "0.5in", + "MarginBottom": "0.5in", + "xmlParam": "EMF8.5in11in0.5in0.5in0.5in0.5in" + } + }, { "name": "queueUnloadCartNE01", "template": "Cart.rdlc", @@ -59,6 +74,21 @@ "xmlParam": "EMF8.5in11in0.5in0.5in0.5in0.5in" } }, + { + "name": "queueUnloadCartNE03", + "template": "Cart.rdlc", + "printerName": "Microsoft Print to PDF", + "deviceInfoParam": { + "OutputFormat": "EMF", + "PageHeight": "11in", + "PageWidth": "8.5in", + "MarginLeft": "0.5in", + "MarginRight": "0.5in", + "MarginTop": "0.5in", + "MarginBottom": "0.5in", + "xmlParam": "EMF8.5in11in0.5in0.5in0.5in0.5in" + } + }, { "name": "queueBunk", "template": "BunkGroup.rdlc", @@ -134,6 +164,21 @@ "xmlParam": "EMF4.09in2in0in0in0in0in" } }, + { + "name": "queuePartNE03", + "template": "Part.rdlc", + "printerName": "Microsoft Print to PDF", + "deviceInfoParam": { + "OutputFormat": "EMF", + "PageHeight": "2in", + "PageWidth": "4.09in", + "MarginLeft": "0in", + "MarginRight": "0in", + "MarginTop": "0in", + "MarginBottom": "0in", + "xmlParam": "EMF4.09in2in0in0in0in0in" + } + }, { "name": "queueOtherPart", "template": "OtherPart.rdlc", @@ -238,5 +283,20 @@ "MarginBottom": "0.5in", "xmlParam": "EMF8.5in11in0.5in0.5in0.5in0.5in" } + }, + { + "name": "queueSpecialPartNE03", + "template": "SpecialParts.rdlc", + "printerName": "Microsoft Print to PDF", + "deviceInfoParam": { + "OutputFormat": "EMF", + "PageHeight": "11in", + "PageWidth": "8.5in", + "MarginLeft": "0.5in", + "MarginRight": "0.5in", + "MarginTop": "0.5in", + "MarginBottom": "0.5in", + "xmlParam": "EMF8.5in11in0.5in0.5in0.5in0.5in" + } } ] \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_DailyStatsList.ascx b/NKC_WF/WebUserControls/cmp_DailyStatsList.ascx index bf38e48..eb01c6d 100644 --- a/NKC_WF/WebUserControls/cmp_DailyStatsList.ascx +++ b/NKC_WF/WebUserControls/cmp_DailyStatsList.ascx @@ -50,6 +50,7 @@ + diff --git a/NKC_WF/WebUserControls/cmp_DailyStatsPlot.ascx b/NKC_WF/WebUserControls/cmp_DailyStatsPlot.ascx index e0ede7f..cedba29 100644 --- a/NKC_WF/WebUserControls/cmp_DailyStatsPlot.ascx +++ b/NKC_WF/WebUserControls/cmp_DailyStatsPlot.ascx @@ -38,6 +38,7 @@ var dataNE01 = dataTS.filter(record => record.label == "NE01"); var dataNE02 = dataTS.filter(record => record.label == "NE02"); + var dataNE03 = dataTS.filter(record => record.label == "NE03"); //console.log('dataNE01 data', dataNE01); //console.log('dataNE02 data', dataNE02); @@ -84,6 +85,13 @@ lineTension: 0, //steppedLine: false, data: dataNE02 + }, + { + label: 'NE03: <%=hfLegend.Value %>', + borderColor: 'rgb(7, 203, 126)', + lineTension: 0, + //steppedLine: false, + data: dataNE03 } ] }, diff --git a/NKC_WF/WebUserControls/cmp_MachSelSmart.ascx.cs b/NKC_WF/WebUserControls/cmp_MachSelSmart.ascx.cs index 013e865..a4f4d32 100644 --- a/NKC_WF/WebUserControls/cmp_MachSelSmart.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_MachSelSmart.ascx.cs @@ -58,6 +58,10 @@ namespace NKC_WF.WebUserControls { cssClass = "primary"; } + else if (MachineSel == "NE03") + { + cssClass = "success"; + } hfMachine.Value = MachineSel; hfMachClass.Value = cssClass; lbtReset.Attributes.Remove("class"); diff --git a/NKC_WF/WebUserControls/cmp_MachSem.ascx b/NKC_WF/WebUserControls/cmp_MachSem.ascx index cf8059c..791ce3d 100644 --- a/NKC_WF/WebUserControls/cmp_MachSem.ascx +++ b/NKC_WF/WebUserControls/cmp_MachSem.ascx @@ -18,6 +18,7 @@ +