diff --git a/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx b/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx index 66ca96b0..60e1b7ef 100644 --- a/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx +++ b/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx @@ -105,6 +105,8 @@
+
diff --git a/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.cs b/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.cs index f193c0ed..e5c62fe3 100644 --- a/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.cs +++ b/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.cs @@ -272,8 +272,10 @@ namespace GMW_Term.WebUserControls btnLoginPage.AccessKey = "7"; btnButtonsHome.Text = "[9]-Home"; btnButtonsHome.AccessKey = "9"; - btnCloseDet.Text = "[2]-Chiudi"; - btnCloseDet.AccessKey = "2"; + btnCloseDet.Text = "[3]-Chiudi"; + btnCloseDet.AccessKey = "3"; + btnBarcode.Text = "[1]-Barcode"; + btnBarcode.AccessKey = "1"; // se username è valorizzato... verificaOperatoreInSessione(); if (_validUserInSession) @@ -473,6 +475,15 @@ namespace GMW_Term.WebUserControls pnlDetail.Visible = true; // nascondo elenco lista prelievo pnlMaster.Visible = false; + // button x barcode: visibile solo se c'è una lista di prelievo attiva... + if (userHasListActive) + { + btnBarcode.Visible = true; + } + else + { + btnBarcode.Visible = false; + } // blocco update! e.Cancel = true; break; @@ -649,7 +660,7 @@ namespace GMW_Term.WebUserControls Response.Redirect("~/Home.aspx"); } /// - /// nasconde dettali + /// nasconde dettagli /// /// /// @@ -661,6 +672,17 @@ namespace GMW_Term.WebUserControls Response.Redirect("~/ListePrelievo.aspx"); } + /// + /// passa al barcode! + /// + /// + /// + protected void btnBarcode_Click(object sender, EventArgs e) + { + Response.Redirect("~/Barcode.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 5be5dbcd..0d38591b 100644 --- a/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.designer.cs +++ b/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.designer.cs @@ -112,6 +112,15 @@ namespace GMW_Term.WebUserControls { /// protected global::System.Web.UI.WebControls.Panel pnlDetail; + /// + /// btnBarcode control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button btnBarcode; + /// /// btnCloseDet control. /// diff --git a/GMW/GMW_Term/bin/GMW_Term.dll b/GMW/GMW_Term/bin/GMW_Term.dll index adc4f83b..97ef1d53 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 adc4f83b..97ef1d53 100644 Binary files a/GMW/GMW_Term/obj/Debug/GMW_Term.dll and b/GMW/GMW_Term/obj/Debug/GMW_Term.dll differ