diff --git a/MP-TAB3/Components/MachineBlock.razor b/MP-TAB3/Components/MachineBlock.razor index 5a3f2e8a..90e8c256 100644 --- a/MP-TAB3/Components/MachineBlock.razor +++ b/MP-TAB3/Components/MachineBlock.razor @@ -66,11 +66,11 @@ else
ODL:
-
@($"{CRecMSE.IdxOdl:00000000}")
+
@($"{CRecMSE.IdxOdl:000000}")
PODL:
-
@($"{CRecMSE.IdxPOdl:00000000}")
+
@($"{CRecMSE.IdxPOdl:000000}")
@@ -132,11 +132,11 @@ else
ODL:
-
@($"{CRecMSE.IdxOdl:00000000}")
+
@($"{CRecMSE.IdxOdl:000000}")
PODL:
-
@($"{CRecMSE.IdxPOdl:00000000}")
+
@($"{CRecMSE.IdxPOdl:000000}")
@@ -277,11 +277,11 @@ else
ODL
-
@CRecMSE.IdxOdl
+
@($"{CRecMSE.IdxOdl:000000}")
PODL:
-
@CRecMSE.IdxPOdl
+
@($"{CRecMSE.IdxPOdl:000000}")
diff --git a/MP-TAB3/Components/OdlMan.razor b/MP-TAB3/Components/OdlMan.razor index ca121849..b53b064c 100644 --- a/MP-TAB3/Components/OdlMan.razor +++ b/MP-TAB3/Components/OdlMan.razor @@ -116,13 +116,6 @@ } - @* @if (!inAttr && !showOdlDetail) - { -
- -
- } *@ - @if (showOdlDetail || inAttr) { @@ -195,7 +188,14 @@ {
- + @if (enableSplitODL) + { + + } + else + { + + }
diff --git a/MP-TAB3/Components/PlaceholderStatusMap.razor b/MP-TAB3/Components/PlaceholderStatusMap.razor index 8d12accf..f5075e16 100644 --- a/MP-TAB3/Components/PlaceholderStatusMap.razor +++ b/MP-TAB3/Components/PlaceholderStatusMap.razor @@ -1,25 +1,26 @@ 
-
+
-
+
-
- +
-
+
-
- +
+
-
+
+ + diff --git a/MP-TAB3/Components/PlaceholderStatusMap.razor.css b/MP-TAB3/Components/PlaceholderStatusMap.razor.css index 218fdd85..c5ab75ff 100644 --- a/MP-TAB3/Components/PlaceholderStatusMap.razor.css +++ b/MP-TAB3/Components/PlaceholderStatusMap.razor.css @@ -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; + } } \ No newline at end of file diff --git a/MP-TAB3/Components/PlaceholderStatusMap.razor.less b/MP-TAB3/Components/PlaceholderStatusMap.razor.less index 90d74c36..008fe881 100644 --- a/MP-TAB3/Components/PlaceholderStatusMap.razor.less +++ b/MP-TAB3/Components/PlaceholderStatusMap.razor.less @@ -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; + } +} \ No newline at end of file diff --git a/MP-TAB3/Components/PlaceholderStatusMap.razor.min.css b/MP-TAB3/Components/PlaceholderStatusMap.razor.min.css index 66d7e09e..3fde6d89 100644 --- a/MP-TAB3/Components/PlaceholderStatusMap.razor.min.css +++ b/MP-TAB3/Components/PlaceholderStatusMap.razor.min.css @@ -1 +1 @@ -.pholderHeight{height:3rem;object-fit:cover;} \ No newline at end of file +.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;}} \ No newline at end of file diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj index 098f61e5..3e6b5c7f 100644 --- a/MP-TAB3/MP-TAB3.csproj +++ b/MP-TAB3/MP-TAB3.csproj @@ -3,7 +3,7 @@ net6.0 enable - 6.16.2503.1418 + 6.16.2503.1714 enable MP_TAB3 diff --git a/MP-TAB3/Pages/StatusMap.razor b/MP-TAB3/Pages/StatusMap.razor index b2c85453..3b2d5268 100644 --- a/MP-TAB3/Pages/StatusMap.razor +++ b/MP-TAB3/Pages/StatusMap.razor @@ -15,7 +15,6 @@ Nessun impianto abilitato per l'operatore.
- LogOut @@ -43,9 +42,18 @@ mseIdx++; if (currMse != null) { -
- -
+
+ +
+ @* if (mseIdx % 2 == 0) + { + } + else + { +
+ +
+ }*@ } else { @@ -54,31 +62,5 @@ }
} - @*
- @{ - int maxBlocks = calcMaxBlock(); - int currIdx = 0; - @foreach (var item in ListMSE) - { - currIdx++; -
- -
- @if (currIdx >= maxBlocks) - { - currIdx = 0; - @((MarkupString)"
") - @((MarkupString)"
") - } - } - // controllo se devo "chiudere riga... - int currNum = (currIdx % maxBlocks); - while (currNum < (maxBlocks)) - { - @((MarkupString)"
 
") - currNum++; - } - } -
*@ }
diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html index 1664133a..452e9a71 100644 --- a/MP-TAB3/Resources/ChangeLog.html +++ b/MP-TAB3/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2503.1418

+

Versione: 6.16.2503.1714


Note di rilascio:
  • diff --git a/MP-TAB3/Resources/VersNum.txt b/MP-TAB3/Resources/VersNum.txt index 7d5437b1..33d6972f 100644 --- a/MP-TAB3/Resources/VersNum.txt +++ b/MP-TAB3/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2503.1418 +6.16.2503.1714 diff --git a/MP-TAB3/Resources/manifest.xml b/MP-TAB3/Resources/manifest.xml index b59b180d..772366d9 100644 --- a/MP-TAB3/Resources/manifest.xml +++ b/MP-TAB3/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2503.1418 + 6.16.2503.1714 https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/MP-TAB3.zip https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/ChangeLog.html false diff --git a/MP.MON.Client/Components/CmpFooter.razor b/MP.MON.Client/Components/CmpFooter.razor index 3db6d023..a785d642 100644 --- a/MP.MON.Client/Components/CmpFooter.razor +++ b/MP.MON.Client/Components/CmpFooter.razor @@ -1,14 +1,17 @@ -
    +
    - Mapo MON .net 8 @(DateTime.Today.Year) | v.@version + Mapo MON @(DateTime.Today.Year) | v.@version +
    +
    @if (Width > 0) { - | @Width x @Height | + @Width x @Height | } @(OperatingSystem.IsBrowser() ? "WASM" : "Server") -
    -
    - @($"{DateTime.Now:HH:mm:ss}") | Egalware + @* + @($"{DateTime.Now:HH:mm:ss}") + *@ + | Egalware
    \ No newline at end of file diff --git a/MP.MON.Client/Components/CmpFooter.razor.cs b/MP.MON.Client/Components/CmpFooter.razor.cs index 265ecce3..55ef358e 100644 --- a/MP.MON.Client/Components/CmpFooter.razor.cs +++ b/MP.MON.Client/Components/CmpFooter.razor.cs @@ -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 diff --git a/MP.MON.Client/Components/CmpHeader.razor b/MP.MON.Client/Components/CmpHeader.razor index b2009d3d..28357073 100644 --- a/MP.MON.Client/Components/CmpHeader.razor +++ b/MP.MON.Client/Components/CmpHeader.razor @@ -1,51 +1,20 @@ 
    - + +   +
    +
    - MP MONitor + Mapo MONitor
    - @($"{DateTime.Now:dddd dd MMMM yyyy}") + @($"{DateTime.Now:yyyy.MM.dd}") - - EgalWare + + @($"{DateTime.Now:HH:mm:ss}") + + @* + EgalWare *@
    -@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(); - //} - -} \ No newline at end of file diff --git a/MP.MON.Client/Components/CmpHeader.razor.cs b/MP.MON.Client/Components/CmpHeader.razor.cs new file mode 100644 index 00000000..f37f4852 --- /dev/null +++ b/MP.MON.Client/Components/CmpHeader.razor.cs @@ -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(); + } + + } +} \ No newline at end of file diff --git a/MP.MON.Client/Components/DetailViewMSE.razor b/MP.MON.Client/Components/DetailViewMSE.razor index fa2bdd6f..10418d18 100644 --- a/MP.MON.Client/Components/DetailViewMSE.razor +++ b/MP.MON.Client/Components/DetailViewMSE.razor @@ -61,7 +61,7 @@ else PODL:
    - @(CurrRecord.IdxPOdl > 0 ? $"{CurrRecord.IdxPOdl:00000000}" : "-") + @(CurrRecord.IdxPOdl > 0 ? $"{CurrRecord.IdxPOdl:000000}" : "-")
@@ -69,7 +69,7 @@ else ODL:
- @(CurrRecord.IdxOdl > 0 ? $"{CurrRecord.IdxOdl:00000000}" : "-") + @(CurrRecord.IdxOdl > 0 ? $"{CurrRecord.IdxOdl:000000}" : "-")
} diff --git a/MP.MON.Client/Program.cs b/MP.MON.Client/Program.cs index 519269f2..12a4cd86 100644 --- a/MP.MON.Client/Program.cs +++ b/MP.MON.Client/Program.cs @@ -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(); diff --git a/MP.MON/Components/Layout/MainLayout.razor b/MP.MON/Components/Layout/MainLayout.razor index fd43cc55..db14a94e 100644 --- a/MP.MON/Components/Layout/MainLayout.razor +++ b/MP.MON/Components/Layout/MainLayout.razor @@ -5,7 +5,7 @@
- +
@@ -24,8 +24,22 @@
@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("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(); diff --git a/MP.MON/Components/Layout/MainLayout.razor.css b/MP.MON/Components/Layout/MainLayout.razor.css index a1f0bb7b..889f36e7 100644 --- a/MP.MON/Components/Layout/MainLayout.razor.css +++ b/MP.MON/Components/Layout/MainLayout.razor.css @@ -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) { diff --git a/MP.MON/Components/Layout/MainLayout.razor.less b/MP.MON/Components/Layout/MainLayout.razor.less index 0899d892..a574f504 100644 --- a/MP.MON/Components/Layout/MainLayout.razor.less +++ b/MP.MON/Components/Layout/MainLayout.razor.less @@ -37,7 +37,7 @@ main { .bottom-row { color: #dedede; background-color: #000000; - height: 1.5rem; + height: 2.0rem; align-items: center; } diff --git a/MP.MON/Components/Layout/MainLayout.razor.min.css b/MP.MON/Components/Layout/MainLayout.razor.min.css index 19dc5f91..5fbd3602 100644 --- a/MP.MON/Components/Layout/MainLayout.razor.min.css +++ b/MP.MON/Components/Layout/MainLayout.razor.min.css @@ -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;}} \ No newline at end of file +.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;}} \ No newline at end of file diff --git a/MP.MON/MP.MON.csproj b/MP.MON/MP.MON.csproj index 73ea4586..ec31fc89 100644 --- a/MP.MON/MP.MON.csproj +++ b/MP.MON/MP.MON.csproj @@ -6,7 +6,7 @@ enable MP.MON $(AssemblyName.Replace(' ', '_')) - 6.16.2503.1512 + 6.16.2503.1711 diff --git a/MP.MON/Resources/ChangeLog.html b/MP.MON/Resources/ChangeLog.html index c56078d1..97f7a450 100644 --- a/MP.MON/Resources/ChangeLog.html +++ b/MP.MON/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2503.1512

+

Versione: 6.16.2503.1711


Note di rilascio:
  • diff --git a/MP.MON/Resources/VersNum.txt b/MP.MON/Resources/VersNum.txt index bc67faa8..43b9dbb7 100644 --- a/MP.MON/Resources/VersNum.txt +++ b/MP.MON/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2503.1512 +6.16.2503.1711 diff --git a/MP.MON/Resources/manifest.xml b/MP.MON/Resources/manifest.xml index cc21e43b..cd1e68a5 100644 --- a/MP.MON/Resources/manifest.xml +++ b/MP.MON/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2503.1512 + 6.16.2503.1711 https://nexus.steamware.net/repository/SWS/MP-MON/stable/LAST/MP-MON.zip https://nexus.steamware.net/repository/SWS/MP-MON/stable/LAST/ChangeLog.html false diff --git a/MP.SPEC/Components/ListODL.razor.cs b/MP.SPEC/Components/ListODL.razor.cs index 810dbcf1..02183f35 100644 --- a/MP.SPEC/Components/ListODL.razor.cs +++ b/MP.SPEC/Components/ListODL.razor.cs @@ -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 diff --git a/MP.SPEC/Components/ListPODL.razor.cs b/MP.SPEC/Components/ListPODL.razor.cs index 2d4a0f87..f727cb25 100644 --- a/MP.SPEC/Components/ListPODL.razor.cs +++ b/MP.SPEC/Components/ListPODL.razor.cs @@ -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); diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj index 48c743db..113dae1e 100644 --- a/MP.SPEC/MP.SPEC.csproj +++ b/MP.SPEC/MP.SPEC.csproj @@ -5,7 +5,7 @@ enable enable MP.SPEC - 6.16.2503.1417 + 6.16.2503.1710 1800a78a-6ff1-40f9-b490-87fb8bfc1394 en diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html index 70fa3c0c..29716892 100644 --- a/MP.SPEC/Resources/ChangeLog.html +++ b/MP.SPEC/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

    Versione: 6.16.2503.1417

    +

    Versione: 6.16.2503.1710


    Note di rilascio:
    • diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt index 1b215c09..19b18699 100644 --- a/MP.SPEC/Resources/VersNum.txt +++ b/MP.SPEC/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2503.1417 +6.16.2503.1710 diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml index 7f49ce6f..e18fbcd5 100644 --- a/MP.SPEC/Resources/manifest.xml +++ b/MP.SPEC/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2503.1417 + 6.16.2503.1710 https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/MP.SPEC.zip https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/ChangeLog.html false