Merge branch 'MAG' into ADM

This commit is contained in:
Samuele E. Locatelli
2021-01-13 19:55:54 +01:00
14 changed files with 618 additions and 288 deletions
Vendored
+1 -1
View File
@@ -13,7 +13,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=1366']) {
withEnv(['NEXT_BUILD_NUMBER=1367']) {
// env.versionNumber = VersionNumber(versionNumberString : '6.12.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '6.12.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
+77 -6
View File
@@ -17,6 +17,28 @@ namespace MP.Controllers
{
#region Protected Methods
protected string getAKV(string key)
{
string answ = "";
using (var ctx = new MoonProEntities())
{
// fix visibilità CTrack
try
{
// importo verifica abilitazione CTrack - !!!FARE!!! vero check key auth!
var rawData = ctx.stp_AKV_getByKey(key).ToList<AnagKeyValue>();
if (rawData.Count > 0)
{
answ = rawData[0].valString;
}
}
catch (Exception exc)
{ }
}
return answ;
}
/// <summary>
/// Path locale dove scaricare gli installer
/// </summary>
@@ -139,6 +161,7 @@ namespace MP.Controllers
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");
done += UpdateMan.obj.downloadLatest(updateUrl("MAG"), localDownloadPath("MAG"), "MAG");
stopWatch.Stop();
// calcolo elapsed time come TimeSpan value.
TimeSpan ts = stopWatch.Elapsed;
@@ -173,16 +196,20 @@ namespace MP.Controllers
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);
// Default: NO CTrack
ViewBag.CTrack_Enb = false;
}
}
ViewBag.MAG_Enb = string.IsNullOrEmpty(getAKV("MAG")) ? false : true;
ViewBag.CTrack_Enb = string.IsNullOrEmpty(getAKV("CTRACK")) ? false : true;
return View();
}
@@ -271,22 +298,66 @@ namespace MP.Controllers
else
{
ViewBag.VersMpCTrack = "ND";
ViewBag.TabDisabled = "disabled";
ViewBag.CTrackDisabled = "disabled";
}
// Recupero info CTRACK...
updArgs = UpdateMan.obj.getUpdateInfo(updateUrl("MAG"));
if (updArgs.IsUpdateAvailable)
{
ViewBag.VersMpMag = updArgs.CurrentVersion;
}
else
{
ViewBag.VersMpMag = "ND";
ViewBag.MagDisabled = "disabled";
}
// salvo risultati...
ViewBag.Results = results;
// fix visibilità CTrack
using (var ctx = new MoonProEntities())
{
System.Collections.Generic.List<AnagKeyValue> rawData = null;
// fix visibilità CTrack
try
{
// importo verifica abilitazione CTrack - !!!FARE!!! vero check key auth!
ViewBag.CTrack_Enb = (ctx.stp_AKV_getByKey("CTRACK").ToList<AnagKeyValue>()[0].valString != "");
ViewBag.CTrack_Enb = string.IsNullOrEmpty(getAKV("CTRACK")) ? false : true;
#if false
rawData = ctx.stp_AKV_getByKey("CTRACK").ToList<AnagKeyValue>();
if (rawData.Count > 0)
{
ViewBag.CTrack_Enb = (rawData[0].valString != "");
}
else
{
ViewBag.CTrack_Enb = false;
}
#endif
}
catch
catch (Exception exc)
{
ViewBag.CTrack_Enb = false;
}
// fix visibilità MAG
try
{
// importo verifica abilitazione MAG - !!!FARE!!! vero check key auth!
ViewBag.MAG_Enb = string.IsNullOrEmpty(getAKV("MAG")) ? false : true;
#if false
rawData = ctx.stp_AKV_getByKey("MAG").ToList<AnagKeyValue>();
if (rawData.Count > 0)
{
ViewBag.MAG_Enb = (ctx.stp_AKV_getByKey("MAG").ToList<AnagKeyValue>()[0].valString != "");
}
else
{
ViewBag.MAG_Enb = false;
}
#endif
}
catch (Exception exc)
{
ViewBag.MAG_Enb = false;
}
}
// VIEW!
return View();
+267 -136
View File
@@ -1,144 +1,275 @@
@{
ViewBag.Title = "MP-LAND HOME";
ViewBag.Title = "MP-LAND HOME";
}
<div class="jumbotron pt-4 pb-2">
<h1>MAPO - @ViewBag.Environment</h1>
<p class="lead">Pannello di gestione della <a href="http://www.steamware.net/iot">suite MAPO</a>: l'integrazione di MES + SCADA + IOT + Gestione Commesse</p>
<h1>MAPO - @ViewBag.Environment</h1>
<p class="lead">Pannello di gestione della <a href="http://www.steamware.net/iot">suite MAPO</a>: l'integrazione di MES + SCADA + IOT + Gestione Commesse</p>
</div>
<div class="row">
<div class="col-md-4">
<a href="@ViewBag.UrlMpSite" class="btn btn-primary btn-lg btn-block" target="_blank">
<h2>MP-SITE &raquo;</h2>
</a>
<hr />
<div class="row">
<div class="col-3 text-center">
<i class="fa fa-sitemap fa-5x" aria-hidden="true"></i>
</div>
<div class="col-9">
<p style="font-size:0.9rem;">
<b>Sito principale:</b>
<ul style="font-size:0.8rem;">
<li>Mappa Stato</li>
<li>Mappa Tempi</li>
<li>Statistiche</li>
<li>Produzione</li>
</ul>
</p>
</div>
</div>
</div>
<div class="col-md-4">
<a href="@ViewBag.UrlMpTAB" class="btn btn-info btn-lg btn-block" target="_blank">
<h2>MP-TAB &raquo;</h2>
</a>
<hr />
<div class="row">
<div class="col-3 text-center">
<i class="fa fa-tablet fa-5x" aria-hidden="true"></i>
</div>
<div class="col-9">
<p style="font-size:0.9rem;">
<b>Accesso tablet:</b>
<ul style="font-size:0.8rem;">
<li>Mappa Stato</li>
<li>Gestione Produzione</li>
<li>Gestione Attrezzaggi</li>
<li>Gestione Fermi</li>
</ul>
</p>
</div>
</div>
</div>
<div class="col-md-4">
<a href="@ViewBag.UrlMpMON" class="btn btn-warning btn-lg btn-block" target="_blank">
<h2>MP-MON &raquo;</h2>
</a>
<hr />
<div class="row">
<div class="col-3 text-center">
<i class="fa fa-television fa-5x" aria-hidden="true"></i>
</div>
<div class="col-9">
<p style="font-size:0.9rem;">
<b>Panel monitoraggio:</b>
<ul style="font-size:0.8rem;">
<li>Panel Stato</li>
<li>Realtime Data</li>
<li>Ottimizzato per TV e sistemi totem HD/4K</li>
</ul>
</p>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-4">
<a href="@ViewBag.UrlMpAdmin" class="btn btn-success btn-lg btn-block" target="_blank">
<h2>MP-ADMIN &raquo;</h2>
</a>
<hr />
<div class="row">
<div class="col-3 text-center">
<i class="fa fa-diamond fa-5x" aria-hidden="true"></i>
</div>
<div class="col-9">
<p style="font-size:0.9rem;">
<b>Sito Amministrativo:</b>
<ul style="font-size:0.8rem;">
<li>Gestione Articoli</li>
<li>Gestione ODL</li>
<li>Gestione Tempi</li>
</ul>
</p>
</div>
</div>
</div>
<div class="col-md-4">
@{
if (ViewBag.CTrack_Enb)
{
<a href="@ViewBag.UrlMpCTrack" class="btn btn-secondary btn-lg btn-block" target="_blank">
<h2>MP-CTRACK &raquo;</h2>
</a>
<hr />
<div class="row">
<div class="col-3 text-center">
<i class="fa fa-hand-paper-o fa-5x" aria-hidden="true"></i>
</div>
<div class="col-9">
<p style="font-size:0.9rem;">
<b>Gestione Montaggi:</b>
<ul style="font-size:0.8rem;">
<li>Gestione Commesse/Postazioni/Operatori</li>
<li>Registrazione Operazioni Manuali</li>
<li>Registro Consuntivo Attivit&agrave;</li>
</ul>
</p>
</div>
<div class="col-md-3">
<div class="card">
<div class="card-header table-secondary">
<a href="@ViewBag.UrlMpAdmin" class="btn btn-success btn-lg btn-block" target="_blank">
<h2>MP-ADMIN &raquo;</h2>
</a>
</div>
<div class="card-body">
<div class="row">
<div class="col-3 text-center">
<i class="fa fa-diamond fa-5x" aria-hidden="true"></i>
</div>
<div class="col-9">
<p style="font-size:0.9rem;">
<b>Sito Amministrativo:</b>
<ul style="font-size:0.8rem;">
<li>Gestione Articoli</li>
<li>Gestione ODL</li>
<li>Gestione Tempi</li>
</ul>
</p>
</div>
</div>
</div>
</div>
}
}
</div>
<div class="col-md-4">
<a href="@ViewBag.UrlMpIO" class="btn btn-danger btn-lg btn-block" target="_blank">
<h2>MP-IO &raquo;</h2>
</a>
<hr />
<div class="row">
<div class="col-3 text-center">
<i class="fa fa-steam fa-5x" aria-hidden="true"></i>
</div>
<div class="col-9">
<p style="font-size:0.9rem;">
<b>Stato IOB:</b>
<ul style="font-size:0.8rem;">
<li>Elenco acquisitori</li>
<li>Storico reboot</li>
</ul>
</p>
</div>
</div>
</div>
</div>
<div class="col-md-3">
<div class="card">
<div class="card-header table-secondary">
<a href="@ViewBag.UrlMpSite" class="btn btn-primary btn-lg btn-block" target="_blank">
<h2>MP-SITE &raquo;</h2>
</a>
</div>
<div class="card-body">
<div class="row">
<div class="col-3 text-center">
<i class="fa fa-sitemap fa-5x" aria-hidden="true"></i>
</div>
<div class="col-9">
<p style="font-size:0.9rem;">
<b>Sito principale:</b>
<ul style="font-size:0.8rem;">
<li>Mappa Stato</li>
<li>Mappa Tempi</li>
<li>Statistiche</li>
<li>Produzione</li>
</ul>
</p>
</div>
</div>
</div>
</div>
</div>
<div class="col-md-3">
<div class="card">
<div class="card-header table-secondary">
<a href="@ViewBag.UrlMpMON" class="btn btn-warning btn-lg btn-block" target="_blank">
<h2>MP-MON &raquo;</h2>
</a>
</div>
<div class="card-body">
<div class="row">
<div class="col-3 text-center">
<i class="fa fa-television fa-5x" aria-hidden="true"></i>
</div>
<div class="col-9">
<p style="font-size:0.9rem;">
<b>Panel monitoraggio:</b>
<ul style="font-size:0.8rem;">
<li>Panel Stato</li>
<li>Realtime Data</li>
<li>Ottimizzato per TV e sistemi totem HD/4K</li>
</ul>
</p>
</div>
</div>
</div>
</div>
</div>
<div class="col-md-3">
<div class="card">
<div class="card-header table-secondary">
<a href="@ViewBag.UrlMpTAB" class="btn btn-info btn-lg btn-block" target="_blank">
<h2>MP-TAB &raquo;</h2>
</a>
</div>
<div class="card-body">
<div class="row">
<div class="col-3 text-center">
<i class="fa fa-tablet fa-5x" aria-hidden="true"></i>
</div>
<div class="col-9">
<p style="font-size:0.9rem;">
<b>Accesso tablet:</b>
<ul style="font-size:0.8rem;">
<li>Mappa Stato</li>
<li>Gestione Produzione</li>
<li>Gestione Attrezzaggi</li>
<li>Gestione Fermi</li>
</ul>
</p>
</div>
</div>
</div>
</div>
</div>
<div class="col-md-3">
<div class="card">
<div class="card-header table-secondary">
<a href="@ViewBag.UrlMpIO" class="btn btn-danger btn-lg btn-block" target="_blank">
<h2>MP-IO &raquo;</h2>
</a>
</div>
<div class="card-body">
<div class="row">
<div class="col-3 text-center">
<i class="fa fa-steam fa-5x" aria-hidden="true"></i>
</div>
<div class="col-9">
<p style="font-size:0.9rem;">
<b>Stato IOB:</b>
<ul style="font-size:0.8rem;">
<li>Elenco acquisitori</li>
<li>Storico reboot</li>
</ul>
</p>
</div>
</div>
</div>
</div>
</div>
<div class="col-md-3">
@{
if (ViewBag.CTrack_Enb)
{
<div class="card">
<div class="card-header table-secondary">
<a href="@ViewBag.UrlMpCTrack" class="btn btn-secondary btn-lg btn-block" target="_blank">
<h2>MP-CTRACK &raquo;</h2>
</a>
</div>
<div class="card-body">
<div class="row">
<div class="col-3 text-center">
<i class="fa fa-hand-paper-o fa-5x" aria-hidden="true"></i>
</div>
<div class="col-9">
<p style="font-size:0.9rem;">
<b>Gestione Montaggi:</b>
<ul style="font-size:0.8rem;">
<li>Gestione Commesse/Postazioni/Operatori</li>
<li>Registrazione Operazioni Manuali</li>
<li>Registro Consuntivo Attivit&agrave;</li>
</ul>
</p>
</div>
</div>
</div>
</div>
}
else
{
<div class="card">
<div class="card-header table-secondary">
<a href="" class="btn btn-secondary btn-lg btn-block disabled">
<h2>
<del>MP-CTRACK</del> &raquo;
</h2>
</a>
</div>
<div class="card-body">
<div class="row">
<div class="col-3 text-center">
<i class="fa fa-hand-paper-o fa-5x" aria-hidden="true"></i>
</div>
<div class="col-9">
<p style="font-size:0.9rem;">
<b>Gestione Montaggi:</b>
<ul style="font-size:0.8rem;">
<li>Gestione Commesse/Postazioni/Operatori</li>
<li>Registrazione Operazioni Manuali</li>
<li>Registro Consuntivo Attivit&agrave;</li>
</ul>
</p>
</div>
</div>
</div>
<div class="card-footer text-center p-0">
<i class="text-danger">Licenza non attivata</i>
</div>
</div>
}
}
</div>
<div class="col-md-3">
@{
if (ViewBag.MAG_Enb)
{
<div class="card">
<div class="card-header table-secondary">
<a href="@ViewBag.UrlMpMag" class="btn btn-secondary btn-lg btn-block" target="_blank">
<h2>MP-MAG &raquo;</h2>
</a>
</div>
<div class="card-body">
<div class="row">
<div class="col-3 text-center">
<i class="fa fa-hand-paper-o fa-5x" aria-hidden="true"></i>
</div>
<div class="col-9">
<p style="font-size:0.9rem;">
<b>Gestione Magazzino:</b>
<ul style="font-size:0.8rem;">
<li>Gestione Lotti</li>
<li>Gestion PackList</li>
<li>Stampa UDC (contenitori)</li>
<li>Gestione AL (pedane)</li>
</ul>
</p>
</div>
</div>
</div>
</div>
}
else
{
<div class="card">
<div class="card-header table-secondary">
<a href="" class="btn btn-dark btn-lg btn-block disabled">
<h2>
<del>MP-MAG</del> &raquo;
</h2>
</a>
</div>
<div class="card-body">
<div class="row">
<div class="col-3 text-center">
<i class="fa fa-hand-paper-o fa-5x" aria-hidden="true"></i>
</div>
<div class="col-9">
<p style="font-size:0.9rem;">
<b>Gestione Magazzino:</b>
<ul style="font-size:0.8rem;">
<li>Gestione Lotti</li>
<li>Gestion PackList</li>
<li>Stampa UDC (contenitori)</li>
<li>Gestione AL (pedane)</li>
</ul>
</p>
</div>
</div>
</div>
<div class="card-footer text-center p-0">
<i class="text-danger">Licenza non attivata</i>
</div>
</div>
}
}
</div>
</div>
+113 -104
View File
@@ -1,112 +1,121 @@
<div class="container-fluid mt-4">
<div class="row">
<div class="col-12">
<div class="card">
<div class="card-header">
<h2>@ViewBag.Title</h2>
</div>
<div class="card-body px-3">
<div class="row">
<div class="col-4 text-center">
<img src="~/images/LogoMapoFull.png" class="img-fluid" />
<br />
<br />
<h4 class="card-title">@ViewBag.Message</h4>
Scaricare uno o più pacchetti selezionando dall'elenco riportato.
</div>
<div class="col-8">
<div class="row">
<div class="col-sm-12 mb-5">
<h2 class="text-center text-success">
ALL PACKAGES <i class="fa fa-download"></i>
</h2>
<a href="@Url.Action("Download", "Home", new { caller = "ALL" })" class="btn btn-outline-success btn-lg fullWidth" onClick="return confirm('Sicuro di voler scaricare tutti i pacchetti?')">
<strong>DOWNLOAD ALL LATEST</strong>
</a>
<div class="row">
<div class="col-12">
<div class="card">
<div class="card-header">
<h2>@ViewBag.Title</h2>
</div>
<div class="col-sm-6 col-md-4">
<h2 class="text-center">MP-ADMIN <i class="fa fa-download"></i></h2>
<a href="@Url.Action("Download", "Home", new { caller = "ADM" })" class="btn btn-outline-secondary btn-lg fullWidth @ViewBag.AdmDisabled">
<strong>@ViewBag.VersMpAdmin</strong>
</a>
</div>
<div class="col-sm-6 col-md-4">
<h2 class="text-center">
MP-IO
<i class="fa fa-download"></i>
</h2>
<a href="@Url.Action("Download", "Home", new { caller = "IO" })" class="btn btn-outline-secondary btn-lg fullWidth @ViewBag.IODisabled">
<strong>@ViewBag.VersMpIO</strong>
</a>
</div>
<div class="col-sm-6 col-md-4">
<h2 class="text-center">
MP-LAND
<i class="fa fa-download"></i>
</h2>
<a href="@Url.Action("Download", "Home", new { caller = "LAND" })" class="btn btn-outline-secondary btn-lg fullWidth @ViewBag.LandDisabled">
<strong>@ViewBag.VersMpLand</strong>
</a>
</div>
<div class="col-sm-6 col-md-4">
<h2 class="text-center">
MP-MON
<i class="fa fa-download"></i>
</h2>
<a href="@Url.Action("Download", "Home", new { caller = "MON" })" class="btn btn-outline-secondary btn-lg fullWidth @ViewBag.MonDisabled">
<strong>@ViewBag.VersMpMon</strong>
</a>
</div>
<div class="col-sm-6 col-md-4">
<h2 class="text-center">
MP-SITE
<i class="fa fa-download"></i>
</h2>
<a href="@Url.Action("Download", "Home", new { caller = "SITE" })" class="btn btn-outline-secondary btn-lg fullWidth @ViewBag.SiteDisabled">
<strong>@ViewBag.VersMpSite</strong>
</a>
</div>
<div class="col-sm-6 col-md-4">
<h2 class="text-center">
MP-TAB
<i class="fa fa-download"></i>
</h2>
<a href="@Url.Action("Download", "Home", new { caller = "TAB" })" class="btn btn-outline-secondary btn-lg fullWidth @ViewBag.TabDisabled">
<strong>@ViewBag.VersMpTab</strong>
</a>
</div>
@{
if (ViewBag.CTrack_Enb)
{
<div class="col-sm-6 col-md-4">
<h2 class="text-center">
MP-CTRACK
<i class="fa fa-download"></i>
</h2>
<a href="@Url.Action("Download", "Home", new { caller = "CTRACK" })" class="btn btn-outline-secondary btn-lg fullWidth @ViewBag.TabDisabled">
<strong>@ViewBag.VersMpCTrack</strong>
</a>
<div class="card-body px-3">
<div class="row">
<div class="col-4 text-center">
<img src="~/images/LogoMapoFull.png" class="img-fluid" />
<br />
<br />
<h4 class="card-title">@ViewBag.Message</h4>
Scaricare uno o più pacchetti selezionando dall'elenco riportato.
</div>
<div class="col-8">
<div class="row">
<div class="col-sm-12 mb-5">
<h2 class="text-center text-success">
ALL PACKAGES <i class="fa fa-download"></i>
</h2>
<a href="@Url.Action("Download", "Home", new { caller = "ALL" })" class="btn btn-outline-success btn-lg fullWidth" onClick="return confirm('Sicuro di voler scaricare tutti i pacchetti?')">
<strong>DOWNLOAD ALL LATEST</strong>
</a>
</div>
<div class="col-sm-6 col-md-4">
<h2 class="text-center">MP-ADMIN <i class="fa fa-download"></i></h2>
<a href="@Url.Action("Download", "Home", new { caller = "ADM" })" class="btn btn-outline-secondary btn-lg fullWidth @ViewBag.AdmDisabled">
<strong>@ViewBag.VersMpAdmin</strong>
</a>
</div>
<div class="col-sm-6 col-md-4">
<h2 class="text-center">
MP-IO
<i class="fa fa-download"></i>
</h2>
<a href="@Url.Action("Download", "Home", new { caller = "IO" })" class="btn btn-outline-secondary btn-lg fullWidth @ViewBag.IODisabled">
<strong>@ViewBag.VersMpIO</strong>
</a>
</div>
<div class="col-sm-6 col-md-4">
<h2 class="text-center">
MP-LAND
<i class="fa fa-download"></i>
</h2>
<a href="@Url.Action("Download", "Home", new { caller = "LAND" })" class="btn btn-outline-secondary btn-lg fullWidth @ViewBag.LandDisabled">
<strong>@ViewBag.VersMpLand</strong>
</a>
</div>
<div class="col-sm-6 col-md-4">
<h2 class="text-center">
MP-MON
<i class="fa fa-download"></i>
</h2>
<a href="@Url.Action("Download", "Home", new { caller = "MON" })" class="btn btn-outline-secondary btn-lg fullWidth @ViewBag.MonDisabled">
<strong>@ViewBag.VersMpMon</strong>
</a>
</div>
<div class="col-sm-6 col-md-4">
<h2 class="text-center">
MP-SITE
<i class="fa fa-download"></i>
</h2>
<a href="@Url.Action("Download", "Home", new { caller = "SITE" })" class="btn btn-outline-secondary btn-lg fullWidth @ViewBag.SiteDisabled">
<strong>@ViewBag.VersMpSite</strong>
</a>
</div>
<div class="col-sm-6 col-md-4">
<h2 class="text-center">
MP-TAB
<i class="fa fa-download"></i>
</h2>
<a href="@Url.Action("Download", "Home", new { caller = "TAB" })" class="btn btn-outline-secondary btn-lg fullWidth @ViewBag.TabDisabled">
<strong>@ViewBag.VersMpTab</strong>
</a>
</div>
@{
if (ViewBag.CTrack_Enb)
{
<div class="col-sm-6 col-md-4">
<h2 class="text-center">
MP-CTRACK
<i class="fa fa-download"></i>
</h2>
<a href="@Url.Action("Download", "Home", new { caller = "CTRACK" })" class="btn btn-outline-secondary btn-lg fullWidth @ViewBag.CTrackDisabled">
<strong>@ViewBag.VersMpCTrack</strong>
</a>
</div>
}
}
@{
if (ViewBag.MAG_Enb)
{
<div class="col-sm-6 col-md-4">
<h2 class="text-center">
MP-MAG
<i class="fa fa-download"></i>
</h2>
<a href="@Url.Action("Download", "Home", new { caller = "MAG" })" class="btn btn-outline-secondary btn-lg fullWidth @ViewBag.MagDisabled">
<strong>@ViewBag.VersMpMag</strong>
</a>
</div>
}
}
</div>
</div>
</div>
}
}
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="col-12 mt-3">
<div class="col-12 mt-3">
<div class="row">
<div class="col-sm-12 text-center">
<i>@ViewBag.Results</i>
<div class="row">
<div class="col-sm-12 text-center">
<i>@ViewBag.Results</i>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
+9 -7
View File
@@ -785,7 +785,9 @@
<Content Include="Scripts\WebForms\WebParts.js" />
<Content Include="Scripts\WebForms\WebUIValidation.js" />
<Content Include="Boundle.config" />
<Content Include="Reports\queueConf.json" />
<Content Include="Reports\queueConf.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="SMART\Default.aspx" />
<Content Include="SMART\EnrollDevice.aspx" />
<Content Include="SMART\jumper.aspx" />
@@ -852,15 +854,15 @@
<Content Include="NLog.config" />
<None Include="Properties\PublishProfiles\IIS02.pubxml" />
<None Include="Properties\PublishProfiles\IIS01.pubxml" />
<None Include="Reports\CartellinoFinitiOdette.rdlc">
<Content Include="Reports\CartellinoFinitiOdette.rdlc">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="Reports\CartellinoPedane.rdlc">
</Content>
<Content Include="Reports\CartellinoPedane.rdlc">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="Reports\CartellinoSemilavorati.rdlc">
</Content>
<Content Include="Reports\CartellinoSemilavorati.rdlc">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</Content>
<None Include="Scripts\jquery-3.4.1.intellisense.js" />
<Content Include="Scripts\jquery-3.4.1.js" />
<Content Include="Scripts\jquery-3.4.1.min.js" />
+1 -1
View File
@@ -13,7 +13,7 @@
<div class="col-6">
</div>
<div class="col-3">
<asp:LinkButton runat="server" ID="lbtPrintReport" CssClass="btn btn-block btn-primary" OnClick="lbtPrintReport_Click">Report <i class="fas fa-print"></i></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtPrintReport" CssClass="btn btn-block btn-primary" OnClick="lbtPrintReport_Click" Visible="false">Report <i class="fas fa-print"></i></asp:LinkButton>
</div>
</div>
<div runat="server" id="divAddNew" class="row table-secondary py-1">
+2 -10
View File
@@ -7,6 +7,7 @@
<%@ Register Src="~/WebUserControls/mod_controlliProd.ascx" TagPrefix="uc5" TagName="mod_controlliProd" %>
<%@ Register Src="~/WebUserControls/mod_dettMacchina.ascx" TagName="mod_dettMacchina" TagPrefix="uc6" %>
<%@ Register Src="~/WebUserControls/mod_regScarti.ascx" TagPrefix="uc3" TagName="mod_regScarti" %>
<%@ Register Src="~/WebUserControls/cmp_goPrint.ascx" TagPrefix="uc1" TagName="cmp_goPrint" %>
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
<div class="container-flow m-3" role="main">
@@ -26,16 +27,7 @@
</div>
</div>
</div>
<div runat="server" id="divGoPrint" class="row textCondens mb-1">
<div class="col-6 text-right">
<b>Gestione stampa etichette <i class="fa fa-long-arrow-right" aria-hidden="true"></i></b>
<br />
Gestione etichette per l'ODL con modulo MAG
</div>
<div class="col-6">
<asp:HyperLink runat="server" ID="hlMagPrint" NavigateUrl="../MAG/" Target="_blank" CssClass="btn btn-success btn-lg btn-block">MAG <i class="fa fa-print"></i></asp:HyperLink>
</div>
</div>
<uc1:cmp_goPrint runat="server" id="cmp_goPrint" />
<uc4:mod_confProd ID="mod_confProd1" runat="server" />
<div class="row textCondens">
<div class="col-6">
+3 -11
View File
@@ -6,8 +6,7 @@ namespace MoonProTablet
{
public partial class DettaglioMacchina : BasePage
{
#region Protected Properties
#if false
protected int MatrOpr
{
get
@@ -37,7 +36,6 @@ namespace MoonProTablet
return answ;
}
}
protected string UserAuthKey
{
get
@@ -56,8 +54,7 @@ namespace MoonProTablet
return answ;
}
}
#endregion Protected Properties
#endif
#region Private Methods
@@ -80,12 +77,7 @@ namespace MoonProTablet
memLayer.ML.setSessionVal("TipoLink", "DetMacc");
hlScarti.Visible = enableScarti;
hlControlli.Visible = enableControlli;
divGoPrint.Visible = enableMagPrint;
// se abilitata stampa sistema il link di navigazione
if (enableMagPrint)
{
hlMagPrint.NavigateUrl = $"../MAG/jumper?MatrOpr={MatrOpr}&UserAuthKey={UserAuthKey}&IdxOdl={idxODL}&IdxMacchina={idxMacchina}&QtaUdc={QtaUdc}";
}
cmp_goPrint.Visible = enableMagPrint;
}
mod_confProd1.eh_newVal += mod_confProd1_eh_newVal;
mod_confProd1.eh_reset += mod_confProd1_eh_reset;
+2 -11
View File
@@ -42,22 +42,13 @@ namespace MoonProTablet
protected global::MoonProTablet.WebUserControls.mod_dettaglioProd mod_dettaglioProd2;
/// <summary>
/// Controllo divGoPrint.
/// Controllo cmp_goPrint.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divGoPrint;
/// <summary>
/// Controllo hlMagPrint.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.HyperLink hlMagPrint;
protected global::MoonProTablet.WebUserControls.cmp_goPrint cmp_goPrint;
/// <summary>
/// Controllo mod_confProd1.
+8
View File
@@ -700,6 +700,7 @@
<Content Include="WebUserControls\cmp_dettPODL.ascx" />
<Content Include="WebUserControls\cmp_disabled.ascx" />
<Content Include="WebUserControls\cmp_displNumPzProd.ascx" />
<Content Include="WebUserControls\cmp_goPrint.ascx" />
<Content Include="WebUserControls\cmp_HwSwInfo.ascx" />
<Content Include="WebUserControls\cmp_newODL.ascx" />
<Content Include="WebUserControls\cmp_selPzPallet.ascx" />
@@ -1013,6 +1014,13 @@
<Compile Include="WebUserControls\cmp_displNumPzProd.ascx.designer.cs">
<DependentUpon>cmp_displNumPzProd.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_goPrint.ascx.cs">
<DependentUpon>cmp_goPrint.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\cmp_goPrint.ascx.designer.cs">
<DependentUpon>cmp_goPrint.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_HwSwInfo.ascx.cs">
<DependentUpon>cmp_HwSwInfo.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
+11
View File
@@ -0,0 +1,11 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_goPrint.ascx.cs" Inherits="MoonProTablet.WebUserControls.cmp_goPrint" %>
<div class="row textCondens mb-1">
<div class="col-6 text-right">
<b>Gestione stampa etichette <i class="fa fa-long-arrow-right" aria-hidden="true"></i></b>
<br />
Gestione etichette per l'ODL con modulo MAG
</div>
<div class="col-6">
<asp:HyperLink runat="server" ID="hlMagPrint" NavigateUrl="../MAG/" Target="_blank" CssClass="btn btn-success btn-lg btn-block">MAG <i class="fa fa-print"></i></asp:HyperLink>
</div>
</div>
@@ -0,0 +1,95 @@
using SteamWare;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace MoonProTablet.WebUserControls
{
public partial class cmp_goPrint : BaseUserControl
{
#region Protected Properties
protected int MatrOpr
{
get
{
return memLayer.ML.IntSessionObj("MatrOpr");
}
}
protected int QtaUdc
{
get
{
int answ = 1;
string codGrp = "IMB";
string codVal = "NUM_PZ_CONT";
// recupero dato da scheda tecnica della quantità per UDC
var tabSTAR = DataLayerObj.taSTAR.getByGrpOdlLbl(codGrp, codVal, idxOdl);
if (tabSTAR.Rows.Count > 0)
{
try
{
int.TryParse(tabSTAR[0].Value, out answ);
}
catch
{ }
}
return answ;
}
}
protected string UserAuthKey
{
get
{
//cerco in sessione...
string answ = memLayer.ML.StringSessionObj("UserAuthKey");
// se non trovo --> db
if (string.IsNullOrEmpty(answ))
{
var tabOpr = DataLayerObj.taOp.getByMatrOpr(MatrOpr);
if (tabOpr.Rows.Count > 0)
{
answ = tabOpr[0].authKey;
}
}
return answ;
}
}
#endregion Protected Properties
#region Protected Methods
protected void Page_Load(object sender, EventArgs e)
{
// se abilitata stampa sistema il link di navigazione
if (!Page.IsPostBack)
{
updateOdl();
hlMagPrint.NavigateUrl = $"../MAG/jumper?MatrOpr={MatrOpr}&UserAuthKey={UserAuthKey}&IdxOdl={idxOdl}&IdxMacchina={idxMacchina}&QtaUdc={QtaUdc}";
}
}
/// <summary>
/// ODL correntemente sulla macchina
/// - cerca in Redis (TTL 5 sec)
/// - altrimenti recupera da DB...
/// </summary>
protected void updateOdl()
{
// userò ODL del turno
int answ = 0;
// cerco da redis...
int.TryParse(DataLayerObj.currODL(idxMacchinaSel, true), out answ);
// salvo!
idxOdl = answ;
}
#endregion Protected Methods
}
}
+26
View File
@@ -0,0 +1,26 @@
//------------------------------------------------------------------------------
// <generato automaticamente>
// Codice generato da uno strumento.
//
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
// il codice viene rigenerato.
// </generato automaticamente>
//------------------------------------------------------------------------------
namespace MoonProTablet.WebUserControls
{
public partial class cmp_goPrint
{
/// <summary>
/// Controllo hlMagPrint.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.HyperLink hlMagPrint;
}
}
+3 -1
View File
@@ -450,7 +450,9 @@ namespace MoonProTablet.WebUserControls
// di default rendo abilitato / disabilitato tutto in base al valore "isEnabled"
lbtShowSplitODL.Enabled = isEnabled && enableRiattrezzaggio;
lbtSplitODL.Enabled = isEnabled;
chkCloseOdl.Enabled = isEnabled;
chkCloseOdl.Enabled = isEnabled && chkCloseOdlVal;
chkCloseOdl.Visible = showChkCloseOdlVal;
fixWCtrStatus(lbtShowSplitODL);
fixWCtrStatus(lbtSplitODL);
fixWCtrStatus(chkCloseOdl);