diff --git a/MP-TAB-SERV/Components/MachineBlock.razor b/MP-TAB-SERV/Components/MachineBlock.razor index c1553df4..7f16b48f 100644 --- a/MP-TAB-SERV/Components/MachineBlock.razor +++ b/MP-TAB-SERV/Components/MachineBlock.razor @@ -151,7 +151,7 @@ else *@ -
+
@@ -162,7 +162,8 @@ else
- + @**@ +
diff --git a/MP-TAB-SERV/Components/MachineBlock.razor.cs b/MP-TAB-SERV/Components/MachineBlock.razor.cs index 4bbdebd1..fa525b34 100644 --- a/MP-TAB-SERV/Components/MachineBlock.razor.cs +++ b/MP-TAB-SERV/Components/MachineBlock.razor.cs @@ -1,3 +1,4 @@ +using EgwCoreLib.Razor; using global::Microsoft.AspNetCore.Components; using MP.Data.DatabaseModels; using MP.Data.Services; @@ -19,6 +20,32 @@ namespace MP_TAB_SERV.Components #endregion Public Properties + + protected List innerCircleVals = new List(); + protected List outerCircleVals = new List(); + + protected int currVal1 = 1000; + protected int currMaxVal = 1000; + protected int maxVal = 1000; + + protected async Task setGaugeVals() + { + if (RecMSE != null) + { + innerCircleVals.Clear(); + outerCircleVals.Clear(); + currMaxVal = int.Parse(RecMSE.NumPezzi.ToString()!); + innerCircleVals.Add(new CircleGaugeMulti.CircSegm() { Color = "#DCFD15", Value = int.Parse(RecMSE.PezziProd.ToString()!) }); + innerCircleVals.Add(new CircleGaugeMulti.CircSegm() { Color = "#13FD67", Value = int.Parse(RecMSE.PezziConf.ToString()!) }); + var extraVal = (int.Parse(RecMSE.NumPezzi.ToString()!) - int.Parse(RecMSE.PezziProd.ToString()!)); + if (extraVal < 0) + { + outerCircleVals.Add(new CircleGaugeMulti.CircSegm() { Color = "#1367FD", Value = Math.Abs(extraVal) }); + } + } + } + + #region Public Methods /// @@ -127,11 +154,12 @@ namespace MP_TAB_SERV.Components //return base.OnAfterRenderAsync(firstRender); } - protected override void OnInitialized() + protected override async void OnInitialized() { isLoading = true; // se configurata uso cartella virtuale... altrimenti cartella processo imgBasePath = Environment.CurrentDirectory; // @"C:\Steamware\macchine"; + await setGaugeVals(); } protected override async Task OnParametersSetAsync() diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj index 5be19ba5..97f07e32 100644 --- a/MP-TAB-SERV/MP-TAB-SERV.csproj +++ b/MP-TAB-SERV/MP-TAB-SERV.csproj @@ -3,7 +3,7 @@ net6.0 enable - 6.16.2310.1217 + 6.16.2310.1312 enable MP_TAB_SERV @@ -17,8 +17,8 @@ - - + + diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html index 23334844..cb2d548b 100644 --- a/MP-TAB-SERV/Resources/ChangeLog.html +++ b/MP-TAB-SERV/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2310.1217

+

Versione: 6.16.2310.1312


Note di rilascio:
  • diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt index fa998c39..5a152b74 100644 --- a/MP-TAB-SERV/Resources/VersNum.txt +++ b/MP-TAB-SERV/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2310.1217 +6.16.2310.1312 diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml index 052c0a7b..4900269e 100644 --- a/MP-TAB-SERV/Resources/manifest.xml +++ b/MP-TAB-SERV/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2310.1217 + 6.16.2310.1312 https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html false