diff --git a/GMW/ExportExcel_SAO.aspx b/GMW/ExportExcel_SAO.aspx new file mode 100644 index 00000000..86c755ef --- /dev/null +++ b/GMW/ExportExcel_SAO.aspx @@ -0,0 +1,67 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ExportExcel_SAO.aspx.cs" Inherits="GMW.ExportExcel_SAO" EnableEventValidation="false" %> + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + diff --git a/GMW/ExportExcel_SAO.aspx.cs b/GMW/ExportExcel_SAO.aspx.cs new file mode 100644 index 00000000..0b9a3ce7 --- /dev/null +++ b/GMW/ExportExcel_SAO.aspx.cs @@ -0,0 +1,122 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using SteamWare; +using GMW_data; + +namespace GMW +{ + public partial class ExportExcel_SAO : System.Web.UI.Page + { + /// + /// fix x export excel + /// + /// + public override void VerifyRenderingInServerForm(Control control) + { + // Confirms that an HtmlForm control is rendered for the specified ASP.NET server control at run time. + } + + + /// + /// evento dati associati a controllo + /// + /// + /// + protected void grView_DataBound(object sender, EventArgs e) + { + if (grView.Rows.Count > 0) + { + LinkButton lb; + // aggiorno gli headers + foreach (TableCell cella in grView.HeaderRow.Cells) + { + try + { + lb = (LinkButton)cella.Controls[0]; + lb.Text = traduci(lb.Text); + } + catch + { } + } + } + } + /// + /// wrapper traduzione + /// + /// + /// + public string traduci(object lemma) + { + return user_std.UtSn.Traduci(lemma.ToString()); + } + + private void doExport() + { + Response.Clear(); + Response.AddHeader("content-disposition", "attachment; filename=Export Storico Azioni Operatore.xls"); + Response.Charset = ""; + // If you want the option to open the Excel file without saving than + // comment out the line below + Response.Cache.SetCacheability(HttpCacheability.NoCache); + Response.ContentType = "application/vnd.xls"; + System.IO.StringWriter stringWrite = new System.IO.StringWriter(); + System.Web.UI.HtmlTextWriter htmlWrite = new HtmlTextWriter(stringWrite); + grView.RenderControl(htmlWrite); + Response.Write(stringWrite.ToString()); + Response.End(); + + } + + #region area protected + + + protected void Page_Load(object sender, EventArgs e) + { + if (!Page.IsPostBack) + { + aggiornamento(); + doExport(); + } + } + + #endregion + + public void aggiornamento() + { + grView.AllowPaging = false; + checkFixOds(); + odsSAO.DataBind(); + grView.DataBind(); + } + + /// + /// sistemo filtraggio con valori selezionati + /// + private void checkFixOds() + { + //ods.FilterExpression = "( (codImpianto LIKE '%{0}%') OR (nomeImpianto LIKE '%{0}%') OR (codMacchina LIKE '%{0}%') OR (nomeMacchina LIKE '%{0}%') OR (descrizione LIKE '%{0}%') OR (descrPriorita LIKE '%{0}%') OR (descrTipo LIKE '%{0}%') )"; + //if (memLayer.ML.isInSessionObject("idxTipo_filt")) + //{ + // ods.FilterExpression += " AND (idxTipo = {1})"; + //} + //if (memLayer.ML.isInSessionObject("idxMacchina_filt")) + //{ + // ods.FilterExpression += " AND (idxMacchina = {2})"; + //} + } + + /// + /// converte codSoggetto in cognome/nome + /// + /// + /// + public string getOperatoreByCod(object codSoggetto) + { + return utils.obj.getOperatoreByCod(codSoggetto.ToString()); + } + } +} \ No newline at end of file diff --git a/GMW/ExportExcel_SAO.aspx.designer.cs b/GMW/ExportExcel_SAO.aspx.designer.cs new file mode 100644 index 00000000..b964df33 --- /dev/null +++ b/GMW/ExportExcel_SAO.aspx.designer.cs @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// 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 { + + + public partial class ExportExcel_SAO { + + /// + /// form1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// 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; + + /// + /// odsSAO control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource odsSAO; + } +} diff --git a/GMW/GMW.csproj b/GMW/GMW.csproj index e4c40a95..6c68d7bc 100644 --- a/GMW/GMW.csproj +++ b/GMW/GMW.csproj @@ -161,6 +161,7 @@ + @@ -270,6 +271,13 @@ ElencoListePrelievo.aspx + + ExportExcel_SAO.aspx + ASPXCodeBehind + + + ExportExcel_SAO.aspx + forceUser.aspx ASPXCodeBehind @@ -607,6 +615,13 @@ mod_detailUDC_storico.ascx + + mod_detLDP.ascx + ASPXCodeBehind + + + mod_detLDP.ascx + mod_dettaglioBlocco.ascx ASPXCodeBehind @@ -1169,6 +1184,7 @@ + diff --git a/GMW/Style.css b/GMW/Style.css index c023b3d6..721236d4 100644 --- a/GMW/Style.css +++ b/GMW/Style.css @@ -83,6 +83,18 @@ font-weight: bold; } +/* gruppo buttons */ +.btnNew +{ + background-image: url(images/new_m.png); + background-repeat: no-repeat; + background-position: right; + border-bottom-style: none; + padding: 4px; + padding-right: 28px; +} +/* end */ + /* group barPlot a colori*/ .sv { diff --git a/GMW/Style_prod.css b/GMW/Style_prod.css index 4b3993d6..c8c3b4f7 100644 --- a/GMW/Style_prod.css +++ b/GMW/Style_prod.css @@ -83,6 +83,18 @@ font-weight: bold; } +/* gruppo buttons */ +.btnNew +{ + background-image: url(images/new_m.png); + background-repeat: no-repeat; + background-position: right; + border-bottom-style: none; + padding: 4px; + padding-right: 28px; +} +/* end */ + /* group barPlot a colori*/ .sv { diff --git a/GMW/Style_test.css b/GMW/Style_test.css index c023b3d6..721236d4 100644 --- a/GMW/Style_test.css +++ b/GMW/Style_test.css @@ -83,6 +83,18 @@ font-weight: bold; } +/* gruppo buttons */ +.btnNew +{ + background-image: url(images/new_m.png); + background-repeat: no-repeat; + background-position: right; + border-bottom-style: none; + padding: 4px; + padding-right: 28px; +} +/* end */ + /* group barPlot a colori*/ .sv { diff --git a/GMW/Web.config b/GMW/Web.config index d0182772..c0ea46aa 100644 --- a/GMW/Web.config +++ b/GMW/Web.config @@ -61,7 +61,7 @@ - + diff --git a/GMW/WebUserControls/mod_SearchProvUDC.ascx b/GMW/WebUserControls/mod_SearchProvUDC.ascx index 88bd79e9..d6cd7c35 100644 --- a/GMW/WebUserControls/mod_SearchProvUDC.ascx +++ b/GMW/WebUserControls/mod_SearchProvUDC.ascx @@ -4,6 +4,7 @@ <%@ Register Src="mod_execUDC.ascx" TagName="mod_execUDC" TagPrefix="uc2" %> <%@ Register Src="mod_detailUDC.ascx" TagName="mod_detailUDC" TagPrefix="uc3" %> <%@ Register src="mod_detailUDC_storico.ascx" tagname="mod_detailUDC_storico" tagprefix="uc4" %> +<%@ Register src="mod_detLDP.ascx" tagname="mod_detLDP" tagprefix="uc5" %>
@@ -16,6 +17,9 @@ + + + diff --git a/GMW/WebUserControls/mod_SearchProvUDC.ascx.cs b/GMW/WebUserControls/mod_SearchProvUDC.ascx.cs index 3b574a51..e7691691 100644 --- a/GMW/WebUserControls/mod_SearchProvUDC.ascx.cs +++ b/GMW/WebUserControls/mod_SearchProvUDC.ascx.cs @@ -74,26 +74,28 @@ namespace GMW.WebUserControls bool showHistUdc = false; string udcSel = memLayer.ML.StringSessionObj("UDC_sel"); string udcHist = memLayer.ML.StringSessionObj("FullSearchValue"); + if (udcHist != "") + { + if (!MagClass.magazzino.checkUDC(udcHist) && udcHist.Length >= 12) + { + showHistUdc = true; + } + } if (udcSel != "") { if (MagClass.magazzino.checkUDC(udcSel)) { showCurUdc = true; + showHistUdc = false; } else { showHistUdc = true; } } - if (udcHist != "") - { - if (!MagClass.magazzino.checkUDC(udcHist)) - { - showHistUdc = true; - } - } mod_detailUDC1.Visible = showCurUdc; mod_detailUDC_storico1.Visible = showHistUdc; + mod_detLDP1.Visible = showCurUdc; } void mod_execUDC1_eh_nuovoValore(object sender, EventArgs e) @@ -154,6 +156,7 @@ namespace GMW.WebUserControls { mod_detailUDC1.Visible = true; mod_detailUDC1.doUpdate(); + mod_detLDP1.doUpdate(); mod_execUDC1.Visible = !udcConsumato; // salvo dati UDC selezionato... UDC_sel c'è già... string UDC = memLayer.ML.StringSessionObj("UDC_sel"); diff --git a/GMW/WebUserControls/mod_SearchProvUDC.ascx.designer.cs b/GMW/WebUserControls/mod_SearchProvUDC.ascx.designer.cs index c109301c..b1c47f21 100644 --- a/GMW/WebUserControls/mod_SearchProvUDC.ascx.designer.cs +++ b/GMW/WebUserControls/mod_SearchProvUDC.ascx.designer.cs @@ -57,6 +57,15 @@ namespace GMW.WebUserControls { /// protected global::GMW.WebUserControls.mod_detailUDC_storico mod_detailUDC_storico1; + /// + /// mod_detLDP1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::GMW.WebUserControls.mod_detLDP mod_detLDP1; + /// /// mod_execUDC1 control. /// diff --git a/GMW/WebUserControls/mod_detLDP.ascx b/GMW/WebUserControls/mod_detLDP.ascx new file mode 100644 index 00000000..0eeb2189 --- /dev/null +++ b/GMW/WebUserControls/mod_detLDP.ascx @@ -0,0 +1,19 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_detLDP.ascx.cs" Inherits="GMW.WebUserControls.mod_detLDP" %> + + + + + + + + + + + + + + + + + + diff --git a/GMW/WebUserControls/mod_detLDP.ascx.cs b/GMW/WebUserControls/mod_detLDP.ascx.cs new file mode 100644 index 00000000..c6ceed6c --- /dev/null +++ b/GMW/WebUserControls/mod_detLDP.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_detLDP : System.Web.UI.UserControl + { + public void doUpdate() + { + grView.DataBind(); + } + } +} \ No newline at end of file diff --git a/GMW/WebUserControls/mod_detLDP.ascx.designer.cs b/GMW/WebUserControls/mod_detLDP.ascx.designer.cs new file mode 100644 index 00000000..03bb3ca2 --- /dev/null +++ b/GMW/WebUserControls/mod_detLDP.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_detLDP { + + /// + /// 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; + } +} diff --git a/GMW/WebUserControls/mod_detailUDC_storico.ascx b/GMW/WebUserControls/mod_detailUDC_storico.ascx index 9314dfdf..c836398a 100644 --- a/GMW/WebUserControls/mod_detailUDC_storico.ascx +++ b/GMW/WebUserControls/mod_detailUDC_storico.ascx @@ -13,7 +13,7 @@ - vuoto + n.d. diff --git a/GMW/WebUserControls/mod_listParticolari.ascx b/GMW/WebUserControls/mod_listParticolari.ascx index dcb6ff54..cc1d8710 100644 --- a/GMW/WebUserControls/mod_listParticolari.ascx +++ b/GMW/WebUserControls/mod_listParticolari.ascx @@ -4,7 +4,7 @@ + OnSorting="grView_Sorting" OnRowDataBound="grView_RowDataBound" PageSize="10"> diff --git a/GMW/WebUserControls/mod_listParticolari.ascx.cs b/GMW/WebUserControls/mod_listParticolari.ascx.cs index b6191ad1..5c01f6c3 100644 --- a/GMW/WebUserControls/mod_listParticolari.ascx.cs +++ b/GMW/WebUserControls/mod_listParticolari.ascx.cs @@ -23,7 +23,6 @@ namespace GMW.WebUserControls protected override void aggiornaControlliDataGL() { base.aggiornaControlliDataGL(); - grView.PageSize = _righeDataGridMed; } /// /// traduce gli header delle colonne diff --git a/GMW/WebUserControls/mod_listUDC.ascx b/GMW/WebUserControls/mod_listUDC.ascx index bc43b2eb..0d2df05b 100644 --- a/GMW/WebUserControls/mod_listUDC.ascx +++ b/GMW/WebUserControls/mod_listUDC.ascx @@ -4,7 +4,7 @@ + OnSorting="grView_Sorting" OnRowDataBound="grView_RowDataBound" PageSize="10"> diff --git a/GMW/WebUserControls/mod_listUDC.ascx.cs b/GMW/WebUserControls/mod_listUDC.ascx.cs index 0803ef4b..7abd3d45 100644 --- a/GMW/WebUserControls/mod_listUDC.ascx.cs +++ b/GMW/WebUserControls/mod_listUDC.ascx.cs @@ -24,7 +24,6 @@ namespace GMW.WebUserControls protected override void aggiornaControlliDataGL() { base.aggiornaControlliDataGL(); - grView.PageSize = _righeDataGridMed; } /// /// traduce gli header delle colonne diff --git a/GMW/WebUserControls/mod_manSAO.ascx b/GMW/WebUserControls/mod_manSAO.ascx index 5b34f0c9..89147635 100644 --- a/GMW/WebUserControls/mod_manSAO.ascx +++ b/GMW/WebUserControls/mod_manSAO.ascx @@ -32,6 +32,9 @@
+
+ Export Excel +
diff --git a/GMW/WebUserControls/mod_manSAO.ascx.designer.cs b/GMW/WebUserControls/mod_manSAO.ascx.designer.cs index 99a0fac6..eb253c90 100644 --- a/GMW/WebUserControls/mod_manSAO.ascx.designer.cs +++ b/GMW/WebUserControls/mod_manSAO.ascx.designer.cs @@ -57,6 +57,15 @@ namespace GMW.WebUserControls { /// protected global::System.Web.UI.WebControls.ObjectDataSource odsSoggetto; + /// + /// hlExportExcel control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HyperLink hlExportExcel; + /// /// filtroAzioni control. /// diff --git a/GMW/bin/GMW.dll b/GMW/bin/GMW.dll index f5566ba4..7c350bb3 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 277334b9..e65764c8 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 fb4fe7e7..1ecde0c6 100644 Binary files a/GMW/bin/SteamWare.dll and b/GMW/bin/SteamWare.dll differ diff --git a/GMW_Term/GMW_Term.csproj b/GMW_Term/GMW_Term.csproj index ece81f0b..6e28af42 100644 --- a/GMW_Term/GMW_Term.csproj +++ b/GMW_Term/GMW_Term.csproj @@ -157,9 +157,13 @@ + + + + @@ -273,6 +277,13 @@ mod_currentTask.ascx + + mod_detail_UDC.ascx + ASPXCodeBehind + + + mod_detail_UDC.ascx + mod_execCella.ascx ASPXCodeBehind @@ -448,6 +459,7 @@ + diff --git a/GMW_Term/Web.config b/GMW_Term/Web.config index 342cd2f9..9abc551b 100644 --- a/GMW_Term/Web.config +++ b/GMW_Term/Web.config @@ -58,7 +58,7 @@ - + diff --git a/GMW_Term/WebUserControls/mod_detail_UDC.ascx b/GMW_Term/WebUserControls/mod_detail_UDC.ascx new file mode 100644 index 00000000..82cb3aff --- /dev/null +++ b/GMW_Term/WebUserControls/mod_detail_UDC.ascx @@ -0,0 +1,67 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_detail_UDC.ascx.cs" Inherits="GMW_Term.WebUserControls.mod_detail_UDC" %> + + +
+
+ +
+
+ +
+
+
+
+ +
+
+
+ +
+
+
+ +
+
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+ + +
+
+ +
+
+
+
+ +
+
+ + + + + + + + + + + + diff --git a/GMW_Term/WebUserControls/mod_detail_UDC.ascx.cs b/GMW_Term/WebUserControls/mod_detail_UDC.ascx.cs new file mode 100644 index 00000000..1ff991d5 --- /dev/null +++ b/GMW_Term/WebUserControls/mod_detail_UDC.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_Term.WebUserControls +{ + public partial class mod_detail_UDC : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/GMW_Term/WebUserControls/mod_detail_UDC.ascx.designer.cs b/GMW_Term/WebUserControls/mod_detail_UDC.ascx.designer.cs new file mode 100644 index 00000000..985391d4 --- /dev/null +++ b/GMW_Term/WebUserControls/mod_detail_UDC.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_Term.WebUserControls { + + + public partial class mod_detail_UDC { + + /// + /// frmViewUdc control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.FormView frmViewUdc; + + /// + /// odsUdc control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource odsUdc; + } +} diff --git a/GMW_Term/WebUserControls/mod_interrMov.ascx b/GMW_Term/WebUserControls/mod_interrMov.ascx index d8726756..abb0eec6 100644 --- a/GMW_Term/WebUserControls/mod_interrMov.ascx +++ b/GMW_Term/WebUserControls/mod_interrMov.ascx @@ -1,14 +1,10 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_interrMov.ascx.cs" - Inherits="GMW_Term.WebUserControls.mod_interrMov" %> +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_interrMov.ascx.cs" Inherits="GMW_Term.WebUserControls.mod_interrMov" %> +<%@ Register Src="mod_detail_UDC.ascx" TagName="mod_detail_UDC" TagPrefix="uc1" %>
- - + + - -
- +
@@ -71,70 +67,5 @@ - - -
-
- -
-
- -
-
-
-
- -
-
-
- -
-
-
- -
-
-
-
-
- -
-
- -
-
-
-
- -
-
- -
-
-
-
- - -
-
- -
-
-
-
- -
-
- - - - - - - - - - - - + diff --git a/GMW_Term/WebUserControls/mod_interrMov.ascx.designer.cs b/GMW_Term/WebUserControls/mod_interrMov.ascx.designer.cs index d85f00ba..07decb51 100644 --- a/GMW_Term/WebUserControls/mod_interrMov.ascx.designer.cs +++ b/GMW_Term/WebUserControls/mod_interrMov.ascx.designer.cs @@ -1,10 +1,9 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.4963 // // Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// the code is regenerated. // //------------------------------------------------------------------------------ @@ -68,21 +67,12 @@ namespace GMW_Term.WebUserControls { protected global::System.Web.UI.WebControls.Panel pnlDetailUdc; /// - /// frmViewUdc control. + /// mod_detail_UDC1 control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.FormView frmViewUdc; - - /// - /// odsUdc control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.ObjectDataSource odsUdc; + protected global::GMW_Term.WebUserControls.mod_detail_UDC mod_detail_UDC1; } } diff --git a/GMW_Term/WebUserControls/mod_searchRes.ascx b/GMW_Term/WebUserControls/mod_searchRes.ascx index 5a054db7..598213be 100644 --- a/GMW_Term/WebUserControls/mod_searchRes.ascx +++ b/GMW_Term/WebUserControls/mod_searchRes.ascx @@ -1,14 +1,18 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_searchRes.ascx.cs" Inherits="GMW_Term.WebUserControls.mod_searchRes" %> +<%@ Register Src="mod_detail_UDC.ascx" TagName="mod_detail_UDC" TagPrefix="uc1" %> <% if (false) { %> <% } %> -
- - - - - +
+ +   + +   + <%----%> + +   +
@@ -28,7 +32,11 @@  /  - + + + + + @@ -55,7 +63,11 @@
- + + + + + @@ -64,3 +76,6 @@
+ + + diff --git a/GMW_Term/WebUserControls/mod_searchRes.ascx.cs b/GMW_Term/WebUserControls/mod_searchRes.ascx.cs index 3cb1f9db..ca87922c 100644 --- a/GMW_Term/WebUserControls/mod_searchRes.ascx.cs +++ b/GMW_Term/WebUserControls/mod_searchRes.ascx.cs @@ -25,6 +25,25 @@ namespace GMW_Term.WebUserControls memLayer.ML.setSessionVal("IdxBlocco_sel", value); } } + /// + /// udc selezionato + /// + protected string udc + { + get + { + return memLayer.ML.StringSessionObj("UDC4det_sel"); + } + set + { + memLayer.ML.setSessionVal("UDC4det_sel", value); + } + } + /// + /// caricamento pagina + /// + /// + /// protected void Page_Load(object sender, EventArgs e) { if (!Page.IsPostBack) @@ -77,14 +96,48 @@ namespace GMW_Term.WebUserControls /// private void showData() { + bool showBlocchi = true; bool showUdc = false; + bool showDetUdc = false; // controllo se ho un idxBlocco sel if (idxBlocco > 0) { + showBlocchi = false; showUdc = true; } - pnlBlocchi.Visible = !showUdc; + // controllo se ho un UDC selezionato + if (udc !="") + { + showBlocchi = false; + showUdc = false; + showDetUdc = true; + } + pnlBlocchi.Visible = showBlocchi; pnlUdc.Visible = showUdc; + pnlDetailUdc.Visible = showDetUdc; + // fix frecce... + if (!showDetUdc) + { + btnUp.Enabled = true; + btnDown.Enabled = true; + btnLeft.Enabled = true; + btnRight.Enabled = true; + btnUp.ImageUrl = "../Images/ArrowUp.png"; + btnDown.ImageUrl = "../Images/ArrowDown.png"; + btnLeft.ImageUrl = "../Images/ArrowLeft.png"; + btnRight.ImageUrl = "../Images/ArrowRight.png"; + } + else // ...se showDetUdc --> mostro attivo solo ritorno! + { + btnUp.Enabled = false; + btnDown.Enabled = false; + btnLeft.Enabled = true; + btnRight.Enabled = false; + btnUp.ImageUrl = "../Images/ArrowUpDisab.png"; + btnDown.ImageUrl = "../Images/ArrowDownDisab.png"; + btnLeft.ImageUrl = "../Images/ArrowLeft.png"; + btnRight.ImageUrl = "../Images/ArrowRightDisab.png"; + } } /// /// va alla pagina dei buttons principale @@ -172,11 +225,18 @@ namespace GMW_Term.WebUserControls } else // modalità UDC { - resetDetailUdc(); + // controllo se c'è UDC e quindi richiesta dettaglio UDC + if (udc != "") + { + resetDetailUdc(); + } + else + { + resetUdc(); + } } } - #endregion #region gestione operazioni spostamento/dettaglio su gridview @@ -297,17 +357,29 @@ namespace GMW_Term.WebUserControls /// private void reqDetailUdc() { - //idxBlocco = Convert.ToInt32(grViewMag.SelectedDataKey["IdxBlocco"].ToString()); - grViewUdc.DataBind(); + udc = grViewUdc.SelectedDataKey["UDC"].ToString(); + showData(); } + /// + /// reset ricerca UDC + /// + private void resetUdc() + { + idxBlocco = -1; + grViewMag.SelectedIndex = 0; + grViewMag.PageIndex = 0; + grViewMag.DataBind(); + showData(); + } + + /// /// reset ricerca dettaglio UDC /// private void resetDetailUdc() { - idxBlocco = -1; - grViewMag.SelectedIndex = 0; - grViewMag.PageIndex = 0; + udc = ""; + grViewUdc.DataBind(); showData(); } diff --git a/GMW_Term/WebUserControls/mod_searchRes.ascx.designer.cs b/GMW_Term/WebUserControls/mod_searchRes.ascx.designer.cs index 84972cd2..0054239b 100644 --- a/GMW_Term/WebUserControls/mod_searchRes.ascx.designer.cs +++ b/GMW_Term/WebUserControls/mod_searchRes.ascx.designer.cs @@ -30,15 +30,6 @@ namespace GMW_Term.WebUserControls { /// protected global::System.Web.UI.WebControls.ImageButton btnUp; - /// - /// btnButtonsHome control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Button btnButtonsHome; - /// /// btnDown control. /// @@ -110,5 +101,23 @@ namespace GMW_Term.WebUserControls { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ObjectDataSource odsUdc; + + /// + /// pnlDetailUdc control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Panel pnlDetailUdc; + + /// + /// mod_detail_UDC1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::GMW_Term.WebUserControls.mod_detail_UDC mod_detail_UDC1; } } diff --git a/GMW_Term/bin/GMW_Term.dll b/GMW_Term/bin/GMW_Term.dll index d39dee54..d205009c 100644 Binary files a/GMW_Term/bin/GMW_Term.dll and b/GMW_Term/bin/GMW_Term.dll differ diff --git a/GMW_Term/bin/GMW_data.dll b/GMW_Term/bin/GMW_data.dll index cbe7a209..fe816a7c 100644 Binary files a/GMW_Term/bin/GMW_data.dll and b/GMW_Term/bin/GMW_data.dll differ diff --git a/GMW_Term/bin/SteamWare.dll b/GMW_Term/bin/SteamWare.dll index 7bf0ca08..0498f641 100644 Binary files a/GMW_Term/bin/SteamWare.dll and b/GMW_Term/bin/SteamWare.dll differ diff --git a/GMW_Term/images/ArrowDownDisab.png b/GMW_Term/images/ArrowDownDisab.png new file mode 100644 index 00000000..8a031a18 Binary files /dev/null and b/GMW_Term/images/ArrowDownDisab.png differ diff --git a/GMW_Term/images/ArrowLeftDisab.png b/GMW_Term/images/ArrowLeftDisab.png new file mode 100644 index 00000000..931b9347 Binary files /dev/null and b/GMW_Term/images/ArrowLeftDisab.png differ diff --git a/GMW_Term/images/ArrowRightDisab.png b/GMW_Term/images/ArrowRightDisab.png new file mode 100644 index 00000000..b5f9ee87 Binary files /dev/null and b/GMW_Term/images/ArrowRightDisab.png differ diff --git a/GMW_Term/images/ArrowUpDisab.png b/GMW_Term/images/ArrowUpDisab.png new file mode 100644 index 00000000..6b74ea4e Binary files /dev/null and b/GMW_Term/images/ArrowUpDisab.png differ