diff --git a/MP-LAND/Controllers/HomeController.cs b/MP-LAND/Controllers/HomeController.cs index 50c1f871..3eedc4f5 100644 --- a/MP-LAND/Controllers/HomeController.cs +++ b/MP-LAND/Controllers/HomeController.cs @@ -17,7 +17,7 @@ namespace MP.Controllers { public ActionResult Index() { - ViewBag.Title = "MoonPro"; + ViewBag.Title = "MAPO"; // x sicurezza leggo da web.config ViewBag.Environment = WebConfigurationManager.AppSettings["Environment"]; using (var ctx = new MoonProEntities()) @@ -150,8 +150,32 @@ namespace MP.Controllers ViewBag.VersMpTab = "ND"; ViewBag.TabDisabled = "disabled"; } + // Recupero info CTRACK... + updArgs = UpdateMan.obj.getUpdateInfo(updateUrl("CTRACK")); + if (updArgs.IsUpdateAvailable) + { + ViewBag.VersMpCTrack = updArgs.CurrentVersion; + } + else + { + ViewBag.VersMpCTrack = "ND"; + ViewBag.TabDisabled = "disabled"; + } // salvo risultati... ViewBag.Results = results; + // fix visibilità CTrack + using (var ctx = new MoonProEntities()) + { + try + { + // importo verifica abilitazione CTrack - !!!FARE!!! vero check key auth! + ViewBag.CTrack_Enb = (ctx.stp_AKV_getByKey("CTRACK").ToList()[0].valString != ""); + } + catch + { + ViewBag.CTrack_Enb = false; + } + } // VIEW! return View(); } @@ -240,7 +264,7 @@ namespace MP.Controllers } - // GET: Home/Download/Caller (ALL|ADM|IO|LAND|MON|SITE|TAB) + // GET: Home/Download/Caller (ALL|ADM|IO|LAND|MON|SITE|TAB|CTRACK) public ActionResult Download(string caller) { string resultsMsg = ""; @@ -265,6 +289,7 @@ namespace MP.Controllers done += UpdateMan.obj.downloadLatest(updateUrl("MON"), localDownloadPath("MON"), "MON"); done += UpdateMan.obj.downloadLatest(updateUrl("SITE"), localDownloadPath("SITE"), "SITE"); done += UpdateMan.obj.downloadLatest(updateUrl("TAB"), localDownloadPath("TAB"), "TAB"); + done += UpdateMan.obj.downloadLatest(updateUrl("CTRACK"), localDownloadPath("CTRACK"), "CTRACK"); stopWatch.Stop(); // calcolo elapsed time come TimeSpan value. TimeSpan ts = stopWatch.Elapsed; diff --git a/MP-LAND/Views/Home/Packages.cshtml b/MP-LAND/Views/Home/Packages.cshtml index 20960ec7..1f11da7f 100644 --- a/MP-LAND/Views/Home/Packages.cshtml +++ b/MP-LAND/Views/Home/Packages.cshtml @@ -20,13 +20,13 @@

ALL PACKAGES

- + DOWNLOAD ALL LATEST

MP-ADMIN

- + @ViewBag.VersMpAdmin
@@ -35,7 +35,7 @@ MP-IO - + @ViewBag.VersMpIO @@ -44,7 +44,7 @@ MP-LAND - + @ViewBag.VersMpLand @@ -53,7 +53,7 @@ MP-MON - + @ViewBag.VersMpMon @@ -62,7 +62,7 @@ MP-SITE - + @ViewBag.VersMpSite @@ -71,10 +71,24 @@ MP-TAB - + @ViewBag.VersMpTab + @{ + if (ViewBag.CTrack_Enb) + { +
+

+ MP-CTRACK + +

+ + @ViewBag.VersMpCTrack + +
+ } + } diff --git a/MP-LAND/Views/Shared/_Layout.cshtml b/MP-LAND/Views/Shared/_Layout.cshtml index 5e856247..006bfd86 100644 --- a/MP-LAND/Views/Shared/_Layout.cshtml +++ b/MP-LAND/Views/Shared/_Layout.cshtml @@ -17,7 +17,7 @@