From ddd21ac60793dc85c286fdefb184f3a9705afbf1 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Sat, 16 Jan 2021 10:05:05 +0100 Subject: [PATCH] update gestione DB recupero chaivi JUMP --- MP-LAND/Controllers/HomeController.cs | 73 +++++++++++-------- MP-LAND/Web.config | 6 -- .../mod_enrollByJumperAuthKey.ascx.cs | 2 +- MP-TAB/WebUserControls/cmp_goPrint.ascx.cs | 8 +- 4 files changed, 50 insertions(+), 39 deletions(-) diff --git a/MP-LAND/Controllers/HomeController.cs b/MP-LAND/Controllers/HomeController.cs index c6e970d4..3802e0ab 100644 --- a/MP-LAND/Controllers/HomeController.cs +++ b/MP-LAND/Controllers/HomeController.cs @@ -17,16 +17,19 @@ namespace MP.Controllers { #region Protected Methods + /// + /// recupera da DB chiave AVK + /// + /// + /// protected string getAKV(string key) { string answ = ""; - using (var ctx = new MoonProEntities()) + using (MoonProEntities ctx = new MoonProEntities()) { - // recupero chaive AVK try { - // importo verifica abilitazione CTrack - !!!FARE!!! vero check key auth! var rawData = ctx.stp_AKV_getByKey(key).ToList(); if (rawData.Count > 0) { @@ -48,13 +51,32 @@ namespace MP.Controllers } /// - /// URLK stringa di UPDATE... + /// URL stringa di UPDATE... /// protected string updateUrl(string package) { return string.Format("http://seriate.steamware.net:8083/SWS/MAPO/{0}/{1}/manifest.xml", package, memLayer.ML.CRS("appVers")); } + /// + /// Costruzione URL da base path + URL specifico finale + /// + /// + /// + protected string urlTgt(string key) + { + string answ = ""; + var currUrl = Request.Url; + try + { + string currTgt = getAKV(key); + answ = $"{currUrl.Scheme}://{currUrl.Authority}/{currTgt}"; + } + catch + { } + return answ; + } + #endregion Protected Methods #region Public Methods @@ -183,33 +205,26 @@ namespace MP.Controllers ViewBag.Title = "MAPO"; // x sicurezza leggo da web.config ViewBag.Environment = WebConfigurationManager.AppSettings["Environment"]; - using (var ctx = new MoonProEntities()) + try { - try - { - // esegue stored procedure come function, recuperando chiave desiderata... - ViewBag.Environment = ctx.stp_AKV_getByKey("Environment").ToList()[0].valString; - // imposto URL dei vari siti - ViewBag.UrlMpSite = ctx.stp_AKV_getByKey("UrlMpSite").ToList()[0].valString; - ViewBag.UrlMpAdmin = ctx.stp_AKV_getByKey("UrlMpAdmin").ToList()[0].valString; - ViewBag.UrlMpIO = ctx.stp_AKV_getByKey("UrlMpIO").ToList()[0].valString; - ViewBag.UrlMpMON = ctx.stp_AKV_getByKey("UrlMpMON").ToList()[0].valString; - ViewBag.UrlMpTAB = ctx.stp_AKV_getByKey("UrlMpTAB").ToList()[0].valString; - ViewBag.UrlMpCTrack = ctx.stp_AKV_getByKey("UrlMpCTrack").ToList()[0].valString; - ViewBag.UrlMpMag = ctx.stp_AKV_getByKey("UrlMpMag").ToList()[0].valString; - // importo verifica abilitazione CTrack - !!!FARE!!! vero check key auth! -#if false - ViewBag.CTrack_Enb = (ctx.stp_AKV_getByKey("CTRACK").ToList()[0].valString != ""); - ViewBag.MAG_Enb = (ctx.stp_AKV_getByKey("MAG").ToList()[0].valString != ""); -#endif - } - catch (Exception exc) - { - logger.lg.scriviLog(string.Format("Eccezione in composizione HOME page LAND:{0}{1}", Environment.NewLine, exc), tipoLog.EXCEPTION); - } + // esegue stored procedure come function, recuperando chiave desiderata... + ViewBag.Environment = getAKV("Environment"); + // imposto URL dei vari siti + ViewBag.UrlMpSite = urlTgt("UrlMpSite"); + ViewBag.UrlMpAdmin = urlTgt("UrlMpAdmin"); + ViewBag.UrlMpIO = urlTgt("UrlMpIO"); + ViewBag.UrlMpMON = urlTgt("UrlMpMON"); + ViewBag.UrlMpTAB = urlTgt("UrlMpTAB"); + ViewBag.UrlMpCTrack = urlTgt("UrlMpCTrack"); + ViewBag.UrlMpMag = urlTgt("UrlMpMag"); + // importo verifica abilitazione CTrack - !!!FARE!!! vero check key auth! + ViewBag.MAG_Enb = string.IsNullOrEmpty(getAKV("MAG")) ? false : true; + ViewBag.CTrack_Enb = string.IsNullOrEmpty(getAKV("CTRACK")) ? false : true; + } + catch (Exception exc) + { + logger.lg.scriviLog(string.Format("Eccezione in composizione HOME page LAND:{0}{1}", Environment.NewLine, exc), tipoLog.EXCEPTION); } - ViewBag.MAG_Enb = string.IsNullOrEmpty(getAKV("MAG")) ? false : true; - ViewBag.CTrack_Enb = string.IsNullOrEmpty(getAKV("CTRACK")) ? false : true; return View(); } diff --git a/MP-LAND/Web.config b/MP-LAND/Web.config index 53e3a29f..df10705b 100644 --- a/MP-LAND/Web.config +++ b/MP-LAND/Web.config @@ -35,12 +35,6 @@ - - - - - - diff --git a/MP-MAG/WebUserControls/mod_enrollByJumperAuthKey.ascx.cs b/MP-MAG/WebUserControls/mod_enrollByJumperAuthKey.ascx.cs index e7b44692..2b3b444e 100644 --- a/MP-MAG/WebUserControls/mod_enrollByJumperAuthKey.ascx.cs +++ b/MP-MAG/WebUserControls/mod_enrollByJumperAuthKey.ascx.cs @@ -61,7 +61,7 @@ namespace MP_MAG.WebUserControls fatto = DataLayerObj.enrollDevice(UserAuthKey, IPv4, DeviceName, userAgent, MatrOpr); if (fatto) { - Response.Redirect(memLayer.ML.CRS("mainPage")); + Response.Redirect(memLayer.ML.CRS("mainPageMag")); } } } diff --git a/MP-TAB/WebUserControls/cmp_goPrint.ascx.cs b/MP-TAB/WebUserControls/cmp_goPrint.ascx.cs index 15da126d..8319b95f 100644 --- a/MP-TAB/WebUserControls/cmp_goPrint.ascx.cs +++ b/MP-TAB/WebUserControls/cmp_goPrint.ascx.cs @@ -71,12 +71,14 @@ namespace MoonProTablet.WebUserControls if (!Page.IsPostBack) { updateOdl(); - string UrlTabJumpMag = memLayer.ML.CRS("UrlTabJumpMag"); + var currUrl = Request.Url; + string UrlTabJumpMag = memLayer.ML.cdv("UrlTabJumpMag"); if (string.IsNullOrEmpty(UrlTabJumpMag)) { - UrlTabJumpMag = "../../MAG/jumper"; + UrlTabJumpMag = "MAG/jumper"; } - hlMagPrint.NavigateUrl = $"{UrlTabJumpMag}?MatrOpr={MatrOpr}&UserAuthKey={UserAuthKey}&IdxOdl={idxOdl}&IdxMacchina={idxMacchina}&QtaUdc={QtaUdc}"; + // compongo url come shcema + authority + jumpAddr + query params + hlMagPrint.NavigateUrl = $"{currUrl.Scheme}://{currUrl.Authority}/{UrlTabJumpMag}?MatrOpr={MatrOpr}&UserAuthKey={UserAuthKey}&IdxOdl={idxOdl}&IdxMacchina={idxMacchina}&QtaUdc={QtaUdc}"; } }