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

Completata navigazione week

Browse Source
This commit is contained in:
Samuele Locatelli
2022-01-11 15:37:27 +01:00
parent 3a6da03b4a
commit f5c7d14fa4
7 changed files with 85 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GPW.CORE.UI/Components/WeekStat.razor
+20 -2
View File
@@ -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
{ }
GPW.CORE.UI/GPW.CORE.UI.csproj
+1 -1
View File
@@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Version>3.0.2201.1114</Version>
<Version>3.0.2201.1115</Version>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
GPW.CORE.UI/Pages/Planner.razor
+44 -14
View File
@@ -6,7 +6,7 @@
<dialog class="modal fade show" tabindex="-1" style="display:block; background-color: rgba(10,10,10,.6);" aria-modal="true" role="dialog">
<div class="modal-dialog modal-xl">
<div class="modal-content">
<WeekSelector CloseReq="ResetSelPeriodo" WeekSelected="ReloadPeriodo"></WeekSelector>
<WeekSelector CloseReq="ResetSelPeriodo" WeekSelected="ReloadPeriodo"></WeekSelector>
</div>
</div>
</dialog>
@@ -36,20 +36,46 @@ else if (ListTimbr != null)
<div class="card-header table-primary py-1">
<div class="row">
<div class="col-12 col-lg-2 text-center">
<h3>Week Plan</h3>
<div class="d-flex justify-content-between">
<div class="py-0 px-1">
<sub>@currWeekSel.inizio.ToString("ddd dd.MM")</sub>
</div>
<div class="py-0 px-1">
<button class="btn btn-sm btn-primary" @onclick="() => ShowSelPeriodo()">
W <b>@currWeekNum.ToString("00")</b><sub>/@currYear</sub>
</button>
</div>
<div class="py-0 px-1">
<sub>@currWeekSel.fine.ToString("ddd dd.MM")</sub>
</div>
<div class="btn-group w-100 mb-1">
<button class="btn btn-sm btn-dark pt-1 pb-0" @onclick="() => ResetWeek()">
<h3><i class="fas fa-home"></i> Week Plan</h3>
</button>
</div>
<div class="btn-group w-100">
<button class="btn btn-sm btn-info py-0" @onclick="() => MoveWeek(-4)">
<div><sub>@currWeekSel.inizio.ToString("dd.MM.yy")</sub></div>
<i class="fas fa-angle-double-left"></i>
</button>
<button class="btn btn-sm btn-primary py-0" @onclick="() => ShowSelPeriodo()">
<div>Week <b>@currWeekNum.ToString("00")</b></div>
<sub>@currYear</sub>
</button>
<button class="btn btn-sm btn-info py-0" @onclick="() => MoveWeek(4)">
<div><sub>@currWeekSel.fine.ToString("dd.MM.yy")</sub></div>
<i class="fas fa-angle-double-right"></i>
</button>
</div>
@*<div class="d-flex justify-content-between">
<div class="py-0 px-1">
<button class="btn btn-sm btn-block btn-info" @onclick="() => MoveWeek(-4)">
<div><sub>@currWeekSel.inizio.ToString("dd.MM.yy")</sub></div>
<i class="fas fa-angle-double-left"></i>
</button>
</div>
<div class="py-0 px-1">
<button class="btn btn-sm btn-block btn-primary" @onclick="() => ShowSelPeriodo()">
<div>W <b>@currWeekNum.ToString("00")</b></div>
<sub>@currYear</sub>
</button>
</div>
<div class="py-0 px-1">
<button class="btn btn-sm btn-block btn-info" @onclick="() => MoveWeek(4)">
<div><sub>@currWeekSel.fine.ToString("dd.MM.yy")</sub></div>
<i class="fas fa-angle-double-right"></i>
</button>
</div>
</div>*@
</div>
<div class="col-12 col-lg-10">
@if (weekStatList != null)
@@ -63,6 +89,10 @@ else if (ListTimbr != null)
}
</div>
}
else
{
<LoadingData></LoadingData>
}
</div>
</div>
</div>
GPW.CORE.UI/Pages/Planner.razor.cs
+17
View File
@@ -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;
Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>GPW - Gestione Presenze Web</i>
<h4>Versione: 3.0.2201.1114</h4>
<h4>Versione: 3.0.2201.1115</h4>
<br /> Note di rilascio:
<ul>
<li>
Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
3.0.2201.1114
3.0.2201.1115
Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>3.0.2201.1114</version>
<version>3.0.2201.1115</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>