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

Fix colori diversi fest/ferie ufficio

Browse Source
This commit is contained in:
Samuele Locatelli
2023-04-11 16:02:06 +02:00
parent 34df9c59fb
commit 87c42e0910
5 changed files with 45 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GPW.CORE.WRKLOG/Components/DayHoriz.razor
+41 -34
View File
@@ -62,49 +62,56 @@
}
else
{
@if (hasFest)
{
//verifico se ci siano festività...
if (DayDTO.ListFermateAzienda != null && DayDTO.ListFermateAzienda.Count > 0)
@if (hasFest)
{
<div class="mx-2 bg-danger rounded text-warning w-100">
<div class="text-uppercase">@DayDTO.ListFermateAzienda.FirstOrDefault().descrizione</div>
</div>
}
}
@if (hasFerie)
{
if (DayDTO.ListFerieDip != null && DayDTO.ListFerieDip.Count > 0)
{
@foreach (var richiesta in DayDTO.ListFerieDip)
//verifico se ci siano festività...
if (DayDTO.ListFermateAzienda != null && DayDTO.ListFermateAzienda.Count > 0)
{
<div class="mx-2 bg-info rounded text-light w-100">
<div>
<b>FERIE</b>
</div>
<div class="small">
@richiesta.Note
</div>
</div>
@foreach (var fermata in DayDTO.ListFermateAzienda)
{
if (fermata.codGiust == "FEST")
{
<div class="mx-2 bg-danger rounded text-warning w-100">
<div class="text-uppercase"><b>@fermata.codGiust</b> | @fermata.descrizione</div>
</div>
}
else
{
<div class="mx-2 bg-warning rounded text-danger w-100">
<div class="text-uppercase"><b>@fermata.codGiust</b> | @fermata.descrizione</div>
</div>
}
}
}
}
}
@if (hasPerm)
{
if (DayDTO.ListRichiesteDip != null && DayDTO.ListRichiesteDip.Count > 0)
@if (hasFerie)
{
@foreach (var richiesta in DayDTO.ListRichiesteDip)
if (DayDTO.ListFerieDip != null && DayDTO.ListFerieDip.Count > 0)
{
<div class="mx-2 bg-warning rounded text-dark w-100">
<div>
<b>@richiesta.CodGiust</b> | @richiesta.Note | <small class="small">
@($"{@richiesta.DtStart:HH.mm} - {@richiesta.DtEnd:HH.mm}")
</small>
@foreach (var richiesta in DayDTO.ListFerieDip)
{
<div class="mx-2 bg-info rounded text-light w-100">
<div>
<b>FERIE</b> | <small class="small">@richiesta.Note</small>
</div>
</div>
</div>
}
}
}
@if (hasPerm)
{
if (DayDTO.ListRichiesteDip != null && DayDTO.ListRichiesteDip.Count > 0)
{
@foreach (var richiesta in DayDTO.ListRichiesteDip)
{
<div class="mx-2 bg-warning rounded text-dark w-100">
<div>
<b>@richiesta.CodGiust</b> | <small class="small">@richiesta.Note, @($"{@richiesta.DtStart:HH.mm} - {@richiesta.DtEnd:HH.mm}")</small>
</div>
</div>
}
}
}
}
}
</div>
@*<!-- RegAtt -->*@
GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj
+1 -1
View File
@@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Version>3.0.2304.1115</Version>
<Version>3.0.2304.1116</Version>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>GPW - Gestione Presenze Web</i>
<h4>Versione: 3.0.2304.1115</h4>
<h4>Versione: 3.0.2304.1116</h4>
<br /> Note di rilascio:
<ul>
<li>
Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
3.0.2304.1115
3.0.2304.1116
Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>3.0.2304.1115</version>
<version>3.0.2304.1116</version>
<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>