From c48897e6b0020c8be4aec0f8922cf953bf3ed354 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Mon, 16 Nov 2020 17:59:12 +0100
Subject: [PATCH] fix new rel x hide salva con modifica num pz
 confermati/lasciati

---
 Jenkinsfile                              |   2 +-
 MP-TAB/WebUserControls/mod_confProd.ascx | 222 ++++++++++++-----------
 2 files changed, 117 insertions(+), 107 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 58d693f9..288dbe7f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -12,7 +12,7 @@ pipeline {
       steps {
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=1321']) {
+        withEnv(['NEXT_BUILD_NUMBER=1322']) {
           // 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'
diff --git a/MP-TAB/WebUserControls/mod_confProd.ascx b/MP-TAB/WebUserControls/mod_confProd.ascx
index 855e4780..7a7a7a23 100644
--- a/MP-TAB/WebUserControls/mod_confProd.ascx
+++ b/MP-TAB/WebUserControls/mod_confProd.ascx
@@ -1,130 +1,140 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_confProd.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_confProd" %>
 
+<script type="text/javascript">
+    function hideConfirmButton() {
+        //console.log('hide confirm');
+        document.getElementById('<%= lbtSalva.ClientID %>').hidden = true
+    }
+    function showConfirmButton() {
+        //console.log('show confirm');
+        document.getElementById('<%= lbtSalva.ClientID %>').hidden = false;
+    }
+</script>
 
 <div class="card bg-secondary">
-  <div class="card-header p-0">
-    <div class="row">
-      <div class="col-12">
-        <asp:Label runat="server" ID="lblConfProd" CssClass="btn btn-dark btn-lg btn-block disabled">
+    <div class="card-header p-0">
+        <div class="row">
+            <div class="col-12">
+                <asp:Label runat="server" ID="lblConfProd" CssClass="btn btn-dark btn-lg btn-block disabled">
       <i class="fa fa-check"></i> MOSTRA Conferma
-        </asp:Label>
-        <asp:Label runat="server" ID="lblMancaODL" Visible="false" ForeColor="Red">MANCA ODL: conferma NON permessa</asp:Label>
-        <asp:LinkButton runat="server" ID="lbtShowConfProd" OnClick="lbtShowConfProd_Click" CssClass="btn btn-dark btn-lg btn-block">
-          <i class="fa fa-check"></i>
-          <asp:Label runat="server" ID="lblShowConfProd" />
-        </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>
+                </asp:Label>
+                <asp:Label runat="server" ID="lblMancaODL" Visible="false" ForeColor="Red">MANCA ODL: conferma NON permessa</asp:Label>
+                <asp:LinkButton runat="server" ID="lbtShowConfProd" OnClick="lbtShowConfProd_Click" CssClass="btn btn-dark btn-lg btn-block">
+                    <i class="fa fa-check"></i>
+                    <asp:Label runat="server" ID="lblShowConfProd" />
+                </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>
-  </div>
-  <div class="card-body p-0">
-    <div class="row textCondens text-right bg-dark m-1 p-1" runat="server" id="divInnovazioni">
-      <div class="col-6 py-1 text-left text-uppercase">
-        <b>Dati Incrementali</b>
-      </div>
-      <div class="col-6 text-right">
-        <sub>ultima conferma -->
+    <div class="card-body p-0">
+        <div class="row textCondens text-right bg-dark m-1 p-1" runat="server" id="divInnovazioni">
+            <div class="col-6 py-1 text-left text-uppercase">
+                <b>Dati Incrementali</b>
+            </div>
+            <div class="col-6 text-right">
+                <sub>ultima conferma -->
           <asp:Label runat="server" ID="lblDtRec"></asp:Label></sub>
-      </div>
-      <div class="col-6 col-sm-3 pr-1 align-self-end font-weight-bold">
-        <asp:Label runat="server" ID="lblNumPezzi" CssClass="mb-0" AssociatedControlID="txtNumPezzi" Text="Pz Prodotti CONFERMATI" />
-        <asp:TextBox runat="server" ID="txtNumPezzi" Font-Size="XX-Large" TextMode="Number" CssClass="form-control text-right alert alert-warning py-0 mb-0" Enabled="true" AutoPostBack="True" OnTextChanged="txtNumPezzi_TextChanged" />
-      </div>
-      <div class="col-6 col-sm-3  px-1 align-self-end font-weight-bold">
-        <div class="px-2">
-          <asp:Label runat="server" ID="lblPzSca2Rec" CssClass="text-danger" Text="Pz Scarto" />
-          +
+            </div>
+            <div class="col-6 col-sm-3 pr-1 align-self-end font-weight-bold">
+                <asp:Label runat="server" ID="lblNumPezzi" CssClass="mb-0" AssociatedControlID="txtNumPezzi" Text="Pz Prodotti CONFERMATI" />
+                <asp:TextBox runat="server" ID="txtNumPezzi" Font-Size="XX-Large" TextMode="Number" CssClass="form-control text-right alert alert-warning py-0 mb-0" Enabled="true" AutoPostBack="True" OnTextChanged="txtNumPezzi_TextChanged" onfocus="hideConfirmButton()" onblur="showConfirmButton()" />
+            </div>
+            <div class="col-6 col-sm-3  px-1 align-self-end font-weight-bold">
+                <div class="px-2">
+                    <asp:Label runat="server" ID="lblPzSca2Rec" CssClass="text-danger" Text="Pz Scarto" />
+                    +
             <asp:Label runat="server" ID="lblPzBuo2Rec" CssClass="text-success" Text="Pz Buoni" />
-        </div>
-        <div class="px-2" style="font-size: 2em;">
-          <asp:Label runat="server" ID="lblPz2RecScarto" CssClass="text-danger py-0">[B2]</asp:Label>
-          +
+                </div>
+                <div class="px-2" style="font-size: 2em;">
+                    <asp:Label runat="server" ID="lblPz2RecScarto" CssClass="text-danger py-0">[B2]</asp:Label>
+                    +
           <asp:Label runat="server" ID="lblPz2RecBuoni" CssClass="text-success py-0">[C2]</asp:Label>
+                </div>
+            </div>
+            <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()" />
+            </div>
+            <div class="col-6 col-sm-3 pl-1 align-self-end font-weight-bold">
+                <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>
-      <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" />
-      </div>
-      <div class="col-6 col-sm-3 pl-1 align-self-end font-weight-bold">
-        <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>
 </div>
 <div class="row textCondens">
-  <div class="col-12">
-    <asp:UpdateProgress ID="updtRicerca" runat="server" DisplayAfter="10" DynamicLayout="true">
-      <ProgressTemplate>
-        <div id="progress_back">
-        </div>
-        <div id="progress_top" class="text-center text-warning align-middle">
-          <i class="fa fa-spinner fa-pulse"></i>&nbsp;
+    <div class="col-12">
+        <asp:UpdateProgress ID="updtRicerca" runat="server" DisplayAfter="10" DynamicLayout="true">
+            <ProgressTemplate>
+                <div id="progress_back">
+                </div>
+                <div id="progress_top" class="text-center text-warning align-middle">
+                    <i class="fa fa-spinner fa-pulse"></i>&nbsp;
               <b>ELABORAZIONE IN CORSO</b>
-          <i class="fa fa-spinner fa-pulse"></i>&nbsp;
+                    <i class="fa fa-spinner fa-pulse"></i>&nbsp;
               <div class="progress">
-                <div class="progress-bar progress-bar-striped bg-success progress-bar-animated" role="progressbar" aria-valuenow="75" aria-valuemin="0" aria-valuemax="100" style="width: 75%"></div>
+                  <div class="progress-bar progress-bar-striped bg-success progress-bar-animated" role="progressbar" aria-valuenow="75" aria-valuemin="0" aria-valuemax="100" style="width: 75%"></div>
               </div>
-        </div>
-      </ProgressTemplate>
-    </asp:UpdateProgress>
-  </div>
+                </div>
+            </ProgressTemplate>
+        </asp:UpdateProgress>
+    </div>
 </div>
 <div class="row textCondens">
-  <div class="col-6 py-1 text-left text-uppercase">
-    <b>Dati Globali ODL</b>
-  </div>
-  <div class="col-6 text-right"><sub>Inizio ODL --> <%: dtReqUpdate.ToString() %></sub></div>
-  <div class="col-6 col-sm-3 pr-1 py-0 text-right">
-    <div class="alert alert-warning py-1">
-      <div class="text-truncate">
-        [A] NUOVI Pz.Prod
-      </div>
-      <div style="font-size: 2em; font-weight: bold;" class="my-0">
-        <asp:Label runat="server" ID="lblPz2RecTot">[A]</asp:Label>
-      </div>
+    <div class="col-6 py-1 text-left text-uppercase">
+        <b>Dati Globali ODL</b>
     </div>
-  </div>
-  <div class="col-6 col-sm-3 pl-1 px-sm-1 py-0 text-right">
-    <div class="alert alert-info py-1">
-      <div class="text-truncate">
-        Pz Prodotti TOT [A+B+C]
-      </div>
-      <div style="font-size: 2em; font-weight: bold;" class="my-0">
-        <asp:Label runat="server" ID="lblPzTotODL">[A+B+C]</asp:Label>
-      </div>
+    <div class="col-6 text-right"><sub>Inizio ODL --> <%: dtReqUpdate.ToString() %></sub></div>
+    <div class="col-6 col-sm-3 pr-1 py-0 text-right">
+        <div class="alert alert-warning py-1">
+            <div class="text-truncate">
+                [A] NUOVI Pz.Prod
+            </div>
+            <div style="font-size: 2em; font-weight: bold;" class="my-0">
+                <asp:Label runat="server" ID="lblPz2RecTot">[A]</asp:Label>
+            </div>
+        </div>
     </div>
-  </div>
-  <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.
-      </div>
-      <div style="font-size: 2em; font-weight: bold;" class="my-0">
-        <asp:Label runat="server" ID="lblPzConfScarto">[B]</asp:Label>
-      </div>
+    <div class="col-6 col-sm-3 pl-1 px-sm-1 py-0 text-right">
+        <div class="alert alert-info py-1">
+            <div class="text-truncate">
+                Pz Prodotti TOT [A+B+C]
+            </div>
+            <div style="font-size: 2em; font-weight: bold;" class="my-0">
+                <asp:Label runat="server" ID="lblPzTotODL">[A+B+C]</asp:Label>
+            </div>
+        </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 VERS.
-      </div>
-      <div style="font-size: 2em; font-weight: bold;" class="my-0">
-        <asp:Label runat="server" ID="lblPzConfBuoni">[C]</asp:Label>
-      </div>
+    <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.
+            </div>
+            <div style="font-size: 2em; font-weight: bold;" class="my-0">
+                <asp:Label runat="server" ID="lblPzConfScarto">[B]</asp:Label>
+            </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 VERS.
+            </div>
+            <div style="font-size: 2em; font-weight: bold;" class="my-0">
+                <asp:Label runat="server" ID="lblPzConfBuoni">[C]</asp:Label>
+            </div>
+        </div>
     </div>
-  </div>
 </div>
 <div class="row my-2">
-  <div class="col-12">
-    <asp:Label runat="server" ID="lblOut" ForeColor="Red" />
-  </div>
-</div>
+    <div class="col-12">
+        <asp:Label runat="server" ID="lblOut" ForeColor="Red" />
+    </div>
+</div>
\ No newline at end of file