diff --git a/GPW.CORE.Api/GPW.CORE.Api.csproj b/GPW.CORE.Api/GPW.CORE.Api.csproj index ace59df..cc38a6a 100644 --- a/GPW.CORE.Api/GPW.CORE.Api.csproj +++ b/GPW.CORE.Api/GPW.CORE.Api.csproj @@ -20,8 +20,8 @@ - - + + diff --git a/GPW.CORE.WRKLOG/Components/DayHoriz.razor b/GPW.CORE.WRKLOG/Components/DayHoriz.razor index 176a509..8c337e7 100644 --- a/GPW.CORE.WRKLOG/Components/DayHoriz.razor +++ b/GPW.CORE.WRKLOG/Components/DayHoriz.razor @@ -13,7 +13,7 @@
@DayDTO.DtRif.ToString("ddd")
@DayDTO.DtRif.ToString("dd.MM")
- @if (hasFest && DayDTO.ListFermateAzienda.Count > 0) + @if (hasFest && DayDTO.ListFermateAzienda != null && DayDTO.ListFermateAzienda.Count > 0) { @foreach (var fermata in DayDTO.ListFermateAzienda) { @@ -57,7 +57,7 @@ { @**@
- @if (hasFest) + @if (hasFest && DayDTO.ListFermateAzienda != null) { @foreach (var fermata in DayDTO.ListFermateAzienda) { @@ -75,7 +75,7 @@ } } } - @if (hasFerie) + @if (hasFerie && DayDTO.ListFerieDip != null) { @foreach (var richiesta in DayDTO.ListFerieDip) { @@ -86,7 +86,7 @@
} } - @if (hasPerm) + @if (hasPerm && DayDTO.ListRichiesteDip != null) { @foreach (var richiesta in DayDTO.ListRichiesteDip) { diff --git a/GPW.CORE.WRKLOG/Components/MyRepStats.razor b/GPW.CORE.WRKLOG/Components/MyRepStats.razor index 48e9933..120c7bf 100644 --- a/GPW.CORE.WRKLOG/Components/MyRepStats.razor +++ b/GPW.CORE.WRKLOG/Components/MyRepStats.razor @@ -36,18 +36,25 @@

Project Pareto

    - @foreach (var item in paretoDetail) + @if (paretoDetail != null) { -
  • -
    -
    @item.Cliente | @item.NomeProj
    -
    @($"{item.TotOre:N1}")
    -
    -
    -
    -
    + @foreach (var item in paretoDetail) + { +
  • +
    +
    @item.Cliente | @item.NomeProj
    +
    + @( + $"{item.TotOre:N1}" + ) +
    +
    +
    +
    +
    -
  • + + } }
diff --git a/GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj b/GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj index d23c09d..f1150b2 100644 --- a/GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj +++ b/GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj @@ -2,7 +2,7 @@ net6.0 - 3.0.2307.0408 + 3.0.2307.3115 enable enable @@ -32,12 +32,12 @@ - - + + - - + + diff --git a/Resources/manifest.xml b/Resources/manifest.xml index b361675..9e6ef27 100644 --- a/Resources/manifest.xml +++ b/Resources/manifest.xml @@ -1,7 +1,7 @@ 3.0.2307.3115 - http://nexus.steamware.net/repository/SWS/GPW/stable/GPW.Smart.zip + http://nexus.steamware.net/repository/SWS/GPW/stable/GPW.UI.zip http://nexus.steamware.net/repository/SWS/GPW/stable/ChangeLog.html false