From 255ac8a32140ec9ed7d0284f415af57261b85e8a Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Fri, 19 Apr 2019 21:34:23 +0200 Subject: [PATCH] Inserita modifica x impedire salvataggio SE commessa chiusa --- C-TRACK/App_Start/RouteConfig.cs | 7 +------ C-TRACK/WebUserControls/mod_btnComandi.ascx.cs | 14 +++++++++++--- C-TRACK/WebUserControls/mod_userCards.ascx.cs | 11 +---------- 3 files changed, 13 insertions(+), 19 deletions(-) diff --git a/C-TRACK/App_Start/RouteConfig.cs b/C-TRACK/App_Start/RouteConfig.cs index e455f82..71cfd88 100644 --- a/C-TRACK/App_Start/RouteConfig.cs +++ b/C-TRACK/App_Start/RouteConfig.cs @@ -17,12 +17,7 @@ namespace C_TRACK routeTemplate: "api/{controller}/{action}/{id}", defaults: new { controller = "Health", action = "Index", id = RouteParameter.Optional } ); - - //routes.MapRoute( - // name: "Default", - // url: "{controller}/{action}/{id}", - // defaults: new { controller = "Home", action = "Index", id = UrlParameter.Optional } - //); + } } } diff --git a/C-TRACK/WebUserControls/mod_btnComandi.ascx.cs b/C-TRACK/WebUserControls/mod_btnComandi.ascx.cs index 0eb1943..7d18621 100644 --- a/C-TRACK/WebUserControls/mod_btnComandi.ascx.cs +++ b/C-TRACK/WebUserControls/mod_btnComandi.ascx.cs @@ -40,9 +40,17 @@ namespace C_TRACK.WebUserControls protected void lbtCmd_Click(object sender, EventArgs e) { - LinkButton lb = (LinkButton)sender; - memLayer.ML.setSessionVal("btnCmdPress", lb.CommandArgument, false); - segnalaClick(); + // PROCEDO SOLO SE non ho veto... + if (!hasVeto) + { + LinkButton lb = (LinkButton)sender; + memLayer.ML.setSessionVal("btnCmdPress", lb.CommandArgument, false); + segnalaClick(); + } + else + { + updateBtn(); + } } public void updateBtn() diff --git a/C-TRACK/WebUserControls/mod_userCards.ascx.cs b/C-TRACK/WebUserControls/mod_userCards.ascx.cs index 0a0dad1..38fee12 100644 --- a/C-TRACK/WebUserControls/mod_userCards.ascx.cs +++ b/C-TRACK/WebUserControls/mod_userCards.ascx.cs @@ -19,16 +19,7 @@ namespace C_TRACK.WebUserControls public string getImgUrl(object codOpr) { - string answ = ""; -#if false - //string targetUrl = string.Format(@"ctrack.steamware.net/elet-scal/jumper?USER_NAME=info@elettronicascalvina.it&UserAuthkey=asdfbqhewrqg7802345bhasdfg78&CodOpr="); - //targetUrl = HttpUtility.UrlEncode(targetUrl); - // genero obj - qrRequest richiesta = new qrRequest(); - richiesta.valore = answ; - // ora serializzo oggetto! - answ = JsonConvert.SerializeObject(richiesta); -#endif + string answ = ""; string UrlQRCodeGen = memLayer.ML.CRS("UrlQRCodeGen"); string TargetQRCode = memLayer.ML.CRS("TargetQRCode"); answ = string.Format(@"{0}/{1}?val={2}", UrlQRCodeGen, TargetQRCode, codOpr);