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/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..186057e2 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,26 @@ 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... } /// /// va alla pagina dei buttons principale @@ -172,11 +203,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 +335,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..57566f49 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..5e164e6a 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..7c14e220 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