diff --git a/Projects/WebGIM/GIM_site/WebMasterPages/Ajax.master b/Projects/WebGIM/GIM_site/WebMasterPages/Ajax.master index 9ffbd93..436e8f9 100644 --- a/Projects/WebGIM/GIM_site/WebMasterPages/Ajax.master +++ b/Projects/WebGIM/GIM_site/WebMasterPages/Ajax.master @@ -9,8 +9,8 @@ - - + +
diff --git a/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSearch.master b/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSearch.master index f58296e..5263a87 100644 --- a/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSearch.master +++ b/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSearch.master @@ -14,8 +14,8 @@ - - + + diff --git a/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSearchEmpty.master b/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSearchEmpty.master index 733a934..a3b2ee2 100644 --- a/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSearchEmpty.master +++ b/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSearchEmpty.master @@ -15,8 +15,8 @@ - - + + diff --git a/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSimple.master b/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSimple.master index 4674bfb..7f79e7f 100644 --- a/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSimple.master +++ b/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSimple.master @@ -7,8 +7,8 @@ Simplepage - - + + diff --git a/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSimpleUpload.master b/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSimpleUpload.master index a3e0f64..1680364 100644 --- a/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSimpleUpload.master +++ b/Projects/WebGIM/GIM_site/WebMasterPages/AjaxSimpleUpload.master @@ -8,8 +8,8 @@ SimplePage - - + + diff --git a/Projects/WebGIM/GIM_site/WebMasterPages/AjaxTitle.master b/Projects/WebGIM/GIM_site/WebMasterPages/AjaxTitle.master index 8587c0c..42d36ca 100644 --- a/Projects/WebGIM/GIM_site/WebMasterPages/AjaxTitle.master +++ b/Projects/WebGIM/GIM_site/WebMasterPages/AjaxTitle.master @@ -10,8 +10,8 @@ - - + + diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx index 3777839..0a2548e 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx @@ -1,5 +1,5 @@ <%@ Control Language="C#" AutoEventWireup="true" - Inherits="mod_elencoRichieste" Codebehind="mod_elencoRichieste.ascx.cs" %> + Inherits="mod_elencoRichieste" CodeBehind="mod_elencoRichieste.ascx.cs" %> <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %> <%@ Register Src="~/WebUserControls/mod_periodoAnalisi.ascx" TagName="mod_periodoAnalisi" TagPrefix="uc1" %> @@ -109,9 +109,19 @@ - <%-- + - --%> + + + + <%-- + --%> + diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx.cs index 3a58e98..af20371 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx.cs +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx.cs @@ -370,7 +370,6 @@ public partial class mod_elencoRichieste : ApplicationUserControl /// private void checkFixOds() { - //ods.FilterExpression = "( CONVERT(numIntMtz,'System.String') LIKE '%{0}%' OR codImpianto LIKE '%{0}%' OR nomeImpianto LIKE '%{0}%' OR codMacchina LIKE '%{0}%' OR nomeMacchina LIKE '%{0}%' OR descrizione LIKE '%{0}%' )"; if (!chkMostraIntChiusi.Checked) { //ods.FilterExpression += " AND (idxStato < 3)"; @@ -380,6 +379,18 @@ public partial class mod_elencoRichieste : ApplicationUserControl { ods.FilterExpression = ""; } + if (memLayer.ML.isInSessionObject("idxTipo_filt")) + { + ods.FilterExpression += " AND (idxTipo = {1})"; + } + if (memLayer.ML.isInSessionObject("idxImpianto_filt")) + { + ods.FilterExpression += " AND (idxImpianto = {2})"; + } + if (memLayer.ML.isInSessionObject("idxMacchina_filt")) + { + ods.FilterExpression += " AND (idxMacchina = {3})"; + } ods.DataBind(); } /// diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_filtraMtzProg.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_filtraMtzProg.ascx index 884f64a..eb527c9 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_filtraMtzProg.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_filtraMtzProg.ascx @@ -1,40 +1,37 @@ -<%@ Control Language="C#" AutoEventWireup="true" Inherits="WebUserControls_mod_filtraMtzProg" Codebehind="mod_filtraMtzProg.ascx.cs" %> -<%@ Register src="mod_filtro.ascx" tagname="mod_filtro" tagprefix="uc1" %> +<%@ Control Language="C#" AutoEventWireup="true" Inherits="WebUserControls_mod_filtraMtzProg" CodeBehind="mod_filtraMtzProg.ascx.cs" %> +<%@ Register Src="mod_filtro.ascx" TagName="mod_filtro" TagPrefix="uc1" %>
- - - - - -
-
- -
-
- - - -
- 		-
- -
-
- - - -
-
- - - - - - -
-
-
\ No newline at end of file +
+
+
+ +
+
+ + +
+
+
+
+ +
+
+ + +
+
+ + + + + + +
+
+
+
+ diff --git a/Projects/WebGIM/GIM_site/bin/GIM_site.dll b/Projects/WebGIM/GIM_site/bin/GIM_site.dll index f98d70c..6ba9abd 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/VersGen.dll b/Projects/WebGIM/GIM_site/bin/VersGen.dll index ea07a92..588c6cd 100644 Binary files a/Projects/WebGIM/GIM_site/bin/VersGen.dll and b/Projects/WebGIM/GIM_site/bin/VersGen.dll differ diff --git a/Projects/WebGIM/GIM_site/elencoRichieste.aspx b/Projects/WebGIM/GIM_site/elencoRichieste.aspx index 70965b6..970e2bb 100644 --- a/Projects/WebGIM/GIM_site/elencoRichieste.aspx +++ b/Projects/WebGIM/GIM_site/elencoRichieste.aspx @@ -4,6 +4,9 @@ <%@ Register Src="~/WebUserControls/mod_dettaglioIntervento.ascx" TagName="mod_dettaglioIntervento" TagPrefix="uc2" %> <%@ Register Src="~/WebUserControls/mod_fixCal.ascx" tagname="mod_fixCal" tagprefix="uc3" %> +<%@ Register Src="~/WebUserControls/mod_filtraMtzProg.ascx" TagPrefix="uc1" TagName="mod_filtraMtzProg" %> + + diff --git a/Projects/WebGIM/GIM_site/elencoRichieste.aspx.cs b/Projects/WebGIM/GIM_site/elencoRichieste.aspx.cs index d8db0fa..0323a03 100644 --- a/Projects/WebGIM/GIM_site/elencoRichieste.aspx.cs +++ b/Projects/WebGIM/GIM_site/elencoRichieste.aspx.cs @@ -8,10 +8,21 @@ public partial class elencoRichieste : System.Web.UI.Page { protected void Page_Load(object sender, EventArgs e) { + mod_filtraMtzProg.eh_newFiltroSel += new EventHandler(mod_filtraMtzProg1_eh_newFiltroSel); mod_elencoRichieste1.eh_selValore += new EventHandler(mod_elencoRichieste1_eh_selValore); ((AjaxSearch)Master).eh_Search_Submit += elencoRichieste_eh_Search_Submit; } + /// + /// è stato chiamato evento "nuovo filtro" e quindi aggiorno + /// + /// + /// + void mod_filtraMtzProg1_eh_newFiltroSel(object sender, EventArgs e) + { + // update della visualizzazione normale + mod_elencoRichieste1.doUpdate(); + } void elencoRichieste_eh_Search_Submit(object sender, EventArgs e) { mod_elencoRichieste1.doUpdate(); diff --git a/Projects/WebGIM/GIM_site/elencoRichieste.aspx.designer.cs b/Projects/WebGIM/GIM_site/elencoRichieste.aspx.designer.cs index 8437ff1..8639711 100644 --- a/Projects/WebGIM/GIM_site/elencoRichieste.aspx.designer.cs +++ b/Projects/WebGIM/GIM_site/elencoRichieste.aspx.designer.cs @@ -1,10 +1,9 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.4927 // // Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// the code is regenerated. // //------------------------------------------------------------------------------ @@ -12,6 +11,15 @@ public partial class elencoRichieste { + /// + /// mod_filtraMtzProg control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::WebUserControls_mod_filtraMtzProg mod_filtraMtzProg; + /// /// mod_elencoRichieste1 control. /// diff --git a/Projects/WebGIM/GIM_site/help/EN/table_of_contents.html b/Projects/WebGIM/GIM_site/help/EN/table_of_contents.html index 5acd776..29d233e 100644 --- a/Projects/WebGIM/GIM_site/help/EN/table_of_contents.html +++ b/Projects/WebGIM/GIM_site/help/EN/table_of_contents.html @@ -13,7 +13,7 @@ - + diff --git a/Projects/WebGIM/GIM_site/help/IT/index.html b/Projects/WebGIM/GIM_site/help/IT/index.html index adec63b..1094430 100644 --- a/Projects/WebGIM/GIM_site/help/IT/index.html +++ b/Projects/WebGIM/GIM_site/help/IT/index.html @@ -4,7 +4,7 @@ ILIAS - Manuale WebGIM - + diff --git a/Projects/WebGIM/GIM_site/help/IT/lm_pg_10.html b/Projects/WebGIM/GIM_site/help/IT/lm_pg_10.html index a15f925..a15c92f 100644 --- a/Projects/WebGIM/GIM_site/help/IT/lm_pg_10.html +++ b/Projects/WebGIM/GIM_site/help/IT/lm_pg_10.html @@ -4,7 +4,7 @@ ILIAS - Manuale WebGIM - + diff --git a/Projects/WebGIM/GIM_site/help/IT/lm_pg_11.html b/Projects/WebGIM/GIM_site/help/IT/lm_pg_11.html index 24affa6..9a5249f 100644 --- a/Projects/WebGIM/GIM_site/help/IT/lm_pg_11.html +++ b/Projects/WebGIM/GIM_site/help/IT/lm_pg_11.html @@ -4,7 +4,7 @@ ILIAS - Manuale WebGIM - + diff --git a/Projects/WebGIM/GIM_site/help/IT/lm_pg_14.html b/Projects/WebGIM/GIM_site/help/IT/lm_pg_14.html index fc2938f..3376d8f 100644 --- a/Projects/WebGIM/GIM_site/help/IT/lm_pg_14.html +++ b/Projects/WebGIM/GIM_site/help/IT/lm_pg_14.html @@ -4,7 +4,7 @@ ILIAS - Manuale WebGIM - + diff --git a/Projects/WebGIM/GIM_site/help/IT/lm_pg_15.html b/Projects/WebGIM/GIM_site/help/IT/lm_pg_15.html index 626f593..4c80a3a 100644 --- a/Projects/WebGIM/GIM_site/help/IT/lm_pg_15.html +++ b/Projects/WebGIM/GIM_site/help/IT/lm_pg_15.html @@ -4,7 +4,7 @@ ILIAS - Manuale WebGIM - + diff --git a/Projects/WebGIM/GIM_site/help/IT/lm_pg_17.html b/Projects/WebGIM/GIM_site/help/IT/lm_pg_17.html index ee075ab..7d3c9ce 100644 --- a/Projects/WebGIM/GIM_site/help/IT/lm_pg_17.html +++ b/Projects/WebGIM/GIM_site/help/IT/lm_pg_17.html @@ -4,7 +4,7 @@ ILIAS - Manuale WebGIM - + diff --git a/Projects/WebGIM/GIM_site/help/IT/lm_pg_18.html b/Projects/WebGIM/GIM_site/help/IT/lm_pg_18.html index f258f20..c135b69 100644 --- a/Projects/WebGIM/GIM_site/help/IT/lm_pg_18.html +++ b/Projects/WebGIM/GIM_site/help/IT/lm_pg_18.html @@ -4,7 +4,7 @@ ILIAS - Manuale WebGIM - + diff --git a/Projects/WebGIM/GIM_site/help/IT/lm_pg_19.html b/Projects/WebGIM/GIM_site/help/IT/lm_pg_19.html index b2c9531..eb723a1 100644 --- a/Projects/WebGIM/GIM_site/help/IT/lm_pg_19.html +++ b/Projects/WebGIM/GIM_site/help/IT/lm_pg_19.html @@ -4,7 +4,7 @@ ILIAS - Manuale WebGIM - + diff --git a/Projects/WebGIM/GIM_site/help/IT/lm_pg_23.html b/Projects/WebGIM/GIM_site/help/IT/lm_pg_23.html index 37a9aeb..838826f 100644 --- a/Projects/WebGIM/GIM_site/help/IT/lm_pg_23.html +++ b/Projects/WebGIM/GIM_site/help/IT/lm_pg_23.html @@ -4,7 +4,7 @@ ILIAS - Manuale WebGIM - + diff --git a/Projects/WebGIM/GIM_site/help/IT/lm_pg_25.html b/Projects/WebGIM/GIM_site/help/IT/lm_pg_25.html index 1908d57..767f1a2 100644 --- a/Projects/WebGIM/GIM_site/help/IT/lm_pg_25.html +++ b/Projects/WebGIM/GIM_site/help/IT/lm_pg_25.html @@ -4,7 +4,7 @@ ILIAS - Manuale WebGIM - + diff --git a/Projects/WebGIM/GIM_site/help/IT/lm_pg_26.html b/Projects/WebGIM/GIM_site/help/IT/lm_pg_26.html index db7e266..1137c76 100644 --- a/Projects/WebGIM/GIM_site/help/IT/lm_pg_26.html +++ b/Projects/WebGIM/GIM_site/help/IT/lm_pg_26.html @@ -4,7 +4,7 @@ ILIAS - Manuale WebGIM - + diff --git a/Projects/WebGIM/GIM_site/help/IT/lm_pg_30.html b/Projects/WebGIM/GIM_site/help/IT/lm_pg_30.html index b6c3e0f..fb702b4 100644 --- a/Projects/WebGIM/GIM_site/help/IT/lm_pg_30.html +++ b/Projects/WebGIM/GIM_site/help/IT/lm_pg_30.html @@ -4,7 +4,7 @@ ILIAS - Manuale WebGIM - + diff --git a/Projects/WebGIM/GIM_site/help/IT/lm_pg_31.html b/Projects/WebGIM/GIM_site/help/IT/lm_pg_31.html index 570b412..76ce67c 100644 --- a/Projects/WebGIM/GIM_site/help/IT/lm_pg_31.html +++ b/Projects/WebGIM/GIM_site/help/IT/lm_pg_31.html @@ -4,7 +4,7 @@ ILIAS - Manuale WebGIM - + diff --git a/Projects/WebGIM/GIM_site/help/IT/lm_pg_33.html b/Projects/WebGIM/GIM_site/help/IT/lm_pg_33.html index 0a3d2fb..1f12263 100644 --- a/Projects/WebGIM/GIM_site/help/IT/lm_pg_33.html +++ b/Projects/WebGIM/GIM_site/help/IT/lm_pg_33.html @@ -4,7 +4,7 @@ ILIAS - Manuale WebGIM - + diff --git a/Projects/WebGIM/GIM_site/help/IT/lm_pg_34.html b/Projects/WebGIM/GIM_site/help/IT/lm_pg_34.html index 3d5baf9..954df30 100644 --- a/Projects/WebGIM/GIM_site/help/IT/lm_pg_34.html +++ b/Projects/WebGIM/GIM_site/help/IT/lm_pg_34.html @@ -4,7 +4,7 @@ ILIAS - Manuale WebGIM - + diff --git a/Projects/WebGIM/GIM_site/help/IT/lm_pg_35.html b/Projects/WebGIM/GIM_site/help/IT/lm_pg_35.html index a11c1f1..60c5e83 100644 --- a/Projects/WebGIM/GIM_site/help/IT/lm_pg_35.html +++ b/Projects/WebGIM/GIM_site/help/IT/lm_pg_35.html @@ -4,7 +4,7 @@ ILIAS - Manuale WebGIM - + diff --git a/Projects/WebGIM/GIM_site/help/IT/lm_pg_69.html b/Projects/WebGIM/GIM_site/help/IT/lm_pg_69.html index 0193eb0..a1e1917 100644 --- a/Projects/WebGIM/GIM_site/help/IT/lm_pg_69.html +++ b/Projects/WebGIM/GIM_site/help/IT/lm_pg_69.html @@ -4,7 +4,7 @@ ILIAS - Manuale WebGIM - + diff --git a/Projects/WebGIM/GIM_site/help/IT/lm_pg_70.html b/Projects/WebGIM/GIM_site/help/IT/lm_pg_70.html index a9ca4fb..f196696 100644 --- a/Projects/WebGIM/GIM_site/help/IT/lm_pg_70.html +++ b/Projects/WebGIM/GIM_site/help/IT/lm_pg_70.html @@ -4,7 +4,7 @@ ILIAS - Manuale WebGIM - + diff --git a/Projects/WebGIM/GIM_site/help/IT/lm_pg_8.html b/Projects/WebGIM/GIM_site/help/IT/lm_pg_8.html index adec63b..1094430 100644 --- a/Projects/WebGIM/GIM_site/help/IT/lm_pg_8.html +++ b/Projects/WebGIM/GIM_site/help/IT/lm_pg_8.html @@ -4,7 +4,7 @@ ILIAS - Manuale WebGIM - + diff --git a/Projects/WebGIM/GIM_site/help/IT/table_of_contents.html b/Projects/WebGIM/GIM_site/help/IT/table_of_contents.html index 7c5a90c..84db67c 100644 --- a/Projects/WebGIM/GIM_site/help/IT/table_of_contents.html +++ b/Projects/WebGIM/GIM_site/help/IT/table_of_contents.html @@ -17,7 +17,7 @@ - + diff --git a/Projects/WebGIM/VersGen/WebGIM.cs b/Projects/WebGIM/VersGen/WebGIM.cs index 10d4b9e..7ed0c85 100644 --- a/Projects/WebGIM/VersGen/WebGIM.cs +++ b/Projects/WebGIM/VersGen/WebGIM.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("1.4.249.510")] -[assembly: AssemblyFileVersion("1.4.249.510")] +[assembly: AssemblyVersion("1.4.251.510")] +[assembly: AssemblyFileVersion("1.4.251.510")] [assembly: AssemblyCopyright("Steamware © 2006-2015")] [assembly: AssemblyCompany("Steamware")] diff --git a/Projects/WebGIM/VersGen/WebGIM.tt b/Projects/WebGIM/VersGen/WebGIM.tt index 5ae8897..cd39b81 100644 --- a/Projects/WebGIM/VersGen/WebGIM.tt +++ b/Projects/WebGIM/VersGen/WebGIM.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("1.4.249.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("1.4.249.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("1.4.251.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("1.4.251.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Steamware © 2006-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+ diff --git a/Projects/WebGIM/VersGen/bin/Release/VersGen.dll b/Projects/WebGIM/VersGen/bin/Release/VersGen.dll index ea07a92..588c6cd 100644 Binary files a/Projects/WebGIM/VersGen/bin/Release/VersGen.dll and b/Projects/WebGIM/VersGen/bin/Release/VersGen.dll differ