diff --git a/CMS-SC-Data/DS_Applicazione.Designer.cs b/CMS-SC-Data/DS_Applicazione.Designer.cs
index 5c08a8f..b680f38 100644
--- a/CMS-SC-Data/DS_Applicazione.Designer.cs
+++ b/CMS-SC-Data/DS_Applicazione.Designer.cs
@@ -72,10 +72,6 @@ namespace CMS_SC_Data {
         
         private global::System.Data.DataRelation relationFK_SchemaCollMacc_ElencoDossier;
         
-        private global::System.Data.DataRelation relationFK_IstanzeMisura_AnagFasi1;
-        
-        private global::System.Data.DataRelation relationFK_Misure_SchemaCollMacc1;
-        
         private global::System.Data.DataRelation relationFK_Tags2Macchine_ElencoMacchineCN;
         
         private global::System.Data.DataRelation relationFK_Tags2Macchine_AnagTags;
@@ -586,8 +582,6 @@ namespace CMS_SC_Data {
             this.relationFK_ElencoDossier_ElencoMacchineCN = this.Relations["FK_ElencoDossier_ElencoMacchineCN"];
             this.relationFK_SchemaCollMacc_AnagSchede = this.Relations["FK_SchemaCollMacc_AnagSchede"];
             this.relationFK_SchemaCollMacc_ElencoDossier = this.Relations["FK_SchemaCollMacc_ElencoDossier"];
-            this.relationFK_IstanzeMisura_AnagFasi1 = this.Relations["FK_IstanzeMisura_AnagFasi1"];
-            this.relationFK_Misure_SchemaCollMacc1 = this.Relations["FK_Misure_SchemaCollMacc1"];
             this.relationFK_Tags2Macchine_ElencoMacchineCN = this.Relations["FK_Tags2Macchine_ElencoMacchineCN"];
             this.relationFK_Tags2Macchine_AnagTags = this.Relations["FK_Tags2Macchine_AnagTags"];
         }
@@ -674,20 +668,6 @@ namespace CMS_SC_Data {
                         this.tableElencoDossier.IdxDossierColumn}, new global::System.Data.DataColumn[] {
                         this.tableSchemaCollMacc.IdxDossierColumn}, false);
             this.Relations.Add(this.relationFK_SchemaCollMacc_ElencoDossier);
-            this.relationFK_IstanzeMisura_AnagFasi1 = new global::System.Data.DataRelation("FK_IstanzeMisura_AnagFasi1", new global::System.Data.DataColumn[] {
-                        this.tableAnagFasi.FaseColumn}, new global::System.Data.DataColumn[] {
-                        this.tableMisure.FaseColumn}, false);
-            this.Relations.Add(this.relationFK_IstanzeMisura_AnagFasi1);
-            this.relationFK_Misure_SchemaCollMacc1 = new global::System.Data.DataRelation("FK_Misure_SchemaCollMacc1", new global::System.Data.DataColumn[] {
-                        this.tableSchemaCollMacc.IdxDossierColumn,
-                        this.tableSchemaCollMacc.CodSchedaColumn,
-                        this.tableSchemaCollMacc.VersColumn,
-                        this.tableSchemaCollMacc.NumSchedaColumn}, new global::System.Data.DataColumn[] {
-                        this.tableMisure.IdxDossierColumn,
-                        this.tableMisure.CodSchedaColumn,
-                        this.tableMisure.VersColumn,
-                        this.tableMisure.NumSchedaColumn}, false);
-            this.Relations.Add(this.relationFK_Misure_SchemaCollMacc1);
             this.relationFK_Tags2Macchine_ElencoMacchineCN = new global::System.Data.DataRelation("FK_Tags2Macchine_ElencoMacchineCN", new global::System.Data.DataColumn[] {
                         this.tableElencoMacchineCN.MatricolaColumn}, new global::System.Data.DataColumn[] {
                         this.tableTags2Macchine.MatricolaColumn}, false);
@@ -4089,6 +4069,8 @@ namespace CMS_SC_Data {
             
             private global::System.Data.DataColumn columnIdxDossier;
             
+            private global::System.Data.DataColumn columnCodSchedaVersNum;
+            
             private global::System.Data.DataColumn columnCodScheda;
             
             private global::System.Data.DataColumn columnVers;
@@ -4099,6 +4081,8 @@ namespace CMS_SC_Data {
             
             private global::System.Data.DataColumn columnFase;
             
+            private global::System.Data.DataColumn columnRev;
+            
             private global::System.Data.DataColumn columnOperatore;
             
             private global::System.Data.DataColumn columnDataOra;
@@ -4125,14 +4109,10 @@ namespace CMS_SC_Data {
             
             private global::System.Data.DataColumn columnLSVal;
             
-            private global::System.Data.DataColumn columnCodSchedaVersNum;
-            
             private global::System.Data.DataColumn columnCodVisib;
             
             private global::System.Data.DataColumn columnOrdinale;
             
-            private global::System.Data.DataColumn columnRev;
-            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
             public MisureDataTable() {
@@ -4174,6 +4154,14 @@ namespace CMS_SC_Data {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public global::System.Data.DataColumn CodSchedaVersNumColumn {
+                get {
+                    return this.columnCodSchedaVersNum;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
             public global::System.Data.DataColumn CodSchedaColumn {
@@ -4214,6 +4202,14 @@ namespace CMS_SC_Data {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public global::System.Data.DataColumn RevColumn {
+                get {
+                    return this.columnRev;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
             public global::System.Data.DataColumn OperatoreColumn {
@@ -4318,14 +4314,6 @@ namespace CMS_SC_Data {
                 }
             }
             
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public global::System.Data.DataColumn CodSchedaVersNumColumn {
-                get {
-                    return this.columnCodSchedaVersNum;
-                }
-            }
-            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
             public global::System.Data.DataColumn CodVisibColumn {
@@ -4342,14 +4330,6 @@ namespace CMS_SC_Data {
                 }
             }
             
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public global::System.Data.DataColumn RevColumn {
-                get {
-                    return this.columnRev;
-                }
-            }
-            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
             [global::System.ComponentModel.Browsable(false)]
@@ -4389,11 +4369,13 @@ namespace CMS_SC_Data {
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
             public MisureRow AddMisureRow(
                         int IdxDossier, 
+                        string CodSchedaVersNum, 
                         string CodScheda, 
                         int Vers, 
                         int NumScheda, 
                         string CodMisura, 
-                        AnagFasiRow parentAnagFasiRowByFK_IstanzeMisura_AnagFasi1, 
+                        string Fase, 
+                        int Rev, 
                         string Operatore, 
                         System.DateTime DataOra, 
                         double ValorePar, 
@@ -4407,18 +4389,18 @@ namespace CMS_SC_Data {
                         double MaxPar, 
                         double LIVal, 
                         double LSVal, 
-                        string CodSchedaVersNum, 
                         string CodVisib, 
-                        int Ordinale, 
-                        int Rev) {
+                        int Ordinale) {
                 MisureRow rowMisureRow = ((MisureRow)(this.NewRow()));
                 object[] columnValuesArray = new object[] {
                         IdxDossier,
+                        CodSchedaVersNum,
                         CodScheda,
                         Vers,
                         NumScheda,
                         CodMisura,
-                        null,
+                        Fase,
+                        Rev,
                         Operatore,
                         DataOra,
                         ValorePar,
@@ -4432,13 +4414,8 @@ namespace CMS_SC_Data {
                         MaxPar,
                         LIVal,
                         LSVal,
-                        CodSchedaVersNum,
                         CodVisib,
-                        Ordinale,
-                        Rev};
-                if ((parentAnagFasiRowByFK_IstanzeMisura_AnagFasi1 != null)) {
-                    columnValuesArray[5] = parentAnagFasiRowByFK_IstanzeMisura_AnagFasi1[0];
-                }
+                        Ordinale};
                 rowMisureRow.ItemArray = columnValuesArray;
                 this.Rows.Add(rowMisureRow);
                 return rowMisureRow;
@@ -4446,14 +4423,13 @@ namespace CMS_SC_Data {
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public MisureRow FindByIdxDossierCodSchedaVersNumSchedaCodMisuraFase(int IdxDossier, string CodScheda, int Vers, int NumScheda, string CodMisura, string Fase) {
+            public MisureRow FindByIdxDossierCodSchedaVersNumCodMisuraFaseRev(int IdxDossier, string CodSchedaVersNum, string CodMisura, string Fase, int Rev) {
                 return ((MisureRow)(this.Rows.Find(new object[] {
                             IdxDossier,
-                            CodScheda,
-                            Vers,
-                            NumScheda,
+                            CodSchedaVersNum,
                             CodMisura,
-                            Fase})));
+                            Fase,
+                            Rev})));
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -4474,11 +4450,13 @@ namespace CMS_SC_Data {
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
             internal void InitVars() {
                 this.columnIdxDossier = base.Columns["IdxDossier"];
+                this.columnCodSchedaVersNum = base.Columns["CodSchedaVersNum"];
                 this.columnCodScheda = base.Columns["CodScheda"];
                 this.columnVers = base.Columns["Vers"];
                 this.columnNumScheda = base.Columns["NumScheda"];
                 this.columnCodMisura = base.Columns["CodMisura"];
                 this.columnFase = base.Columns["Fase"];
+                this.columnRev = base.Columns["Rev"];
                 this.columnOperatore = base.Columns["Operatore"];
                 this.columnDataOra = base.Columns["DataOra"];
                 this.columnValorePar = base.Columns["ValorePar"];
@@ -4492,10 +4470,8 @@ namespace CMS_SC_Data {
                 this.columnMaxPar = base.Columns["MaxPar"];
                 this.columnLIVal = base.Columns["LIVal"];
                 this.columnLSVal = base.Columns["LSVal"];
-                this.columnCodSchedaVersNum = base.Columns["CodSchedaVersNum"];
                 this.columnCodVisib = base.Columns["CodVisib"];
                 this.columnOrdinale = base.Columns["Ordinale"];
-                this.columnRev = base.Columns["Rev"];
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -4503,6 +4479,8 @@ namespace CMS_SC_Data {
             private void InitClass() {
                 this.columnIdxDossier = new global::System.Data.DataColumn("IdxDossier", typeof(int), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnIdxDossier);
+                this.columnCodSchedaVersNum = new global::System.Data.DataColumn("CodSchedaVersNum", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnCodSchedaVersNum);
                 this.columnCodScheda = new global::System.Data.DataColumn("CodScheda", typeof(string), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnCodScheda);
                 this.columnVers = new global::System.Data.DataColumn("Vers", typeof(int), null, global::System.Data.MappingType.Element);
@@ -4513,6 +4491,8 @@ namespace CMS_SC_Data {
                 base.Columns.Add(this.columnCodMisura);
                 this.columnFase = new global::System.Data.DataColumn("Fase", typeof(string), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnFase);
+                this.columnRev = new global::System.Data.DataColumn("Rev", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnRev);
                 this.columnOperatore = new global::System.Data.DataColumn("Operatore", typeof(string), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnOperatore);
                 this.columnDataOra = new global::System.Data.DataColumn("DataOra", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element);
@@ -4539,22 +4519,20 @@ namespace CMS_SC_Data {
                 base.Columns.Add(this.columnLIVal);
                 this.columnLSVal = new global::System.Data.DataColumn("LSVal", typeof(double), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnLSVal);
-                this.columnCodSchedaVersNum = new global::System.Data.DataColumn("CodSchedaVersNum", typeof(string), null, global::System.Data.MappingType.Element);
-                base.Columns.Add(this.columnCodSchedaVersNum);
                 this.columnCodVisib = new global::System.Data.DataColumn("CodVisib", typeof(string), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnCodVisib);
                 this.columnOrdinale = new global::System.Data.DataColumn("Ordinale", typeof(int), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnOrdinale);
-                this.columnRev = new global::System.Data.DataColumn("Rev", typeof(int), null, global::System.Data.MappingType.Element);
-                base.Columns.Add(this.columnRev);
                 this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
                                 this.columnIdxDossier,
-                                this.columnCodScheda,
-                                this.columnVers,
-                                this.columnNumScheda,
+                                this.columnCodSchedaVersNum,
                                 this.columnCodMisura,
-                                this.columnFase}, true));
+                                this.columnFase,
+                                this.columnRev}, true));
                 this.columnIdxDossier.AllowDBNull = false;
+                this.columnCodSchedaVersNum.AllowDBNull = false;
+                this.columnCodSchedaVersNum.ReadOnly = true;
+                this.columnCodSchedaVersNum.MaxLength = 152;
                 this.columnCodScheda.AllowDBNull = false;
                 this.columnCodScheda.MaxLength = 50;
                 this.columnVers.AllowDBNull = false;
@@ -4563,6 +4541,7 @@ namespace CMS_SC_Data {
                 this.columnCodMisura.MaxLength = 50;
                 this.columnFase.AllowDBNull = false;
                 this.columnFase.MaxLength = 50;
+                this.columnRev.AllowDBNull = false;
                 this.columnOperatore.AllowDBNull = false;
                 this.columnOperatore.MaxLength = 250;
                 this.columnDataOra.AllowDBNull = false;
@@ -4577,13 +4556,14 @@ namespace CMS_SC_Data {
                 this.columnTipoValMisura.AllowDBNull = false;
                 this.columnTipoValMisura.MaxLength = 50;
                 this.columnNomePar.AllowDBNull = false;
-                this.columnNomePar.MaxLength = 50;
-                this.columnCodSchedaVersNum.ReadOnly = true;
-                this.columnCodSchedaVersNum.MaxLength = 152;
+                this.columnNomePar.MaxLength = 100;
+                this.columnMinPar.ReadOnly = true;
+                this.columnMaxPar.ReadOnly = true;
+                this.columnLIVal.ReadOnly = true;
+                this.columnLSVal.ReadOnly = true;
                 this.columnCodVisib.AllowDBNull = false;
                 this.columnCodVisib.MaxLength = 50;
                 this.columnOrdinale.AllowDBNull = false;
-                this.columnRev.AllowDBNull = false;
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -7228,17 +7208,6 @@ namespace CMS_SC_Data {
             public void SetDescrizioneNull() {
                 this[this.tableAnagFasi.DescrizioneColumn] = global::System.Convert.DBNull;
             }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public MisureRow[] GetMisureRows() {
-                if ((this.Table.ChildRelations["FK_IstanzeMisura_AnagFasi1"] == null)) {
-                    return new MisureRow[0];
-                }
-                else {
-                    return ((MisureRow[])(base.GetChildRows(this.Table.ChildRelations["FK_IstanzeMisura_AnagFasi1"])));
-                }
-            }
         }
         
         /// <summary>
@@ -8138,17 +8107,6 @@ namespace CMS_SC_Data {
             public void SetDescrizioneNull() {
                 this[this.tableSchemaCollMacc.DescrizioneColumn] = global::System.Convert.DBNull;
             }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public MisureRow[] GetMisureRows() {
-                if ((this.Table.ChildRelations["FK_Misure_SchemaCollMacc1"] == null)) {
-                    return new MisureRow[0];
-                }
-                else {
-                    return ((MisureRow[])(base.GetChildRows(this.Table.ChildRelations["FK_Misure_SchemaCollMacc1"])));
-                }
-            }
         }
         
         /// <summary>
@@ -8176,6 +8134,17 @@ namespace CMS_SC_Data {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public string CodSchedaVersNum {
+                get {
+                    return ((string)(this[this.tableMisure.CodSchedaVersNumColumn]));
+                }
+                set {
+                    this[this.tableMisure.CodSchedaVersNumColumn] = value;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
             public string CodScheda {
@@ -8231,6 +8200,17 @@ namespace CMS_SC_Data {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public int Rev {
+                get {
+                    return ((int)(this[this.tableMisure.RevColumn]));
+                }
+                set {
+                    this[this.tableMisure.RevColumn] = value;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
             public string Operatore {
@@ -8394,22 +8374,6 @@ namespace CMS_SC_Data {
                 }
             }
             
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public string CodSchedaVersNum {
-                get {
-                    try {
-                        return ((string)(this[this.tableMisure.CodSchedaVersNumColumn]));
-                    }
-                    catch (global::System.InvalidCastException e) {
-                        throw new global::System.Data.StrongTypingException("Il valore della colonna \'CodSchedaVersNum\' nella tabella \'Misure\' è DBNull.", e);
-                    }
-                }
-                set {
-                    this[this.tableMisure.CodSchedaVersNumColumn] = value;
-                }
-            }
-            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
             public string CodVisib {
@@ -8432,39 +8396,6 @@ namespace CMS_SC_Data {
                 }
             }
             
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public int Rev {
-                get {
-                    return ((int)(this[this.tableMisure.RevColumn]));
-                }
-                set {
-                    this[this.tableMisure.RevColumn] = value;
-                }
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public AnagFasiRow AnagFasiRow {
-                get {
-                    return ((AnagFasiRow)(this.GetParentRow(this.Table.ParentRelations["FK_IstanzeMisura_AnagFasi1"])));
-                }
-                set {
-                    this.SetParentRow(value, this.Table.ParentRelations["FK_IstanzeMisura_AnagFasi1"]);
-                }
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public SchemaCollMaccRow SchemaCollMaccRowParent {
-                get {
-                    return ((SchemaCollMaccRow)(this.GetParentRow(this.Table.ParentRelations["FK_Misure_SchemaCollMacc1"])));
-                }
-                set {
-                    this.SetParentRow(value, this.Table.ParentRelations["FK_Misure_SchemaCollMacc1"]);
-                }
-            }
-            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
             public bool IsMinParNull() {
@@ -8512,18 +8443,6 @@ namespace CMS_SC_Data {
             public void SetLSValNull() {
                 this[this.tableMisure.LSValColumn] = global::System.Convert.DBNull;
             }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public bool IsCodSchedaVersNumNull() {
-                return this.IsNull(this.tableMisure.CodSchedaVersNumColumn);
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public void SetCodSchedaVersNumNull() {
-                this[this.tableMisure.CodSchedaVersNumColumn] = global::System.Convert.DBNull;
-            }
         }
         
         /// <summary>
@@ -14859,11 +14778,13 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab, Ordin
             tableMapping.SourceTable = "Table";
             tableMapping.DataSetTable = "Misure";
             tableMapping.ColumnMappings.Add("IdxDossier", "IdxDossier");
+            tableMapping.ColumnMappings.Add("CodSchedaVersNum", "CodSchedaVersNum");
             tableMapping.ColumnMappings.Add("CodScheda", "CodScheda");
             tableMapping.ColumnMappings.Add("Vers", "Vers");
             tableMapping.ColumnMappings.Add("NumScheda", "NumScheda");
             tableMapping.ColumnMappings.Add("CodMisura", "CodMisura");
             tableMapping.ColumnMappings.Add("Fase", "Fase");
+            tableMapping.ColumnMappings.Add("Rev", "Rev");
             tableMapping.ColumnMappings.Add("Operatore", "Operatore");
             tableMapping.ColumnMappings.Add("DataOra", "DataOra");
             tableMapping.ColumnMappings.Add("ValorePar", "ValorePar");
@@ -14878,10 +14799,7 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab, Ordin
             tableMapping.ColumnMappings.Add("LIVal", "LIVal");
             tableMapping.ColumnMappings.Add("LSVal", "LSVal");
             tableMapping.ColumnMappings.Add("CodVisib", "CodVisib");
-            tableMapping.ColumnMappings.Add("Codschedaversnum", "Codschedaversnum");
             tableMapping.ColumnMappings.Add("Ordinale", "Ordinale");
-            tableMapping.ColumnMappings.Add("CodSchedaVersNum", "CodSchedaVersNum");
-            tableMapping.ColumnMappings.Add("Rev", "Rev");
             this._adapter.TableMappings.Add(tableMapping);
         }
         
@@ -17553,15 +17471,6 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa
                     allChangedRows.AddRange(updatedRows);
                 }
             }
-            if ((this._anagFasiTableAdapter != null)) {
-                global::System.Data.DataRow[] updatedRows = dataSet.AnagFasi.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent);
-                updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows);
-                if (((updatedRows != null) 
-                            && (0 < updatedRows.Length))) {
-                    result = (result + this._anagFasiTableAdapter.Update(updatedRows));
-                    allChangedRows.AddRange(updatedRows);
-                }
-            }
             if ((this._dettSchedaTableAdapter != null)) {
                 global::System.Data.DataRow[] updatedRows = dataSet.DettScheda.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent);
                 updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows);
@@ -17571,15 +17480,6 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa
                     allChangedRows.AddRange(updatedRows);
                 }
             }
-            if ((this._schemaCollMaccTableAdapter != null)) {
-                global::System.Data.DataRow[] updatedRows = dataSet.SchemaCollMacc.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent);
-                updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows);
-                if (((updatedRows != null) 
-                            && (0 < updatedRows.Length))) {
-                    result = (result + this._schemaCollMaccTableAdapter.Update(updatedRows));
-                    allChangedRows.AddRange(updatedRows);
-                }
-            }
             if ((this._anagTagsTableAdapter != null)) {
                 global::System.Data.DataRow[] updatedRows = dataSet.AnagTags.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent);
                 updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows);
@@ -17589,6 +17489,15 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa
                     allChangedRows.AddRange(updatedRows);
                 }
             }
+            if ((this._anagFasiTableAdapter != null)) {
+                global::System.Data.DataRow[] updatedRows = dataSet.AnagFasi.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent);
+                updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows);
+                if (((updatedRows != null) 
+                            && (0 < updatedRows.Length))) {
+                    result = (result + this._anagFasiTableAdapter.Update(updatedRows));
+                    allChangedRows.AddRange(updatedRows);
+                }
+            }
             if ((this._validValTableAdapter != null)) {
                 global::System.Data.DataRow[] updatedRows = dataSet.ValidVal.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent);
                 updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows);
@@ -17598,6 +17507,15 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa
                     allChangedRows.AddRange(updatedRows);
                 }
             }
+            if ((this._schemaCollMaccTableAdapter != null)) {
+                global::System.Data.DataRow[] updatedRows = dataSet.SchemaCollMacc.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent);
+                updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows);
+                if (((updatedRows != null) 
+                            && (0 < updatedRows.Length))) {
+                    result = (result + this._schemaCollMaccTableAdapter.Update(updatedRows));
+                    allChangedRows.AddRange(updatedRows);
+                }
+            }
             if ((this._tags2MacchineTableAdapter != null)) {
                 global::System.Data.DataRow[] updatedRows = dataSet.Tags2Macchine.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent);
                 updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows);
@@ -17634,14 +17552,6 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa
                     allAddedRows.AddRange(addedRows);
                 }
             }
-            if ((this._anagFasiTableAdapter != null)) {
-                global::System.Data.DataRow[] addedRows = dataSet.AnagFasi.Select(null, null, global::System.Data.DataViewRowState.Added);
-                if (((addedRows != null) 
-                            && (0 < addedRows.Length))) {
-                    result = (result + this._anagFasiTableAdapter.Update(addedRows));
-                    allAddedRows.AddRange(addedRows);
-                }
-            }
             if ((this._dettSchedaTableAdapter != null)) {
                 global::System.Data.DataRow[] addedRows = dataSet.DettScheda.Select(null, null, global::System.Data.DataViewRowState.Added);
                 if (((addedRows != null) 
@@ -17650,14 +17560,6 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa
                     allAddedRows.AddRange(addedRows);
                 }
             }
-            if ((this._schemaCollMaccTableAdapter != null)) {
-                global::System.Data.DataRow[] addedRows = dataSet.SchemaCollMacc.Select(null, null, global::System.Data.DataViewRowState.Added);
-                if (((addedRows != null) 
-                            && (0 < addedRows.Length))) {
-                    result = (result + this._schemaCollMaccTableAdapter.Update(addedRows));
-                    allAddedRows.AddRange(addedRows);
-                }
-            }
             if ((this._anagTagsTableAdapter != null)) {
                 global::System.Data.DataRow[] addedRows = dataSet.AnagTags.Select(null, null, global::System.Data.DataViewRowState.Added);
                 if (((addedRows != null) 
@@ -17666,6 +17568,14 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa
                     allAddedRows.AddRange(addedRows);
                 }
             }
+            if ((this._anagFasiTableAdapter != null)) {
+                global::System.Data.DataRow[] addedRows = dataSet.AnagFasi.Select(null, null, global::System.Data.DataViewRowState.Added);
+                if (((addedRows != null) 
+                            && (0 < addedRows.Length))) {
+                    result = (result + this._anagFasiTableAdapter.Update(addedRows));
+                    allAddedRows.AddRange(addedRows);
+                }
+            }
             if ((this._validValTableAdapter != null)) {
                 global::System.Data.DataRow[] addedRows = dataSet.ValidVal.Select(null, null, global::System.Data.DataViewRowState.Added);
                 if (((addedRows != null) 
@@ -17674,6 +17584,14 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa
                     allAddedRows.AddRange(addedRows);
                 }
             }
+            if ((this._schemaCollMaccTableAdapter != null)) {
+                global::System.Data.DataRow[] addedRows = dataSet.SchemaCollMacc.Select(null, null, global::System.Data.DataViewRowState.Added);
+                if (((addedRows != null) 
+                            && (0 < addedRows.Length))) {
+                    result = (result + this._schemaCollMaccTableAdapter.Update(addedRows));
+                    allAddedRows.AddRange(addedRows);
+                }
+            }
             if ((this._tags2MacchineTableAdapter != null)) {
                 global::System.Data.DataRow[] addedRows = dataSet.Tags2Macchine.Select(null, null, global::System.Data.DataViewRowState.Added);
                 if (((addedRows != null) 
@@ -17716,6 +17634,14 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa
                     allChangedRows.AddRange(deletedRows);
                 }
             }
+            if ((this._schemaCollMaccTableAdapter != null)) {
+                global::System.Data.DataRow[] deletedRows = dataSet.SchemaCollMacc.Select(null, null, global::System.Data.DataViewRowState.Deleted);
+                if (((deletedRows != null) 
+                            && (0 < deletedRows.Length))) {
+                    result = (result + this._schemaCollMaccTableAdapter.Update(deletedRows));
+                    allChangedRows.AddRange(deletedRows);
+                }
+            }
             if ((this._validValTableAdapter != null)) {
                 global::System.Data.DataRow[] deletedRows = dataSet.ValidVal.Select(null, null, global::System.Data.DataViewRowState.Deleted);
                 if (((deletedRows != null) 
@@ -17724,6 +17650,14 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa
                     allChangedRows.AddRange(deletedRows);
                 }
             }
+            if ((this._anagFasiTableAdapter != null)) {
+                global::System.Data.DataRow[] deletedRows = dataSet.AnagFasi.Select(null, null, global::System.Data.DataViewRowState.Deleted);
+                if (((deletedRows != null) 
+                            && (0 < deletedRows.Length))) {
+                    result = (result + this._anagFasiTableAdapter.Update(deletedRows));
+                    allChangedRows.AddRange(deletedRows);
+                }
+            }
             if ((this._anagTagsTableAdapter != null)) {
                 global::System.Data.DataRow[] deletedRows = dataSet.AnagTags.Select(null, null, global::System.Data.DataViewRowState.Deleted);
                 if (((deletedRows != null) 
@@ -17732,14 +17666,6 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa
                     allChangedRows.AddRange(deletedRows);
                 }
             }
-            if ((this._schemaCollMaccTableAdapter != null)) {
-                global::System.Data.DataRow[] deletedRows = dataSet.SchemaCollMacc.Select(null, null, global::System.Data.DataViewRowState.Deleted);
-                if (((deletedRows != null) 
-                            && (0 < deletedRows.Length))) {
-                    result = (result + this._schemaCollMaccTableAdapter.Update(deletedRows));
-                    allChangedRows.AddRange(deletedRows);
-                }
-            }
             if ((this._dettSchedaTableAdapter != null)) {
                 global::System.Data.DataRow[] deletedRows = dataSet.DettScheda.Select(null, null, global::System.Data.DataViewRowState.Deleted);
                 if (((deletedRows != null) 
@@ -17748,14 +17674,6 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa
                     allChangedRows.AddRange(deletedRows);
                 }
             }
-            if ((this._anagFasiTableAdapter != null)) {
-                global::System.Data.DataRow[] deletedRows = dataSet.AnagFasi.Select(null, null, global::System.Data.DataViewRowState.Deleted);
-                if (((deletedRows != null) 
-                            && (0 < deletedRows.Length))) {
-                    result = (result + this._anagFasiTableAdapter.Update(deletedRows));
-                    allChangedRows.AddRange(deletedRows);
-                }
-            }
             if ((this._anagSchedeTableAdapter != null)) {
                 global::System.Data.DataRow[] deletedRows = dataSet.AnagSchede.Select(null, null, global::System.Data.DataViewRowState.Deleted);
                 if (((deletedRows != null) 
diff --git a/CMS-SC-Data/DS_Applicazione.xsd b/CMS-SC-Data/DS_Applicazione.xsd
index d04871a..4a81c68 100644
--- a/CMS-SC-Data/DS_Applicazione.xsd
+++ b/CMS-SC-Data/DS_Applicazione.xsd
@@ -1039,11 +1039,13 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab, Ordin
             </MainSource>
             <Mappings>
               <Mapping SourceColumn="IdxDossier" DataSetColumn="IdxDossier" />
+              <Mapping SourceColumn="CodSchedaVersNum" DataSetColumn="CodSchedaVersNum" />
               <Mapping SourceColumn="CodScheda" DataSetColumn="CodScheda" />
               <Mapping SourceColumn="Vers" DataSetColumn="Vers" />
               <Mapping SourceColumn="NumScheda" DataSetColumn="NumScheda" />
               <Mapping SourceColumn="CodMisura" DataSetColumn="CodMisura" />
               <Mapping SourceColumn="Fase" DataSetColumn="Fase" />
+              <Mapping SourceColumn="Rev" DataSetColumn="Rev" />
               <Mapping SourceColumn="Operatore" DataSetColumn="Operatore" />
               <Mapping SourceColumn="DataOra" DataSetColumn="DataOra" />
               <Mapping SourceColumn="ValorePar" DataSetColumn="ValorePar" />
@@ -1058,10 +1060,7 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab, Ordin
               <Mapping SourceColumn="LIVal" DataSetColumn="LIVal" />
               <Mapping SourceColumn="LSVal" DataSetColumn="LSVal" />
               <Mapping SourceColumn="CodVisib" DataSetColumn="CodVisib" />
-              <Mapping SourceColumn="Codschedaversnum" DataSetColumn="Codschedaversnum" />
               <Mapping SourceColumn="Ordinale" DataSetColumn="Ordinale" />
-              <Mapping SourceColumn="CodSchedaVersNum" DataSetColumn="CodSchedaVersNum" />
-              <Mapping SourceColumn="Rev" DataSetColumn="Rev" />
             </Mappings>
             <Sources>
               <DbSource ConnectionRef="CMS_SCConnectionString (Settings)" DbObjectName="[CMS-SC].dbo.stp_Mis_Deroga" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="deroga" Modifier="Public" Name="deroga" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="deroga">
@@ -1545,7 +1544,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa
   <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">
@@ -1566,7 +1565,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa
             </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">
@@ -1604,7 +1603,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa
             </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">
@@ -1624,7 +1623,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa
             </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">
@@ -1666,7 +1665,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa
             </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">
@@ -1715,7 +1714,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa
             </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">
@@ -1740,7 +1739,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa
             </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">
@@ -1798,7 +1797,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="ElencoDossier" msprop:Generator_TableClassName="ElencoDossierDataTable" msprop:Generator_TableVarName="tableElencoDossier" msprop:Generator_RowChangedName="ElencoDossierRowChanged" msprop:Generator_TablePropName="ElencoDossier" msprop:Generator_RowDeletingName="ElencoDossierRowDeleting" msprop:Generator_RowChangingName="ElencoDossierRowChanging" msprop:Generator_RowEvHandlerName="ElencoDossierRowChangeEventHandler" msprop:Generator_RowDeletedName="ElencoDossierRowDeleted" msprop:Generator_RowClassName="ElencoDossierRow" msprop:Generator_UserTableName="ElencoDossier" msprop:Generator_RowEvArgName="ElencoDossierRowChangeEvent">
+        <xs:element name="ElencoDossier" msprop:Generator_TableClassName="ElencoDossierDataTable" msprop:Generator_TableVarName="tableElencoDossier" msprop:Generator_TablePropName="ElencoDossier" msprop:Generator_RowDeletingName="ElencoDossierRowDeleting" msprop:Generator_RowChangingName="ElencoDossierRowChanging" msprop:Generator_RowEvHandlerName="ElencoDossierRowChangeEventHandler" msprop:Generator_RowDeletedName="ElencoDossierRowDeleted" msprop:Generator_UserTableName="ElencoDossier" msprop:Generator_RowChangedName="ElencoDossierRowChanged" msprop:Generator_RowEvArgName="ElencoDossierRowChangeEvent" msprop:Generator_RowClassName="ElencoDossierRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="IdxDossier" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnIdxDossier" msprop:Generator_ColumnPropNameInRow="IdxDossier" msprop:Generator_ColumnPropNameInTable="IdxDossierColumn" msprop:Generator_UserColumnName="IdxDossier" type="xs:int" />
@@ -1845,7 +1844,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <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: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:complexType>
             <xs:sequence>
               <xs:element name="IdxDossier" msprop:Generator_ColumnVarNameInTable="columnIdxDossier" msprop:Generator_ColumnPropNameInRow="IdxDossier" msprop:Generator_ColumnPropNameInTable="IdxDossierColumn" msprop:Generator_UserColumnName="IdxDossier" type="xs:int" />
@@ -1883,10 +1882,17 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <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: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:complexType>
             <xs:sequence>
               <xs:element name="IdxDossier" msprop:Generator_ColumnVarNameInTable="columnIdxDossier" msprop:Generator_ColumnPropNameInRow="IdxDossier" msprop:Generator_ColumnPropNameInTable="IdxDossierColumn" msprop:Generator_UserColumnName="IdxDossier" type="xs:int" />
+              <xs:element name="CodSchedaVersNum" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnCodSchedaVersNum" msprop:Generator_ColumnPropNameInRow="CodSchedaVersNum" msprop:Generator_ColumnPropNameInTable="CodSchedaVersNumColumn" msprop:Generator_UserColumnName="CodSchedaVersNum">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="152" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
               <xs:element name="CodScheda" msprop:Generator_ColumnVarNameInTable="columnCodScheda" msprop:Generator_ColumnPropNameInRow="CodScheda" msprop:Generator_ColumnPropNameInTable="CodSchedaColumn" msprop:Generator_UserColumnName="CodScheda">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
@@ -1910,6 +1916,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
+              <xs:element name="Rev" msprop:Generator_ColumnVarNameInTable="columnRev" msprop:Generator_ColumnPropNameInRow="Rev" msprop:Generator_ColumnPropNameInTable="RevColumn" msprop:Generator_UserColumnName="Rev" type="xs:int" />
               <xs:element name="Operatore" msprop:Generator_ColumnVarNameInTable="columnOperatore" msprop:Generator_ColumnPropNameInRow="Operatore" msprop:Generator_ColumnPropNameInTable="OperatoreColumn" msprop:Generator_UserColumnName="Operatore">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
@@ -1951,21 +1958,14 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa
               <xs:element name="NomePar" msprop:Generator_ColumnVarNameInTable="columnNomePar" msprop:Generator_ColumnPropNameInRow="NomePar" msprop:Generator_ColumnPropNameInTable="NomeParColumn" msprop:Generator_UserColumnName="NomePar">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
-                    <xs:maxLength value="50" />
-                  </xs:restriction>
-                </xs:simpleType>
-              </xs:element>
-              <xs:element name="MinPar" msprop:Generator_ColumnVarNameInTable="columnMinPar" msprop:Generator_ColumnPropNameInRow="MinPar" msprop:Generator_ColumnPropNameInTable="MinParColumn" msprop:Generator_UserColumnName="MinPar" type="xs:double" minOccurs="0" />
-              <xs:element name="MaxPar" msprop:Generator_ColumnVarNameInTable="columnMaxPar" msprop:Generator_ColumnPropNameInRow="MaxPar" msprop:Generator_ColumnPropNameInTable="MaxParColumn" msprop:Generator_UserColumnName="MaxPar" type="xs:double" minOccurs="0" />
-              <xs:element name="LIVal" msprop:Generator_ColumnVarNameInTable="columnLIVal" msprop:Generator_ColumnPropNameInRow="LIVal" msprop:Generator_ColumnPropNameInTable="LIValColumn" msprop:Generator_UserColumnName="LIVal" type="xs:double" minOccurs="0" />
-              <xs:element name="LSVal" msprop:Generator_ColumnVarNameInTable="columnLSVal" msprop:Generator_ColumnPropNameInRow="LSVal" msprop:Generator_ColumnPropNameInTable="LSValColumn" msprop:Generator_UserColumnName="LSVal" type="xs:double" minOccurs="0" />
-              <xs:element name="CodSchedaVersNum" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnCodSchedaVersNum" msprop:Generator_ColumnPropNameInRow="CodSchedaVersNum" msprop:Generator_ColumnPropNameInTable="CodSchedaVersNumColumn" msprop:Generator_UserColumnName="CodSchedaVersNum" minOccurs="0">
-                <xs:simpleType>
-                  <xs:restriction base="xs:string">
-                    <xs:maxLength value="152" />
+                    <xs:maxLength value="100" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
+              <xs:element name="MinPar" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnMinPar" msprop:Generator_ColumnPropNameInRow="MinPar" msprop:Generator_ColumnPropNameInTable="MinParColumn" msprop:Generator_UserColumnName="MinPar" type="xs:double" minOccurs="0" />
+              <xs:element name="MaxPar" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnMaxPar" msprop:Generator_ColumnPropNameInRow="MaxPar" msprop:Generator_ColumnPropNameInTable="MaxParColumn" msprop:Generator_UserColumnName="MaxPar" type="xs:double" minOccurs="0" />
+              <xs:element name="LIVal" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnLIVal" msprop:Generator_ColumnPropNameInRow="LIVal" msprop:Generator_ColumnPropNameInTable="LIValColumn" msprop:Generator_UserColumnName="LIVal" type="xs:double" minOccurs="0" />
+              <xs:element name="LSVal" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnLSVal" msprop:Generator_ColumnPropNameInRow="LSVal" msprop:Generator_ColumnPropNameInTable="LSValColumn" msprop:Generator_UserColumnName="LSVal" type="xs:double" minOccurs="0" />
               <xs:element name="CodVisib" msprop:Generator_ColumnVarNameInTable="columnCodVisib" msprop:Generator_ColumnPropNameInRow="CodVisib" msprop:Generator_ColumnPropNameInTable="CodVisibColumn" msprop:Generator_UserColumnName="CodVisib">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
@@ -1974,11 +1974,10 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa
                 </xs:simpleType>
               </xs:element>
               <xs:element name="Ordinale" msprop:Generator_ColumnVarNameInTable="columnOrdinale" msprop:Generator_ColumnPropNameInRow="Ordinale" msprop:Generator_ColumnPropNameInTable="OrdinaleColumn" msprop:Generator_UserColumnName="Ordinale" type="xs:int" />
-              <xs:element name="Rev" msprop:Generator_ColumnVarNameInTable="columnRev" msprop:Generator_ColumnPropNameInRow="Rev" msprop:Generator_ColumnPropNameInTable="RevColumn" msprop:Generator_UserColumnName="Rev" type="xs:int" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="ReportData" msprop:Generator_TableClassName="ReportDataDataTable" msprop:Generator_TableVarName="tableReportData" msprop:Generator_TablePropName="ReportData" msprop:Generator_RowDeletingName="ReportDataRowDeleting" msprop:Generator_RowChangingName="ReportDataRowChanging" msprop:Generator_RowEvHandlerName="ReportDataRowChangeEventHandler" msprop:Generator_RowDeletedName="ReportDataRowDeleted" msprop:Generator_UserTableName="ReportData" msprop:Generator_RowChangedName="ReportDataRowChanged" msprop:Generator_RowEvArgName="ReportDataRowChangeEvent" msprop:Generator_RowClassName="ReportDataRow">
+        <xs:element name="ReportData" msprop:Generator_TableClassName="ReportDataDataTable" msprop:Generator_TableVarName="tableReportData" msprop:Generator_RowChangedName="ReportDataRowChanged" msprop:Generator_TablePropName="ReportData" msprop:Generator_RowDeletingName="ReportDataRowDeleting" msprop:Generator_RowChangingName="ReportDataRowChanging" msprop:Generator_RowEvHandlerName="ReportDataRowChangeEventHandler" msprop:Generator_RowDeletedName="ReportDataRowDeleted" msprop:Generator_RowClassName="ReportDataRow" msprop:Generator_UserTableName="ReportData" msprop:Generator_RowEvArgName="ReportDataRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="IdxDossier" msprop:Generator_ColumnVarNameInTable="columnIdxDossier" msprop:Generator_ColumnPropNameInRow="IdxDossier" msprop:Generator_ColumnPropNameInTable="IdxDossierColumn" msprop:Generator_UserColumnName="IdxDossier" type="xs:int" />
@@ -2092,7 +2091,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Tags2Macchine" msprop:Generator_TableClassName="Tags2MacchineDataTable" msprop:Generator_TableVarName="tableTags2Macchine" msprop:Generator_RowChangedName="Tags2MacchineRowChanged" msprop:Generator_TablePropName="Tags2Macchine" msprop:Generator_RowDeletingName="Tags2MacchineRowDeleting" msprop:Generator_RowChangingName="Tags2MacchineRowChanging" msprop:Generator_RowEvHandlerName="Tags2MacchineRowChangeEventHandler" msprop:Generator_RowDeletedName="Tags2MacchineRowDeleted" msprop:Generator_RowClassName="Tags2MacchineRow" msprop:Generator_UserTableName="Tags2Macchine" msprop:Generator_RowEvArgName="Tags2MacchineRowChangeEvent">
+        <xs:element name="Tags2Macchine" msprop:Generator_TableClassName="Tags2MacchineDataTable" msprop:Generator_TableVarName="tableTags2Macchine" msprop:Generator_TablePropName="Tags2Macchine" msprop:Generator_RowDeletingName="Tags2MacchineRowDeleting" msprop:Generator_RowChangingName="Tags2MacchineRowChanging" msprop:Generator_RowEvHandlerName="Tags2MacchineRowChangeEventHandler" msprop:Generator_RowDeletedName="Tags2MacchineRowDeleted" msprop:Generator_UserTableName="Tags2Macchine" msprop:Generator_RowChangedName="Tags2MacchineRowChanged" msprop:Generator_RowEvArgName="Tags2MacchineRowChangeEvent" msprop:Generator_RowClassName="Tags2MacchineRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="Matricola" msprop:Generator_ColumnVarNameInTable="columnMatricola" msprop:Generator_ColumnPropNameInRow="Matricola" msprop:Generator_ColumnPropNameInTable="MatricolaColumn" msprop:Generator_UserColumnName="Matricola">
@@ -2112,7 +2111,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="AnagTags" msprop:Generator_TableClassName="AnagTagsDataTable" msprop:Generator_TableVarName="tableAnagTags" msprop:Generator_RowChangedName="AnagTagsRowChanged" msprop:Generator_TablePropName="AnagTags" msprop:Generator_RowDeletingName="AnagTagsRowDeleting" msprop:Generator_RowChangingName="AnagTagsRowChanging" msprop:Generator_RowEvHandlerName="AnagTagsRowChangeEventHandler" msprop:Generator_RowDeletedName="AnagTagsRowDeleted" msprop:Generator_RowClassName="AnagTagsRow" msprop:Generator_UserTableName="AnagTags" msprop:Generator_RowEvArgName="AnagTagsRowChangeEvent">
+        <xs:element name="AnagTags" msprop:Generator_TableClassName="AnagTagsDataTable" msprop:Generator_TableVarName="tableAnagTags" msprop:Generator_TablePropName="AnagTags" msprop:Generator_RowDeletingName="AnagTagsRowDeleting" msprop:Generator_RowChangingName="AnagTagsRowChanging" msprop:Generator_RowEvHandlerName="AnagTagsRowChangeEventHandler" msprop:Generator_RowDeletedName="AnagTagsRowDeleted" msprop:Generator_UserTableName="AnagTags" msprop:Generator_RowChangedName="AnagTagsRowChanged" msprop:Generator_RowEvArgName="AnagTagsRowChangeEvent" msprop:Generator_RowClassName="AnagTagsRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="TagCode" msprop:Generator_ColumnVarNameInTable="columnTagCode" msprop:Generator_ColumnPropNameInRow="TagCode" msprop:Generator_ColumnPropNameInTable="TagCodeColumn" msprop:Generator_UserColumnName="TagCode">
@@ -2132,7 +2131,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="UserParam" msprop:Generator_TableClassName="UserParamDataTable" msprop:Generator_TableVarName="tableUserParam" msprop:Generator_RowChangedName="UserParamRowChanged" msprop:Generator_TablePropName="UserParam" msprop:Generator_RowDeletingName="UserParamRowDeleting" msprop:Generator_RowChangingName="UserParamRowChanging" msprop:Generator_RowEvHandlerName="UserParamRowChangeEventHandler" msprop:Generator_RowDeletedName="UserParamRowDeleted" msprop:Generator_RowClassName="UserParamRow" msprop:Generator_UserTableName="UserParam" msprop:Generator_RowEvArgName="UserParamRowChangeEvent">
+        <xs:element name="UserParam" msprop:Generator_TableClassName="UserParamDataTable" msprop:Generator_TableVarName="tableUserParam" msprop:Generator_TablePropName="UserParam" msprop:Generator_RowDeletingName="UserParamRowDeleting" msprop:Generator_RowChangingName="UserParamRowChanging" msprop:Generator_RowEvHandlerName="UserParamRowChangeEventHandler" msprop:Generator_RowDeletedName="UserParamRowDeleted" msprop:Generator_UserTableName="UserParam" msprop:Generator_RowChangedName="UserParamRowChanged" msprop:Generator_RowEvArgName="UserParamRowChangeEvent" msprop:Generator_RowClassName="UserParamRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="Email" msprop:Generator_ColumnVarNameInTable="columnEmail" msprop:Generator_ColumnPropNameInRow="Email" msprop:Generator_ColumnPropNameInTable="EmailColumn" msprop:Generator_UserColumnName="Email">
@@ -2159,7 +2158,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="StatoCollaudi" msprop:Generator_TableClassName="StatoCollaudiDataTable" msprop:Generator_TableVarName="tableStatoCollaudi" msprop:Generator_TablePropName="StatoCollaudi" msprop:Generator_RowDeletingName="StatoCollaudiRowDeleting" msprop:Generator_RowChangingName="StatoCollaudiRowChanging" msprop:Generator_RowEvHandlerName="StatoCollaudiRowChangeEventHandler" msprop:Generator_RowDeletedName="StatoCollaudiRowDeleted" msprop:Generator_UserTableName="StatoCollaudi" msprop:Generator_RowChangedName="StatoCollaudiRowChanged" msprop:Generator_RowEvArgName="StatoCollaudiRowChangeEvent" msprop:Generator_RowClassName="StatoCollaudiRow">
+        <xs:element name="StatoCollaudi" msprop:Generator_TableClassName="StatoCollaudiDataTable" msprop:Generator_TableVarName="tableStatoCollaudi" msprop:Generator_RowChangedName="StatoCollaudiRowChanged" msprop:Generator_TablePropName="StatoCollaudi" msprop:Generator_RowDeletingName="StatoCollaudiRowDeleting" msprop:Generator_RowChangingName="StatoCollaudiRowChanging" msprop:Generator_RowEvHandlerName="StatoCollaudiRowChangeEventHandler" msprop:Generator_RowDeletedName="StatoCollaudiRowDeleted" msprop:Generator_RowClassName="StatoCollaudiRow" msprop:Generator_UserTableName="StatoCollaudi" msprop:Generator_RowEvArgName="StatoCollaudiRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="IdxDossier" msprop:Generator_ColumnVarNameInTable="columnIdxDossier" msprop:Generator_ColumnPropNameInRow="IdxDossier" msprop:Generator_ColumnPropNameInTable="IdxDossierColumn" msprop:Generator_UserColumnName="IdxDossier" type="xs:int" />
@@ -2216,7 +2215,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="DFR" msprop:Generator_TableClassName="DFRDataTable" msprop:Generator_TableVarName="tableDFR" msprop:Generator_RowChangedName="DFRRowChanged" msprop:Generator_TablePropName="DFR" msprop:Generator_RowDeletingName="DFRRowDeleting" msprop:Generator_RowChangingName="DFRRowChanging" msprop:Generator_RowEvHandlerName="DFRRowChangeEventHandler" msprop:Generator_RowDeletedName="DFRRowDeleted" msprop:Generator_RowClassName="DFRRow" msprop:Generator_UserTableName="DFR" msprop:Generator_RowEvArgName="DFRRowChangeEvent">
+        <xs:element name="DFR" msprop:Generator_TableClassName="DFRDataTable" msprop:Generator_TableVarName="tableDFR" msprop:Generator_TablePropName="DFR" msprop:Generator_RowDeletingName="DFRRowDeleting" msprop:Generator_RowChangingName="DFRRowChanging" msprop:Generator_RowEvHandlerName="DFRRowChangeEventHandler" msprop:Generator_RowDeletedName="DFRRowDeleted" msprop:Generator_UserTableName="DFR" msprop:Generator_RowChangedName="DFRRowChanged" msprop:Generator_RowEvArgName="DFRRowChangeEvent" msprop:Generator_RowClassName="DFRRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="IdxDossier" msprop:Generator_ColumnVarNameInTable="columnIdxDossier" msprop:Generator_ColumnPropNameInRow="IdxDossier" msprop:Generator_ColumnPropNameInTable="IdxDossierColumn" msprop:Generator_UserColumnName="IdxDossier" type="xs:int" />
@@ -2283,11 +2282,10 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa
     <xs:unique name="Misure_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true">
       <xs:selector xpath=".//mstns:Misure" />
       <xs:field xpath="mstns:IdxDossier" />
-      <xs:field xpath="mstns:CodScheda" />
-      <xs:field xpath="mstns:Vers" />
-      <xs:field xpath="mstns:NumScheda" />
+      <xs:field xpath="mstns:CodSchedaVersNum" />
       <xs:field xpath="mstns:CodMisura" />
       <xs:field xpath="mstns:Fase" />
+      <xs:field xpath="mstns:Rev" />
     </xs:unique>
     <xs:unique name="Tags2Macchine_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true">
       <xs:selector xpath=".//mstns:Tags2Macchine" />
@@ -2313,18 +2311,16 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa
   </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_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_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_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_ElencoDossier_ElencoMacchineCN" msdata:parent="ElencoMacchineCN" msdata:child="ElencoDossier" msdata:parentkey="Matricola" msdata:childkey="Matricola" msprop:Generator_UserChildTable="ElencoDossier" msprop:Generator_ChildPropName="GetElencoDossierRows" msprop:Generator_UserRelationName="FK_ElencoDossier_ElencoMacchineCN" msprop:Generator_RelationVarName="relationFK_ElencoDossier_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_SchemaCollMacc_ElencoDossier" msdata:parent="ElencoDossier" msdata:child="SchemaCollMacc" msdata:parentkey="IdxDossier" msdata:childkey="IdxDossier" msprop:Generator_UserChildTable="SchemaCollMacc" msprop:Generator_ChildPropName="GetSchemaCollMaccRows" msprop:Generator_UserRelationName="FK_SchemaCollMacc_ElencoDossier" msprop:Generator_RelationVarName="relationFK_SchemaCollMacc_ElencoDossier" msprop:Generator_UserParentTable="ElencoDossier" msprop:Generator_ParentPropName="ElencoDossierRow" />
-      <msdata:Relationship name="FK_IstanzeMisura_AnagFasi1" 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_AnagFasi1" msprop:Generator_RelationVarName="relationFK_IstanzeMisura_AnagFasi1" msprop:Generator_UserParentTable="AnagFasi" msprop:Generator_ParentPropName="AnagFasiRow" />
-      <msdata:Relationship name="FK_Misure_SchemaCollMacc1" msdata:parent="SchemaCollMacc" msdata:child="Misure" msdata:parentkey="IdxDossier CodScheda Vers NumScheda" msdata:childkey="IdxDossier 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_Tags2Macchine_ElencoMacchineCN" msdata:parent="ElencoMacchineCN" msdata:child="Tags2Macchine" msdata:parentkey="Matricola" msdata:childkey="Matricola" msprop:Generator_UserChildTable="Tags2Macchine" msprop:Generator_ChildPropName="GetTags2MacchineRows" msprop:Generator_UserRelationName="FK_Tags2Macchine_ElencoMacchineCN" msprop:Generator_RelationVarName="relationFK_Tags2Macchine_ElencoMacchineCN" msprop:Generator_UserParentTable="ElencoMacchineCN" msprop:Generator_ParentPropName="ElencoMacchineCNRow" />
-      <msdata:Relationship name="FK_Tags2Macchine_AnagTags" msdata:parent="AnagTags" msdata:child="Tags2Macchine" msdata:parentkey="TagCode" msdata:childkey="TagCode" msprop:Generator_UserChildTable="Tags2Macchine" msprop:Generator_ChildPropName="GetTags2MacchineRows" msprop:Generator_UserRelationName="FK_Tags2Macchine_AnagTags" msprop:Generator_ParentPropName="AnagTagsRow" msprop:Generator_RelationVarName="relationFK_Tags2Macchine_AnagTags" msprop:Generator_UserParentTable="AnagTags" />
+      <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_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_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" />
+      <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_ElencoDossier_ElencoMacchineCN" msdata:parent="ElencoMacchineCN" msdata:child="ElencoDossier" msdata:parentkey="Matricola" msdata:childkey="Matricola" msprop:Generator_UserChildTable="ElencoDossier" msprop:Generator_ChildPropName="GetElencoDossierRows" msprop:Generator_UserRelationName="FK_ElencoDossier_ElencoMacchineCN" msprop:Generator_ParentPropName="ElencoMacchineCNRow" msprop:Generator_RelationVarName="relationFK_ElencoDossier_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_SchemaCollMacc_ElencoDossier" msdata:parent="ElencoDossier" msdata:child="SchemaCollMacc" msdata:parentkey="IdxDossier" msdata:childkey="IdxDossier" msprop:Generator_UserChildTable="SchemaCollMacc" msprop:Generator_ChildPropName="GetSchemaCollMaccRows" msprop:Generator_UserRelationName="FK_SchemaCollMacc_ElencoDossier" msprop:Generator_ParentPropName="ElencoDossierRow" msprop:Generator_RelationVarName="relationFK_SchemaCollMacc_ElencoDossier" msprop:Generator_UserParentTable="ElencoDossier" />
+      <msdata:Relationship name="FK_Tags2Macchine_ElencoMacchineCN" msdata:parent="ElencoMacchineCN" msdata:child="Tags2Macchine" msdata:parentkey="Matricola" msdata:childkey="Matricola" msprop:Generator_UserChildTable="Tags2Macchine" msprop:Generator_ChildPropName="GetTags2MacchineRows" msprop:Generator_UserRelationName="FK_Tags2Macchine_ElencoMacchineCN" msprop:Generator_ParentPropName="ElencoMacchineCNRow" msprop:Generator_RelationVarName="relationFK_Tags2Macchine_ElencoMacchineCN" msprop:Generator_UserParentTable="ElencoMacchineCN" />
+      <msdata:Relationship name="FK_Tags2Macchine_AnagTags" msdata:parent="AnagTags" msdata:child="Tags2Macchine" msdata:parentkey="TagCode" msdata:childkey="TagCode" msprop:Generator_UserChildTable="Tags2Macchine" msprop:Generator_ChildPropName="GetTags2MacchineRows" msprop:Generator_UserRelationName="FK_Tags2Macchine_AnagTags" msprop:Generator_RelationVarName="relationFK_Tags2Macchine_AnagTags" msprop:Generator_UserParentTable="AnagTags" msprop:Generator_ParentPropName="AnagTagsRow" />
     </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 16cd632..03fa395 100644
--- a/CMS-SC-Data/DS_Applicazione.xss
+++ b/CMS-SC-Data/DS_Applicazione.xss
@@ -6,11 +6,11 @@
 </autogenerated>-->
 <DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="-49" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
-    <Shape ID="DesignTable:ElencoFamMacc" ZOrder="26" X="598" Y="-22" Height="227" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="99" />
+    <Shape ID="DesignTable:ElencoFamMacc" ZOrder="24" X="598" Y="-22" Height="227" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="99" />
     <Shape ID="DesignTable:ElencoMacchineCN" ZOrder="12" X="1029" Y="-32" Height="365" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="214" />
     <Shape ID="DesignTable:AnagFasi" ZOrder="10" X="1097" Y="812" Height="204" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="76" />
     <Shape ID="DesignTable:AnagSchede" ZOrder="2" X="55" Y="436" Height="319" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="168" />
-    <Shape ID="DesignTable:DettScheda" ZOrder="5" X="420" Y="536" Height="388" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="191" />
+    <Shape ID="DesignTable:DettScheda" ZOrder="5" X="420" Y="536" Height="342" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="191" />
     <Shape ID="DesignTable:ValidVal" ZOrder="14" X="59" Y="778" Height="342" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="191" />
     <Shape ID="DesignTable:SchemaCollFamMacc" ZOrder="3" X="51" Y="-39" Height="411" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="260" />
     <Shape ID="DesignTable:ElencoDossier" ZOrder="9" X="1070" Y="325" Height="434" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="283" />
@@ -24,7 +24,7 @@
     <Shape ID="DesignTable:DFR" ZOrder="8" X="738" Y="1126" Height="204" Width="232" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="99" />
   </Shapes>
   <Connectors>
-    <Connector ID="DesignRelation:FK_DettScheda_AnagSchede1" ZOrder="28" LineWidth="11">
+    <Connector ID="DesignRelation:FK_DettScheda_AnagSchede1" ZOrder="26" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>355</X>
@@ -36,7 +36,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_ElencoMacchineCN_ElencoFamMacc" ZOrder="27" LineWidth="11">
+    <Connector ID="DesignRelation:FK_ElencoMacchineCN_ElencoFamMacc" ZOrder="25" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>898</X>
@@ -48,19 +48,19 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_ValidVal_DettScheda" ZOrder="25" LineWidth="11">
+    <Connector ID="DesignRelation:FK_ValidVal_DettScheda" ZOrder="23" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>420</X>
-          <Y>905</Y>
+          <Y>878</Y>
         </Point>
         <Point>
           <X>359</X>
-          <Y>905</Y>
+          <Y>878</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_SchemaCollFamMacc_AnagSchede1" ZOrder="23" LineWidth="11">
+    <Connector ID="DesignRelation:FK_SchemaCollFamMacc_AnagSchede1" ZOrder="21" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>204</X>
@@ -72,7 +72,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_SchemaCollFamMacc_ElencoFamMacc" ZOrder="24" LineWidth="11">
+    <Connector ID="DesignRelation:FK_SchemaCollFamMacc_ElencoFamMacc" ZOrder="22" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>598</X>
@@ -112,7 +112,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_SchemaCollMacc_ElencoDossier" ZOrder="22" LineWidth="11">
+    <Connector ID="DesignRelation:FK_SchemaCollMacc_ElencoDossier" ZOrder="20" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>1070</X>
@@ -124,30 +124,6 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_IstanzeMisura_AnagFasi1" ZOrder="21" LineWidth="11">
-      <RoutePoints>
-        <Point>
-          <X>1097</X>
-          <Y>930</Y>
-        </Point>
-        <Point>
-          <X>1035</X>
-          <Y>930</Y>
-        </Point>
-      </RoutePoints>
-    </Connector>
-    <Connector ID="DesignRelation:FK_Misure_SchemaCollMacc1" ZOrder="20" LineWidth="11">
-      <RoutePoints>
-        <Point>
-          <X>792</X>
-          <Y>549</Y>
-        </Point>
-        <Point>
-          <X>792</X>
-          <Y>583</Y>
-        </Point>
-      </RoutePoints>
-    </Connector>
     <Connector ID="DesignRelation:FK_Tags2Macchine_ElencoMacchineCN" ZOrder="17" LineWidth="11">
       <RoutePoints>
         <Point>
diff --git a/CMS-SC-Data/obj/Debug/CMS-SC-Data.csproj.CoreCompileInputs.cache b/CMS-SC-Data/obj/Debug/CMS-SC-Data.csproj.CoreCompileInputs.cache
index 9147403..81395e3 100644
--- a/CMS-SC-Data/obj/Debug/CMS-SC-Data.csproj.CoreCompileInputs.cache
+++ b/CMS-SC-Data/obj/Debug/CMS-SC-Data.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-c355ee6932ff22a2f6c7d84b3449927b5b4b5506
+73bbb3de17cae454ab54595b2c5a3ff7389a549e
diff --git a/CMS-SC-Data/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/CMS-SC-Data/obj/Debug/DesignTimeResolveAssemblyReferences.cache
index 44ab5d7..9a97df2 100644
Binary files a/CMS-SC-Data/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/CMS-SC-Data/obj/Debug/DesignTimeResolveAssemblyReferences.cache 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 1fefc26..f72c277 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_StatoCollaudi.ascx.cs b/CMS_SC/WebUserControls/mod_StatoCollaudi.ascx.cs
index 667ed45..26d95b2 100644
--- a/CMS_SC/WebUserControls/mod_StatoCollaudi.ascx.cs
+++ b/CMS_SC/WebUserControls/mod_StatoCollaudi.ascx.cs
@@ -12,7 +12,7 @@ namespace CMS_SC.WebUserControls
     {
       if (!Page.IsPostBack)
       {
-        grView.DataBind();
+        doUpdate();
       }
     }
     /// <summary>
@@ -41,7 +41,7 @@ namespace CMS_SC.WebUserControls
       set
       {
         hfIdxDossier.Value = value;
-        grView.DataBind();
+        //grView.DataBind();
       }
     }
     /// <summary>
@@ -56,7 +56,7 @@ namespace CMS_SC.WebUserControls
       set
       {
         hfFase.Value = value;
-        grView.DataBind();
+        //grView.DataBind();
       }
     }
     /// <summary>
@@ -73,7 +73,7 @@ namespace CMS_SC.WebUserControls
       set
       {
         hfRev.Value = value.ToString();
-        grView.DataBind();
+        //grView.DataBind();
       }
     }
 
@@ -117,7 +117,7 @@ namespace CMS_SC.WebUserControls
         // salvo parametro
         savePar("ddlSelScheda", CodSchedaVersNum);
         // fix visualizzazione...
-        grView.DataBind();
+        doUpdate();
         // sollevo evento...
         raiseEvent(ucEvType.Selected);
       }
@@ -138,7 +138,7 @@ namespace CMS_SC.WebUserControls
     protected void lbtShowAll_Click(object sender, EventArgs e)
     {
       grView.SelectedIndex = -1;
-      grView.DataBind();
+      doUpdate();
       // salvo parametro
       savePar("ddlSelScheda", "");
       raiseEvent(ucEvType.ReqUpdateParent);
@@ -153,11 +153,11 @@ namespace CMS_SC.WebUserControls
     public void resetSelezione()
     {
       grView.SelectedIndex = -1;
-      grView.DataBind();
+      doUpdate();
       // salvo parametro
       savePar("ddlSelScheda", "");
       raiseEvent(ucEvType.Reset);
     }
-    
+
   }
 }
\ No newline at end of file
diff --git a/CMS_SC/WebUserControls/mod_collaudi.ascx.cs b/CMS_SC/WebUserControls/mod_collaudi.ascx.cs
index 747b68e..298469f 100644
--- a/CMS_SC/WebUserControls/mod_collaudi.ascx.cs
+++ b/CMS_SC/WebUserControls/mod_collaudi.ascx.cs
@@ -104,7 +104,7 @@ namespace CMS_SC.WebUserControls
       }
       catch (Exception exc)
       {
-        logger.lg.scriviLog(string.Format("Eccezione in databind, valori filtro{0}Dossier: [{1}]{0}CodScheda: [{2}]{0}Fase: [{3}]{0}Eccezione:{0}{4}", Environment.NewLine, IdxDossier, CodSchedaVers, Fase, exc));
+        logger.lg.scriviLog(string.Format("Eccezione in databind, valori filtro{0}Dossier: [{1}]{0}CodScheda: [{2}]{0}Fase: [{3}]{0}Rev: [{4}]{0}Eccezione:{0}{5}", Environment.NewLine, IdxDossier, CodSchedaVers, Fase, Rev, exc));
       }
     }
     /// <summary>
diff --git a/CMS_SC/bin/CMS-SC-Data.dll b/CMS_SC/bin/CMS-SC-Data.dll
index 9903d44..74104cf 100644
Binary files a/CMS_SC/bin/CMS-SC-Data.dll and b/CMS_SC/bin/CMS-SC-Data.dll differ
diff --git a/Jenkinsfile b/Jenkinsfile
index 79f43b1..b738f08 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,7 +14,7 @@ pipeline {
 
 				/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
 				script {
-					withEnv(['NEXT_BUILD_NUMBER=4220']) {
+					withEnv(['NEXT_BUILD_NUMBER=4221']) {
 						// env.versionNumber = VersionNumber(versionNumberString : '${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
 						env.versionNumber = VersionNumber(versionNumberString : '${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
     					env.APP_NAME = 'CMS-SC'