diff --git a/MP.Data/DatabaseModels/ODLModel.cs b/MP.Data/DatabaseModels/ODLModel.cs index ead0554b..6b140ff1 100644 --- a/MP.Data/DatabaseModels/ODLModel.cs +++ b/MP.Data/DatabaseModels/ODLModel.cs @@ -39,17 +39,15 @@ namespace MP.Data.DatabaseModels get { string answ = ""; - if (DataFine != null) + DateTime end = DataFine != null ? (DateTime)DataFine : DateTime.Now; + var tsDurata = (end).Subtract((DateTime)DataInizio); + if (tsDurata.TotalDays < 1) { - 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}'"; - } + answ = $"{tsDurata.Hours:00}h {tsDurata.Minutes:00}'"; + } + else + { + answ = $"{tsDurata.Days}gg {tsDurata.Hours:00}h"; } return answ; } diff --git a/MP.SPEC/Components/ListODL.razor b/MP.SPEC/Components/ListODL.razor index 2deaad4d..cf58da0e 100644 --- a/MP.SPEC/Components/ListODL.razor +++ b/MP.SPEC/Components/ListODL.razor @@ -38,8 +38,8 @@ else @if (record.Note != "") { -