diff --git a/GMW/GMW_Term/ActiveTask.aspx b/GMW/GMW_Term/ActiveTask.aspx index a0d008c3..e8e6332f 100644 --- a/GMW/GMW_Term/ActiveTask.aspx +++ b/GMW/GMW_Term/ActiveTask.aspx @@ -1,8 +1,11 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/Compact.Master" AutoEventWireup="true" CodeBehind="ActiveTask.aspx.cs" Inherits="GMW_Term.ActiveTask" %> +<%@ Register src="WebUserControls/mod_activeTask.ascx" tagname="mod_activeTask" tagprefix="uc1" %> + - w.i.p. + diff --git a/GMW/GMW_Term/ActiveTask.aspx.designer.cs b/GMW/GMW_Term/ActiveTask.aspx.designer.cs index 615106de..1d79deba 100644 --- a/GMW/GMW_Term/ActiveTask.aspx.designer.cs +++ b/GMW/GMW_Term/ActiveTask.aspx.designer.cs @@ -12,5 +12,14 @@ namespace GMW_Term { public partial class ActiveTask { + + /// + /// mod_activeTask1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::GMW_Term.WebUserControls.mod_activeTask mod_activeTask1; } } diff --git a/GMW/GMW_Term/GMW_Term.csproj b/GMW/GMW_Term/GMW_Term.csproj index 02bb50f4..d51a1268 100644 --- a/GMW/GMW_Term/GMW_Term.csproj +++ b/GMW/GMW_Term/GMW_Term.csproj @@ -81,6 +81,13 @@ UDC.aspx + + mod_activeTask.ascx + ASPXCodeBehind + + + mod_activeTask.ascx + mod_barcode.ascx ASPXCodeBehind @@ -213,6 +220,7 @@ + diff --git a/GMW/GMW_Term/WebUserControls/mod_activeTask.ascx b/GMW/GMW_Term/WebUserControls/mod_activeTask.ascx new file mode 100644 index 00000000..584df26f --- /dev/null +++ b/GMW/GMW_Term/WebUserControls/mod_activeTask.ascx @@ -0,0 +1,23 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_activeTask.ascx.cs" + Inherits="GMW_Term.WebUserControls.mod_activeTask" %> +
+
+ +
+ +
+ + +
+
+ + +
+ +
+ ultimo barcode scannato +
+ ultimo comando digitato +
diff --git a/GMW/GMW_Term/WebUserControls/mod_activeTask.ascx.cs b/GMW/GMW_Term/WebUserControls/mod_activeTask.ascx.cs new file mode 100644 index 00000000..1d78d84e --- /dev/null +++ b/GMW/GMW_Term/WebUserControls/mod_activeTask.ascx.cs @@ -0,0 +1,98 @@ +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_Term.WebUserControls +{ + public partial class mod_activeTask : System.Web.UI.UserControl + { + // variabile per verificare se è operatore + bool _validUserInSession = false; + /// + /// Verifica se c'è un valore in sessione di tipo operatore + /// + protected void verificaOperatoreInSessione() + { + if (string.IsNullOrEmpty(user_std.UtSn.utente)) + { + _validUserInSession = false; + } + else + { + _validUserInSession = true; + } + } + + /// + /// metodi al caricamento della pagina + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + // scrive label e text bottoni + btnLoginPage.Text = "[7]-LogOut"; + btnLoginPage.AccessKey = "7"; + btnButtonsHome.Text = "[9]-Home"; + btnButtonsHome.AccessKey = "9"; + // se username è valorizzato... + verificaOperatoreInSessione(); + if (_validUserInSession) + { + btnLoginPage.Visible = true; + btnButtonsHome.Visible = true; + } + // se non è valorizzato chiede di effettuare login... + else + { + Response.Redirect("Home.aspx"); + } + if (!Page.IsPostBack) + { + lblListaAttiva.Text = "Lista prelievo attiva:"; + } + disegnaControlli(); + } + /// + /// sistema i controlli visualizzati + /// + private void disegnaControlli() + { + // liste prelievo + if (memLayer.ML.isInSessionObject("CodListaAttiva")) + { + pnlListaPrelievo.Visible = true; + hkListaAttiva.Text = memLayer.ML.StringSessionObj("CodListaAttiva"); + } + else + { + pnlListaPrelievo.Visible = false; + } + // altri valori + } + + /// + /// effettua logout... + /// + /// + /// + protected void btnLoginPage_Click(object sender, EventArgs e) + { + user_std.UtSn.logOffUtente(); + Response.Redirect("~/Barcode.aspx"); + } + /// + /// va alla pagina dei buttons principale + /// + /// + /// + protected void btnButtonsHome_Click(object sender, EventArgs e) + { + Response.Redirect("~/Home.aspx"); + } + } +} \ No newline at end of file diff --git a/GMW/GMW_Term/WebUserControls/mod_activeTask.ascx.designer.cs b/GMW/GMW_Term/WebUserControls/mod_activeTask.ascx.designer.cs new file mode 100644 index 00000000..eea4116d --- /dev/null +++ b/GMW/GMW_Term/WebUserControls/mod_activeTask.ascx.designer.cs @@ -0,0 +1,79 @@ +//------------------------------------------------------------------------------ +// +// 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_Term.WebUserControls { + + + public partial class mod_activeTask { + + /// + /// lblInput control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblInput; + + /// + /// pnlMaster control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Panel pnlMaster; + + /// + /// btnLoginPage control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button btnLoginPage; + + /// + /// 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; + + /// + /// pnlListaPrelievo control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Panel pnlListaPrelievo; + + /// + /// lblListaAttiva control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblListaAttiva; + + /// + /// hkListaAttiva control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HyperLink hkListaAttiva; + } +} diff --git a/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.cs b/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.cs index e5c62fe3..18243b5f 100644 --- a/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.cs +++ b/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.cs @@ -452,6 +452,8 @@ namespace GMW_Term.WebUserControls { eh_nuovoValore(this, new EventArgs()); } + memLayer.ML.setSessionVal("activeTask", string.Format("Lista Prelievo {0}", codLista)); + memLayer.ML.setSessionVal("CodListaAttiva", codLista); // blocco update! e.Cancel = true; break; @@ -465,6 +467,8 @@ namespace GMW_Term.WebUserControls { eh_nuovoValore(this, new EventArgs()); } + memLayer.ML.emptySessionVal("CodListaAttiva"); + memLayer.ML.emptySessionVal("activeTask"); // blocco update! e.Cancel = true; break; diff --git a/GMW/GMW_Term/bin/GMW_Term.dll b/GMW/GMW_Term/bin/GMW_Term.dll index 97ef1d53..2ad5896f 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 97ef1d53..2ad5896f 100644 Binary files a/GMW/GMW_Term/obj/Debug/GMW_Term.dll and b/GMW/GMW_Term/obj/Debug/GMW_Term.dll differ diff --git a/GMW/GMW_data/obj/Debug/Refactor/GMW_data.dll b/GMW/GMW_data/obj/Debug/Refactor/GMW_data.dll index b1c581e5..6659139d 100644 Binary files a/GMW/GMW_data/obj/Debug/Refactor/GMW_data.dll and b/GMW/GMW_data/obj/Debug/Refactor/GMW_data.dll differ