Merge branch 'Release/MpMon_02'

This commit is contained in:
Samuele Locatelli
2025-03-17 14:21:40 +01:00
31 changed files with 198 additions and 125 deletions
+6 -6
View File
@@ -66,11 +66,11 @@ else
</div>
<div class="text-center text-light d-flex justify-content-between small lh-sm">
<div class="px-1">ODL:</div>
<div class="px-1">@($"{CRecMSE.IdxOdl:00000000}")</div>
<div class="px-1">@($"{CRecMSE.IdxOdl:000000}")</div>
</div>
<div class="text-center text-light d-flex justify-content-between small lh-sm">
<div class="px-1">PODL:</div>
<div class="px-1">@($"{CRecMSE.IdxPOdl:00000000}")</div>
<div class="px-1">@($"{CRecMSE.IdxPOdl:000000}")</div>
</div>
</div>
</div>
@@ -132,11 +132,11 @@ else
</div>
<div class="text-center text-light d-flex justify-content-between lh-sm">
<div class="px-1 small">ODL:</div>
<div class="px-1">@($"{CRecMSE.IdxOdl:00000000}")</div>
<div class="px-1">@($"{CRecMSE.IdxOdl:000000}")</div>
</div>
<div class="text-center text-light d-flex justify-content-between lh-sm">
<div class="px-1 small">PODL:</div>
<div class="px-1">@($"{CRecMSE.IdxPOdl:00000000}")</div>
<div class="px-1">@($"{CRecMSE.IdxPOdl:000000}")</div>
</div>
</div>
</div>
@@ -277,11 +277,11 @@ else
</div>
<div class="text-end text-light d-flex justify-content-between small lh-sm">
<div class="px-0">ODL</div>
<div class="px-0">@CRecMSE.IdxOdl</div>
<div class="px-0">@($"{CRecMSE.IdxOdl:000000}")</div>
</div>
<div class="text-end text-light d-flex justify-content-between small lh-sm">
<div class="px-0">PODL:</div>
<div class="px-0">@CRecMSE.IdxPOdl</div>
<div class="px-0">@($"{CRecMSE.IdxPOdl:000000}")</div>
</div>
</div>
</div>
+8 -8
View File
@@ -116,13 +116,6 @@
</div>
}
@* @if (!inAttr && !showOdlDetail)
{
<div class="col-12 my-1">
<button class="btn btn-lg btn-warning w-100" disabled="@inAttr" @onclick="ToggleOdlDetail"><i class="fa-solid fa-chevron-down"></i> @txtBtnOdlDetail</button>
</div>
} *@
@if (showOdlDetail || inAttr)
{
<CurrOdlDetail CurrOdl="@currOdl" CurrPodl="@currPodl" IdxPOdlSel="@IdxPOdlSel" ShowOdlDetail="@showOdlDetail" ForceCloseOdl="@forceCloseOdl" InAttr="@inAttr" EC_ToggleOdlDetail="ToggleOdlDetail"></CurrOdlDetail>
@@ -195,7 +188,14 @@
{
<div class="col-12 col-md-6 my-2">
<div class="form-check form-switch fs-3">
<input class="form-check-input" type="checkbox" @bind="@forceCloseOdl">
@if (enableSplitODL)
{
<input class="form-check-input" type="checkbox" @bind="@forceCloseOdl">
}
else
{
<input class="form-check-input" type="checkbox" @bind="@forceCloseOdl" disabled>
}
<label class="form-check-label">@txtForceCloseOdl</label>
</div>
</div>
@@ -1,25 +1,26 @@
<div class="cardObj card shadow bg-dark border border-3 border-secondary p-0 rounded rounded-4">
<div class="card-body px-1">
<div class="card-body p-0">
<div class="row">
<div class="col-12 placeholder-glow text-center mb-2">
<div class="col-12 placeholder-glow text-center my-0 lh-lg">
<span class="placeholder col-12 fs-1 bg-secondary"></span>
</div>
<div class="col-12 placeholder-glow text-center mb-2">
<span class="placeholder col-12 fs-3 bg-light pholderHeight"></span>
<div class="col-12 placeholder-glow text-center my-0">
<span class="placeholder col-12 fs-3 bg-light pholderHeight"></span>
</div>
<div class="col-12 placeholder-glow text-center">
<span class="placeholder col-12 fs-2 bg-success"></span>
</div>
<div class="col-12 placeholder-glow text-center my-1">
<div class="col-12 placeholder-glow text-center my-0">
<span class="placeholder placeholder-lg col-4 bg-success"></span>
<span class="placeholder placeholder-lg col-3 bg-danger"></span>
<span class="placeholder placeholder-lg col-4 bg-warning"></span>
</div>
<div class="col-4 placeholder-glow text-center">
<span class="placeholder col-12 bg-success fs-1 h-100 rounded-circle"></span>
<div class="col-5 placeholder-glow text-center mb-2">
<span class="placeholder col-12 bg-success fs-1 h-100 rounded-circle my-1 mx-2"></span>
</div>
<div class="col-8 placeholder-glow">
<div class="col-7 placeholder-glow mb-2">
<span class="placeholder small text-light col-9"></span>
<span class="placeholder small text-light col-2"></span>
<span class="placeholder small text-light col-9"></span>
<span class="placeholder small text-light col-2"></span>
<span class="placeholder small text-light col-9"></span>
@@ -1,4 +1,29 @@
.pholderHeight {
height: 3rem;
height: 5.5rem;
object-fit: cover;
}
@media (min-width: 430px) {
.pholderHeight {
height: 5.8rem;
}
}
@media (min-width: 600px) {
.pholderHeight {
height: 5.1rem;
}
}
@media (min-width: 768px) {
.pholderHeight {
height: 7.6rem;
}
}
@media (min-width: 800px) {
.pholderHeight {
height: 8.2rem;
}
}
@media (min-width: 1025px) {
.pholderHeight {
height: 7.2rem;
}
}
@@ -1,6 +1,35 @@
.pholderHeight {
height: 3rem;
height: 5.5rem;
object-fit: cover;
}
@media (min-width: 430px) {
.pholderHeight {
height: 5.8rem;
}
}
@media (min-width: 600px) {
.pholderHeight {
height: 5.1rem;
}
}
@media (min-width: 768px) {
.pholderHeight {
height: 7.6rem;
}
}
@media (min-width: 800px) {
.pholderHeight {
height: 8.2rem;
}
}
@media (min-width: 1025px) {
.pholderHeight {
height: 7.2rem;
}
}
+1 -1
View File
@@ -1 +1 @@
.pholderHeight{height:3rem;object-fit:cover;}
.pholderHeight{height:5.5rem;object-fit:cover;}@media(min-width:430px){.pholderHeight{height:5.8rem;}}@media(min-width:600px){.pholderHeight{height:5.1rem;}}@media(min-width:768px){.pholderHeight{height:7.6rem;}}@media(min-width:800px){.pholderHeight{height:8.2rem;}}@media(min-width:1025px){.pholderHeight{height:7.2rem;}}
+1 -1
View File
@@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<Version>6.16.2503.1418</Version>
<Version>6.16.2503.1714</Version>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MP_TAB3</RootNamespace>
</PropertyGroup>
+12 -30
View File
@@ -15,7 +15,6 @@
Nessun impianto abilitato per l'operatore.
</div>
<NavLink class="btn btn-primary btn-lg w-75" @onclick="()=>DoLogout()">
<i class="fa fa-lg fa-sign-out pe-2" aria-hidden="true"></i> LogOut
</NavLink>
@@ -43,9 +42,18 @@
mseIdx++;
if (currMse != null)
{
<div class="col ps-0 pe-1">
<MachineBlock RecMSE="currMse" FullMode="true" Width="@Width" Height="@Height" ShowCard="@ShowCard" doBlink="@doBlink"></MachineBlock>
</div>
<div class="col ps-0 pe-1">
<MachineBlock RecMSE="currMse" FullMode="true" Width="@Width" Height="@Height" ShowCard="@ShowCard" doBlink="@doBlink"></MachineBlock>
</div>
@* if (mseIdx % 2 == 0)
{
}
else
{
<div class="col ps-0 pe-1">
<PlaceholderStatusMap></PlaceholderStatusMap>
</div>
}*@
}
else
{
@@ -54,31 +62,5 @@
}
</div>
}
@* <div class="row mb-2">
@{
int maxBlocks = calcMaxBlock();
int currIdx = 0;
@foreach (var item in ListMSE)
{
currIdx++;
<div class="col ps-0 pe-1">
<MachineBlock RecMSE="@item" FullMode="true" Width="@Width" Height="@Height" ShowCard="@ShowCard" doBlink="@doBlink"></MachineBlock>
</div>
@if (currIdx >= maxBlocks)
{
currIdx = 0;
@((MarkupString)"</div>")
@((MarkupString)"<div class=\"row mb-2\">")
}
}
// controllo se devo "chiudere riga...
int currNum = (currIdx % maxBlocks);
while (currNum < (maxBlocks))
{
@((MarkupString)"<div class=\"col ps-0 pe-1 bloccoMacc\">&nbsp;</div>")
currNum++;
}
}
</div> *@
}
</div>
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MAPOSPEC </i>
<h4>Versione: 6.16.2503.1418</h4>
<h4>Versione: 6.16.2503.1714</h4>
<br /> Note di rilascio:
<ul>
<li>
+1 -1
View File
@@ -1 +1 @@
6.16.2503.1418
6.16.2503.1714
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.16.2503.1418</version>
<version>6.16.2503.1714</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>
+9 -6
View File
@@ -1,14 +1,17 @@
<div class="d-flex justify-content-between text-light">
<div class="d-flex justify-content-between text-light fs-4">
<div class="px-1">
<b>Mapo MON .net 8 @(DateTime.Today.Year)</b> | <span class="small">v.@version</span>
<b>Mapo MON @(DateTime.Today.Year)</b> | <span class="small">v.@version</span>
</div>
<div class="px-2">
@if (Width > 0)
{
<small class="small align-items-center"> | @Width x @Height | </small>
<small class="small align-items-center">@Width x @Height | </small>
}
<small class="ps-1 small align-items-center">@(OperatingSystem.IsBrowser() ? "WASM" : "Server")</small>
</div>
<div class="px-2">
<span class="small">@($"{DateTime.Now:HH:mm:ss}")</span> | <a class="text-light" href="https://www.egalware.com/" target="_blank"><img class="img-fluid" width="16" src="images/LogoEgw.png" /> Egalware </a>
@* <span class="">
@($"{DateTime.Now:HH:mm:ss}")
</span> *@
| <a class="text-light" href="https://www.egalware.com/" target="_blank"><img class="img-fluid" width="16" src="images/LogoEgw.png" /> Egalware </a>
</div>
</div>
+1 -2
View File
@@ -17,7 +17,6 @@ namespace MP.MON.Client.Components
public void Dispose()
{
//aTimer.Elapsed -= ElapsedTimer;
aTimer.Stop();
aTimer.Dispose();
}
@@ -88,7 +87,7 @@ namespace MP.MON.Client.Components
protected override void OnInitialized()
{
StartTimer();
Console.WriteLine($"OnInitialized completato");
Console.WriteLine($"OnInitialized Footer completato");
}
#endregion Protected Methods
+11 -42
View File
@@ -1,51 +1,20 @@
<div class="px-2">
<img class="logoImg img-fluid" src="images/LogoMapo.png" height="24" />
<img class="logoImg img-fluid" src="images/LogoMapo.png" height="20" />
<span class="px-5 mx-5">&nbsp;</span>
</div>
<div class="px-2">
<NavLink class="mainHead p-3 align-middle" href="force-reload" style="text-decoration:none;">
<span><b><span style="color: #DEDEDE;">MP MON</span>itor</b></span>
<span class="fs-2"><span style="color: #DEDEDE;">Mapo MON</span>itor</span>
</NavLink>
</div>
<div class="px-2">
<span id="text-white text-right">
@($"{DateTime.Now:dddd dd MMMM yyyy}")
@($"{DateTime.Now:yyyy.MM.dd}")
</span>
<img class="logoImg img-fluid" src="images/logoCliente.png" height="24" />
EgalWare
<span class="text-white fw-bold fs-2">
@($"{DateTime.Now:HH:mm:ss}")
</span>
@* <img class="logoImg img-fluid" src="images/logoCliente.png" height="24" />
<span class=" text-white">EgalWare</span> *@
</div>
@code {
//protected override async Task OnInitializedAsync()
//{
// StartTimer();
//}
//public void Dispose()
//{
// aTimer.Stop();
// aTimer.Dispose();
//}
//private static System.Timers.Timer aTimer;
//public void StartTimer()
//{
// int tOutPeriod = 60000;
// //int.TryParse(Configuration["ReloadStatusTimer"], out tOutPeriod);
// aTimer = new System.Timers.Timer(tOutPeriod);
// aTimer.Elapsed += ElapsedTimer;
// aTimer.Enabled = true;
// aTimer.Start();
//}
//public void ElapsedTimer(Object source, System.Timers.ElapsedEventArgs e)
//{
// var pUpd = Task.Run(async () =>
// {
// //await ReloadData();
// await Task.Delay(1);
// await InvokeAsync(StateHasChanged);
// });
// pUpd.Wait();
//}
}
@@ -0,0 +1,44 @@
using Microsoft.AspNetCore.Components;
namespace MP.MON.Client.Components
{
public partial class CmpHeader: ComponentBase, IDisposable
{
protected override void OnInitialized()
{
StartTimer();
Console.WriteLine($"OnInitialized Header completato");
}
public void Dispose()
{
aTimer.Stop();
aTimer.Dispose();
}
private static System.Timers.Timer aTimer;
public void StartTimer()
{
int tOutPeriod = 1000;
aTimer = new System.Timers.Timer(tOutPeriod);
aTimer.Elapsed += ElapsedTimer;
aTimer.Enabled = true;
aTimer.Start();
}
public void ElapsedTimer(Object source, System.Timers.ElapsedEventArgs e)
{
var pUpd = Task.Run(async () =>
{
await Task.Delay(1);
//Console.WriteLine($"{DateTime.Now} | Elapsed Timer Footer");
await InvokeAsync(() => StateHasChanged());
});
pUpd.Wait();
}
}
}
+2 -2
View File
@@ -61,7 +61,7 @@ else
PODL:
</div>
<div class="px-1">
@(CurrRecord.IdxPOdl > 0 ? $"{CurrRecord.IdxPOdl:00000000}" : "-")
@(CurrRecord.IdxPOdl > 0 ? $"{CurrRecord.IdxPOdl:000000}" : "-")
</div>
</div>
<div class="card-text d-flex justify-content-between small lh-sm">
@@ -69,7 +69,7 @@ else
ODL:
</div>
<div class="px-1">
@(CurrRecord.IdxOdl > 0 ? $"{CurrRecord.IdxOdl:00000000}" : "-")
@(CurrRecord.IdxOdl > 0 ? $"{CurrRecord.IdxOdl:000000}" : "-")
</div>
</div>
}
+4
View File
@@ -1,5 +1,9 @@
using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
using System.Globalization;
var builder = WebAssemblyHostBuilder.CreateDefault(args);
//CultureInfo.DefaultThreadCurrentCulture = new CultureInfo("it-IT");
//CultureInfo.DefaultThreadCurrentUICulture = new CultureInfo("it-IT");
await builder.Build().RunAsync();
+15 -1
View File
@@ -5,7 +5,7 @@
<div class="page">
<main>
<div class="top-row px-4 justify-content-between">
<CmpHeader></CmpHeader>
<CmpHeader @rendermode="InteractiveWebAssembly"></CmpHeader>
</div>
<article class="content px-4">
@@ -24,8 +24,22 @@
</div>
@code{
[Inject]
protected NavigationManager NavMan { get; set; } = null!;
[Inject]
protected IConfiguration config { get; set; } = null!;
protected override void OnInitialized()
{
// controllo URL x riscrivere se non fosse /MP/MON finale...
string baseUrl = config.GetValue<string>("ServerConf:BaseAppPath") ?? "/MP/MON/";
string wrongEnd = baseUrl.Substring(0, baseUrl.Length - 1);
string currUrl = NavMan.Uri;
if(currUrl.EndsWith(wrongEnd))
{
NavMan.NavigateTo(baseUrl, true);
}
// base.OnInitialized();
var currAssembly = typeof(Program).Assembly.GetName();
version = currAssembly.Version != null ? currAssembly.Version : new Version();
@@ -31,7 +31,7 @@ main {
.bottom-row {
color: #dedede;
background-color: #000000;
height: 1.5rem;
height: 2rem;
align-items: center;
}
@media (max-width: 640.98px) {
@@ -37,7 +37,7 @@ main {
.bottom-row {
color: #dedede;
background-color: #000000;
height: 1.5rem;
height: 2.0rem;
align-items: center;
}
+1 -1
View File
@@ -1 +1 @@
.page{position:relative;display:flex;flex-direction:column;}main{flex:1;}.top-row{background-color:#000;color:#696969;font-size:1.4em;height:2.6rem;display:flex;align-items:center;justify-content:space-evenly;}.mainHead{font-size:1.6rem;}.top-row ::deep a,.top-row .btn-link{white-space:nowrap;margin-left:1.5rem;}.top-row a:first-child{overflow:hidden;text-overflow:ellipsis;}.bottom-row{color:#dedede;background-color:#000;height:1.5rem;align-items:center;}@media(max-width:640.98px){.top-row:not(.auth){display:none;}.top-row.auth{justify-content:space-between;}.top-row a,.top-row .btn-link{margin-left:0;}}@media(min-width:641px){.page{flex-direction:row;}.sidebar{width:15rem;height:100vh;position:sticky;top:0;}.sidebarSmall{width:80px;height:100vh;position:sticky;top:0;}.top-row{position:sticky;top:0;z-index:1;}.top-row,article{padding-left:.5rem!important;padding-right:.5rem!important;}.bottom-row{position:fixed;bottom:0;z-index:1;}.main>div{padding-left:.5rem!important;padding-right:.5rem!important;}}
.page{position:relative;display:flex;flex-direction:column;}main{flex:1;}.top-row{background-color:#000;color:#696969;font-size:1.4em;height:2.6rem;display:flex;align-items:center;justify-content:space-evenly;}.mainHead{font-size:1.6rem;}.top-row ::deep a,.top-row .btn-link{white-space:nowrap;margin-left:1.5rem;}.top-row a:first-child{overflow:hidden;text-overflow:ellipsis;}.bottom-row{color:#dedede;background-color:#000;height:2rem;align-items:center;}@media(max-width:640.98px){.top-row:not(.auth){display:none;}.top-row.auth{justify-content:space-between;}.top-row a,.top-row .btn-link{margin-left:0;}}@media(min-width:641px){.page{flex-direction:row;}.sidebar{width:15rem;height:100vh;position:sticky;top:0;}.sidebarSmall{width:80px;height:100vh;position:sticky;top:0;}.top-row{position:sticky;top:0;z-index:1;}.top-row,article{padding-left:.5rem!important;padding-right:.5rem!important;}.bottom-row{position:fixed;bottom:0;z-index:1;}.main>div{padding-left:.5rem!important;padding-right:.5rem!important;}}
+1 -1
View File
@@ -6,7 +6,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MP.MON</RootNamespace>
<AssemblyName>$(AssemblyName.Replace(' ', '_'))</AssemblyName>
<Version>6.16.2503.1512</Version>
<Version>6.16.2503.1711</Version>
</PropertyGroup>
<ItemGroup>
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MAPOSPEC </i>
<h4>Versione: 6.16.2503.1512</h4>
<h4>Versione: 6.16.2503.1711</h4>
<br /> Note di rilascio:
<ul>
<li>
+1 -1
View File
@@ -1 +1 @@
6.16.2503.1512
6.16.2503.1711
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.16.2503.1512</version>
<version>6.16.2503.1711</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>
+3 -1
View File
@@ -127,7 +127,9 @@ namespace MP.SPEC.Components
{
// imposto task x setComm, setArt, SetPzComm
await MpIoApiCall.addTask2Exe(currRecord.IdxMacchina, "setArt", currRecord.CodArticolo);
await MpIoApiCall.addTask2Exe(currRecord.IdxMacchina, "setComm", $"ODL{currRecord.IdxOdl:00000000}");
string odlPad = currRecord.IdxOdl.ToString(padCodXdl);
await MpIoApiCall.addTask2Exe(currRecord.IdxMacchina, "setComm", $"ODL{odlPad}");
//await MpIoApiCall.addTask2Exe(currRecord.IdxMacchina, "setComm", $"ODL{currRecord.IdxOdl:00000000}");
await MpIoApiCall.addTask2Exe(currRecord.IdxMacchina, "setPzComm", $"{currRecord.NumPezzi}");
// richiesto anche sync DB
+2 -1
View File
@@ -265,7 +265,8 @@ namespace MP.SPEC.Components
// imposto task x setComm, setArt, SetPzComm
await callTask2Exe(selRec.IdxMacchina, "setArt", newOdl.CodArticolo);
await callTask2Exe(selRec.IdxMacchina, "setComm", $"ODL{newOdl.IdxOdl:00000000}");
string odlPad = newOdl.IdxOdl.ToString(padCodXdl);
await callTask2Exe(selRec.IdxMacchina, "setComm", $"ODL{odlPad}");
await callTask2Exe(selRec.IdxMacchina, "setPzComm", $"{newOdl.NumPezzi}");
// chiamo task x IOB
await callForceUpdate(selRec.IdxMacchina);
+1 -1
View File
@@ -5,7 +5,7 @@
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MP.SPEC</RootNamespace>
<Version>6.16.2503.1417</Version>
<Version>6.16.2503.1710</Version>
<UserSecretsId>1800a78a-6ff1-40f9-b490-87fb8bfc1394</UserSecretsId>
<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
</PropertyGroup>
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MAPOSPEC </i>
<h4>Versione: 6.16.2503.1417</h4>
<h4>Versione: 6.16.2503.1710</h4>
<br /> Note di rilascio:
<ul>
<li>
+1 -1
View File
@@ -1 +1 @@
6.16.2503.1417
6.16.2503.1710
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.16.2503.1417</version>
<version>6.16.2503.1710</version>
<url>https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/MP.SPEC.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>