diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_anagAmbitiGuasto.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_anagAmbitiGuasto.ascx index c73074a..a6a90a6 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_anagAmbitiGuasto.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_anagAmbitiGuasto.ascx @@ -1,16 +1,10 @@ <%@ Control Language="C#" AutoEventWireup="true" Inherits="mod_anagAmbitiGuasto" CodeBehind="mod_anagAmbitiGuasto.ascx.cs" %> <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %> - - - - - - - - - + + + + - + TargetControlID="imgDelete"> diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_anagLocazioni.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_anagLocazioni.ascx index f6461da..36b0356 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_anagLocazioni.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_anagLocazioni.ascx @@ -2,14 +2,10 @@ <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %> - - - - - - - + DataKeyNames="CodLocazione" DataSourceID="ods" OnDataBound="grView_DataBound" CssClass="table table-striped" OnRowEditing="grView_RowEditing" EnableModelValidation="True"> + + + @@ -52,8 +48,7 @@ - + TargetControlID="imgDelete"> @@ -78,4 +73,4 @@ - \ No newline at end of file + diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_anagOpMtz.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_anagOpMtz.ascx index f634d6a..0845edb 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_anagOpMtz.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_anagOpMtz.ascx @@ -1,15 +1,9 @@ <%@ Control Language="C#" AutoEventWireup="true" Inherits="mod_anagOpMtz" CodeBehind="mod_anagOpMtz.ascx.cs" %> <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %> - - - - - - - - - + + + + - - - - - - - - + DataKeyNames="TagCode" DataSourceID="ods" OnDataBound="grView_DataBound" OnRowEditing="grView_RowEditing" CssClass="table table-striped" OnSelectedIndexChanged="grView_SelectedIndexChanged"> + + + <%--&& !hasChild(Eval("TagCode"))--%> - + TargetControlID="imgDelete"> diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_anagTags.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_anagTags.ascx.cs index 9491e0f..8efe2df 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_anagTags.ascx.cs +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_anagTags.ascx.cs @@ -16,6 +16,7 @@ namespace GIM_site.WebUserControls if(!Page.IsPostBack) { divDetail.Visible = false; + grView.PageSize = 10; } } public event EventHandler eh_resetSelezione; diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_aperturaImpianti.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_aperturaImpianti.ascx index f734f93..10d1763 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_aperturaImpianti.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_aperturaImpianti.ascx @@ -1,16 +1,10 @@ <%@ Control Language="C#" AutoEventWireup="true" Inherits="mod_aperturaImpianti" Codebehind="mod_aperturaImpianti.ascx.cs" %> <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %> - - - - - - - - - + + + + diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_calChiusura.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_calChiusura.ascx index 521d96a..4f01c77 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_calChiusura.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_calChiusura.ascx @@ -1,16 +1,10 @@ <%@ Control Language="C#" AutoEventWireup="true" Inherits="mod_calChiusura" Codebehind="mod_calChiusura.ascx.cs" %> <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %> - - - - - - - - - + + + + diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_chLang.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_chLang.ascx index 099209b..805cd89 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_chLang.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_chLang.ascx @@ -28,7 +28,4 @@ - - - + diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_elFamMacch.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_elFamMacch.ascx index dec59c0..49c6bff 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_elFamMacch.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_elFamMacch.ascx @@ -1,18 +1,10 @@ <%@ Control Language="C#" AutoEventWireup="true" Inherits="mod_elFamMacch" Codebehind="mod_elFamMacch.ascx.cs" %> <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %> - - - - - - - - - + + + + diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_elMacch2Fam.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_elMacch2Fam.ascx index f051290..6a71760 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_elMacch2Fam.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_elMacch2Fam.ascx @@ -1,16 +1,10 @@ <%@ Control Language="C#" AutoEventWireup="true" Inherits="mod_elMacch2Fam" Codebehind="mod_elMacch2Fam.ascx.cs" %> <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %> - - - - - - - - - + + + + diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoMtzProg.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoMtzProg.ascx index df20dae..315dc0a 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoMtzProg.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoMtzProg.ascx @@ -2,14 +2,13 @@ <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %> <%@ Register Src="~/WebUserControls/mod_filtro.ascx" TagName="mod_filtro" TagPrefix="uc1" %> <% if (false) - { %> + { %> <% } %>
-
+
@@ -22,8 +21,7 @@ - + TargetControlID="txtDataInizio" Format="dd/MM/yy">
@@ -32,8 +30,7 @@ - + SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selPriorTableAdapter">
@@ -51,8 +48,7 @@ DataTextField="label" DataValueField="value"> - + SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selTipoGuastoTableAdapter"> @@ -64,8 +60,7 @@ DataTextField="label" DataValueField="value"> - + SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selFreqTableAdapter">
@@ -99,18 +94,10 @@
- - - - - - - - - + + + + @@ -170,8 +157,7 @@ CommandArgument='<%# Eval("idxIntPro") %>' ToolTip='<%# traduci("Delete") %>' Visible='<%# isWritable() %>' ImageUrl='<%# imgPath(SteamWare.tipoImg.elimina , SteamWare.dimImg.small) %>' /> - + TargetControlID="imgDelete"> diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx index c0849be..9c78bb6 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx @@ -23,18 +23,10 @@
- - - - - - - - - + + + + diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx.cs index 7b8b063..e19af62 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx.cs +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx.cs @@ -23,7 +23,7 @@ public partial class mod_elencoRichieste : ApplicationUserControl protected override void aggiornaControlliDataGL() { base.aggiornaControlliDataGL(); - grView.PageSize = _righeDataGridMed; + grView.PageSize = _righeDataGridShort; } /// /// traduce gli header delle colonne diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_magRic.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_magRic.ascx index f7b3ea1..9bfd6e9 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_magRic.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_magRic.ascx @@ -4,15 +4,10 @@
- - - - - - - - + DataKeyNames="idxItem" DataSourceID="ods" OnDataBound="grView_DataBound" OnRowEditing="grView_RowEditing" CssClass="table table-striped" OnSelectedIndexChanged="grView_SelectedIndexChanged"> + + +
-
+
diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_magRic.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_magRic.ascx.cs index 7424b7e..2c5a6a4 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_magRic.ascx.cs +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_magRic.ascx.cs @@ -10,6 +10,12 @@ namespace GIM_site.WebUserControls { public partial class mod_magRic : ApplicationUserControl { + protected override void Page_Load(object sender, EventArgs e) + { + base.Page_Load(sender, e); + grView.PageSize = 10; + } + public event EventHandler eh_resetSelezione; /// /// evento dati associati a controllo diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_mtzPrevPending.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_mtzPrevPending.ascx index 672d4b2..e7b4a58 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_mtzPrevPending.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_mtzPrevPending.ascx @@ -4,16 +4,10 @@
- - - - - - - - - + + + + diff --git a/Projects/WebGIM/GIM_site/bin/GIM_site.dll b/Projects/WebGIM/GIM_site/bin/GIM_site.dll index 80daa95..3ac86aa 100644 Binary files a/Projects/WebGIM/GIM_site/bin/GIM_site.dll and b/Projects/WebGIM/GIM_site/bin/GIM_site.dll differ