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 f72c277..31d234e 100644 Binary files a/CMS-SC-Data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll and b/CMS-SC-Data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll differ 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 1b2a0d9..0e75959 100644 Binary files a/CMS_SC/bin/CMS-SC-Data.dll and b/CMS_SC/bin/CMS-SC-Data.dll differ 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'