From 58412b3d5b7fc3a254429c949bee3b6db57107bf Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Sat, 27 Oct 2018 10:26:33 +0200
Subject: [PATCH] Nuova vers + fix footer num righe (ODL/PODL)

---
 Jenkinsfile                                   |   2 +-
 MP-Admin/BCode.aspx                           |   1 +
 MP-Admin/GestKIT.aspx                         |   4 +-
 MP-Admin/WebUserControls/mod_gestPromODL.ascx | 364 +++++++++---------
 .../mod_gestPromODL.ascx.designer.cs          | 144 +++----
 MP-Admin/WebUserControls/mod_gestioneODL.ascx | 320 +++++++--------
 .../mod_gestioneODL.ascx.designer.cs          | 126 +++---
 7 files changed, 492 insertions(+), 469 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index b972e69a..c24eaea4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,7 +17,7 @@ pipeline {
 
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=944']) {
+        withEnv(['NEXT_BUILD_NUMBER=947']) {
           // env.versionNumber = VersionNumber(versionNumberString : '6.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '6.1.${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-Admin/BCode.aspx b/MP-Admin/BCode.aspx
index 593aae0b..f4453a37 100644
--- a/MP-Admin/BCode.aspx
+++ b/MP-Admin/BCode.aspx
@@ -6,5 +6,6 @@
 
 <asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
   <uc1:mod_barcode runat="server" ID="mod_barcode" />
+  <hr />
   <uc1:mod_gestPromODL runat="server" ID="mod_gestPromODL" />
 </asp:Content>
diff --git a/MP-Admin/GestKIT.aspx b/MP-Admin/GestKIT.aspx
index 4ed8a390..62d99f4d 100644
--- a/MP-Admin/GestKIT.aspx
+++ b/MP-Admin/GestKIT.aspx
@@ -7,7 +7,9 @@
 
 <asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
 
-  <uc1:mod_gestKIT runat="server" id="mod_gestKIT" />
+  <uc1:mod_gestKIT runat="server" id="mod_gestKIT" /> 
+  <hr />
   <uc1:mod_barcode runat="server" ID="mod_barcode" />
+  <hr />
   <uc1:mod_gestPromODL runat="server" ID="mod_gestPromODL" />
 </asp:Content>
diff --git a/MP-Admin/WebUserControls/mod_gestPromODL.ascx b/MP-Admin/WebUserControls/mod_gestPromODL.ascx
index 3b6fe756..e28e58cd 100644
--- a/MP-Admin/WebUserControls/mod_gestPromODL.ascx
+++ b/MP-Admin/WebUserControls/mod_gestPromODL.ascx
@@ -2,197 +2,207 @@
 
 <%@ Register Src="~/WebUserControls/mod_newPromessaODL.ascx" TagPrefix="uc1" TagName="mod_newPromessaODL" %>
 
-
-<div style="text-align: center; margin: auto; vertical-align: middle; width: 100%; background: #DCDCDC;">
-  <div class="bg-secondary text-light" style="white-space: nowrap; padding: 2px;">
+<div class="card">
+  <div class="card-header">
     <div class="row">
-      <div class="col-4"></div>
-      <div class="col-4">
-        <asp:LinkButton ID="lbtNewPODL" runat="server" OnClick="lbtNewPODL_Click" CssClass="btn btn-block btn-primary"><i class="fa fa-plus"></i> PROMESSA ODL <i class="fa fa-list-ol"></i></asp:LinkButton>
+      <div class="col-sm-2">
+        <h4>Filtri attivi</h4>
       </div>
-      <div class="col-4"></div>
-    </div>
-    <uc1:mod_newPromessaODL runat="server" ID="mod_newPromessaODL" />
-  </div>
-  <div id="divEditQta" runat="server" visible="false" class="ctrSelRowStyle" style="white-space: nowrap; padding: 2px;">
-    <div class="row">
-      <div class="col-sm-3">
-        <asp:LinkButton ID="lbtOk" runat="server" Text="Ok" OnClick="btnOk_Click" CssClass="btn btn-block btn-success" OnClientClick="return  confirm('Sicuro di voler modificare la Promessa ODL?');"><i class="fa fa-plus"></i> Modifica </asp:LinkButton>
-      </div>
-      <div class="col-sm-3">
-        # Pezzi Richiesti:
-                <asp:TextBox runat="server" ID="txtNewQta" Width="6em" />
-      </div>
-      <div class="col-sm-3">
-        Pezzi Pallet:
-                <asp:TextBox runat="server" ID="txtNewPzPallet" Width="6em" />
-      </div>
-      <div class="col-sm-3">
-        <asp:LinkButton ID="lbtCancel" runat="server" Text="Annulla" OnClick="btnCancel_Click" CssClass="btn btn-block btn-warning"><i class="fa fa-ban"></i> Annulla</asp:LinkButton>
-      </div>
-    </div>
-  </div>
-  <div class="row">
-    <div class="col-sm-2">
-      <h3>Filtri attivi</h3>
-    </div>
-    <div class="col-sm-4 text-nowrap">
-      <div class="input-group my-1 input-group-sm">
-        <div class="input-group-prepend">
-          <asp:LinkButton runat="server" ID="lbtResArt" CssClass="btn btn-outline-dark" OnClick="lbtResArt_Click"><i class="fa fa-refresh"></i> <b>Articolo</b></asp:LinkButton>
-          <asp:Label runat="server" ID="lblCodArt" CssClass="input-group-text" />
-          <asp:Label runat="server" ID="lblDescArt" CssClass="input-group-text text-truncate" />
-        </div>
-      </div>
-    </div>
-    <div class="col-sm-4">
-      <div class="input-group my-1 input-group-sm">
-        <div class="input-group-prepend">
-          <asp:LinkButton runat="server" ID="lbtResMacc" CssClass="btn btn-outline-dark" OnClick="lbtResMacc_Click"><i class="fa fa-refresh"></i> <b>Macchina</b></asp:LinkButton>
-          <asp:Label runat="server" ID="lblNomeMacc" CssClass="input-group-text" />
-          <asp:Label runat="server" ID="lblIdxMacc" CssClass="input-group-text" />
-        </div>
-      </div>
-    </div>
-    <div class="col-sm-2">
-      <div class="input-group mb-3">
-        <div class="input-group-prepend">
-          <div class="input-group-text">
-            <asp:CheckBox runat="server" ID="chkUnassigned" AutoPostBack="True" OnCheckedChanged="chkUnassigned_CheckedChanged" Checked="true" />
+      <div class="col-sm-4 text-nowrap">
+        <div class="input-group my-1 input-group-sm">
+          <div class="input-group-prepend">
+            <asp:LinkButton runat="server" ID="lbtResArt" CssClass="btn btn-outline-dark" OnClick="lbtResArt_Click"><i class="fa fa-refresh"></i> <b>Articolo</b></asp:LinkButton>
+            <asp:Label runat="server" ID="lblCodArt" CssClass="input-group-text" />
+            <asp:Label runat="server" ID="lblDescArt" CssClass="input-group-text text-truncate" />
           </div>
         </div>
-        <asp:Label runat="server" ID="lblUnass" CssClass="input-group-text" Text="Mostra SOLO programmate" />
+      </div>
+      <div class="col-sm-4">
+        <div class="input-group my-1 input-group-sm">
+          <div class="input-group-prepend">
+            <asp:LinkButton runat="server" ID="lbtResMacc" CssClass="btn btn-outline-dark" OnClick="lbtResMacc_Click"><i class="fa fa-refresh"></i> <b>Macchina</b></asp:LinkButton>
+            <asp:Label runat="server" ID="lblNomeMacc" CssClass="input-group-text" />
+            <asp:Label runat="server" ID="lblIdxMacc" CssClass="input-group-text" />
+          </div>
+        </div>
+      </div>
+      <div class="col-sm-2">
+        <div class="input-group mb-3">
+          <div class="input-group-prepend">
+            <div class="input-group-text">
+              <asp:CheckBox runat="server" ID="chkUnassigned" AutoPostBack="True" OnCheckedChanged="chkUnassigned_CheckedChanged" Checked="true" />
+            </div>
+          </div>
+          <asp:Label runat="server" ID="lblUnass" CssClass="input-group-text" Text="Mostra SOLO programmate" />
+        </div>
+      </div>
+    </div>
+    <div class="bg-dark text-light" style="white-space: nowrap; padding: 2px;">
+      <div class="row">
+        <div class="col-4"></div>
+        <div class="col-4">
+          <asp:LinkButton ID="lbtNewPODL" runat="server" OnClick="lbtNewPODL_Click" CssClass="btn btn-block btn-primary text-light"><i class="fa fa-plus"></i> PROMESSA ODL <i class="fa fa-list-ol"></i></asp:LinkButton>
+        </div>
+        <div class="col-4"></div>
+      </div>
+      <uc1:mod_newPromessaODL runat="server" ID="mod_newPromessaODL" />
+    </div>
+    <div id="divEditQta" runat="server" visible="false" class="ctrSelRowStyle" style="white-space: nowrap; padding: 2px;">
+      <div class="row">
+        <div class="col-sm-3">
+          <asp:LinkButton ID="lbtOk" runat="server" Text="Ok" OnClick="btnOk_Click" CssClass="btn btn-block btn-success" OnClientClick="return  confirm('Sicuro di voler modificare la Promessa ODL?');"><i class="fa fa-plus"></i> Modifica </asp:LinkButton>
+        </div>
+        <div class="col-sm-3">
+          # Pezzi Richiesti:
+                <asp:TextBox runat="server" ID="txtNewQta" Width="6em" />
+        </div>
+        <div class="col-sm-3">
+          Pezzi Pallet:
+                <asp:TextBox runat="server" ID="txtNewPzPallet" Width="6em" />
+        </div>
+        <div class="col-sm-3">
+          <asp:LinkButton ID="lbtCancel" runat="server" Text="Annulla" OnClick="btnCancel_Click" CssClass="btn btn-block btn-warning"><i class="fa fa-ban"></i> Annulla</asp:LinkButton>
+        </div>
       </div>
     </div>
   </div>
-  <asp:GridView ID="grView" runat="server" AllowPaging="True" AllowSorting="True" AutoGenerateColumns="False"
-    OnSelectedIndexChanged="grView_SelectedIndexChanged" OnDataBound="grView_DataBound" PageSize="25"
-    DataKeyNames="IdxPromessa" DataSourceID="ods" Width="100%">
-    <RowStyle CssClass="ctrRowStyle" />
-    <AlternatingRowStyle CssClass="ctrAltRowStyle" />
-    <EditRowStyle CssClass="ctrEditRowStyle" />
-    <SelectedRowStyle CssClass="ctrSelRowStyle" />
-    <FooterStyle CssClass="ctrFooter" />
-    <PagerStyle CssClass="active GridPager" />
-    <PagerSettings Mode="NumericFirstLast" />
-    <HeaderStyle CssClass="ctrHeaderPager" ForeColor="White" Font-Bold="True" />
-    <EmptyDataRowStyle CssClass="ctrRowStyle" />
-    <EmptyDataTemplate>
-      <asp:Label runat="server" ID="lblNoRecord" Text='<%# traduci("noRecord") %>' />
-    </EmptyDataTemplate>
-    <Columns>
-      <asp:TemplateField ShowHeader="False" ItemStyle-HorizontalAlign="Center">
-        <HeaderTemplate>
-          <asp:LinkButton runat="server" ID="lbtReset" CausesValidation="false" OnClick="btnReset_Click" ToolTip="Reset selezione" CssClass="btn btn-block btn-warning"><i class="fa fa-refresh"></i></asp:LinkButton>
-        </HeaderTemplate>
-        <ItemTemplate>
-          <asp:LinkButton runat="server" ID="lbtSel" CausesValidation="false" CommandName="Select" OnCommand="lbt_Command" CommandArgument="Edit" ToolTip="Modifica promessa" Visible='<%# Eval("IdxODL").ToString()=="" || Eval("IdxODL").ToString()=="0" %>' CssClass="btn btn-sm btn-info"><i class="fa fa-edit"></i></asp:LinkButton>
-          <asp:LinkButton runat="server" ID="lbtClona" CausesValidation="false" CommandName="Select" OnCommand="lbt_Command" CommandArgument="Clona" ToolTip="Copia promessa" CssClass="btn btn-sm btn-primary"><i class="fa fa-clipboard"></i></asp:LinkButton>
-        </ItemTemplate>
-        <ItemStyle HorizontalAlign="Center"></ItemStyle>
-      </asp:TemplateField>
-      <asp:TemplateField HeaderText="#" SortExpression="IdxPromessa">
-        <ItemTemplate>
-          <asp:Label runat="server" ID="txtIdxPromessa" Text='<%# Eval("IdxPromessa") %>' />
-        </ItemTemplate>
-      </asp:TemplateField>
-      <asp:TemplateField HeaderText="ODL" SortExpression="IdxOdl">
-        <ItemTemplate>
-          <asp:Label runat="server" ID="txtIdxOdl" Text='<%# Eval("IdxOdl") %>' />
-        </ItemTemplate>
-      </asp:TemplateField>
-      <asp:TemplateField HeaderText="CodArticolo" SortExpression="CodArticolo">
-        <ItemTemplate>
-          <div style="float: left;">
-            <asp:LinkButton runat="server" ID="lbtSelArt" OnClick="lbtSelArt_Click" CausesValidation="False" CommandArgument='<%# Eval("CodArticolo")+"|"+Eval("DescArticolo") %>' CssClass="btn btn-sm btn-outline-dark p-1">
+  <div class="card-body">
+    <asp:GridView ID="grView" runat="server" AllowPaging="True" AllowSorting="True" AutoGenerateColumns="False"
+      OnSelectedIndexChanged="grView_SelectedIndexChanged" OnDataBound="grView_DataBound" PageSize="25"
+      DataKeyNames="IdxPromessa" DataSourceID="ods" Width="100%">
+      <RowStyle CssClass="ctrRowStyle" />
+      <AlternatingRowStyle CssClass="ctrAltRowStyle" />
+      <EditRowStyle CssClass="ctrEditRowStyle" />
+      <SelectedRowStyle CssClass="ctrSelRowStyle" />
+      <FooterStyle CssClass="ctrFooter" />
+      <PagerStyle CssClass="active GridPager" />
+      <PagerSettings Mode="NumericFirstLast" />
+      <HeaderStyle CssClass="ctrHeaderPager" ForeColor="White" Font-Bold="True" />
+      <EmptyDataRowStyle CssClass="ctrRowStyle" />
+      <EmptyDataTemplate>
+        <asp:Label runat="server" ID="lblNoRecord" Text='<%# traduci("noRecord") %>' />
+      </EmptyDataTemplate>
+      <Columns>
+        <asp:TemplateField ShowHeader="False" ItemStyle-HorizontalAlign="Center">
+          <HeaderTemplate>
+            <asp:LinkButton runat="server" ID="lbtReset" CausesValidation="false" OnClick="btnReset_Click" ToolTip="Reset selezione" CssClass="btn btn-block btn-warning"><i class="fa fa-refresh"></i></asp:LinkButton>
+          </HeaderTemplate>
+          <ItemTemplate>
+            <asp:LinkButton runat="server" ID="lbtSel" CausesValidation="false" CommandName="Select" OnCommand="lbt_Command" CommandArgument="Edit" ToolTip="Modifica promessa" Visible='<%# Eval("IdxODL").ToString()=="" || Eval("IdxODL").ToString()=="0" %>' CssClass="btn btn-sm btn-info"><i class="fa fa-edit"></i></asp:LinkButton>
+            <asp:LinkButton runat="server" ID="lbtClona" CausesValidation="false" CommandName="Select" OnCommand="lbt_Command" CommandArgument="Clona" ToolTip="Copia promessa" CssClass="btn btn-sm btn-primary" Visible='<%# !Eval("KeyRichiesta").ToString().StartsWith("KIT") %>'><i class="fa fa-clipboard"></i></asp:LinkButton>
+          </ItemTemplate>
+          <ItemStyle HorizontalAlign="Center"></ItemStyle>
+        </asp:TemplateField>
+        <asp:TemplateField HeaderText="#" SortExpression="IdxPromessa">
+          <ItemTemplate>
+            <asp:Label runat="server" ID="txtIdxPromessa" Text='<%# Eval("IdxPromessa") %>' />
+          </ItemTemplate>
+        </asp:TemplateField>
+        <asp:TemplateField HeaderText="ODL" SortExpression="IdxOdl">
+          <ItemTemplate>
+            <asp:Label runat="server" ID="txtIdxOdl" Text='<%# Eval("IdxOdl") %>' />
+          </ItemTemplate>
+        </asp:TemplateField>
+        <asp:TemplateField HeaderText="CodArticolo" SortExpression="CodArticolo">
+          <ItemTemplate>
+            <div style="float: left;">
+              <asp:LinkButton runat="server" ID="lbtSelArt" OnClick="lbtSelArt_Click" CausesValidation="False" CommandArgument='<%# Eval("CodArticolo")+"|"+Eval("DescArticolo") %>' CssClass="btn btn-sm btn-outline-dark p-1">
               <i class="fa fa-search"></i>
               <b><%# Eval("CodArticolo") %></b>
-            </asp:LinkButton>
-          </div>
-          <div style="float: right; font-size: 0.8em;">
-            <asp:Label runat="server" ID="Label1" Text='<%# Eval("KeyRichiesta") %>' />
-          </div>
-          <div style="float: none; clear: both;">
-            <asp:Label runat="server" ID="txtDescArticolo" Text='<%# Eval("DescArticolo") %>' />
-          </div>
-        </ItemTemplate>
-      </asp:TemplateField>
-      <asp:TemplateField HeaderText="codMacchina" SortExpression="CodMacchina">
-        <ItemTemplate>
-          <asp:LinkButton runat="server" ID="lbtSelMacc" OnClick="lbtSelMacc_Click" CausesValidation="False" CommandArgument='<%# Eval("IdxMacchina")+"|"+Eval("Nome") %>' CssClass="btn btn-sm btn-outline-dark p-1 btn-block">
+              </asp:LinkButton>
+            </div>
+            <div style="float: right; font-size: 0.8em;">
+              <asp:Label runat="server" ID="Label1" Text='<%# Eval("KeyRichiesta") %>' />
+            </div>
+            <div style="float: none; clear: both;">
+              <asp:Label runat="server" ID="txtDescArticolo" Text='<%# Eval("DescArticolo") %>' />
+            </div>
+          </ItemTemplate>
+        </asp:TemplateField>
+        <asp:TemplateField HeaderText="codMacchina" SortExpression="CodMacchina">
+          <ItemTemplate>
+            <asp:LinkButton runat="server" ID="lbtSelMacc" OnClick="lbtSelMacc_Click" CausesValidation="False" CommandArgument='<%# Eval("IdxMacchina")+"|"+Eval("Nome") %>' CssClass="btn btn-sm btn-outline-dark p-1 btn-block">
               <i class="fa fa-search"></i>
               <b><%# Eval("Nome") %></b>  
               <div><%# Eval("CodMacchina") %></div>
-          </asp:LinkButton>
-        </ItemTemplate>
-      </asp:TemplateField>
-      <asp:TemplateField HeaderText="NumPezzi" SortExpression="NumPezzi">
-        <ItemTemplate>
-          <asp:Label runat="server" ID="txtNumPezzi" Text='<%# Eval("NumPezzi") %>' />
-        </ItemTemplate>
-        <EditItemTemplate>
-          <asp:Label runat="server" ID="txtNumPezzi" Text='<%# Bind("NumPezzi") %>' />
-        </EditItemTemplate>
-      </asp:TemplateField>
-      <asp:TemplateField HeaderText="TCAssegnato" SortExpression="TCAssegnato">
-        <ItemTemplate>
-          <asp:Label runat="server" ID="txtTCAssegnato" Text='<%# Eval("TCAssegnato","{0:0.000}") %>' />
-          <div class="small">
-            <asp:Label runat="server" ID="txtTCAssMs" Text='<%# SteamWare.TempiCiclo.minSec(Eval("TCAssegnato")) %>' />
-            (m:s)
-          </div>
-        </ItemTemplate>
-      </asp:TemplateField>
-      <asp:TemplateField HeaderText="PzPallet" SortExpression="PzPallet">
-        <ItemTemplate>
-          <asp:Label runat="server" ID="txtPzPallet" Text='<%# Eval("PzPallet") %>' />
-        </ItemTemplate>
-        <EditItemTemplate>
-        </EditItemTemplate>
-      </asp:TemplateField>
-      <asp:TemplateField HeaderText="Data" SortExpression="DueDate">
-        <ItemTemplate>
-          <asp:Label runat="server" ID="txtDataInizio" Text='<%# Eval("DueDate") %>' />
-        </ItemTemplate>
-      </asp:TemplateField>
-      <asp:TemplateField HeaderText="Attiva" SortExpression="Attivabile">
-        <ItemTemplate>
-          <asp:Label runat="server" ID="txtAttivabile" Text='<%# Eval("Attivabile") %>' />
-        </ItemTemplate>
-      </asp:TemplateField>
-      <asp:TemplateField HeaderStyle-HorizontalAlign="Center" ItemStyle-HorizontalAlign="Center">
-        <ItemTemplate>
-          <asp:LinkButton runat="server" ID="lbtDel" CommandArgument='<%# Eval("IdxPromessa") %>' OnClientClick="return  confirm('Sicuro di voler procedere con eliminazione?');" OnClick="lbtDel_Click" ToolTip='<%# traduci("Delete") %>' Visible='<%# Eval("IdxODL").ToString()=="" || Eval("IdxODL").ToString()=="0" %>' CssClass="btn btn-sm btn-danger"><i class="fa fa-trash"></i></asp:LinkButton>
-        </ItemTemplate>
-        <HeaderStyle HorizontalAlign="Center"></HeaderStyle>
-        <ItemStyle HorizontalAlign="Center"></ItemStyle>
-      </asp:TemplateField>
-    </Columns>
-  </asp:GridView>
-  <asp:Label ID="lblNumRec" runat="server" CssClass="txtMini" />&nbsp;&nbsp;
+            </asp:LinkButton>
+          </ItemTemplate>
+        </asp:TemplateField>
+        <asp:TemplateField HeaderText="NumPezzi" SortExpression="NumPezzi">
+          <ItemTemplate>
+            <asp:Label runat="server" ID="txtNumPezzi" Text='<%# Eval("NumPezzi") %>' />
+          </ItemTemplate>
+          <EditItemTemplate>
+            <asp:Label runat="server" ID="txtNumPezzi" Text='<%# Bind("NumPezzi") %>' />
+          </EditItemTemplate>
+        </asp:TemplateField>
+        <asp:TemplateField HeaderText="TCAssegnato" SortExpression="TCAssegnato">
+          <ItemTemplate>
+            <asp:Label runat="server" ID="txtTCAssegnato" Text='<%# Eval("TCAssegnato","{0:0.000}") %>' />
+            <div class="small">
+              <asp:Label runat="server" ID="txtTCAssMs" Text='<%# SteamWare.TempiCiclo.minSec(Eval("TCAssegnato")) %>' />
+              (m:s)
+            </div>
+          </ItemTemplate>
+        </asp:TemplateField>
+        <asp:TemplateField HeaderText="PzPallet" SortExpression="PzPallet">
+          <ItemTemplate>
+            <asp:Label runat="server" ID="txtPzPallet" Text='<%# Eval("PzPallet") %>' />
+          </ItemTemplate>
+          <EditItemTemplate>
+          </EditItemTemplate>
+        </asp:TemplateField>
+        <asp:TemplateField HeaderText="Data" SortExpression="DueDate">
+          <ItemTemplate>
+            <asp:Label runat="server" ID="txtDataInizio" Text='<%# Eval("DueDate") %>' />
+          </ItemTemplate>
+        </asp:TemplateField>
+        <asp:TemplateField HeaderText="Attiva" SortExpression="Attivabile">
+          <ItemTemplate>
+            <asp:Label runat="server" ID="txtAttivabile" Text='<%# Eval("Attivabile") %>' />
+          </ItemTemplate>
+        </asp:TemplateField>
+        <asp:TemplateField HeaderStyle-HorizontalAlign="Center" ItemStyle-HorizontalAlign="Center">
+          <ItemTemplate>
+            <asp:LinkButton runat="server" ID="lbtDel" CommandArgument='<%# Eval("IdxPromessa") %>' OnClientClick="return  confirm('Sicuro di voler procedere con eliminazione?');" OnClick="lbtDel_Click" ToolTip='<%# traduci("Delete") %>' Visible='<%# Eval("IdxODL").ToString()=="" || Eval("IdxODL").ToString()=="0" %>' CssClass="btn btn-sm btn-danger"><i class="fa fa-trash"></i></asp:LinkButton>
+          </ItemTemplate>
+          <HeaderStyle HorizontalAlign="Center"></HeaderStyle>
+          <ItemStyle HorizontalAlign="Center"></ItemStyle>
+        </asp:TemplateField>
+      </Columns>
+    </asp:GridView>
+
+    <asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByMaccArt" TypeName="MapoDb.DS_ProdTempiTableAdapters.PromesseODLTableAdapter" OnInserting="recuperaFooter" FilterExpression="CodArticolo LIKE '%{0}%' OR DescArticolo  LIKE '%{0}%' " OnInserted="ods_Updated" OnUpdated="ods_Updated" DeleteMethod="deleteQuery" OnDeleted="ods_Updated" UpdateMethod="updateQta">
+      <FilterParameters>
+        <asp:SessionParameter DefaultValue="*" Name="ricerca" SessionField="valoreCercato" />
+      </FilterParameters>
+      <DeleteParameters>
+        <asp:Parameter Name="Original_idxPromessa" Type="Int32" />
+      </DeleteParameters>
+      <SelectParameters>
+        <asp:ControlParameter ControlID="lblIdxMacc" Name="IdxMacchina" PropertyName="Text" Type="String" />
+        <asp:ControlParameter ControlID="lblCodArt" Name="CodArticolo" PropertyName="Text" Type="String" />
+        <asp:ControlParameter ControlID="chkUnassigned" Name="onlyFree" PropertyName="Checked" Type="Boolean" />
+      </SelectParameters>
+      <UpdateParameters>
+        <asp:Parameter Name="NumPezzi" Type="Int32" />
+        <asp:Parameter Name="PzPallet" Type="Int32" />
+        <asp:Parameter Name="Original_idxPromessa" Type="Int32" />
+      </UpdateParameters>
+    </asp:ObjectDataSource>
+  </div>
+  <div class="card-footer">
+    <div class="row">
+      <div class="col"></div>
+      <div class="col text-center">
+        <asp:Label ID="lblNumRec" runat="server" CssClass="txtMini" />&nbsp;&nbsp;
     <asp:Label ID="lblWarning" runat="server" Visible="false" CssClass="erroreMid" />
-  <asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByMaccArt" TypeName="MapoDb.DS_ProdTempiTableAdapters.PromesseODLTableAdapter" OnInserting="recuperaFooter" FilterExpression="CodArticolo LIKE '%{0}%' OR DescArticolo  LIKE '%{0}%' " OnInserted="ods_Updated" OnUpdated="ods_Updated" DeleteMethod="deleteQuery" OnDeleted="ods_Updated" UpdateMethod="updateQta">
-    <FilterParameters>
-      <asp:SessionParameter DefaultValue="*" Name="ricerca" SessionField="valoreCercato" />
-    </FilterParameters>
-    <DeleteParameters>
-      <asp:Parameter Name="Original_idxPromessa" Type="Int32" />
-    </DeleteParameters>
-    <SelectParameters>
-      <asp:ControlParameter ControlID="lblIdxMacc" Name="IdxMacchina" PropertyName="Text" Type="String" />
-      <asp:ControlParameter ControlID="lblCodArt" Name="CodArticolo" PropertyName="Text" Type="String" />
-      <asp:ControlParameter ControlID="chkUnassigned" Name="onlyFree" PropertyName="Checked" Type="Boolean" />
-    </SelectParameters>
-    <UpdateParameters>
-      <asp:Parameter Name="NumPezzi" Type="Int32" />
-      <asp:Parameter Name="PzPallet" Type="Int32" />
-      <asp:Parameter Name="Original_idxPromessa" Type="Int32" />
-    </UpdateParameters>
-  </asp:ObjectDataSource>
-  <div style="text-align: center; margin: auto; vertical-align: middle; padding: 4px 2px; height: 1.5em;">
-    <div style="float: right;">
-      mostra:
+      </div>
+      <div class="col text-right">
+        mostra:
         <asp:TextBox runat="server" ID="txtPageSize" Text="10" Width="2em" OnTextChanged="txtPageSize_TextChanged" />
+      </div>
     </div>
   </div>
 </div>
+
diff --git a/MP-Admin/WebUserControls/mod_gestPromODL.ascx.designer.cs b/MP-Admin/WebUserControls/mod_gestPromODL.ascx.designer.cs
index 2af910af..dd161e46 100644
--- a/MP-Admin/WebUserControls/mod_gestPromODL.ascx.designer.cs
+++ b/MP-Admin/WebUserControls/mod_gestPromODL.ascx.designer.cs
@@ -12,69 +12,6 @@ namespace MoonProAdmin.WebUserControls {
     
     public partial class mod_gestPromODL {
         
-        /// <summary>
-        /// Controllo lbtNewPODL.
-        /// </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 lbtNewPODL;
-        
-        /// <summary>
-        /// Controllo mod_newPromessaODL.
-        /// </summary>
-        /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
-        /// </remarks>
-        protected global::MoonProAdmin.WebUserControls.mod_newPromessaODL mod_newPromessaODL;
-        
-        /// <summary>
-        /// Controllo divEditQta.
-        /// </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 divEditQta;
-        
-        /// <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 txtNewQta.
-        /// </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 txtNewQta;
-        
-        /// <summary>
-        /// Controllo txtNewPzPallet.
-        /// </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 txtNewPzPallet;
-        
-        /// <summary>
-        /// Controllo lbtCancel.
-        /// </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 lbtCancel;
-        
         /// <summary>
         /// Controllo lbtResArt.
         /// </summary>
@@ -147,6 +84,69 @@ namespace MoonProAdmin.WebUserControls {
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblUnass;
         
+        /// <summary>
+        /// Controllo lbtNewPODL.
+        /// </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 lbtNewPODL;
+        
+        /// <summary>
+        /// Controllo mod_newPromessaODL.
+        /// </summary>
+        /// <remarks>
+        /// Campo generato automaticamente.
+        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// </remarks>
+        protected global::MoonProAdmin.WebUserControls.mod_newPromessaODL mod_newPromessaODL;
+        
+        /// <summary>
+        /// Controllo divEditQta.
+        /// </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 divEditQta;
+        
+        /// <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 txtNewQta.
+        /// </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 txtNewQta;
+        
+        /// <summary>
+        /// Controllo txtNewPzPallet.
+        /// </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 txtNewPzPallet;
+        
+        /// <summary>
+        /// Controllo lbtCancel.
+        /// </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 lbtCancel;
+        
         /// <summary>
         /// Controllo grView.
         /// </summary>
@@ -156,6 +156,15 @@ namespace MoonProAdmin.WebUserControls {
         /// </remarks>
         protected global::System.Web.UI.WebControls.GridView grView;
         
+        /// <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 lblNumRec.
         /// </summary>
@@ -174,15 +183,6 @@ namespace MoonProAdmin.WebUserControls {
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblWarning;
         
-        /// <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 txtPageSize.
         /// </summary>
diff --git a/MP-Admin/WebUserControls/mod_gestioneODL.ascx b/MP-Admin/WebUserControls/mod_gestioneODL.ascx
index d6002d58..581ded3c 100644
--- a/MP-Admin/WebUserControls/mod_gestioneODL.ascx
+++ b/MP-Admin/WebUserControls/mod_gestioneODL.ascx
@@ -2,178 +2,188 @@
   Inherits="MoonPro_site.WebUserControls.mod_gestioneODL" %>
 <%@ Register Src="mod_newOdl.ascx" TagName="mod_newOdl" TagPrefix="uc1" %>
 
-<div style="text-align: center; margin: auto; vertical-align: middle; width: 100%; background: #DCDCDC;">
-  <div class="bg-secondary text-light" style="white-space: nowrap; padding: 2px;">
+
+<div class="card">
+  <div class="card-header">
     <div class="row">
-      <div class="col-4"></div>
-      <div class="col-4">
-        <asp:LinkButton ID="lbtNewODL" runat="server" OnClick="lbtNewODL_Click" CssClass="btn btn-block btn-primary"><i class="fa fa-plus"></i> Nuovo ODL <i class="fa fa-list-ol"></i></asp:LinkButton>
+      <div class="col-sm-2">
+        <h4>Filtri attivi</h4>
+      </div>
+      <div class="col-sm-4 text-nowrap">
+        <div class="input-group my-1 input-group-sm">
+          <div class="input-group-prepend">
+            <asp:LinkButton runat="server" ID="lbtResArt" CssClass="btn btn-outline-dark" OnClick="lbtResArt_Click"><i class="fa fa-refresh"></i> <b>Articolo</b></asp:LinkButton>
+            <asp:Label runat="server" ID="lblCodArt" CssClass="input-group-text" />
+            <asp:Label runat="server" ID="lblDescArt" CssClass="input-group-text text-truncate" />
+          </div>
+        </div>
+      </div>
+      <div class="col-sm-4">
+        <div class="input-group my-1 input-group-sm">
+          <div class="input-group-prepend">
+            <asp:LinkButton runat="server" ID="lbtResMacc" CssClass="btn btn-outline-dark" OnClick="lbtResMacc_Click"><i class="fa fa-refresh"></i> <b>Macchina</b></asp:LinkButton>
+            <asp:Label runat="server" ID="lblNomeMacc" CssClass="input-group-text" />
+            <asp:Label runat="server" ID="lblIdxMacc" CssClass="input-group-text" />
+          </div>
+        </div>
+      </div>
+      <div class="col-sm-2">
       </div>
-      <div class="col-4"></div>
     </div>
-    <uc1:mod_newOdl ID="mod_newOdl1" runat="server" />
-  </div>
-  <div id="divEditQta" runat="server" visible="false" class="ctrSelRowStyle" style="white-space: nowrap; padding: 2px;">
-    <div class="row">
-      <div class="col-sm-3">
-        <asp:Button runat="server" ID="btnOk" Text="Ok" Width="10em" OnClick="btnOk_Click" />
+    <div class="bg-dark text-light" style="white-space: nowrap; padding: 2px;">
+      <div class="row">
+        <div class="col-4"></div>
+        <div class="col-4">
+          <asp:LinkButton ID="lbtNewODL" runat="server" OnClick="lbtNewODL_Click" CssClass="btn btn-block btn-primary text-light"><i class="fa fa-plus"></i> Nuovo ODL <i class="fa fa-list-ol"></i></asp:LinkButton>
+        </div>
+        <div class="col-4"></div>
       </div>
-      <div class="col-sm-3">
-        Pezzi ODL:
+      <uc1:mod_newOdl ID="mod_newOdl1" runat="server" />
+    </div>
+    <div id="divEditQta" runat="server" visible="false" class="ctrSelRowStyle" style="white-space: nowrap; padding: 2px;">
+      <div class="row">
+        <div class="col-sm-3">
+          <asp:Button runat="server" ID="btnOk" Text="Ok" Width="10em" OnClick="btnOk_Click" />
+        </div>
+        <div class="col-sm-3">
+          Pezzi ODL:
                 <asp:TextBox runat="server" ID="txtNewQta" Width="6em" />
-      </div>
-      <div class="col-sm-3">
-        Pezzi Pallet:
+        </div>
+        <div class="col-sm-3">
+          Pezzi Pallet:
                 <asp:TextBox runat="server" ID="txtNewPzPallet" Width="6em" />
-      </div>
-      <div class="col-sm-3">
-        <asp:Button runat="server" ID="btnCancel" Text="Annulla" Width="10em" OnClick="btnCancel_Click" />
-      </div>
-    </div>
-  </div>  
-  <div class="row">
-    <div class="col-sm-2">
-      <h3>Filtri attivi</h3>
-    </div>
-    <div class="col-sm-4 text-nowrap">
-      <div class="input-group my-1 input-group-sm">
-        <div class="input-group-prepend">
-          <asp:LinkButton runat="server" ID="lbtResArt" CssClass="btn btn-outline-dark" OnClick="lbtResArt_Click"><i class="fa fa-refresh"></i> <b>Articolo</b></asp:LinkButton>
-          <asp:Label runat="server" ID="lblCodArt" CssClass="input-group-text" />
-          <asp:Label runat="server" ID="lblDescArt" CssClass="input-group-text text-truncate" />
+        </div>
+        <div class="col-sm-3">
+          <asp:Button runat="server" ID="btnCancel" Text="Annulla" Width="10em" OnClick="btnCancel_Click" />
         </div>
       </div>
     </div>
-    <div class="col-sm-4">
-      <div class="input-group my-1 input-group-sm">
-        <div class="input-group-prepend">
-          <asp:LinkButton runat="server" ID="lbtResMacc" CssClass="btn btn-outline-dark" OnClick="lbtResMacc_Click"><i class="fa fa-refresh"></i> <b>Macchina</b></asp:LinkButton>
-          <asp:Label runat="server" ID="lblNomeMacc" CssClass="input-group-text" />
-          <asp:Label runat="server" ID="lblIdxMacc" CssClass="input-group-text" />
-        </div>
-      </div>
-    </div>
-    <div class="col-sm-2">
-    </div>
   </div>
-  <asp:GridView ID="grView" runat="server" AllowPaging="True" AllowSorting="True" AutoGenerateColumns="False"
-    OnSelectedIndexChanged="grView_SelectedIndexChanged" OnDataBound="grView_DataBound" PageSize="25"
-    DataKeyNames="IdxODL" DataSourceID="ods" Width="100%">
-    <RowStyle CssClass="ctrRowStyle" />
-    <AlternatingRowStyle CssClass="ctrAltRowStyle" />
-    <EditRowStyle CssClass="ctrEditRowStyle" />
-    <SelectedRowStyle CssClass="ctrSelRowStyle" />
-    <FooterStyle CssClass="ctrFooter" />
-    <PagerStyle CssClass="active GridPager" />
-    <PagerSettings Mode="NumericFirstLast" />
-    <HeaderStyle CssClass="ctrHeaderPager" ForeColor="White" Font-Bold="True" />
-    <EmptyDataRowStyle CssClass="ctrRowStyle" />
-    <EmptyDataTemplate>
-      <asp:Label runat="server" ID="lblNoRecord" Text='<%# traduci("noRecord") %>' />
-    </EmptyDataTemplate>
-    <Columns>
-      <asp:TemplateField ShowHeader="False" ItemStyle-HorizontalAlign="Center">
-        <HeaderTemplate>
-          <asp:Button ID="btnReset" runat="server" Text='<%# traduci("Reset") %>' OnClick="btnReset_Click" CausesValidation="false" Visible="true" />
-        </HeaderTemplate>
-        <ItemTemplate>
-          <span style="padding-right: 2px;">
-            <asp:ImageButton ID="ImageButton1" runat="server" CausesValidation="False" CommandName="Select"
-              ToolTip="Modifica num pz" ImageUrl="~/images/edit_s.png" Visible='<%# OdlIsCurrent(Eval("DataInizio"),Eval("DataFine")) %>' />
-          </span>
-        </ItemTemplate>
-        <ItemStyle HorizontalAlign="Center"></ItemStyle>
-      </asp:TemplateField>
-      <asp:TemplateField HeaderText="ODL" SortExpression="IdxOdl">
-        <ItemTemplate>
-          <asp:Label runat="server" ID="txtIdxOdl" Text='<%# Eval("IdxOdl") %>' />
-        </ItemTemplate>
-      </asp:TemplateField>
-      <asp:TemplateField HeaderText="CodArticolo" SortExpression="CodArticolo">
-        <ItemTemplate>
-          <div style="float: left;">  
-            <asp:LinkButton runat="server" ID="lbtSelArt" OnClick="lbtSelArt_Click" CausesValidation="False" CommandArgument='<%# Eval("CodArticolo")+"|"+Eval("DescArticolo") %>' CssClass="btn btn-sm btn-outline-dark p-1">
+  <div class="card-body">
+    <asp:GridView ID="grView" runat="server" AllowPaging="True" AllowSorting="True" AutoGenerateColumns="False"
+      OnSelectedIndexChanged="grView_SelectedIndexChanged" OnDataBound="grView_DataBound" PageSize="25"
+      DataKeyNames="IdxODL" DataSourceID="ods" Width="100%">
+      <RowStyle CssClass="ctrRowStyle" />
+      <AlternatingRowStyle CssClass="ctrAltRowStyle" />
+      <EditRowStyle CssClass="ctrEditRowStyle" />
+      <SelectedRowStyle CssClass="ctrSelRowStyle" />
+      <FooterStyle CssClass="ctrFooter" />
+      <PagerStyle CssClass="active GridPager" />
+      <PagerSettings Mode="NumericFirstLast" />
+      <HeaderStyle CssClass="ctrHeaderPager" ForeColor="White" Font-Bold="True" />
+      <EmptyDataRowStyle CssClass="ctrRowStyle" />
+      <EmptyDataTemplate>
+        <asp:Label runat="server" ID="lblNoRecord" Text='<%# traduci("noRecord") %>' />
+      </EmptyDataTemplate>
+      <Columns>
+        <asp:TemplateField ShowHeader="False" ItemStyle-HorizontalAlign="Center">
+          <HeaderTemplate>
+            <asp:Button ID="btnReset" runat="server" Text='<%# traduci("Reset") %>' OnClick="btnReset_Click" CausesValidation="false" Visible="true" />
+          </HeaderTemplate>
+          <ItemTemplate>
+            <span style="padding-right: 2px;">
+              <asp:ImageButton ID="ImageButton1" runat="server" CausesValidation="False" CommandName="Select"
+                ToolTip="Modifica num pz" ImageUrl="~/images/edit_s.png" Visible='<%# OdlIsCurrent(Eval("DataInizio"),Eval("DataFine")) %>' />
+            </span>
+          </ItemTemplate>
+          <ItemStyle HorizontalAlign="Center"></ItemStyle>
+        </asp:TemplateField>
+        <asp:TemplateField HeaderText="ODL" SortExpression="IdxOdl">
+          <ItemTemplate>
+            <asp:Label runat="server" ID="txtIdxOdl" Text='<%# Eval("IdxOdl") %>' />
+          </ItemTemplate>
+        </asp:TemplateField>
+        <asp:TemplateField HeaderText="CodArticolo" SortExpression="CodArticolo">
+          <ItemTemplate>
+            <div style="float: left;">
+              <asp:LinkButton runat="server" ID="lbtSelArt" OnClick="lbtSelArt_Click" CausesValidation="False" CommandArgument='<%# Eval("CodArticolo")+"|"+Eval("DescArticolo") %>' CssClass="btn btn-sm btn-outline-dark p-1">
               <i class="fa fa-search"></i>
               <b><%# Eval("CodArticolo") %></b>
-            </asp:LinkButton>
-          </div>
-          <div style="float: right; font-size: 0.8em;">
-            <asp:Label runat="server" ID="Label1" Text='<%# Eval("CommessaAs400") %>' />
-          </div>
-          <div style="float: none; clear: both;">
-            <asp:Label runat="server" ID="txtDescArticolo" Text='<%# Eval("DescArticolo") %>' />
-          </div>
-        </ItemTemplate>
-      </asp:TemplateField>
-      <asp:TemplateField HeaderText="codMacchina" SortExpression="CodMacchina">
-        <ItemTemplate>                                                         
-          <asp:LinkButton runat="server" ID="lbtSelMacc" OnClick="lbtSelMacc_Click" CausesValidation="False" CommandArgument='<%# Eval("IdxMacchina")+"|"+Eval("Nome") %>' CssClass="btn btn-sm btn-outline-dark p-1 btn-block">
+              </asp:LinkButton>
+            </div>
+            <div style="float: right; font-size: 0.8em;">
+              <asp:Label runat="server" ID="Label1" Text='<%# Eval("CommessaAs400") %>' />
+            </div>
+            <div style="float: none; clear: both;">
+              <asp:Label runat="server" ID="txtDescArticolo" Text='<%# Eval("DescArticolo") %>' />
+            </div>
+          </ItemTemplate>
+        </asp:TemplateField>
+        <asp:TemplateField HeaderText="codMacchina" SortExpression="CodMacchina">
+          <ItemTemplate>
+            <asp:LinkButton runat="server" ID="lbtSelMacc" OnClick="lbtSelMacc_Click" CausesValidation="False" CommandArgument='<%# Eval("IdxMacchina")+"|"+Eval("Nome") %>' CssClass="btn btn-sm btn-outline-dark p-1 btn-block">
               <i class="fa fa-search"></i>
               <b><%# Eval("Nome") %></b>  
               <div><%# Eval("CodMacchina") %></div>
-          </asp:LinkButton>
-        </ItemTemplate>
-      </asp:TemplateField>
-      <asp:TemplateField HeaderText="NumPezzi" SortExpression="NumPezzi">
-        <ItemTemplate>
-          <asp:Label runat="server" ID="txtNumPezzi" Text='<%# Eval("NumPezzi") %>' />
-        </ItemTemplate>
-        <EditItemTemplate>
-          <asp:Label runat="server" ID="txtNumPezzi" Text='<%# Bind("NumPezzi") %>' />
-        </EditItemTemplate>
-      </asp:TemplateField>
-      <asp:TemplateField HeaderText="TCAssegnato" SortExpression="TCAssegnato">
-        <ItemTemplate>
-          <asp:Label runat="server" ID="txtTCAssegnato" Text='<%# Eval("TCAssegnato","{0:0.000}") %>' />
-        </ItemTemplate>
-      </asp:TemplateField>
-      <asp:TemplateField HeaderText="PzPallet" SortExpression="PzPallet">
-        <ItemTemplate>
-          <asp:Label runat="server" ID="txtPzPallet" Text='<%# Eval("PzPallet") %>' />
-        </ItemTemplate>
-        <EditItemTemplate>
-          <%--<asp:Label runat="server" ID="txtPzPallet" Text='<%# Bind("PzPallet") %>' />--%>
-        </EditItemTemplate>
-      </asp:TemplateField>
-      <asp:TemplateField HeaderText="DataInizio" SortExpression="DataInizio">
-        <ItemTemplate>
-          <asp:Label runat="server" ID="txtDataInizio" Text='<%# Eval("DataInizio") %>' />
-        </ItemTemplate>
-      </asp:TemplateField>
-      <asp:TemplateField HeaderText="DataFine" SortExpression="DataFine">
-        <ItemTemplate>
-          <asp:Label runat="server" ID="txtDataFine" Text='<%# Eval("DataFine") %>' />
-        </ItemTemplate>
-      </asp:TemplateField>
-      <asp:TemplateField HeaderStyle-HorizontalAlign="Center" ItemStyle-HorizontalAlign="Center">
-        <ItemTemplate>
-          <asp:ImageButton ID="imgDelete" runat="server" CausesValidation="False" CommandName="Delete" OnClientClick="return  confirm('Sicuro di voler procedere con eliminazione?');"
-            CommandArgument='<%# Eval("IdxODL") %>' ToolTip='<%# traduci("Delete") %>' Visible='<%# delEnabled(Eval("IdxODL")) %>'
-            ImageUrl="~/images/elimina_m.png" />
-        </ItemTemplate>
-        <HeaderStyle HorizontalAlign="Center"></HeaderStyle>
-        <ItemStyle HorizontalAlign="Center"></ItemStyle>
-      </asp:TemplateField>
-    </Columns>
-  </asp:GridView>
-  <asp:Label ID="lblNumRec" runat="server" CssClass="txtMini" />&nbsp;&nbsp;
+            </asp:LinkButton>
+          </ItemTemplate>
+        </asp:TemplateField>
+        <asp:TemplateField HeaderText="NumPezzi" SortExpression="NumPezzi">
+          <ItemTemplate>
+            <asp:Label runat="server" ID="txtNumPezzi" Text='<%# Eval("NumPezzi") %>' />
+          </ItemTemplate>
+          <EditItemTemplate>
+            <asp:Label runat="server" ID="txtNumPezzi" Text='<%# Bind("NumPezzi") %>' />
+          </EditItemTemplate>
+        </asp:TemplateField>
+        <asp:TemplateField HeaderText="TCAssegnato" SortExpression="TCAssegnato">
+          <ItemTemplate>
+            <asp:Label runat="server" ID="txtTCAssegnato" Text='<%# Eval("TCAssegnato","{0:0.000}") %>' />
+          </ItemTemplate>
+        </asp:TemplateField>
+        <asp:TemplateField HeaderText="PzPallet" SortExpression="PzPallet">
+          <ItemTemplate>
+            <asp:Label runat="server" ID="txtPzPallet" Text='<%# Eval("PzPallet") %>' />
+          </ItemTemplate>
+          <EditItemTemplate>
+            <%--<asp:Label runat="server" ID="txtPzPallet" Text='<%# Bind("PzPallet") %>' />--%>
+          </EditItemTemplate>
+        </asp:TemplateField>
+        <asp:TemplateField HeaderText="DataInizio" SortExpression="DataInizio">
+          <ItemTemplate>
+            <asp:Label runat="server" ID="txtDataInizio" Text='<%# Eval("DataInizio") %>' />
+          </ItemTemplate>
+        </asp:TemplateField>
+        <asp:TemplateField HeaderText="DataFine" SortExpression="DataFine">
+          <ItemTemplate>
+            <asp:Label runat="server" ID="txtDataFine" Text='<%# Eval("DataFine") %>' />
+          </ItemTemplate>
+        </asp:TemplateField>
+        <asp:TemplateField HeaderStyle-HorizontalAlign="Center" ItemStyle-HorizontalAlign="Center">
+          <ItemTemplate>
+            <asp:ImageButton ID="imgDelete" runat="server" CausesValidation="False" CommandName="Delete" OnClientClick="return  confirm('Sicuro di voler procedere con eliminazione?');"
+              CommandArgument='<%# Eval("IdxODL") %>' ToolTip='<%# traduci("Delete") %>' Visible='<%# delEnabled(Eval("IdxODL")) %>'
+              ImageUrl="~/images/elimina_m.png" />
+          </ItemTemplate>
+          <HeaderStyle HorizontalAlign="Center"></HeaderStyle>
+          <ItemStyle HorizontalAlign="Center"></ItemStyle>
+        </asp:TemplateField>
+      </Columns>
+    </asp:GridView>
+    <asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByMacchinaArticolo" TypeName="MapoDb.DS_ProdTempiTableAdapters.ODLTableAdapter" OnInserting="recuperaFooter" FilterExpression="CodArticolo LIKE '%{0}%'" OnInserted="ods_Updated" OnUpdated="ods_Updated" DeleteMethod="DeleteQuery" OnDeleted="ods_Updated">
+      <FilterParameters>
+        <asp:SessionParameter DefaultValue="*" Name="ricerca" SessionField="valoreCercato" />
+      </FilterParameters>
+      <DeleteParameters>
+        <asp:Parameter Name="Original_IdxODL" Type="Int32" />
+      </DeleteParameters>
+      <SelectParameters>
+        <asp:ControlParameter ControlID="lblCodArt" Name="CodArticolo" PropertyName="Text" Type="String" />
+        <asp:ControlParameter ControlID="lblIdxMacc" Name="IdxMacchina" PropertyName="Text" Type="String" />
+      </SelectParameters>
+    </asp:ObjectDataSource>
+  </div>
+  <div class="card-footer">
+    <div class="row">
+      <div class="col"></div>
+      <div class="col text-center">
+        <asp:Label ID="lblNumRec" runat="server" CssClass="txtMini" />&nbsp;&nbsp;
     <asp:Label ID="lblWarning" runat="server" Visible="false" CssClass="erroreMid" />
-  <asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByMacchinaArticolo" TypeName="MapoDb.DS_ProdTempiTableAdapters.ODLTableAdapter" OnInserting="recuperaFooter" FilterExpression="CodArticolo LIKE '%{0}%'" OnInserted="ods_Updated" OnUpdated="ods_Updated" DeleteMethod="DeleteQuery" OnDeleted="ods_Updated">
-    <FilterParameters>
-      <asp:SessionParameter DefaultValue="*" Name="ricerca" SessionField="valoreCercato" />
-    </FilterParameters>
-    <DeleteParameters>
-      <asp:Parameter Name="Original_IdxODL" Type="Int32" />
-    </DeleteParameters>
-    <SelectParameters>
-      <asp:ControlParameter ControlID="lblCodArt" Name="CodArticolo" PropertyName="Text" Type="String" />
-      <asp:ControlParameter ControlID="lblIdxMacc" Name="IdxMacchina" PropertyName="Text" Type="String" />
-    </SelectParameters>
-  </asp:ObjectDataSource>
-  <div style="text-align: center; margin: auto; vertical-align: middle; padding: 4px 2px; height: 1.5em;">
-    <div style="float: right;">
-      mostra:
+      </div>
+      <div class="col text-right">
+        mostra:
         <asp:TextBox runat="server" ID="txtPageSize" Text="10" Width="2em" OnTextChanged="txtPageSize_TextChanged" />
+      </div>
     </div>
   </div>
 </div>
diff --git a/MP-Admin/WebUserControls/mod_gestioneODL.ascx.designer.cs b/MP-Admin/WebUserControls/mod_gestioneODL.ascx.designer.cs
index 26b18146..519c3db7 100644
--- a/MP-Admin/WebUserControls/mod_gestioneODL.ascx.designer.cs
+++ b/MP-Admin/WebUserControls/mod_gestioneODL.ascx.designer.cs
@@ -12,6 +12,60 @@ namespace MoonPro_site.WebUserControls {
     
     public partial class mod_gestioneODL {
         
+        /// <summary>
+        /// Controllo lbtResArt.
+        /// </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 lbtResArt;
+        
+        /// <summary>
+        /// Controllo lblCodArt.
+        /// </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 lblCodArt;
+        
+        /// <summary>
+        /// Controllo lblDescArt.
+        /// </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 lblDescArt;
+        
+        /// <summary>
+        /// Controllo lbtResMacc.
+        /// </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 lbtResMacc;
+        
+        /// <summary>
+        /// Controllo lblNomeMacc.
+        /// </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 lblNomeMacc;
+        
+        /// <summary>
+        /// Controllo lblIdxMacc.
+        /// </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 lblIdxMacc;
+        
         /// <summary>
         /// Controllo lbtNewODL.
         /// </summary>
@@ -75,60 +129,6 @@ namespace MoonPro_site.WebUserControls {
         /// </remarks>
         protected global::System.Web.UI.WebControls.Button btnCancel;
         
-        /// <summary>
-        /// Controllo lbtResArt.
-        /// </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 lbtResArt;
-        
-        /// <summary>
-        /// Controllo lblCodArt.
-        /// </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 lblCodArt;
-        
-        /// <summary>
-        /// Controllo lblDescArt.
-        /// </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 lblDescArt;
-        
-        /// <summary>
-        /// Controllo lbtResMacc.
-        /// </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 lbtResMacc;
-        
-        /// <summary>
-        /// Controllo lblNomeMacc.
-        /// </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 lblNomeMacc;
-        
-        /// <summary>
-        /// Controllo lblIdxMacc.
-        /// </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 lblIdxMacc;
-        
         /// <summary>
         /// Controllo grView.
         /// </summary>
@@ -138,6 +138,15 @@ namespace MoonPro_site.WebUserControls {
         /// </remarks>
         protected global::System.Web.UI.WebControls.GridView grView;
         
+        /// <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 lblNumRec.
         /// </summary>
@@ -156,15 +165,6 @@ namespace MoonPro_site.WebUserControls {
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblWarning;
         
-        /// <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 txtPageSize.
         /// </summary>