diff --git a/MP.Data/DatabaseModels/OdlEnergyModel.cs b/MP.Data/DatabaseModels/OdlEnergyModel.cs index e67251ed..8fb0c93f 100644 --- a/MP.Data/DatabaseModels/OdlEnergyModel.cs +++ b/MP.Data/DatabaseModels/OdlEnergyModel.cs @@ -46,5 +46,20 @@ namespace MP.Data.DatabaseModels return answ; } } + [NotMapped] + public decimal AvgTotEn01 + { + get + { + var num = TotEn01; + var den = TotCount01; + if (den == 0) + { + den = 1; + } + decimal answ = num / den; + return answ; + } + } } } \ No newline at end of file diff --git a/MP.Stats/Components/ChartEnergy.razor.cs b/MP.Stats/Components/ChartEnergy.razor.cs index 9d843c6f..656f2312 100644 --- a/MP.Stats/Components/ChartEnergy.razor.cs +++ b/MP.Stats/Components/ChartEnergy.razor.cs @@ -11,6 +11,9 @@ namespace MP.Stats.Components { #region Public Properties + [Parameter] + public bool DynMode { get; set; } = false; + [Parameter] public List RawData { @@ -22,7 +25,7 @@ namespace MP.Stats.Components if (value != null) { // ricalcolo charting data - recalcData(); + RecalcData(); } } } @@ -158,7 +161,7 @@ namespace MP.Stats.Components return answ; } - private void recalcData() + private void RecalcData() { if (RawData != null) { @@ -168,11 +171,22 @@ namespace MP.Stats.Components .OrderByDescending(x => x.value) .ToList(); - TSData = RawData - .GroupBy(x => x.DataInizio.Date) - .Select(r => new chartJsData.chartJsTSerie() { x = r.First().DataInizio.Date, y = r.Average(l => (double)l.AvgWatt) }) - .OrderBy(o => o.x) - .ToList(); + if (DynMode) + { + TSData = RawData + .GroupBy(x => x.DataInizio.Date) + .Select(r => new chartJsData.chartJsTSerie() { x = r.First().DataInizio.Date, y = r.Average(l => (double)l.AvgTotEn01) }) + .OrderBy(o => o.x) + .ToList(); + } + else + { + TSData = RawData + .GroupBy(x => x.DataInizio.Date) + .Select(r => new chartJsData.chartJsTSerie() { x = r.First().DataInizio.Date, y = r.Average(l => (double)l.AvgWatt) }) + .OrderBy(o => o.x) + .ToList(); + } } } diff --git a/MP.Stats/Components/CmpFooter.razor b/MP.Stats/Components/CmpFooter.razor index 3009e8b2..78086298 100644 --- a/MP.Stats/Components/CmpFooter.razor +++ b/MP.Stats/Components/CmpFooter.razor @@ -1,6 +1,6 @@ 
-
- MagMan v.@version +
+ MAPO Stats module | v.@version
@adesso diff --git a/MP.Stats/Components/CmpTop.razor b/MP.Stats/Components/CmpTop.razor index ab4bb84b..ca64aa6c 100644 --- a/MP.Stats/Components/CmpTop.razor +++ b/MP.Stats/Components/CmpTop.razor @@ -13,7 +13,7 @@
@PageName
-
+
@if (ShowSearch) { diff --git a/MP.Stats/Components/SelectionFilter.razor b/MP.Stats/Components/SelectionFilter.razor index 77962901..853c8941 100644 --- a/MP.Stats/Components/SelectionFilter.razor +++ b/MP.Stats/Components/SelectionFilter.razor @@ -32,14 +32,14 @@
-
- - + +
+
@if (ActionsEnabled) @@ -47,12 +47,14 @@
- - @foreach (var item in ddlAzioni) - { - - } - +
+ +
} @@ -64,12 +66,23 @@
- - @foreach (var item in ddlCommesse) - { - - } - + @if (!string.IsNullOrEmpty(SearchCom) && SearchCom.Length >= minChar) + { +
+ +
+ @* + @foreach (var item in ddlCommesse) + { + + } + *@ + }
@@ -80,12 +93,17 @@
- - @foreach (var item in ddlArticoli) - { - - } - + @if (!string.IsNullOrEmpty(SearchArt) && SearchArt.Length >= minChar) + { +
+ +
+ } diff --git a/MP.Stats/Data/MpStatsService.cs b/MP.Stats/Data/MpStatsService.cs index b945a01e..bf671070 100644 --- a/MP.Stats/Data/MpStatsService.cs +++ b/MP.Stats/Data/MpStatsService.cs @@ -2,6 +2,7 @@ using Microsoft.Extensions.Caching.Memory; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; +using MimeKit.Cryptography; using MP.Data.Controllers; using MP.Data.DatabaseModels; using MP.Data.Services; @@ -603,6 +604,11 @@ namespace MP.Stats.Data else { result = dbController.StatUserLogGetAll(CurrFilter.DateStart, CurrFilter.DateEnd, CurrFilter.IdxMacchina, CurrFilter.IdxOdl, CurrFilter.KeyRichiesta, CurrFilter.CodArticolo); + // filtro x tipo azione "a mano" prima di salvare... + if (CurrFilter.Azione != "*") + { + result = result.Where(x => x.Azione == CurrFilter.Azione).ToList(); + } // serializzp e salvo... rawData = JsonConvert.SerializeObject(result); await redisDb.StringSetAsync(currKey, rawData, FastCache); diff --git a/MP.Stats/MP.Stats.csproj b/MP.Stats/MP.Stats.csproj index f9311de8..a3a918fe 100644 --- a/MP.Stats/MP.Stats.csproj +++ b/MP.Stats/MP.Stats.csproj @@ -4,8 +4,8 @@ net6.0 MP.Stats 826e877c-ba70-4253-84cb-d0b1cafd4440 - 6.16.2502.1811 - 6.16.2502.1811 + 6.16.2502.1812 + 6.16.2502.1812 true $(NoWarn);1591 en diff --git a/MP.Stats/Pages/Controlli.razor b/MP.Stats/Pages/Controlli.razor index ae5546cc..ae7fdda9 100644 --- a/MP.Stats/Pages/Controlli.razor +++ b/MP.Stats/Pages/Controlli.razor @@ -58,7 +58,7 @@ @record.EsitoOk @record.Note - @record.Cognome @record.Nome (@record.MatrOpr) + @record.Cognome @record.Nome (@record.MatrOpr) } diff --git a/MP.Stats/Pages/Diario.razor b/MP.Stats/Pages/Diario.razor index 2c474550..fd39e4ad 100644 --- a/MP.Stats/Pages/Diario.razor +++ b/MP.Stats/Pages/Diario.razor @@ -26,9 +26,9 @@ Data Commessa/ODL Articolo - Stato - Durata - Pezzi + Stato + Durata + Pezzi @@ -51,12 +51,12 @@ @record.CodArticolo
@record.DescArticolo
- @record.Descrizione - + @record.Descrizione + @MP.Data.Utils.ConvMsecToTime((long)record.DurataPeriodo)
@(((double)record.DurataPeriodo/60000).ToString("N2")) min
- @record.TotPzProd + @record.TotPzProd } diff --git a/MP.Stats/Pages/Energy.razor b/MP.Stats/Pages/Energy.razor index 7631b1c4..d72ed36b 100644 --- a/MP.Stats/Pages/Energy.razor +++ b/MP.Stats/Pages/Energy.razor @@ -9,7 +9,7 @@
@if (ShowCharts == true) { - + } @if (ListRecords == null) { @@ -33,33 +33,33 @@ Fine @if (dynMode) { - @Traduci("MP-STATS_TotCount01") + @Traduci("MP-STATS_TotCount01") @if (numCount > 1) { - @Traduci("MP-STATS_TotCount02") + @Traduci("MP-STATS_TotCount02") } @if (numCount > 2) { - @Traduci("MP-STATS_TotCount03") + @Traduci("MP-STATS_TotCount03") } - @Traduci("MP-STATS_TotEn01") - @Traduci("MP-STATS_TotEn01")/Unit + @Traduci("MP-STATS_TotEn01") + @Traduci("MP-STATS_TotEn01")/Unit @if (numTotEn > 1) { - @Traduci("MP-STATS_TotEn02") - @Traduci("MP-STATS_TotEn02")/Unit + @Traduci("MP-STATS_TotEn02") + @Traduci("MP-STATS_TotEn02")/Unit } @if (numTotEn > 2) { - @Traduci("MP-STATS_TotEn03") - @Traduci("MP-STATS_TotEn03")/Unit + @Traduci("MP-STATS_TotEn03") + @Traduci("MP-STATS_TotEn03")/Unit } } else { - Unit - Energy - Gas + Unit + Energy + Gas } @@ -80,21 +80,21 @@ @record.DataFine @if (dynMode) { - @($"{record.TotCount01:N0}") @GetUM("TotCount01") + @($"{record.TotCount01:N0}") @GetUM("TotCount01") @if (numCount > 1) { - @($"{record.TotCount02:N0}") @GetUM("TotCount02") + @($"{record.TotCount02:N0}") @GetUM("TotCount02") } @if (numCount > 2) { - @($"{record.TotCount03:N0}") @GetUM("TotCount03") + @($"{record.TotCount03:N0}") @GetUM("TotCount03") } - +
@($"{record.TotEn01:N2}") @GetUM("TotEn01")
- +
@righDiv(record.TotEn01, record.TotCount01).ToString("N3") @GetUM("TotEn01")/@GetUM("TotCount01")
@@ -113,12 +113,12 @@ @if (numTotEn > 1) { - +
@($"{record.TotEn02:N2}") @GetUM("TotEn02")
- +
@righDiv(record.TotEn02, record.TotCount01).ToString("N3") @GetUM("TotEn02")/@GetUM("TotCount01")
@@ -138,12 +138,12 @@ } @if (numTotEn > 2) { - +
@($"{record.TotEn03:N2}") @GetUM("TotEn03")
- +
@righDiv(record.TotEn03, record.TotCount01).ToString("N3") @GetUM("TotEn02")/@GetUM("TotCount01")
@@ -164,8 +164,8 @@ } else { - @(record.TotCount.ToString("N0")) m - + @(record.TotCount.ToString("N0")) m +
@record.TotWatt.ToString("N2") kWh
@@ -173,7 +173,7 @@ @righDiv(record.TotWatt, record.TotCount).ToString("N3") kWh/m - +
@record.TotGas.ToString("N2") m3
diff --git a/MP.Stats/Pages/Oee.razor b/MP.Stats/Pages/Oee.razor index 91cdbb74..9e3a2dfd 100644 --- a/MP.Stats/Pages/Oee.razor +++ b/MP.Stats/Pages/Oee.razor @@ -34,9 +34,9 @@ Turno Macchina Articolo - Durata - Pezzi - OEE % + Durata + Pezzi + OEE % @@ -56,13 +56,13 @@ @record.CodArticolo
@record.DescArticolo
- @*@record.TotPeriodo.ToString("N2")*@ - + @*@record.TotPeriodo.ToString("N2")*@ + @MP.Data.Utils.ConvMinToTime((double)record.TotPeriodo)
@record.TotPeriodo.ToString("N2") min
- @record.TotPz - @record.OEE.ToString("P2") + @record.TotPz + @record.OEE.ToString("P2") } diff --git a/MP.Stats/Pages/Scarti.razor b/MP.Stats/Pages/Scarti.razor index 1f9cfe58..d7be9e3b 100644 --- a/MP.Stats/Pages/Scarti.razor +++ b/MP.Stats/Pages/Scarti.razor @@ -31,9 +31,9 @@ Data Commessa/ODL Articolo - Descrizione - Qta - Operatore + Descrizione + Qta + Operatore @@ -56,15 +56,15 @@ @record.CodArticolo
@record.DescArticolo
- +
[@record.Causale]
-
@record.Descrizione
+
@record.Descrizione
@record.Note
- @record.Qta - @record.Cognome @record.Nome (@record.MatrOpr) + @record.Qta + @record.Cognome @record.Nome (@record.MatrOpr) } diff --git a/MP.Stats/Pages/UserLog.razor b/MP.Stats/Pages/UserLog.razor index 6b4a67a9..fe454294 100644 --- a/MP.Stats/Pages/UserLog.razor +++ b/MP.Stats/Pages/UserLog.razor @@ -30,9 +30,9 @@ Data Commessa/ODL Articolo - Descrizione - Qta - Operatore + Descrizione + Qta + Operatore @@ -55,19 +55,19 @@ @record.CodArticolo
@record.DescArticolo
- +
@record.Valore
[@record.IdxLog]
-
+
@decodeAction(@record.Azione).Descrizione
- @record.Qta.ToString("N0") - @record.Cognome @record.Nome (@record.MatrOpr) + @record.Qta.ToString("N0") + @record.Cognome @record.Nome (@record.MatrOpr) } diff --git a/MP.Stats/Pages/UserLog.razor.cs b/MP.Stats/Pages/UserLog.razor.cs index a221bb06..7f24d46d 100644 --- a/MP.Stats/Pages/UserLog.razor.cs +++ b/MP.Stats/Pages/UserLog.razor.cs @@ -47,7 +47,7 @@ namespace MP.Stats.Pages if (_currPage != value) { _currPage = value; - var pUpd = Task.Run(async () => await reloadData()); + var pUpd = Task.Run(async () => await ReloadData()); pUpd.Wait(); } } @@ -68,7 +68,7 @@ namespace MP.Stats.Pages if (_numRecord != value) { _numRecord = value; - var pUpd = Task.Run(async () => await reloadData()); + var pUpd = Task.Run(async () => await ReloadData()); pUpd.Wait(); } } @@ -122,7 +122,7 @@ namespace MP.Stats.Pages isLoading = false; } - private async Task reloadData() + private async Task ReloadData() { isLoading = true; ActionsList = await StatService.ActionsGetAll(); @@ -141,7 +141,7 @@ namespace MP.Stats.Pages SearchRecords = null; ListRecords = null; currFilter = newFilter; - await reloadData(); + await ReloadData(); } protected void ForceReload(int newNum) @@ -162,7 +162,7 @@ namespace MP.Stats.Pages MessageService.PageName = "User ActionLog"; MessageService.PageIcon = "oi oi-document"; MessageService.EA_SearchUpdated += OnSeachUpdated; - await reloadData(); + await ReloadData(); } protected void ResetData() @@ -179,7 +179,7 @@ namespace MP.Stats.Pages SearchRecords = null; ListRecords = null; currFilter = SelectData.Init(5, 7); - await reloadData(); + await ReloadData(); } protected async Task ToggleChart(bool doShow) @@ -187,14 +187,14 @@ namespace MP.Stats.Pages ShowCharts = !ShowCharts; if (ShowCharts) { - await reloadData(); + await ReloadData(); } } protected async Task UpdateData() { currRecord = null; - await reloadData(); + await ReloadData(); } #endregion Protected Methods diff --git a/MP.Stats/Resources/ChangeLog.html b/MP.Stats/Resources/ChangeLog.html index 46ce91c8..825cb3c2 100644 --- a/MP.Stats/Resources/ChangeLog.html +++ b/MP.Stats/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo statistiche MAPO -

Versione: 6.16.2502.1811

+

Versione: 6.16.2502.1812


Note di rilascio: