diff --git a/GMW/GMW_Term/WebUserControls/mod_barcode.ascx.cs b/GMW/GMW_Term/WebUserControls/mod_barcode.ascx.cs
index d1a8df26..ef55c164 100644
--- a/GMW/GMW_Term/WebUserControls/mod_barcode.ascx.cs
+++ b/GMW/GMW_Term/WebUserControls/mod_barcode.ascx.cs
@@ -166,7 +166,11 @@ namespace GMW_Term.WebUserControls
eh_resetUser(this, new EventArgs());
}
}
-
+ ///
+ /// va alla pagina dei buttons principale
+ ///
+ ///
+ ///
protected void btnButtonsHome_Click(object sender, EventArgs e)
{
Response.Redirect("Home.aspx");
diff --git a/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx b/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx
index 71672a0b..c0be7b59 100644
--- a/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx
+++ b/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx
@@ -2,6 +2,8 @@
Inherits="GMW_Term.WebUserControls.mod_listePrelievo" %>
<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
<%@ Register Src="mod_periodoAnalisi.ascx" TagName="mod_periodoAnalisi" TagPrefix="uc1" %>
+
+
diff --git a/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.cs b/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.cs
index 752ca2de..e972709e 100644
--- a/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.cs
+++ b/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.cs
@@ -242,7 +242,49 @@ namespace GMW_Term.WebUserControls
#endregion
- #region area codice variabile
+
+ // 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");
+ }
+ }
///
/// verifica complessiva non esistenza record child
@@ -573,6 +615,27 @@ namespace GMW_Term.WebUserControls
return traduci(codice.ToString());
}
- #endregion
+
+
+ ///
+ /// 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_listePrelievo.ascx.designer.cs b/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.designer.cs
index 2df092e0..c6064743 100644
--- a/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.designer.cs
+++ b/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.designer.cs
@@ -13,6 +13,15 @@ namespace GMW_Term.WebUserControls {
public partial class mod_listePrelievo {
+ ///
+ /// ScriptManager1 control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.ScriptManager ScriptManager1;
+
///
/// lblInput control.
///
@@ -31,15 +40,6 @@ namespace GMW_Term.WebUserControls {
///
protected global::mod_periodoAnalisi mod_periodoAnalisi1;
- ///
- /// ScriptManager1 control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.ScriptManager ScriptManager1;
-
///
/// grView control.
///
@@ -77,21 +77,21 @@ namespace GMW_Term.WebUserControls {
protected global::System.Web.UI.WebControls.ObjectDataSource ods;
///
- /// btn1 control.
+ /// btnLoginPage control.
///
///
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
///
- protected global::System.Web.UI.WebControls.Button btn1;
+ protected global::System.Web.UI.WebControls.Button btnLoginPage;
///
- /// btn2 control.
+ /// btnButtonsHome control.
///
///
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
///
- protected global::System.Web.UI.WebControls.Button btn2;
+ protected global::System.Web.UI.WebControls.Button btnButtonsHome;
}
}
diff --git a/GMW/GMW_Term/bin/GMW_Term.dll b/GMW/GMW_Term/bin/GMW_Term.dll
index f51419d2..8dc52d01 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 f51419d2..8dc52d01 100644
Binary files a/GMW/GMW_Term/obj/Debug/GMW_Term.dll and b/GMW/GMW_Term/obj/Debug/GMW_Term.dll differ