From 304c369f457bd3bc8c69f678523353cecddce2d0 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Thu, 19 Oct 2017 16:42:24 +0200
Subject: [PATCH] update x gestione con NUOVA stored x ricalcolo DDB

---
 MP-Tablet/Web.config                          |  3 +++
 .../WebUserControls/mod_dichiarazione.ascx.cs |  9 +++++--
 MapoDb/DS_Utility.Designer.cs                 | 25 +++++++++++++++++--
 MapoDb/DS_Utility.xsd                         | 23 +++++++++--------
 MapoDb/DS_Utility.xss                         |  6 ++---
 5 files changed, 49 insertions(+), 17 deletions(-)

diff --git a/MP-Tablet/Web.config b/MP-Tablet/Web.config
index 4645b29d..b0db1a58 100644
--- a/MP-Tablet/Web.config
+++ b/MP-Tablet/Web.config
@@ -72,6 +72,9 @@
     <add key="commEnableEditDel" value="false" />
     <add key="minAnticipoRicalcolo" value="-2" />
     <add key="dltMinRealtime" value="5" />
+    <add key="rdm_nEvStep" value="100" />
+    <add key="rdm_nEvCheck" value="40" />
+    <add key="rdm_ChkOnly" value="false" />
     <!--conf URL-->
     <add key="baseUrlAdmin" value="http://iis02/MP/ADM/" />
     <add key="pageUrlApprODL" value="approvazioneODL.aspx" />
diff --git a/MP-Tablet/WebUserControls/mod_dichiarazione.ascx.cs b/MP-Tablet/WebUserControls/mod_dichiarazione.ascx.cs
index 41371785..e26cf8ff 100644
--- a/MP-Tablet/WebUserControls/mod_dichiarazione.ascx.cs
+++ b/MP-Tablet/WebUserControls/mod_dichiarazione.ascx.cs
@@ -108,8 +108,13 @@ namespace MoonProTablet.WebUserControls
             controllerMapo.scriviRigaEventoBarcode(idxMacchina.ToString(), idxEvento, rigaStato.CodArticolo, commento, DataLayer.MatrOpr, rigaStato.pallet, dataOraEv.AddSeconds(1), DateTime.Now);
             // eseguo ricalcolo!
             DateTime startRicalcolo = dataOraEv.AddMinutes(memLayer.ML.confReadInt("minAnticipoRicalcolo"));
-            DataLayer.obj.taComm.stp_ricalcolaDatiMacchinaFromDate(idxMacchina.ToString(), startRicalcolo, 1); // nella stored imposto macchina OFFline e poi ONline, parto da "minAnticipoRicalcolo" minuti prima...
-                                                                                                               // aggiorno data evento x insert eventuale commento (5 sec...)
+
+            // leggo parametri x esecuzione...
+            int rdm_nEvStep = memLayer.ML.CRI("rdm_nEvStep");
+            int rdm_nEvCheck = memLayer.ML.CRI("rdm_nEvCheck");
+            bool rdm_ChkOnly = memLayer.ML.CRB("rdm_ChkOnly");
+            DataLayer.obj.taComm.stp_ricalcolaDatiMacchinaFromDate(idxMacchina.ToString(), startRicalcolo, 1, rdm_nEvStep, rdm_nEvCheck, rdm_ChkOnly); // nella stored imposto macchina OFFline e poi ONline, parto da "minAnticipoRicalcolo" minuti prima...
+                                                                                                                                                       // aggiorno data evento x insert eventuale commento (5 sec...)
             dataOraEv = dataOraEv.AddSeconds(5);
             // riabilito insert... anche se non dovrebbe servire x stored ricalcolo precedente...
             DataLayer.obj.taStatoMacchine.setInsEnabled(idxMacchina.ToString(), true);
diff --git a/MapoDb/DS_Utility.Designer.cs b/MapoDb/DS_Utility.Designer.cs
index 3ebd535d..896cb6ca 100644
--- a/MapoDb/DS_Utility.Designer.cs
+++ b/MapoDb/DS_Utility.Designer.cs
@@ -7317,12 +7317,15 @@ SELECT IdxMacchina, IdxStato, InizioStato, Value, CodArticolo, TempoCicloBase, P
             this._commandCollection[1].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[2] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[2].Connection = this.Connection;
-            this._commandCollection[2].CommandText = "man.stp_ricalcolaDatiMacchinaFromDate";
+            this._commandCollection[2].CommandText = "man.stp_ricalcolaDatiMacchinaFromDateFork";
             this._commandCollection[2].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[2].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[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxMacchina", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@inizio", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxStatoStart", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@nStepEventi", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@nRecCheck", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CheckOnly", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
         }
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -7398,7 +7401,7 @@ SELECT IdxMacchina, IdxStato, InizioStato, Value, CodArticolo, TempoCicloBase, P
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
-        public virtual int stp_ricalcolaDatiMacchinaFromDate(string idxMacchina, global::System.Nullable<global::System.DateTime> inizio, global::System.Nullable<int> idxStatoStart) {
+        public virtual int stp_ricalcolaDatiMacchinaFromDate(string idxMacchina, global::System.Nullable<global::System.DateTime> inizio, global::System.Nullable<int> idxStatoStart, global::System.Nullable<int> nStepEventi, global::System.Nullable<int> nRecCheck, global::System.Nullable<bool> CheckOnly) {
             global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[2];
             if ((idxMacchina == null)) {
                 command.Parameters[1].Value = global::System.DBNull.Value;
@@ -7418,6 +7421,24 @@ SELECT IdxMacchina, IdxStato, InizioStato, Value, CodArticolo, TempoCicloBase, P
             else {
                 command.Parameters[3].Value = global::System.DBNull.Value;
             }
+            if ((nStepEventi.HasValue == true)) {
+                command.Parameters[4].Value = ((int)(nStepEventi.Value));
+            }
+            else {
+                command.Parameters[4].Value = global::System.DBNull.Value;
+            }
+            if ((nRecCheck.HasValue == true)) {
+                command.Parameters[5].Value = ((int)(nRecCheck.Value));
+            }
+            else {
+                command.Parameters[5].Value = global::System.DBNull.Value;
+            }
+            if ((CheckOnly.HasValue == true)) {
+                command.Parameters[6].Value = ((bool)(CheckOnly.Value));
+            }
+            else {
+                command.Parameters[6].Value = global::System.DBNull.Value;
+            }
             global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
             if (((command.Connection.State & global::System.Data.ConnectionState.Open) 
                         != global::System.Data.ConnectionState.Open)) {
diff --git a/MapoDb/DS_Utility.xsd b/MapoDb/DS_Utility.xsd
index fdb5fef8..c6fc6a3a 100644
--- a/MapoDb/DS_Utility.xsd
+++ b/MapoDb/DS_Utility.xsd
@@ -308,15 +308,18 @@ ORDER BY label</CommandText>
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
-              <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="Donati_MoonPro.man.stp_ricalcolaDatiMacchinaFromDate" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="stp_ricalcolaDatiMacchinaFromDate" Modifier="Public" Name="stp_ricalcolaDatiMacchinaFromDate" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy1" UserSourceName="stp_ricalcolaDatiMacchinaFromDate">
+              <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="Donati_MoonProLAV.man.stp_ricalcolaDatiMacchinaFromDateFork" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="stp_ricalcolaDatiMacchinaFromDate" Modifier="Public" Name="stp_ricalcolaDatiMacchinaFromDate" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy1" UserSourceName="stp_ricalcolaDatiMacchinaFromDate">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
-                    <CommandText>man.stp_ricalcolaDatiMacchinaFromDate</CommandText>
+                    <CommandText>man.stp_ricalcolaDatiMacchinaFromDateFork</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="nvarchar" DbType="String" Direction="Input" ParameterName="@idxMacchina" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@inizio" Precision="23" ProviderType="DateTime" Scale="3" Size="8" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idxStatoStart" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@nStepEventi" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@nRecCheck" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@CheckOnly" Precision="1" ProviderType="Bit" Scale="0" Size="1" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </SelectCommand>
@@ -449,7 +452,7 @@ ORDER BY label</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="v_selOperatori" msprop:Generator_TableClassName="v_selOperatoriDataTable" msprop:Generator_TableVarName="tablev_selOperatori" msprop:Generator_TablePropName="v_selOperatori" msprop:Generator_RowDeletingName="v_selOperatoriRowDeleting" msprop:Generator_RowChangingName="v_selOperatoriRowChanging" msprop:Generator_RowEvHandlerName="v_selOperatoriRowChangeEventHandler" msprop:Generator_RowDeletedName="v_selOperatoriRowDeleted" msprop:Generator_UserTableName="v_selOperatori" msprop:Generator_RowChangedName="v_selOperatoriRowChanged" msprop:Generator_RowEvArgName="v_selOperatoriRowChangeEvent" msprop:Generator_RowClassName="v_selOperatoriRow">
+        <xs:element name="v_selOperatori" msprop:Generator_TableClassName="v_selOperatoriDataTable" msprop:Generator_TableVarName="tablev_selOperatori" msprop:Generator_RowChangedName="v_selOperatoriRowChanged" msprop:Generator_TablePropName="v_selOperatori" msprop:Generator_RowDeletingName="v_selOperatoriRowDeleting" msprop:Generator_RowChangingName="v_selOperatoriRowChanging" msprop:Generator_RowEvHandlerName="v_selOperatoriRowChangeEventHandler" msprop:Generator_RowDeletedName="v_selOperatoriRowDeleted" msprop:Generator_RowClassName="v_selOperatoriRow" msprop:Generator_UserTableName="v_selOperatori" msprop:Generator_RowEvArgName="v_selOperatoriRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="value" msprop:Generator_ColumnVarNameInTable="columnvalue" msprop:Generator_ColumnPropNameInRow="value" msprop:Generator_ColumnPropNameInTable="valueColumn" msprop:Generator_UserColumnName="value" type="xs:int" />
@@ -463,7 +466,7 @@ ORDER BY label</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="v_selODL" msprop:Generator_TableClassName="v_selODLDataTable" msprop:Generator_TableVarName="tablev_selODL" msprop:Generator_RowChangedName="v_selODLRowChanged" msprop:Generator_TablePropName="v_selODL" msprop:Generator_RowDeletingName="v_selODLRowDeleting" msprop:Generator_RowChangingName="v_selODLRowChanging" msprop:Generator_RowEvHandlerName="v_selODLRowChangeEventHandler" msprop:Generator_RowDeletedName="v_selODLRowDeleted" msprop:Generator_RowClassName="v_selODLRow" msprop:Generator_UserTableName="v_selODL" msprop:Generator_RowEvArgName="v_selODLRowChangeEvent">
+        <xs:element name="v_selODL" msprop:Generator_TableClassName="v_selODLDataTable" msprop:Generator_TableVarName="tablev_selODL" msprop:Generator_TablePropName="v_selODL" msprop:Generator_RowDeletingName="v_selODLRowDeleting" msprop:Generator_RowChangingName="v_selODLRowChanging" msprop:Generator_RowEvHandlerName="v_selODLRowChangeEventHandler" msprop:Generator_RowDeletedName="v_selODLRowDeleted" msprop:Generator_UserTableName="v_selODL" msprop:Generator_RowChangedName="v_selODLRowChanged" msprop:Generator_RowEvArgName="v_selODLRowChangeEvent" msprop:Generator_RowClassName="v_selODLRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="value" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnvalue" msprop:Generator_ColumnPropNameInRow="value" msprop:Generator_ColumnPropNameInTable="valueColumn" msprop:Generator_UserColumnName="value" type="xs:int" />
@@ -478,7 +481,7 @@ ORDER BY label</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="v_selEventiBCode" msprop:Generator_TableClassName="v_selEventiBCodeDataTable" msprop:Generator_TableVarName="tablev_selEventiBCode" msprop:Generator_TablePropName="v_selEventiBCode" msprop:Generator_RowDeletingName="v_selEventiBCodeRowDeleting" msprop:Generator_RowChangingName="v_selEventiBCodeRowChanging" msprop:Generator_RowEvHandlerName="v_selEventiBCodeRowChangeEventHandler" msprop:Generator_RowDeletedName="v_selEventiBCodeRowDeleted" msprop:Generator_UserTableName="v_selEventiBCode" msprop:Generator_RowChangedName="v_selEventiBCodeRowChanged" msprop:Generator_RowEvArgName="v_selEventiBCodeRowChangeEvent" msprop:Generator_RowClassName="v_selEventiBCodeRow">
+        <xs:element name="v_selEventiBCode" msprop:Generator_TableClassName="v_selEventiBCodeDataTable" msprop:Generator_TableVarName="tablev_selEventiBCode" msprop:Generator_RowChangedName="v_selEventiBCodeRowChanged" msprop:Generator_TablePropName="v_selEventiBCode" msprop:Generator_RowDeletingName="v_selEventiBCodeRowDeleting" msprop:Generator_RowChangingName="v_selEventiBCodeRowChanging" msprop:Generator_RowEvHandlerName="v_selEventiBCodeRowChangeEventHandler" msprop:Generator_RowDeletedName="v_selEventiBCodeRowDeleted" msprop:Generator_RowClassName="v_selEventiBCodeRow" msprop:Generator_UserTableName="v_selEventiBCode" msprop:Generator_RowEvArgName="v_selEventiBCodeRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="value" msprop:Generator_ColumnVarNameInTable="columnvalue" msprop:Generator_ColumnPropNameInRow="value" msprop:Generator_ColumnPropNameInTable="valueColumn" msprop:Generator_UserColumnName="value" type="xs:int" />
@@ -492,7 +495,7 @@ ORDER BY label</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="v_selMacchine" msprop:Generator_TableClassName="v_selMacchineDataTable" msprop:Generator_TableVarName="tablev_selMacchine" msprop:Generator_TablePropName="v_selMacchine" msprop:Generator_RowDeletingName="v_selMacchineRowDeleting" msprop:Generator_RowChangingName="v_selMacchineRowChanging" msprop:Generator_RowEvHandlerName="v_selMacchineRowChangeEventHandler" msprop:Generator_RowDeletedName="v_selMacchineRowDeleted" msprop:Generator_UserTableName="v_selMacchine" msprop:Generator_RowChangedName="v_selMacchineRowChanged" msprop:Generator_RowEvArgName="v_selMacchineRowChangeEvent" msprop:Generator_RowClassName="v_selMacchineRow">
+        <xs:element name="v_selMacchine" msprop:Generator_TableClassName="v_selMacchineDataTable" msprop:Generator_TableVarName="tablev_selMacchine" msprop:Generator_RowChangedName="v_selMacchineRowChanged" msprop:Generator_TablePropName="v_selMacchine" msprop:Generator_RowDeletingName="v_selMacchineRowDeleting" msprop:Generator_RowChangingName="v_selMacchineRowChanging" msprop:Generator_RowEvHandlerName="v_selMacchineRowChangeEventHandler" msprop:Generator_RowDeletedName="v_selMacchineRowDeleted" msprop:Generator_RowClassName="v_selMacchineRow" msprop:Generator_UserTableName="v_selMacchine" msprop:Generator_RowEvArgName="v_selMacchineRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="value" msprop:Generator_ColumnVarNameInTable="columnvalue" msprop:Generator_ColumnPropNameInRow="value" msprop:Generator_ColumnPropNameInTable="valueColumn" msprop:Generator_UserColumnName="value">
@@ -512,7 +515,7 @@ ORDER BY label</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="stp_statusCorrente" msprop:Generator_TableClassName="stp_statusCorrenteDataTable" msprop:Generator_TableVarName="tablestp_statusCorrente" msprop:Generator_TablePropName="stp_statusCorrente" msprop:Generator_RowDeletingName="stp_statusCorrenteRowDeleting" msprop:Generator_RowChangingName="stp_statusCorrenteRowChanging" msprop:Generator_RowEvHandlerName="stp_statusCorrenteRowChangeEventHandler" msprop:Generator_RowDeletedName="stp_statusCorrenteRowDeleted" msprop:Generator_UserTableName="stp_statusCorrente" msprop:Generator_RowChangedName="stp_statusCorrenteRowChanged" msprop:Generator_RowEvArgName="stp_statusCorrenteRowChangeEvent" msprop:Generator_RowClassName="stp_statusCorrenteRow">
+        <xs:element name="stp_statusCorrente" msprop:Generator_TableClassName="stp_statusCorrenteDataTable" msprop:Generator_TableVarName="tablestp_statusCorrente" msprop:Generator_RowChangedName="stp_statusCorrenteRowChanged" msprop:Generator_TablePropName="stp_statusCorrente" msprop:Generator_RowDeletingName="stp_statusCorrenteRowDeleting" msprop:Generator_RowChangingName="stp_statusCorrenteRowChanging" msprop:Generator_RowEvHandlerName="stp_statusCorrenteRowChangeEventHandler" msprop:Generator_RowDeletedName="stp_statusCorrenteRowDeleted" msprop:Generator_RowClassName="stp_statusCorrenteRow" msprop:Generator_UserTableName="stp_statusCorrente" msprop:Generator_RowEvArgName="stp_statusCorrenteRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="IdxMacchina" msprop:Generator_ColumnVarNameInTable="columnIdxMacchina" msprop:Generator_ColumnPropNameInRow="IdxMacchina" msprop:Generator_ColumnPropNameInTable="IdxMacchinaColumn" msprop:Generator_UserColumnName="IdxMacchina">
@@ -581,7 +584,7 @@ ORDER BY label</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Commenti" msprop:Generator_TableClassName="CommentiDataTable" msprop:Generator_TableVarName="tableCommenti" msprop:Generator_RowChangedName="CommentiRowChanged" msprop:Generator_TablePropName="Commenti" msprop:Generator_RowDeletingName="CommentiRowDeleting" msprop:Generator_RowChangingName="CommentiRowChanging" msprop:Generator_RowEvHandlerName="CommentiRowChangeEventHandler" msprop:Generator_RowDeletedName="CommentiRowDeleted" msprop:Generator_RowClassName="CommentiRow" msprop:Generator_UserTableName="Commenti" msprop:Generator_RowEvArgName="CommentiRowChangeEvent">
+        <xs:element name="Commenti" msprop:Generator_TableClassName="CommentiDataTable" msprop:Generator_TableVarName="tableCommenti" msprop:Generator_TablePropName="Commenti" msprop:Generator_RowDeletingName="CommentiRowDeleting" msprop:Generator_RowChangingName="CommentiRowChanging" msprop:Generator_RowEvHandlerName="CommentiRowChangeEventHandler" msprop:Generator_RowDeletedName="CommentiRowDeleted" msprop:Generator_UserTableName="Commenti" msprop:Generator_RowChangedName="CommentiRowChanged" msprop:Generator_RowEvArgName="CommentiRowChangeEvent" msprop:Generator_RowClassName="CommentiRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="idxODL" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_ColumnVarNameInTable="columnidxODL" msprop:Generator_ColumnPropNameInRow="idxODL" msprop:Generator_ColumnPropNameInTable="idxODLColumn" msprop:Generator_UserColumnName="idxODL" type="xs:int" />
@@ -617,7 +620,7 @@ ORDER BY label</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="FermiNonQual" msprop:Generator_TableClassName="FermiNonQualDataTable" msprop:Generator_TableVarName="tableFermiNonQual" msprop:Generator_RowChangedName="FermiNonQualRowChanged" msprop:Generator_TablePropName="FermiNonQual" msprop:Generator_RowDeletingName="FermiNonQualRowDeleting" msprop:Generator_RowChangingName="FermiNonQualRowChanging" msprop:Generator_RowEvHandlerName="FermiNonQualRowChangeEventHandler" msprop:Generator_RowDeletedName="FermiNonQualRowDeleted" msprop:Generator_RowClassName="FermiNonQualRow" msprop:Generator_UserTableName="FermiNonQual" msprop:Generator_RowEvArgName="FermiNonQualRowChangeEvent">
+        <xs:element name="FermiNonQual" msprop:Generator_TableClassName="FermiNonQualDataTable" msprop:Generator_TableVarName="tableFermiNonQual" msprop:Generator_TablePropName="FermiNonQual" msprop:Generator_RowDeletingName="FermiNonQualRowDeleting" msprop:Generator_RowChangingName="FermiNonQualRowChanging" msprop:Generator_RowEvHandlerName="FermiNonQualRowChangeEventHandler" msprop:Generator_RowDeletedName="FermiNonQualRowDeleted" msprop:Generator_UserTableName="FermiNonQual" msprop:Generator_RowChangedName="FermiNonQualRowChanged" msprop:Generator_RowEvArgName="FermiNonQualRowChangeEvent" msprop:Generator_RowClassName="FermiNonQualRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="IdxMacchina" msprop:Generator_ColumnVarNameInTable="columnIdxMacchina" msprop:Generator_ColumnPropNameInRow="IdxMacchina" msprop:Generator_ColumnPropNameInTable="IdxMacchinaColumn" msprop:Generator_UserColumnName="IdxMacchina">
@@ -668,7 +671,7 @@ ORDER BY label</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="v_selTally" msprop:Generator_TableClassName="v_selTallyDataTable" msprop:Generator_TableVarName="tablev_selTally" msprop:Generator_TablePropName="v_selTally" msprop:Generator_RowDeletingName="v_selTallyRowDeleting" msprop:Generator_RowChangingName="v_selTallyRowChanging" msprop:Generator_RowEvHandlerName="v_selTallyRowChangeEventHandler" msprop:Generator_RowDeletedName="v_selTallyRowDeleted" msprop:Generator_UserTableName="v_selTally" msprop:Generator_RowChangedName="v_selTallyRowChanged" msprop:Generator_RowEvArgName="v_selTallyRowChangeEvent" msprop:Generator_RowClassName="v_selTallyRow">
+        <xs:element name="v_selTally" msprop:Generator_TableClassName="v_selTallyDataTable" msprop:Generator_TableVarName="tablev_selTally" msprop:Generator_RowChangedName="v_selTallyRowChanged" msprop:Generator_TablePropName="v_selTally" msprop:Generator_RowDeletingName="v_selTallyRowDeleting" msprop:Generator_RowChangingName="v_selTallyRowChanging" msprop:Generator_RowEvHandlerName="v_selTallyRowChangeEventHandler" msprop:Generator_RowDeletedName="v_selTallyRowDeleted" msprop:Generator_RowClassName="v_selTallyRow" msprop:Generator_UserTableName="v_selTally" msprop:Generator_RowEvArgName="v_selTallyRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="label" msprop:Generator_ColumnVarNameInTable="columnlabel" msprop:Generator_ColumnPropNameInRow="label" msprop:Generator_ColumnPropNameInTable="labelColumn" msprop:Generator_UserColumnName="label" type="xs:long" minOccurs="0" />
diff --git a/MapoDb/DS_Utility.xss b/MapoDb/DS_Utility.xss
index c21956e4..ab9924c5 100644
--- a/MapoDb/DS_Utility.xss
+++ b/MapoDb/DS_Utility.xss
@@ -11,11 +11,11 @@
     <Shape ID="DesignTable:v_selOperatori" ZOrder="8" X="443" Y="654" Height="115" Width="228" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
     <Shape ID="DesignTable:v_selODL" ZOrder="7" X="812" Y="635" Height="134" Width="197" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
     <Shape ID="DesignTable:v_selEventiBCode" ZOrder="6" X="181" Y="554" Height="115" Width="245" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:v_selMacchine" ZOrder="2" X="637" Y="787" Height="169" Width="227" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="97" />
+    <Shape ID="DesignTable:v_selMacchine" ZOrder="3" X="637" Y="787" Height="169" Width="227" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="97" />
     <Shape ID="DesignTable:stp_statusCorrente" ZOrder="5" X="265" Y="848" Height="305" Width="253" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:Commenti" ZOrder="3" X="591" Y="984" Height="229" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
+    <Shape ID="DesignTable:Commenti" ZOrder="1" X="591" Y="984" Height="314" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="188" />
     <Shape ID="DesignTable:FermiNonQual" ZOrder="4" X="978" Y="925" Height="248" Width="280" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
-    <Shape ID="DesignTable:v_selTally" ZOrder="1" X="751" Y="263" Height="153" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:v_selTally" ZOrder="2" X="751" Y="263" Height="153" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
   </Shapes>
   <Connectors />
 </DiagramLayout>
\ No newline at end of file