From b3a9fa995178d4db0ba8b67fe077f55dd962aebc Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 15 Oct 2015 16:23:09 +0200 Subject: [PATCH] versione 1.4.249 completata x filtraggi su mtz preventiva --- .../mod_filtraMtzProg.ascx.designer.cs | 3 +-- .../WebUserControls/mod_mtzPrevPending.ascx | 12 ++++++++---- .../mod_mtzPrevPending.ascx.cs | 6 +++++- Projects/WebGIM/GIM_site/bin/GIM_site.dll | Bin 516096 -> 516096 bytes Projects/WebGIM/VersGen/WebGIM.cs | 4 ++-- Projects/WebGIM/VersGen/WebGIM.tt | 4 ++-- 6 files changed, 18 insertions(+), 11 deletions(-) diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_filtraMtzProg.ascx.designer.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_filtraMtzProg.ascx.designer.cs index 53de72d..a62ea7c 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_filtraMtzProg.ascx.designer.cs +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_filtraMtzProg.ascx.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. // //------------------------------------------------------------------------------ diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_mtzPrevPending.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_mtzPrevPending.ascx index 52b03ca..719e9e5 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_mtzPrevPending.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_mtzPrevPending.ascx @@ -5,7 +5,7 @@
+ DataKeyNames="idxPending" DataSourceID="ods" OnDataBound="grView_DataBound" EnableModelValidation="True" OnPageIndexChanged="grView_PageIndexChanged"> @@ -24,14 +24,16 @@
- + + - +
- + + @@ -47,6 +49,8 @@ + diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_mtzPrevPending.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_mtzPrevPending.ascx.cs index 784371e..2c9738f 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_mtzPrevPending.ascx.cs +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_mtzPrevPending.ascx.cs @@ -76,9 +76,13 @@ public partial class mod_mtzPrevPending : ApplicationUserControl { 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 = {2})"; + ods.FilterExpression += " AND (idxMacchina = {3})"; } ods.DataBind(); } diff --git a/Projects/WebGIM/GIM_site/bin/GIM_site.dll b/Projects/WebGIM/GIM_site/bin/GIM_site.dll index e69e7b437762aea98a7882e0e5fb5ddabadfde72..f98d70c44da3753a37b63ccb4dd25fef7d6df079 100644 GIT binary patch delta 2830 zcmY+`4Qy0Z76 zckaFK-h0lx`$C=hq0aox&trDemW|h2C0pKn(E4}WvL>e%f90Xv#DoD)Fuur|Y?Z~s zmOHuNvWNJuR9&D{8WauU82z^Et;9_aJMN9_ad;-s*NwLygObu!ym7x^vAnr zOwj*_X9VIOSEhrgVW<)-khUv+VK}=qYZs4`q~A_<=vQ!VWks`2{(@C5vATJSl|ot( zLRyR-MfDzT8K(1j4*eQ8ydA&in{0Q^UcMQj|BQ;!V>l+d;E&Pc2-TSm>!&%i95d@p z%NiA1j$zSJHP{M_eTQRF?*j!d`Boq(T2WA?w84lDsg_S+lW6={R<$clcjx(iPhmjR zuJkmH7VAOv%E}RFFps!vyx&)jQqdBnl?Z7?C_Oz!tFXP1TSn-Yg)w>t)ml+nKHj0# zI4-gFiTS?O7;4m;7om%)>F=)D%C%V5WQO6LS&JQ7N#c!t7W?C`T*+~h`d(Nk!o{p+ zZXc#Yw>#uwjcD*^H9i-?7Bg1mm>7kzQ&g|g@_X#o3e(vFht{KPziIiZYPlYDq7PNe z4QSB{Q~4x^UckbVR?~E~YWf1&MNg`x6-a7@>6@Q86vKX5%1V{GtC}@BMw_rKzV6!` zx4MnTih6rf{k}K`M5mRu!r#uZq%M(dn4=Y;7u8saA2jWz80|o*iFrpkh4eBOi*lWS z(&N%^b*e*E822uZ8KF^`thy3mpJrJH2cz`o`5de;^5$nwQi_YFWo9TBBJ(-cAblyn6 zBlaP1i1_(YFXw(AN)=h0`(~`uGP!TTZV~6c6(b_feJghTh5MP@w_!lUxo^YN!yGfY zZ^NA;&V3sev0N48+_&L3Ca81Yj&c#_z5`oDocj(8ixyDaXxB zcwV1lwut9-8mqMUEOzJ&-V)uRUae=)s1>G%9EZNZZ1=BbnA;{yS6m<}nP4d`)H2IE zhn4+Tm-jcU5pm*&5Yh_MaE?P?qE}+P*e`Kjloy!gyMSRWvn>}@%x?x=rGghRKam4# z{&n|$#5cp#RN~Mjgc9XYyR|)00c%PyIACI@iXFOw16sV$n9`?OQF`PShenX{N#ZoD z>_`yJZxJz zZok~Dn)r;*vAv&}!G4-P*XOl={Bh;8D|O6F$!8};Jf%_gi1g#v@MwG7;MFOm*|}O~ zN&)*GiSd*I_EHlxpCIYiJaC*{-8?qM8nY)bZ~xi5z8~9t$BTQLdT+jdo@YZ*y`?Uw z%T`y4x>D8UG#Ax-&J_e_H|0OT&sQIgv_)M@)JN))6CS$n{^I+eJ+LT$PN;Rk#^#p} z9(#G*V~OGuo^}55^2N%%rYHJNcyds1x%nR_JpZ+t(?0cFu~B+U^O!-;KdmiOJ^u$u CmBeBI delta 2825 zcmY+`e{fXQ6$kM1zK^_pv#@aqB!px!{%H8I!?Y1n6=tlz5Yy65Q+1>*&KOJDi5N>9 zVT4NiveRV+VFhNfTWYG5&`gR%iAe}0unn+{AtVHCI;22i(8#0?(vEFf!7bB!?mg3# zow-kfpukUwRrfwHJ^n5Z;EWa+0w7tUF9cY(vh=Cza~__DPw@zmC3iQ%sX5?i(g z5)Ike3B;$jV0+@uX_Jwtx&2#xmJ{Na^mzHs#-Y~rEiDh^gL>`Vzg?eLu;`| zVn=Q(@~_3AR(*I;x}v(iaKllqM`@dR4WG<MRX!O_}jUE zgu1@wkcTqS@R#fT9x_@{+B!8(5v)06-rTIx@^fs^iqMC}4sAr}_a^om)pH|iMenJe zFJY5bgjUaXXfx(6J#4zJRb4k@tLPckbqjWCMd<1bhvL{QTd7g0o6zDZaoUE`MAH|A zUQGwTE9UlQ1^fv#ibj-nVn{2kOXO7qkC<6sQSVCrPYdS8X&3TM%$@9n={1B!At$JG zw~SkxMN*U1y zc9>c)>5n{p%pJ3XO4CH^7KW)6A<@Q#L8ZN-@8-^?HtZKYlbfs5W~6^34q`+}%^!0) z_Xm;RWv1ZVx8qw{CijQ1LBv0zhtVtI+#kk^@A5d4`wldUIQJc(ZjPDUcVLEybKik^ zEKdbF_Z_&)1a)95^*J@ za7N2BrI5ndDbtlJp%ecSaU~o_X|IWKC8Xi&GvZ3ZO{81 zdr)+H&I5ke{{Mehe*1|F6HD^jJ4L*t$#$=nS<)1HbZBBp+4f~Ev!tMX^YFxyg7zID zA+IUth6$(JHSG^hvZgi#7xy2%ecGji5AWVyTUoWd>DWt^&6a9V%~oxaYFVl|?Ul{G z(c<||YtiF82UOdkT8a7>T5{G$k372M(c@lg#XaK-9^O4V{CfB5<4+~mob~-Q@K^bt r%A@S$^|QW0jE}b$4*LFKB`XGfCGFYgeAjH`-`PHO*!MSUM~Uyhdg8=i diff --git a/Projects/WebGIM/VersGen/WebGIM.cs b/Projects/WebGIM/VersGen/WebGIM.cs index 2e35ccc..10d4b9e 100644 --- a/Projects/WebGIM/VersGen/WebGIM.cs +++ b/Projects/WebGIM/VersGen/WebGIM.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("1.4.247.484")] -[assembly: AssemblyFileVersion("1.4.247.484")] +[assembly: AssemblyVersion("1.4.249.510")] +[assembly: AssemblyFileVersion("1.4.249.510")] [assembly: AssemblyCopyright("Steamware © 2006-2015")] [assembly: AssemblyCompany("Steamware")] diff --git a/Projects/WebGIM/VersGen/WebGIM.tt b/Projects/WebGIM/VersGen/WebGIM.tt index b983e0a..5ae8897 100644 --- a/Projects/WebGIM/VersGen/WebGIM.tt +++ b/Projects/WebGIM/VersGen/WebGIM.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("1.4.247.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("1.4.247.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("1.4.249.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("1.4.249.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Steamware © 2006-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+