From e508c2e60a666af2edda670f9120aeed23ba5eae Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Tue, 27 Feb 2018 17:12:41 +0100
Subject: [PATCH] COmpletata review dettaglio macchina

---
 MP-Tablet/DettaglioMacchina.aspx              | 12 ++--
 MP-Tablet/WebUserControls/mod_confProd.ascx   | 66 ++++++++++---------
 .../WebUserControls/mod_confProd.ascx.cs      | 16 ++---
 .../mod_confProd.ascx.designer.cs             | 21 ++++--
 .../WebUserControls/mod_dettMacchina.ascx.cs  |  2 +-
 5 files changed, 64 insertions(+), 53 deletions(-)

diff --git a/MP-Tablet/DettaglioMacchina.aspx b/MP-Tablet/DettaglioMacchina.aspx
index d7888b26..346aa245 100644
--- a/MP-Tablet/DettaglioMacchina.aspx
+++ b/MP-Tablet/DettaglioMacchina.aspx
@@ -8,19 +8,19 @@
 
 <asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
   <div class="container-fluid my-3" role="main">
-    <div class="d-flex">
-      <div class="p-2">
+    <div class="row">
+      <div class="col-12 col-sm-6 col-md-4 col-lg-3">
         <uc1:mod_dettMacchina ID="mod_dettMacchina1" runat="server" />
       </div>
-      <div class="p-2">
+      <div class="col-12 col-sm-6 col-md-8 col-lg-9">
         <uc4:mod_confProd ID="mod_confProd1" runat="server" />
       </div>
     </div>
-    <div class="d-flex">
-      <div class="p-2">
+    <div class="row">
+      <div class="col-12 col-lg-6">
         <uc2:mod_dettaglioProd ID="mod_dettaglioProd2" runat="server" />
       </div>
-      <div class="p-2">
+      <div class="col-12 col-lg-6">
         <uc3:mod_dettTurni ID="mod_dettTurni2" runat="server" />
       </div>
     </div>
diff --git a/MP-Tablet/WebUserControls/mod_confProd.ascx b/MP-Tablet/WebUserControls/mod_confProd.ascx
index f8d004df..ab80e6eb 100644
--- a/MP-Tablet/WebUserControls/mod_confProd.ascx
+++ b/MP-Tablet/WebUserControls/mod_confProd.ascx
@@ -1,38 +1,40 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_confProd.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_confProd" %>
-<div data-role="content">
-  <div class="ui-grid-b">
-    <div class="ui-block-a" data-role="content">
-      <asp:Button runat="server" ID="btnShowConfProd" Text="Mostra Conferma" data-role="button" data-iconpos="bottom" data-icon="check" data-theme="b" data-inline="false" OnClick="btnShowConfProd_Click" Width="100%" />
-      <asp:Label runat="server" ID="lblMancaODL" Visible="false" ForeColor="Red">MANCA ODL: conferma produzione NON permessa</asp:Label>
-    </div>
-    <div class="ui-block-b" data-role="content">
-      <asp:Button runat="server" ID="btnSalva" Text="Conferma Produzione" data-role="button" data-iconpos="bottom" data-icon="plus"
-        data-theme="e" data-inline="false" Visible="false" OnClick="btnSalva_Click" Width="100%" />
-    </div>
-    <div runat="server" id="divSelMacc" class="ui-block-c" data-role="content">
-      <asp:DropDownList runat="server" ID="ddlSubMacc" DataSourceID="ods" 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 class="row">
+  <div class="col-6 col-sm-4">
+    <asp:LinkButton runat="server" ID="lbtShowConfProd" OnClick="lbtShowConfProd_Click" CssClass="btn btn-primary btn-lg btn-block"><i class="fa fa-check"></i>
+      <asp:Label runat="server" ID="lblShowConfProd" /></asp:LinkButton>
   </div>
-  <div class="ui-grid-b">
-    <div class="ui-block-a" data-role="content">
-      <asp:Label runat="server" ID="lblNumPezzi" AssociatedControlID="txtNumPezzi" Text="Pezzi Prodotti (+)" />
-      <asp:TextBox runat="server" ID="txtNumPezzi" Font-Size="XX-Large" Width="5em" Enabled="false" AutoPostBack="True" OnTextChanged="txtNumPezzi_TextChanged" />
-    </div>
-    <div class="ui-block-b" data-role="content">
-      <asp:Label runat="server" ID="lblNumScarti" AssociatedControlID="txtNumScarti" Text="Pezzi Scarto (-)" />
-      <asp:TextBox runat="server" ID="txtNumScarti" Font-Size="XX-Large" Width="5em" Enabled="false" AutoPostBack="True" OnTextChanged="txtNumScarti_TextChanged" />
-    </div>
-    <div class="ui-block-c" data-role="content">
-      <asp:Label runat="server" ID="lblPzBuoni" AssociatedControlID="txtPzBuoni" Text="Pezzi Buoni" />
-      <asp:TextBox runat="server" ID="txtPzBuoni" Font-Size="XX-Large" Width="5em" Enabled="false" Text="---" />
-    </div>
+  <div class="col-6 col-sm-4">
+    <asp:LinkButton runat="server" ID="lbtSalva" Visible="false" CssClass="btn btn-success btn-lg btn-block" OnClick="lbtSalva_Click"><i class="fa fa-floppy-o"></i> Conferma produzione</asp:LinkButton>
   </div>
-  <div class="ui-grid-solo">
+  <div class="col-6 col-sm-4" runat="server" id="divSelMacc">
+    <asp:DropDownList runat="server" ID="ddlSubMacc" DataSourceID="ods" 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">
+  <div class="col-6 col-sm-4 form-group">
+    <asp:Label runat="server" ID="lblNumPezzi" AssociatedControlID="txtNumPezzi" Text="Pezzi Prodotti (+)" />
+    <asp:TextBox runat="server" ID="txtNumPezzi" Font-Size="XX-Large" CssClass="form-control" Enabled="false" AutoPostBack="True" OnTextChanged="txtNumPezzi_TextChanged" />
+  </div>
+  <div class="col-6 col-sm-4">
+    <asp:Label runat="server" ID="lblNumScarti" AssociatedControlID="txtNumScarti" Text="Pezzi Scarto (-)" />
+    <asp:TextBox runat="server" ID="txtNumScarti" Font-Size="XX-Large" CssClass="form-control" Enabled="false" AutoPostBack="True" OnTextChanged="txtNumScarti_TextChanged" />
+  </div>
+  <div class="col-6 col-sm-4">
+    <asp:Label runat="server" ID="lblPzBuoni" AssociatedControlID="txtPzBuoni" Text="Pezzi Buoni" />
+    <asp:TextBox runat="server" ID="txtPzBuoni" Font-Size="XX-Large" CssClass="form-control" Enabled="false" Text="---" />
+  </div>
+</div>
+<div class="row">
+  <div class="col-12">
+    <asp:Label runat="server" ID="lblMancaODL" Visible="false" ForeColor="Red">MANCA ODL: conferma produzione NON permessa</asp:Label>
     <asp:Label runat="server" ID="lblOut" ForeColor="Red" />
   </div>
 </div>
diff --git a/MP-Tablet/WebUserControls/mod_confProd.ascx.cs b/MP-Tablet/WebUserControls/mod_confProd.ascx.cs
index 08315e24..38f6a52c 100644
--- a/MP-Tablet/WebUserControls/mod_confProd.ascx.cs
+++ b/MP-Tablet/WebUserControls/mod_confProd.ascx.cs
@@ -38,14 +38,14 @@ namespace MoonProTablet.WebUserControls
       checkOdl();
       lblOut.Text = "";
       switchBtnConferma(false);
-      btnShowConfProd.Visible = odlOk;
+      lbtShowConfProd.Visible = odlOk;
     }
     /// <summary>
     /// Verifica se abbia un ODL ATTIVO
     /// </summary>
     private void checkOdl()
     {
-      btnShowConfProd.Visible = odlOk;
+      lbtShowConfProd.Visible = odlOk;
       lblMancaODL.Visible = !odlOk;
     }
 
@@ -137,7 +137,7 @@ namespace MoonProTablet.WebUserControls
     /// </summary>
     /// <param name="sender"></param>
     /// <param name="e"></param>
-    protected void btnShowConfProd_Click(object sender, EventArgs e)
+    protected void lbtShowConfProd_Click(object sender, EventArgs e)
     {
       switchBtnConferma(!txtNumPezzi.Enabled);
     }
@@ -148,7 +148,7 @@ namespace MoonProTablet.WebUserControls
     {
       txtNumPezzi.Enabled = showConf;
       txtNumScarti.Enabled = showConf;
-      btnSalva.Visible = showConf;
+      lbtSalva.Visible = showConf;
       DS_ProdTempi.stp_PzProd_getByMacchinaRow rigaProd;
       rigaProd = DataLayer.obj.taPzProd2conf.GetData(idxMacchina)[0];
       try
@@ -169,11 +169,11 @@ namespace MoonProTablet.WebUserControls
       }
       if (showConf)
       {
-        btnShowConfProd.Text = "Nascondi Conferma";
+        lblShowConfProd.Text = "Nascondi Conferma";
       }
       else
       {
-        btnShowConfProd.Text = "Mostra Conferma";
+        lblShowConfProd.Text = "Mostra Conferma";
         // sollevo evento!
         if (eh_reset != null)
         {
@@ -230,7 +230,7 @@ namespace MoonProTablet.WebUserControls
     /// </summary>
     /// <param name="sender"></param>
     /// <param name="e"></param>
-    protected void btnSalva_Click(object sender, EventArgs e)
+    protected void lbtSalva_Click(object sender, EventArgs e)
     {
       if (memLayer.ML.CRI("modoConfProd") == 2)
       {
@@ -319,7 +319,7 @@ namespace MoonProTablet.WebUserControls
     {
       get
       {
-       return memLayer.ML.StringSessionObj("subMaccSel");
+        return memLayer.ML.StringSessionObj("subMaccSel");
       }
       set
       {
diff --git a/MP-Tablet/WebUserControls/mod_confProd.ascx.designer.cs b/MP-Tablet/WebUserControls/mod_confProd.ascx.designer.cs
index 6bab290d..ae7ac109 100644
--- a/MP-Tablet/WebUserControls/mod_confProd.ascx.designer.cs
+++ b/MP-Tablet/WebUserControls/mod_confProd.ascx.designer.cs
@@ -13,31 +13,31 @@ namespace MoonProTablet.WebUserControls {
     public partial class mod_confProd {
         
         /// <summary>
-        /// Controllo btnShowConfProd.
+        /// Controllo lbtShowConfProd.
         /// </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.Button btnShowConfProd;
+        protected global::System.Web.UI.WebControls.LinkButton lbtShowConfProd;
         
         /// <summary>
-        /// Controllo lblMancaODL.
+        /// Controllo lblShowConfProd.
         /// </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 lblMancaODL;
+        protected global::System.Web.UI.WebControls.Label lblShowConfProd;
         
         /// <summary>
-        /// Controllo btnSalva.
+        /// 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.Button btnSalva;
+        protected global::System.Web.UI.WebControls.LinkButton lbtSalva;
         
         /// <summary>
         /// Controllo divSelMacc.
@@ -120,6 +120,15 @@ namespace MoonProTablet.WebUserControls {
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox txtPzBuoni;
         
+        /// <summary>
+        /// Controllo lblMancaODL.
+        /// </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 lblMancaODL;
+        
         /// <summary>
         /// Controllo lblOut.
         /// </summary>
diff --git a/MP-Tablet/WebUserControls/mod_dettMacchina.ascx.cs b/MP-Tablet/WebUserControls/mod_dettMacchina.ascx.cs
index 9f331fcb..8fe0ee95 100644
--- a/MP-Tablet/WebUserControls/mod_dettMacchina.ascx.cs
+++ b/MP-Tablet/WebUserControls/mod_dettMacchina.ascx.cs
@@ -77,7 +77,7 @@ namespace MoonProTablet.WebUserControls
       ScriptManager.RegisterStartupScript(Page, GetType(), "temp", "<script type='text/javascript'>$('#dettMacch').trigger('create');</script>", false);
     }
     /// <summary>
-    /// determian se nascondere la visualizzaizone compelta (e mostrare solo nome macchina)
+    /// determina se nascondere la visualizzazione completa (e mostrare solo nome macchina)
     /// </summary>
     /// <param name="full">mostra tutto (true) o solo header(false)</param>
     public void detailLevel(bool full)