Egalware/MoonPro.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update gestione DB recupero chaivi JUMP

Browse Source
This commit is contained in:
Samuele E. Locatelli
2021-01-16 10:05:05 +01:00
parent 0670533ef8
commit ddd21ac607
4 changed files with 50 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-LAND/Controllers/HomeController.cs
+44 -29
View File
@@ -17,16 +17,19 @@ namespace MP.Controllers
{
#region Protected Methods
/// <summary>
/// recupera da DB chiave AVK
/// </summary>
/// <param name="key"></param>
/// <returns></returns>
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<AnagKeyValue>();
if (rawData.Count > 0)
{
@@ -48,13 +51,32 @@ namespace MP.Controllers
}
/// <summary>
/// URLK stringa di UPDATE...
/// URL stringa di UPDATE...
/// </summary>
protected string updateUrl(string package)
{
return string.Format("http://seriate.steamware.net:8083/SWS/MAPO/{0}/{1}/manifest.xml", package, memLayer.ML.CRS("appVers"));
}
/// <summary>
/// Costruzione URL da base path + URL specifico finale
/// </summary>
/// <param name="key"></param>
/// <returns></returns>
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<AnagKeyValue>()[0].valString;
// imposto URL dei vari siti
ViewBag.UrlMpSite = ctx.stp_AKV_getByKey("UrlMpSite").ToList<AnagKeyValue>()[0].valString;
ViewBag.UrlMpAdmin = ctx.stp_AKV_getByKey("UrlMpAdmin").ToList<AnagKeyValue>()[0].valString;
ViewBag.UrlMpIO = ctx.stp_AKV_getByKey("UrlMpIO").ToList<AnagKeyValue>()[0].valString;
ViewBag.UrlMpMON = ctx.stp_AKV_getByKey("UrlMpMON").ToList<AnagKeyValue>()[0].valString;
ViewBag.UrlMpTAB = ctx.stp_AKV_getByKey("UrlMpTAB").ToList<AnagKeyValue>()[0].valString;
ViewBag.UrlMpCTrack = ctx.stp_AKV_getByKey("UrlMpCTrack").ToList<AnagKeyValue>()[0].valString;
ViewBag.UrlMpMag = ctx.stp_AKV_getByKey("UrlMpMag").ToList<AnagKeyValue>()[0].valString;
// importo verifica abilitazione CTrack - !!!FARE!!! vero check key auth!
#if false
ViewBag.CTrack_Enb = (ctx.stp_AKV_getByKey("CTRACK").ToList<AnagKeyValue>()[0].valString != "");
ViewBag.MAG_Enb = (ctx.stp_AKV_getByKey("MAG").ToList<AnagKeyValue>()[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();
}
MP-LAND/Web.config
-6
View File
@@ -35,12 +35,6 @@
<add key="webpages:Enabled" value="false" />
<add key="ClientValidationEnabled" value="true" />
<add key="UnobtrusiveJavaScriptEnabled" value="true" />
<!--URL se DB non andasse..-->
<add key="UrlMpSite" value="../MP/SITE" />
<add key="UrlMpAdmin" value="../MP/ADM" />
<add key="UrlMpIO" value="../MP/IO" />
<add key="UrlMpMON" value="../MP/MON" />
<add key="UrlMpTAB" value="../MP/TAB" />
<!--gestione timeout "esteso" x chiamate SQL critiche, in secondi -->
<add key="sqlLongCommandTimeout" value="600" />
<!--stringhe connessione SQL2016-->
MP-MAG/WebUserControls/mod_enrollByJumperAuthKey.ascx.cs
+1 -1
View File
@@ -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"));
}
}
}
MP-TAB/WebUserControls/cmp_goPrint.ascx.cs
+5 -3
View File
@@ -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}";
}
}