diff --git a/GMW/GMW_Term/WebUserControls/mod_activeTask.ascx b/GMW/GMW_Term/WebUserControls/mod_activeTask.ascx index 584df26f..259dfb97 100644 --- a/GMW/GMW_Term/WebUserControls/mod_activeTask.ascx +++ b/GMW/GMW_Term/WebUserControls/mod_activeTask.ascx @@ -13,11 +13,35 @@ - -
- +
+ +
+
+ + + +
+
+ +
+ +
+
+ + + +
+
+ + +
+ +
+
+ + + +
- ultimo barcode scannato -
- ultimo comando digitato + \ No newline at end of file diff --git a/GMW/GMW_Term/WebUserControls/mod_activeTask.ascx.cs b/GMW/GMW_Term/WebUserControls/mod_activeTask.ascx.cs index 1d78d84e..7a507796 100644 --- a/GMW/GMW_Term/WebUserControls/mod_activeTask.ascx.cs +++ b/GMW/GMW_Term/WebUserControls/mod_activeTask.ascx.cs @@ -54,6 +54,8 @@ namespace GMW_Term.WebUserControls if (!Page.IsPostBack) { lblListaAttiva.Text = "Lista prelievo attiva:"; + lblBarcode.Text = "Ultimo barcode:"; + lblRicerca.Text = "Ultima ricerca:"; } disegnaControlli(); } @@ -66,13 +68,32 @@ namespace GMW_Term.WebUserControls if (memLayer.ML.isInSessionObject("CodListaAttiva")) { pnlListaPrelievo.Visible = true; - hkListaAttiva.Text = memLayer.ML.StringSessionObj("CodListaAttiva"); + hlListaAttiva.Text = memLayer.ML.StringSessionObj("CodListaAttiva"); } else { pnlListaPrelievo.Visible = false; } - // altri valori + // altri valori: barcode + if (memLayer.ML.isInSessionObject("scannedValue")) + { + pnlBarcode.Visible = true; + hlBarcode.Text = memLayer.ML.StringSessionObj("scannedValue"); + } + else + { + pnlListaPrelievo.Visible = false; + } + // altri valori: ricerca + if (memLayer.ML.isInSessionObject("searchValue")) + { + pnlRicerca.Visible = true; + hlRicerca.Text = memLayer.ML.StringSessionObj("searchValue"); + } + else + { + pnlRicerca.Visible = false; + } } /// diff --git a/GMW/GMW_Term/WebUserControls/mod_activeTask.ascx.designer.cs b/GMW/GMW_Term/WebUserControls/mod_activeTask.ascx.designer.cs index eea4116d..2f33eebc 100644 --- a/GMW/GMW_Term/WebUserControls/mod_activeTask.ascx.designer.cs +++ b/GMW/GMW_Term/WebUserControls/mod_activeTask.ascx.designer.cs @@ -68,12 +68,66 @@ namespace GMW_Term.WebUserControls { protected global::System.Web.UI.WebControls.Label lblListaAttiva; /// - /// hkListaAttiva control. + /// hlListaAttiva control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.HyperLink hkListaAttiva; + protected global::System.Web.UI.WebControls.HyperLink hlListaAttiva; + + /// + /// pnlBarcode control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Panel pnlBarcode; + + /// + /// lblBarcode control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblBarcode; + + /// + /// hlBarcode control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HyperLink hlBarcode; + + /// + /// pnlRicerca control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Panel pnlRicerca; + + /// + /// lblRicerca control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblRicerca; + + /// + /// hlRicerca control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HyperLink hlRicerca; } } diff --git a/GMW/GMW_Term/WebUserControls/mod_search.ascx b/GMW/GMW_Term/WebUserControls/mod_search.ascx index 5ee9b6a0..a23d0610 100644 --- a/GMW/GMW_Term/WebUserControls/mod_search.ascx +++ b/GMW/GMW_Term/WebUserControls/mod_search.ascx @@ -8,7 +8,8 @@
- + diff --git a/GMW/GMW_Term/WebUserControls/mod_search.ascx.cs b/GMW/GMW_Term/WebUserControls/mod_search.ascx.cs index 533dab8e..d5636c67 100644 --- a/GMW/GMW_Term/WebUserControls/mod_search.ascx.cs +++ b/GMW/GMW_Term/WebUserControls/mod_search.ascx.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; +using SteamWare; namespace GMW_Term.WebUserControls { @@ -15,5 +16,42 @@ namespace GMW_Term.WebUserControls //lblTitle.Text = (string)(Session["loginName"]); } + /// + /// in caso di valore cercato... + /// + /// + /// + protected void txtRicerca_TextChanged(object sender, EventArgs e) + { + valoreRicerca = txtSearch; + } + /// + /// testo contenuto nella textbox + /// + public string txtSearch + { + get + { + return txtRicerca.Text.Trim(); + } + set + { + txtRicerca.Text = value; + } + } + /// + /// valore della scansione barcode + /// + public string valoreRicerca + { + get + { + return memLayer.ML.StringSessionObj("searchValue"); + } + set + { + memLayer.ML.setSessionVal("searchValue", value, false); + } + } } } \ No newline at end of file diff --git a/GMW/GMW_Term/bin/GMW_Term.dll b/GMW/GMW_Term/bin/GMW_Term.dll index 2ad5896f..d9721279 100644 Binary files a/GMW/GMW_Term/bin/GMW_Term.dll and b/GMW/GMW_Term/bin/GMW_Term.dll differ diff --git a/GMW/GMW_Term/obj/Debug/GMW_Term.dll b/GMW/GMW_Term/obj/Debug/GMW_Term.dll index 2ad5896f..d9721279 100644 Binary files a/GMW/GMW_Term/obj/Debug/GMW_Term.dll and b/GMW/GMW_Term/obj/Debug/GMW_Term.dll differ