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

Correzioni icone stats

Browse Source
This commit is contained in:
Samuele Locatelli
2026-05-04 14:56:56 +02:00
parent 243dcf00a5
commit 974a804d72
16 changed files with 180 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP.Stats/MP.Stats.csproj
+1 -1
View File
@@ -4,7 +4,7 @@
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>MP.Stats</RootNamespace>
<UserSecretsId>826e877c-ba70-4253-84cb-d0b1cafd4440</UserSecretsId>
<Version>8.16.2605.0412</Version>
<Version>8.16.2605.0414</Version>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
</PropertyGroup>
MP.Stats/Pages/Controlli.razor.cs
+1 -1
View File
@@ -164,7 +164,7 @@ namespace MP.Stats.Pages
numRecord = 10;
MessageService.ShowSearch = false;
MessageService.PageName = "Registro Controlli";
MessageService.PageIcon = "oi oi-beaker";
MessageService.PageIcon = "fa fa-flask";
MessageService.EA_SearchUpdated += OnSeachUpdated;
await reloadData();
}
MP.Stats/Pages/Diario.razor.cs
+1 -1
View File
@@ -145,7 +145,7 @@ namespace MP.Stats.Pages
numRecord = 10;
MessageService.ShowSearch = false;
MessageService.PageName = "Diario Produzione";
MessageService.PageIcon = "oi oi-clipboard";
MessageService.PageIcon = "fa fa-clipboard";
MessageService.EA_SearchUpdated += OnSeachUpdated;
await reloadData();
}
MP.Stats/Pages/Energy.razor.cs
+1 -2
View File
@@ -2,7 +2,6 @@ using Microsoft.AspNetCore.Components;
using Microsoft.JSInterop;
using MP.Data.DbModels;
using MP.Data.Services;
using MP.Stats.Components;
using MP.Stats.Data;
using System;
using System.Collections.Generic;
@@ -119,7 +118,7 @@ namespace MP.Stats.Pages
clearFile();
MServ.ShowSearch = false;
MServ.PageName = "ENERGY";
MServ.PageIcon = "oi oi-bar-chart";
MServ.PageIcon = "fa fa-chart-column";
MServ.EA_SearchUpdated += OnSeachUpdated;
await LoadConfData();
await ReloadData();
MP.Stats/Pages/Index.razor
+1 -1
View File
@@ -52,7 +52,7 @@
{
MessageService.ShowSearch = false;
MessageService.PageName = "Home";
MessageService.PageIcon = "oi oi-home";
MessageService.PageIcon = "fa fa-home";
return base.OnInitializedAsync();
}
}
MP.Stats/Pages/Oee.razor.cs
+2 -6
View File
@@ -3,14 +3,10 @@ using Microsoft.JSInterop;
using MP.Stats.Data;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using System.IO;
using System.Threading;
using System.Text;
using System.ComponentModel;
namespace MP.Stats.Pages
{
public partial class Oee : ComponentBase, IDisposable
@@ -166,7 +162,7 @@ namespace MP.Stats.Pages
numRecord = 10;
MessageService.ShowSearch = false;
MessageService.PageName = "TRS/OEE %";
MessageService.PageIcon = "oi oi-monitor";
MessageService.PageIcon = "fa fa-display";
MessageService.EA_SearchUpdated += OnSeachUpdated;
await ReloadData();
}
MP.Stats/Pages/ReportODL.razor.cs
+1 -1
View File
@@ -133,7 +133,7 @@ namespace MP.Stats.Pages
numRecord = 10;
MessageService.ShowSearch = false;
MessageService.PageName = "Report ODL/Comm.";
MessageService.PageIcon = "oi oi-book";
MessageService.PageIcon = "fa fa-book";
MessageService.EA_SearchUpdated += OnSeachUpdated;
await ReloadData();
}
MP.Stats/Pages/Scarti.razor.cs
+145 -145
View File
@@ -11,6 +11,151 @@ namespace MP.Stats.Pages
{
public partial class Scarti : ComponentBase, IDisposable
{
#region Public Properties
[Parameter]
public SelectData currFilter
{
get
{
return MessageService.DetailFilter;
}
set
{
MessageService.DetailFilter = value;
}
}
#endregion Public Properties
#region Public Methods
public string checkSelect(DateTime DataOraRif, string IdxMacchina, string Causale)
{
string answ = "";
if (currRecord != null)
{
try
{
answ = (currRecord.DataOraRif == DataOraRif && currRecord.IdxMacchina == IdxMacchina && currRecord.Causale == Causale) ? "table-info" : "";
}
catch
{ }
}
return answ;
}
public void Dispose()
{
MessageService.EA_SearchUpdated -= OnSeachUpdated;
}
public async void OnSeachUpdated()
{
await InvokeAsync(() =>
{
Task task = UpdateData();
StateHasChanged();
});
}
#endregion Public Methods
#region Protected Properties
[Inject]
protected IJSRuntime JSRuntime { get; set; }
[Inject]
protected MessageService MessageService { get; set; }
[Inject]
protected NavigationManager NavManager { get; set; }
[Inject]
protected MpStatsService StatService { get; set; }
protected int totalCount
{
get
{
int answ = 0;
if (SearchRecords != null)
{
answ = SearchRecords.Count;
}
return answ;
}
}
#endregion Protected Properties
#region Protected Methods
protected async Task DoFilter(SelectData newFilter)
{
clearFile();
SearchRecords = null;
ListRecords = null;
currFilter = newFilter;
await reloadData();
}
protected void ForceReload(int newNum)
{
numRecord = newNum;
}
protected void ForceReloadPage(int newNum)
{
currPage = newNum;
}
protected override async Task OnInitializedAsync()
{
clearFile();
numRecord = 10;
MessageService.ShowSearch = false;
MessageService.PageName = "Registro Scarti";
MessageService.PageIcon = "fa fa-warning";
MessageService.EA_SearchUpdated += OnSeachUpdated;
await reloadData();
}
protected void ResetData()
{
clearFile();
StatService.rollBackEdit(currRecord);
currRecord = null;
}
protected async Task ResetFilter(SelectData newFilter)
{
clearFile();
currRecord = null;
SearchRecords = null;
ListRecords = null;
currFilter = SelectData.Init(5, 7);
await reloadData();
}
protected async Task ToggleChart(bool doShow)
{
ShowCharts = !ShowCharts;
if (ShowCharts)
{
await reloadData();
}
}
protected async Task UpdateData()
{
currRecord = null;
await reloadData();
}
#endregion Protected Methods
#region Private Fields
private MP.Data.DbModels.ResScarti currRecord = null;
@@ -66,52 +211,6 @@ namespace MP.Stats.Pages
#endregion Private Properties
#region Protected Properties
[Inject]
protected IJSRuntime JSRuntime { get; set; }
[Inject]
protected MessageService MessageService { get; set; }
[Inject]
protected NavigationManager NavManager { get; set; }
[Inject]
protected MpStatsService StatService { get; set; }
protected int totalCount
{
get
{
int answ = 0;
if (SearchRecords != null)
{
answ = SearchRecords.Count;
}
return answ;
}
}
#endregion Protected Properties
#region Public Properties
[Parameter]
public SelectData currFilter
{
get
{
return MessageService.DetailFilter;
}
set
{
MessageService.DetailFilter = value;
}
}
#endregion Public Properties
#region Private Methods
private async void clearFile()
@@ -136,104 +235,5 @@ namespace MP.Stats.Pages
}
#endregion Private Methods
#region Protected Methods
protected async Task DoFilter(SelectData newFilter)
{
clearFile();
SearchRecords = null;
ListRecords = null;
currFilter = newFilter;
await reloadData();
}
protected void ForceReload(int newNum)
{
numRecord = newNum;
}
protected void ForceReloadPage(int newNum)
{
currPage = newNum;
}
protected override async Task OnInitializedAsync()
{
clearFile();
numRecord = 10;
MessageService.ShowSearch = false;
MessageService.PageName = "Registro Scarti";
MessageService.PageIcon = "oi oi-warning";
MessageService.EA_SearchUpdated += OnSeachUpdated;
await reloadData();
}
protected void ResetData()
{
clearFile();
StatService.rollBackEdit(currRecord);
currRecord = null;
}
protected async Task ResetFilter(SelectData newFilter)
{
clearFile();
currRecord = null;
SearchRecords = null;
ListRecords = null;
currFilter = SelectData.Init(5, 7);
await reloadData();
}
protected async Task ToggleChart(bool doShow)
{
ShowCharts = !ShowCharts;
if (ShowCharts)
{
await reloadData();
}
}
protected async Task UpdateData()
{
currRecord = null;
await reloadData();
}
#endregion Protected Methods
#region Public Methods
public string checkSelect(DateTime DataOraRif, string IdxMacchina, string Causale)
{
string answ = "";
if (currRecord != null)
{
try
{
answ = (currRecord.DataOraRif == DataOraRif && currRecord.IdxMacchina == IdxMacchina && currRecord.Causale == Causale) ? "table-info" : "";
}
catch
{ }
}
return answ;
}
public void Dispose()
{
MessageService.EA_SearchUpdated -= OnSeachUpdated;
}
public async void OnSeachUpdated()
{
await InvokeAsync(() =>
{
Task task = UpdateData();
StateHasChanged();
});
}
#endregion Public Methods
}
}
MP.Stats/Pages/StatusChecks.razor
+5 -5
View File
@@ -2,14 +2,14 @@
<div class="card">
<div class="card-header table-primary p-1 d-flex justify-content-between">
<div class="px-0">
<div class="card-header table-primary pb-0 row">
<div class="col-3">
<b class="fs-4">Status Checks</b>
</div>
<div class="px-0 w-50">
<ParetoProgress ParetoData="@ParetoTime" Title="Situazione Acquisitori" />
<div class="col-6 pt-1">
<ParetoProgress ParetoData="@ParetoTime" Title="" />
</div>
<div class="px-0">
<div class="col-3">
<div class="input-group">
<span class="input-group-text">Scadenza (minuti)</span>
<input type="number" class="form-control" @bind="@timeoutMin" @bind:after="UpdateTable">
MP.Stats/Pages/StatusChecks.razor.cs
+4
View File
@@ -26,6 +26,8 @@ namespace MP.Stats.Pages
protected override void OnInitialized()
{
MServ.PageName = "Energy Check";
MServ.PageIcon = "fa fa-list-check";
sortField = "dtEvento";
timeoutMin = ConfMan.GetValue<int>("SpecialConf:TimeoutEnergyFlux");
}
@@ -44,6 +46,8 @@ namespace MP.Stats.Pages
private List<MaccEnergyCheckModel> SortRecord = new();
private List<MaccEnergyCheckModel> ListPaged = new();
[Inject]
protected MessageService MServ { get; set; } = null!;
private int numRecPage = 10;
MP.Stats/Pages/TaskScheduler.razor.cs
+10 -17
View File
@@ -1,17 +1,6 @@
using Microsoft.AspNetCore.Components;
using Microsoft.JSInterop;
using MP.Stats.Data;
using System.Collections.Generic;
using System.IO;
using System.Threading.Tasks;
using System;
using System.Linq;
using StackExchange.Redis;
using MP.Data.DbModels;
using Microsoft.AspNetCore.DataProtection;
using MP.TaskMan.Models;
using static MP.TaskMan.Objects.Enums;
using Microsoft.Extensions.Configuration;
using MP.Stats.Data;
namespace MP.Stats.Pages
{
@@ -19,14 +8,14 @@ namespace MP.Stats.Pages
{
#region Protected Properties
[Inject]
protected IConfiguration ConfMan { get; set; }
protected int minOrdinal { get; set; } = 0;
[Inject]
protected MessageService MServ { get; set; } = null!;
[Inject]
protected IConfiguration ConfMan { get; set; }
#endregion Protected Properties
#region Protected Methods
@@ -35,12 +24,16 @@ namespace MP.Stats.Pages
{
MServ.ShowSearch = true;
MServ.PageName = "Task Scheduler";
MServ.PageIcon = "oi oi-clock";
MServ.PageIcon = "fa fa-clock";
EnableRedis = ConfMan.GetValue<bool>("ServerConf:TaskEnableRedis");
}
#endregion Protected Methods
#region Private Fields
private bool EnableRedis = true;
#endregion Protected Methods
#endregion Private Fields
}
}
MP.Stats/Pages/UserLog.razor.cs
+1 -1
View File
@@ -160,7 +160,7 @@ namespace MP.Stats.Pages
numRecord = 10;
MessageService.ShowSearch = false;
MessageService.PageName = "User ActionLog";
MessageService.PageIcon = "oi oi-document";
MessageService.PageIcon = "fa fa-file-lines";
MessageService.EA_SearchUpdated += OnSeachUpdated;
await ReloadData();
}
MP.Stats/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo statistiche MAPO</i>
<h4>Versione: 8.16.2605.0412</h4>
<h4>Versione: 8.16.2605.0414</h4>
<br />
Note di rilascio:
<ul>
MP.Stats/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
8.16.2605.0412
8.16.2605.0414
MP.Stats/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>8.16.2605.0412</version>
<version>8.16.2605.0414</version>
<url>https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/MP.Stats.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>
MP.Stats/Shared/NavMenu.razor
+4 -4
View File
@@ -52,7 +52,7 @@
</li>
<li class="nav-item px-2">
<NavLink class="nav-link" href="ReportODL">
<span class="fa fa-bookmark pe-2" aria-hidden="true" title="Dati di Produzione (P)ODL/Commesse"></span>
<span class="fa fa-book pe-2" aria-hidden="true" title="Dati di Produzione (P)ODL/Commesse"></span>
@if (showText)
{
<span class="@hideText">Rep. ODL/Comm</span>
@@ -70,7 +70,7 @@
</li>
<li class="nav-item px-2">
<NavLink class="nav-link" href="UserLog">
<span class="fa fa-document pe-2" aria-hidden="true" title="Statistiche Controlli"></span>
<span class="fa fa-file-lines pe-2" aria-hidden="true" title="Statistiche Controlli"></span>
@if (showText)
{
<span class="@hideText">User ActionLog</span>
@@ -106,10 +106,10 @@
</li>
<li class="nav-item px-2">
<NavLink class="nav-link" href="StatusChecks">
<span class="fa fa-solid fa-list-check pe-2" aria-hidden="true"></span>
<span class="fa fa-list-check pe-2" aria-hidden="true"></span>
@if (showText)
{
<span class="@hideText">Status Check</span>
<span class="@hideText">Energy Check</span>
}
</NavLink>
</li>