Egalware/mapo-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Release/UpdateTabOrdFermi01'

Browse Source
This commit is contained in:
Samuele Locatelli
2024-05-17 19:01:15 +02:00
parent 8409980e60 cb4085e28e
commit 6ce7fee3d9
18 changed files with 102 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-TAB3/MP-TAB3.csproj
+1 -1
View File
@@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<Version>6.16.2405.909</Version>
<Version>6.16.2405.1717</Version>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MP_TAB3</RootNamespace>
</PropertyGroup>
MP-TAB3/Pages/ProdStop.razor.cs
+2 -1
View File
@@ -241,7 +241,8 @@ namespace MP_TAB3.Pages
var eventsAll = await TabDServ.AnagEventiGetByMacch(IdxMacc);
if (eventsAll != null)
{
events2show = eventsAll.Where(x => x.EventoTablet).OrderBy(x => x.label).ToList();
events2show = eventsAll.Where(x => x.EventoTablet).ToList();
//events2show = eventsAll.Where(x => x.EventoTablet).OrderBy(x => x.label).ToList();
}
}
catch (Exception exc)
MP-TAB3/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MAPOSPEC </i>
<h4>Versione: 6.16.2405.909</h4>
<h4>Versione: 6.16.2405.1717</h4>
<br /> Note di rilascio:
<ul>
<li>
MP-TAB3/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2405.909
6.16.2405.1717
MP-TAB3/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.16.2405.909</version>
<version>6.16.2405.1717</version>
<url>https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/MP-TAB3.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>
MP.Mon/Components/DetailMSE.razor
+5 -5
View File
@@ -7,7 +7,7 @@
{
<div class="@cssStatus(CurrRecord.Semaforo) p-1 @overlayCss">
<div class="d-flex ui-title justify-content-center align-items-center text-uppercase">
<div class="px-0 @textDescrCss">
<div class="px-0 @textDescrCss(@CurrRecord.Nome)">
<span>@CurrRecord.Nome</span>
</div>
</div>
@@ -70,9 +70,9 @@
}
else
{
<div class="d-flex justify-content-between pt-0 mt-1 pb-2 px-1 fontSmall">
<div class="px-1 text-uppercase"><b>@CurrRecord.DescrizioneStato</b></div>
<div class="px-1 ps-0">@getMinSec(getDecimal(@CurrRecord.Durata))</div>
<div class="d-flex justify-content-between pt-0 mt-1 pb-2 px-1 fontSmall text-uppercase">
<div class="px-1 text-truncate col-8">@CurrRecord.DescrizioneStato</div>
<div class="px-1 ps-0 text-nowrap">@getMinSec(getDecimal(@CurrRecord.Durata))</div>
</div>
}
@if (hasRow(4))
@@ -104,7 +104,7 @@
else
{
<div class="d-flex justify-content-between py-0 px-1 fontSmall1 text-uppercase">
<div class="px-1 pe-0">Pezzi<sub>(prod/ord)</sub></div>
<div class="px-1 pe-0">Pezzi<small class="small"><sub>p/o</sub></small></div>
<div class="px-1 ps-0">@CurrRecord.PezziProd / @CurrRecord.NumPezzi</div>
</div>
}
MP.Mon/Components/DetailMSE.razor.cs
+17 -17
View File
@@ -1,4 +1,5 @@
using Microsoft.AspNetCore.Components;
using Microsoft.Extensions.FileSystemGlobbing;
using MP.Data.Conf;
using MP.Data.DatabaseModels;
using NLog;
@@ -75,21 +76,6 @@ namespace MP.Mon.Components
pUpd.Wait();
}
///// <summary>
///// CSS class x testo (se descr lunga scorre...)
///// </summary>
//protected string textDescrCss
//{
// get
// {
// string answ = "text-nowrap";
// if (CurrRecord != null && CurrRecord.DescrizioneStato.Length > 7)
// {
// answ = " scroll-left";
// }
// return answ;
// }
//}
public void StartTimer()
{
int tOutPeriod = 1000;
@@ -108,8 +94,6 @@ namespace MP.Mon.Components
protected int kaFactor = 60 / 2;
protected string textDescrCss = "";
#endregion Protected Fields
#region Protected Properties
@@ -127,6 +111,20 @@ namespace MP.Mon.Components
}
}
/// <summary>
/// CSS class x testo (se descr lunga scorre...)
/// </summary>
protected string textDescrCss(string currText)
{
string answ = "text-nowrap";
if (currText.Length > maxChar4Scroll)
{
answ = " scroll-left";
}
return answ;
}
protected bool dataLoaded { get; set; } = false;
/// <summary>
@@ -192,11 +190,13 @@ namespace MP.Mon.Components
Random rnd = new Random();
await Task.Delay(rnd.Next(5));
cssOverlayOff = config.GetValue<string>("ServerConf:cssOverlayOff");
maxChar4Scroll = config.GetValue<int>("ServerConf:maxChar4Scroll");
setupConf();
dataLoaded = true;
}
private string cssOverlayOff = "bg-dark text-light opacity-100";
private int maxChar4Scroll = 20;
/// <summary>
/// Restituisce (se presenti) valori di override per la riga indicata
MP.Mon/Components/DetailMSE.razor.css
+42
View File
@@ -0,0 +1,42 @@
/* gestione scroll testo */
.scroll-left {
height: 1.5em;
overflow: hidden;
position: relative;
width: 100%;
white-space: nowrap;
}
.scroll-left span {
/*display: inline-block;*/
position: absolute;
width: 100%;
height: 100%;
margin: 0;
line-height: 1.5em;
/* Starting position */
-moz-transform: translateX(-50%);
-webkit-transform: translateX(-50%);
transform: translateX(-50%);
/* Apply animation to this element */
-moz-animation: scroll-left 20s ease infinite;
-webkit-animation: scroll-left 20s ease infinite;
animation: scroll-left 20s ease infinite;
}
/* Move it (define the animation) */
@keyframes scroll-left {
0% {
transform: translateX(-50%);
}
25% {
transform: translateX(-30%);
}
50% {
transform: translateX(-50%);
}
75% {
transform: translateX(-70%);
}
100% {
transform: translateX(-50%);
}
}
MP.Mon/Components/DetailMSE.razor.less
+19 -12
View File
@@ -4,9 +4,8 @@
height: 1.5em;
overflow: hidden;
position: relative;
width: 70%;
width: 100%;
white-space: nowrap;
/*display: inline-block;*/
}
.scroll-left span {
@@ -17,25 +16,33 @@
margin: 0;
line-height: 1.5em;
/* Starting position */
-moz-transform: translateX(0%);
-webkit-transform: translateX(0%);
transform: translateX(0%);
-moz-transform: translateX(-50%);
-webkit-transform: translateX(-50%);
transform: translateX(-50%);
/* Apply animation to this element */
-moz-animation: scroll-left 8s ease infinite;
-webkit-animation: scroll-left 8s ease infinite;
animation: scroll-left 8s ease infinite;
-moz-animation: scroll-left 20s ease infinite;
-webkit-animation: scroll-left 20s ease infinite;
animation: scroll-left 20s ease infinite;
}
/* Move it (define the animation) */
@keyframes scroll-left {
0% {
transform: translateX(0%);
transform: translateX(-50%);
}
30% {
transform: translateX(0%);
25% {
transform: translateX(-30%);
}
80% {
50% {
transform: translateX(-50%);
}
75% {
transform: translateX(-70%);
}
100% {
transform: translateX(-50%);
}
}
MP.Mon/Components/DetailMSE.razor.min.css
Vendored
+1
View File
@@ -0,0 +1 @@
.scroll-left{height:1.5em;overflow:hidden;position:relative;width:100%;white-space:nowrap;}.scroll-left span{position:absolute;width:100%;height:100%;margin:0;line-height:1.5em;-moz-transform:translateX(-50%);-webkit-transform:translateX(-50%);transform:translateX(-50%);-moz-animation:scroll-left 20s ease infinite;-webkit-animation:scroll-left 20s ease infinite;animation:scroll-left 20s ease infinite;}@keyframes scroll-left{0%{transform:translateX(-50%);}25%{transform:translateX(-30%);}50%{transform:translateX(-50%);}75%{transform:translateX(-70%);}100%{transform:translateX(-50%);}}
MP.Mon/MP.Mon.csproj
+1 -1
View File
@@ -4,7 +4,7 @@
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<Version>6.16.2403.417</Version>
<Version>6.16.2405.1719</Version>
</PropertyGroup>
<ItemGroup>
MP.Mon/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MON MAPO</i>
<h4>Versione: 6.16.2403.417</h4>
<h4>Versione: 6.16.2405.1719</h4>
<br /> Note di rilascio:
<ul>
<li>
MP.Mon/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2403.417
6.16.2405.1719
MP.Mon/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.16.2403.417</version>
<version>6.16.2405.1719</version>
<url>https://nexus.steamware.net/repository/SWS/MP-MON/stable/LAST/MP.Mon.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/MP-MON/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>
MP.Mon/appsettings.Production.json
+2 -1
View File
@@ -16,6 +16,7 @@
},
"ServerConf": {
"maxAge": "2000",
"cssOverlayOff": "bg-dark text-light bg-opacity-50"
"cssOverlayOff": "bg-dark text-light bg-opacity-50",
"maxChar4Scroll": 20
}
}
MP.Mon/appsettings.json
+2 -1
View File
@@ -14,6 +14,7 @@
},
"ServerConf": {
"maxAge": "2000",
"cssOverlayOff": "bg-dark text-light bg-opacity-50"
"cssOverlayOff": "bg-dark text-light bg-opacity-50",
"maxChar4Scroll": 20
}
}
MP.Mon/compilerconfig.json
+4
View File
@@ -6,5 +6,9 @@
{
"outputFile": "wwwroot/css/fonts.css",
"inputFile": "wwwroot/css/fonts.less"
},
{
"outputFile": "Components/DetailMSE.razor.css",
"inputFile": "Components/DetailMSE.razor.less"
}
]
MP.Prog/Startup.cs
-84
View File
@@ -100,68 +100,6 @@ namespace MP.Prog
// For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940
public void ConfigureServices(IServiceCollection services)
{
#if false
// init info x DB
string dbServerAddr = Configuration["DbConfig:Server"];
string nKey = Configuration["DbConfig:nKey"];
string sKey = Configuration["DbConfig:sKey"];
DbConfig.InitDb(dbServerAddr, nKey, sKey);
// inizializzo il DB e creo (se necessario) l'utente
DbConfig.CheckUser(nKey, sKey);
// verifico se serve applicazione migrazioni
//DbConfig.ExecMigrationMain();
//DbConfig.ExecMigrationIdentity();
// altri parametri per check vari
string connStringDB = DbConfig.CONNECTION_STRING;
string connStringRedis = Configuration.GetConnectionString("Redis");
string redisSrvAddr = connStringRedis.Substring(0, connStringRedis.IndexOf(":"));
//var qrCodeUri = new Uri(Configuration["ZCodeUrl"]);
//string qrCodeAddr = qrCodeUri.Host;
#endif
#if false
// healthchecks
services.AddHealthChecks()
.AddMySql(connStringDB, "MySql instance")
.AddAsyncCheck($"DB PING ({dbServerAddr})", () => Health.Checks.PingCheck(dbServerAddr))
.AddAsyncCheck($"Redis PING ({redisSrvAddr})", () => Health.Checks.PingCheck(redisSrvAddr))
//.AddAsyncCheck($"QrCode PING ({qrCodeAddr})", () => Health.Checks.PingCheck(qrCodeAddr))
.AddProcessAllocatedMemoryHealthCheck(512, "Max Process memory (<512MB)", failureStatus: HealthStatus.Degraded) // 512 MB max allocated memory
.AddRedis(Configuration.GetConnectionString("Redis"), "Redis", failureStatus: HealthStatus.Degraded)
//.AddUrlGroup(new Uri(Configuration["ZCodeUrl"]), name: $"QrCode Gen ({Configuration["ZCodeUrl"]})", failureStatus: HealthStatus.Degraded)
.AddAsyncCheck($"MySql Root User", () => Health.Checks.DbUserRoot("MySql"))
.AddAsyncCheck($"MySql App Users", () => Health.Checks.DbUserApp(DbConfig.DATABASE_NAME))
.AddAsyncCheck($"MySql Identity", () => Health.Checks.DbIdentity(DbConfig.DATABASE_NAME))
.AddAsyncCheck($"MySql PlantLog", () => Health.Checks.DbPlantLogTable(DbConfig.DATABASE_NAME))
;
//.AddDiskStorageHealthCheck(s => s.AddDrive("C:\\", 1024)) // 1024 MB (1 GB) free minimum
//.AddProcessHealthCheck("ProcessName", p => p.Length > 0) // check if process is running
//.AddWindowsServiceHealthCheck("someservice", s => s.Status == ServiceControllerStatus.Running);
services
.AddHealthChecksUI(s =>
{
s.AddHealthCheckEndpoint("GWMS_Services", "health");
s.SetEvaluationTimeInSeconds(60);
s.SetMinimumSecondsBetweenFailureNotifications(120);
s.SetApiMaxActiveRequests(5);
s.SetHeaderText("GWMS Health Check Status");
})
.AddInMemoryStorage();
// abilitazione x email management con MailKit
services.AddTransient<IEmailSender, MailKitEmailSender>();
services.Configure<MailKitEmailSenderOptions>(options =>
{
options.Host_Address = Configuration["ExternalProviders:MailKit:SMTP:Address"];
options.Host_Port = Convert.ToInt32(Configuration["ExternalProviders:MailKit:SMTP:Port"]);
options.Host_Username = Configuration["ExternalProviders:MailKit:SMTP:Account"];
options.Host_Password = Configuration["ExternalProviders:MailKit:SMTP:Password"];
options.Sender_EMail = Configuration["ExternalProviders:MailKit:SMTP:SenderEmail"];
options.Sender_Name = Configuration["ExternalProviders:MailKit:SMTP:SenderName"];
});
#endif
// cookie applicazione da 14 gg (defaul) a 30
services.ConfigureApplicationCookie(o =>
@@ -169,24 +107,6 @@ namespace MP.Prog
o.ExpireTimeSpan = TimeSpan.FromDays(30);
o.SlidingExpiration = true;
});
#if false
// token di sicurezza dati a 3h
services.Configure<DataProtectionTokenProviderOptions>(o =>
o.TokenLifespan = TimeSpan.FromHours(3));
#endif
#if false
// setup MySql
//string connString = Configuration.GetConnectionString("AdminConnection");
var serverVersion = DbConfig.MysqlServerVersion(connStringDB);
services.AddDbContext<UserIdentityDbContext>(options =>
options.UseMySql(connStringDB, serverVersion));
// identity management
services.AddDefaultIdentity<IdentityUser>(options => options.SignIn.RequireConfirmedAccount = true)
.AddRoles<IdentityRole>()
.AddEntityFrameworkStores<UserIdentityDbContext>();
#endif
//// Elmah
//services.AddElmah();
@@ -208,10 +128,6 @@ namespace MP.Prog
services.AddRazorPages();
services.AddServerSideBlazor();
#if false
services.AddScoped<AuthenticationStateProvider, RevalidatingIdentityAuthenticationStateProvider<IdentityUser>>();
services.AddDatabaseDeveloperPageExceptionFilter();
#endif
services.AddSingleton<IConfiguration>(Configuration);
//services.AddTransient<Services.BlazorTimer>();