From 2bf8dba6181b7dd4078836ba5eda3509ca1ae1e1 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Wed, 2 May 2018 16:41:43 +0200
Subject: [PATCH] Altro testing (insieme scarti/controlli e prod NON vanno)

---
 MP-Tablet/DettaglioMacchina.aspx              |  22 ++--
 MP-Tablet/Test.aspx                           | 111 ++----------------
 MP-Tablet/Test.aspx.designer.cs               |  27 +++++
 MP-Tablet/WebUserControls/mod_confProd.ascx   |  49 ++++----
 .../WebUserControls/mod_confProd.ascx.cs      |  39 +++---
 .../mod_confProd.ascx.designer.cs             |  18 +++
 MP-Tablet/WebUserControls/mod_regScarti.ascx  |  42 +++----
 .../WebUserControls/mod_regScarti.ascx.cs     |  69 ++++-------
 .../mod_regScarti.ascx.designer.cs            |  71 +----------
 9 files changed, 154 insertions(+), 294 deletions(-)

diff --git a/MP-Tablet/DettaglioMacchina.aspx b/MP-Tablet/DettaglioMacchina.aspx
index 571345b2..e224d90a 100644
--- a/MP-Tablet/DettaglioMacchina.aspx
+++ b/MP-Tablet/DettaglioMacchina.aspx
@@ -1,25 +1,24 @@
 <%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/Bootstrap.Master" AutoEventWireup="true" CodeBehind="DettaglioMacchina.aspx.cs"
   Inherits="MoonProTablet.DettaglioMacchina" %>
 
-<%@ Register Src="WebUserControls/mod_dettMacchina.ascx" TagName="mod_dettMacchina" TagPrefix="uc1" %>
-<%@ Register Src="WebUserControls/mod_dettaglioProd.ascx" TagName="mod_dettaglioProd" TagPrefix="uc2" %>
-<%@ Register Src="WebUserControls/mod_dettTurni.ascx" TagName="mod_dettTurni" TagPrefix="uc3" %>
-<%@ Register Src="WebUserControls/mod_confProd.ascx" TagName="mod_confProd" TagPrefix="uc4" %>
-<%@ Register Src="~/WebUserControls/mod_controlliProd.ascx" TagPrefix="uc1" TagName="mod_controlliProd" %>
 <%@ Register Src="~/WebUserControls/mod_directLinks.ascx" TagPrefix="uc1" TagName="mod_directLinks" %>
-<%@ Register Src="~/WebUserControls/mod_regScarti.ascx" TagPrefix="uc1" TagName="mod_regScarti" %>
-
+<%@ Register Src="~/WebUserControls/mod_dettaglioProd.ascx" TagName="mod_dettaglioProd" TagPrefix="uc2" %>
+<%@ Register Src="~/WebUserControls/mod_confProd.ascx" TagName="mod_confProd" TagPrefix="uc4" %>
+<%@ Register Src="~/WebUserControls/mod_controlliProd.ascx" TagPrefix="uc5" TagName="mod_controlliProd" %>
+<%@ Register Src="~/WebUserControls/mod_dettMacchina.ascx" TagName="mod_dettMacchina" TagPrefix="uc6" %>
+<%@ Register Src="~/WebUserControls/mod_regScarti.ascx" TagPrefix="uc3" TagName="mod_regScarti" %>
 
 <asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
   <div class="container-flow m-3" role="main">
     <div class="row">
       <div class="col-12 col-sm-8 col-md-9 col-xl-10">
-        <uc1:mod_dettMacchina ID="mod_dettMacchina1" runat="server" />
+        <uc6:mod_dettMacchina ID="mod_dettMacchina1" runat="server" />
         <%--statistiche produzione--%>
         <div class="card bg-dark my-3">
           <div class="card-header bg-light" id="heading01">
             <p class="mb-0">
-              <asp:LinkButton runat="server" ID="lbtGrp03" class="btn btn-light btn-block collapsed p-0" data-toggle="collapse" data-target="#collapse01" aria-expanded="false" aria-controls="collapse01"> <i class="fa fa-gear"></i><b>Statistiche produzione</b> </asp:LinkButton>
+              <asp:LinkButton runat="server" ID="lbtGrp03" class="btn btn-light btn-block collapsed p-0" data-toggle="collapse" data-target="#collapse01" aria-expanded="false" aria-controls="collapse01"> <i class="fa fa-gear"></i><b>Statistiche produzione</b>
+              </asp:LinkButton>
             </p>
           </div>
           <div id="collapse01" class="collapse" aria-labelledby="headingThree" data-parent="#accordion">
@@ -30,13 +29,12 @@
           </div>
         </div>
         <uc4:mod_confProd ID="mod_confProd1" runat="server" />
-        <uc1:mod_regScarti runat="server" ID="mod_regScarti" />
-        <uc1:mod_controlliProd runat="server" ID="mod_controlliProd" />
+        <uc3:mod_regScarti runat="server" ID="mod_regScarti" />
+        <uc5:mod_controlliProd runat="server" ID="mod_controlliProd" />
       </div>
       <div class="col-12 col-sm-4 col-md-3 col-xl-2">
         <uc1:mod_directLinks runat="server" ID="mod_directLinks" />
       </div>
-      <%--<uc3:mod_dettTurni ID="mod_dettTurni2" runat="server" />--%>
     </div>
   </div>
 </asp:Content>
diff --git a/MP-Tablet/Test.aspx b/MP-Tablet/Test.aspx
index 01fc949e..17c0a894 100644
--- a/MP-Tablet/Test.aspx
+++ b/MP-Tablet/Test.aspx
@@ -1,109 +1,18 @@
 <%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/Bootstrap.Master" AutoEventWireup="true" CodeBehind="Test.aspx.cs" Inherits="MoonProTablet.Test" %>
 
+<%@ Register Src="~/WebUserControls/mod_controlliProd.ascx" TagPrefix="uc1" TagName="mod_controlliProd" %>
+<%@ Register Src="~/WebUserControls/mod_regScarti.ascx" TagPrefix="uc1" TagName="mod_regScarti" %>
+<%@ Register Src="~/WebUserControls/mod_confProd.ascx" TagPrefix="uc1" TagName="mod_confProd" %>
+
+
+
+
 <asp:Content ID="Content1" ContentPlaceHolderID="HeadContent" runat="server">
 </asp:Content>
 <asp:Content ID="Content3" ContentPlaceHolderID="MainContent" runat="server">
   <div class="container">
-<%--    <br />
-    <br />
-    <br />
-    <h1>PROVA SLIDEOUT</h1>
-    <script type="text/javascript">
-      function closeModal() {
-        $('#MainSideMenu').modal('hide');
-        $('#btnClose').click();
-      }
-      function toggleTimer() {
-        $('#MainSideMenu').modal('toggle');
-        myVar = setTimeout(closeModal2, 10000);
-        function closeModal2() {
-          $('#MainSideMenu').modal('hide');
-        }
-      }
-    </script>
-    
-<div class="modal fade text-dark" id="MainSideMenu" tabindex="-1" role="dialog" aria-labelledby="MainSideMenu" aria-hidden="true">
-  <div class="modal-dialog modal-dialog-slideout modal-sm" role="document">
-    <div class="modal-content">
-      <div class="modal-header">
-        <div class="d-flex flex-row">
-          <div class="p-0">
-            <asp:Image ID="Image1" ImageUrl="../images/logoSteamware.png" runat="server" Height="40px" CssClass="img-fluid" />
-          </div>
-          <div class="p-0 pl-1">
-            <div class="flex-row">
-              <h5 class="modal-title">Steamware MPTAB</h5>
-            </div>
-            <div class="flex-row">
-              <small>Main Menu</small>
-            </div>
-          </div>
-        </div>
-        <button id="btnClose" type="button" class="close" data-dismiss="modal" aria-label="Close">
-          <span aria-hidden="true">×</span>
-        </button>
-      </div>
-      <div class="modal-body">
-        <button id="btnClose2" type="button" onclick="closeModal()" class="BTN BTN-WARNING">
-          <span aria-hidden="true">btn close</span>
-        </button>
-        <div class="d-flex">
-          <div class="flex-row">
-            <div class="p-2">
-              Mappa Stato
-            </div>
-            <div class="p-2">
-              <div class="btn-group">
-                <button type="button" class="btn btn-danger dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                  ELENCO IMPIANTI
-                </button>
-                <div class="dropdown-menu">
-                  <a class="dropdown-item" href="#">Action</a>
-                  <a class="dropdown-item" href="#">Another action</a>
-                  <a class="dropdown-item" href="#">Something else here</a>
-                  <div class="dropdown-divider"></div>
-                  <a class="dropdown-item" href="#">Separated link</a>
-                </div>
-              </div>
-            </div>
-            <div class="p-2">
-              Dettaglio macchina
-              <div class="p-2">
-                Produzione
-              </div>
-              <div class="p-2">
-                ODL / Attrezzaggio
-              </div>
-              <div class="p-2">
-                Gest Turni
-              </div>
-              <div class="p-2">
-                Fermate
-              </div>
-              <div class="p-2">
-                Commenti
-              </div>
-              <div class="p-2">
-                Controlli
-              </div>
-            </div>
-            <div class="p-2">
-              Storico TC
-            </div>
-            <div class="p-2">
-              Utente
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-secondary btn-block" data-dismiss="modal">Chiudi</button>
-      </div>
-    </div>
+    <uc1:mod_confProd runat="server" ID="mod_confProd" />
+    <uc1:mod_regScarti runat="server" ID="mod_regScarti" />
+    <uc1:mod_controlliProd runat="server" ID="mod_controlliProd" />
   </div>
-</div>
-    <button id="btnTogg" type="button" onclick="toggleTimer()">
-      <span aria-hidden="true">show modal</span>
-    </button>
-  </div>--%>
 </asp:Content>
diff --git a/MP-Tablet/Test.aspx.designer.cs b/MP-Tablet/Test.aspx.designer.cs
index cc702a95..948187bf 100644
--- a/MP-Tablet/Test.aspx.designer.cs
+++ b/MP-Tablet/Test.aspx.designer.cs
@@ -11,5 +11,32 @@ namespace MoonProTablet {
     
     
     public partial class Test {
+        
+        /// <summary>
+        /// Controllo mod_confProd.
+        /// </summary>
+        /// <remarks>
+        /// Campo generato automaticamente.
+        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// </remarks>
+        protected global::MoonProTablet.WebUserControls.mod_confProd mod_confProd;
+        
+        /// <summary>
+        /// Controllo mod_regScarti.
+        /// </summary>
+        /// <remarks>
+        /// Campo generato automaticamente.
+        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// </remarks>
+        protected global::MoonProTablet.WebUserControls.mod_regScarti mod_regScarti;
+        
+        /// <summary>
+        /// Controllo mod_controlliProd.
+        /// </summary>
+        /// <remarks>
+        /// Campo generato automaticamente.
+        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// </remarks>
+        protected global::MoonProTablet.WebUserControls.mod_controlliProd mod_controlliProd;
     }
 }
diff --git a/MP-Tablet/WebUserControls/mod_confProd.ascx b/MP-Tablet/WebUserControls/mod_confProd.ascx
index bf5745eb..e64f916c 100644
--- a/MP-Tablet/WebUserControls/mod_confProd.ascx
+++ b/MP-Tablet/WebUserControls/mod_confProd.ascx
@@ -26,7 +26,7 @@
     <b>Dati Globali ODL</b>
   </div>
   <div class="col-4 text-right"><sub>(Inizio ODL --> <%: dtReqUpdate.ToString() %>)</sub></div>
-  <div class="col-4 pr-1 py-0 text-right">
+  <div class="col-6 col-sm-3 pr-1 py-0 text-right">
     <div class="alert alert-info py-1">
       <div class="text-truncate">
         Pz Prodotti TOT [A+B+C]
@@ -36,20 +36,30 @@
       </div>
     </div>
   </div>
-  <div class="col-4 px-1 py-0 text-right">
-    <div class="alert alert-danger py-1">
+  <div class="col-6 col-sm-3 pl-1 px-sm-1 py-0 text-right">
+    <div class="alert alert-warning py-1">
       <div class="text-truncate">
-        [B] Scarti GIA' scaricati
+        [A] NUOVI Pz.Prod
       </div>
       <div style="font-size: 2em; font-weight: bold;" class="my-0">
-        <%: datiProdAct.PzConfScarto %>
+        <%: datiProdAct.Pz2RecTot %>
       </div>
     </div>
   </div>
-  <div class="col-4 pl-1 py-0 text-right">
+  <div class="col-6 col-sm-3 pr-1 px-sm-1 py-0 text-right">
+    <div class="alert alert-danger py-1">
+      <div class="text-truncate">
+        [B] Scarti VERS + PEND
+      </div>
+      <div style="font-size: 2em; font-weight: bold;" class="my-0">
+        <%: datiProdAct.PzConfScarto %> + <%: datiProdAct.Pz2RecScarto %>
+      </div>
+    </div>
+  </div>
+  <div class="col-6 col-sm-3 pl-1 py-0 text-right">
     <div class="alert alert-success py-1">
       <div class="text-truncate">
-        [C] Pz Buoni VERSATI
+        [C] Pz Buoni VERS.
       </div>
       <div style="font-size: 2em; font-weight: bold;" class="my-0">
         <%: datiProdAct.PzConfBuoni %>
@@ -57,32 +67,31 @@
     </div>
   </div>
 </div>
-<div class="row textCondens text-right bg-secondary">
+<div class="row textCondens text-right bg-secondary" runat="server" id="divInnovazioni">
   <div class="col-4"></div>
   <div class="col-4 py-1 text-center text-uppercase">
     <b>Dati Incrementali</b>
   </div>
   <div class="col-4 text-right"><sub>(ultima conferma --> <%: dtReqUpdate.ToString() %>)</sub></div>
-  <div class="col-4 pr-1">
-    <asp:Label runat="server" ID="lblNumPezzi" AssociatedControlID="txtNumPezzi" Text="[A] Pz Prodotti" />
+  <div class="col-3 pr-1">
+    <asp:Label runat="server" ID="lblNumPezzi" AssociatedControlID="txtNumPezzi" Text="Pz Prodotti" />
     <asp:TextBox runat="server" ID="txtNumPezzi" Font-Size="XX-Large" TextMode="Number" CssClass="form-control text-right alert alert-info py-0" Enabled="false" AutoPostBack="True" OnTextChanged="txtNumPezzi_TextChanged" />
   </div>
-  <div class="col-4 px-1">
-    <asp:Label runat="server" ID="lblNumScarti" AssociatedControlID="txtNumScarti" Text="Pz Scarto(-)" />
+  <div class="col-3 px-1">
+    <asp:Label runat="server" ID="lblNumScarti" AssociatedControlID="txtNumScarti" Text="Pz Scarto" />
     <asp:TextBox runat="server" ID="txtNumScarti" Font-Size="XX-Large" TextMode="Number" CssClass="form-control text-right alert alert-danger py-0" Enabled="false" AutoPostBack="True" OnTextChanged="txtNumScarti_TextChanged" />
   </div>
-  <div class="col-4 pl-1">
-    <asp:Label runat="server" ID="lblPzBuoni" AssociatedControlID="txtPzBuoni" Text="Pezzi Buoni" />
+  <div class="col-3 px-1">
+    <asp:Label runat="server" ID="lblPzBuoni" AssociatedControlID="txtPzBuoni" Text="Pz Buoni" />
     <asp:TextBox runat="server" ID="txtPzBuoni" Font-Size="XX-Large" TextMode="Number" CssClass="form-control text-right alert alert-success py-0" Enabled="false" Text="---" />
   </div>
-</div>
-<div class="row mt-2">
-  <div class="col-12">
-    <asp:LinkButton runat="server" ID="lbtSalva" Visible="false" CssClass="btn btn-warning text-light btn-lg btn-block" OnClick="lbtSalva_Click"><i class="fa fa-floppy-o"></i> CONFERMA</asp:LinkButton>
+  <div class="col-3 pl-1">
+    <asp:Label runat="server" ID="Label1" AssociatedControlID="txtPzBuoni" Text="-" />
+    <asp:LinkButton runat="server" ID="lbtSalva" Visible="false" CssClass="btn btn-success text-light btn-lg btn-block" OnClick="lbtSalva_Click"><i class="fa fa-floppy-o"></i> CONFERMA</asp:LinkButton>
   </div>
 </div>
-<div class="row mb-2">
+<div class="row my-2">
   <div class="col-12">
     <asp:Label runat="server" ID="lblOut" ForeColor="Red" />
   </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/MP-Tablet/WebUserControls/mod_confProd.ascx.cs b/MP-Tablet/WebUserControls/mod_confProd.ascx.cs
index 550281c1..e92b5880 100644
--- a/MP-Tablet/WebUserControls/mod_confProd.ascx.cs
+++ b/MP-Tablet/WebUserControls/mod_confProd.ascx.cs
@@ -182,7 +182,7 @@ namespace MoonProTablet.WebUserControls
     /// <param name="e"></param>
     protected void lbtShowConfProd_Click(object sender, EventArgs e)
     {
-      switchBtnConferma(!txtNumPezzi.Enabled);
+      switchBtnConferma(!divInnovazioni.Visible);
     }
 
     /// <summary>
@@ -192,27 +192,27 @@ namespace MoonProTablet.WebUserControls
     {
       // aggiorno valori rilevati
       updateProdData();
-      // continuo update
-      txtNumPezzi.Enabled = showConf;
-      txtNumScarti.Enabled = showConf;
-      lbtSalva.Visible = showConf;
-      DS_ProdTempi.stp_PzProd_getByMacchinaRow rigaProd;
-      rigaProd = DataLayer.obj.taPzProd2conf.GetData(idxMacchina)[0];
-      try
+      divInnovazioni.Visible = showConf;
+      if (showConf)
       {
-        //numPzProdotti = rigaProd.pezziNonConfermati;
-        //numPzScarto = 0;
-        txtPzBuoni.Text = numPzConfermati.ToString();
-        // sollevo evento!
-        if (eh_inserting != null)
+        // continuo update
+        txtNumPezzi.Enabled = showConf;
+        txtNumScarti.Enabled = false;// showConf;
+        lbtSalva.Visible = showConf;
+        try
         {
-          eh_inserting(this, new EventArgs());
+          txtPzBuoni.Text = numPzConfermati.ToString();
+          // sollevo evento!
+          if (eh_inserting != null)
+          {
+            eh_inserting(this, new EventArgs());
+          }
+        }
+        catch
+        {
+          txtNumPezzi.Text = "0";
+          logger.lg.scriviLog(string.Format("Errore recupero pezzi da confermare per la macchina {0}", idxMacchina), tipoLog.ERROR);
         }
-      }
-      catch
-      {
-        txtNumPezzi.Text = "0";
-        logger.lg.scriviLog(string.Format("Errore recupero pezzi da confermare per la macchina {0}", idxMacchina), tipoLog.ERROR);
       }
       if (showConf)
       {
@@ -381,5 +381,6 @@ namespace MoonProTablet.WebUserControls
         memLayer.ML.setSessionVal("subMaccSel", value);
       }
     }
+
   }
 }
\ No newline at end of file
diff --git a/MP-Tablet/WebUserControls/mod_confProd.ascx.designer.cs b/MP-Tablet/WebUserControls/mod_confProd.ascx.designer.cs
index 069c39d2..4fb57882 100644
--- a/MP-Tablet/WebUserControls/mod_confProd.ascx.designer.cs
+++ b/MP-Tablet/WebUserControls/mod_confProd.ascx.designer.cs
@@ -75,6 +75,15 @@ namespace MoonProTablet.WebUserControls {
         /// </remarks>
         protected global::System.Web.UI.WebControls.ObjectDataSource ods;
         
+        /// <summary>
+        /// Controllo divInnovazioni.
+        /// </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.HtmlControls.HtmlGenericControl divInnovazioni;
+        
         /// <summary>
         /// Controllo lblNumPezzi.
         /// </summary>
@@ -129,6 +138,15 @@ namespace MoonProTablet.WebUserControls {
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox txtPzBuoni;
         
+        /// <summary>
+        /// Controllo Label1.
+        /// </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 Label1;
+        
         /// <summary>
         /// Controllo lbtSalva.
         /// </summary>
diff --git a/MP-Tablet/WebUserControls/mod_regScarti.ascx b/MP-Tablet/WebUserControls/mod_regScarti.ascx
index 7ce673d9..93f04557 100644
--- a/MP-Tablet/WebUserControls/mod_regScarti.ascx
+++ b/MP-Tablet/WebUserControls/mod_regScarti.ascx
@@ -1,48 +1,36 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_regScarti.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_regScarti" %>
 
-
 <div class="row">
   <div class="col-12">
-    <asp:Label runat="server" ID="lblConfScarti" CssClass="btn btn-warning btn-lg btn-block disabled">
+    <asp:Label runat="server" ID="lblConfScarti" CssClass="btn btn-info btn-lg btn-block disabled">
       <i class="fa fa-bug"></i> Registra SCARTI
     </asp:Label>
     <asp:Label runat="server" ID="lblMancaODL" Visible="false" ForeColor="Red">MANCA ODL: registrazione scarti produzione NON permessa</asp:Label>
-    <asp:LinkButton runat="server" ID="lbtShowScarti" OnClick="lbtShowContr_Click" CssClass="btn btn-warning btn-lg btn-block">
+    <asp:LinkButton runat="server" ID="lbtShowScarti" OnClick="lbtShowContr_Click" CssClass="btn btn-info btn-lg btn-block">
       <i class="fa fa-bug"></i>
       <asp:Label runat="server" ID="lblShowScarti" />
     </asp:LinkButton>
   </div>
-  <div class="col-12" runat="server" id="divSelMacc">
-    <asp:DropDownList runat="server" ID="ddlSubMacc" DataSourceID="ods" CssClass="form-control" DataTextField="CodMaccArticolo" DataValueField="IdxMacchina" AutoPostBack="True" OnSelectedIndexChanged="ddlSubMacc_SelectedIndexChanged" OnDataBound="ddlSubMacc_DataBound"></asp:DropDownList>
-    <asp:ObjectDataSource runat="server" ID="ods" OldValuesParameterFormatString="original_{0}" SelectMethod="getMulti" TypeName="MapoDb.DS_applicazioneTableAdapters.MSFDTableAdapter" FilterExpression="idxMacchina LIKE '%#%'">
-      <SelectParameters>
-        <asp:SessionParameter DefaultValue="0" Name="IdxMacchina" SessionField="IdxMacchina" Type="String" />
-      </SelectParameters>
-    </asp:ObjectDataSource>
-  </div>
 </div>
-<div class="row my-2" runat="server">
-
-
-
-
-
-  <div class="col-6">
-    <asp:LinkButton runat="server" ID="lbtOK" CssClass="btn btn-block btn-success" OnClick="lbtOK_Click">OK</asp:LinkButton>
+<div class="row my-2" runat="server" id="divDetail">
+  <div class="col-4">
+    Data
+  </div>
+  <div class="col-4">
+    Ora
+  </div>
+  <div class="col-4">
+    NumPz
   </div>
   <div class="col-6">
-    <asp:LinkButton runat="server" ID="lbtKO" CssClass="btn btn-block btn-danger" OnClick="lbtKO_Click">KO</asp:LinkButton>
+    <asp:TextBox runat="server" ID="txtNote" />
   </div>
-  <div class="col-12" runat="server" id="divNote" visible="false">
-    <asp:Label runat="server" ID="Label1" CssClass="small disabled" AssociatedControlID="txtNoteContr">
-      Note controllo NON superato (opzionali)
-    </asp:Label>
-    <asp:TextBox runat="server" ID="txtNoteContr" TextMode="MultiLine" CssClass="form-control"></asp:TextBox>
-    <asp:LinkButton runat="server" ID="lbtSalva" CssClass="btn btn-danger text-light btn-lg btn-block" OnClick="lbtSalva_Click"><i class="fa fa-floppy-o"></i> CONFERMA controllo KO</asp:LinkButton>
+  <div class="col-6">
+    BtnSalva
   </div>
 </div>
 <div class="row mb-2">
   <div class="col-12">
     <asp:Label runat="server" ID="lblOut" ForeColor="Red" />
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/MP-Tablet/WebUserControls/mod_regScarti.ascx.cs b/MP-Tablet/WebUserControls/mod_regScarti.ascx.cs
index 2fd31d51..d3767661 100644
--- a/MP-Tablet/WebUserControls/mod_regScarti.ascx.cs
+++ b/MP-Tablet/WebUserControls/mod_regScarti.ascx.cs
@@ -35,7 +35,9 @@ namespace MoonProTablet.WebUserControls
 
     private void checkAll()
     {
-      fixSelMacc();
+#if false
+      fixSelMacc(); 
+#endif
       checkOdl();
       lblOut.Text = "";
       switchBtnConferma(false);
@@ -54,6 +56,7 @@ namespace MoonProTablet.WebUserControls
     /// <summary>
     /// Verifica se la macchina MAIN sia MULTI (da DatiMacchina / redis...)
     /// </summary>
+#if false
     protected bool isMulti
     {
       get
@@ -67,7 +70,8 @@ namespace MoonProTablet.WebUserControls
     private void fixSelMacc()
     {
       divSelMacc.Visible = isMulti;
-    }
+    } 
+#endif
     /// <summary>
     /// restituisce css disabled SE odl NON OK...
     /// </summary>
@@ -109,25 +113,16 @@ namespace MoonProTablet.WebUserControls
       get
       {
         string answ = memLayer.ML.StringSessionObj("IdxMacchina");
-        // verifoc: se multi uso selettore tendina...
-        if (isMulti)
-        {
-          if (ddlSubMacc.SelectedValue == "")
-          {
-            ddlSubMacc.DataBind();
-          }
-          if (ddlSubMacc.SelectedValue != "")
-          {
-            answ = ddlSubMacc.SelectedValue;
-          }
-        }
         return answ;
       }
+#if false
       set
       {
         memLayer.ML.setSessionVal("IdxMacchina", value);
-      }
+      } 
+#endif
     }
+#if false
     /// <summary>
     /// idx macchina selezionata
     /// </summary>
@@ -141,7 +136,8 @@ namespace MoonProTablet.WebUserControls
       {
         memLayer.ML.setSessionVal("IdxMacchina", value);
       }
-    }
+    } 
+#endif
     /// <summary>
     /// cambio stato visibilità pannello e testo button
     /// </summary>
@@ -149,16 +145,14 @@ namespace MoonProTablet.WebUserControls
     /// <param name="e"></param>
     protected void lbtShowContr_Click(object sender, EventArgs e)
     {
-      switchBtnConferma(!lbtOK.Visible);
+      switchBtnConferma(!divDetail.Visible);
     }
     /// <summary>
     /// determina comportamento btn conferma
     /// </summary>
     private void switchBtnConferma(bool showConf)
     {
-      lbtOK.Visible = showConf;
-      lbtKO.Visible = showConf;
-      lbtSalva.Visible = showConf;
+      divDetail.Visible = showConf;
       if (showConf)
       {
         lblShowScarti.Text = "Nascondi SCARTI";
@@ -180,8 +174,10 @@ namespace MoonProTablet.WebUserControls
     /// <param name="e"></param>
     protected void lbtSalva_Click(object sender, EventArgs e)
     {
+#if false
       // salvo controllo KO
-      DataLayer.obj.taRC.insertQuery(idxMacchina, DataLayer.MatrOpr, false, txtNoteContr.Text.Trim(), DateTime.Now);
+      DataLayer.obj.taRC.insertQuery(idxMacchina, DataLayer.MatrOpr, false, txtNote.Text.Trim(), DateTime.Now); 
+#endif
       // sollevo evento!
       if (eh_newVal != null)
       {
@@ -192,32 +188,11 @@ namespace MoonProTablet.WebUserControls
 
     private void resetControlli()
     {
-      txtNoteContr.Text = "";
+      txtNote.Text = "";
       // nascondo!
       switchBtnConferma(false);
-      divNote.Visible = false;
     }
 
-    protected void ddlSubMacc_SelectedIndexChanged(object sender, EventArgs e)
-    {
-      subMaccSel = ddlSubMacc.SelectedValue;
-      checkAll();
-    }
-
-    protected void ddlSubMacc_DataBound(object sender, EventArgs e)
-    {
-      // se ho in memoria un valore LO REIMPOSTO...
-      if (subMaccSel != "")
-      {
-        // provo a preselezionare...
-        try
-        {
-          ddlSubMacc.SelectedValue = subMaccSel;
-        }
-        catch
-        { }
-      }
-    }
     /// <summary>
     /// Sotto sistema (macchina) selezionato
     /// </summary>
@@ -235,8 +210,10 @@ namespace MoonProTablet.WebUserControls
 
     protected void lbtOK_Click(object sender, EventArgs e)
     {
+#if false
       // Salvo controllo come OK
-      DataLayer.obj.taRC.insertQuery(idxMacchina, DataLayer.MatrOpr, true, "", DateTime.Now);
+      DataLayer.obj.taRC.insertQuery(idxMacchina, DataLayer.MatrOpr, true, "", DateTime.Now); 
+#endif
       // sollevo evento!
       if (eh_newVal != null)
       {
@@ -245,9 +222,5 @@ namespace MoonProTablet.WebUserControls
       resetControlli();
     }
 
-    protected void lbtKO_Click(object sender, EventArgs e)
-    {
-      divNote.Visible = true;
-    }
   }
 }
\ No newline at end of file
diff --git a/MP-Tablet/WebUserControls/mod_regScarti.ascx.designer.cs b/MP-Tablet/WebUserControls/mod_regScarti.ascx.designer.cs
index 166a7101..90839d8d 100644
--- a/MP-Tablet/WebUserControls/mod_regScarti.ascx.designer.cs
+++ b/MP-Tablet/WebUserControls/mod_regScarti.ascx.designer.cs
@@ -49,85 +49,22 @@ namespace MoonProTablet.WebUserControls {
         protected global::System.Web.UI.WebControls.Label lblShowScarti;
         
         /// <summary>
-        /// Controllo divSelMacc.
+        /// Controllo divDetail.
         /// </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.HtmlControls.HtmlGenericControl divSelMacc;
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl divDetail;
         
         /// <summary>
-        /// Controllo ddlSubMacc.
+        /// Controllo txtNote.
         /// </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.DropDownList ddlSubMacc;
-        
-        /// <summary>
-        /// Controllo ods.
-        /// </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.ObjectDataSource ods;
-        
-        /// <summary>
-        /// Controllo lbtOK.
-        /// </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.LinkButton lbtOK;
-        
-        /// <summary>
-        /// Controllo lbtKO.
-        /// </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.LinkButton lbtKO;
-        
-        /// <summary>
-        /// Controllo divNote.
-        /// </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.HtmlControls.HtmlGenericControl divNote;
-        
-        /// <summary>
-        /// Controllo Label1.
-        /// </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 Label1;
-        
-        /// <summary>
-        /// Controllo txtNoteContr.
-        /// </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.TextBox txtNoteContr;
-        
-        /// <summary>
-        /// Controllo lbtSalva.
-        /// </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.LinkButton lbtSalva;
+        protected global::System.Web.UI.WebControls.TextBox txtNote;
         
         /// <summary>
         /// Controllo lblOut.