From 5cd239315f36d70bc9ddb6d56fb24daf881753a6 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Thu, 13 Aug 2020 13:54:26 +0200
Subject: [PATCH 1/7] Fix x refresh messagio itemsent to sec screen

---
 Jenkinsfile                                    |  2 +-
 NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs | 17 +++++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 6739e6e..1f6313b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -11,7 +11,7 @@ pipeline {
       steps {
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=327']) {
+        withEnv(['NEXT_BUILD_NUMBER=328']) {
           // env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
           env.versionNumberBeta = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
diff --git a/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs b/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs
index 052dd2b..5ae0ea6 100644
--- a/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs
+++ b/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs
@@ -194,12 +194,15 @@ namespace NKC_WF.WebUserControls
             // processo evento..
             lastCmd = cmp_barcode.inputAcquired.ToUpper();
             doRaiseEv = processLastCmd(doRaiseEv);
-
             // reset comando
             cmp_barcode.inputAcquired = "";
             ComLib.man.resetSheetUnload(SheetID);
             // aggiorno...
             doUpdate();
+            if (doRaiseEv)
+            {
+                resetMessages();
+            }
         }
 
         private bool processLastCmd(bool doRaiseEv)
@@ -274,7 +277,16 @@ namespace NKC_WF.WebUserControls
             updateCurrData();
             ComLib.saveItemPickup(SheetID, DeviceId, itemDtmx);
         }
-
+        /// <summary>
+        /// Resetta mesaggi ed errori
+        /// </summary>
+        protected void resetMessages()
+        {
+            divInfoMessage.Visible = false;
+            lblInfoMessage.Text = "";
+            divItemError.Visible = false;
+            lblErrorMsg.Text = "";
+        }
         /// <summary>
         /// Processo il DataMatrix letto
         /// </summary>
@@ -283,6 +295,7 @@ namespace NKC_WF.WebUserControls
         /// <param name="codeInt"></param>
         private void processItemSuggestion(codeType tipoCod, string rawData, int codeInt)
         {
+            displMessage("", false);
             DS_App.ItemListDataTable tabItem = null;
             // processo suggerimenti x ITEM / cart / bin dato suo RawData (Dtmx) e Cod univoco (intero)
             switch (tipoCod)

From 47130753b8249adc1ad693b68b2cd2fc8097d919 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Thu, 13 Aug 2020 17:47:44 +0200
Subject: [PATCH 2/7] FIX woff2 x roboto & fontawesome

---
 NKC_WF/Web.config | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/NKC_WF/Web.config b/NKC_WF/Web.config
index b9bacb7..af03bc1 100644
--- a/NKC_WF/Web.config
+++ b/NKC_WF/Web.config
@@ -403,6 +403,13 @@
             <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler"
                 preCondition="integratedMode,runtimeVersionv4.0"/>
         </handlers>
+        <staticContent>
+            <clientCache cacheControlCustom="public" cacheControlMode="UseMaxAge" cacheControlMaxAge="1.00:00:00"/>
+            <remove fileExtension=".woff"/>
+            <remove fileExtension=".woff2"/>
+            <mimeMap fileExtension=".woff" mimeType="application/x-font-woff"/>
+            <mimeMap fileExtension=".woff2" mimeType="application/font-woff2"/>
+        </staticContent>
     </system.webServer>
     <elmah>
         <!--

From e09c61de7f20ad9df8c8bde30f13c7db959fb5b9 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Thu, 13 Aug 2020 17:47:59 +0200
Subject: [PATCH 3/7] inversione svuotamento code PJQ

---
 NKC_WF/Controllers/PrintQueueController.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/NKC_WF/Controllers/PrintQueueController.cs b/NKC_WF/Controllers/PrintQueueController.cs
index a38740a..e1681b1 100644
--- a/NKC_WF/Controllers/PrintQueueController.cs
+++ b/NKC_WF/Controllers/PrintQueueController.cs
@@ -154,11 +154,11 @@ namespace NKC_WF.Controllers
             }
             else
             {
-                // chiudo gli zombie (stampe non chiuse)...
-                DataLayer.man.taPJQ.chiudiZoombie(DateTime.Now.AddMilliseconds(-memLayer.ML.CRI("zombieMsTime")));
                 // recupero da db e salvo
                 answ = countWaitingDb;
                 memLayer.ML.setRSV(redQueueCount, answ.ToString(), memLayer.ML.CRI("cacheQueueSec"));
+                // chiudo gli zombie (stampe non chiuse)...
+                DataLayer.man.taPJQ.chiudiZoombie(DateTime.Now.AddMilliseconds(-memLayer.ML.CRI("zombieMsTime")));
             }
             return answ;
         }

From 34291567f2de8a66439a77a8bf2fd6e762c8560d Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Thu, 13 Aug 2020 17:58:02 +0200
Subject: [PATCH 4/7] Implementazione conteggio code parziali

---
 NKC_WF/Controllers/PrintQueueController.cs | 54 +++++++++++++++++++++-
 1 file changed, 53 insertions(+), 1 deletion(-)

diff --git a/NKC_WF/Controllers/PrintQueueController.cs b/NKC_WF/Controllers/PrintQueueController.cs
index e1681b1..0e48dc5 100644
--- a/NKC_WF/Controllers/PrintQueueController.cs
+++ b/NKC_WF/Controllers/PrintQueueController.cs
@@ -6,6 +6,7 @@ using System;
 using System.Collections.Generic;
 using System.Data;
 using System.IO;
+using System.Linq;
 using System.Web.Http;
 using System.Web.Http.ModelBinding;
 
@@ -20,7 +21,11 @@ namespace NKC_WF.Controllers
         /// </summary>
         internal static string redQueueCount = "NKC:SERV:PJQ";
         /// <summary>
-        /// Conteggio elementi in attesa stsampa da DB
+        /// chaive redis x cache conteggio coda PJQ composta da tante code
+        /// </summary>
+        internal static string redQueueCountSet = "NKC:SERV:PJQCOUNT";
+        /// <summary>
+        /// Conteggio elementi in attesa stampa da DB
         /// </summary>
         protected int countWaitingDb
         {
@@ -37,6 +42,24 @@ namespace NKC_WF.Controllers
             }
         }
         /// <summary>
+        /// Conteggio elementi in attesa stampa da DB che fanno parte di un SET di queue
+        /// </summary>
+        protected int countWaitingDbQueueMult(string queueSet)
+        {
+            int answ = 0;
+            // resetto conteggio in redis...
+            DS_Report.PrintJobQueueDataTable tabPJQ = DataLayer.man.taPJQ.getWaiting();
+            if (tabPJQ != null)
+            {
+                var selQueue = tabPJQ.Where(x => queueSet.Contains($"#{x.prtName}#")).ToList();
+                if (selQueue != null)
+                {
+                    answ = selQueue.Count;
+                }
+            }
+            return answ;
+        }
+        /// <summary>
         /// Carica i dati richiesti dal report dalla StoredProcedure (filtrando quindi...) e restituisce Dictionary [nome RDS / tab RDS]
         /// </summary>
         /// <param name="tipoReport"></param>
@@ -195,6 +218,35 @@ namespace NKC_WF.Controllers
             return answ;
         }
 
+
+        /// <summary>
+        /// Restituisce numero jobs aperti (stato = 0...), se 0 = NESSUNO
+        /// GET: api/PrintQueue/#queue01#queue02#queue03#
+        /// </summary>
+        /// <param name="queueList">Elenco code delimitate da #..#</param>
+        /// <returns></returns>
+        public int GetCountAll(string queueList)
+        {
+            // restituisco...
+            int answ = 0;
+            string redVal = memLayer.ML.getRSV($"{redQueueCountSet}:{queueList}");
+            // cerco in redis se ci sia chiave..
+            if (!string.IsNullOrEmpty(redVal))
+            {
+                // recupero
+                int.TryParse(redVal, out answ);
+            }
+            else
+            {
+                // recupero da db e salvo
+                answ = countWaitingDbQueueMult(queueList);
+                memLayer.ML.setRSV($"{redQueueCountSet}:{queueList}", answ.ToString(), memLayer.ML.CRI("cacheQueueSec"));
+                // chiudo gli zombie (stampe non chiuse)...
+                DataLayer.man.taPJQ.chiudiZoombie(DateTime.Now.AddMilliseconds(-memLayer.ML.CRI("zombieMsTime")));
+            }
+            return answ;
+        }
+
         /// <summary>
         /// Processa una chiamata POST per l'invio in blocco del risultato dell'elaborazione
         /// POST: api/PrintQueue

From ca35b97fc009c540421f406da7873aec954e9083 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Thu, 13 Aug 2020 18:43:07 +0200
Subject: [PATCH 5/7] Fix gestione printQueue x calcolare SOLO conteggio code
 sel

---
 AppData/ComLib.cs                          | 10 ++++++++
 AppData/DataLayer.cs                       |  3 +++
 NKC_WF/Controllers/PrintQueueController.cs | 30 ++++++++++------------
 3 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/AppData/ComLib.cs b/AppData/ComLib.cs
index f3d2050..87292e7 100644
--- a/AppData/ComLib.cs
+++ b/AppData/ComLib.cs
@@ -195,6 +195,16 @@ namespace AppData
         public static string redMachUnloadCount = "NKC:SERV:MACH_UNLOAD:COUNT";
         public static string redMachUnloadForce = "NKC:SERV:MACH_UNLOAD:FORCERELOAD";
 
+
+        /// <summary>
+        /// chaive redis x cache conteggio coda PJQ
+        /// </summary>
+        public static string redQueueCount = "NKC:SERV:PJQ";
+        /// <summary>
+        /// chaive redis x cache conteggio coda PJQ composta da tante code
+        /// </summary>
+        public static string redQueueCountSet = "NKC:SERV:PJQCOUNT";
+
         #endregion
 
         #region definizione classi impiegate con PROD
diff --git a/AppData/DataLayer.cs b/AppData/DataLayer.cs
index 0acf848..3323c67 100644
--- a/AppData/DataLayer.cs
+++ b/AppData/DataLayer.cs
@@ -264,6 +264,9 @@ namespace AppData
             if (checkDoc(tipoDoc, keyParam))
             {
                 answ = reportPrinter.obj.stampaCartellino(tipoDoc, keyParam, printer, true);
+                // svuoto code redis salvate..
+                memLayer.ML.redFlushKey(ComLib.redQueueCount);
+                memLayer.ML.redFlushKey(ComLib.redQueueCountSet);
                 if (answ)
                 {
                     logger.lg.scriviLog(string.Format(" | {0} | stampato UDC {1} | stampante {2} | tipo {3}", clientIp, keyParam, printer, tipoDoc), tipoLog.INFO);
diff --git a/NKC_WF/Controllers/PrintQueueController.cs b/NKC_WF/Controllers/PrintQueueController.cs
index 0e48dc5..e206093 100644
--- a/NKC_WF/Controllers/PrintQueueController.cs
+++ b/NKC_WF/Controllers/PrintQueueController.cs
@@ -16,14 +16,6 @@ namespace NKC_WF.Controllers
     {
         #region classi gestione PJQ
 
-        /// <summary>
-        /// chaive redis x cache conteggio coda PJQ
-        /// </summary>
-        internal static string redQueueCount = "NKC:SERV:PJQ";
-        /// <summary>
-        /// chaive redis x cache conteggio coda PJQ composta da tante code
-        /// </summary>
-        internal static string redQueueCountSet = "NKC:SERV:PJQCOUNT";
         /// <summary>
         /// Conteggio elementi in attesa stampa da DB
         /// </summary>
@@ -51,7 +43,7 @@ namespace NKC_WF.Controllers
             DS_Report.PrintJobQueueDataTable tabPJQ = DataLayer.man.taPJQ.getWaiting();
             if (tabPJQ != null)
             {
-                var selQueue = tabPJQ.Where(x => queueSet.Contains($"#{x.prtName}#")).ToList();
+                var selQueue = tabPJQ.Where(x => queueSet.Contains($"|{x.prtName}|")).ToList();
                 if (selQueue != null)
                 {
                     answ = selQueue.Count;
@@ -168,7 +160,7 @@ namespace NKC_WF.Controllers
         {
             // restituisco...
             int answ = 0;
-            string redVal = memLayer.ML.getRSV(redQueueCount);
+            string redVal = memLayer.ML.getRSV(ComLib.redQueueCount);
             // cerco in redis se ci sia chiave..
             if (!string.IsNullOrEmpty(redVal))
             {
@@ -179,7 +171,7 @@ namespace NKC_WF.Controllers
             {
                 // recupero da db e salvo
                 answ = countWaitingDb;
-                memLayer.ML.setRSV(redQueueCount, answ.ToString(), memLayer.ML.CRI("cacheQueueSec"));
+                memLayer.ML.setRSV(ComLib.redQueueCount, answ.ToString(), memLayer.ML.CRI("cacheQueueSec"));
                 // chiudo gli zombie (stampe non chiuse)...
                 DataLayer.man.taPJQ.chiudiZoombie(DateTime.Now.AddMilliseconds(-memLayer.ML.CRI("zombieMsTime")));
             }
@@ -221,15 +213,17 @@ namespace NKC_WF.Controllers
 
         /// <summary>
         /// Restituisce numero jobs aperti (stato = 0...), se 0 = NESSUNO
-        /// GET: api/PrintQueue/#queue01#queue02#queue03#
+        /// GET: api/PrintQueue/GetCount/|queue01|queue02|queue03|
         /// </summary>
-        /// <param name="queueList">Elenco code delimitate da #..#</param>
+        /// <param name="queueList">Elenco code delimitate da |..|</param>
         /// <returns></returns>
-        public int GetCountAll(string queueList)
+        //[HttpGet]
+        //[Route("count")]
+        public int GetCount(string queueList)
         {
             // restituisco...
             int answ = 0;
-            string redVal = memLayer.ML.getRSV($"{redQueueCountSet}:{queueList}");
+            string redVal = memLayer.ML.getRSV($"{ComLib.redQueueCountSet}:{queueList}");
             // cerco in redis se ci sia chiave..
             if (!string.IsNullOrEmpty(redVal))
             {
@@ -240,7 +234,7 @@ namespace NKC_WF.Controllers
             {
                 // recupero da db e salvo
                 answ = countWaitingDbQueueMult(queueList);
-                memLayer.ML.setRSV($"{redQueueCountSet}:{queueList}", answ.ToString(), memLayer.ML.CRI("cacheQueueSec"));
+                memLayer.ML.setRSV($"{ComLib.redQueueCountSet}:{queueList}", answ.ToString(), memLayer.ML.CRI("cacheQueueSec"));
                 // chiudo gli zombie (stampe non chiuse)...
                 DataLayer.man.taPJQ.chiudiZoombie(DateTime.Now.AddMilliseconds(-memLayer.ML.CRI("zombieMsTime")));
             }
@@ -277,7 +271,9 @@ namespace NKC_WF.Controllers
                     int.TryParse(printAnsw.ticketNum, out idxPJQ);
                     DataLayer.man.taPJQ.updateStato(idxPJQ, printAnsw.newStatus);
                     // resetto conteggio in redis...
-                    memLayer.ML.setRSV(redQueueCount, countWaitingDb.ToString(), memLayer.ML.CRI("cacheQueueSec"));
+                    memLayer.ML.setRSV(ComLib.redQueueCount, countWaitingDb.ToString(), memLayer.ML.CRI("cacheQueueSec"));
+                    // svuoto code redis salvate..
+                    memLayer.ML.redFlushKey(ComLib.redQueueCountSet);
                     answ = "OK";
                 }
             }

From deefe6a4929718eb4208364149a0c0a8b46843fd Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Thu, 13 Aug 2020 18:46:18 +0200
Subject: [PATCH 6/7] Fix x batch approved NON visibili in CSV

---
 NKC_WF/WebUserControls/cmp_batchList.ascx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/NKC_WF/WebUserControls/cmp_batchList.ascx b/NKC_WF/WebUserControls/cmp_batchList.ascx
index 9c01dc4..cbb6807 100644
--- a/NKC_WF/WebUserControls/cmp_batchList.ascx
+++ b/NKC_WF/WebUserControls/cmp_batchList.ascx
@@ -23,7 +23,7 @@
             <asp:ListItem Text="Estimating Completed" Value="2"></asp:ListItem>
             <asp:ListItem Text="Nesting Requested" Value="3"></asp:ListItem>
             <asp:ListItem Text="Nesting Completed" Value="4"></asp:ListItem>
-            <asp:ListItem Text="Nesting Approved" Value="5"></asp:ListItem>
+            <%--<asp:ListItem Text="Nesting Approved" Value="5"></asp:ListItem>--%>
             <asp:ListItem Text="Nesting Discarded" Value="6"></asp:ListItem>
             <asp:ListItem Text="Errors Present" Value="7"></asp:ListItem>
             <asp:ListItem Text="Validation UNKNOWN" Value="8"></asp:ListItem>
@@ -92,7 +92,7 @@
                 </Columns>
             </asp:GridView>
             <asp:HiddenField ID="hfDeleteEnabled" runat="server" />
-            <asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByStatus" TypeName="AppData.DS_AppTableAdapters.BatchListTableAdapter" DeleteMethod="deleteTree">
+            <asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByStatus" TypeName="AppData.DS_AppTableAdapters.BatchListTableAdapter" DeleteMethod="deleteTree" FilterExpression="Status <> 5">
                 <SelectParameters>
                     <asp:ControlParameter ControlID="ddlStatus" DefaultValue="-1" Name="Status" PropertyName="SelectedValue" Type="Int32" />
                     <asp:SessionParameter Name="SearchVal" SessionField="valoreSearch" Type="String" DefaultValue="" />

From 71c1f620eba177d02efb3a508127b4abb45e87ef Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Thu, 13 Aug 2020 18:59:14 +0200
Subject: [PATCH 7/7] Update friltraggio batchList

---
 NKC_WF/WebUserControls/cmp_batchList.ascx | 7 +------
 NKC_WF/site/OrderManager.aspx             | 2 +-
 NKC_WF/site/OrderManager.aspx.cs          | 1 +
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/NKC_WF/WebUserControls/cmp_batchList.ascx b/NKC_WF/WebUserControls/cmp_batchList.ascx
index cbb6807..f7b73e4 100644
--- a/NKC_WF/WebUserControls/cmp_batchList.ascx
+++ b/NKC_WF/WebUserControls/cmp_batchList.ascx
@@ -2,8 +2,6 @@
 <%@ Register Src="~/WebUserControls/cmp_batchDetail.ascx" TagPrefix="uc1" TagName="cmp_batchDetail" %>
 <%@ Register Src="~/WebUserControls/cmp_numRow.ascx" TagPrefix="uc1" TagName="cmp_numRow" %>
 
-
-
 <div class="row">
     <div class="col-12 border border-info table-info rounded py-2" runat="server" id="divDetail">
         <uc1:cmp_batchDetail runat="server" ID="cmp_batchDetail" />
@@ -92,7 +90,7 @@
                 </Columns>
             </asp:GridView>
             <asp:HiddenField ID="hfDeleteEnabled" runat="server" />
-            <asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByStatus" TypeName="AppData.DS_AppTableAdapters.BatchListTableAdapter" DeleteMethod="deleteTree" FilterExpression="Status <> 5">
+            <asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getByStatus" TypeName="AppData.DS_AppTableAdapters.BatchListTableAdapter" DeleteMethod="deleteTree" FilterExpression="Status <> 5">
                 <SelectParameters>
                     <asp:ControlParameter ControlID="ddlStatus" DefaultValue="-1" Name="Status" PropertyName="SelectedValue" Type="Int32" />
                     <asp:SessionParameter Name="SearchVal" SessionField="valoreSearch" Type="String" DefaultValue="" />
@@ -102,9 +100,6 @@
                     <asp:Parameter Name="Original_BatchID" Type="Int32" />
                     <asp:Parameter Name="ForceDelete" Type="Int32" DefaultValue="1" />
                 </DeleteParameters>
-                <FilterParameters>
-                    <asp:SessionParameter SessionField="valoreSearch" DefaultValue="" Type="String" />
-                </FilterParameters>
             </asp:ObjectDataSource>
             <asp:HiddenField runat="server" ID="hfPartValid" />
         </div>
diff --git a/NKC_WF/site/OrderManager.aspx b/NKC_WF/site/OrderManager.aspx
index 1d4b935..43d331f 100644
--- a/NKC_WF/site/OrderManager.aspx
+++ b/NKC_WF/site/OrderManager.aspx
@@ -18,7 +18,7 @@
                         <asp:UpdatePanel ID="UpdatePanel1" runat="server">
                             <ContentTemplate>
                                 <uc1:cmp_batchList runat="server" ID="cmp_batchList" />
-                                <asp:Timer ID="Timer1" runat="server" Interval="2000" OnTick="Timer1_Tick"></asp:Timer>
+                                <asp:Timer ID="Timer1" runat="server" Interval="4000" OnTick="Timer1_Tick"></asp:Timer>
                             </ContentTemplate>
                         </asp:UpdatePanel>
 
diff --git a/NKC_WF/site/OrderManager.aspx.cs b/NKC_WF/site/OrderManager.aspx.cs
index 1d810f8..6f68457 100644
--- a/NKC_WF/site/OrderManager.aspx.cs
+++ b/NKC_WF/site/OrderManager.aspx.cs
@@ -29,6 +29,7 @@ namespace NKC_WF
         {
             if (!Page.IsPostBack)
             {
+                ((SiteMaster)this.Master).showSearch = false;
                 doUpdate();
             }
             cmp_batchList.eh_doRefresh += Cmp_batchList_eh_doRefresh;