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

Merge branch 'release/FixStartMidnightWeekPlanner'

Browse Source
This commit is contained in:
Samuele Locatelli
2022-03-15 17:17:46 +01:00
parent fa7b52467e bd694535d9
commit 12cb0fb7e4
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GPW.CORE.Data/Controllers/GPWController.cs
+4 -4
View File
@@ -405,19 +405,19 @@ namespace GPW.CORE.Data.Controllers
IdxDipendente = idxDipendente,
DtRif = thisDay,
ListRA = rawRegAtt
.Where(x => thisDay <= x.Inizio && x.Inizio <= thisDay.AddDays(1))
.Where(x => thisDay <= x.Inizio && x.Inizio < thisDay.AddDays(1))
.ToList(),
ListTimbr = rawTimbr
.Where(x => thisDay <= x.DataOra && x.DataOra <= thisDay.AddDays(1))
.Where(x => thisDay <= x.DataOra && x.DataOra < thisDay.AddDays(1))
.ToList(),
TimbrExpl = rawTimbExp
.Where(x => thisDay == x.DataLav)
.FirstOrDefault(),
ListRilTemp = rawRilTemp
.Where(x => thisDay <= x.DtRilievo && x.DtRilievo <= thisDay.AddDays(1))
.Where(x => thisDay <= x.DtRilievo && x.DtRilievo < thisDay.AddDays(1))
.ToList(),
ListCheckC19 = rawCheckC19
.Where(x => thisDay <= x.DtCheck && x.DtCheck <= thisDay.AddDays(1))
.Where(x => thisDay <= x.DtCheck && x.DtCheck < thisDay.AddDays(1))
.ToList()
};
GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj
+1 -1
View File
@@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Version>3.0.2203.1514</Version>
<Version>3.0.2203.1517</Version>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
Resources/ChangeLog.html
+2 -2
View File
@@ -1,6 +1,6 @@
<body>
<i>GPW - Gestione Presenze Web</i>
<h4>Versione: 3.0.2203.1514</h4>
<h4>Versione: 3.0.2203.1517</h4>
<br /> Note di rilascio:
<ul>
<li>
@@ -24,4 +24,4 @@
<a href="https://www.steamware.net/GPW" target="_blank">&copy; Egalware 2006-2022</a>
</div>
</div>
</body>
</body>
Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
3.0.2203.1514
3.0.2203.1517
Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>3.0.2203.1514</version>
<version>3.0.2203.1517</version>
<url>http://nexus.steamware.net/repository/SWS/GWMS/stable/0/GWMS.UI.zip</url>
<changelog>http://nexus.steamware.net/repository/SWS/GWMS/stable/0/ChangeLog.html</changelog>
<mandatory>false</mandatory>