diff --git a/MP.Data/DbModels/ODLExpModel.cs b/MP.Data/DbModels/ODLExpModel.cs index ec0af9b6..7982941d 100644 --- a/MP.Data/DbModels/ODLExpModel.cs +++ b/MP.Data/DbModels/ODLExpModel.cs @@ -34,18 +34,28 @@ namespace MP.Data.DbModels { get { - string answ = ""; - DateTime end = DataFine != null ? (DateTime)DataFine : DateTime.Now; - var tsDurata = (end).Subtract((DateTime)DataInizio); + if (DataInizio == null) + return ""; + + var start = DataInizio.Value; + var end = DataFine ?? DateTime.Now; + + var tsDurata = end - start; + if (tsDurata.TotalDays < 1) - { - answ = $"{tsDurata.Hours:00}h {tsDurata.Minutes:00}'"; - } - else - { - answ = $"{tsDurata.Days}gg {tsDurata.Hours:00}h"; - } - return answ; + return $"{tsDurata.Hours:00}h {tsDurata.Minutes:00}'"; + + return $"{tsDurata.Days}gg {tsDurata.Hours:00}h"; + } + } + [NotMapped] + public TimeSpan DurataMinutiTimeSpan + { + get + { + DateTime end = DataFine != null ? (DateTime)DataFine : DateTime.Now; + TimeSpan tsDurata = (end).Subtract((DateTime)DataInizio); + return tsDurata; } } diff --git a/MP.IOC/MP.IOC.csproj b/MP.IOC/MP.IOC.csproj index 8b1c7d14..e3d3020b 100644 --- a/MP.IOC/MP.IOC.csproj +++ b/MP.IOC/MP.IOC.csproj @@ -4,7 +4,7 @@ net8.0 enable enable - 6.16.2604.1318 + 6.16.2604.1407 diff --git a/MP.IOC/Resources/ChangeLog.html b/MP.IOC/Resources/ChangeLog.html index 7dfec0c7..506729cd 100644 --- a/MP.IOC/Resources/ChangeLog.html +++ b/MP.IOC/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MP-IOC -

Versione: 6.16.2604.1318

+

Versione: 6.16.2604.1407


Note di rilascio: