diff --git a/GMW/GMW.csproj b/GMW/GMW.csproj index 6689056f..f49c615d 100644 --- a/GMW/GMW.csproj +++ b/GMW/GMW.csproj @@ -414,6 +414,7 @@ + @@ -1055,6 +1056,13 @@ mod_delibera.ascx + + mod_detailAL2UDC.ascx + ASPXCodeBehind + + + mod_detailAL2UDC.ascx + mod_detailCelle.ascx ASPXCodeBehind diff --git a/GMW/SearchMag.aspx b/GMW/SearchMag.aspx index d2fcd4c3..1ff5d94f 100644 --- a/GMW/SearchMag.aspx +++ b/GMW/SearchMag.aspx @@ -62,11 +62,13 @@
-
- -
-
- +
+
+   +
+
+   +
<%--
@@ -74,9 +76,7 @@ --%> - - -
+
diff --git a/GMW/SearchMag.aspx.cs b/GMW/SearchMag.aspx.cs index 8f3e4c9a..c77229d5 100644 --- a/GMW/SearchMag.aspx.cs +++ b/GMW/SearchMag.aspx.cs @@ -16,7 +16,6 @@ namespace GMW if (!Page.IsPostBack) { doTraduci(); - pnlEmpty.Visible = true; pnlResults.Visible = true; //false; // se ho in URL la chiave "search" lo riporto come search... if (ricercaUrl != "") @@ -163,7 +162,6 @@ namespace GMW memLayer.ML.setSessionVal("SearchIsLikeBased", chkLikeType.Checked, false); if (txtRicerca != "") { - pnlEmpty.Visible = false; pnlResults.Visible = true; if (chkLikeType.Checked) { @@ -235,7 +233,6 @@ namespace GMW else { memLayer.ML.emptySessionVal("FullSearchValue"); - pnlEmpty.Visible = true; pnlResults.Visible = false; } } diff --git a/GMW/SearchMag.aspx.designer.cs b/GMW/SearchMag.aspx.designer.cs index 6e76d515..2f5daf95 100644 --- a/GMW/SearchMag.aspx.designer.cs +++ b/GMW/SearchMag.aspx.designer.cs @@ -102,15 +102,6 @@ namespace GMW { /// protected global::GMW.WebUserControls.mod_SearchProvDtx mod_SearchProvDtx1; - /// - /// pnlEmpty control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Panel pnlEmpty; - /// /// mod_metodiNoSearch1 control. /// diff --git a/GMW/WebUserControls/mod_SearchProvAL.ascx b/GMW/WebUserControls/mod_SearchProvAL.ascx index f9b8c36f..cb92dd83 100644 --- a/GMW/WebUserControls/mod_SearchProvAL.ascx +++ b/GMW/WebUserControls/mod_SearchProvAL.ascx @@ -2,20 +2,20 @@ <%@ Register src="mod_listAL.ascx" tagname="mod_listAL" tagprefix="uc1" %> +<%@ Register src="mod_detailAL2UDC.ascx" tagname="mod_detailAL2UDC" tagprefix="uc2" %> +
- + <%: traduci("AL") %>
-
+
-
- dettaglio UDC compresi in AL - <%-- - --%> +
+
diff --git a/GMW/WebUserControls/mod_SearchProvAL.ascx.cs b/GMW/WebUserControls/mod_SearchProvAL.ascx.cs index 277fdd3f..aec19a23 100644 --- a/GMW/WebUserControls/mod_SearchProvAL.ascx.cs +++ b/GMW/WebUserControls/mod_SearchProvAL.ascx.cs @@ -24,7 +24,6 @@ namespace GMW.WebUserControls { if (!Page.IsPostBack) { - doTraduci(); #if false mod_execParticolari1.Visible = false; #endif @@ -114,13 +113,7 @@ namespace GMW.WebUserControls } } - - private void doTraduci() - { - lblSearchProvider.Text = traduci("Particolari"); - } - - /// +/// /// Effettua la ricerca indicata /// public void doSearch() diff --git a/GMW/WebUserControls/mod_SearchProvAL.ascx.designer.cs b/GMW/WebUserControls/mod_SearchProvAL.ascx.designer.cs index 2ce6f715..45364a67 100644 --- a/GMW/WebUserControls/mod_SearchProvAL.ascx.designer.cs +++ b/GMW/WebUserControls/mod_SearchProvAL.ascx.designer.cs @@ -38,5 +38,14 @@ namespace GMW.WebUserControls { /// To modify move field declaration from designer file to code-behind file. /// protected global::GMW.WebUserControls.mod_listAL mod_listAL1; + + /// + /// mod_detailAL2UDC1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::GMW.WebUserControls.mod_detailAL2UDC mod_detailAL2UDC1; } } diff --git a/GMW/WebUserControls/mod_SearchProvParticolari.ascx b/GMW/WebUserControls/mod_SearchProvParticolari.ascx index a5940cb5..195323b3 100644 --- a/GMW/WebUserControls/mod_SearchProvParticolari.ascx +++ b/GMW/WebUserControls/mod_SearchProvParticolari.ascx @@ -8,7 +8,7 @@
- + <%: traduci("Particolari") %>
diff --git a/GMW/WebUserControls/mod_SearchProvParticolari.ascx.cs b/GMW/WebUserControls/mod_SearchProvParticolari.ascx.cs index 93366bf6..65982e3c 100644 --- a/GMW/WebUserControls/mod_SearchProvParticolari.ascx.cs +++ b/GMW/WebUserControls/mod_SearchProvParticolari.ascx.cs @@ -25,7 +25,6 @@ namespace GMW.WebUserControls { if (!Page.IsPostBack) { - doTraduci(); mod_execParticolari1.Visible = false; memLayer.ML.setSessionVal("RicercaParticolariAttiva", false, false); } @@ -101,12 +100,6 @@ namespace GMW.WebUserControls } } - - private void doTraduci() - { - lblSearchProvider.Text = traduci("Particolari"); - } - /// /// Effettua la ricerca indicata /// diff --git a/GMW/WebUserControls/mod_detAttr.ascx b/GMW/WebUserControls/mod_detAttr.ascx index 684abb54..c1b878d2 100644 --- a/GMW/WebUserControls/mod_detAttr.ascx +++ b/GMW/WebUserControls/mod_detAttr.ascx @@ -6,13 +6,13 @@ + <%----%> - diff --git a/GMW/WebUserControls/mod_detailAL2UDC.ascx b/GMW/WebUserControls/mod_detailAL2UDC.ascx new file mode 100644 index 00000000..5c4d47c3 --- /dev/null +++ b/GMW/WebUserControls/mod_detailAL2UDC.ascx @@ -0,0 +1,35 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_detailAL2UDC.ascx.cs" Inherits="GMW.WebUserControls.mod_detailAL2UDC" %> + + + + + + + + + + <%-- + + <%: traduci("Reset") %> + + + + + --%> + + + <%# Eval("UDC") %> + + + <%-- + --%> + + + + + + + + +
+ diff --git a/GMW/WebUserControls/mod_detailAL2UDC.ascx.cs b/GMW/WebUserControls/mod_detailAL2UDC.ascx.cs new file mode 100644 index 00000000..bf7b6a21 --- /dev/null +++ b/GMW/WebUserControls/mod_detailAL2UDC.ascx.cs @@ -0,0 +1,27 @@ +using SteamWare; +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_detailAL2UDC : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + /// + /// wrapper traduzione + /// + /// + /// + public string traduci(object lemma) + { + return user_std.UtSn.Traduci(lemma.ToString()); + } + } +} \ No newline at end of file diff --git a/GMW/WebUserControls/mod_detailAL2UDC.ascx.designer.cs b/GMW/WebUserControls/mod_detailAL2UDC.ascx.designer.cs new file mode 100644 index 00000000..055da45c --- /dev/null +++ b/GMW/WebUserControls/mod_detailAL2UDC.ascx.designer.cs @@ -0,0 +1,51 @@ +//------------------------------------------------------------------------------ +// +// 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_detailAL2UDC { + + /// + /// grView control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.GridView grView; + + /// + /// ods control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource ods; + + /// + /// lblNumRec control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblNumRec; + + /// + /// lblWarning control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblWarning; + } +} diff --git a/GMW/WebUserControls/mod_listAL.ascx b/GMW/WebUserControls/mod_listAL.ascx index 61b0a577..9cebadf5 100644 --- a/GMW/WebUserControls/mod_listAL.ascx +++ b/GMW/WebUserControls/mod_listAL.ascx @@ -26,10 +26,12 @@ - - - + + + + +
-    + +
diff --git a/GMW/bin/GMW.dll b/GMW/bin/GMW.dll index 4a3ab3cb..880c39cf 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 b336a92b..7c4edf17 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 284c86bf..66be3cc3 100644 Binary files a/GMW/bin/SteamWare.dll and b/GMW/bin/SteamWare.dll differ