diff --git a/GMW/GMW/GMW.csproj b/GMW/GMW/GMW.csproj index 8cecbba9..5293f244 100644 --- a/GMW/GMW/GMW.csproj +++ b/GMW/GMW/GMW.csproj @@ -222,6 +222,13 @@ mod_confMag.ascx + + mod_detailUDC.ascx + ASPXCodeBehind + + + mod_detailUDC.ascx + mod_execUDC.ascx ASPXCodeBehind @@ -313,6 +320,13 @@ mod_searchMag.ascx + + mod_SearchProvUDC.ascx + ASPXCodeBehind + + + mod_SearchProvUDC.ascx + mod_selettore_ajax.ascx ASPXCodeBehind @@ -320,12 +334,12 @@ mod_selettore_ajax.ascx - - mod_showUDC.ascx + + mod_searchUDC.ascx ASPXCodeBehind - - mod_showUDC.ascx + + mod_searchUDC.ascx mod_tipoCella.ascx @@ -498,6 +512,7 @@ + @@ -511,8 +526,9 @@ + - + diff --git a/GMW/GMW/WebUserControls/mod_SearchProvUDC.ascx b/GMW/GMW/WebUserControls/mod_SearchProvUDC.ascx new file mode 100644 index 00000000..42387c6f --- /dev/null +++ b/GMW/GMW/WebUserControls/mod_SearchProvUDC.ascx @@ -0,0 +1,18 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_SearchProvUDC.ascx.cs" + Inherits="GMW.WebUserControls.mod_SearchProvUDC" %> +<%@ Register src="mod_searchUDC.ascx" tagname="mod_searchUDC" tagprefix="uc1" %> +<%@ Register src="mod_execUDC.ascx" tagname="mod_execUDC" tagprefix="uc2" %> +<%@ Register src="mod_detailUDC.ascx" tagname="mod_detailUDC" tagprefix="uc3" %> + + + + + + +
+ + + + + +
diff --git a/GMW/GMW/WebUserControls/mod_SearchProvUDC.ascx.cs b/GMW/GMW/WebUserControls/mod_SearchProvUDC.ascx.cs new file mode 100644 index 00000000..01995155 --- /dev/null +++ b/GMW/GMW/WebUserControls/mod_SearchProvUDC.ascx.cs @@ -0,0 +1,65 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using SteamWare; + +namespace GMW.WebUserControls +{ + public partial class mod_SearchProvUDC : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + if (!Page.IsPostBack) + { + doTraduci(); + mod_detailUDC1.Visible = false; + mod_execUDC1.Visible = false; + } + mod_searchUDC1.eh_selValore += new EventHandler(mod_searchUDC1_eh_selValore); + mod_searchUDC1.eh_resetSelezione += new EventHandler(mod_searchUDC1_eh_resetSelezione); + } + + void mod_searchUDC1_eh_resetSelezione(object sender, EventArgs e) + { + mod_detailUDC1.Visible = false; + mod_execUDC1.Visible = false; + } + + void mod_searchUDC1_eh_selValore(object sender, EventArgs e) + { + mod_detailUDC1.Visible = true; + mod_execUDC1.Visible = true; + } + + + private void doTraduci() + { + //chkLikeType.Text = traduci("AbilitaRicercaLike"); + //chkLikeType.ToolTip = traduci("AbilitaRicercaLikeExpl"); + //btnSearch.Text = traduci("btnSearch"); + //TBWE_search.WatermarkText = traduci("insertCod4search"); + } + + /// + /// Effettua la ricerca indicata + /// + public void doSearch() + { + mod_searchUDC1.doUpdate(); + mod_detailUDC1.Visible = false; + mod_execUDC1.Visible = false; + } + /// + /// wrapper metodo traduzione + /// + /// + /// + public string traduci(string lemma) + { + return user_std.UtSn.Traduci(lemma); + } + } +} \ No newline at end of file diff --git a/GMW/GMW/WebUserControls/mod_SearchProvUDC.ascx.designer.cs b/GMW/GMW/WebUserControls/mod_SearchProvUDC.ascx.designer.cs new file mode 100644 index 00000000..a0db0492 --- /dev/null +++ b/GMW/GMW/WebUserControls/mod_SearchProvUDC.ascx.designer.cs @@ -0,0 +1,43 @@ +//------------------------------------------------------------------------------ +// +// 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. +// +//------------------------------------------------------------------------------ + +namespace GMW.WebUserControls { + + + public partial class mod_SearchProvUDC { + + /// + /// mod_searchUDC1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::GMW.WebUserControls.mod_searchUDC mod_searchUDC1; + + /// + /// mod_detailUDC1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::GMW.WebUserControls.mod_detailUDC mod_detailUDC1; + + /// + /// mod_execUDC1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::GMW.WebUserControls.mod_execUDC mod_execUDC1; + } +} diff --git a/GMW/GMW/WebUserControls/mod_detailUDC.ascx b/GMW/GMW/WebUserControls/mod_detailUDC.ascx new file mode 100644 index 00000000..dc662fe3 --- /dev/null +++ b/GMW/GMW/WebUserControls/mod_detailUDC.ascx @@ -0,0 +1,2 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_detailUDC.ascx.cs" Inherits="GMW.WebUserControls.mod_detailUDC" %> +dettagli UDC \ No newline at end of file diff --git a/GMW/GMW/WebUserControls/mod_detailUDC.ascx.cs b/GMW/GMW/WebUserControls/mod_detailUDC.ascx.cs new file mode 100644 index 00000000..4c4fd8a5 --- /dev/null +++ b/GMW/GMW/WebUserControls/mod_detailUDC.ascx.cs @@ -0,0 +1,17 @@ +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_detailUDC : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/GMW/GMW/WebUserControls/mod_detailUDC.ascx.designer.cs b/GMW/GMW/WebUserControls/mod_detailUDC.ascx.designer.cs new file mode 100644 index 00000000..8afd5f35 --- /dev/null +++ b/GMW/GMW/WebUserControls/mod_detailUDC.ascx.designer.cs @@ -0,0 +1,16 @@ +//------------------------------------------------------------------------------ +// +// 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. +// +//------------------------------------------------------------------------------ + +namespace GMW.WebUserControls { + + + public partial class mod_detailUDC { + } +} diff --git a/GMW/GMW/WebUserControls/mod_searchMag.ascx b/GMW/GMW/WebUserControls/mod_searchMag.ascx index 9e9f702d..1f8a7e21 100644 --- a/GMW/GMW/WebUserControls/mod_searchMag.ascx +++ b/GMW/GMW/WebUserControls/mod_searchMag.ascx @@ -2,9 +2,8 @@ Inherits="GMW.WebUserControls.mod_searchMag" %> <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %> <%@ Register Src="mod_filtro.ascx" TagName="mod_filtro" TagPrefix="uc2" %> -<%@ Register Src="mod_showUDC.ascx" TagName="mod_showUDC" TagPrefix="uc1" %> <%@ Register Src="mod_metodiNoSearch.ascx" TagName="mod_metodiNoSearch" TagPrefix="uc3" %> -<%@ Register Src="mod_execUDC.ascx" TagName="mod_execUDC" TagPrefix="uc4" %> +<%@ Register Src="mod_SearchProvUDC.ascx" TagName="mod_SearchProvUDC" TagPrefix="uc1" %>
@@ -12,42 +11,50 @@ style="color: Blue;">mag
-   - - -
-
-
- -
- - + + + + + +
+ + +
+
+
+ +
+ + + 		+   + + +
- - - + +
+
- -

- -

- - - - - 		- - - -
+ + + + +
+ +
+ + + +
diff --git a/GMW/GMW/WebUserControls/mod_searchMag.ascx.cs b/GMW/GMW/WebUserControls/mod_searchMag.ascx.cs index 0f367775..1c9218db 100644 --- a/GMW/GMW/WebUserControls/mod_searchMag.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_searchMag.ascx.cs @@ -17,27 +17,9 @@ namespace GMW.WebUserControls doTraduci(); pnlEmpty.Visible = true; pnlResults.Visible = false; - pnlMethod.Visible = false; } - //mod_elencoObj1.eh_selValore += new EventHandler(mod_elencoObj1_eh_selValore); - //mod_elencoObj1.eh_resetSelezione += new EventHandler(mod_elencoObj1_eh_resetSelezione); } - void mod_elencoObj1_eh_resetSelezione(object sender, EventArgs e) - { - //mod_dettaglioImpieghiObj1.Visible = false; - //mod_elencoObj1.noBorder(); - } - - void mod_elencoObj1_eh_selValore(object sender, EventArgs e) - { - //if (!mod_dettaglioImpieghiObj1.Visible) - //{ - // mod_dettaglioImpieghiObj1.Visible = true; - //} - //mod_dettaglioImpieghiObj1.doUpdate(); - //mod_elencoObj1.addBorder(); - } private void doTraduci() { @@ -54,15 +36,17 @@ namespace GMW.WebUserControls { doSearch(); } - + /// + /// effettua la ricerca + /// private void doSearch() { - // !!! RI FARE!!! - se è tipo like NON HA senso distinguere nel tipo di ricerca, attiva tutti i "search provider" string testoCercato = txtSearch.Text.Trim(); + memLayer.ML.setSessionVal("FullSearchValue", testoCercato, false); + memLayer.ML.setSessionVal("SearchIsLikeBased", chkLikeType.Checked, false); + // !!! RI FARE!!! - se è tipo like NON HA senso distinguere nel tipo di ricerca, attiva tutti i "search provider" if (testoCercato != "") { - memLayer.ML.setSessionVal("FullSearchValue", testoCercato, false); - memLayer.ML.setSessionVal("SearchIsLikeBased", chkLikeType.Checked, false); pnlEmpty.Visible = false; pnlResults.Visible = true; // in base al tipo di richiesta determino che risultati visualizzare... @@ -70,30 +54,26 @@ namespace GMW.WebUserControls { case "I": lblTipoSearch.Text = traduci("RicercaImballi"); - mod_showUDC1.Visible = false; + mod_SearchProvUDC1.Visible = false; break; case "M": lblTipoSearch.Text = traduci("RicercaMagazzino"); - mod_showUDC1.Visible = false; + mod_SearchProvUDC1.Visible = false; break; case "O": lblTipoSearch.Text = traduci("RicercaOperatore"); - mod_showUDC1.Visible = false; + mod_SearchProvUDC1.Visible = false; break; case "U": lblTipoSearch.Text = traduci("RicercaUDC"); - mod_showUDC1.Visible = true; - mod_showUDC1.doUpdate(); + mod_SearchProvUDC1.Visible = true; + mod_SearchProvUDC1.doSearch(); break; default: lblTipoSearch.Text = traduci("RicercaGenerica"); - mod_showUDC1.Visible = false; + mod_SearchProvUDC1.Visible = false; break; } - - //mod_elencoObj1.testoCercato = testoCercato; - pnlMethod.Visible = false; - //mod_elencoObj1.noBorder(); } else { diff --git a/GMW/GMW/WebUserControls/mod_searchMag.ascx.designer.cs b/GMW/GMW/WebUserControls/mod_searchMag.ascx.designer.cs index b522c58e..ada1c408 100644 --- a/GMW/GMW/WebUserControls/mod_searchMag.ascx.designer.cs +++ b/GMW/GMW/WebUserControls/mod_searchMag.ascx.designer.cs @@ -13,6 +13,15 @@ namespace GMW.WebUserControls { public partial class mod_searchMag { + /// + /// updtRicerca control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.UpdateProgress updtRicerca; + /// /// txtSearch control. /// @@ -40,15 +49,6 @@ namespace GMW.WebUserControls { /// protected global::AjaxControlToolkit.TextBoxWatermarkExtender TBWE_search; - /// - /// updtRicerca control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.UpdateProgress updtRicerca; - /// /// chkLikeType control. /// @@ -77,13 +77,13 @@ namespace GMW.WebUserControls { protected global::System.Web.UI.WebControls.Label lblTipoSearch; /// - /// mod_showUDC1 control. + /// mod_SearchProvUDC1 control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::GMW.WebUserControls.mod_showUDC mod_showUDC1; + protected global::GMW.WebUserControls.mod_SearchProvUDC mod_SearchProvUDC1; /// /// pnlEmpty control. @@ -94,24 +94,6 @@ namespace GMW.WebUserControls { /// protected global::System.Web.UI.WebControls.Panel pnlEmpty; - /// - /// pnlMethod control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Panel pnlMethod; - - /// - /// mod_execUDC1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::GMW.WebUserControls.mod_execUDC mod_execUDC1; - /// /// mod_metodiNoSearch1 control. /// diff --git a/GMW/GMW/WebUserControls/mod_showUDC.ascx b/GMW/GMW/WebUserControls/mod_searchUDC.ascx similarity index 95% rename from GMW/GMW/WebUserControls/mod_showUDC.ascx rename to GMW/GMW/WebUserControls/mod_searchUDC.ascx index 7877ba0a..f263405f 100644 --- a/GMW/GMW/WebUserControls/mod_showUDC.ascx +++ b/GMW/GMW/WebUserControls/mod_searchUDC.ascx @@ -1,5 +1,5 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_showUDC.ascx.cs" - Inherits="GMW.WebUserControls.mod_showUDC" %> +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_searchUDC.ascx.cs" + Inherits="GMW.WebUserControls.mod_searchUDC" %> <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %> /// grView control. diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll index 4fa6ed78..7f248042 100644 Binary files a/GMW/GMW/bin/GMW.dll and b/GMW/GMW/bin/GMW.dll differ diff --git a/GMW/GMW/obj/Debug/GMW.dll b/GMW/GMW/obj/Debug/GMW.dll index 4fa6ed78..7f248042 100644 Binary files a/GMW/GMW/obj/Debug/GMW.dll and b/GMW/GMW/obj/Debug/GMW.dll differ