diff --git a/MP.Data/DatabaseModels/ODLModel.cs b/MP.Data/DatabaseModels/ODLModel.cs index 7e7c0c15..ead0554b 100644 --- a/MP.Data/DatabaseModels/ODLModel.cs +++ b/MP.Data/DatabaseModels/ODLModel.cs @@ -33,6 +33,28 @@ namespace MP.Data.DatabaseModels [MaxLength(50)] public string CodCli { get; set; } = ""; + [NotMapped] + public string DurataMinuti + { + get + { + string answ = ""; + if (DataFine != null) + { + var tsDurata = ((DateTime)DataFine).Subtract((DateTime)DataInizio); + if (tsDurata.TotalDays < 1) + { + answ = $"{tsDurata.Hours:00}h {tsDurata.Minutes:00}'"; + } + else + { + answ = $"{tsDurata.Days}gg {tsDurata.Hours:00}h {tsDurata.Minutes:00}'"; + } + } + return answ; + } + } + /// /// Navigazione oggetto Machine /// diff --git a/MP.SPEC/Components/ListODL.razor b/MP.SPEC/Components/ListODL.razor index 357aa2d3..d09e411d 100644 --- a/MP.SPEC/Components/ListODL.razor +++ b/MP.SPEC/Components/ListODL.razor @@ -19,11 +19,9 @@ else Articolo Fase Macchina - Periodo Info ciclo - @* Note - @* Richiesta - *@ + Periodo + Durata @@ -50,31 +48,41 @@ else @record.IdxMacchina
@record.MachineNav.Descrizione
- -
@record.DataInizio
- @if (@record.DataFine != null) - { -
@record.DataFine
- } - else - { - - } -
N° pezzi: @record.NumPezzi
T. Ciclo: @record.Tcassegnato.ToString("N3")
- @* - @record.Note - @*@record.KeyRichiesta - - @if (ArticoloDelEnabled(record.CodArticolo)) - { - - } - *@ + +
+
+
@($"{@record.DataInizio:yyyy/MM/dd}")
+
@($"{@record.DataInizio:ddd HH:mm:ss}")
+
+
+ +
+
+ @if (@record.DataFine != null) + { +
@($"{@record.DataFine:yyyy/MM/dd}")
+
@($"{@record.DataFine:ddd HH:mm:ss}")
+ } + else + { + + } +
+
+ + +
+ @record.DurataMinuti +
+
+ +
+ } diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj index bd1cca50..f8703f9b 100644 --- a/MP.SPEC/MP.SPEC.csproj +++ b/MP.SPEC/MP.SPEC.csproj @@ -5,7 +5,7 @@ enable enable MP.SPEC - 6.16.2210.716 + 6.16.2210.717 diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html index 533303fc..3bbfb1d3 100644 --- a/MP.SPEC/Resources/ChangeLog.html +++ b/MP.SPEC/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2210.716

+

Versione: 6.16.2210.717


Note di rilascio: