From f7e19dcf9de9b2f02fa4980d1076df16aec9e09a Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 17 May 2021 19:46:29 +0200 Subject: [PATCH] Bozza pagina DDB --- MP.Data/DatabaseModels/DdbTurni.cs | 14 ++++++++++++++ MP.Stats/Data/MpStatsService.cs | 5 +++++ MP.Stats/Pages/Diario.razor | 27 +++++++++++++++++---------- 3 files changed, 36 insertions(+), 10 deletions(-) diff --git a/MP.Data/DatabaseModels/DdbTurni.cs b/MP.Data/DatabaseModels/DdbTurni.cs index 5a14c106..ca6059ec 100644 --- a/MP.Data/DatabaseModels/DdbTurni.cs +++ b/MP.Data/DatabaseModels/DdbTurni.cs @@ -1,5 +1,7 @@ using System; using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; #nullable disable @@ -16,6 +18,18 @@ namespace MP.Data.DatabaseModels public DateTime? DataTurnoFine { get; set; } public DateTime? DataTurnoInizio { get; set; } public string Descrizione { get; set; } + + [NotMapped] + [DisplayFormat(DataFormatString = "{0:N2}", ApplyFormatInEditMode = true)] + public long? DurataMin + { + get + { + long answ = (long)(DurataStato != null ? DurataStato : 0); + return answ / 60000; + } + } + public long? DurataPeriodo { get; set; } public long? DurataStato { get; set; } public DateTime? FinePeriodo { get; set; } diff --git a/MP.Stats/Data/MpStatsService.cs b/MP.Stats/Data/MpStatsService.cs index 85a9053d..56df3569 100644 --- a/MP.Stats/Data/MpStatsService.cs +++ b/MP.Stats/Data/MpStatsService.cs @@ -74,6 +74,11 @@ namespace MP.Stats.Data return Task.FromResult(dbController.StatControlliGetAll(numRecord, searchVal).ToArray()); } + public Task StatDdbGetAll(int numRecord, string searchVal = "") + { + return Task.FromResult(dbController.StatDdbGetAll(numRecord, searchVal).ToArray()); + } + public Task StatScartiGetAll(int numRecord, string searchVal = "") { return Task.FromResult(dbController.StatScartiGetAll(numRecord, searchVal).ToArray()); diff --git a/MP.Stats/Pages/Diario.razor b/MP.Stats/Pages/Diario.razor index 54e6fa6f..ad4bf737 100644 --- a/MP.Stats/Pages/Diario.razor +++ b/MP.Stats/Pages/Diario.razor @@ -24,23 +24,30 @@ Data ODL/Commessa Articolo - Esito - Note - Operatore + Stato + Durata + Pezzi + @*Operatore*@ @foreach (var record in ListRecords) { - + @* *@ - @record.IdxMacchina - @record.DataOra - @record.IdxOdl + +
@record.CodMacchina
+
@record.IdxMacchina
+ + +
@record.InizioStato.ToString("yyyy.MM.dd")
+
@record.InizioStato.ToString("ddd HH:mm.ss")
+ + @record.IdxOdl | @record.KeyRichiesta @record.CodArticolo - @record.EsitoOk - @record.Note - @record.MatrOpr + @record.Descrizione + @record.DurataMin + @record.TotPzProd }