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

Merge branch 'release/displayWeekCalRichMPF02'

Browse Source
This commit is contained in:
Samuele Locatelli
2023-04-11 10:08:39 +02:00
parent 614ebcf818 f10c0d19c7
commit 388aa0cd65
10 changed files with 60 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GPW.CORE.Data/Controllers/GPWController.cs
+5 -2
View File
@@ -563,7 +563,7 @@ namespace GPW.CORE.Data.Controllers
.ToList();
rawRichDip = localDbCtx
.DbSetRegRichieste
.Where(x => (idxDipendente == 0 || x.IdxDipendente == idxDipendente) && (x.DtStart >= dtInizio && x.DtStart <= dtFine))
.Where(x => (idxDipendente == 0 || x.IdxDipendente == idxDipendente) && ((x.DtStart >= dtInizio && x.DtStart <= dtFine) || (x.DtStart <= dtInizio && dtFine <= x.DtEnd) || (x.DtEnd >= dtInizio && x.DtEnd<= dtFine)))
.ToList();
// calcolo intervallo date...
@@ -600,8 +600,11 @@ namespace GPW.CORE.Data.Controllers
ListMalattie = rawMalattie
.Where(x => thisDay >= x.DtInizio && thisDay <= x.DtInizio.AddDays(x.NumGG))
.ToList(),
ListFerieDip = rawRichDip
.Where(x => x.CodGiust == "FER" && (thisDay >= x.DtStart && thisDay <= x.DtEnd))
.ToList(),
ListRichiesteDip = rawRichDip
.Where(x => thisDay.Date == x.DtStart.Date)
.Where(x => x.CodGiust != "FER" && (thisDay.Date == x.DtStart.Date))
.ToList()
};
GPW.CORE.Data/DTO/DailyDataDTO.cs
+1
View File
@@ -23,6 +23,7 @@ namespace GPW.CORE.Data.DTO
public List<CheckVc19Model>? ListCheckC19 { get; set; } = null;
public List<CalFesteFerieModel>? ListFermateAzienda { get; set; } = null;
public List<RegMalattieModel>? ListMalattie { get; set; } = null;
public List<RegRichiesteModel>? ListFerieDip { get; set; } = null;
public List<RegRichiesteModel>? ListRichiesteDip { get; set; } = null;
public DateTime DtInizio
GPW.CORE.WRKLOG/Components/DayHoriz.razor
+25 -20
View File
@@ -76,31 +76,36 @@
</div>
}
}
@if (hasPermFerie)
@if (hasFerie)
{
if (DayDTO.ListFerieDip != null && DayDTO.ListFerieDip.Count > 0)
{
@foreach (var richiesta in DayDTO.ListFerieDip)
{
<div class="mx-2 px-2 pt-2 bg-info rounded text-light w-100">
<div>
<b>FERIE</b>
</div>
<div class="small">
@richiesta.Note
</div>
</div>
}
}
}
@if (hasPerm)
{
if (DayDTO.ListRichiesteDip != null && DayDTO.ListRichiesteDip.Count > 0)
{
@foreach (var richiesta in DayDTO.ListRichiesteDip)
{
<div class="mx-2 px-2 pt-2 bg-info rounded text-dark w-100">
@if (richiesta.CodGiust == "FER")
{
<div>
<b>@richiesta.CodGiust</b>
</div>
<div class="small">
@richiesta.Note
</div>
}
else
{
<div>
<b>@richiesta.CodGiust</b> | @richiesta.Note
</div>
<div class="small">
@($"{@richiesta.DtStart:HH.mm} - {@richiesta.DtEnd:HH.mm}")
</div>
}
<div class="mx-2 px-2 pt-2 bg-warning rounded text-dark w-100">
<div>
<b>@richiesta.CodGiust</b> | @richiesta.Note
</div>
<div class="small">
@($"{@richiesta.DtStart:HH.mm} - {@richiesta.DtEnd:HH.mm}")
</div>
</div>
}
}
GPW.CORE.WRKLOG/Components/DayHoriz.razor.cs
+10 -4
View File
@@ -18,8 +18,9 @@ namespace GPW.CORE.WRKLOG.Components
#region Private Properties
private bool noData {
get => DayDTO == null || DayDTO.ListRA == null || DayDTO.ListRA.Count == 0;
private bool noData
{
get => DayDTO == null || DayDTO.ListRA == null || DayDTO.ListRA.Count == 0;
}
private bool hasFest
@@ -27,9 +28,14 @@ namespace GPW.CORE.WRKLOG.Components
get => DayDTO != null && DayDTO.ListFermateAzienda != null;
}
private bool hasPermFerie
private bool hasFerie
{
get => DayDTO != null && DayDTO.ListRichiesteDip!= null;
get => DayDTO != null && DayDTO.ListFerieDip != null;
}
private bool hasPerm
{
get => DayDTO != null && DayDTO.ListRichiesteDip != null;
}
private bool OkTemp
GPW.CORE.WRKLOG/Data/GpwDataService.cs
+2
View File
@@ -1160,6 +1160,7 @@ namespace GPW.CORE.WRKLOG.Data
}
// invalido la cache...
await ExecFlushRedisPattern($"{rKeyDipendenti}:*");
await ExecFlushRedisPattern($"{rKeyDailyData}:*");
}
catch
{ }
@@ -1249,6 +1250,7 @@ namespace GPW.CORE.WRKLOG.Data
}
// invalido la cache...
await ExecFlushRedisPattern($"{rKeyDipendenti}:*");
await ExecFlushRedisPattern($"{rKeyDailyData}:*");
}
catch
{ }
GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj
+1 -1
View File
@@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Version>3.0.2304.1109</Version>
<Version>3.0.2304.1110</Version>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
GPW.CORE.WRKLOG/Properties/PublishProfiles/IIS-PROD.pubxml.user
+13
View File
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
This file is used by the publish/package process of your Web project. You can customize the behavior of this process
by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project>
<PropertyGroup>
<TimeStampOfAssociatedLegacyPublishXmlFile />
<EncryptedPassword>AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAw3dMMgC4FUywyOTV2xvCRgAAAAACAAAAAAADZgAAwAAAABAAAADrbAogtj/xpZqylbgs9Hb3AAAAAASAAACgAAAAEAAAAFm1lcdH7oj+NFy4QgZ7q18YAAAAROPsyRR12dhPTKfMEQ5yNCAZJ5K7C4pvFAAAAEFBVTwItjyYP2BlOTsuK1g9myQ8</EncryptedPassword>
<History>True|2023-04-11T07:18:55.4555319Z;True|2023-04-11T09:16:05.8827677+02:00;True|2022-06-06T12:56:03.5790550+02:00;False|2022-06-06T12:54:19.4739620+02:00;False|2022-06-06T12:53:46.4246554+02:00;</History>
<LastFailureDetails />
</PropertyGroup>
</Project>
Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>GPW - Gestione Presenze Web</i>
<h4>Versione: 3.0.2304.1109</h4>
<h4>Versione: 3.0.2304.1110</h4>
<br /> Note di rilascio:
<ul>
<li>
Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
3.0.2304.1109
3.0.2304.1110
Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>3.0.2304.1109</version>
<version>3.0.2304.1110</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>