From 0da6bc3ba6fec091be3dd0de57bf5d43966beb46 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Mon, 5 Mar 2018 15:29:31 +0100 Subject: [PATCH] fix problema quando seleziono un dossier --- CMS-SC-Data/DS_Applicazione.Designer.cs | 2 +- CMS-SC-Data/DS_Applicazione.xsd | 56 +++++++++--------- CMS-SC-Data/DS_Applicazione.xss | 2 +- .../TempPE/DS_Applicazione.Designer.cs.dll | Bin 280064 -> 280064 bytes CMS_SC/ElencoSchede.aspx.cs | 6 ++ .../mod_elencoDossiers.ascx.cs | 2 +- CMS_SC/WebUserControls/mod_testata.ascx.cs | 21 +++---- CMS_SC/bin/CMS-SC-Data.dll | Bin 415232 -> 415232 bytes Jenkinsfile | 2 +- 9 files changed, 49 insertions(+), 42 deletions(-) diff --git a/CMS-SC-Data/DS_Applicazione.Designer.cs b/CMS-SC-Data/DS_Applicazione.Designer.cs index b680f38..8c9b8db 100644 --- a/CMS-SC-Data/DS_Applicazione.Designer.cs +++ b/CMS-SC-Data/DS_Applicazione.Designer.cs @@ -13691,7 +13691,7 @@ SELECT CodScheda, Vers, CodMisura, MinPar, MaxPar, LIVal, LSVal FROM ValidVal WH this._commandCollection = new global::System.Data.SqlClient.SqlCommand[6]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT * FROM v_ElencoDossier"; + this._commandCollection[0].CommandText = "SELECT * FROM v_ElencoDossier ORDER BY Matricola DESC"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; diff --git a/CMS-SC-Data/DS_Applicazione.xsd b/CMS-SC-Data/DS_Applicazione.xsd index 4a81c68..897c1e3 100644 --- a/CMS-SC-Data/DS_Applicazione.xsd +++ b/CMS-SC-Data/DS_Applicazione.xsd @@ -772,8 +772,8 @@ ORDER BY Ordinale, CodSchedaVers - - SELECT * FROM v_ElencoDossier + + SELECT * FROM v_ElencoDossier ORDER BY Matricola DESC @@ -1544,7 +1544,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -1565,7 +1565,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -1603,7 +1603,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -1623,7 +1623,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -1665,7 +1665,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -1714,7 +1714,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -1739,7 +1739,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -1797,7 +1797,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -1844,7 +1844,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -1882,7 +1882,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -1977,7 +1977,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -2091,7 +2091,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -2111,7 +2111,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -2131,7 +2131,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -2158,7 +2158,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -2215,7 +2215,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -2311,16 +2311,16 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/CMS-SC-Data/DS_Applicazione.xss b/CMS-SC-Data/DS_Applicazione.xss index 03fa395..849704d 100644 --- a/CMS-SC-Data/DS_Applicazione.xss +++ b/CMS-SC-Data/DS_Applicazione.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + diff --git a/CMS-SC-Data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll b/CMS-SC-Data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll index f72c277b632a02a5ff0060d241a47baf4dd4040b..31d234e437d2bb8362836178f131f1fe22844d32 100644 GIT binary patch delta 5199 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 Ho1Oj(yIOEB delta 5153 zcmcguc~q6v7QcIQxfkII7aaz7X3XR$^^hG@ST{$?HU2-<62e+Iv_~Z_uiI^SHFS@ zqVKmwSRE_8?N+g6k6s-3HWfY*-n&P^SE6Khi>Zd);dm`pgzYJW5K((JlJ&boyg0t+ z20SJ9f7hfNve$%*wR=(L4N*ze$2amuYYUHEE)2G8Z^3|ss<)AZ#P$6DE z(WzzyZBvIKkq9%2@dI{HOY_r|X0=%6e zUiu>$!o}x*6hSrB=pkBU-;V#n&$AS0V25}T3l)f zhgrgOUkhiXs=nfWIBXJMx4;%Ya1&!6RN!gN#1dBs$IAnjSfKI7@H$I&z{`yaG!-Bm z{Adw?lW7`<;D%|LB6OO%l$2AOC`XVf&(QDKf|Bb3Zk$xr6OsZQaDl!KQZ)6|Lm0eG zg?c8bVUQW&E74&H^-#zQp4hd~MmWo8&8 zA?|vTu0=oq)kQ!@y!fQTLI=Q#EUN9wXyb{GMbG$0xj_?R9ny2P^(0()H{h2oJdtkU^RJ+ zXo|CWX)^SrD@ovCvNWTCjE;mH8kNl2C-R%MX;Cu7nl3jZff{nR8L>*FCncnC;yr0< zN-GvDWKQM7^spHR{ID$t{K%$rQ^BLX^QMRMvD0o-D&M96icjO)^a{;PgCg8qAZkMG zbTAD}csZZEGa!bt)Av9hkAon zBT)WGHqebuj^vORQt+sz7kA?*el%aFx@M$j0hpAs0$Ab+8_6&QGC2o1Q^3w$rPh6< zb@f{3Q>@OVY26Fl1??Q8E1R~I-;EjAeJ$t=?groc;N$DFZ(`hJTDx0!kp= z6XKP^m%xmWOJy@50~XV-3m_hUDx&K%!RC3lh$C`=P3gQ1<$lVSReS-Jm9ycFfr;{%diK14rDtgfgRV!H){mBWf&rtgC!vR>3LABG_ zqr!9We3N@uq%bQ(^L1K1|M%xQ)K;?q%jmOuh{Sb_ZDeYLRM_EAu$*V%PzI%+2P@WV zpi*@nJ_n9h>P6V$()yvqyG6>WI(QkBsGnh#jM1U%YK%JE;25c8zUst1CnwZ0Uqu_7 z&~;RK10J(AN8^FhWOFoh&>T75=hru26Cjn}1dG2~$EkKboRn0>wOI)G05u-r@weJ~OOhie-;;={YMIt1`lcNgr7fq!y^y;{7Hqj?gZ?0`R&!c2#7i3O-y+680y5cKMTYue=Y zB!}CIu^R^IVHS0@;7c$|S!KZoZOZCmWvmTj5jRYvRjC-NY`0^m3uaByq&vOv3gFdA zWKQBa*EqcBhO;M2sVjBpkN2Rf;+2H!5%)bsx#d{(#9nS7?cFUOzD@kGohrJ5nwRVf~c9rbvu zR9pUUWAGH>q%wz8h{=HP9BmoTWxWAxOjhl+fxT!8~)7j(~+g+?=+Unw| z)LwAu)!#hkWVYqNt<%X%(hJ9=*AD$i@eS8k2en^Tq<7pNoo*{_Owm8i|GvE``gq`4 XS#NL0(3@YqcH@5md+cox diff --git a/CMS_SC/ElencoSchede.aspx.cs b/CMS_SC/ElencoSchede.aspx.cs index df4d2a7..c733453 100644 --- a/CMS_SC/ElencoSchede.aspx.cs +++ b/CMS_SC/ElencoSchede.aspx.cs @@ -28,6 +28,12 @@ namespace CMS_SC mod_elencoDossiers.eh_selezioneValore += mod_elencoDossiers_eh_selezioneValore; mod_elencoDossiers.eh_deleteVal += Mod_elencoDossiers_eh_deleteVal; mod_dossier.eh_valUpdated += Mod_dossier_eh_valUpdated; + // se ho matricola in url la segno come ricerca x filtrare... + if (memLayer.ML.QSS("Matricola") != "") + { + ((Bootstrap)this.Master).searchVal = memLayer.ML.QSS("Matricola"); + Response.Redirect(devicesAuthProxy.pagCorrente); + } } /// /// nascondo dettaglio... diff --git a/CMS_SC/WebUserControls/mod_elencoDossiers.ascx.cs b/CMS_SC/WebUserControls/mod_elencoDossiers.ascx.cs index d76d849..badc2ee 100644 --- a/CMS_SC/WebUserControls/mod_elencoDossiers.ascx.cs +++ b/CMS_SC/WebUserControls/mod_elencoDossiers.ascx.cs @@ -28,7 +28,6 @@ namespace CMS_SC.WebUserControls } protected void Page_Load(object sender, EventArgs e) { - } /// /// dimensione pagina grid view @@ -166,5 +165,6 @@ namespace CMS_SC.WebUserControls eh_deleteVal(this, new EventArgs()); } } + } } \ No newline at end of file diff --git a/CMS_SC/WebUserControls/mod_testata.ascx.cs b/CMS_SC/WebUserControls/mod_testata.ascx.cs index 7424fd3..cdf1c2b 100644 --- a/CMS_SC/WebUserControls/mod_testata.ascx.cs +++ b/CMS_SC/WebUserControls/mod_testata.ascx.cs @@ -9,14 +9,6 @@ namespace CMS_SC.WebUserControls { public partial class mod_testata : System.Web.UI.UserControl { - ///// - ///// nome della pagina correntemente caricata - ///// - //public string _paginaCorrente; - ///// - ///// memorizza la pagina precedente (ovvero la corrente ma non da page-object ma in session... - ///// - //public string _paginaPrecedente; /// /// calcola currentPage @@ -75,8 +67,17 @@ namespace CMS_SC.WebUserControls devicesAuthProxy.pagCorrente = titolo; // fix logo imgLogo.Visible = logoVisible; - //PagCorrente(); // tolto 2015.02.24 - memLayer.ML.emptySessionVal("searchVal"); + // se la pagina NON รจ cambiata tengo ricerca + if (devicesAuthProxy.pagCorrente == devicesAuthProxy.pagPrecedente) + { + searchVal = memLayer.ML.StringSessionObj("searchVal"); + } + // altrimenti la svuoto... + else + { + //PagCorrente(); // tolto 2015.02.24 + memLayer.ML.emptySessionVal("searchVal"); + } // fix componenti lblUtente.DataBind(); } diff --git a/CMS_SC/bin/CMS-SC-Data.dll b/CMS_SC/bin/CMS-SC-Data.dll index 1b2a0d9c76f3cf0f84bd90c53ed0973bf8761683..0e75959d2f4eaef4c66e0eca7de14b34d5825bfe 100644 GIT binary patch delta 5858 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 DD`{Eu delta 5805 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 Y8wLrl7{gr!w~P=z(+t<3c#!M=06woA@&Et; diff --git a/Jenkinsfile b/Jenkinsfile index 2859c5a..588625b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,7 +14,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=4232']) { + withEnv(['NEXT_BUILD_NUMBER=4233']) { // env.versionNumber = VersionNumber(versionNumberString : '3.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '3.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'CMS-SC'