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

Merge branch 'develop' of https://gitlab.steamware.net/steamware/gpw_next into develop

Browse Source
This commit is contained in:
zaccaria.majid
2023-01-17 13:25:07 +01:00
parent 54d9dade4b 83ab057286
commit 5166c4bc5e
11 changed files with 22 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GPW.CORE.Data/Controllers/GPWController.cs
+4 -2
View File
@@ -558,9 +558,11 @@ namespace GPW.CORE.Data.Controllers
DtRif = thisDay,
ListRA = rawRegAtt
.Where(x => thisDay <= x.Inizio && x.Inizio < thisDay.AddDays(1))
.OrderBy(x => x.Inizio)
.ToList(),
ListTimbr = rawTimbr
.Where(x => thisDay <= x.DataOra && x.DataOra < thisDay.AddDays(1))
.OrderBy(x => x.DataOra)
.ToList(),
TimbrExpl = rawTimbExp
.Where(x => thisDay == x.DataLav)
@@ -632,8 +634,8 @@ namespace GPW.CORE.Data.Controllers
if (currItem.IdxDipendente > 0)
{
var currRec = localDbCtx
.DbSetDipendenti
.FirstOrDefault(x => x.IdxDipendente == currItem.IdxDipendente);
.DbSetDipendenti
.FirstOrDefault(x => x.IdxDipendente == currItem.IdxDipendente);
if (currRec != null)
{
currRec.Cognome = currItem.Cognome;
GPW.CORE.SMART/Components/BottoniEntrEsc.razor
+4 -4
View File
@@ -1,22 +1,22 @@
<div class="buttons">
@if (IsRicTimb)
{
<button class="mancTimb" @onclick="() =>doRichiesta(true)"><i class="fa-solid fa-right-to-bracket"></i>&nbsp;&nbsp;ENTRATA</button>
<button class="mancTimb" @onclick="() =>doRichiesta(false)">USCITA&nbsp;&nbsp;<i class="fa-solid fa-right-from-bracket"></i></button>
<button class="mancTimb" @onclick="() => doRichiesta(true)"><i class="fa-solid fa-right-to-bracket"></i>&nbsp;&nbsp;ENTRATA</button>
<button class="mancTimb" @onclick="() => doRichiesta(false)">USCITA&nbsp;&nbsp;<i class="fa-solid fa-right-from-bracket"></i></button>
}
else
{
@if (nextIsEntrata)
{
<button class="entrata" @onclick="() =>registraTimbratura(true)"><i class="fa-solid fa-right-to-bracket"></i>&nbsp;&nbsp;ENTRATA</button>
<button class="entrata" @onclick="() => registraTimbratura(true)"><i class="fa-solid fa-right-to-bracket"></i>&nbsp;&nbsp;ENTRATA</button>
<button class="uscitaDisabled" disabled>USCITA&nbsp;&nbsp;<i class="fa-solid fa-right-from-bracket"></i></button>
}
else
{
<button class="entrataDisabled" disabled><i class="fa-solid fa-right-to-bracket"></i>&nbsp;&nbsp;ENTRATA</button>
<button class="uscita" @onclick="() =>registraTimbratura(false)">USCITA&nbsp;&nbsp;<i class="fa-solid fa-right-from-bracket"></i></button>
<button class="uscita" @onclick="() => registraTimbratura(false)">USCITA&nbsp;&nbsp;<i class="fa-solid fa-right-from-bracket"></i></button>
}
}
</div>
GPW.CORE.SMART/Components/BottoniEntrEsc.razor.cs
+4 -7
View File
@@ -15,9 +15,6 @@ namespace GPW.CORE.Smart.Components
#region Public Properties
private DateTime DataRif = DateTime.Now;
//private DateTime DataRifMancTimb {
// get => MService.targetDate;
//}
[Parameter]
public int IdxDipendente { get; set; } = -1;
@@ -46,7 +43,7 @@ namespace GPW.CORE.Smart.Components
#region Protected Methods
protected async void DoAdd(bool IsUscita)
protected async Task DoAdd(bool IsUscita)
{
// var accessorie / base
TimbratureModel currRecord = new TimbratureModel();
@@ -108,7 +105,7 @@ namespace GPW.CORE.Smart.Components
currRecord = new TimbratureModel()
{
Entrata = !IsUscita,
Approv = true,
Approv = false,
CodTipoTimb = "Web",
DataOra = DataRif,
IdxDipendente = MService.IdxDipendente,
@@ -189,11 +186,11 @@ namespace GPW.CORE.Smart.Components
lastAction = $"Registrato evento {lastAct} alle {adesso:HH:mm}";
// inidico inizio update
isRecording = true;
DoAdd(!isEntrata);
await DoAdd(!isEntrata);
nextIsEntrata = !isEntrata;
MService.ReportTimbratura();
// chiudo visualizzazione stato update
await Task.Delay(3000);
await Task.Delay(5000);
isRecording = false;
}
GPW.CORE.WRKLOG/Components/DayHoriz.razor
+2 -2
View File
@@ -29,7 +29,7 @@
}
else
{
<!-- Timbrature -->
@*<!-- Timbrature -->*@
<div class="d-flex justify-content-between text-center">
@if (@DayDTO != null && @DayDTO.ListTimbr != null)
{
@@ -61,7 +61,7 @@
}
}
</div>
<!-- RegAtt -->
@*<!-- RegAtt -->*@
<div class="d-flex justify-content-between text-center">
@if (@noData)
{
GPW.CORE.WRKLOG/Components/TimbrEditor.razor.cs
+3 -3
View File
@@ -36,13 +36,13 @@ namespace GPW.CORE.WRKLOG.Components
protected List<TimbratureModel> _listTimb { get; set; } = new List<TimbratureModel>();
[Inject]
protected GpwDataService GDataServ { get; set; } = null!;
private GpwDataService GDataServ { get; set; } = null!;
protected bool IsUscita { get; set; } = false;
protected List<TimbratureModel>? ListTimbAppr { get; set; }
private List<TimbratureModel>? ListTimbAppr { get; set; }
protected List<TimbratureModel>? ListTimbRich { get; set; }
private List<TimbratureModel>? ListTimbRich { get; set; }
protected string txtMsgInOut
{
GPW.CORE.WRKLOG/Data/GpwDataService.cs
+1 -1
View File
@@ -1371,7 +1371,7 @@ namespace GPW.CORE.WRKLOG.Data
#region Protected Fields
protected const string passPhrase = "6E1DA6B4-4647-4578-AB4F-01360E2B7E68";
protected const string redisBaseAddr = "WrkLog:";
protected const string redisBaseAddr = "WrkLog";
protected const string rKeyAKV = $"{redisBaseAddr}:Cache:AKV";
GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj
+1 -1
View File
@@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Version>3.0.2301.1614</Version>
<Version>3.0.2301.1713</Version>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
GPW.CORE.WRKLOG/Pages/WeekPlan.razor.cs
-5
View File
@@ -335,11 +335,6 @@ namespace GPW.CORE.WRKLOG.Pages
protected override async Task OnParametersSetAsync()
{
// return base.OnParametersSetAsync();
//}
//protected override async Task OnInitializedAsync()
//{
weekStatList = null;
ListRecords = null;
await InvokeAsync(StateHasChanged);
Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>GPW - Gestione Presenze Web</i>
<h4>Versione: 3.0.2301.1614</h4>
<h4>Versione: 3.0.2301.1713</h4>
<br /> Note di rilascio:
<ul>
<li>
Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
3.0.2301.1614
3.0.2301.1713
Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>3.0.2301.1614</version>
<version>3.0.2301.1713</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>