diff --git a/GPW.CORE.UI/Components/WeekStat.razor b/GPW.CORE.UI/Components/WeekStat.razor index 9cce7bc..77a7eb3 100644 --- a/GPW.CORE.UI/Components/WeekStat.razor +++ b/GPW.CORE.UI/Components/WeekStat.razor @@ -108,6 +108,24 @@ } } + protected double denom + { + get + { + double answ = 40; + // cerco massimo tra ore lav e commesse... + if (currData.SumOreLav > answ) + { + answ = currData.SumOreLav; + } + if (currData.SumOreComm > answ) + { + answ = currData.SumOreComm; + } + return answ; + } + } + protected string styleLav { get @@ -117,7 +135,7 @@ { try { - valPerc = currData.SumOreLav / 64; + valPerc = currData.SumOreLav / denom; } catch { } @@ -134,7 +152,7 @@ { try { - valPerc = currData.SumOreComm / 64; + valPerc = currData.SumOreComm / denom; } catch { } diff --git a/GPW.CORE.UI/GPW.CORE.UI.csproj b/GPW.CORE.UI/GPW.CORE.UI.csproj index 20813bf..d3e18e3 100644 --- a/GPW.CORE.UI/GPW.CORE.UI.csproj +++ b/GPW.CORE.UI/GPW.CORE.UI.csproj @@ -2,7 +2,7 @@ net6.0 - 3.0.2201.1114 + 3.0.2201.1115 enable enable diff --git a/GPW.CORE.UI/Pages/Planner.razor b/GPW.CORE.UI/Pages/Planner.razor index e96db16..cfa8ea0 100644 --- a/GPW.CORE.UI/Pages/Planner.razor +++ b/GPW.CORE.UI/Pages/Planner.razor @@ -6,7 +6,7 @@ @@ -36,20 +36,46 @@ else if (ListTimbr != null)
-

Week Plan

-
-
- @currWeekSel.inizio.ToString("ddd dd.MM") -
-
- -
-
- @currWeekSel.fine.ToString("ddd dd.MM") -
+ +
+
+
+ + + +
+ @*
+
+ +
+
+ +
+
+ +
+
*@
@if (weekStatList != null) @@ -63,6 +89,10 @@ else if (ListTimbr != null) }
} + else + { + + }
diff --git a/GPW.CORE.UI/Pages/Planner.razor.cs b/GPW.CORE.UI/Pages/Planner.razor.cs index 571c1bd..dce699d 100644 --- a/GPW.CORE.UI/Pages/Planner.razor.cs +++ b/GPW.CORE.UI/Pages/Planner.razor.cs @@ -314,9 +314,12 @@ namespace GPW.CORE.UI.Pages protected async Task ReloadPeriodo() { selPeriod = false; + weekStatList = null; currRecord = null; ListTimbr = null; + await Task.Delay(1); await InitData(false); + await Task.Delay(1); await ReloadData(); } @@ -373,6 +376,20 @@ namespace GPW.CORE.UI.Pages selPeriod = true; } + protected async Task MoveWeek(int numWeek) + { + TargetDate = TargetDate.AddDays(numWeek * 7); + await InitData(false); + await ReloadData(); + } + protected async Task ResetWeek() + { + TargetDate = DateTime.Today; + await InitData(false); + await ReloadData(); + } + + protected async Task UpdRegAttData() { currRecord = null; diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index f73c7da..360601b 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ GPW - Gestione Presenze Web -

Versione: 3.0.2201.1114

+

Versione: 3.0.2201.1115


Note di rilascio: