diff --git a/CMS-SC-Data/DS_Applicazione.Designer.cs b/CMS-SC-Data/DS_Applicazione.Designer.cs
index 3dd0e3b..f96ae56 100644
--- a/CMS-SC-Data/DS_Applicazione.Designer.cs
+++ b/CMS-SC-Data/DS_Applicazione.Designer.cs
@@ -7021,7 +7021,7 @@ SELECT CodScheda, Vers, CodMisura, NomeMisura, TipoValMisura, NomePar FROM DettS
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
         private void InitCommandCollection() {
-            this._commandCollection = new global::System.Data.SqlClient.SqlCommand[5];
+            this._commandCollection = new global::System.Data.SqlClient.SqlCommand[6];
             this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[0].Connection = this.Connection;
             this._commandCollection[0].CommandText = "SELECT CodScheda, Vers, CodMisura, NomeMisura, TipoValMisura, NomePar FROM DettSc" +
@@ -7050,16 +7050,25 @@ SELECT CodScheda, Vers, CodMisura, NomeMisura, TipoValMisura, NomePar FROM DettS
             this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NomeMisura", 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_DS_updateQuery";
+            this._commandCollection[4].CommandText = "dbo.stp_DS_moveUpDown";
             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("@MovType", 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("@CodScheda", 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("@Vers", 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("@CodMisura", 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("@NomeMisura", 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("@TipoValMisura", 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("@NomePar", 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("@Original_CodScheda", 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("@Original_Vers", 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("@Original_CodMisura", global::System.Data.SqlDbType.NVarChar, 50, 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_DS_updateQuery";
+            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("@CodMisura", 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("@NomeMisura", 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("@TipoValMisura", 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("@NomePar", 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("@Original_CodScheda", 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("@Original_Vers", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodMisura", 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()]
@@ -7402,12 +7411,58 @@ SELECT CodScheda, Vers, CodMisura, NomeMisura, TipoValMisura, NomePar FROM DettS
             return returnValue;
         }
         
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+        public virtual int moveUpDown(string MovType, string CodScheda, global::System.Nullable<int> Vers, string CodMisura) {
+            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[4];
+            if ((MovType == null)) {
+                command.Parameters[1].Value = global::System.DBNull.Value;
+            }
+            else {
+                command.Parameters[1].Value = ((string)(MovType));
+            }
+            if ((CodScheda == null)) {
+                command.Parameters[2].Value = global::System.DBNull.Value;
+            }
+            else {
+                command.Parameters[2].Value = ((string)(CodScheda));
+            }
+            if ((Vers.HasValue == true)) {
+                command.Parameters[3].Value = ((int)(Vers.Value));
+            }
+            else {
+                command.Parameters[3].Value = global::System.DBNull.Value;
+            }
+            if ((CodMisura == null)) {
+                command.Parameters[4].Value = global::System.DBNull.Value;
+            }
+            else {
+                command.Parameters[4].Value = ((string)(CodMisura));
+            }
+            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();
+            }
+            int returnValue;
+            try {
+                returnValue = command.ExecuteNonQuery();
+            }
+            finally {
+                if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) {
+                    command.Connection.Close();
+                }
+            }
+            return returnValue;
+        }
+        
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, false)]
         public virtual int updateQuery(string CodMisura, string NomeMisura, string TipoValMisura, string NomePar, string Original_CodScheda, global::System.Nullable<int> Original_Vers, string Original_CodMisura) {
-            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[4];
+            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[5];
             if ((CodMisura == null)) {
                 command.Parameters[1].Value = global::System.DBNull.Value;
             }
diff --git a/CMS-SC-Data/DS_Applicazione.xsd b/CMS-SC-Data/DS_Applicazione.xsd
index e43edc3..9892805 100644
--- a/CMS-SC-Data/DS_Applicazione.xsd
+++ b/CMS-SC-Data/DS_Applicazione.xsd
@@ -468,7 +468,7 @@ SELECT CodScheda, Vers, CodMisura, NomeMisura, TipoValMisura, NomePar FROM DettS
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
-              <DbSource ConnectionRef="CMS_SCConnectionString (Settings)" DbObjectName="[CMS-SC].dbo.stp_DS_insertNew" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="insertNew" Modifier="Public" Name="insertNew" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy2" UserSourceName="insertNew">
+              <DbSource ConnectionRef="CMS_SCConnectionString (Settings)" DbObjectName="[CMS-SC].dbo.stp_DS_insertNew" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="insertNew" Modifier="Public" Name="insertNew" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy1" UserSourceName="insertNew">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.stp_DS_insertNew</CommandText>
@@ -480,7 +480,21 @@ SELECT CodScheda, Vers, CodMisura, NomeMisura, TipoValMisura, NomePar FROM DettS
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
-              <DbSource ConnectionRef="CMS_SCConnectionString (Settings)" DbObjectName="" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="updateQuery" Modifier="Public" Name="updateQuery" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy1" UserSourceName="updateQuery">
+              <DbSource ConnectionRef="CMS_SCConnectionString (Settings)" DbObjectName="[CMS-SC].dbo.stp_DS_moveUpDown" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="moveUpDown" Modifier="Public" Name="moveUpDown" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy3" UserSourceName="moveUpDown">
+                <SelectCommand>
+                  <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
+                    <CommandText>dbo.stp_DS_moveUpDown</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="@MovType" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@CodScheda" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Vers" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@CodMisura" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
+              <DbSource ConnectionRef="CMS_SCConnectionString (Settings)" DbObjectName="" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="updateQuery" Modifier="Public" Name="updateQuery" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy2" UserSourceName="updateQuery">
                 <UpdateCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.stp_DS_updateQuery</CommandText>
@@ -853,7 +867,7 @@ SELECT CodScheda, Vers, CodMisura, MinPar, MaxPar, LIVal, LSVal FROM ValidVal WH
   <xs:element name="DS_Applicazione" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="DS_Applicazione" msprop:Generator_UserDSName="DS_Applicazione">
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="ElencoFamMacc" msprop:Generator_TableClassName="ElencoFamMaccDataTable" msprop:Generator_TableVarName="tableElencoFamMacc" msprop:Generator_TablePropName="ElencoFamMacc" msprop:Generator_RowDeletingName="ElencoFamMaccRowDeleting" msprop:Generator_RowChangingName="ElencoFamMaccRowChanging" msprop:Generator_RowEvHandlerName="ElencoFamMaccRowChangeEventHandler" msprop:Generator_RowDeletedName="ElencoFamMaccRowDeleted" msprop:Generator_UserTableName="ElencoFamMacc" msprop:Generator_RowChangedName="ElencoFamMaccRowChanged" msprop:Generator_RowEvArgName="ElencoFamMaccRowChangeEvent" msprop:Generator_RowClassName="ElencoFamMaccRow">
+        <xs:element name="ElencoFamMacc" msprop:Generator_TableClassName="ElencoFamMaccDataTable" msprop:Generator_TableVarName="tableElencoFamMacc" msprop:Generator_RowChangedName="ElencoFamMaccRowChanged" msprop:Generator_TablePropName="ElencoFamMacc" msprop:Generator_RowDeletingName="ElencoFamMaccRowDeleting" msprop:Generator_RowChangingName="ElencoFamMaccRowChanging" msprop:Generator_RowEvHandlerName="ElencoFamMaccRowChangeEventHandler" msprop:Generator_RowDeletedName="ElencoFamMaccRowDeleted" msprop:Generator_RowClassName="ElencoFamMaccRow" msprop:Generator_UserTableName="ElencoFamMacc" msprop:Generator_RowEvArgName="ElencoFamMaccRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="CodFam" msprop:Generator_ColumnVarNameInTable="columnCodFam" msprop:Generator_ColumnPropNameInRow="CodFam" msprop:Generator_ColumnPropNameInTable="CodFamColumn" msprop:Generator_UserColumnName="CodFam">
@@ -873,7 +887,7 @@ SELECT CodScheda, Vers, CodMisura, MinPar, MaxPar, LIVal, LSVal FROM ValidVal WH
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="ElencoMacchineCN" msprop:Generator_TableClassName="ElencoMacchineCNDataTable" msprop:Generator_TableVarName="tableElencoMacchineCN" msprop:Generator_TablePropName="ElencoMacchineCN" msprop:Generator_RowDeletingName="ElencoMacchineCNRowDeleting" msprop:Generator_RowChangingName="ElencoMacchineCNRowChanging" msprop:Generator_RowEvHandlerName="ElencoMacchineCNRowChangeEventHandler" msprop:Generator_RowDeletedName="ElencoMacchineCNRowDeleted" msprop:Generator_UserTableName="ElencoMacchineCN" msprop:Generator_RowChangedName="ElencoMacchineCNRowChanged" msprop:Generator_RowEvArgName="ElencoMacchineCNRowChangeEvent" msprop:Generator_RowClassName="ElencoMacchineCNRow">
+        <xs:element name="ElencoMacchineCN" msprop:Generator_TableClassName="ElencoMacchineCNDataTable" msprop:Generator_TableVarName="tableElencoMacchineCN" msprop:Generator_RowChangedName="ElencoMacchineCNRowChanged" msprop:Generator_TablePropName="ElencoMacchineCN" msprop:Generator_RowDeletingName="ElencoMacchineCNRowDeleting" msprop:Generator_RowChangingName="ElencoMacchineCNRowChanging" msprop:Generator_RowEvHandlerName="ElencoMacchineCNRowChangeEventHandler" msprop:Generator_RowDeletedName="ElencoMacchineCNRowDeleted" msprop:Generator_RowClassName="ElencoMacchineCNRow" msprop:Generator_UserTableName="ElencoMacchineCN" msprop:Generator_RowEvArgName="ElencoMacchineCNRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="Matricola" msprop:Generator_ColumnVarNameInTable="columnMatricola" msprop:Generator_ColumnPropNameInRow="Matricola" msprop:Generator_ColumnPropNameInTable="MatricolaColumn" msprop:Generator_UserColumnName="Matricola">
@@ -907,7 +921,7 @@ SELECT CodScheda, Vers, CodMisura, MinPar, MaxPar, LIVal, LSVal FROM ValidVal WH
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="AnagFasi" msprop:Generator_TableClassName="AnagFasiDataTable" msprop:Generator_TableVarName="tableAnagFasi" msprop:Generator_TablePropName="AnagFasi" msprop:Generator_RowDeletingName="AnagFasiRowDeleting" msprop:Generator_RowChangingName="AnagFasiRowChanging" msprop:Generator_RowEvHandlerName="AnagFasiRowChangeEventHandler" msprop:Generator_RowDeletedName="AnagFasiRowDeleted" msprop:Generator_UserTableName="AnagFasi" msprop:Generator_RowChangedName="AnagFasiRowChanged" msprop:Generator_RowEvArgName="AnagFasiRowChangeEvent" msprop:Generator_RowClassName="AnagFasiRow">
+        <xs:element name="AnagFasi" msprop:Generator_TableClassName="AnagFasiDataTable" msprop:Generator_TableVarName="tableAnagFasi" msprop:Generator_RowChangedName="AnagFasiRowChanged" msprop:Generator_TablePropName="AnagFasi" msprop:Generator_RowDeletingName="AnagFasiRowDeleting" msprop:Generator_RowChangingName="AnagFasiRowChanging" msprop:Generator_RowEvHandlerName="AnagFasiRowChangeEventHandler" msprop:Generator_RowDeletedName="AnagFasiRowDeleted" msprop:Generator_RowClassName="AnagFasiRow" msprop:Generator_UserTableName="AnagFasi" msprop:Generator_RowEvArgName="AnagFasiRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="Fase" msprop:Generator_ColumnVarNameInTable="columnFase" msprop:Generator_ColumnPropNameInRow="Fase" msprop:Generator_ColumnPropNameInTable="FaseColumn" msprop:Generator_UserColumnName="Fase">
@@ -927,7 +941,7 @@ SELECT CodScheda, Vers, CodMisura, MinPar, MaxPar, LIVal, LSVal FROM ValidVal WH
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="AnagSchede" msprop:Generator_TableClassName="AnagSchedeDataTable" msprop:Generator_TableVarName="tableAnagSchede" msprop:Generator_RowChangedName="AnagSchedeRowChanged" msprop:Generator_TablePropName="AnagSchede" msprop:Generator_RowDeletingName="AnagSchedeRowDeleting" msprop:Generator_RowChangingName="AnagSchedeRowChanging" msprop:Generator_RowEvHandlerName="AnagSchedeRowChangeEventHandler" msprop:Generator_RowDeletedName="AnagSchedeRowDeleted" msprop:Generator_RowClassName="AnagSchedeRow" msprop:Generator_UserTableName="AnagSchede" msprop:Generator_RowEvArgName="AnagSchedeRowChangeEvent">
+        <xs:element name="AnagSchede" msprop:Generator_TableClassName="AnagSchedeDataTable" msprop:Generator_TableVarName="tableAnagSchede" msprop:Generator_TablePropName="AnagSchede" msprop:Generator_RowDeletingName="AnagSchedeRowDeleting" msprop:Generator_RowChangingName="AnagSchedeRowChanging" msprop:Generator_RowEvHandlerName="AnagSchedeRowChangeEventHandler" msprop:Generator_RowDeletedName="AnagSchedeRowDeleted" msprop:Generator_UserTableName="AnagSchede" msprop:Generator_RowChangedName="AnagSchedeRowChanged" msprop:Generator_RowEvArgName="AnagSchedeRowChangeEvent" msprop:Generator_RowClassName="AnagSchedeRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="CodScheda" msprop:Generator_ColumnVarNameInTable="columnCodScheda" msprop:Generator_ColumnPropNameInRow="CodScheda" msprop:Generator_ColumnPropNameInTable="CodSchedaColumn" msprop:Generator_UserColumnName="CodScheda">
@@ -955,7 +969,7 @@ SELECT CodScheda, Vers, CodMisura, MinPar, MaxPar, LIVal, LSVal FROM ValidVal WH
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="DettScheda" msprop:Generator_TableClassName="DettSchedaDataTable" msprop:Generator_TableVarName="tableDettScheda" msprop:Generator_TablePropName="DettScheda" msprop:Generator_RowDeletingName="DettSchedaRowDeleting" msprop:Generator_RowChangingName="DettSchedaRowChanging" msprop:Generator_RowEvHandlerName="DettSchedaRowChangeEventHandler" msprop:Generator_RowDeletedName="DettSchedaRowDeleted" msprop:Generator_UserTableName="DettScheda" msprop:Generator_RowChangedName="DettSchedaRowChanged" msprop:Generator_RowEvArgName="DettSchedaRowChangeEvent" msprop:Generator_RowClassName="DettSchedaRow">
+        <xs:element name="DettScheda" msprop:Generator_TableClassName="DettSchedaDataTable" msprop:Generator_TableVarName="tableDettScheda" msprop:Generator_RowChangedName="DettSchedaRowChanged" msprop:Generator_TablePropName="DettScheda" msprop:Generator_RowDeletingName="DettSchedaRowDeleting" msprop:Generator_RowChangingName="DettSchedaRowChanging" msprop:Generator_RowEvHandlerName="DettSchedaRowChangeEventHandler" msprop:Generator_RowDeletedName="DettSchedaRowDeleted" msprop:Generator_RowClassName="DettSchedaRow" msprop:Generator_UserTableName="DettScheda" msprop:Generator_RowEvArgName="DettSchedaRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="CodScheda" msprop:Generator_ColumnVarNameInTable="columnCodScheda" msprop:Generator_ColumnPropNameInRow="CodScheda" msprop:Generator_ColumnPropNameInTable="CodSchedaColumn" msprop:Generator_UserColumnName="CodScheda">
@@ -997,7 +1011,7 @@ SELECT CodScheda, Vers, CodMisura, MinPar, MaxPar, LIVal, LSVal FROM ValidVal WH
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="SchemaCollFamMacc" msprop:Generator_TableClassName="SchemaCollFamMaccDataTable" msprop:Generator_TableVarName="tableSchemaCollFamMacc" msprop:Generator_TablePropName="SchemaCollFamMacc" msprop:Generator_RowDeletingName="SchemaCollFamMaccRowDeleting" msprop:Generator_RowChangingName="SchemaCollFamMaccRowChanging" msprop:Generator_RowEvHandlerName="SchemaCollFamMaccRowChangeEventHandler" msprop:Generator_RowDeletedName="SchemaCollFamMaccRowDeleted" msprop:Generator_UserTableName="SchemaCollFamMacc" msprop:Generator_RowChangedName="SchemaCollFamMaccRowChanged" msprop:Generator_RowEvArgName="SchemaCollFamMaccRowChangeEvent" msprop:Generator_RowClassName="SchemaCollFamMaccRow">
+        <xs:element name="SchemaCollFamMacc" msprop:Generator_TableClassName="SchemaCollFamMaccDataTable" msprop:Generator_TableVarName="tableSchemaCollFamMacc" msprop:Generator_RowChangedName="SchemaCollFamMaccRowChanged" msprop:Generator_TablePropName="SchemaCollFamMacc" msprop:Generator_RowDeletingName="SchemaCollFamMaccRowDeleting" msprop:Generator_RowChangingName="SchemaCollFamMaccRowChanging" msprop:Generator_RowEvHandlerName="SchemaCollFamMaccRowChangeEventHandler" msprop:Generator_RowDeletedName="SchemaCollFamMaccRowDeleted" msprop:Generator_RowClassName="SchemaCollFamMaccRow" msprop:Generator_UserTableName="SchemaCollFamMacc" msprop:Generator_RowEvArgName="SchemaCollFamMaccRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="CodFam" msprop:Generator_ColumnVarNameInTable="columnCodFam" msprop:Generator_ColumnPropNameInRow="CodFam" msprop:Generator_ColumnPropNameInTable="CodFamColumn" msprop:Generator_UserColumnName="CodFam">
@@ -1026,7 +1040,7 @@ SELECT CodScheda, Vers, CodMisura, MinPar, MaxPar, LIVal, LSVal FROM ValidVal WH
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="SchemaCollMacc" msprop:Generator_TableClassName="SchemaCollMaccDataTable" msprop:Generator_TableVarName="tableSchemaCollMacc" msprop:Generator_TablePropName="SchemaCollMacc" msprop:Generator_RowDeletingName="SchemaCollMaccRowDeleting" msprop:Generator_RowChangingName="SchemaCollMaccRowChanging" msprop:Generator_RowEvHandlerName="SchemaCollMaccRowChangeEventHandler" msprop:Generator_RowDeletedName="SchemaCollMaccRowDeleted" msprop:Generator_UserTableName="SchemaCollMacc" msprop:Generator_RowChangedName="SchemaCollMaccRowChanged" msprop:Generator_RowEvArgName="SchemaCollMaccRowChangeEvent" msprop:Generator_RowClassName="SchemaCollMaccRow">
+        <xs:element name="SchemaCollMacc" msprop:Generator_TableClassName="SchemaCollMaccDataTable" msprop:Generator_TableVarName="tableSchemaCollMacc" msprop:Generator_RowChangedName="SchemaCollMaccRowChanged" msprop:Generator_TablePropName="SchemaCollMacc" msprop:Generator_RowDeletingName="SchemaCollMaccRowDeleting" msprop:Generator_RowChangingName="SchemaCollMaccRowChanging" msprop:Generator_RowEvHandlerName="SchemaCollMaccRowChangeEventHandler" msprop:Generator_RowDeletedName="SchemaCollMaccRowDeleted" msprop:Generator_RowClassName="SchemaCollMaccRow" msprop:Generator_UserTableName="SchemaCollMacc" msprop:Generator_RowEvArgName="SchemaCollMaccRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="Matricola" msprop:Generator_ColumnVarNameInTable="columnMatricola" msprop:Generator_ColumnPropNameInRow="Matricola" msprop:Generator_ColumnPropNameInTable="MatricolaColumn" msprop:Generator_UserColumnName="Matricola">
@@ -1055,7 +1069,7 @@ SELECT CodScheda, Vers, CodMisura, MinPar, MaxPar, LIVal, LSVal FROM ValidVal WH
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Misure" msprop:Generator_TableClassName="MisureDataTable" msprop:Generator_TableVarName="tableMisure" msprop:Generator_TablePropName="Misure" msprop:Generator_RowDeletingName="MisureRowDeleting" msprop:Generator_RowChangingName="MisureRowChanging" msprop:Generator_RowEvHandlerName="MisureRowChangeEventHandler" msprop:Generator_RowDeletedName="MisureRowDeleted" msprop:Generator_UserTableName="Misure" msprop:Generator_RowChangedName="MisureRowChanged" msprop:Generator_RowEvArgName="MisureRowChangeEvent" msprop:Generator_RowClassName="MisureRow">
+        <xs:element name="Misure" msprop:Generator_TableClassName="MisureDataTable" msprop:Generator_TableVarName="tableMisure" msprop:Generator_RowChangedName="MisureRowChanged" msprop:Generator_TablePropName="Misure" msprop:Generator_RowDeletingName="MisureRowDeleting" msprop:Generator_RowChangingName="MisureRowChanging" msprop:Generator_RowEvHandlerName="MisureRowChangeEventHandler" msprop:Generator_RowDeletedName="MisureRowDeleted" msprop:Generator_RowClassName="MisureRow" msprop:Generator_UserTableName="Misure" msprop:Generator_RowEvArgName="MisureRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="Matricola" msprop:Generator_ColumnVarNameInTable="columnMatricola" msprop:Generator_ColumnPropNameInRow="Matricola" msprop:Generator_ColumnPropNameInTable="MatricolaColumn" msprop:Generator_UserColumnName="Matricola">
@@ -1115,7 +1129,7 @@ SELECT CodScheda, Vers, CodMisura, MinPar, MaxPar, LIVal, LSVal FROM ValidVal WH
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="ValidVal" msprop:Generator_TableClassName="ValidValDataTable" msprop:Generator_TableVarName="tableValidVal" msprop:Generator_TablePropName="ValidVal" msprop:Generator_RowDeletingName="ValidValRowDeleting" msprop:Generator_RowChangingName="ValidValRowChanging" msprop:Generator_RowEvHandlerName="ValidValRowChangeEventHandler" msprop:Generator_RowDeletedName="ValidValRowDeleted" msprop:Generator_UserTableName="ValidVal" msprop:Generator_RowChangedName="ValidValRowChanged" msprop:Generator_RowEvArgName="ValidValRowChangeEvent" msprop:Generator_RowClassName="ValidValRow">
+        <xs:element name="ValidVal" msprop:Generator_TableClassName="ValidValDataTable" msprop:Generator_TableVarName="tableValidVal" msprop:Generator_RowChangedName="ValidValRowChanged" msprop:Generator_TablePropName="ValidVal" msprop:Generator_RowDeletingName="ValidValRowDeleting" msprop:Generator_RowChangingName="ValidValRowChanging" msprop:Generator_RowEvHandlerName="ValidValRowChangeEventHandler" msprop:Generator_RowDeletedName="ValidValRowDeleted" msprop:Generator_RowClassName="ValidValRow" msprop:Generator_UserTableName="ValidVal" msprop:Generator_RowEvArgName="ValidValRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="CodScheda" msprop:Generator_ColumnVarNameInTable="columnCodScheda" msprop:Generator_ColumnPropNameInRow="CodScheda" msprop:Generator_ColumnPropNameInTable="CodSchedaColumn" msprop:Generator_UserColumnName="CodScheda">
@@ -1204,15 +1218,15 @@ SELECT CodScheda, Vers, CodMisura, MinPar, MaxPar, LIVal, LSVal FROM ValidVal WH
   </xs:element>
   <xs:annotation>
     <xs:appinfo>
-      <msdata:Relationship name="FK_DettScheda_AnagSchede1" msdata:parent="AnagSchede" msdata:child="DettScheda" msdata:parentkey="CodScheda Vers" msdata:childkey="CodScheda Vers" msprop:Generator_UserChildTable="DettScheda" msprop:Generator_ChildPropName="GetDettSchedaRows" msprop:Generator_UserRelationName="FK_DettScheda_AnagSchede1" msprop:Generator_ParentPropName="AnagSchedeRowParent" msprop:Generator_RelationVarName="relationFK_DettScheda_AnagSchede1" msprop:Generator_UserParentTable="AnagSchede" />
-      <msdata:Relationship name="FK_SchemaCollFamMacc_AnagSchede1" msdata:parent="AnagSchede" msdata:child="SchemaCollFamMacc" msdata:parentkey="CodScheda Vers" msdata:childkey="CodScheda Vers" msprop:Generator_UserChildTable="SchemaCollFamMacc" msprop:Generator_ChildPropName="GetSchemaCollFamMaccRows" msprop:Generator_UserRelationName="FK_SchemaCollFamMacc_AnagSchede1" msprop:Generator_ParentPropName="AnagSchedeRowParent" msprop:Generator_RelationVarName="relationFK_SchemaCollFamMacc_AnagSchede1" msprop:Generator_UserParentTable="AnagSchede" />
-      <msdata:Relationship name="FK_SchemaCollFamMacc_ElencoFamMacc" msdata:parent="ElencoFamMacc" msdata:child="SchemaCollFamMacc" msdata:parentkey="CodFam" msdata:childkey="CodFam" msprop:Generator_UserChildTable="SchemaCollFamMacc" msprop:Generator_ChildPropName="GetSchemaCollFamMaccRows" msprop:Generator_UserRelationName="FK_SchemaCollFamMacc_ElencoFamMacc" msprop:Generator_ParentPropName="ElencoFamMaccRow" msprop:Generator_RelationVarName="relationFK_SchemaCollFamMacc_ElencoFamMacc" msprop:Generator_UserParentTable="ElencoFamMacc" />
-      <msdata:Relationship name="FK_ElencoMacchineCN_ElencoFamMacc" msdata:parent="ElencoFamMacc" msdata:child="ElencoMacchineCN" msdata:parentkey="CodFam" msdata:childkey="CodFam" msprop:Generator_UserChildTable="ElencoMacchineCN" msprop:Generator_ChildPropName="GetElencoMacchineCNRows" msprop:Generator_UserRelationName="FK_ElencoMacchineCN_ElencoFamMacc" msprop:Generator_ParentPropName="ElencoFamMaccRow" msprop:Generator_RelationVarName="relationFK_ElencoMacchineCN_ElencoFamMacc" msprop:Generator_UserParentTable="ElencoFamMacc" />
-      <msdata:Relationship name="FK_ElencoSchedeMacchina_ElencoMacchineCN" msdata:parent="ElencoMacchineCN" msdata:child="SchemaCollMacc" msdata:parentkey="Matricola" msdata:childkey="Matricola" msprop:Generator_UserChildTable="SchemaCollMacc" msprop:Generator_ChildPropName="GetSchemaCollMaccRows" msprop:Generator_UserRelationName="FK_ElencoSchedeMacchina_ElencoMacchineCN" msprop:Generator_ParentPropName="ElencoMacchineCNRow" msprop:Generator_RelationVarName="relationFK_ElencoSchedeMacchina_ElencoMacchineCN" msprop:Generator_UserParentTable="ElencoMacchineCN" />
-      <msdata:Relationship name="FK_SchemaCollMacc_AnagSchede" msdata:parent="AnagSchede" msdata:child="SchemaCollMacc" msdata:parentkey="CodScheda Vers" msdata:childkey="CodScheda Vers" msprop:Generator_UserChildTable="SchemaCollMacc" msprop:Generator_ChildPropName="GetSchemaCollMaccRows" msprop:Generator_UserRelationName="FK_SchemaCollMacc_AnagSchede" msprop:Generator_ParentPropName="AnagSchedeRowParent" msprop:Generator_RelationVarName="relationFK_SchemaCollMacc_AnagSchede" msprop:Generator_UserParentTable="AnagSchede" />
-      <msdata:Relationship name="FK_IstanzeMisura_AnagFasi" msdata:parent="AnagFasi" msdata:child="Misure" msdata:parentkey="Fase" msdata:childkey="Fase" msprop:Generator_UserChildTable="Misure" msprop:Generator_ChildPropName="GetMisureRows" msprop:Generator_UserRelationName="FK_IstanzeMisura_AnagFasi" msprop:Generator_ParentPropName="AnagFasiRow" msprop:Generator_RelationVarName="relationFK_IstanzeMisura_AnagFasi" msprop:Generator_UserParentTable="AnagFasi" />
-      <msdata:Relationship name="FK_Misure_SchemaCollMacc1" msdata:parent="SchemaCollMacc" msdata:child="Misure" msdata:parentkey="Matricola CodScheda Vers NumScheda" msdata:childkey="Matricola CodScheda Vers NumScheda" msprop:Generator_UserChildTable="Misure" msprop:Generator_ChildPropName="GetMisureRows" msprop:Generator_UserRelationName="FK_Misure_SchemaCollMacc1" msprop:Generator_ParentPropName="SchemaCollMaccRowParent" msprop:Generator_RelationVarName="relationFK_Misure_SchemaCollMacc1" msprop:Generator_UserParentTable="SchemaCollMacc" />
-      <msdata:Relationship name="FK_ValidVal_DettScheda" msdata:parent="DettScheda" msdata:child="ValidVal" msdata:parentkey="CodScheda Vers CodMisura" msdata:childkey="CodScheda Vers CodMisura" msprop:Generator_UserChildTable="ValidVal" msprop:Generator_ChildPropName="GetValidValRows" msprop:Generator_UserRelationName="FK_ValidVal_DettScheda" msprop:Generator_ParentPropName="DettSchedaRowParent" msprop:Generator_RelationVarName="relationFK_ValidVal_DettScheda" msprop:Generator_UserParentTable="DettScheda" />
+      <msdata:Relationship name="FK_DettScheda_AnagSchede1" msdata:parent="AnagSchede" msdata:child="DettScheda" msdata:parentkey="CodScheda Vers" msdata:childkey="CodScheda Vers" msprop:Generator_UserChildTable="DettScheda" msprop:Generator_ChildPropName="GetDettSchedaRows" msprop:Generator_UserRelationName="FK_DettScheda_AnagSchede1" msprop:Generator_RelationVarName="relationFK_DettScheda_AnagSchede1" msprop:Generator_UserParentTable="AnagSchede" msprop:Generator_ParentPropName="AnagSchedeRowParent" />
+      <msdata:Relationship name="FK_SchemaCollFamMacc_AnagSchede1" msdata:parent="AnagSchede" msdata:child="SchemaCollFamMacc" msdata:parentkey="CodScheda Vers" msdata:childkey="CodScheda Vers" msprop:Generator_UserChildTable="SchemaCollFamMacc" msprop:Generator_ChildPropName="GetSchemaCollFamMaccRows" msprop:Generator_UserRelationName="FK_SchemaCollFamMacc_AnagSchede1" msprop:Generator_RelationVarName="relationFK_SchemaCollFamMacc_AnagSchede1" msprop:Generator_UserParentTable="AnagSchede" msprop:Generator_ParentPropName="AnagSchedeRowParent" />
+      <msdata:Relationship name="FK_SchemaCollFamMacc_ElencoFamMacc" msdata:parent="ElencoFamMacc" msdata:child="SchemaCollFamMacc" msdata:parentkey="CodFam" msdata:childkey="CodFam" msprop:Generator_UserChildTable="SchemaCollFamMacc" msprop:Generator_ChildPropName="GetSchemaCollFamMaccRows" msprop:Generator_UserRelationName="FK_SchemaCollFamMacc_ElencoFamMacc" msprop:Generator_RelationVarName="relationFK_SchemaCollFamMacc_ElencoFamMacc" msprop:Generator_UserParentTable="ElencoFamMacc" msprop:Generator_ParentPropName="ElencoFamMaccRow" />
+      <msdata:Relationship name="FK_ElencoMacchineCN_ElencoFamMacc" msdata:parent="ElencoFamMacc" msdata:child="ElencoMacchineCN" msdata:parentkey="CodFam" msdata:childkey="CodFam" msprop:Generator_UserChildTable="ElencoMacchineCN" msprop:Generator_ChildPropName="GetElencoMacchineCNRows" msprop:Generator_UserRelationName="FK_ElencoMacchineCN_ElencoFamMacc" msprop:Generator_RelationVarName="relationFK_ElencoMacchineCN_ElencoFamMacc" msprop:Generator_UserParentTable="ElencoFamMacc" msprop:Generator_ParentPropName="ElencoFamMaccRow" />
+      <msdata:Relationship name="FK_ElencoSchedeMacchina_ElencoMacchineCN" msdata:parent="ElencoMacchineCN" msdata:child="SchemaCollMacc" msdata:parentkey="Matricola" msdata:childkey="Matricola" msprop:Generator_UserChildTable="SchemaCollMacc" msprop:Generator_ChildPropName="GetSchemaCollMaccRows" msprop:Generator_UserRelationName="FK_ElencoSchedeMacchina_ElencoMacchineCN" msprop:Generator_RelationVarName="relationFK_ElencoSchedeMacchina_ElencoMacchineCN" msprop:Generator_UserParentTable="ElencoMacchineCN" msprop:Generator_ParentPropName="ElencoMacchineCNRow" />
+      <msdata:Relationship name="FK_SchemaCollMacc_AnagSchede" msdata:parent="AnagSchede" msdata:child="SchemaCollMacc" msdata:parentkey="CodScheda Vers" msdata:childkey="CodScheda Vers" msprop:Generator_UserChildTable="SchemaCollMacc" msprop:Generator_ChildPropName="GetSchemaCollMaccRows" msprop:Generator_UserRelationName="FK_SchemaCollMacc_AnagSchede" msprop:Generator_RelationVarName="relationFK_SchemaCollMacc_AnagSchede" msprop:Generator_UserParentTable="AnagSchede" msprop:Generator_ParentPropName="AnagSchedeRowParent" />
+      <msdata:Relationship name="FK_IstanzeMisura_AnagFasi" msdata:parent="AnagFasi" msdata:child="Misure" msdata:parentkey="Fase" msdata:childkey="Fase" msprop:Generator_UserChildTable="Misure" msprop:Generator_ChildPropName="GetMisureRows" msprop:Generator_UserRelationName="FK_IstanzeMisura_AnagFasi" msprop:Generator_RelationVarName="relationFK_IstanzeMisura_AnagFasi" msprop:Generator_UserParentTable="AnagFasi" msprop:Generator_ParentPropName="AnagFasiRow" />
+      <msdata:Relationship name="FK_Misure_SchemaCollMacc1" msdata:parent="SchemaCollMacc" msdata:child="Misure" msdata:parentkey="Matricola CodScheda Vers NumScheda" msdata:childkey="Matricola CodScheda Vers NumScheda" msprop:Generator_UserChildTable="Misure" msprop:Generator_ChildPropName="GetMisureRows" msprop:Generator_UserRelationName="FK_Misure_SchemaCollMacc1" msprop:Generator_RelationVarName="relationFK_Misure_SchemaCollMacc1" msprop:Generator_UserParentTable="SchemaCollMacc" msprop:Generator_ParentPropName="SchemaCollMaccRowParent" />
+      <msdata:Relationship name="FK_ValidVal_DettScheda" msdata:parent="DettScheda" msdata:child="ValidVal" msdata:parentkey="CodScheda Vers CodMisura" msdata:childkey="CodScheda Vers CodMisura" msprop:Generator_UserChildTable="ValidVal" msprop:Generator_ChildPropName="GetValidValRows" msprop:Generator_UserRelationName="FK_ValidVal_DettScheda" msprop:Generator_RelationVarName="relationFK_ValidVal_DettScheda" msprop:Generator_UserParentTable="DettScheda" msprop:Generator_ParentPropName="DettSchedaRowParent" />
     </xs:appinfo>
   </xs:annotation>
 </xs:schema>
\ No newline at end of file
diff --git a/CMS-SC-Data/DS_Applicazione.xss b/CMS-SC-Data/DS_Applicazione.xss
index b4139ff..7612bb8 100644
--- a/CMS-SC-Data/DS_Applicazione.xss
+++ b/CMS-SC-Data/DS_Applicazione.xss
@@ -4,12 +4,130 @@
      Changes to this file may cause incorrect behavior and will be lost if
      the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="0" ViewPortY="0" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-29" ViewPortY="-47" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
-    <Shape ID="DesignTable:ElencoFamMacc" ZOrder="4" X="57" Y="249" Height="172" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:ElencoMacchineCN" ZOrder="3" X="454" Y="232" Height="210" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
-    <Shape ID="DesignTable:AnagFasi" ZOrder="2" X="461" Y="537" Height="172" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:AnagSchede" ZOrder="1" X="936" Y="658" Height="210" Width="288" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:ElencoFamMacc" ZOrder="6" X="602" Y="-11" Height="172" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:ElencoMacchineCN" ZOrder="5" X="961" Y="-7" Height="210" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:AnagFasi" ZOrder="3" X="750" Y="593" Height="172" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:AnagSchede" ZOrder="18" X="273" Y="240" Height="210" Width="288" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:DettScheda" ZOrder="17" X="319" Y="515" Height="267" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
+    <Shape ID="DesignTable:SchemaCollFamMacc" ZOrder="16" X="357" Y="-9" Height="186" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="135" />
+    <Shape ID="DesignTable:SchemaCollMacc" ZOrder="1" X="1063" Y="238" Height="172" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
+    <Shape ID="DesignTable:Misure" ZOrder="4" X="1078" Y="491" Height="305" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:ValidVal" ZOrder="15" X="32" Y="512" Height="267" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
   </Shapes>
-  <Connectors />
+  <Connectors>
+    <Connector ID="DesignRelation:FK_DettScheda_AnagSchede1" ZOrder="14" LineWidth="11">
+      <RoutePoints>
+        <Point>
+          <X>398</X>
+          <Y>450</Y>
+        </Point>
+        <Point>
+          <X>398</X>
+          <Y>515</Y>
+        </Point>
+      </RoutePoints>
+    </Connector>
+    <Connector ID="DesignRelation:FK_SchemaCollFamMacc_AnagSchede1" ZOrder="13" LineWidth="11">
+      <RoutePoints>
+        <Point>
+          <X>436</X>
+          <Y>240</Y>
+        </Point>
+        <Point>
+          <X>436</X>
+          <Y>177</Y>
+        </Point>
+      </RoutePoints>
+    </Connector>
+    <Connector ID="DesignRelation:FK_SchemaCollFamMacc_ElencoFamMacc" ZOrder="12" LineWidth="11">
+      <RoutePoints>
+        <Point>
+          <X>602</X>
+          <Y>70</Y>
+        </Point>
+        <Point>
+          <X>515</X>
+          <Y>70</Y>
+        </Point>
+      </RoutePoints>
+    </Connector>
+    <Connector ID="DesignRelation:FK_ElencoMacchineCN_ElencoFamMacc" ZOrder="11" LineWidth="11">
+      <RoutePoints>
+        <Point>
+          <X>902</X>
+          <Y>78</Y>
+        </Point>
+        <Point>
+          <X>961</X>
+          <Y>78</Y>
+        </Point>
+      </RoutePoints>
+    </Connector>
+    <Connector ID="DesignRelation:FK_ElencoSchedeMacchina_ElencoMacchineCN" ZOrder="10" LineWidth="11">
+      <RoutePoints>
+        <Point>
+          <X>1247</X>
+          <Y>203</Y>
+        </Point>
+        <Point>
+          <X>1247</X>
+          <Y>322</Y>
+        </Point>
+        <Point>
+          <X>1221</X>
+          <Y>322</Y>
+        </Point>
+      </RoutePoints>
+    </Connector>
+    <Connector ID="DesignRelation:FK_SchemaCollMacc_AnagSchede" ZOrder="9" LineWidth="11">
+      <RoutePoints>
+        <Point>
+          <X>561</X>
+          <Y>314</Y>
+        </Point>
+        <Point>
+          <X>1063</X>
+          <Y>314</Y>
+        </Point>
+      </RoutePoints>
+    </Connector>
+    <Connector ID="DesignRelation:FK_IstanzeMisura_AnagFasi" ZOrder="2" LineWidth="11">
+      <RoutePoints>
+        <Point>
+          <X>1050</X>
+          <Y>647</Y>
+        </Point>
+        <Point>
+          <X>1078</X>
+          <Y>647</Y>
+        </Point>
+      </RoutePoints>
+    </Connector>
+    <Connector ID="DesignRelation:FK_Misure_SchemaCollMacc1" ZOrder="8" LineWidth="11">
+      <RoutePoints>
+        <Point>
+          <X>1139</X>
+          <Y>410</Y>
+        </Point>
+        <Point>
+          <X>1139</X>
+          <Y>491</Y>
+        </Point>
+      </RoutePoints>
+    </Connector>
+    <Connector ID="DesignRelation:FK_ValidVal_DettScheda" ZOrder="7" LineWidth="11">
+      <RoutePoints>
+        <Point>
+          <X>319</X>
+          <Y>697</Y>
+        </Point>
+        <Point>
+          <X>190</X>
+          <Y>697</Y>
+        </Point>
+      </RoutePoints>
+    </Connector>
+  </Connectors>
 </DiagramLayout>
\ No newline at end of file
diff --git a/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll b/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll
index 84d6faa..f9c3b6b 100644
Binary files a/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll and b/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll differ
diff --git a/CMS-SC-Data/bin/Debug/SteamWare.dll b/CMS-SC-Data/bin/Debug/SteamWare.dll
index a94839b..2d90de5 100644
Binary files a/CMS-SC-Data/bin/Debug/SteamWare.dll and b/CMS-SC-Data/bin/Debug/SteamWare.dll differ
diff --git a/CMS-SC-Data/obj/Debug/CMS-SC-Data.dll b/CMS-SC-Data/obj/Debug/CMS-SC-Data.dll
index 84d6faa..f9c3b6b 100644
Binary files a/CMS-SC-Data/obj/Debug/CMS-SC-Data.dll and b/CMS-SC-Data/obj/Debug/CMS-SC-Data.dll differ
diff --git a/CMS-SC-Data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll b/CMS-SC-Data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll
index 5984dac..bd5f98c 100644
Binary files a/CMS-SC-Data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll and b/CMS-SC-Data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll differ
diff --git a/CMS_SC/WebUserControls/mod_DettScheda.ascx b/CMS_SC/WebUserControls/mod_DettScheda.ascx
index 9c50572..9849f6c 100644
--- a/CMS_SC/WebUserControls/mod_DettScheda.ascx
+++ b/CMS_SC/WebUserControls/mod_DettScheda.ascx
@@ -2,13 +2,13 @@
 <asp:GridView ID="grView" runat="server" AutoGenerateColumns="False" DataKeyNames="CodScheda,Vers,CodMisura" DataSourceID="ods" CssClass="table table-striped table-hover" AllowPaging="True" AllowSorting="True" OnSelectedIndexChanged="grView_SelectedIndexChanged">
     <PagerStyle CssClass="info" />
     <EmptyDataTemplate>
-        <asp:Button runat="server" ID="btnNewFromEmpty" Text='<%# traduci("btnAddNewFromEmpty") %>' OnClick="btnNewFromEmpty_Click"  />
+        <asp:Button runat="server" ID="btnNewFromEmpty" Text='<%# traduci("btnAddNewFromEmpty") %>' OnClick="btnNewFromEmpty_Click" />
     </EmptyDataTemplate>
     <Columns>
         <asp:TemplateField ShowHeader="False">
-                    <HeaderTemplate>
-                        <asp:LinkButton ID="lbtReset" runat="server" OnClick="btnReset_Click" CssClass="btn btn-default" Visible="true"><i class="fa fa-refresh"></i> <%: traduci("Reset") %></asp:LinkButton>
-                    </HeaderTemplate>
+            <HeaderTemplate>
+                <asp:LinkButton ID="lbtReset" runat="server" OnClick="btnReset_Click" CssClass="btn btn-default" Visible="true"><i class="fa fa-refresh"></i> <%: traduci("Reset") %></asp:LinkButton>
+            </HeaderTemplate>
             <EditItemTemplate>
                 <asp:LinkButton ID="lbUpdate" runat="server" CausesValidation="True" CommandName="Update" ToolTip="Update" CssClass="fa fa-check fa-2x" />
                 &nbsp;<asp:LinkButton ID="lbCancel" runat="server" CausesValidation="False" CommandName="Cancel" ToolTip="Cancel" CssClass="fa fa-undo fa-2x" />
@@ -19,9 +19,24 @@
                 <asp:LinkButton ID="lbEdit" runat="server" CausesValidation="False" CommandName="Edit" ToolTip="Edit" CssClass="fa fa-edit fa-2x" />
             </ItemTemplate>
         </asp:TemplateField>
-        <asp:BoundField DataField="CodScheda" HeaderText="CodScheda" ReadOnly="True" SortExpression="CodScheda" />
-        <asp:BoundField DataField="Vers" HeaderText="Vers" ReadOnly="True" SortExpression="Vers" />
+        <%--<asp:BoundField DataField="CodScheda" HeaderText="CodScheda" ReadOnly="True" SortExpression="CodScheda" />
+        <asp:BoundField DataField="Vers" HeaderText="Vers" ReadOnly="True" SortExpression="Vers" />--%>
         <asp:BoundField DataField="CodMisura" HeaderText="CodMisura" ReadOnly="false" SortExpression="CodMisura" />
+        <asp:TemplateField ShowHeader="False">
+            <HeaderTemplate>
+                <%# traduci("moveMis") %>
+            </HeaderTemplate>
+            <EditItemTemplate>
+            </EditItemTemplate>
+            <ItemTemplate>
+                <div class="col-xs-6">
+                    <asp:LinkButton ID="lbMoveUp" runat="server" CausesValidation="False" CommandName="Select" CommandArgument="moveUp" OnClick="lbUpDown_Click" ToolTip="Move Up" CssClass="fa fa-arrow-up fa-2x" Visible='<%# arrowVisible("UP", Eval("CodMisura")) %>' />
+                </div>
+                <div class="col-xs-6">
+                    <asp:LinkButton ID="lbMoveDown" runat="server" CausesValidation="False" CommandName="Select" CommandArgument="moveDown" OnClick="lbUpDown_Click" ToolTip="Move Down" CssClass="fa fa-arrow-down fa-2x" Visible='<%# arrowVisible("DOWN", Eval("CodMisura")) %>' />
+                </div>
+            </ItemTemplate>
+        </asp:TemplateField>
         <asp:BoundField DataField="NomeMisura" HeaderText="NomeMisura" SortExpression="NomeMisura" />
         <asp:TemplateField HeaderText="TipoValMisura" SortExpression="TipoValMisura">
             <EditItemTemplate>
@@ -71,4 +86,4 @@
         <asp:Parameter Name="Original_Vers" Type="Int32" />
         <asp:Parameter Name="Original_CodMisura" Type="String" />
     </UpdateParameters>
-</asp:ObjectDataSource>
\ No newline at end of file
+</asp:ObjectDataSource>
diff --git a/CMS_SC/WebUserControls/mod_DettScheda.ascx.cs b/CMS_SC/WebUserControls/mod_DettScheda.ascx.cs
index 816536c..8b6c4f5 100644
--- a/CMS_SC/WebUserControls/mod_DettScheda.ascx.cs
+++ b/CMS_SC/WebUserControls/mod_DettScheda.ascx.cs
@@ -89,6 +89,40 @@ namespace CMS_SC.WebUserControls
             return user_std.UtSn.Traduci(lemma);
         }
         /// <summary>
+        /// Scheda selezionata
+        /// </summary>
+        public string CodSchedaSel
+        {
+            get
+            {
+                string answ = "";
+                try
+                {
+                    answ = grView.SelectedDataKey["CodScheda"].ToString();
+                }
+                catch
+                { }
+                return answ;
+            }
+        }
+        /// <summary>
+        /// Versione selezionata
+        /// </summary>
+        public int VersSel
+        {
+            get
+            {
+                int answ = -1;
+                try
+                {
+                    answ = Convert.ToInt32(grView.SelectedDataKey["Vers"].ToString());
+                }
+                catch
+                { }
+                return answ;
+            }
+        }
+        /// <summary>
         /// Misura selezionata
         /// </summary>
         public string CodMisuraSel
@@ -106,12 +140,34 @@ namespace CMS_SC.WebUserControls
             }
         }
         /// <summary>
+        /// salvo in session il prox comando
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void lbUpDown_Click(object sender, EventArgs e)
+        {
+            SteamWare.memLayer.ML.setSessionVal("nextObjCommand", ((LinkButton)sender).CommandArgument);
+        }
+        /// <summary>
         /// selezionato valore
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
         protected void grView_SelectedIndexChanged(object sender, EventArgs e)
         {
+            // verifico se ho un argomento di tipo moveUp / moveDown... quale comando?
+            string _comando = "";
+            if (SteamWare.memLayer.ML.isInSessionObject("nextObjCommand"))
+            {
+                _comando = SteamWare.memLayer.ML.StringSessionObj("nextObjCommand");
+                SteamWare.memLayer.ML.emptySessionVal("nextObjCommand");
+            }
+            // SE c'era comando eseguo move...
+            if(_comando!="")
+            {
+                DtProxy.man.taDS.moveUpDown(_comando, CodSchedaSel, VersSel, CodMisuraSel);
+                grView.DataBind();
+            }
             raiseEvent();
         }
         protected void btnReset_Click(object sender, EventArgs e)
@@ -120,6 +176,37 @@ namespace CMS_SC.WebUserControls
             grView.DataBind();
             raiseEvent();
         }
-
+        /// <summary>
+        /// determina visibilità frecce spostamento
+        /// </summary>
+        /// <param name="direction">direzione: UP / DOWN</param>
+        /// <param name="CodMisura">CodMisura da verificare</param>
+        /// <returns></returns>
+        public bool arrowVisible(object _direction, object _CodMisura)
+        {
+            bool answ = false;
+            string direction = _direction.ToString();
+            string CodMisura = _CodMisura.ToString();
+            if (memLayer.ML.QSS("CodSchedaVers") != "")
+            {
+                // recupero TUTTE  le righe della scheda dett corrente
+                DS_Applicazione.DettSchedaDataTable tab = DtProxy.man.taDS.getByScheda(memLayer.ML.QSS("CodSchedaVers"));
+                // a seconda della direzione CERCO se ci siano misure prima/dopo...
+                string where = "";
+                switch (direction)
+                {
+                    case "UP":
+                        where = string.Format("CodMisura < '{0}'", CodMisura);
+                        break;
+                    case "DOWN":
+                        where = string.Format("CodMisura > '{0}'", CodMisura);
+                        break;
+                    default:
+                        break;
+                }
+                answ = tab.Select(where).Length > 0;
+            }
+            return answ;
+        }
     }
 }
\ No newline at end of file
diff --git a/CMS_SC/bin/CMS-SC-Data.dll b/CMS_SC/bin/CMS-SC-Data.dll
index 84d6faa..f9c3b6b 100644
Binary files a/CMS_SC/bin/CMS-SC-Data.dll and b/CMS_SC/bin/CMS-SC-Data.dll differ
diff --git a/CMS_SC/bin/CMS_SC.dll b/CMS_SC/bin/CMS_SC.dll
index 914c8dc..080561b 100644
Binary files a/CMS_SC/bin/CMS_SC.dll and b/CMS_SC/bin/CMS_SC.dll differ
diff --git a/CMS_SC/bin/SteamWare.dll b/CMS_SC/bin/SteamWare.dll
index a94839b..2d90de5 100644
Binary files a/CMS_SC/bin/SteamWare.dll and b/CMS_SC/bin/SteamWare.dll differ
diff --git a/VersGen/CMS_SC.cs b/VersGen/CMS_SC.cs
index 2b6f548..c2d92a3 100644
--- a/VersGen/CMS_SC.cs
+++ b/VersGen/CMS_SC.cs
@@ -5,7 +5,7 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("1.2.021.335")]
-[assembly: AssemblyFileVersion("1.2.021.335")]
+[assembly: AssemblyVersion("1.2.023.335")]
+[assembly: AssemblyFileVersion("1.2.023.335")]
 [assembly: AssemblyCopyright("Steamware © 2009-2015")]
 [assembly: AssemblyCompany("Steamware")]
diff --git a/VersGen/CMS_SC.tt b/VersGen/CMS_SC.tt
index 108861d..0737387 100644
--- a/VersGen/CMS_SC.tt
+++ b/VersGen/CMS_SC.tt
@@ -6,8 +6,8 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("1.2.021.<#= this.RevisionNumber #>")]
-[assembly: AssemblyFileVersion("1.2.021.<#= this.RevisionNumber #>")]
+[assembly: AssemblyVersion("1.2.023.<#= this.RevisionNumber #>")]
+[assembly: AssemblyFileVersion("1.2.023.<#= this.RevisionNumber #>")]
 [assembly: AssemblyCopyright("Steamware © 2009-<#= DateTime.Now.Year #>")]
 [assembly: AssemblyCompany("Steamware")]
 <#+
diff --git a/VersGen/bin/Debug/VersGen.dll b/VersGen/bin/Debug/VersGen.dll
index ae15a8d..9e3b437 100644
Binary files a/VersGen/bin/Debug/VersGen.dll and b/VersGen/bin/Debug/VersGen.dll differ