From 6cfeefcfc92cbb4ce446ffdd2e7e8d00fb4e52ec Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Thu, 10 Dec 2020 16:14:53 +0100
Subject: [PATCH] Fix MP ADM x gestione anagrafica articoli con filtro a capo +
 speedup paged data

---
 MP-ADM/WebUserControls/mod_anagArticoli.ascx  |   7 +-
 .../WebUserControls/mod_anagArticoli.ascx.cs  | 273 +++++++++---------
 MapoDb/DS_ProdTempi.xsd                       |  43 ++-
 MapoDb/DS_ProdTempi.xss                       |  28 +-
 MapoDb/DS_ProdTempi1.Designer.cs              |  94 +++++-
 5 files changed, 271 insertions(+), 174 deletions(-)

diff --git a/MP-ADM/WebUserControls/mod_anagArticoli.ascx b/MP-ADM/WebUserControls/mod_anagArticoli.ascx
index 676b616b..9e15203e 100644
--- a/MP-ADM/WebUserControls/mod_anagArticoli.ascx
+++ b/MP-ADM/WebUserControls/mod_anagArticoli.ascx
@@ -19,13 +19,8 @@
     <Columns>
         <asp:TemplateField ShowHeader="False" ItemStyle-HorizontalAlign="Center">
             <HeaderTemplate>
-                <%--<asp:Button ID="btnReset" runat="server" Text='<%# traduci("Reset") %>' OnClick="btnReset_Click"
-                    Visible="true" />--%>
             </HeaderTemplate>
             <ItemTemplate>
-                <%--<asp:ImageButton ID="imgSelect" runat="server" CausesValidation="False" CommandName="Select"
-                    ToolTip='<%# traduci("Select") %>' ImageUrl="~/images/view_m.png" />
-                &nbsp;--%>
                 <asp:ImageButton ID="imgEdit" runat="server" CausesValidation="False" CommandName="Edit"
                     Visible='<%# isWritable() %>' ToolTip='<%# traduci("Edit") %>' ImageUrl="~/images/edit_m.png" />
             </ItemTemplate>
@@ -118,7 +113,7 @@
 </asp:GridView>
 <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="GetData" TypeName="MapoDb.DS_ProdTempiTableAdapters.AnagArticoliTableAdapter" OnInserting="recuperaFooter" FilterExpression="CodArticolo LIKE '%{0}%' OR DescArticolo LIKE '%{0}%' " OnInserted="ods_Updated" OnUpdated="ods_Updated" OnDeleted="ods_Updated" UpdateMethod="updateQry" DeleteMethod="deleteQry" InsertMethod="Insert" OnUpdating="ods_Updating">
+<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getPaged" TypeName="MapoDb.DS_ProdTempiTableAdapters.AnagArticoliTableAdapter" OnInserting="recuperaFooter" FilterExpression="CodArticolo LIKE '%{0}%' OR DescArticolo LIKE '%{0}%' " OnInserted="ods_Updated" OnUpdated="ods_Updated" OnDeleted="ods_Updated" UpdateMethod="updateQry" DeleteMethod="deleteQry" InsertMethod="Insert" OnUpdating="ods_Updating" EnablePaging="True" SelectCountMethod="rowCount" SortParameterName="orderByCol">
     <FilterParameters>
         <asp:SessionParameter DefaultValue="*" Name="ricerca" SessionField="valoreCercato" />
     </FilterParameters>
diff --git a/MP-ADM/WebUserControls/mod_anagArticoli.ascx.cs b/MP-ADM/WebUserControls/mod_anagArticoli.ascx.cs
index 5cc01d81..3fe7d656 100644
--- a/MP-ADM/WebUserControls/mod_anagArticoli.ascx.cs
+++ b/MP-ADM/WebUserControls/mod_anagArticoli.ascx.cs
@@ -8,17 +8,62 @@ namespace MP_ADM.WebUserControls
 {
     public partial class mod_anagArticoli : BaseUserControl
     {
+        #region Private Fields
+
         /// <summary>
         /// Oggetto datalayer specifico
         /// </summary>
         private DataLayer DataLayerObj = new DataLayer();
 
-        #region area da NON modificare
+        #endregion Private Fields
 
-        #region area protected
+        #region Protected Fields
 
         protected string _idxGridView;
 
+        #endregion Protected Fields
+
+        #region Public Events
+
+        public event EventHandler eh_nuovoValore;
+
+        public event EventHandler eh_resetSelezione;
+
+        public event EventHandler eh_selValore;
+
+        #endregion Public Events
+
+        #region Private Methods
+
+        /// <summary>
+        /// nuovo valore creato...
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void mod_newOdl1_eh_nuovoValore(object sender, EventArgs e)
+        {
+            // aggiorno!
+            resetSelezione();
+        }
+
+        #endregion Private Methods
+
+        #region Protected Methods
+
+        /// <summary>
+        /// crea un nuovo record e ricarica...
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnNew_Click(object sender, EventArgs e)
+        {
+            string tempCode = string.Format("_{0:yyyyMMdd-HHmmss}", DateTime.Now);
+            string tempName = string.Format("Nuovo articolo creato {0:dd/MM/yyyy HH:mm:ss}", DateTime.Now);
+            DataLayerObj.taAnagArt.Insert(tempCode, tempName, "", "", "", "ART");
+            // reset!
+            resetSelezione();
+        }
+
         /// <summary>
         /// reset della selezione
         /// </summary>
@@ -30,19 +75,14 @@ namespace MP_ADM.WebUserControls
         }
 
         /// <summary>
-        /// gestione cambio selezione valore
+        /// elenco colonne del datagrid
         /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void grView_SelectedIndexChanged(object sender, EventArgs e)
+        /// <returns></returns>
+        protected DataColumnCollection colonneObj()
         {
-            // salvo in session il valore selezionato...
-            memLayer.ML.setSessionVal(string.Format("{0}_sel", _idxGridView), grView.SelectedValue, false);
-            // sollevo evento nuovo valore...
-            if (eh_selValore != null)
-            {
-                eh_selValore(this, new EventArgs());
-            }
+            MapoDb.DS_ProdTempi.DatiMacchineDataTable tabella = new MapoDb.DS_ProdTempi.DatiMacchineDataTable();
+            DataColumnCollection colonne = tabella.Columns;
+            return colonne;
         }
 
         /// <summary>
@@ -75,6 +115,63 @@ namespace MP_ADM.WebUserControls
             }
         }
 
+        /// <summary>
+        /// gestione cambio selezione valore
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void grView_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            // salvo in session il valore selezionato...
+            memLayer.ML.setSessionVal(string.Format("{0}_sel", _idxGridView), grView.SelectedValue, false);
+            // sollevo evento nuovo valore...
+            if (eh_selValore != null)
+            {
+                eh_selValore(this, new EventArgs());
+            }
+        }
+
+        /// <summary>
+        /// svuoto da cache post update
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ods_Updated(object sender, ObjectDataSourceStatusEventArgs e)
+        {
+            // evento come nuovo...
+            if (eh_nuovoValore != null)
+            {
+                eh_nuovoValore(this, new EventArgs());
+            }
+        }
+
+        protected void ods_Updating(object sender, ObjectDataSourceMethodEventArgs e)
+        {
+            // verifico eventuali nulli --> ""
+            if (e.InputParameters["DescArticolo"] == null) e.InputParameters["DescArticolo"] = "";
+            if (e.InputParameters["CurrRev"] == null) e.InputParameters["CurrRev"] = "";
+            if (e.InputParameters["Disegno"] == null) e.InputParameters["Disegno"] = "";
+            // rimuovo a capo x tutti i campi
+            for (int i = 0; i < e.InputParameters.Count; i++)
+            {
+                e.InputParameters[i] = e.InputParameters[i].ToString().Replace("/n", "").Replace("/r", "");
+            }
+        }
+
+        /// inizializzazione valori di default
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnInit(EventArgs e)
+        {
+            base.OnInit(e);
+            _idxGridView = "IdxMacchina";
+        }
+
+        protected override void OnLoad(EventArgs e)
+        {
+            base.OnLoad(e);
+        }
+
         /// <summary>
         /// recupera i dati di un nuovo record contenuti nel footer di un gridView;
         /// questi devono esses opportunamente nominati (es: txt{0}, dl{0}, ...)
@@ -131,110 +228,9 @@ namespace MP_ADM.WebUserControls
             }
         }
 
-        /// <summary>
-        /// svuoto da cache post update
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void ods_Updated(object sender, ObjectDataSourceStatusEventArgs e)
-        {
-            // evento come nuovo...
-            if (eh_nuovoValore != null)
-            {
-                eh_nuovoValore(this, new EventArgs());
-            }
-        }
+        #endregion Protected Methods
 
-        #endregion area protected
-
-        #region are public
-
-        /// <summary>
-        /// effettua traduzione del lemma
-        /// </summary>
-        /// <param name="lemma"></param>
-        /// <returns></returns>
-        public string traduci(string lemma)
-        {
-            return user_std.UtSn.Traduci(lemma);
-        }
-
-        /// <summary>
-        /// effettua traduzione in inglese del lemma
-        /// </summary>
-        /// <param name="lemma"></param>
-        /// <returns></returns>
-        public string traduciEn(string lemma)
-        {
-            return user_std.UtSn.TraduciEn(lemma);
-        }
-
-        /// <summary>
-        /// resetta la selezione dei valori in caso di modifiche su altri controlli
-        /// </summary>
-        public void resetSelezione()
-        {
-            memLayer.ML.emptySessionVal(string.Format("{0}_sel", _idxGridView));
-            grView.SelectedIndex = -1;
-            grView.DataBind();
-            lblWarning.Visible = false;
-            if (eh_resetSelezione != null)
-            {
-                eh_resetSelezione(this, new EventArgs());
-            }
-        }
-
-        #endregion are public
-
-        #endregion area da NON modificare
-
-        #region gestione eventi
-
-        public event EventHandler eh_resetSelezione;
-
-        public event EventHandler eh_nuovoValore;
-
-        public event EventHandler eh_selValore;
-
-        #endregion gestione eventi
-
-        #region area da modificare
-
-        protected override void OnLoad(EventArgs e)
-        {
-            base.OnLoad(e);
-        }
-
-        /// inizializzazione valori di default
-        /// </summary>
-        /// <param name="e"></param>
-        protected override void OnInit(EventArgs e)
-        {
-            base.OnInit(e);
-            _idxGridView = "IdxMacchina";
-        }
-
-        /// <summary>
-        /// nuovo valore creato...
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void mod_newOdl1_eh_nuovoValore(object sender, EventArgs e)
-        {
-            // aggiorno!
-            resetSelezione();
-        }
-
-        /// <summary>
-        /// elenco colonne del datagrid
-        /// </summary>
-        /// <returns></returns>
-        protected DataColumnCollection colonneObj()
-        {
-            MapoDb.DS_ProdTempi.DatiMacchineDataTable tabella = new MapoDb.DS_ProdTempi.DatiMacchineDataTable();
-            DataColumnCollection colonne = tabella.Columns;
-            return colonne;
-        }
+        #region Public Methods
 
         public bool delEnabled(object _idx)
         {
@@ -262,27 +258,40 @@ namespace MP_ADM.WebUserControls
         }
 
         /// <summary>
-        /// crea un nuovo record e ricarica...
+        /// resetta la selezione dei valori in caso di modifiche su altri controlli
         /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void btnNew_Click(object sender, EventArgs e)
+        public void resetSelezione()
         {
-            string tempCode = string.Format("_{0:yyyyMMdd-HHmmss}", DateTime.Now);
-            string tempName = string.Format("Nuovo articolo creato {0:dd/MM/yyyy HH:mm:ss}", DateTime.Now);
-            DataLayerObj.taAnagArt.Insert(tempCode, tempName, "", "", "", "ART");
-            // reset!
-            resetSelezione();
+            memLayer.ML.emptySessionVal(string.Format("{0}_sel", _idxGridView));
+            grView.SelectedIndex = -1;
+            grView.DataBind();
+            lblWarning.Visible = false;
+            if (eh_resetSelezione != null)
+            {
+                eh_resetSelezione(this, new EventArgs());
+            }
         }
 
-        #endregion area da modificare
-
-        protected void ods_Updating(object sender, ObjectDataSourceMethodEventArgs e)
+        /// <summary>
+        /// effettua traduzione del lemma
+        /// </summary>
+        /// <param name="lemma"></param>
+        /// <returns></returns>
+        public string traduci(string lemma)
         {
-            // verifico eventuali nulli --> ""
-            if (e.InputParameters["DescArticolo"] == null) e.InputParameters["DescArticolo"] = "";
-            if (e.InputParameters["CurrRev"] == null) e.InputParameters["CurrRev"] = "";
-            if (e.InputParameters["Disegno"] == null) e.InputParameters["Disegno"] = "";
+            return user_std.UtSn.Traduci(lemma);
         }
+
+        /// <summary>
+        /// effettua traduzione in inglese del lemma
+        /// </summary>
+        /// <param name="lemma"></param>
+        /// <returns></returns>
+        public string traduciEn(string lemma)
+        {
+            return user_std.UtSn.TraduciEn(lemma);
+        }
+
+        #endregion Public Methods
     }
 }
\ No newline at end of file
diff --git a/MapoDb/DS_ProdTempi.xsd b/MapoDb/DS_ProdTempi.xsd
index ccde4f6e..5d24021c 100644
--- a/MapoDb/DS_ProdTempi.xsd
+++ b/MapoDb/DS_ProdTempi.xsd
@@ -672,6 +672,29 @@ SELECT CodArticolo, Disegno, DescArticolo, CurrRev, ProdRev, FlagIsNew, Tipo FRO
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
+              <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="MoonPro.dbo.stp_ART_getPaged" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getPaged" GetMethodModifier="Public" GetMethodName="getPaged" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getPaged" UserSourceName="getPaged">
+                <SelectCommand>
+                  <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
+                    <CommandText>dbo.stp_ART_getPaged</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@maximumRows" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@startRowIndex" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@orderByCol" Precision="0" ProviderType="NVarChar" Scale="0" Size="250" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
+              <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="MoonPro.dbo.stp_ART_rowCount" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="rowCount" Modifier="Public" Name="rowCount" QueryType="Scalar" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy4" UserSourceName="rowCount">
+                <SelectCommand>
+                  <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
+                    <CommandText>dbo.stp_ART_rowCount</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
               <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="MoonPro.dbo.stp_ART_setNewRev" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="setNewRev" Modifier="Public" Name="setNewRev" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy2" UserSourceName="setNewRev">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
@@ -2887,7 +2910,7 @@ SELECT IdxMacchina, IdxMacchinaSlave FROM Macchine2Slave WHERE (IdxMacchina = @I
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="MappaStatoExpl" msprop:Generator_TableClassName="MappaStatoExplDataTable" msprop:Generator_TableVarName="tableMappaStatoExpl" msprop:Generator_TablePropName="MappaStatoExpl" msprop:Generator_RowDeletingName="MappaStatoExplRowDeleting" msprop:Generator_RowChangingName="MappaStatoExplRowChanging" msprop:Generator_RowEvHandlerName="MappaStatoExplRowChangeEventHandler" msprop:Generator_RowDeletedName="MappaStatoExplRowDeleted" msprop:Generator_UserTableName="MappaStatoExpl" msprop:Generator_RowChangedName="MappaStatoExplRowChanged" msprop:Generator_RowEvArgName="MappaStatoExplRowChangeEvent" msprop:Generator_RowClassName="MappaStatoExplRow">
+        <xs:element name="MappaStatoExpl" msprop:Generator_TableClassName="MappaStatoExplDataTable" msprop:Generator_TableVarName="tableMappaStatoExpl" msprop:Generator_RowChangedName="MappaStatoExplRowChanged" msprop:Generator_TablePropName="MappaStatoExpl" msprop:Generator_RowDeletingName="MappaStatoExplRowDeleting" msprop:Generator_RowChangingName="MappaStatoExplRowChanging" msprop:Generator_RowEvHandlerName="MappaStatoExplRowChangeEventHandler" msprop:Generator_RowDeletedName="MappaStatoExplRowDeleted" msprop:Generator_RowClassName="MappaStatoExplRow" msprop:Generator_UserTableName="MappaStatoExpl" msprop:Generator_RowEvArgName="MappaStatoExplRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="RowNum" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnRowNum" msprop:Generator_ColumnPropNameInRow="RowNum" msprop:Generator_ColumnPropNameInTable="RowNumColumn" msprop:Generator_UserColumnName="RowNum" type="xs:int" />
@@ -2968,7 +2991,7 @@ SELECT IdxMacchina, IdxMacchinaSlave FROM Macchine2Slave WHERE (IdxMacchina = @I
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="ResProdDett_splitODL" msprop:Generator_TableClassName="ResProdDett_splitODLDataTable" msprop:Generator_TableVarName="tableResProdDett_splitODL" msprop:Generator_TablePropName="ResProdDett_splitODL" msprop:Generator_RowDeletingName="ResProdDett_splitODLRowDeleting" msprop:Generator_RowChangingName="ResProdDett_splitODLRowChanging" msprop:Generator_RowEvHandlerName="ResProdDett_splitODLRowChangeEventHandler" msprop:Generator_RowDeletedName="ResProdDett_splitODLRowDeleted" msprop:Generator_UserTableName="ResProdDett_splitODL" msprop:Generator_RowChangedName="ResProdDett_splitODLRowChanged" msprop:Generator_RowEvArgName="ResProdDett_splitODLRowChangeEvent" msprop:Generator_RowClassName="ResProdDett_splitODLRow">
+        <xs:element name="ResProdDett_splitODL" msprop:Generator_TableClassName="ResProdDett_splitODLDataTable" msprop:Generator_TableVarName="tableResProdDett_splitODL" msprop:Generator_RowChangedName="ResProdDett_splitODLRowChanged" msprop:Generator_TablePropName="ResProdDett_splitODL" msprop:Generator_RowDeletingName="ResProdDett_splitODLRowDeleting" msprop:Generator_RowChangingName="ResProdDett_splitODLRowChanging" msprop:Generator_RowEvHandlerName="ResProdDett_splitODLRowChangeEventHandler" msprop:Generator_RowDeletedName="ResProdDett_splitODLRowDeleted" msprop:Generator_RowClassName="ResProdDett_splitODLRow" msprop:Generator_UserTableName="ResProdDett_splitODL" msprop:Generator_RowEvArgName="ResProdDett_splitODLRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="IdxODL" msprop:Generator_ColumnVarNameInTable="columnIdxODL" msprop:Generator_ColumnPropNameInRow="IdxODL" msprop:Generator_ColumnPropNameInTable="IdxODLColumn" msprop:Generator_UserColumnName="IdxODL" type="xs:int" minOccurs="0" />
@@ -2980,7 +3003,7 @@ SELECT IdxMacchina, IdxMacchinaSlave FROM Macchine2Slave WHERE (IdxMacchina = @I
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="ResProdDett_splitGG" msprop:Generator_TableClassName="ResProdDett_splitGGDataTable" msprop:Generator_TableVarName="tableResProdDett_splitGG" msprop:Generator_TablePropName="ResProdDett_splitGG" msprop:Generator_RowDeletingName="ResProdDett_splitGGRowDeleting" msprop:Generator_RowChangingName="ResProdDett_splitGGRowChanging" msprop:Generator_RowEvHandlerName="ResProdDett_splitGGRowChangeEventHandler" msprop:Generator_RowDeletedName="ResProdDett_splitGGRowDeleted" msprop:Generator_UserTableName="ResProdDett_splitGG" msprop:Generator_RowChangedName="ResProdDett_splitGGRowChanged" msprop:Generator_RowEvArgName="ResProdDett_splitGGRowChangeEvent" msprop:Generator_RowClassName="ResProdDett_splitGGRow">
+        <xs:element name="ResProdDett_splitGG" msprop:Generator_TableClassName="ResProdDett_splitGGDataTable" msprop:Generator_TableVarName="tableResProdDett_splitGG" msprop:Generator_RowChangedName="ResProdDett_splitGGRowChanged" msprop:Generator_TablePropName="ResProdDett_splitGG" msprop:Generator_RowDeletingName="ResProdDett_splitGGRowDeleting" msprop:Generator_RowChangingName="ResProdDett_splitGGRowChanging" msprop:Generator_RowEvHandlerName="ResProdDett_splitGGRowChangeEventHandler" msprop:Generator_RowDeletedName="ResProdDett_splitGGRowDeleted" msprop:Generator_RowClassName="ResProdDett_splitGGRow" msprop:Generator_UserTableName="ResProdDett_splitGG" msprop:Generator_RowEvArgName="ResProdDett_splitGGRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="Data" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnData" msprop:Generator_ColumnPropNameInRow="Data" msprop:Generator_ColumnPropNameInTable="DataColumn" msprop:Generator_UserColumnName="Data" type="xs:dateTime" minOccurs="0" />
@@ -3005,7 +3028,7 @@ SELECT IdxMacchina, IdxMacchinaSlave FROM Macchine2Slave WHERE (IdxMacchina = @I
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="ResProdTot" msprop:Generator_TableClassName="ResProdTotDataTable" msprop:Generator_TableVarName="tableResProdTot" msprop:Generator_RowChangedName="ResProdTotRowChanged" msprop:Generator_TablePropName="ResProdTot" msprop:Generator_RowDeletingName="ResProdTotRowDeleting" msprop:Generator_RowChangingName="ResProdTotRowChanging" msprop:Generator_RowEvHandlerName="ResProdTotRowChangeEventHandler" msprop:Generator_RowDeletedName="ResProdTotRowDeleted" msprop:Generator_RowClassName="ResProdTotRow" msprop:Generator_UserTableName="ResProdTot" msprop:Generator_RowEvArgName="ResProdTotRowChangeEvent">
+        <xs:element name="ResProdTot" msprop:Generator_TableClassName="ResProdTotDataTable" msprop:Generator_TableVarName="tableResProdTot" msprop:Generator_TablePropName="ResProdTot" msprop:Generator_RowDeletingName="ResProdTotRowDeleting" msprop:Generator_RowChangingName="ResProdTotRowChanging" msprop:Generator_RowEvHandlerName="ResProdTotRowChangeEventHandler" msprop:Generator_RowDeletedName="ResProdTotRowDeleted" msprop:Generator_UserTableName="ResProdTot" msprop:Generator_RowChangedName="ResProdTotRowChanged" msprop:Generator_RowEvArgName="ResProdTotRowChangeEvent" msprop:Generator_RowClassName="ResProdTotRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="Nome" msprop:Generator_ColumnVarNameInTable="columnNome" msprop:Generator_ColumnPropNameInRow="Nome" msprop:Generator_ColumnPropNameInTable="NomeColumn" msprop:Generator_UserColumnName="Nome">
@@ -3043,7 +3066,7 @@ SELECT IdxMacchina, IdxMacchinaSlave FROM Macchine2Slave WHERE (IdxMacchina = @I
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="RegistroControlli" msprop:Generator_TableClassName="RegistroControlliDataTable" msprop:Generator_TableVarName="tableRegistroControlli" msprop:Generator_TablePropName="RegistroControlli" msprop:Generator_RowDeletingName="RegistroControlliRowDeleting" msprop:Generator_RowChangingName="RegistroControlliRowChanging" msprop:Generator_RowEvHandlerName="RegistroControlliRowChangeEventHandler" msprop:Generator_RowDeletedName="RegistroControlliRowDeleted" msprop:Generator_UserTableName="RegistroControlli" msprop:Generator_RowChangedName="RegistroControlliRowChanged" msprop:Generator_RowEvArgName="RegistroControlliRowChangeEvent" msprop:Generator_RowClassName="RegistroControlliRow">
+        <xs:element name="RegistroControlli" msprop:Generator_TableClassName="RegistroControlliDataTable" msprop:Generator_TableVarName="tableRegistroControlli" msprop:Generator_RowChangedName="RegistroControlliRowChanged" msprop:Generator_TablePropName="RegistroControlli" msprop:Generator_RowDeletingName="RegistroControlliRowDeleting" msprop:Generator_RowChangingName="RegistroControlliRowChanging" msprop:Generator_RowEvHandlerName="RegistroControlliRowChangeEventHandler" msprop:Generator_RowDeletedName="RegistroControlliRowDeleted" msprop:Generator_RowClassName="RegistroControlliRow" msprop:Generator_UserTableName="RegistroControlli" msprop:Generator_RowEvArgName="RegistroControlliRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="IdxControllo" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnIdxControllo" msprop:Generator_ColumnPropNameInRow="IdxControllo" msprop:Generator_ColumnPropNameInTable="IdxControlloColumn" msprop:Generator_UserColumnName="IdxControllo" type="xs:int" />
@@ -3082,7 +3105,7 @@ SELECT IdxMacchina, IdxMacchinaSlave FROM Macchine2Slave WHERE (IdxMacchina = @I
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="RegistroScarti" msprop:Generator_TableClassName="RegistroScartiDataTable" msprop:Generator_TableVarName="tableRegistroScarti" msprop:Generator_TablePropName="RegistroScarti" msprop:Generator_RowDeletingName="RegistroScartiRowDeleting" msprop:Generator_RowChangingName="RegistroScartiRowChanging" msprop:Generator_RowEvHandlerName="RegistroScartiRowChangeEventHandler" msprop:Generator_RowDeletedName="RegistroScartiRowDeleted" msprop:Generator_UserTableName="RegistroScarti" msprop:Generator_RowChangedName="RegistroScartiRowChanged" msprop:Generator_RowEvArgName="RegistroScartiRowChangeEvent" msprop:Generator_RowClassName="RegistroScartiRow">
+        <xs:element name="RegistroScarti" msprop:Generator_TableClassName="RegistroScartiDataTable" msprop:Generator_TableVarName="tableRegistroScarti" msprop:Generator_RowChangedName="RegistroScartiRowChanged" msprop:Generator_TablePropName="RegistroScarti" msprop:Generator_RowDeletingName="RegistroScartiRowDeleting" msprop:Generator_RowChangingName="RegistroScartiRowChanging" msprop:Generator_RowEvHandlerName="RegistroScartiRowChangeEventHandler" msprop:Generator_RowDeletedName="RegistroScartiRowDeleted" msprop:Generator_RowClassName="RegistroScartiRow" msprop:Generator_UserTableName="RegistroScarti" msprop:Generator_RowEvArgName="RegistroScartiRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="IdxMacchina" msprop:Generator_ColumnVarNameInTable="columnIdxMacchina" msprop:Generator_ColumnPropNameInRow="IdxMacchina" msprop:Generator_ColumnPropNameInTable="IdxMacchinaColumn" msprop:Generator_UserColumnName="IdxMacchina">
@@ -3148,7 +3171,7 @@ SELECT IdxMacchina, IdxMacchinaSlave FROM Macchine2Slave WHERE (IdxMacchina = @I
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="PromesseODL" msprop:Generator_TableClassName="PromesseODLDataTable" msprop:Generator_TableVarName="tablePromesseODL" msprop:Generator_RowChangedName="PromesseODLRowChanged" msprop:Generator_TablePropName="PromesseODL" msprop:Generator_RowDeletingName="PromesseODLRowDeleting" msprop:Generator_RowChangingName="PromesseODLRowChanging" msprop:Generator_RowEvHandlerName="PromesseODLRowChangeEventHandler" msprop:Generator_RowDeletedName="PromesseODLRowDeleted" msprop:Generator_RowClassName="PromesseODLRow" msprop:Generator_UserTableName="PromesseODL" msprop:Generator_RowEvArgName="PromesseODLRowChangeEvent">
+        <xs:element name="PromesseODL" msprop:Generator_TableClassName="PromesseODLDataTable" msprop:Generator_TableVarName="tablePromesseODL" msprop:Generator_TablePropName="PromesseODL" msprop:Generator_RowDeletingName="PromesseODLRowDeleting" msprop:Generator_RowChangingName="PromesseODLRowChanging" msprop:Generator_RowEvHandlerName="PromesseODLRowChangeEventHandler" msprop:Generator_RowDeletedName="PromesseODLRowDeleted" msprop:Generator_UserTableName="PromesseODL" msprop:Generator_RowChangedName="PromesseODLRowChanged" msprop:Generator_RowEvArgName="PromesseODLRowChangeEvent" msprop:Generator_RowClassName="PromesseODLRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="idxPromessa" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidxPromessa" msprop:Generator_ColumnPropNameInRow="idxPromessa" msprop:Generator_ColumnPropNameInTable="idxPromessaColumn" msprop:Generator_UserColumnName="idxPromessa" type="xs:int" />
@@ -3225,7 +3248,7 @@ SELECT IdxMacchina, IdxMacchinaSlave FROM Macchine2Slave WHERE (IdxMacchina = @I
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="ElencoConfermeProd" msprop:Generator_TableClassName="ElencoConfermeProdDataTable" msprop:Generator_TableVarName="tableElencoConfermeProd" msprop:Generator_RowChangedName="ElencoConfermeProdRowChanged" msprop:Generator_TablePropName="ElencoConfermeProd" msprop:Generator_RowDeletingName="ElencoConfermeProdRowDeleting" msprop:Generator_RowChangingName="ElencoConfermeProdRowChanging" msprop:Generator_RowEvHandlerName="ElencoConfermeProdRowChangeEventHandler" msprop:Generator_RowDeletedName="ElencoConfermeProdRowDeleted" msprop:Generator_RowClassName="ElencoConfermeProdRow" msprop:Generator_UserTableName="ElencoConfermeProd" msprop:Generator_RowEvArgName="ElencoConfermeProdRowChangeEvent">
+        <xs:element name="ElencoConfermeProd" msprop:Generator_TableClassName="ElencoConfermeProdDataTable" msprop:Generator_TableVarName="tableElencoConfermeProd" msprop:Generator_TablePropName="ElencoConfermeProd" msprop:Generator_RowDeletingName="ElencoConfermeProdRowDeleting" msprop:Generator_RowChangingName="ElencoConfermeProdRowChanging" msprop:Generator_RowEvHandlerName="ElencoConfermeProdRowChangeEventHandler" msprop:Generator_RowDeletedName="ElencoConfermeProdRowDeleted" msprop:Generator_UserTableName="ElencoConfermeProd" msprop:Generator_RowChangedName="ElencoConfermeProdRowChanged" msprop:Generator_RowEvArgName="ElencoConfermeProdRowChangeEvent" msprop:Generator_RowClassName="ElencoConfermeProdRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="DataOraConf" msprop:Generator_ColumnVarNameInTable="columnDataOraConf" msprop:Generator_ColumnPropNameInRow="DataOraConf" msprop:Generator_ColumnPropNameInTable="DataOraConfColumn" msprop:Generator_UserColumnName="DataOraConf" type="xs:dateTime" />
@@ -3260,7 +3283,7 @@ SELECT IdxMacchina, IdxMacchinaSlave FROM Macchine2Slave WHERE (IdxMacchina = @I
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="StatoProd" msprop:Generator_TableClassName="StatoProdDataTable" msprop:Generator_TableVarName="tableStatoProd" msprop:Generator_TablePropName="StatoProd" msprop:Generator_RowDeletingName="StatoProdRowDeleting" msprop:Generator_RowChangingName="StatoProdRowChanging" msprop:Generator_RowEvHandlerName="StatoProdRowChangeEventHandler" msprop:Generator_RowDeletedName="StatoProdRowDeleted" msprop:Generator_UserTableName="StatoProd" msprop:Generator_RowChangedName="StatoProdRowChanged" msprop:Generator_RowEvArgName="StatoProdRowChangeEvent" msprop:Generator_RowClassName="StatoProdRow">
+        <xs:element name="StatoProd" msprop:Generator_TableClassName="StatoProdDataTable" msprop:Generator_TableVarName="tableStatoProd" msprop:Generator_RowChangedName="StatoProdRowChanged" msprop:Generator_TablePropName="StatoProd" msprop:Generator_RowDeletingName="StatoProdRowDeleting" msprop:Generator_RowChangingName="StatoProdRowChanging" msprop:Generator_RowEvHandlerName="StatoProdRowChangeEventHandler" msprop:Generator_RowDeletedName="StatoProdRowDeleted" msprop:Generator_RowClassName="StatoProdRow" msprop:Generator_UserTableName="StatoProd" msprop:Generator_RowEvArgName="StatoProdRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="idxMacchina" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnidxMacchina" msprop:Generator_ColumnPropNameInRow="idxMacchina" msprop:Generator_ColumnPropNameInTable="idxMacchinaColumn" msprop:Generator_UserColumnName="idxMacchina" minOccurs="0">
@@ -3282,7 +3305,7 @@ SELECT IdxMacchina, IdxMacchinaSlave FROM Macchine2Slave WHERE (IdxMacchina = @I
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Macchine2Slave" msprop:Generator_TableClassName="Macchine2SlaveDataTable" msprop:Generator_TableVarName="tableMacchine2Slave" msprop:Generator_TablePropName="Macchine2Slave" msprop:Generator_RowDeletingName="Macchine2SlaveRowDeleting" msprop:Generator_RowChangingName="Macchine2SlaveRowChanging" msprop:Generator_RowEvHandlerName="Macchine2SlaveRowChangeEventHandler" msprop:Generator_RowDeletedName="Macchine2SlaveRowDeleted" msprop:Generator_UserTableName="Macchine2Slave" msprop:Generator_RowChangedName="Macchine2SlaveRowChanged" msprop:Generator_RowEvArgName="Macchine2SlaveRowChangeEvent" msprop:Generator_RowClassName="Macchine2SlaveRow">
+        <xs:element name="Macchine2Slave" msprop:Generator_TableClassName="Macchine2SlaveDataTable" msprop:Generator_TableVarName="tableMacchine2Slave" msprop:Generator_RowChangedName="Macchine2SlaveRowChanged" msprop:Generator_TablePropName="Macchine2Slave" msprop:Generator_RowDeletingName="Macchine2SlaveRowDeleting" msprop:Generator_RowChangingName="Macchine2SlaveRowChanging" msprop:Generator_RowEvHandlerName="Macchine2SlaveRowChangeEventHandler" msprop:Generator_RowDeletedName="Macchine2SlaveRowDeleted" msprop:Generator_RowClassName="Macchine2SlaveRow" msprop:Generator_UserTableName="Macchine2Slave" msprop:Generator_RowEvArgName="Macchine2SlaveRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="IdxMacchina" msprop:Generator_ColumnVarNameInTable="columnIdxMacchina" msprop:Generator_ColumnPropNameInRow="IdxMacchina" msprop:Generator_ColumnPropNameInTable="IdxMacchinaColumn" msprop:Generator_UserColumnName="IdxMacchina">
diff --git a/MapoDb/DS_ProdTempi.xss b/MapoDb/DS_ProdTempi.xss
index a142eddf..571d5bd6 100644
--- a/MapoDb/DS_ProdTempi.xss
+++ b/MapoDb/DS_ProdTempi.xss
@@ -7,29 +7,29 @@
 <DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-5" ViewPortY="29" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
     <Shape ID="DesignTable:TempiCicloRilevati" ZOrder="15" X="20" Y="81" Height="248" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
-    <Shape ID="DesignTable:ODL" ZOrder="1" X="588" Y="452" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:AnagArticoli" ZOrder="14" X="20" Y="388" Height="286" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
+    <Shape ID="DesignTable:ODL" ZOrder="2" X="588" Y="452" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:AnagArticoli" ZOrder="1" X="20" Y="388" Height="324" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
     <Shape ID="DesignTable:DatiMacchine" ZOrder="21" X="949" Y="353" Height="286" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
     <Shape ID="DesignTable:PostazioniMapo" ZOrder="24" X="950" Y="39" Height="248" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
-    <Shape ID="DesignTable:stp_PzProd_getByMacchina" ZOrder="4" X="23" Y="754" Height="229" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:stp_PzProd_getByMacchina" ZOrder="5" X="23" Y="754" Height="229" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
     <Shape ID="DesignTable:DatiConfermati" ZOrder="23" X="585" Y="50" Height="343" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:CalendFesteFerie" ZOrder="10" X="346" Y="364" Height="115" Width="242" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:stp_TempoByIdxMaccPeriodClass" ZOrder="9" X="25" Y="979" Height="97" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="46" />
+    <Shape ID="DesignTable:CalendFesteFerie" ZOrder="11" X="346" Y="364" Height="115" Width="242" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:stp_TempoByIdxMaccPeriodClass" ZOrder="10" X="25" Y="979" Height="97" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="46" />
     <Shape ID="DesignTable:DatiProduzione" ZOrder="20" X="554" Y="922" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:stp_repDonati_getDatiProdMacchina" ZOrder="7" X="949" Y="688" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:stp_repDonati_getDatiProdMacchina" ZOrder="8" X="949" Y="688" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:stp_repDonati_getLastStatoDurataMacchina" ZOrder="22" X="957" Y="1072" Height="115" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:stp_repDonati_getDatiProdMacchinaPeriodo" ZOrder="8" X="26" Y="1152" Height="172" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
+    <Shape ID="DesignTable:stp_repDonati_getDatiProdMacchinaPeriodo" ZOrder="9" X="26" Y="1152" Height="172" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
     <Shape ID="DesignTable:TurniMacchina" ZOrder="16" X="363" Y="94" Height="191" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
-    <Shape ID="DesignTable:MappaStatoExpl" ZOrder="6" X="946" Y="1217" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:ResProdDett_splitODL" ZOrder="3" X="940" Y="2192" Height="191" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
+    <Shape ID="DesignTable:MappaStatoExpl" ZOrder="7" X="946" Y="1217" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:ResProdDett_splitODL" ZOrder="4" X="940" Y="2192" Height="191" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
     <Shape ID="DesignTable:ResProdDett_splitGG" ZOrder="17" X="27" Y="2218" Height="210" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
     <Shape ID="DesignTable:ResProdTot" ZOrder="18" X="544" Y="2122" Height="229" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
-    <Shape ID="DesignTable:RegistroControlli" ZOrder="12" X="536" Y="1403" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
-    <Shape ID="DesignTable:RegistroScarti" ZOrder="11" X="25" Y="1371" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:PromesseODL" ZOrder="5" X="946" Y="1728" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:RegistroControlli" ZOrder="13" X="536" Y="1403" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
+    <Shape ID="DesignTable:RegistroScarti" ZOrder="12" X="25" Y="1371" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:PromesseODL" ZOrder="6" X="946" Y="1728" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:ElencoConfermeProd" ZOrder="19" X="26" Y="1839" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
-    <Shape ID="DesignTable:StatoProd" ZOrder="13" X="541" Y="1777" Height="267" Width="238" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
-    <Shape ID="DesignTable:Macchine2Slave" ZOrder="2" X="333" Y="559" Height="153" Width="237" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:StatoProd" ZOrder="14" X="541" Y="1777" Height="267" Width="238" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
+    <Shape ID="DesignTable:Macchine2Slave" ZOrder="3" X="333" Y="559" Height="153" Width="237" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
   </Shapes>
   <Connectors />
 </DiagramLayout>
\ No newline at end of file
diff --git a/MapoDb/DS_ProdTempi1.Designer.cs b/MapoDb/DS_ProdTempi1.Designer.cs
index eca5a012..0ebaa74a 100644
--- a/MapoDb/DS_ProdTempi1.Designer.cs
+++ b/MapoDb/DS_ProdTempi1.Designer.cs
@@ -18800,7 +18800,7 @@ SELECT CodArticolo, Disegno, DescArticolo, CurrRev, ProdRev, FlagIsNew, Tipo FRO
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         private void InitCommandCollection() {
-            this._commandCollection = new global::System.Data.SqlClient.SqlCommand[6];
+            this._commandCollection = new global::System.Data.SqlClient.SqlCommand[8];
             this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[0].Connection = this.Connection;
             this._commandCollection[0].CommandText = "SELECT * FROM AnagArticoli";
@@ -18826,21 +18826,34 @@ SELECT CodArticolo, Disegno, DescArticolo, CurrRev, ProdRev, FlagIsNew, Tipo FRO
             this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodArticolo", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[4].Connection = this.Connection;
-            this._commandCollection[4].CommandText = "dbo.stp_ART_setNewRev";
+            this._commandCollection[4].CommandText = "dbo.stp_ART_getPaged";
             this._commandCollection[4].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodArticolo", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@maximumRows", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@startRowIndex", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@orderByCol", global::System.Data.SqlDbType.NVarChar, 250, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[5] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[5].Connection = this.Connection;
-            this._commandCollection[5].CommandText = "dbo.stp_ART_update";
+            this._commandCollection[5].CommandText = "dbo.stp_ART_rowCount";
             this._commandCollection[5].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodArticolo", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DescArticolo", global::System.Data.SqlDbType.NVarChar, 250, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CurrRev", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodArticolo", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Disegno", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Tipo", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[6] = new global::System.Data.SqlClient.SqlCommand();
+            this._commandCollection[6].Connection = this.Connection;
+            this._commandCollection[6].CommandText = "dbo.stp_ART_setNewRev";
+            this._commandCollection[6].CommandType = global::System.Data.CommandType.StoredProcedure;
+            this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodArticolo", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[7] = new global::System.Data.SqlClient.SqlCommand();
+            this._commandCollection[7].Connection = this.Connection;
+            this._commandCollection[7].CommandText = "dbo.stp_ART_update";
+            this._commandCollection[7].CommandType = global::System.Data.CommandType.StoredProcedure;
+            this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodArticolo", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DescArticolo", global::System.Data.SqlDbType.NVarChar, 250, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CurrRev", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodArticolo", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Disegno", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Tipo", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
         }
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -18884,6 +18897,35 @@ SELECT CodArticolo, Disegno, DescArticolo, CurrRev, ProdRev, FlagIsNew, Tipo FRO
             return dataTable;
         }
         
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+        [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
+        public virtual DS_ProdTempi.AnagArticoliDataTable getPaged(global::System.Nullable<int> maximumRows, global::System.Nullable<int> startRowIndex, string orderByCol) {
+            this.Adapter.SelectCommand = this.CommandCollection[4];
+            if ((maximumRows.HasValue == true)) {
+                this.Adapter.SelectCommand.Parameters[1].Value = ((int)(maximumRows.Value));
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
+            }
+            if ((startRowIndex.HasValue == true)) {
+                this.Adapter.SelectCommand.Parameters[2].Value = ((int)(startRowIndex.Value));
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value;
+            }
+            if ((orderByCol == null)) {
+                this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[3].Value = ((string)(orderByCol));
+            }
+            DS_ProdTempi.AnagArticoliDataTable dataTable = new DS_ProdTempi.AnagArticoliDataTable();
+            this.Adapter.Fill(dataTable);
+            return dataTable;
+        }
+        
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
@@ -19219,11 +19261,39 @@ SELECT CodArticolo, Disegno, DescArticolo, CurrRev, ProdRev, FlagIsNew, Tipo FRO
             return returnValue;
         }
         
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+        public virtual object rowCount() {
+            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[5];
+            global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
+            if (((command.Connection.State & global::System.Data.ConnectionState.Open) 
+                        != global::System.Data.ConnectionState.Open)) {
+                command.Connection.Open();
+            }
+            object returnValue;
+            try {
+                returnValue = command.ExecuteScalar();
+            }
+            finally {
+                if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) {
+                    command.Connection.Close();
+                }
+            }
+            if (((returnValue == null) 
+                        || (returnValue.GetType() == typeof(global::System.DBNull)))) {
+                return null;
+            }
+            else {
+                return ((object)(returnValue));
+            }
+        }
+        
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         public virtual int setNewRev(string Original_CodArticolo) {
-            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[4];
+            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[6];
             if ((Original_CodArticolo == null)) {
                 command.Parameters[1].Value = global::System.DBNull.Value;
             }
@@ -19251,7 +19321,7 @@ SELECT CodArticolo, Disegno, DescArticolo, CurrRev, ProdRev, FlagIsNew, Tipo FRO
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         public virtual int updateQry(string Original_CodArticolo, string DescArticolo, string CurrRev, string CodArticolo, string Disegno, string Tipo) {
-            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[5];
+            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[7];
             if ((Original_CodArticolo == null)) {
                 command.Parameters[1].Value = global::System.DBNull.Value;
             }