diff --git a/Projects/WebGIM/GIM_data/DS_applicazione.Designer.cs b/Projects/WebGIM/GIM_data/DS_applicazione.Designer.cs
index 8822324..af6beca 100644
--- a/Projects/WebGIM/GIM_data/DS_applicazione.Designer.cs
+++ b/Projects/WebGIM/GIM_data/DS_applicazione.Designer.cs
@@ -8182,6 +8182,8 @@ namespace GIM_data {
             
             private global::System.Data.DataColumn columnTotImport;
             
+            private global::System.Data.DataColumn columnNote;
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
             public ImpiegoRisorseDataTable() {
@@ -8263,6 +8265,14 @@ namespace GIM_data {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public global::System.Data.DataColumn NoteColumn {
+                get {
+                    return this.columnNote;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
             [global::System.ComponentModel.Browsable(false)]
@@ -8300,7 +8310,7 @@ namespace GIM_data {
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
-            public ImpiegoRisorseRow AddImpiegoRisorseRow(int idxImpiego, AnagTipoRisorsaRow parentAnagTipoRisorsaRowByFK_ImpiegoRisorse_AnagTipoRisorsa, v_intervExpRow parentv_intervExpRowByv_intervExp_ImpiegoRisorse, decimal QtaRisorsa, decimal CostoUnit, decimal TotImport) {
+            public ImpiegoRisorseRow AddImpiegoRisorseRow(int idxImpiego, AnagTipoRisorsaRow parentAnagTipoRisorsaRowByFK_ImpiegoRisorse_AnagTipoRisorsa, v_intervExpRow parentv_intervExpRowByv_intervExp_ImpiegoRisorse, decimal QtaRisorsa, decimal CostoUnit, decimal TotImport, string Note) {
                 ImpiegoRisorseRow rowImpiegoRisorseRow = ((ImpiegoRisorseRow)(this.NewRow()));
                 object[] columnValuesArray = new object[] {
                         idxImpiego,
@@ -8308,7 +8318,8 @@ namespace GIM_data {
                         null,
                         QtaRisorsa,
                         CostoUnit,
-                        TotImport};
+                        TotImport,
+                        Note};
                 if ((parentAnagTipoRisorsaRowByFK_ImpiegoRisorse_AnagTipoRisorsa != null)) {
                     columnValuesArray[1] = parentAnagTipoRisorsaRowByFK_ImpiegoRisorse_AnagTipoRisorsa[0];
                 }
@@ -8350,6 +8361,7 @@ namespace GIM_data {
                 this.columnQtaRisorsa = base.Columns["QtaRisorsa"];
                 this.columnCostoUnit = base.Columns["CostoUnit"];
                 this.columnTotImport = base.Columns["TotImport"];
+                this.columnNote = base.Columns["Note"];
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -8367,6 +8379,8 @@ namespace GIM_data {
                 base.Columns.Add(this.columnCostoUnit);
                 this.columnTotImport = new global::System.Data.DataColumn("TotImport", typeof(decimal), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnTotImport);
+                this.columnNote = new global::System.Data.DataColumn("Note", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnNote);
                 this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
                                 this.columnidxImpiego}, true));
                 this.columnidxImpiego.AllowDBNull = false;
@@ -8374,7 +8388,11 @@ namespace GIM_data {
                 this.columnCodRisorsa.AllowDBNull = false;
                 this.columnCodRisorsa.MaxLength = 10;
                 this.columnnumIntMtz.AllowDBNull = false;
+                this.columnQtaRisorsa.AllowDBNull = false;
+                this.columnCostoUnit.AllowDBNull = false;
                 this.columnTotImport.ReadOnly = true;
+                this.columnNote.AllowDBNull = false;
+                this.columnNote.MaxLength = 2147483647;
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -12140,12 +12158,7 @@ namespace GIM_data {
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
             public decimal QtaRisorsa {
                 get {
-                    try {
-                        return ((decimal)(this[this.tableImpiegoRisorse.QtaRisorsaColumn]));
-                    }
-                    catch (global::System.InvalidCastException e) {
-                        throw new global::System.Data.StrongTypingException("The value for column \'QtaRisorsa\' in table \'ImpiegoRisorse\' is DBNull.", e);
-                    }
+                    return ((decimal)(this[this.tableImpiegoRisorse.QtaRisorsaColumn]));
                 }
                 set {
                     this[this.tableImpiegoRisorse.QtaRisorsaColumn] = value;
@@ -12156,12 +12169,7 @@ namespace GIM_data {
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
             public decimal CostoUnit {
                 get {
-                    try {
-                        return ((decimal)(this[this.tableImpiegoRisorse.CostoUnitColumn]));
-                    }
-                    catch (global::System.InvalidCastException e) {
-                        throw new global::System.Data.StrongTypingException("The value for column \'CostoUnit\' in table \'ImpiegoRisorse\' is DBNull.", e);
-                    }
+                    return ((decimal)(this[this.tableImpiegoRisorse.CostoUnitColumn]));
                 }
                 set {
                     this[this.tableImpiegoRisorse.CostoUnitColumn] = value;
@@ -12184,6 +12192,17 @@ namespace GIM_data {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public string Note {
+                get {
+                    return ((string)(this[this.tableImpiegoRisorse.NoteColumn]));
+                }
+                set {
+                    this[this.tableImpiegoRisorse.NoteColumn] = value;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
             public AnagTipoRisorsaRow AnagTipoRisorsaRow {
@@ -12206,30 +12225,6 @@ namespace GIM_data {
                 }
             }
             
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
-            public bool IsQtaRisorsaNull() {
-                return this.IsNull(this.tableImpiegoRisorse.QtaRisorsaColumn);
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
-            public void SetQtaRisorsaNull() {
-                this[this.tableImpiegoRisorse.QtaRisorsaColumn] = global::System.Convert.DBNull;
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
-            public bool IsCostoUnitNull() {
-                return this.IsNull(this.tableImpiegoRisorse.CostoUnitColumn);
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
-            public void SetCostoUnitNull() {
-                this[this.tableImpiegoRisorse.CostoUnitColumn] = global::System.Convert.DBNull;
-            }
-            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
             public bool IsTotImportNull() {
@@ -20945,6 +20940,7 @@ ORDER BY numIntMtz DESC";
             tableMapping.ColumnMappings.Add("QtaRisorsa", "QtaRisorsa");
             tableMapping.ColumnMappings.Add("CostoUnit", "CostoUnit");
             tableMapping.ColumnMappings.Add("TotImport", "TotImport");
+            tableMapping.ColumnMappings.Add("Note", "Note");
             this._adapter.TableMappings.Add(tableMapping);
             this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand();
             this._adapter.DeleteCommand.Connection = this.Connection;
@@ -20953,26 +20949,26 @@ ORDER BY numIntMtz DESC";
             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idxImpiego", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idxImpiego", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand();
             this._adapter.InsertCommand.Connection = this.Connection;
-            this._adapter.InsertCommand.CommandText = "INSERT INTO [dbo].[ImpiegoRisorse] ([idxImpiego], [CodRisorsa], [numIntMtz], [Qta" +
-                "Risorsa], [CostoUnit]) VALUES (@idxImpiego, @CodRisorsa, @numIntMtz, @QtaRisorsa" +
-                ", @CostoUnit)";
+            this._adapter.InsertCommand.CommandText = "INSERT INTO [dbo].[ImpiegoRisorse] ([CodRisorsa], [numIntMtz], [QtaRisorsa], [Cos" +
+                "toUnit], [Note]) VALUES (@CodRisorsa, @numIntMtz, @QtaRisorsa, @CostoUnit, @Note" +
+                ")";
             this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text;
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxImpiego", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idxImpiego", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodRisorsa", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodRisorsa", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@numIntMtz", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "numIntMtz", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@QtaRisorsa", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 6, "QtaRisorsa", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CostoUnit", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 6, "CostoUnit", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Note", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Note", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand();
             this._adapter.UpdateCommand.Connection = this.Connection;
-            this._adapter.UpdateCommand.CommandText = "UPDATE [dbo].[ImpiegoRisorse] SET [idxImpiego] = @idxImpiego, [CodRisorsa] = @Cod" +
-                "Risorsa, [numIntMtz] = @numIntMtz, [QtaRisorsa] = @QtaRisorsa, [CostoUnit] = @Co" +
-                "stoUnit WHERE (([idxImpiego] = @Original_idxImpiego))";
+            this._adapter.UpdateCommand.CommandText = "UPDATE [dbo].[ImpiegoRisorse] SET [CodRisorsa] = @CodRisorsa, [numIntMtz] = @numI" +
+                "ntMtz, [QtaRisorsa] = @QtaRisorsa, [CostoUnit] = @CostoUnit, [Note] = @Note WHER" +
+                "E (([idxImpiego] = @Original_idxImpiego))";
             this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text;
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxImpiego", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idxImpiego", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodRisorsa", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodRisorsa", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@numIntMtz", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "numIntMtz", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@QtaRisorsa", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 6, "QtaRisorsa", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CostoUnit", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 6, "CostoUnit", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Note", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Note", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idxImpiego", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idxImpiego", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
         }
         
@@ -20989,8 +20985,7 @@ ORDER BY numIntMtz DESC";
             this._commandCollection = new global::System.Data.SqlClient.SqlCommand[4];
             this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[0].Connection = this.Connection;
-            this._commandCollection[0].CommandText = "SELECT idxImpiego, CodRisorsa, numIntMtz, QtaRisorsa, CostoUnit, TotImport FROM d" +
-                "bo.ImpiegoRisorse";
+            this._commandCollection[0].CommandText = "SELECT * FROM dbo.ImpiegoRisorse";
             this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
             this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[1].Connection = this.Connection;
@@ -21007,6 +21002,7 @@ ORDER BY numIntMtz DESC";
             this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@numIntMtz", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@QtaRisorsa", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 6, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CostoUnit", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 6, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Note", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[3].Connection = this.Connection;
             this._commandCollection[3].CommandText = "dbo.stp_ImpRis_update";
@@ -21017,6 +21013,7 @@ ORDER BY numIntMtz DESC";
             this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@numIntMtz", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@QtaRisorsa", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 6, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CostoUnit", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 6, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Note", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
         }
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -21098,26 +21095,21 @@ ORDER BY numIntMtz DESC";
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Insert, true)]
-        public virtual int Insert(int idxImpiego, string CodRisorsa, int numIntMtz, global::System.Nullable<decimal> QtaRisorsa, global::System.Nullable<decimal> CostoUnit) {
-            this.Adapter.InsertCommand.Parameters[0].Value = ((int)(idxImpiego));
+        public virtual int Insert(string CodRisorsa, int numIntMtz, decimal QtaRisorsa, decimal CostoUnit, string Note) {
             if ((CodRisorsa == null)) {
                 throw new global::System.ArgumentNullException("CodRisorsa");
             }
             else {
-                this.Adapter.InsertCommand.Parameters[1].Value = ((string)(CodRisorsa));
+                this.Adapter.InsertCommand.Parameters[0].Value = ((string)(CodRisorsa));
             }
-            this.Adapter.InsertCommand.Parameters[2].Value = ((int)(numIntMtz));
-            if ((QtaRisorsa.HasValue == true)) {
-                this.Adapter.InsertCommand.Parameters[3].Value = ((decimal)(QtaRisorsa.Value));
+            this.Adapter.InsertCommand.Parameters[1].Value = ((int)(numIntMtz));
+            this.Adapter.InsertCommand.Parameters[2].Value = ((decimal)(QtaRisorsa));
+            this.Adapter.InsertCommand.Parameters[3].Value = ((decimal)(CostoUnit));
+            if ((Note == null)) {
+                throw new global::System.ArgumentNullException("Note");
             }
             else {
-                this.Adapter.InsertCommand.Parameters[3].Value = global::System.DBNull.Value;
-            }
-            if ((CostoUnit.HasValue == true)) {
-                this.Adapter.InsertCommand.Parameters[4].Value = ((decimal)(CostoUnit.Value));
-            }
-            else {
-                this.Adapter.InsertCommand.Parameters[4].Value = global::System.DBNull.Value;
+                this.Adapter.InsertCommand.Parameters[4].Value = ((string)(Note));
             }
             global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State;
             if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) 
@@ -21139,26 +21131,21 @@ ORDER BY numIntMtz DESC";
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, true)]
-        public virtual int Update(int idxImpiego, string CodRisorsa, int numIntMtz, global::System.Nullable<decimal> QtaRisorsa, global::System.Nullable<decimal> CostoUnit, int Original_idxImpiego) {
-            this.Adapter.UpdateCommand.Parameters[0].Value = ((int)(idxImpiego));
+        public virtual int Update(string CodRisorsa, int numIntMtz, decimal QtaRisorsa, decimal CostoUnit, string Note, int Original_idxImpiego) {
             if ((CodRisorsa == null)) {
                 throw new global::System.ArgumentNullException("CodRisorsa");
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[1].Value = ((string)(CodRisorsa));
+                this.Adapter.UpdateCommand.Parameters[0].Value = ((string)(CodRisorsa));
             }
-            this.Adapter.UpdateCommand.Parameters[2].Value = ((int)(numIntMtz));
-            if ((QtaRisorsa.HasValue == true)) {
-                this.Adapter.UpdateCommand.Parameters[3].Value = ((decimal)(QtaRisorsa.Value));
+            this.Adapter.UpdateCommand.Parameters[1].Value = ((int)(numIntMtz));
+            this.Adapter.UpdateCommand.Parameters[2].Value = ((decimal)(QtaRisorsa));
+            this.Adapter.UpdateCommand.Parameters[3].Value = ((decimal)(CostoUnit));
+            if ((Note == null)) {
+                throw new global::System.ArgumentNullException("Note");
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[3].Value = global::System.DBNull.Value;
-            }
-            if ((CostoUnit.HasValue == true)) {
-                this.Adapter.UpdateCommand.Parameters[4].Value = ((decimal)(CostoUnit.Value));
-            }
-            else {
-                this.Adapter.UpdateCommand.Parameters[4].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[4].Value = ((string)(Note));
             }
             this.Adapter.UpdateCommand.Parameters[5].Value = ((int)(Original_idxImpiego));
             global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State;
@@ -21177,14 +21164,6 @@ ORDER BY numIntMtz DESC";
             }
         }
         
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
-        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
-        [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, true)]
-        public virtual int Update(string CodRisorsa, int numIntMtz, global::System.Nullable<decimal> QtaRisorsa, global::System.Nullable<decimal> CostoUnit, int Original_idxImpiego) {
-            return this.Update(Original_idxImpiego, CodRisorsa, numIntMtz, QtaRisorsa, CostoUnit, Original_idxImpiego);
-        }
-        
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
@@ -21216,7 +21195,7 @@ ORDER BY numIntMtz DESC";
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
-        public virtual int insertQuery(string CodRisorsa, global::System.Nullable<int> numIntMtz, global::System.Nullable<decimal> QtaRisorsa, global::System.Nullable<decimal> CostoUnit) {
+        public virtual int insertQuery(string CodRisorsa, global::System.Nullable<int> numIntMtz, global::System.Nullable<decimal> QtaRisorsa, global::System.Nullable<decimal> CostoUnit, string Note) {
             global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[2];
             if ((CodRisorsa == null)) {
                 command.Parameters[1].Value = global::System.DBNull.Value;
@@ -21242,6 +21221,12 @@ ORDER BY numIntMtz DESC";
             else {
                 command.Parameters[4].Value = global::System.DBNull.Value;
             }
+            if ((Note == null)) {
+                command.Parameters[5].Value = global::System.DBNull.Value;
+            }
+            else {
+                command.Parameters[5].Value = ((string)(Note));
+            }
             global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
             if (((command.Connection.State & global::System.Data.ConnectionState.Open) 
                         != global::System.Data.ConnectionState.Open)) {
@@ -21262,7 +21247,7 @@ ORDER BY numIntMtz DESC";
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
-        public virtual int updateQuery(global::System.Nullable<int> Original_idxImpiego, string CodRisorsa, global::System.Nullable<int> numIntMtz, global::System.Nullable<decimal> QtaRisorsa, global::System.Nullable<decimal> CostoUnit) {
+        public virtual int updateQuery(global::System.Nullable<int> Original_idxImpiego, string CodRisorsa, global::System.Nullable<int> numIntMtz, global::System.Nullable<decimal> QtaRisorsa, global::System.Nullable<decimal> CostoUnit, string Note) {
             global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[3];
             if ((Original_idxImpiego.HasValue == true)) {
                 command.Parameters[1].Value = ((int)(Original_idxImpiego.Value));
@@ -21294,6 +21279,12 @@ ORDER BY numIntMtz DESC";
             else {
                 command.Parameters[5].Value = global::System.DBNull.Value;
             }
+            if ((Note == null)) {
+                command.Parameters[6].Value = global::System.DBNull.Value;
+            }
+            else {
+                command.Parameters[6].Value = ((string)(Note));
+            }
             global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
             if (((command.Connection.State & global::System.Data.ConnectionState.Open) 
                         != global::System.Data.ConnectionState.Open)) {
diff --git a/Projects/WebGIM/GIM_data/DS_applicazione.xsd b/Projects/WebGIM/GIM_data/DS_applicazione.xsd
index b17f7de..a695789 100644
--- a/Projects/WebGIM/GIM_data/DS_applicazione.xsd
+++ b/Projects/WebGIM/GIM_data/DS_applicazione.xsd
@@ -1590,31 +1590,31 @@ WHERE     (idxCausale = @Original_idxCausale)</CommandText>
                 </DeleteCommand>
                 <InsertCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>INSERT INTO [dbo].[ImpiegoRisorse] ([idxImpiego], [CodRisorsa], [numIntMtz], [QtaRisorsa], [CostoUnit]) VALUES (@idxImpiego, @CodRisorsa, @numIntMtz, @QtaRisorsa, @CostoUnit)</CommandText>
+                    <CommandText>INSERT INTO [dbo].[ImpiegoRisorse] ([CodRisorsa], [numIntMtz], [QtaRisorsa], [CostoUnit], [Note]) VALUES (@CodRisorsa, @numIntMtz, @QtaRisorsa, @CostoUnit, @Note)</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@idxImpiego" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="idxImpiego" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@CodRisorsa" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CodRisorsa" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@numIntMtz" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="numIntMtz" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Decimal" Direction="Input" ParameterName="@QtaRisorsa" Precision="18" ProviderType="Decimal" Scale="6" Size="0" SourceColumn="QtaRisorsa" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Decimal" Direction="Input" ParameterName="@CostoUnit" Precision="18" ProviderType="Decimal" Scale="6" Size="0" SourceColumn="CostoUnit" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Decimal" Direction="Input" ParameterName="@QtaRisorsa" Precision="18" ProviderType="Decimal" Scale="6" Size="0" SourceColumn="QtaRisorsa" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Decimal" Direction="Input" ParameterName="@CostoUnit" Precision="18" ProviderType="Decimal" Scale="6" Size="0" SourceColumn="CostoUnit" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Note" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="Note" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </InsertCommand>
                 <SelectCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>SELECT idxImpiego, CodRisorsa, numIntMtz, QtaRisorsa, CostoUnit, TotImport FROM dbo.ImpiegoRisorse</CommandText>
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>SELECT * FROM dbo.ImpiegoRisorse</CommandText>
                     <Parameters />
                   </DbCommand>
                 </SelectCommand>
                 <UpdateCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>UPDATE [dbo].[ImpiegoRisorse] SET [idxImpiego] = @idxImpiego, [CodRisorsa] = @CodRisorsa, [numIntMtz] = @numIntMtz, [QtaRisorsa] = @QtaRisorsa, [CostoUnit] = @CostoUnit WHERE (([idxImpiego] = @Original_idxImpiego))</CommandText>
+                    <CommandText>UPDATE [dbo].[ImpiegoRisorse] SET [CodRisorsa] = @CodRisorsa, [numIntMtz] = @numIntMtz, [QtaRisorsa] = @QtaRisorsa, [CostoUnit] = @CostoUnit, [Note] = @Note WHERE (([idxImpiego] = @Original_idxImpiego))</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@idxImpiego" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="idxImpiego" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@CodRisorsa" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CodRisorsa" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@numIntMtz" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="numIntMtz" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Decimal" Direction="Input" ParameterName="@QtaRisorsa" Precision="18" ProviderType="Decimal" Scale="6" Size="0" SourceColumn="QtaRisorsa" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Decimal" Direction="Input" ParameterName="@CostoUnit" Precision="18" ProviderType="Decimal" Scale="6" Size="0" SourceColumn="CostoUnit" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Decimal" Direction="Input" ParameterName="@QtaRisorsa" Precision="18" ProviderType="Decimal" Scale="6" Size="0" SourceColumn="QtaRisorsa" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Decimal" Direction="Input" ParameterName="@CostoUnit" Precision="18" ProviderType="Decimal" Scale="6" Size="0" SourceColumn="CostoUnit" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Note" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="Note" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_idxImpiego" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="idxImpiego" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
                   </DbCommand>
@@ -1628,6 +1628,7 @@ WHERE     (idxCausale = @Original_idxCausale)</CommandText>
               <Mapping SourceColumn="QtaRisorsa" DataSetColumn="QtaRisorsa" />
               <Mapping SourceColumn="CostoUnit" DataSetColumn="CostoUnit" />
               <Mapping SourceColumn="TotImport" DataSetColumn="TotImport" />
+              <Mapping SourceColumn="Note" DataSetColumn="Note" />
             </Mappings>
             <Sources>
               <DbSource ConnectionRef="GIMConnectionString (Web.config)" DbObjectName="GIM.dbo.stp_ImpRis_delete" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="deleteQuery" Modifier="Public" Name="deleteQuery" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="deleteQuery">
@@ -1651,6 +1652,7 @@ WHERE     (idxCausale = @Original_idxCausale)</CommandText>
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@numIntMtz" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="decimal" DbType="Decimal" Direction="Input" ParameterName="@QtaRisorsa" Precision="18" ProviderType="Decimal" Scale="6" Size="9" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="decimal" DbType="Decimal" Direction="Input" ParameterName="@CostoUnit" Precision="18" ProviderType="Decimal" Scale="6" Size="9" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@Note" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </SelectCommand>
@@ -1666,6 +1668,7 @@ WHERE     (idxCausale = @Original_idxCausale)</CommandText>
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@numIntMtz" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="decimal" DbType="Decimal" Direction="Input" ParameterName="@QtaRisorsa" Precision="18" ProviderType="Decimal" Scale="6" Size="9" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="decimal" DbType="Decimal" Direction="Input" ParameterName="@CostoUnit" Precision="18" ProviderType="Decimal" Scale="6" Size="9" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@Note" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </SelectCommand>
@@ -2342,9 +2345,16 @@ WHERE     (idxCausale = @Original_idxCausale)</CommandText>
                 </xs:simpleType>
               </xs:element>
               <xs:element name="numIntMtz" msprop:Generator_ColumnVarNameInTable="columnnumIntMtz" msprop:Generator_ColumnPropNameInRow="numIntMtz" msprop:Generator_ColumnPropNameInTable="numIntMtzColumn" msprop:Generator_UserColumnName="numIntMtz" type="xs:int" />
-              <xs:element name="QtaRisorsa" msprop:Generator_ColumnVarNameInTable="columnQtaRisorsa" msprop:Generator_ColumnPropNameInRow="QtaRisorsa" msprop:Generator_ColumnPropNameInTable="QtaRisorsaColumn" msprop:Generator_UserColumnName="QtaRisorsa" type="xs:decimal" minOccurs="0" />
-              <xs:element name="CostoUnit" msprop:Generator_ColumnVarNameInTable="columnCostoUnit" msprop:Generator_ColumnPropNameInRow="CostoUnit" msprop:Generator_ColumnPropNameInTable="CostoUnitColumn" msprop:Generator_UserColumnName="CostoUnit" type="xs:decimal" minOccurs="0" />
+              <xs:element name="QtaRisorsa" msprop:Generator_ColumnVarNameInTable="columnQtaRisorsa" msprop:Generator_ColumnPropNameInRow="QtaRisorsa" msprop:Generator_ColumnPropNameInTable="QtaRisorsaColumn" msprop:Generator_UserColumnName="QtaRisorsa" type="xs:decimal" />
+              <xs:element name="CostoUnit" msprop:Generator_ColumnVarNameInTable="columnCostoUnit" msprop:Generator_ColumnPropNameInRow="CostoUnit" msprop:Generator_ColumnPropNameInTable="CostoUnitColumn" msprop:Generator_UserColumnName="CostoUnit" type="xs:decimal" />
               <xs:element name="TotImport" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnTotImport" msprop:Generator_ColumnPropNameInRow="TotImport" msprop:Generator_ColumnPropNameInTable="TotImportColumn" msprop:Generator_UserColumnName="TotImport" type="xs:decimal" minOccurs="0" />
+              <xs:element name="Note" msprop:Generator_ColumnVarNameInTable="columnNote" msprop:Generator_ColumnPropNameInRow="Note" msprop:Generator_ColumnPropNameInTable="NoteColumn" msprop:Generator_UserColumnName="Note">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="2147483647" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
diff --git a/Projects/WebGIM/GIM_data/DS_applicazione.xss b/Projects/WebGIM/GIM_data/DS_applicazione.xss
index 9ba77af..65484e0 100644
--- a/Projects/WebGIM/GIM_data/DS_applicazione.xss
+++ b/Projects/WebGIM/GIM_data/DS_applicazione.xss
@@ -4,7 +4,7 @@
      Changes to this file may cause incorrect behavior and will be lost if
      the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="64" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="76" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
     <Shape ID="DesignTable:LogUpdateDb" ZOrder="39" X="36" Y="19" Height="122" Width="219" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="58" />
     <Shape ID="DesignTable:AnagAmbitoGuasto" ZOrder="38" X="475" Y="7" Height="134" Width="251" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
@@ -20,15 +20,15 @@
     <Shape ID="DesignTable:MtzProgPending" ZOrder="27" X="821" Y="791" Height="249" Width="235" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="162" />
     <Shape ID="DesignTable:MtzProgrammata" ZOrder="12" X="1141" Y="749" Height="306" Width="241" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="198" />
     <Shape ID="DesignTable:CalendFesteFerie" ZOrder="10" X="76" Y="939" Height="134" Width="242" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:OreAperturaSett" ZOrder="18" X="379" Y="855" Height="191" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
+    <Shape ID="DesignTable:OreAperturaSett" ZOrder="18" X="402" Y="867" Height="191" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
     <Shape ID="DesignTable:FiltroImpianti" ZOrder="22" X="1399" Y="644" Height="122" Width="229" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="58" />
     <Shape ID="DesignTable:FiltroMacchine" ZOrder="23" X="1410" Y="168" Height="122" Width="229" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="58" />
     <Shape ID="DesignTable:FiltroStati" ZOrder="21" X="764" Y="7" Height="122" Width="229" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="58" />
     <Shape ID="DesignTable:AnagCausali" ZOrder="17" X="1433" Y="-40" Height="156" Width="192" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="92" />
-    <Shape ID="DesignTable:AnagrOperMtz" ZOrder="15" X="531" Y="669" Height="145" Width="223" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="77" />
+    <Shape ID="DesignTable:AnagrOperMtz" ZOrder="15" X="531" Y="669" Height="134" Width="223" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
     <Shape ID="DesignTable:v_mtzProgExp" ZOrder="8" X="6" Y="313" Height="343" Width="209" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:ImpiegoRisorse" ZOrder="2" X="248" Y="587" Height="248" Width="222" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
-    <Shape ID="DesignTable:AnagTipoRisorsa" ZOrder="1" X="-10" Y="713" Height="210" Width="209" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:ImpiegoRisorse" ZOrder="1" X="248" Y="580" Height="267" Width="245" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
+    <Shape ID="DesignTable:AnagTipoRisorsa" ZOrder="2" X="-10" Y="713" Height="210" Width="209" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
   </Shapes>
   <Connectors>
     <Connector ID="DesignRelation:FK_AnagMacchine_AnagImpianti" ZOrder="37" LineWidth="11">
@@ -203,11 +203,11 @@
       <RoutePoints>
         <Point>
           <X>754</X>
-          <Y>712</Y>
+          <Y>714</Y>
         </Point>
         <Point>
           <X>793</X>
-          <Y>712</Y>
+          <Y>714</Y>
         </Point>
       </RoutePoints>
     </Connector>
@@ -219,11 +219,11 @@
         </Point>
         <Point>
           <X>121</X>
-          <Y>690</Y>
+          <Y>683</Y>
         </Point>
         <Point>
           <X>248</X>
-          <Y>690</Y>
+          <Y>683</Y>
         </Point>
       </RoutePoints>
     </Connector>
@@ -235,11 +235,11 @@
         </Point>
         <Point>
           <X>569</X>
-          <Y>651</Y>
+          <Y>644</Y>
         </Point>
         <Point>
-          <X>470</X>
-          <Y>651</Y>
+          <X>493</X>
+          <Y>644</Y>
         </Point>
       </RoutePoints>
     </Connector>
diff --git a/Projects/WebGIM/GIM_data/TA_app.cs b/Projects/WebGIM/GIM_data/TA_app.cs
index 70a04c4..2574ac4 100644
--- a/Projects/WebGIM/GIM_data/TA_app.cs
+++ b/Projects/WebGIM/GIM_data/TA_app.cs
@@ -31,6 +31,7 @@ public class TA_app
     public GIM_data.DS_applicazioneTableAdapters.FiltroStatiTableAdapter taFiltSta;
     public GIM_data.DS_applicazioneTableAdapters.AnagCausaliTableAdapter taAnagCau;
     public GIM_data.DS_utilityTableAdapters.v_selOperMtzTableAdapter taSelMatrOp;
+    public GIM_data.DS_applicazioneTableAdapters.ImpiegoRisorseTableAdapter taImpRis;
 
     #endregion
 
@@ -58,6 +59,7 @@ public class TA_app
         taFiltSta = new GIM_data.DS_applicazioneTableAdapters.FiltroStatiTableAdapter();
         taAnagCau = new GIM_data.DS_applicazioneTableAdapters.AnagCausaliTableAdapter();
         taSelMatrOp = new GIM_data.DS_utilityTableAdapters.v_selOperMtzTableAdapter();
+        taImpRis = new GIM_data.DS_applicazioneTableAdapters.ImpiegoRisorseTableAdapter();
     }
     /// <summary>
     /// Singleton
diff --git a/Projects/WebGIM/GIM_data/bin/GIM_data.dll b/Projects/WebGIM/GIM_data/bin/GIM_data.dll
index 85407f4..c36c137 100644
Binary files a/Projects/WebGIM/GIM_data/bin/GIM_data.dll and b/Projects/WebGIM/GIM_data/bin/GIM_data.dll differ
diff --git a/Projects/WebGIM/GIM_data/bin/SteamWare.dll b/Projects/WebGIM/GIM_data/bin/SteamWare.dll
index 19f7e17..fa15e8a 100644
Binary files a/Projects/WebGIM/GIM_data/bin/SteamWare.dll and b/Projects/WebGIM/GIM_data/bin/SteamWare.dll differ
diff --git a/Projects/WebGIM/GIM_site/Web.config b/Projects/WebGIM/GIM_site/Web.config
index bde2c85..56b9e53 100644
--- a/Projects/WebGIM/GIM_site/Web.config
+++ b/Projects/WebGIM/GIM_site/Web.config
@@ -161,6 +161,7 @@
     <!--gestione stampanti--> 
     <add key="stampanteRichiesteMtz" value="PDFCreator" /> 
     <!--template campi nuovi-->
+    <add key="CodRis" value="MAT" />
     <add key="newValuta" value="€" />
     <add key="newAmbitoGuasto" value="-- [NUOVO] non definito --" />
     <add key="newCognome" value="-- [NUOVO] Cognome --" /> 
diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx
index 704bc05..f4e9166 100644
--- a/Projects/WebGIM/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx
+++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx
@@ -189,6 +189,9 @@
                             <asp:Label runat="server" ID="lblInterventi" Text='<%# traduci ("lblInterventi") %>'
                                 Font-Size="X-Small"></asp:Label>
                         </td>
+                        <td style="text-align: center;">
+                            <asp:Label runat="server" ID="lblRisorse" Text='<%# traduci ("lblRisorse") %>' Font-Size="X-Small"></asp:Label>
+                        </td>
                     </tr>
                     <tr>
                         <td>
@@ -410,9 +413,12 @@
                                 Font-Size="X-Small" />
                         </td>
                         <td style="text-align: center;">
-                            <asp:Label runat="server" ID="lblInterventi" Text='<%# traduci ("lblInterventi") %>'
-                                Font-Size="X-Small"></asp:Label>
+                            <asp:Label runat="server" ID="lblInterventi" Text='<%# traduci ("lblInterventi") %>' Font-Size="X-Small"></asp:Label>
                         </td>
+                        <td style="text-align: center;">
+                            <asp:Label runat="server" ID="lblRisorse" Text='<%# traduci ("lblRisorse") %>' Font-Size="X-Small"></asp:Label>
+                        </td>
+
                     </tr>
                     <tr>
                         <td>
@@ -438,7 +444,7 @@
                             <uc1:mod_interventoOpMtz ID="mod_interventoOpMtz1" runat="server" vistaModulo="editing" />
                         </td>
                         <td rowspan="3" style="vertical-align: top; padding-left: 30px;">
-                            <uc3:mod_impiegoRisorse runat="server" id="mod_impiegoRisorse1"  vistaModulo="editing" />
+                            <uc3:mod_impiegoRisorse runat="server" ID="mod_impiegoRisorse1" vistaModulo="editing" />
                         </td>
                     </tr>
                     <tr>
@@ -661,9 +667,12 @@
                                 Font-Size="X-Small" />
                         </td>
                         <td style="text-align: center;">
-                            <asp:Label runat="server" ID="lblInterventi" Text='<%# traduci ("lblInterventi") %>'
-                                Font-Size="X-Small"></asp:Label>
+                            <asp:Label runat="server" ID="lblInterventi" Text='<%# traduci ("lblInterventi") %>' Font-Size="X-Small"></asp:Label>
                         </td>
+                        <td style="text-align: center;">
+                            <asp:Label runat="server" ID="lblRisorse" Text='<%# traduci ("lblRisorse") %>' Font-Size="X-Small"></asp:Label>
+                        </td>
+
                     </tr>
                     <tr>
                         <td>
@@ -691,7 +700,7 @@
                             <uc1:mod_interventoOpMtz ID="mod_interventoOpMtz2" runat="server" vistaModulo="editing" />
                         </td>
                         <td rowspan="3" style="vertical-align: top; padding-left: 30px;">
-                            <uc3:mod_impiegoRisorse runat="server" id="mod_impiegoRisorse2"  vistaModulo="editing" />
+                            <uc3:mod_impiegoRisorse runat="server" ID="mod_impiegoRisorse2" vistaModulo="editing" />
                         </td>
                     </tr>
                     <tr>
diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_impiegoRisorse.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_impiegoRisorse.ascx
index 6415bd8..17d3442 100644
--- a/Projects/WebGIM/GIM_site/WebUserControls/mod_impiegoRisorse.ascx
+++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_impiegoRisorse.ascx
@@ -1,28 +1,6 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_impiegoRisorse.ascx.cs" Inherits="GIM_site.WebUserControls.mod_impiegoRisorse" %>
 <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
 
-
-<%--<asp:TemplateField ShowHeader="False" ItemStyle-HorizontalAlign="Center">
-            <EditItemTemplate>
-                <asp:ImageButton ID="imgUpdate" runat="server" CausesValidation="False" CommandName="Update"
-                    ToolTip='<%# traduci("Update")%>' ImageUrl='<%# imgPath(SteamWare.tipoImg.conferma, SteamWare.dimImg.small) %>' />
-                <asp:ImageButton ID="imgCancel" runat="server" CausesValidation="False" CommandName="Cancel"
-                    ToolTip='<%# traduci("Cancel") %>' ImageUrl='<%# imgPath(SteamWare.tipoImg.annulla, SteamWare.dimImg.small) %>' />
-            </EditItemTemplate>
-            <HeaderTemplate>
-                <asp:Button ID="btnReset" runat="server" Text='<%# traduci("Reset") %>' OnClick="btnReset_Click"
-                    Visible="false" />
-            </HeaderTemplate>
-            <ItemTemplate>
-                <asp:ImageButton ID="imgSelect" runat="server" CausesValidation="False" CommandName="Select"
-                    Visible="false" ToolTip='<%# traduci("Select") %>' ImageUrl='<%# imgPath(SteamWare.tipoImg.seleziona, SteamWare.dimImg.small) %>' />
-                <asp:ImageButton ID="imgEdit" runat="server" CausesValidation="False" CommandName="Edit"
-                    ToolTip='<%# traduci("Edit") %>' ImageUrl='<%# imgPath(SteamWare.tipoImg.modifica, SteamWare.dimImg.small) %>'
-                    Visible='<%# isOnEdit %>' />
-            </ItemTemplate>
-            <ItemStyle HorizontalAlign="Center" />
-        </asp:TemplateField>--%>
-
 <asp:GridView ID="grView" runat="server" AllowPaging="True" AllowSorting="True" AutoGenerateColumns="False"
     DataKeyNames="idxImpiego" DataSourceID="ods" OnDataBound="grView_DataBound"
     OnRowEditing="grView_RowEditing" EnableModelValidation="True">
@@ -40,44 +18,55 @@
             Visible='<%# isOnEdit %>' />
     </EmptyDataTemplate>
     <Columns>
-        <asp:BoundField DataField="idxImpiego" HeaderText="idxImpiego" ReadOnly="True" SortExpression="idxImpiego" />
+        <asp:TemplateField ShowHeader="False" ItemStyle-HorizontalAlign="Center">
+            <EditItemTemplate>
+                <asp:ImageButton ID="imgUpdate" runat="server" CausesValidation="False" CommandName="Update" ToolTip='<%# traduci("Update")%>' ImageUrl='<%# imgPath(SteamWare.tipoImg.conferma, SteamWare.dimImg.small) %>' />
+                <asp:ImageButton ID="imgCancel" runat="server" CausesValidation="False" CommandName="Cancel" ToolTip='<%# traduci("Cancel") %>' ImageUrl='<%# imgPath(SteamWare.tipoImg.annulla, SteamWare.dimImg.small) %>' />
+            </EditItemTemplate>
+            <HeaderTemplate>
+                <asp:Button ID="btnReset" runat="server" Text='<%# traduci("Reset") %>' OnClick="btnReset_Click" Visible="false" />
+            </HeaderTemplate>
+            <ItemTemplate>
+                <asp:ImageButton ID="imgSelect" runat="server" CausesValidation="False" CommandName="Select" Visible="false" ToolTip='<%# traduci("Select") %>' ImageUrl='<%# imgPath(SteamWare.tipoImg.seleziona, SteamWare.dimImg.small) %>' />
+                <asp:ImageButton ID="imgEdit" runat="server" CausesValidation="False" CommandName="Edit" ToolTip='<%# traduci("Edit") %>' ImageUrl='<%# imgPath(SteamWare.tipoImg.modifica, SteamWare.dimImg.small) %>' Visible='<%# isOnEdit %>' />
+            </ItemTemplate>
+            <ItemStyle HorizontalAlign="Center" />
+        </asp:TemplateField>
+        <asp:BoundField DataField="idxImpiego" HeaderText="#" ReadOnly="True" SortExpression="idxImpiego" />
         <asp:BoundField DataField="CodRisorsa" HeaderText="CodRisorsa" SortExpression="CodRisorsa" />
-        <asp:BoundField DataField="numIntMtz" HeaderText="numIntMtz" SortExpression="numIntMtz" />
-        <asp:BoundField DataField="QtaRisorsa" HeaderText="QtaRisorsa" SortExpression="QtaRisorsa" />
-        <asp:BoundField DataField="CostoUnit" HeaderText="CostoUnit" SortExpression="CostoUnit" />
-        <asp:BoundField DataField="TotImport" HeaderText="TotImport" ReadOnly="True" SortExpression="TotImport" />
-
-    </Columns>
-</asp:GridView>
-<%--<asp:TemplateField ItemStyle-HorizontalAlign="Center">
+        <asp:BoundField DataField="Note" HeaderText="Note" SortExpression="Note" NullDisplayText="..." />
+        <asp:BoundField DataField="QtaRisorsa" HeaderText="QtaRisorsa" SortExpression="QtaRisorsa" DataFormatString="{0:0.##}" ApplyFormatInEditMode="true" />
+        <asp:BoundField DataField="CostoUnit" HeaderText="CostoUnit" SortExpression="CostoUnit" DataFormatString="{0:0.00}" ApplyFormatInEditMode="true" />
+        <asp:BoundField DataField="TotImport" HeaderText="TotImport" ReadOnly="True" SortExpression="TotImport" DataFormatString="{0:0.00}" />
+        <asp:TemplateField ItemStyle-HorizontalAlign="Center">
             <HeaderTemplate>
                 <asp:Button ID="btnNew" runat="server" OnClick="btnNewFromEmpty_Click" Text='<%# traduci("New") %>'
                     Visible='<%# canInsertNew() %>' />
             </HeaderTemplate>
             <EditItemTemplate>
-                <asp:ImageButton ID="imgUpdate2" runat="server" CausesValidation="False" CommandName="Update"
-                    ToolTip='<%# traduci("Update")%>' ImageUrl='<%# imgPath(SteamWare.tipoImg.conferma, SteamWare.dimImg.small) %>' />
-                <asp:ImageButton ID="imgCancel2" runat="server" CausesValidation="False" CommandName="Cancel"
-                    ToolTip='<%# traduci("Cancel") %>' ImageUrl='<%# imgPath(SteamWare.tipoImg.annulla, SteamWare.dimImg.small) %>' />
+                <asp:ImageButton ID="imgUpdate2" runat="server" CausesValidation="False" CommandName="Update" ToolTip='<%# traduci("Update")%>' ImageUrl='<%# imgPath(SteamWare.tipoImg.conferma, SteamWare.dimImg.small) %>' />
+                <asp:ImageButton ID="imgCancel2" runat="server" CausesValidation="False" CommandName="Cancel" ToolTip='<%# traduci("Cancel") %>' ImageUrl='<%# imgPath(SteamWare.tipoImg.annulla, SteamWare.dimImg.small) %>' />
             </EditItemTemplate>
             <ItemTemplate>
-                <asp:ImageButton ID="imgDelete" runat="server" CausesValidation="False" CommandName="Delete"
-                    Visible='<%# isOnEdit %>' ToolTip='<%# traduci("Delete") %>' ImageUrl='<%# imgPath(SteamWare.tipoImg.elimina, SteamWare.dimImg.small) %>' />
-                <cc1:ConfirmButtonExtender ID="ConfirmButtonExtender1" runat="server" ConfirmText='<%# traduci("confermaDel")%>'
-                    TargetControlID="imgDelete">
+                <asp:ImageButton ID="imgDelete" runat="server" CausesValidation="False" CommandName="Delete" Visible='<%# isOnEdit %>' ToolTip='<%# traduci("Delete") %>' ImageUrl='<%# imgPath(SteamWare.tipoImg.elimina, SteamWare.dimImg.small) %>' />
+                <cc1:ConfirmButtonExtender ID="ConfirmButtonExtender1" runat="server" ConfirmText='<%# traduci("confermaDel")%>' TargetControlID="imgDelete">
                 </cc1:ConfirmButtonExtender>
             </ItemTemplate>
             <ItemStyle HorizontalAlign="Center" />
-        </asp:TemplateField>--%>
+        </asp:TemplateField>
+
+    </Columns>
+</asp:GridView>
 <asp:Label ID="lblNumRec" runat="server" CssClass="txtMini"></asp:Label>
 <asp:ObjectDataSource ID="ods" runat="server" SelectMethod="GetData" TypeName="GIM_data.DS_applicazioneTableAdapters.ImpiegoRisorseTableAdapter"
     UpdateMethod="updateQuery" DeleteMethod="deleteQuery" OldValuesParameterFormatString="Original_{0}"
-    InsertMethod="insertQuery">
+    InsertMethod="insertQuery" OnUpdating="ods_Updating">
     <UpdateParameters>
         <asp:Parameter Name="CodRisorsa" Type="String" />
         <asp:Parameter Name="numIntMtz" Type="Int32" />
         <asp:Parameter Name="QtaRisorsa" Type="Decimal" />
         <asp:Parameter Name="CostoUnit" Type="Decimal" />
+        <asp:Parameter Name="Note" Type="String" />
         <asp:Parameter Name="Original_idxImpiego" Type="Int32" />
     </UpdateParameters>
     <DeleteParameters>
@@ -88,5 +77,6 @@
         <asp:Parameter Name="numIntMtz" Type="Int32" />
         <asp:Parameter Name="QtaRisorsa" Type="Decimal" />
         <asp:Parameter Name="CostoUnit" Type="Decimal" />
+        <asp:Parameter Name="Note" Type="String" />
     </InsertParameters>
 </asp:ObjectDataSource>
diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_impiegoRisorse.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_impiegoRisorse.ascx.cs
index b3aa944..9353a21 100644
--- a/Projects/WebGIM/GIM_site/WebUserControls/mod_impiegoRisorse.ascx.cs
+++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_impiegoRisorse.ascx.cs
@@ -81,26 +81,17 @@ namespace GIM_site.WebUserControls
             // reset selezione...
             resetSelezione();
             int numIntMtz = memLayer.ML.IntSessionObj("numIntMtz_sel");
-            string matr = memLayer.ML.confReadString("defaultMatr");
-            TA_app.obj.taIntOpMtz.Insert(numIntMtz, matr, 0);
+            string CodRis = memLayer.ML.confReadString("CodRis");
+            TA_app.obj.taImpRis.insertQuery(CodRis, numIntMtz, 1, 1, "--");
             grView.DataBind();
         }
         /// <summary>
-        /// restituisce un booleano se sia abilitato inserimento nuovi valori (solo se NON C'E' GIA' un operatore con amtricola di default...)
+        /// restituisce un booleano se sia abilitato inserimento nuovi valori
         /// </summary>
         /// <returns></returns>
         public bool canInsertNew()
         {
-            bool answ = false;
-            int numIntMtz = memLayer.ML.IntSessionObj("numIntMtz_sel");
-            string matr = memLayer.ML.confReadString("defaultMatr");
-            try
-            {
-                answ = (TA_app.obj.taIntOpMtz.getByMatrNumIntMtz(numIntMtz, matr).Rows.Count == 0);
-            }
-            catch
-            { }
-            return (answ && isOnEdit);
+            return isOnEdit;
         }
         /// <summary>
         /// restituisce true se il controllo è in modalità editing (e non selezione...)
@@ -112,21 +103,12 @@ namespace GIM_site.WebUserControls
                 return _vistaModulo == tipoVistaMod.editing;
             }
         }
-        /// <summary>
-        /// traduce matricola in matr + cognome + nome
-        /// </summary>
-        /// <param name="matr"></param>
-        /// <returns></returns>
-        public string traduciMatrOp(object matr)
+
+        protected void ods_Updating(object sender, ObjectDataSourceMethodEventArgs e)
         {
-            string answ = "";
-            try
-            {
-                answ = TA_app.obj.taSelMatrOp.getByValue(matr.ToString())[0].label;
-            }
-            catch
-            { }
-            return answ;
+            e.InputParameters["numIntMtz"] = memLayer.ML.IntSessionObj("numIntMtz_sel").ToString();
+            //e.InputParameters["QtaRisorsa"] = Convert.ToDouble(e.InputParameters["QtaRisorsa"].ToString().Replace(".", ","));
+            //e.InputParameters["CostoUnit"] = Convert.ToDouble(e.InputParameters["CostoUnit"].ToString().Replace(".", ","));
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Projects/WebGIM/GIM_site/bin/GIM_data.dll b/Projects/WebGIM/GIM_site/bin/GIM_data.dll
index 85407f4..c36c137 100644
Binary files a/Projects/WebGIM/GIM_site/bin/GIM_data.dll and b/Projects/WebGIM/GIM_site/bin/GIM_data.dll differ
diff --git a/Projects/WebGIM/GIM_site/bin/GIM_site.dll b/Projects/WebGIM/GIM_site/bin/GIM_site.dll
index c245017..29f8299 100644
Binary files a/Projects/WebGIM/GIM_site/bin/GIM_site.dll and b/Projects/WebGIM/GIM_site/bin/GIM_site.dll differ
diff --git a/Projects/WebGIM/GIM_site/bin/SteamWare.dll b/Projects/WebGIM/GIM_site/bin/SteamWare.dll
index 19f7e17..fa15e8a 100644
Binary files a/Projects/WebGIM/GIM_site/bin/SteamWare.dll and b/Projects/WebGIM/GIM_site/bin/SteamWare.dll differ