diff --git a/GMW/GMW.csproj b/GMW/GMW.csproj index 1157a86e..e12bef13 100644 --- a/GMW/GMW.csproj +++ b/GMW/GMW.csproj @@ -422,6 +422,8 @@ + + @@ -1472,6 +1474,13 @@ mod_listOperatori.ascx + + mod_SearchProvAL.ascx + ASPXCodeBehind + + + mod_SearchProvAL.ascx + mod_SearchProvCelle.ascx ASPXCodeBehind @@ -1479,6 +1488,13 @@ mod_SearchProvCelle.ascx + + mod_SearchProvDtx.ascx + ASPXCodeBehind + + + mod_SearchProvDtx.ascx + Mod_SearchProvImballi.ascx ASPXCodeBehind diff --git a/GMW/SearchMag.aspx b/GMW/SearchMag.aspx index 4c0925d4..d2fcd4c3 100644 --- a/GMW/SearchMag.aspx +++ b/GMW/SearchMag.aspx @@ -7,6 +7,9 @@ <%@ Register Src="WebUserControls/mod_SearchProvParticolari.ascx" TagName="mod_SearchProvParticolari" TagPrefix="uc5" %> <%@ Register Src="WebUserControls/Mod_SearchProvImballi.ascx" TagName="Mod_SearchProvImballi" TagPrefix="uc6" %> +<%@ Register Src="WebUserControls/mod_SearchProvAL.ascx" TagName="mod_SearchProvAL" TagPrefix="uc7" %> +<%@ Register Src="WebUserControls/mod_SearchProvDtx.ascx" TagName="mod_SearchProvDtx" TagPrefix="uc8" %> + @@ -59,6 +62,12 @@
+
+ +
+
+ +
<%--

diff --git a/GMW/SearchMag.aspx.cs b/GMW/SearchMag.aspx.cs index 227425d1..d046d565 100644 --- a/GMW/SearchMag.aspx.cs +++ b/GMW/SearchMag.aspx.cs @@ -18,6 +18,19 @@ namespace GMW doTraduci(); pnlEmpty.Visible = true; pnlResults.Visible = true; //false; + // se ho in URL la chiave "search" lo riporto come search... + if (ricercaUrl != "") + { + ricerca = ricercaUrl; + //string request = Request.Url; + Response.Redirect("SearchMag"); + } + // se ho in sessione ricerca la mostro... + if (ricerca != "") + { + txtRicerca = ricerca; + doSearch(); + } } mod_SearchProvUDC1.eh_selValore += new EventHandler(mod_SearchProvUDC1_eh_selValore); mod_SearchProvParticolari1.eh_selValore += new EventHandler(mod_SearchProvParticolari1_eh_selValore); @@ -25,6 +38,54 @@ namespace GMW mod_SearchProvParticolari1.eh_reset += new EventHandler(mod_SearchProvParticolari1_eh_reset); txtSearch.Focus(); } + /// + /// ricerca corrente + /// + protected string ricerca + { + get + { + return memLayer.ML.StringSessionObj("FullSearchValue"); + } + set + { + memLayer.ML.setSessionVal("FullSearchValue", value, false); + } + } + + /// + /// ricerca corrente + /// + protected string txtRicerca + { + get + { + return txtSearch.Text.Trim(); + } + set + { + txtSearch.Text = value; + } + } + /// + /// restituisce termine ricerca contenuto in URL (se disponibile) + /// + protected string ricercaUrl + { + get + { + string answ = ""; + try + { + answ = Request.QueryString["search"].ToString(); + } + catch + { + answ = ""; + } + return answ; + } + } void mod_SearchProvParticolari1_eh_reset(object sender, EventArgs e) { @@ -90,22 +151,25 @@ namespace GMW /// private void doSearch() { - string testoCercato = txtSearch.Text.Trim(); - memLayer.ML.setSessionVal("FullSearchValue", testoCercato, false); + memLayer.ML.setSessionVal("FullSearchValue", txtRicerca, false); memLayer.ML.setSessionVal("SearchIsLikeBased", chkLikeType.Checked, false); - if (testoCercato != "") + if (txtRicerca != "") { pnlEmpty.Visible = false; pnlResults.Visible = true; if (chkLikeType.Checked) { // è generica, mostro tutto! + mod_SearchProvAL1.Visible = true; + mod_SearchProvAL1.doSearch(); + // NON faccio ricerca LIKE x Dtx !!! + mod_SearchProvDtx1.Visible = false; + mod_SearchProvParticolari1.Visible = true; + mod_SearchProvParticolari1.doSearch(); mod_SearchProvUDC1.Visible = true; mod_SearchProvUDC1.doSearch(); //mod_SearchProvCelle1.Visible = true; //mod_SearchProvCelle1.doSearch(); - mod_SearchProvParticolari1.Visible = true; - mod_SearchProvParticolari1.doSearch(); //Mod_SearchProvImballi1.Visible = true; //Mod_SearchProvImballi1.doSearch(); @@ -113,32 +177,30 @@ namespace GMW else { // in base al tipo di richiesta determino che risultati visualizzare... - switch (testoCercato.Substring(0, 1)) + switch (txtRicerca.Substring(0, 1)) { - case "I": - mod_SearchProvUDC1.Visible = false; - //mod_SearchProvCelle1.Visible = false; + //case "I": + // mod_SearchProvAL1.Visible = false; + // mod_SearchProvDtx1.Visible = false; + // mod_SearchProvParticolari1.Visible = false; + // mod_SearchProvUDC1.Visible = false; + // //mod_SearchProvCelle1.Visible = false; + // //Mod_SearchProvImballi1.Visible = true; + // //Mod_SearchProvImballi1.doSearch(); + // break; + case "A": + mod_SearchProvAL1.Visible = true; + mod_SearchProvAL1.doSearch(); + mod_SearchProvDtx1.Visible = false; mod_SearchProvParticolari1.Visible = false; - //Mod_SearchProvImballi1.Visible = true; - //Mod_SearchProvImballi1.doSearch(); - break; -#if false - case "C": mod_SearchProvUDC1.Visible = false; //mod_SearchProvCelle1.Visible = true; //mod_SearchProvCelle1.doSearch(); - mod_SearchProvParticolari1.Visible = false; //Mod_SearchProvImballi1.Visible = false; - break; - case "P": - mod_SearchProvUDC1.Visible = false; - //mod_SearchProvCelle1.Visible = false; - mod_SearchProvParticolari1.Visible = true; - mod_SearchProvParticolari1.doSearch(); - //Mod_SearchProvImballi1.Visible = false; - break; -#endif + break; case "U": + mod_SearchProvAL1.Visible = false; + mod_SearchProvDtx1.Visible = false; mod_SearchProvUDC1.Visible = true; mod_SearchProvUDC1.doSearch(); //mod_SearchProvCelle1.Visible = false; @@ -146,12 +208,16 @@ namespace GMW //Mod_SearchProvImballi1.Visible = false; break; default: + mod_SearchProvAL1.Visible = true; + mod_SearchProvAL1.doSearch(); + mod_SearchProvDtx1.Visible = true; + mod_SearchProvDtx1.doSearch(); + mod_SearchProvParticolari1.Visible = true; + mod_SearchProvParticolari1.doSearch(); mod_SearchProvUDC1.Visible = true; mod_SearchProvUDC1.doSearch(); //mod_SearchProvCelle1.Visible = true; //mod_SearchProvCelle1.doSearch(); - mod_SearchProvParticolari1.Visible = true; - mod_SearchProvParticolari1.doSearch(); //Mod_SearchProvImballi1.Visible = true; //Mod_SearchProvImballi1.doSearch(); break; diff --git a/GMW/SearchMag.aspx.designer.cs b/GMW/SearchMag.aspx.designer.cs index d59d949a..6e76d515 100644 --- a/GMW/SearchMag.aspx.designer.cs +++ b/GMW/SearchMag.aspx.designer.cs @@ -84,6 +84,24 @@ namespace GMW { /// protected global::GMW.WebUserControls.mod_SearchProvUDC mod_SearchProvUDC1; + /// + /// mod_SearchProvAL1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::GMW.WebUserControls.mod_SearchProvAL mod_SearchProvAL1; + + /// + /// mod_SearchProvDtx1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::GMW.WebUserControls.mod_SearchProvDtx mod_SearchProvDtx1; + /// /// pnlEmpty control. /// diff --git a/GMW/WebUserControls/mod_SearchProvAL.ascx b/GMW/WebUserControls/mod_SearchProvAL.ascx new file mode 100644 index 00000000..cfb0e765 --- /dev/null +++ b/GMW/WebUserControls/mod_SearchProvAL.ascx @@ -0,0 +1,21 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_SearchProvAL.ascx.cs" Inherits="GMW.WebUserControls.mod_SearchProvAL" %> + + +
+ + +
+
+
+
+ elenco AL + <%-- --%> +
+
+ dettaglio UDC compresi in AL + <%-- + --%> +
+
+
+ \ No newline at end of file diff --git a/GMW/WebUserControls/mod_SearchProvAL.ascx.cs b/GMW/WebUserControls/mod_SearchProvAL.ascx.cs new file mode 100644 index 00000000..a14e592c --- /dev/null +++ b/GMW/WebUserControls/mod_SearchProvAL.ascx.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace GMW.WebUserControls +{ + public partial class mod_SearchProvAL : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + public void doSearch() + {} + } +} \ No newline at end of file diff --git a/GMW/WebUserControls/mod_SearchProvAL.ascx.designer.cs b/GMW/WebUserControls/mod_SearchProvAL.ascx.designer.cs new file mode 100644 index 00000000..c97f15d2 --- /dev/null +++ b/GMW/WebUserControls/mod_SearchProvAL.ascx.designer.cs @@ -0,0 +1,33 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace GMW.WebUserControls { + + + public partial class mod_SearchProvAL { + + /// + /// pnlSearchProvider control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Panel pnlSearchProvider; + + /// + /// lblSearchProvider control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblSearchProvider; + } +} diff --git a/GMW/WebUserControls/mod_SearchProvDtx.ascx b/GMW/WebUserControls/mod_SearchProvDtx.ascx new file mode 100644 index 00000000..0b2e6836 --- /dev/null +++ b/GMW/WebUserControls/mod_SearchProvDtx.ascx @@ -0,0 +1,26 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_SearchProvDtx.ascx.cs" Inherits="GMW.WebUserControls.mod_SearchProvDtx" %> + +
+ + +
+
+
+
+ dettaglio DTX (UDC, particolare) + <%-- --%> +
+
+ dettaglio UDC del DTX +
+ dettaglio attributi DTX +
+ dettaglio attributi UDC +
+ dettaglio trattamento AL/UDC + <%-- + --%> +
+
+
+ \ No newline at end of file diff --git a/GMW/WebUserControls/mod_SearchProvDtx.ascx.cs b/GMW/WebUserControls/mod_SearchProvDtx.ascx.cs new file mode 100644 index 00000000..37a85da4 --- /dev/null +++ b/GMW/WebUserControls/mod_SearchProvDtx.ascx.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace GMW.WebUserControls +{ + public partial class mod_SearchProvDtx : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + public void doSearch() + { } + } +} \ No newline at end of file diff --git a/GMW/WebUserControls/mod_SearchProvDtx.ascx.designer.cs b/GMW/WebUserControls/mod_SearchProvDtx.ascx.designer.cs new file mode 100644 index 00000000..ecac3e20 --- /dev/null +++ b/GMW/WebUserControls/mod_SearchProvDtx.ascx.designer.cs @@ -0,0 +1,33 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace GMW.WebUserControls { + + + public partial class mod_SearchProvDtx { + + /// + /// pnlSearchProvider control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Panel pnlSearchProvider; + + /// + /// lblSearchProvider control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblSearchProvider; + } +} diff --git a/GMW/WebUserControls/mod_elencoListePrelievo.ascx b/GMW/WebUserControls/mod_elencoListePrelievo.ascx index 0f9fc622..e553e200 100644 --- a/GMW/WebUserControls/mod_elencoListePrelievo.ascx +++ b/GMW/WebUserControls/mod_elencoListePrelievo.ascx @@ -259,7 +259,7 @@
- <%: traduci("ForzaDL") %> + <%: traduci("ForzaDL") %>
diff --git a/GMW/WebUserControls/mod_execUDC.ascx b/GMW/WebUserControls/mod_execUDC.ascx index b274fa43..010f4525 100644 --- a/GMW/WebUserControls/mod_execUDC.ascx +++ b/GMW/WebUserControls/mod_execUDC.ascx @@ -32,10 +32,10 @@ -
+
-
+

diff --git a/GMW/WebUserControls/mod_execUDC.ascx.cs b/GMW/WebUserControls/mod_execUDC.ascx.cs index 0fd1c6b5..e1326b39 100644 --- a/GMW/WebUserControls/mod_execUDC.ascx.cs +++ b/GMW/WebUserControls/mod_execUDC.ascx.cs @@ -206,6 +206,7 @@ namespace GMW.WebUserControls { dMain.Attributes.Remove("style"); } + dMain.Visible = value; } } } diff --git a/GMW/bin/GMW.dll b/GMW/bin/GMW.dll index f5cab8e1..39ab46db 100644 Binary files a/GMW/bin/GMW.dll and b/GMW/bin/GMW.dll differ diff --git a/GMW/bin/GMW_data.dll b/GMW/bin/GMW_data.dll index 47190b7e..8ab657ac 100644 Binary files a/GMW/bin/GMW_data.dll and b/GMW/bin/GMW_data.dll differ diff --git a/GMW/bin/SteamWare.dll b/GMW/bin/SteamWare.dll index 79605e51..7d7d8b0d 100644 Binary files a/GMW/bin/SteamWare.dll and b/GMW/bin/SteamWare.dll differ diff --git a/GMW/bin/VersGen.dll b/GMW/bin/VersGen.dll index 8708bb5e..24df18f8 100644 Binary files a/GMW/bin/VersGen.dll and b/GMW/bin/VersGen.dll differ diff --git a/VersGen/GMW.cs b/VersGen/GMW.cs index 3972cc45..ea0b629f 100644 --- a/VersGen/GMW.cs +++ b/VersGen/GMW.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("2.5.639.1545")] -[assembly: AssemblyFileVersion("2.5.639.1545")] +[assembly: AssemblyVersion("2.5.640.1546")] +[assembly: AssemblyFileVersion("2.5.640.1546")] //[assembly: AssemblyCopyright("© Steamware 2007-2014")] //[assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/GMW.tt b/VersGen/GMW.tt index a730dde4..84bd097b 100644 --- a/VersGen/GMW.tt +++ b/VersGen/GMW.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("2.5.639.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("2.5.639.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("2.5.640.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("2.5.640.<#= this.RevisionNumber #>")] //[assembly: AssemblyCopyright("© Steamware 2007-<#= DateTime.Now.Year #>")] //[assembly: AssemblyCompany("Steamware")] <#+