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

Merge branch 'feature/fixVisuals' into develop

Browse Source
This commit is contained in:
Samuele Locatelli
2021-07-02 19:19:42 +02:00
parent c35fd8b77e 355fa9e246
commit 7864ec708d
17 changed files with 251 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+6
View File
@@ -4,6 +4,12 @@
*.pdb
.vs/*
#--------------------------------
# area MP.Stats
#--------------------------------
/Mp.Stats/temp/*.csv
#--------------------------------
# Area VersGen
#--------------------------------
MP.Data/Utils.cs
+13
View File
@@ -1,5 +1,7 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@@ -26,6 +28,17 @@ namespace MP.Data
return answ;
}
public static async Task SaveToCsv<T>(List<T> reportData, string path)
{
var lines = new List<string>();
IEnumerable<PropertyDescriptor> props = TypeDescriptor.GetProperties(typeof(T)).OfType<PropertyDescriptor>();
var header = string.Join(";", props.ToList().Select(x => x.Name));
lines.Add(header);
var valueLines = reportData.Select(row => string.Join(";", header.Split(';').Select(a => row.GetType().GetProperty(a).GetValue(row, null))));
lines.AddRange(valueLines);
await Task.Run(() => File.WriteAllLines(path, lines.ToArray()));
}
#endregion Public Methods
}
}
MP.Stats/Components/ChartOEE.razor
+1 -1
View File
@@ -13,7 +13,7 @@
{
<li class="list-group-item p-1 d-flex justify-content-between align-items-center">
@item.label
<span class="badge badge-primary badge-pill">@item.value.ToString("P1")</span>
<span class="badge badge-primary badge-pill">@item.value.ToString("N2")%</span>
</li>
}
</ul>
MP.Stats/Components/ChartOEE.razor.cs
+5 -4
View File
@@ -62,10 +62,11 @@ namespace MP.Stats.Components
new {
Display = true,
ticks= new {
suggestedMin = 0
min = 0,
max = 100
}
}
}
}
},
Tooltips = new
{
@@ -177,13 +178,13 @@ namespace MP.Stats.Components
{
ParetoData = RawData
.GroupBy(x => x.IdxMacchina)
.Select(y => new ChartKV() { label = y.First().IdxMacchina, value = y.Average(c => c.OEE) })
.Select(y => new ChartKV() { label = y.First().CodMacchina, value = Math.Round(y.Average(c => c.OEE) * 100, 2) })
.OrderByDescending(x => x.value)
.ToList();
TSData = RawData
.GroupBy(x => x.DataRif.Date)
.Select(y => new ChartTS() { TLabel = y.First().DataRif.Date, Value = y.Average(c => c.OEE) })
.Select(y => new ChartTS() { TLabel = y.First().DataRif.Date, Value = Math.Round(y.Average(c => c.OEE) * 100, 2) })
.OrderBy(x => x.TLabel)
.ToList();
}
MP.Stats/Components/DataPager.razor
+54 -43
View File
@@ -4,43 +4,54 @@
<div class="col-9 small">
@if (totalCount > 0)
{
<Pagination>
<PaginationItem>
<PaginationLink Clicked="@HandlePaginationItemClick" Page="1">
<i class="fas fa-angle-double-left"></i>
</PaginationLink>
</PaginationItem>
<PaginationItem>
<PaginationLink Clicked="@HandlePaginationItemClick" Page="@prevBlock.ToString()">
<span aria-hidden="true"><i class="fas fa-angle-left"></i></span>
</PaginationLink>
</PaginationItem>
@for (int i = @startPage; i <= endPage; ++i)
<Pagination>
<PaginationItem>
<PaginationLink Clicked="@HandlePaginationItemClick" Page="1">
<i class="fas fa-angle-double-left"></i>
</PaginationLink>
</PaginationItem>
<PaginationItem>
<PaginationLink Clicked="@HandlePaginationItemClick" Page="@prevBlock.ToString()">
<span aria-hidden="true"><i class="fas fa-angle-left"></i></span>
</PaginationLink>
</PaginationItem>
@for (int i = @startPage; i <= endPage; ++i)
{
var pageNum = i;
<PaginationItem Active="@(currPage.Equals(pageNum))">
<PaginationLink Clicked="@HandlePaginationItemClick" Page="@pageNum.ToString()">
@pageNum
</PaginationLink>
</PaginationItem>
<PaginationItem Active="@(currPage.Equals(pageNum))">
<PaginationLink Clicked="@HandlePaginationItemClick" Page="@pageNum.ToString()">
@pageNum
</PaginationLink>
</PaginationItem>
}
<PaginationItem>
<PaginationLink Clicked="@HandlePaginationItemClick" Page="@nextBlock.ToString()">
<i class="fas fa-angle-right"></i>
</PaginationLink>
</PaginationItem>
<PaginationItem>
<PaginationLink Clicked="@HandlePaginationItemClick" Page="@LastPage.ToString()">
<i class="fas fa-angle-double-right"></i>
</PaginationLink>
</PaginationItem>
</Pagination>
<PaginationItem>
<PaginationLink Clicked="@HandlePaginationItemClick" Page="@nextBlock.ToString()">
<i class="fas fa-angle-right"></i>
</PaginationLink>
</PaginationItem>
<PaginationItem>
<PaginationLink Clicked="@HandlePaginationItemClick" Page="@LastPage.ToString()">
<i class="fas fa-angle-double-right"></i>
</PaginationLink>
</PaginationItem>
</Pagination>
}
</div>
<div class="col-3">
<div class="col-3 text-center">
@if (!showLoading)
{
<span>@totalCount records</span>
<div>@totalCount records</div>
}
@if (totalCount > 0)
{
if (!fileExist)
{
<button class="btn btn-block btn-sm btn-primary" @onclick="() => requestSave()"><span class="oi oi-wrench"></span> Prepare Data</button>
}
else
{
<a target="_blank" href="/Download?fileName=@fileName" class="btn btn-block btn-sm btn-success"><span class="oi oi-cloud-download"></span> Download Data</a>
}
}
</div>
</div>
@@ -48,9 +59,9 @@
<div class="col-12 small">
@if (showLoading)
{
<Progress>
<ProgressBar Value="@percLoading" Striped="true" Animated="true" />
</Progress>
<Progress>
<ProgressBar Value="@percLoading" Striped="true" Animated="true" />
</Progress>
}
</div>
</div>
@@ -58,16 +69,16 @@
<div class="col-6 col-lg-2 text-right">
@if (totalCount > 0)
{
<div class="input-group input-group-sm">
row/pag:&nbsp;
<select @bind="@PageSize" class="form-control form-control-sm">
<option value="5">5</option>
<option value="10">10</option>
<option value="25">25</option>
<option value="50">50</option>
<option value="100">100</option>
</select>
</div>
<div class="input-group input-group-sm">
row/pag:&nbsp;
<select @bind="@PageSize" class="form-control form-control-sm">
<option value="5">5</option>
<option value="10">10</option>
<option value="25">25</option>
<option value="50">50</option>
<option value="100">100</option>
</select>
</div>
}
</div>
</div>
MP.Stats/Components/DataPager.razor.cs
+29
View File
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Components;
@@ -14,6 +15,8 @@ namespace MP.Stats.Components
protected bool _showLoading = false;
protected string exportDir = $"{Directory.GetCurrentDirectory()}/temp";
#endregion Protected Fields
#region Private Properties
@@ -80,6 +83,19 @@ namespace MP.Stats.Components
protected int _numRecord { get; set; } = 10;
protected bool fileExist
{
get
{
return File.Exists(fullPath);
}
}
protected string fullPath
{
get => $"{exportDir}/{fileName}";
}
protected int percLoading { get; set; } = 0;
#endregion Protected Properties
@@ -104,6 +120,12 @@ namespace MP.Stats.Components
}
}
[Parameter]
public EventCallback<int> exportRequested { get; set; }
[Parameter]
public string fileName { get; set; }
[Parameter]
public EventCallback<int> numPageChanged { get; set; }
@@ -167,6 +189,13 @@ namespace MP.Stats.Components
numPageChanged.InvokeAsync(currPage);
}
private async Task requestSave()
{
showLoading = true;
await exportRequested.InvokeAsync(currPage);
showLoading = false;
}
#endregion Private Methods
#region Protected Methods
MP.Stats/MP.Stats.csproj
+4 -1
View File
@@ -4,7 +4,7 @@
<TargetFramework>net5.0</TargetFramework>
<RootNamespace>MP.Stats</RootNamespace>
<UserSecretsId>826e877c-ba70-4253-84cb-d0b1cafd4440</UserSecretsId>
<Version>1.0.2106.2814</Version>
<Version>1.0.2107.0219</Version>
</PropertyGroup>
<ItemGroup>
@@ -47,6 +47,9 @@
<None Update="logs\.placeholder">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="temp\.placeholder">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="powershell.exe -ExecutionPolicy Unrestricted -NoProfile -NonInteractive -File $(ProjectDir)\post-build.ps1 -ProjectDir $(ProjectDir) -ProjectPath $(ProjectPath)" />
MP.Stats/Pages/Download.cshtml
+5
View File
@@ -0,0 +1,5 @@
@page "/Download"
@model MP.Stats.Pages.DownloadModel
@{
}
MP.Stats/Pages/Download.cshtml.cs
+52
View File
@@ -0,0 +1,52 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.RazorPages;
namespace MP.Stats.Pages
{
/// <summary>
/// Gestione donwnload file csv
///
/// da valutare eventualmente xlsx con https://github.com/closedxml/closedxml
/// </summary>
public class DownloadModel : PageModel
{
#region Private Fields
private readonly IWebHostEnvironment _env;
#endregion Private Fields
#region Public Constructors
public DownloadModel(IWebHostEnvironment env)
{
_env = env;
}
#endregion Public Constructors
#region Public Methods
public IActionResult OnGet()
{
string fileName = "OUT.csv";
if (Request.Query.ContainsKey("fileName"))
{
fileName = Request.Query["fileName"];
}
var filePath = Path.Combine(_env.WebRootPath, "..\\temp\\", fileName);
byte[] fileBytes = System.IO.File.ReadAllBytes(filePath);
return File(fileBytes, "application/force-download", fileName);
}
#endregion Public Methods
}
}
MP.Stats/Pages/Oee.razor
+1 -4
View File
@@ -30,7 +30,6 @@
<table class="table table-sm table-striped">
<thead>
<tr>
@*<th><button class="btn btn-sm btn-primary" @onclick="() => ResetData()"><span class="oi oi-loop-circular"></span></button></th>*@
<th>Data</th>
<th>Turno</th>
<th>Macchina</th>
@@ -44,8 +43,6 @@
@foreach (var record in ListRecords)
{
<tr class="@checkSelect(record.DataRif, record.Turno, @record.IdxMacchina)">
@*<td><button class="btn btn-sm btn-primary" @onclick="() => Select(record)"><span class="oi oi-magnifying-glass"></span></button></td>*@
<td>
<div>@record.DataRif.ToString("yyyy.MM.dd")</div>
<div class="small">@record.DataRif.ToString("dddd")</div>
@@ -75,6 +72,6 @@
}
</div>
<div class="card-footer py-1">
<DataPager PageSize="numRecord" currPage="currPage" numRecordChanged="ForceReload" numPageChanged="ForceReloadPage" totalCount="totalCount" showLoading="isLoading" />
<DataPager PageSize="numRecord" currPage="currPage" numRecordChanged="ForceReload" numPageChanged="ForceReloadPage" exportRequested="ExportCsv" fileName="@fileName" totalCount="totalCount" showLoading="isLoading" />
</div>
</div>
MP.Stats/Pages/Oee.razor.cs
+37 -8
View File
@@ -6,6 +6,11 @@ using System.Collections.Generic;
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
@@ -14,6 +19,7 @@ namespace MP.Stats.Pages
private MP.Data.DatabaseModels.TurniOee currRecord = null;
private string fileName = "OEE.csv";
private List<MP.Data.DatabaseModels.TurniOee> ListRecords;
private List<MP.Data.DatabaseModels.TurniOee> SearchRecords;
@@ -46,12 +52,17 @@ 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();
}
}
}
private string fullPath
{
get => $"{Directory.GetCurrentDirectory()}\\temp\\{fileName}";
}
private bool isLoading { get; set; } = false;
private int numRecord
@@ -62,7 +73,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();
}
}
@@ -103,7 +114,21 @@ namespace MP.Stats.Pages
#region Private Methods
private async Task reloadData()
private async void clearFile()
{
await Task.Run(() => File.Delete(fullPath));
}
private async Task ExportCsv()
{
isLoading = true;
// calcolo nome file
// salvo davvero!
await MP.Data.Utils.SaveToCsv(SearchRecords, fullPath);
isLoading = false;
}
private async Task ReloadData()
{
isLoading = true;
SearchRecords = await StatService.StatTurniOeeGetAllCached(currFilter, MessageService.SearchVal);
@@ -117,11 +142,12 @@ namespace MP.Stats.Pages
protected async Task DoFilter(SelectData newFilter)
{
clearFile();
currRecord = null;
SearchRecords = null;
ListRecords = null;
currFilter = newFilter;
await reloadData();
await ReloadData();
}
protected void ForceReload(int newNum)
@@ -136,27 +162,30 @@ namespace MP.Stats.Pages
protected override async Task OnInitializedAsync()
{
clearFile();
numRecord = 10;
MessageService.ShowSearch = false;
MessageService.PageName = "TRS/OEE %";
MessageService.PageIcon = "oi oi-monitor";
MessageService.EA_SearchUpdated += OnSeachUpdated;
await reloadData();
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();
await ReloadData();
}
protected void Select(MP.Data.DatabaseModels.TurniOee selRecord)
@@ -170,14 +199,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
MP.Stats/Pages/ReportODL.razor
+2 -2
View File
@@ -50,8 +50,8 @@
<td>@record.DataFine</td>
<td class="text-right">@record.NumPezzi</td>
<td class="text-right">@record.NumPezziEv</td>
<td class="text-right">@record.NumPezziRil</td>
<td class="text-right">@record.NumPezziSca</td>
<td class="text-right">@record.NumPezziRil</td>
</tr>
}
</tbody>
@@ -61,6 +61,6 @@
}
</div>
<div class="card-footer py-1">
<DataPager PageSize="numRecord" currPage="currPage" numRecordChanged="ForceReload" numPageChanged="ForceReloadPage" totalCount="totalCount" />
<DataPager PageSize="numRecord" currPage="currPage" numRecordChanged="ForceReload" numPageChanged="ForceReloadPage" exportRequested="ExportCsv" fileName="@fileName" totalCount="totalCount" showLoading="isLoading" />
</div>
</div>
MP.Stats/Pages/ReportODL.razor.cs
+38 -7
View File
@@ -3,6 +3,7 @@ using Microsoft.JSInterop;
using MP.Stats.Data;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
@@ -19,6 +20,12 @@ namespace MP.Stats.Pages
#endregion Private Fields
#region Protected Fields
protected string fileName = "ODL.csv";
#endregion Protected Fields
#region Private Properties
private SelectData currFilter
@@ -34,6 +41,13 @@ namespace MP.Stats.Pages
}
private int currPage { get; set; } = 1;
private string fullPath
{
get => $"{Directory.GetCurrentDirectory()}\\temp\\{fileName}";
}
private bool isLoading { get; set; } = false;
private int numRecord { get; set; } = 10;
#endregion Private Properties
@@ -69,7 +83,20 @@ namespace MP.Stats.Pages
#region Private Methods
private async Task reloadData()
private async void clearFile()
{
await Task.Run(() => File.Delete(fullPath));
}
private async Task ExportCsv()
{
isLoading = true;
// salvo davvero!
await MP.Data.Utils.SaveToCsv(SearchRecords, fullPath);
isLoading = false;
}
private async Task ReloadData()
{
SearchRecords = await StatService.StatOdlGetAll(currFilter, MessageService.SearchVal);
ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList();
@@ -81,53 +108,57 @@ namespace MP.Stats.Pages
protected async Task DoFilter(SelectData newFilter)
{
clearFile();
SearchRecords = null;
ListRecords = null;
currFilter = newFilter;
await reloadData();
await ReloadData();
}
protected async Task ForceReload(int newNum)
{
numRecord = newNum;
await reloadData();
await ReloadData();
}
protected async Task ForceReloadPage(int newNum)
{
currPage = newNum;
await reloadData();
await ReloadData();
}
protected override async Task OnInitializedAsync()
{
clearFile();
numRecord = 10;
MessageService.ShowSearch = false;
MessageService.PageName = "Report ODL/Comm.";
MessageService.PageIcon = "oi oi-book";
MessageService.EA_SearchUpdated += OnSeachUpdated;
await reloadData();
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();
await ReloadData();
}
protected async Task UpdateData()
{
currRecord = null;
await reloadData();
await ReloadData();
}
#endregion Protected Methods
MP.Stats/temp/.placeholder
+1
View File
@@ -0,0 +1 @@

Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo statistiche MAPO</i>
<h4>Versione: 1.0.2106.2814</h4>
<h4>Versione: 1.0.2107.0219</h4>
<br />
Note di rilascio:
<ul>
Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.0.2106.2814
1.0.2107.0219
Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.0.2106.2814</version>
<version>1.0.2107.0219</version>
<url>http://nexus.steamware.net/repository/SWS/MP-STATS/stable/0/MP.Stats.zip</url>
<changelog>http://nexus.steamware.net/repository/SWS/MP-STATS/stable/0/ChangeLog.html</changelog>
<mandatory>false</mandatory>