diff --git a/GMW/GMW_Term/ActiveTask.aspx b/GMW/GMW_Term/ActiveTask.aspx new file mode 100644 index 00000000..a0d008c3 --- /dev/null +++ b/GMW/GMW_Term/ActiveTask.aspx @@ -0,0 +1,8 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/Compact.Master" + AutoEventWireup="true" CodeBehind="ActiveTask.aspx.cs" Inherits="GMW_Term.ActiveTask" %> + + + + + w.i.p. + diff --git a/GMW/GMW_Term/ActiveTask.aspx.cs b/GMW/GMW_Term/ActiveTask.aspx.cs new file mode 100644 index 00000000..d1156c55 --- /dev/null +++ b/GMW/GMW_Term/ActiveTask.aspx.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 +{ + public partial class ActiveTask : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} diff --git a/GMW/GMW_Term/ActiveTask.aspx.designer.cs b/GMW/GMW_Term/ActiveTask.aspx.designer.cs new file mode 100644 index 00000000..615106de --- /dev/null +++ b/GMW/GMW_Term/ActiveTask.aspx.designer.cs @@ -0,0 +1,16 @@ +//------------------------------------------------------------------------------ +// +// 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 { + + + public partial class ActiveTask { + } +} diff --git a/GMW/GMW_Term/GMW_Term.csproj b/GMW/GMW_Term/GMW_Term.csproj index 40032c2d..b5a13024 100644 --- a/GMW/GMW_Term/GMW_Term.csproj +++ b/GMW/GMW_Term/GMW_Term.csproj @@ -60,6 +60,13 @@ + + ActiveTask.aspx + ASPXCodeBehind + + + ActiveTask.aspx + Default.aspx ASPXCodeBehind @@ -74,13 +81,6 @@ mod_barcode.ascx - - mod_changeUser.ascx - ASPXCodeBehind - - - mod_changeUser.ascx - mod_home.ascx ASPXCodeBehind @@ -134,13 +134,6 @@ Barcode.aspx - - ChangeUser.aspx - ASPXCodeBehind - - - ChangeUser.aspx - Home.aspx ASPXCodeBehind @@ -179,9 +172,9 @@ + - @@ -190,7 +183,6 @@ - diff --git a/GMW/GMW_Term/WebMasterPages/Compact.Master b/GMW/GMW_Term/WebMasterPages/Compact.Master index 936e88e1..cda2b4db 100644 --- a/GMW/GMW_Term/WebMasterPages/Compact.Master +++ b/GMW/GMW_Term/WebMasterPages/Compact.Master @@ -4,7 +4,7 @@ - + GMW Terminus diff --git a/GMW/GMW_Term/WebUserControls/mod_barcode.ascx.cs b/GMW/GMW_Term/WebUserControls/mod_barcode.ascx.cs index c9ed1122..7e6ec688 100644 --- a/GMW/GMW_Term/WebUserControls/mod_barcode.ascx.cs +++ b/GMW/GMW_Term/WebUserControls/mod_barcode.ascx.cs @@ -12,7 +12,7 @@ namespace GMW_Term.WebUserControls public partial class mod_barcode : System.Web.UI.UserControl { // variabile per verificare se è operatore - bool _isOperatore = false; + bool _validUserInSession = false; /// /// metodi al caricamento della pagina /// @@ -24,10 +24,9 @@ namespace GMW_Term.WebUserControls btnLoginPage.Text = "Login"; btnButtonsHome.Text = "Home"; - - // se username è valorizzato... - if (verificaOperatoreInSessione()) + verificaOperatoreInSessione(); + if (_validUserInSession) { btnLoginPage.Text = "Rifai Login"; btnLoginPage.Visible = false; @@ -54,8 +53,8 @@ namespace GMW_Term.WebUserControls string dataIn = txtInput.Text.Trim(); // verifica l'input immesso tipoCodiceBarcode answ = TermClass.Ter.riconosciBarcode(dataIn); - - if (!verificaOperatoreInSessione()) //controllo: se non c'è operatore in sessione + verificaOperatoreInSessione(); + if (!_validUserInSession) //controllo: se non c'è operatore in sessione { if (answ == tipoCodiceBarcode.Operatore) { @@ -63,7 +62,8 @@ namespace GMW_Term.WebUserControls } else { - lblData.Text = "Inserire Operatore!"; + lblData.Text = string.Format("Codice non riconosciuto: {0}{1}Inserire Operatore!", txtInput.Text, Environment.NewLine); + txtInput.Text = ""; } } else @@ -72,20 +72,26 @@ namespace GMW_Term.WebUserControls { case tipoCodiceBarcode.ND: lblData.Text = "Codice non riconosciuto: " + txtInput.Text; + txtInput.Text = ""; break; case tipoCodiceBarcode.Operatore: effettuaLoginOperatore(dataIn); break; case tipoCodiceBarcode.ListaPrelievo: lblData.Text = "Codice Lista Prelievo: " + txtInput.Text; + txtInput.Text = ""; break; case tipoCodiceBarcode.UDC: lblData.Text = "Codice UDC: " + txtInput.Text; + txtInput.Text = ""; break; case tipoCodiceBarcode.Particolare: lblData.Text = "Codice Particolare: " + txtInput.Text; + txtInput.Text = ""; break; default: + lblData.Text = "Codice non riconosciuto: " + txtInput.Text; + txtInput.Text = ""; break; } } @@ -123,18 +129,16 @@ namespace GMW_Term.WebUserControls /// /// Verifica se c'è un valore in sessione di tipo operatore /// - protected bool verificaOperatoreInSessione() + protected void verificaOperatoreInSessione() { - if (string.IsNullOrEmpty(memLayer.ML.StringSessionObj("username"))) + if (string.IsNullOrEmpty(user_std.UtSn.utente)) { - _isOperatore = false; + _validUserInSession = false; } - else { - _isOperatore = true; + _validUserInSession = true; } - return _isOperatore; } /// @@ -144,12 +148,11 @@ namespace GMW_Term.WebUserControls { set { - _isOperatore = value; + _validUserInSession = value; } - get { - return _isOperatore; + return _validUserInSession; } } diff --git a/GMW/GMW_Term/WebUserControls/mod_home.ascx.cs b/GMW/GMW_Term/WebUserControls/mod_home.ascx.cs index db69f585..97a952b5 100644 --- a/GMW/GMW_Term/WebUserControls/mod_home.ascx.cs +++ b/GMW/GMW_Term/WebUserControls/mod_home.ascx.cs @@ -17,7 +17,7 @@ namespace GMW_Term.WebUserControls btn1.Text = "Barcode"; btn2.Text = "Ricerca"; btn3.Text = "Liste Prelievo"; - btn4.Text = "Cambia Utente"; + btn4.Text = "Task Attivi"; } protected void btn1_Click(object sender, EventArgs e) @@ -37,7 +37,7 @@ namespace GMW_Term.WebUserControls protected void btn4_Click1(object sender, EventArgs e) { - Response.Redirect("ChangeUser.aspx"); + Response.Redirect("ActiveTask.aspx"); } } } diff --git a/GMW/GMW_Term/bin/GMW_Term.dll b/GMW/GMW_Term/bin/GMW_Term.dll index 1478113c..1b5b252a 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 1478113c..1b5b252a 100644 Binary files a/GMW/GMW_Term/obj/Debug/GMW_Term.dll and b/GMW/GMW_Term/obj/Debug/GMW_Term.dll differ