From c07bf80e908f5a09e3d0353210e5caad58c7b7cc Mon Sep 17 00:00:00 2001 From: samuele Date: Fri, 28 Sep 2012 17:25:00 +0200 Subject: [PATCH] corretto ulteriore bug ricerca, estesa ricerca filtrata x data su campi filtro al campo FASE --- ETS-WS/ETS-WS.suo | Bin 173568 -> 173568 bytes ETS-WS/ETS-WS/WS/AutoCompletamento.asmx.cs | 15 +++++++++-- .../mod_archivioDocumenti.ascx.cs | 9 ++++++- .../WebUserControls/mod_filtroRicerca.ascx.cs | 1 + .../mod_textAutocomplete.ascx.cs | 14 ++++++++++ ETS-WS/ETS-WS/bin/ETS-WS.dll | Bin 38912 -> 39424 bytes ETS-WS/ETS-WS/bin/ETS_Data.dll | Bin 304128 -> 304640 bytes ETS_Data/DS_utils.Designer.cs | 24 ++++++++++++++---- ETS_Data/DS_utils.xsd | 20 ++++++++------- ETS_Data/DS_utils.xss | 6 ++--- 10 files changed, 69 insertions(+), 20 deletions(-) diff --git a/ETS-WS/ETS-WS.suo b/ETS-WS/ETS-WS.suo index 98ea49e68432311b4f2af96ddce987759db1d9a9..957c41c2390081d70ae1d7f75a650abc6af824f6 100644 GIT binary patch delta 3832 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 delta 2743 zcmZuz4RBP|6@KUJZrE(XW|M3Jgc$O(Y?hFO{LuhelDC@;MMPK={=}4KQ_xm}2280% zq>BZekr+ab=1>JD1iNu6r76$ytXh2`(W+&bh*r@-8YttW)lsU}A1tKjrGy!0df$BS zoO|wl_nv$H?u(vuL{B>UTdX$M&kF4iYn!a~fRN2s7Q!4dlCAW$?KOyK1927$Sm>4b zt2AgWwM|kKrIo&M`~pv*wl(2(OT1DeBBy{|cJOI!Nnsl}##f1Z7!)OFr_1goko3QG z+tPMU+H9_&D6}cHMypPbv)bL#OBGyOAj1mSfwXn{jWp<7cr5d4gpcW)tefnUWlqAx zJZhV<6Ni4KU7qoV#g;D8Qie3lBxgYqeUY~lcg6G8IPj6@Y^L^-=Vqiw^UL|31sG55 z#Z#!qm(6*5VG8lAS=h3HjC_OM%bQL&6wD;UXVCq#D-s*)Ry6!D6lsezh8oD2rSi-) zTnKsQHq+?V*|XpxL2eBlT0Db3X>ro;W~ai7B2j5@_CoG)<5UqPQGU}D8fXa}D{KYy zptiZl3H*v3s;IvuiIRr4XzCmz5#G_jZ$aCWs3=FY`0B4LVgoUeHRwrB5GGMDS>P08 z(EMONbWtRjIxS23xq@s#j-XSJCupWegP+@4g?oZ_)mB=sj*X3xQ9Bh*(|fgd744S+ z5T|pVxicy-AsPh4sOj@e8dJx+Qwz&05h~h%k%7Zi+C}4!oS)Vs}t>H+gN3q z(gytmPgB>PEdIk5^iX=FfK;!lMI%FYd#!xpy8c<)ory?Mua`b5UP-=!RHDU2wvxv1 z=6f`CzR&Zo9^v2>SIQKpdKM!^-^XNsOOLNzFCM^`6g)cPM_lqF9v=xU~i=;X?|%@+KEP0qHb);S2{>pxS%U&Is@#4?hPP z+U8F>EL{~@=8m!Bl7lj!uGH_WT+%_3Csu0eozw z3>}>Y^@-enGpM>+0gcf0kw^D<;jD%CS7AQiQis#})B>2qIrC73A=+_MP2Z>U5c-TV z@x`a}aSFU-+S#Y?p9|~bjxUA%5c7kT;a0qZ->8)uGwz2TK5#Rp^OIHRlfmV6=x4PI zrn0KSk99Q&D)O#?C}D&^okY1?x9b_p;KKwm$V(&ld-bJ_5C-1760-PQ88qQ%Z|Tvs z5EXM(74pGB2S35>bAx%vVa3MdMGcQqDOAFoVvfIJ(QgZ(bSKnj{X7bwPksf3(loD{*7^ zqpT9Bq%Mq7SDu@j-Vy(Hm*AbE^?q#SUI%QUlCng0=7Ll2?1qxLQg*WFQl5)H4?qe; zX<%fzE~TV3o_DMeZ(XUu)N#MTwwNp?_ec#a)74Q>-QDTv$(c~br1vU~N}aMoX;6xk z)$(pJg|wrxicar%j+}#W{E{5?21VH|@Ds-l?Q4YnNzDG7y zM^z4lBo@D#heiCiI!sSVn)pER8D8O?3ZGwvPhAf&hh^zKcW_Y}mP--7g_B3+A7G-E z&`EDicN*F_T8&vevQkd?pQX5*jPok2=fF&?(W6t)NMp4ajlyOIRI=-* z8u51E3lD*xQpyV1^(P6)CFOYhaC9kj&qWV=D$rxKic;fQZZofee{ym)%;D^6$mF59 z68XYqkH4tIYW+VV-JAvR6y<#XFnQ`5=|sa?UABr@I656A`22VlU?XpO7Y4{U=%5w< za&fdz606`S9OTZI!OaH`i?-nt&~Kyc?aR0`CciOjhGAW75h5E8U?#Nj2M=JLt}aGH z>c>!yS!LJSRyQ<;BfPE*nyF=)RR1oy0*?8hz~t<#-h>8+Uxo$xrD3xu4ex0(<7`!T zF6QdF%kZ3)JO3eiShr*GcW|697p_#EkYsC-5*Qx~2v;IcKv1i{{7Zzaw0dQO Y suggerimenti = new List(); // proseguo SOLO SE min "MinCharAutocomplete" char... if (count >= Convert.ToInt32(ConfigurationManager.AppSettings.Get("MinCharAutocomplete"))) { // elenco candidati - DS_utils.v_tbDocs_selFasiDataTable tabella = utils.obj.taTDSelFasi.getByLikeSearch(prefixText); + DS_utils.v_tbDocs_selFasiDataTable tabella = utils.obj.taTDSelFasi.getByLikeSearch(inizio, fine, prefixText); // contatore risultati int i = 0; // aggiungo ogni riga... diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx.cs b/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx.cs index d452ad7..1e4ce32 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx.cs +++ b/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx.cs @@ -125,7 +125,14 @@ namespace ETS_WS.WebUserControls /// public void doUpdate() { - grView.DataBind(); + try + { + grView.DataBind(); + } + catch(Exception exc) + { + + } } /// /// restituisce una stringa di max "maxChar caratteri tenendo gli ultimi lastChar diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.cs b/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.cs index faacbec..c649789 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.cs +++ b/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.cs @@ -177,6 +177,7 @@ namespace ETS_WS.WebUserControls { if (chkFase.Checked) { + tacFasi.contextKey = string.Format("{0}#{1}", utils.obj.StringSessionObj("_inizio"), utils.obj.StringSessionObj("_fine")); chkFase.Text = "Elimina Filtro Fasi"; tacFasi.setFocus(); } diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_textAutocomplete.ascx.cs b/ETS-WS/ETS-WS/WebUserControls/mod_textAutocomplete.ascx.cs index 008415f..3532926 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_textAutocomplete.ascx.cs +++ b/ETS-WS/ETS-WS/WebUserControls/mod_textAutocomplete.ascx.cs @@ -200,5 +200,19 @@ namespace ETS_WS.WebUserControls { txtValue.Focus(); } + /// + /// permette di apssare altri parametri di contesto al metodo invocato x autocomplete + /// + public string contextKey + { + get + { + return txtValueAce.ContextKey; + } + set + { + txtValueAce.ContextKey = value; + } + } } } \ No newline at end of file diff --git a/ETS-WS/ETS-WS/bin/ETS-WS.dll b/ETS-WS/ETS-WS/bin/ETS-WS.dll index a0992fe70859d5387039f7745e1f67af520a7cc5..f2e936b488d30a6dd9a8a2ba08324e3d2e283b77 100644 GIT binary patch delta 15082 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 diff --git a/ETS-WS/ETS-WS/bin/ETS_Data.dll b/ETS-WS/ETS-WS/bin/ETS_Data.dll index e6ed0632cf3dff48acca7ff3e8734997668185e0..704c7ed881edd3ae23b13320b1ac6e3959d7b83f 100644 GIT binary patch delta 19981 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 N`a#p5ojZ?j{(ofaowWb} delta 19842 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 diff --git a/ETS_Data/DS_utils.Designer.cs b/ETS_Data/DS_utils.Designer.cs index 2a3355b..62251b7 100644 --- a/ETS_Data/DS_utils.Designer.cs +++ b/ETS_Data/DS_utils.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.17626 +// Runtime Version:4.0.30319.17929 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -4803,6 +4803,8 @@ namespace ETS_Data.DS_utilsTableAdapters { this._commandCollection[1].CommandText = "dbo.stp_tbDocs_Fasi_likeSearch"; this._commandCollection[1].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@inizio", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@fine", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@search", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } @@ -4834,13 +4836,25 @@ namespace ETS_Data.DS_utilsTableAdapters { [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.Select, false)] - public virtual DS_utils.v_tbDocs_selFasiDataTable getByLikeSearch(string search) { + public virtual DS_utils.v_tbDocs_selFasiDataTable getByLikeSearch(global::System.Nullable inizio, global::System.Nullable fine, string search) { this.Adapter.SelectCommand = this.CommandCollection[1]; - if ((search == null)) { - this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + if ((inizio.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[1].Value = ((System.DateTime)(inizio.Value)); } else { - this.Adapter.SelectCommand.Parameters[1].Value = ((string)(search)); + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + if ((fine.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[2].Value = ((System.DateTime)(fine.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; + } + if ((search == null)) { + this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[3].Value = ((string)(search)); } DS_utils.v_tbDocs_selFasiDataTable dataTable = new DS_utils.v_tbDocs_selFasiDataTable(); this.Adapter.Fill(dataTable); diff --git a/ETS_Data/DS_utils.xsd b/ETS_Data/DS_utils.xsd index 1843651..546d80e 100644 --- a/ETS_Data/DS_utils.xsd +++ b/ETS_Data/DS_utils.xsd @@ -147,6 +147,8 @@ ORDER BY value dbo.stp_tbDocs_Fasi_likeSearch + + @@ -249,7 +251,7 @@ ORDER BY value - + @@ -269,7 +271,7 @@ ORDER BY value - + @@ -283,7 +285,7 @@ ORDER BY value - + @@ -297,7 +299,7 @@ ORDER BY value - + @@ -307,7 +309,7 @@ ORDER BY value - + @@ -327,7 +329,7 @@ ORDER BY value - + @@ -347,7 +349,7 @@ ORDER BY value - + @@ -367,7 +369,7 @@ ORDER BY value - + @@ -387,7 +389,7 @@ ORDER BY value - + diff --git a/ETS_Data/DS_utils.xss b/ETS_Data/DS_utils.xss index 2816032..b132fea 100644 --- a/ETS_Data/DS_utils.xss +++ b/ETS_Data/DS_utils.xss @@ -10,11 +10,11 @@ - + - + + - \ No newline at end of file