diff --git a/Projects/WebGIM/GIM_data/bin/GIM_data.dll b/Projects/WebGIM/GIM_data/bin/GIM_data.dll
index 7e37d18..489f5e4 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 f0b96db..5c32d0d 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/WebUserControls/mod_macchine.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_macchine.ascx
index 7117104..4cab833 100644
--- a/Projects/WebGIM/GIM_site/WebUserControls/mod_macchine.ascx
+++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_macchine.ascx
@@ -1,16 +1,15 @@
<%@ Control Language="C#" AutoEventWireup="true"
- Inherits="mod_macchine" Codebehind="mod_macchine.ascx.cs" %>
+ Inherits="mod_macchine" CodeBehind="mod_macchine.ascx.cs" %>
<%@ Register Src="~/WebUserControls/mod_selettore_ajax.ascx" TagName="mod_selettore_ajax" TagPrefix="uc1" %>
<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
<%@ Register Src="~/WebUserControls/mod_filtro.ascx" TagName="mod_filtro" TagPrefix="uc2" %>
-
+ SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selImpiantiTableAdapter">
+ OnRowUpdating="grView_RowUpdating" OnPageIndexChanged="grView_PageIndexChanged" OnSorted="grView_Sorted" OnRowCancelingEdit="grView_RowCancelingEdit" OnRowEditing="grView_RowEditing">
@@ -188,7 +187,7 @@
+ Visible='<%# isWritable() %>' />
+ OnRowDataBound="grView_RowDataBound" OnRowUpdating="grView_RowUpdating" >
diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_macchine.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_macchine.ascx.cs
index 8b484b9..a05d50f 100644
--- a/Projects/WebGIM/GIM_site/WebUserControls/mod_macchine.ascx.cs
+++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_macchine.ascx.cs
@@ -604,4 +604,15 @@ public partial class mod_macchine : ApplicationUserControl
}
#endregion
+
+ protected void grView_RowEditing(object sender, GridViewEditEventArgs e)
+ {
+ doUpdate();
+ }
+
+ protected void grView_RowCancelingEdit(object sender, GridViewCancelEditEventArgs e)
+ {
+ doUpdate();
+ }
+
}
\ No newline at end of file
diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_mtzPrevPending.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_mtzPrevPending.ascx.cs
index d635737..784371e 100644
--- a/Projects/WebGIM/GIM_site/WebUserControls/mod_mtzPrevPending.ascx.cs
+++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_mtzPrevPending.ascx.cs
@@ -7,7 +7,8 @@ using SteamWare;
public partial class mod_mtzPrevPending : ApplicationUserControl
{
- public event EventHandler eh_resetSelezione;
+ //public event EventHandler eh_resetSelezione;
+
///
/// evento dati associati a controllo
///
diff --git a/Projects/WebGIM/GIM_site/bin/GIM_data.dll b/Projects/WebGIM/GIM_site/bin/GIM_data.dll
index 7e37d18..489f5e4 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 ec7a5a9..ec95ed1 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 f0b96db..5c32d0d 100644
Binary files a/Projects/WebGIM/GIM_site/bin/SteamWare.dll and b/Projects/WebGIM/GIM_site/bin/SteamWare.dll differ
diff --git a/Projects/WebGIM/GIM_site/obj/SomaschiniUSA/GIM_site.dll b/Projects/WebGIM/GIM_site/obj/SomaschiniUSA/GIM_site.dll
index 9686418..ec95ed1 100644
Binary files a/Projects/WebGIM/GIM_site/obj/SomaschiniUSA/GIM_site.dll and b/Projects/WebGIM/GIM_site/obj/SomaschiniUSA/GIM_site.dll differ