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

Merge branch 'release/UpdateWeekDisplay'

Browse Source
This commit is contained in:
Samuele Locatelli
2022-04-02 10:26:58 +02:00
parent 30d407d293 9de4f5c638
commit 1ea5e16374
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GPW.CORE.WRKLOG/Components/RegAtt.razor
+3 -3
View File
@@ -73,9 +73,9 @@
}
</div>
<div class="px-1 py-0 text-left textTrim flex-fill">
<div class="text-dark" title="@CurrData.FasiNav?.ProgettoNav?.ClienteNav?.RagSociale - @CurrData.FasiNav?.ProgettoNav?.NomeProj"><b>@(trimLine($"{CurrData.FasiNav?.ProgettoNav?.ClienteNav?.RagSociale}",65))</b> - @(trimLine($"{CurrData.FasiNav?.ProgettoNav?.NomeProj}",75))</div>
<div class="text-secondary" title="@CurrData.FasiNav?.DescrizioneFase">@(trimLine($"{CurrData.FasiNav?.DescrizioneFase}",130))</div>
<div class="small" title="@CurrData.Descrizione">@(trimLine($"{CurrData.Descrizione}",250))</div>
<div class="text-dark" title="@CurrData.FasiNav?.ProgettoNav?.ClienteNav?.RagSociale - @CurrData.FasiNav?.ProgettoNav?.NomeProj"><b>@(trimLine($"{CurrData.FasiNav?.ProgettoNav?.ClienteNav?.RagSociale}",60))</b>&nbsp;@(trimLine($"{CurrData.FasiNav?.ProgettoNav?.NomeProj}",60))</div>
<div class="text-secondary" title="@CurrData.FasiNav?.DescrizioneFase">@(trimLine($"{CurrData.FasiNav?.DescrizioneFase}",150))</div>
<div class="small" title="@CurrData.Descrizione">@(trimLine($"{CurrData.Descrizione}",200))</div>
</div>
}
else
GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj
+1 -1
View File
@@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Version>3.0.2204.0115</Version>
<Version>3.0.2204.0210</Version>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
GPW.CORE.WRKLOG/Pages/WeekPlan.razor.cs
+3 -3
View File
@@ -194,7 +194,7 @@ namespace GPW.CORE.WRKLOG.Pages
{
int minHour = 12;
int maxHour = 14;
int roundMin = 0;
int roundMin = 30;
//int extraEnd = 30;
if (ListRecords != null)
{
@@ -252,7 +252,7 @@ namespace GPW.CORE.WRKLOG.Pages
}
}
}
startHour = minHour - 1;
startHour = minHour;// - 1;
checkOrarioDip();
// minimo 6 h... x cui "allungo" verso fine
if (maxHour - minHour < AppMServ.orarioDip)
@@ -260,7 +260,7 @@ namespace GPW.CORE.WRKLOG.Pages
minHour--;
maxHour = minHour + AppMServ.orarioDip;
}
endHour = maxHour + 1;
endHour = maxHour;// + 1;
}
private void checkOrarioDip()
Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>GPW - Gestione Presenze Web</i>
<h4>Versione: 3.0.2204.0115</h4>
<h4>Versione: 3.0.2204.0210</h4>
<br /> Note di rilascio:
<ul>
<li>
Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
3.0.2204.0115
3.0.2204.0210
Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>3.0.2204.0115</version>
<version>3.0.2204.0210</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>