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

Merge branch 'release/FixDisplayFerieMultiDay'

Browse Source
This commit is contained in:
Samuele Locatelli
2023-04-03 10:03:55 +02:00
parent 2b7346063a 81ad753268
commit f408c0e9d6
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GPW.CORE.SMART/GPW.CORE.SMART.csproj
+1 -1
View File
@@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<Version>3.0.2303.2808</Version>
<Version>3.0.2304.0309</Version>
<ImplicitUsings>enable</ImplicitUsings>
<PackageProjectUrl>www.egalware.com</PackageProjectUrl>
<Description>GPW Smart UI</Description>
GPW.CORE.SMART/Pages/DayOff.razor.cs
+4 -4
View File
@@ -264,7 +264,7 @@ namespace GPW.CORE.Smart.Pages
{
string cssSpec = "";
foreach (var item in ListFermateAzienda)
{
{
cssSpec = item.codGiust == "FEST" ? cssFest : cssChius;
if (!DateCFF.ContainsKey(item.data))
@@ -272,7 +272,7 @@ namespace GPW.CORE.Smart.Pages
if (item.data.DayOfWeek != DayOfWeek.Saturday && item.data.DayOfWeek != DayOfWeek.Sunday)
{
DateCFF.Add(item.data, cssSpec);
}
}
}
eventList.Add(new CalendarEvent()
@@ -309,8 +309,8 @@ namespace GPW.CORE.Smart.Pages
break;
}
// aggiungo x tutte le date richieste...
int numGG = item.DtEnd.Subtract(item.DtStart).Days;
for (int i = 0; i <= numGG; i++)
int numGG = item.DtEnd.Subtract(item.DtStart).Days + 1;
for (int i = 0; i < numGG; i++)
{
dtIns = item.DtStart.Date.AddDays(i);
if (!DateRDip.ContainsKey(dtIns))
Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>GPW - Gestione Presenze Web</i>
<h4>Versione: 3.0.2303.2808</h4>
<h4>Versione: 3.0.2304.0309</h4>
<br /> Note di rilascio:
<ul>
<li>
Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
3.0.2303.2808
3.0.2304.0309
Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>3.0.2303.2808</version>
<version>3.0.2304.0309</version>
<url>http://nexus.steamware.net/repository/SWS/GPW/stable/GPW.Smart.zip</url>
<changelog>http://nexus.steamware.net/repository/SWS/GPW/stable/ChangeLog.html</changelog>
<mandatory>false</mandatory>