Egalware/gpw_next
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix GPW.WRKLOG

Browse Source
This commit is contained in:
Samuele Locatelli
2023-07-31 15:54:38 +02:00
parent f9ea6f5721
commit 1eafdee5af
5 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GPW.CORE.Api/GPW.CORE.Api.csproj
+2 -2
View File
@@ -20,8 +20,8 @@
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="6.0.14" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
<PackageReference Include="StackExchange.Redis" Version="2.6.96" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="StackExchange.Redis" Version="2.6.122" />
<PackageReference Include="StackExchange.Redis.Extensions.AspNetCore" Version="9.1.0" />
<PackageReference Include="StackExchange.Redis.Extensions.Core" Version="9.1.0" />
<PackageReference Include="StackExchange.Redis.Extensions.Newtonsoft" Version="9.1.0" />
GPW.CORE.WRKLOG/Components/DayHoriz.razor
+4 -4
View File
@@ -13,7 +13,7 @@
<div class="@dayCardCss text-center text-uppercase">
<div class="text-uppercase"><b>@DayDTO.DtRif.ToString("ddd")</b></div>
<div class="small">@DayDTO.DtRif.ToString("dd.MM")</div>
@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 @@
{
@*<!-- MPF -->*@
<div class="d-flex justify-content-between text-center small">
@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 @@
</div>
}
}
@if (hasPerm)
@if (hasPerm && DayDTO.ListRichiesteDip != null)
{
@foreach (var richiesta in DayDTO.ListRichiesteDip)
{
GPW.CORE.WRKLOG/Components/MyRepStats.razor
+17 -10
View File
@@ -36,18 +36,25 @@
<h4>Project Pareto</h4>
</div>
<ul class="list-group list-group-flush">
@foreach (var item in paretoDetail)
@if (paretoDetail != null)
{
<li class="list-group-item @checkCss(item.idxProj)" @onclick="() => selectProj(item.idxProj)">
<div class="d-flex justify-content-between">
<div class="px-2">@item.Cliente | @item.NomeProj</div>
<div class="px-2">@($"{item.TotOre:N1}")</div>
</div>
<div class="progress">
<div class="progress-bar" role="progressbar" style="width: @progrWidth(item.TotOre)"></div>
</div>
@foreach (var item in paretoDetail)
{
<li class="list-group-item @checkCss(item.idxProj)" @onclick="() => selectProj(item.idxProj)">
<div class="d-flex justify-content-between">
<div class="px-2">@item.Cliente | @item.NomeProj</div>
<div class="px-2">
@(
$"{item.TotOre:N1}"
)
</div>
</div>
<div class="progress">
<div class="progress-bar" role="progressbar" style="width: @progrWidth(item.TotOre)"></div>
</div>
</li>
</li>
}
}
</ul>
</div>
GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj
+5 -5
View File
@@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Version>3.0.2307.0408</Version>
<Version>3.0.2307.3115</Version>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
@@ -32,12 +32,12 @@
<ItemGroup>
<PackageReference Include="BlazorCalendar" Version="2.5.3" />
<PackageReference Include="EgwCoreLib.Razor" Version="1.4.2307.308" />
<PackageReference Include="EgwCoreLib.Utils" Version="1.4.2307.308" />
<PackageReference Include="EgwCoreLib.Razor" Version="1.4.2307.3111" />
<PackageReference Include="EgwCoreLib.Utils" Version="1.4.2307.3111" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Negotiate" Version="6.0.14" />
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="6.0.14" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
<PackageReference Include="NLog" Version="5.1.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="NLog" Version="5.2.2" />
<PackageReference Include="RestSharp" Version="108.0.3" />
<PackageReference Include="StackExchange.Redis" Version="2.6.96" />
</ItemGroup>
Resources/manifest.xml
+1 -1
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>3.0.2307.3115</version>
<url>http://nexus.steamware.net/repository/SWS/GPW/stable/GPW.Smart.zip</url>
<url>http://nexus.steamware.net/repository/SWS/GPW/stable/GPW.UI.zip</url>
<changelog>http://nexus.steamware.net/repository/SWS/GPW/stable/ChangeLog.html</changelog>
<mandatory>false</mandatory>
</item>