From b444ac09fde59625448c82f4564e906b834145b9 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Sat, 2 Apr 2022 10:26:23 +0200 Subject: [PATCH 1/2] cambio (di nuovo) condizioni arrotondamento x display week --- GPW.CORE.WRKLOG/Components/RegAtt.razor | 6 +++--- GPW.CORE.WRKLOG/Pages/WeekPlan.razor.cs | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/GPW.CORE.WRKLOG/Components/RegAtt.razor b/GPW.CORE.WRKLOG/Components/RegAtt.razor index 0c0fa75..5acb0b1 100644 --- a/GPW.CORE.WRKLOG/Components/RegAtt.razor +++ b/GPW.CORE.WRKLOG/Components/RegAtt.razor @@ -73,9 +73,9 @@ }
-
@(trimLine($"{CurrData.FasiNav?.ProgettoNav?.ClienteNav?.RagSociale}",65)) - @(trimLine($"{CurrData.FasiNav?.ProgettoNav?.NomeProj}",75))
-
@(trimLine($"{CurrData.FasiNav?.DescrizioneFase}",130))
-
@(trimLine($"{CurrData.Descrizione}",250))
+
@(trimLine($"{CurrData.FasiNav?.ProgettoNav?.ClienteNav?.RagSociale}",60)) @(trimLine($"{CurrData.FasiNav?.ProgettoNav?.NomeProj}",60))
+
@(trimLine($"{CurrData.FasiNav?.DescrizioneFase}",150))
+
@(trimLine($"{CurrData.Descrizione}",200))
} else diff --git a/GPW.CORE.WRKLOG/Pages/WeekPlan.razor.cs b/GPW.CORE.WRKLOG/Pages/WeekPlan.razor.cs index 865c7ff..a91696b 100644 --- a/GPW.CORE.WRKLOG/Pages/WeekPlan.razor.cs +++ b/GPW.CORE.WRKLOG/Pages/WeekPlan.razor.cs @@ -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() From 9de4f5c6386a563d100e6b774adb28958e642888 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Sat, 2 Apr 2022 10:26:28 +0200 Subject: [PATCH 2/2] refresh codice --- GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj | 2 +- Resources/ChangeLog.html | 2 +- Resources/VersNum.txt | 2 +- Resources/manifest.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj b/GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj index 0e7e39d..afd3504 100644 --- a/GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj +++ b/GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj @@ -2,7 +2,7 @@ net6.0 - 3.0.2204.0115 + 3.0.2204.0210 enable enable diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index 2a6a3bd..55e613f 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ GPW - Gestione Presenze Web -

Versione: 3.0.2204.0115

+

Versione: 3.0.2204.0210


Note di rilascio: