Merge branch 'develop' into MongoDb

Jenkinsfile

@@ -12,7 +12,7 @@ pipeline {
       steps {
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=1325']) {
+        withEnv(['NEXT_BUILD_NUMBER=1326']) {
           // env.versionNumber = VersionNumber(versionNumberString : '6.11.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '6.11.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
           env.APP_NAME = 'MAPO'

MP-MON/Controllers/DbTaskController.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
+using System.Text;
 using System.Web.Http;
 
 namespace MP_MON.Controllers
@@ -19,7 +20,7 @@ namespace MP_MON.Controllers
         // GET: api/DbTask
         public IEnumerable<string> Get()
         {
-            return new string[] { "value1", "value2" };
+            return new string[] { "Refresh", "value2" };
         }
 
         // GET: api/DbTask/5
@@ -29,8 +30,14 @@ namespace MP_MON.Controllers
         }
 
         // POST: api/DbTask
-        public void Post([FromBody] string value)
+        public string Post([FromBody] List<string> names)
         {
+            string answ = "";
+            foreach (var item in names)
+            {
+                answ += $"{item} | ";
+            }
+            return answ;
         }
 
         // PUT: api/DbTask/5

MP-TAB/WebUserControls/mod_ODL.ascx.cs

@@ -1068,6 +1068,17 @@ namespace MoonProTablet.WebUserControls
                 // indico INIZIO SETUP su REDIS come EXE della macchina...
                 string ts = string.Format("{0:yyMMdd}T{0:HHmmss.fff}Z", DateTime.Now);
                 DataLayerObj.addTask4Machine(idxMacchinaFix, taskType.startSetup, $"TS:{ts}|MATR:{DataLayerObj.MatrOpr}|ODL:{idxODL_curr}");
+                // aggiungo articolo, commessa, richiesta pezzi...
+                try
+                {
+                    var datiODL = DataLayerObj.taODL.getByMacchina(idxMacchinaFix)[0];
+                    DataLayerObj.addTask4Machine(idxMacchinaFix, taskType.setArt, $"{datiODL.CodArticolo}");
+                    DataLayerObj.addTask4Machine(idxMacchinaFix, taskType.setPzComm, $"{datiODL.NumPezzi}");
+                    DataLayerObj.addTask4Machine(idxMacchinaFix, taskType.setComm, $"ODL{datiODL.IdxODL:00000000}");
+                }
+                catch
+                { }
+
                 // se è multi CHIUDO ODL x altra tavola...
                 if (isMulti)
                 {

MP-TAB/WebUserControls/mod_confProd.ascx

@@ -12,9 +12,9 @@
         ////document.getElementById('<%= lblUpdating.ClientID %>').hidden = true;
     }
     function fixDelayed() {
-        console.log('start delay');
+        //console.log('start delay');
         setTimeout(function () {
-            console.log('after');
+            //console.log('after');
         ////document.getElementById('<%= lblUpdating.ClientID %>').hidden = true;
         }, 300);
     }
@@ -71,6 +71,7 @@
             <div class="col-6 col-sm-3 pr-1 align-self-end font-weight-bold">
                 <asp:Label runat="server" ID="lblNumLasciati" CssClass="mb-0" AssociatedControlID="txtNumPezzi" Text="Pz Prodotti LASCIATI" />
                 <asp:TextBox runat="server" ID="txtNumLasciati" Font-Size="XX-Large" TextMode="Number" CssClass="form-control text-right alert alert-secondary py-0 mb-0" Enabled="true" AutoPostBack="True" OnTextChanged="txtNumLasciati_TextChanged" onfocus="hideConfirmButton()" onblur="showConfirmButton()" />
+                <asp:Label runat="server" ID="lblEmptyNumLasciati" CssClass="btn btn-secondary text-light btn-lg btn-block" Visible="false">&nbsp;</asp:Label>
             </div>
             <div class="col-6 col-sm-3 pl-1 align-self-end font-weight-bold">
                 <asp:LinkButton runat="server" ID="lbtSalva" CssClass="btn btn-success text-light btn-lg btn-block" OnClick="lbtSalva_Click"><i class="fa fa-floppy-o"></i> CONFERMA</asp:LinkButton>

MP-TAB/WebUserControls/mod_confProd.ascx.cs

@@ -248,8 +248,10 @@ namespace MoonProTablet.WebUserControls
         private void checkConfig()
         {
             // verifico SE sia permesso gestire i "Pezzi lasciati" in macchina...
-            lblNumLasciati.Visible = memLayer.ML.cdvb("enablePzProdLasciati");
-            txtNumLasciati.Visible = memLayer.ML.cdvb("enablePzProdLasciati");
+            bool enablePzProdLasciati = memLayer.ML.cdvb("enablePzProdLasciati");
+            lblNumLasciati.Visible = enablePzProdLasciati;
+            txtNumLasciati.Visible = enablePzProdLasciati;
+            lblEmptyNumLasciati.Visible = !enablePzProdLasciati;
         }
 
         /// <summary>

MP-TAB/WebUserControls/mod_confProd.ascx.designer.cs

@@ -167,6 +167,15 @@ namespace MoonProTablet.WebUserControls
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox txtNumLasciati;
 
+        /// <summary>
+        /// Controllo lblEmptyNumLasciati.
+        /// </summary>
+        /// <remarks>
+        /// Campo generato automaticamente.
+        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblEmptyNumLasciati;
+
         /// <summary>
         /// Controllo lbtSalva.
         /// </summary>