diff --git a/GPW.CORE.Data/Controllers/GPWController.cs b/GPW.CORE.Data/Controllers/GPWController.cs index 809a506..85273b4 100644 --- a/GPW.CORE.Data/Controllers/GPWController.cs +++ b/GPW.CORE.Data/Controllers/GPWController.cs @@ -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; diff --git a/GPW.CORE.SMART/Components/BottoniEntrEsc.razor b/GPW.CORE.SMART/Components/BottoniEntrEsc.razor index 504cdeb..ecb5459 100644 --- a/GPW.CORE.SMART/Components/BottoniEntrEsc.razor +++ b/GPW.CORE.SMART/Components/BottoniEntrEsc.razor @@ -1,22 +1,22 @@ 
@if (IsRicTimb) { - - + + } else { @if (nextIsEntrata) { - + } else { - + } }
diff --git a/GPW.CORE.SMART/Components/BottoniEntrEsc.razor.cs b/GPW.CORE.SMART/Components/BottoniEntrEsc.razor.cs index a5b824d..cbd3f7f 100644 --- a/GPW.CORE.SMART/Components/BottoniEntrEsc.razor.cs +++ b/GPW.CORE.SMART/Components/BottoniEntrEsc.razor.cs @@ -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; } diff --git a/GPW.CORE.WRKLOG/Components/DayHoriz.razor b/GPW.CORE.WRKLOG/Components/DayHoriz.razor index 5fc9a86..2a13cd3 100644 --- a/GPW.CORE.WRKLOG/Components/DayHoriz.razor +++ b/GPW.CORE.WRKLOG/Components/DayHoriz.razor @@ -29,7 +29,7 @@ } else { - + @**@
@if (@DayDTO != null && @DayDTO.ListTimbr != null) { @@ -61,7 +61,7 @@ } }
- + @**@
@if (@noData) { diff --git a/GPW.CORE.WRKLOG/Components/TimbrEditor.razor.cs b/GPW.CORE.WRKLOG/Components/TimbrEditor.razor.cs index f5d4e59..98f3fe7 100644 --- a/GPW.CORE.WRKLOG/Components/TimbrEditor.razor.cs +++ b/GPW.CORE.WRKLOG/Components/TimbrEditor.razor.cs @@ -36,13 +36,13 @@ namespace GPW.CORE.WRKLOG.Components protected List _listTimb { get; set; } = new List(); [Inject] - protected GpwDataService GDataServ { get; set; } = null!; + private GpwDataService GDataServ { get; set; } = null!; protected bool IsUscita { get; set; } = false; - protected List? ListTimbAppr { get; set; } + private List? ListTimbAppr { get; set; } - protected List? ListTimbRich { get; set; } + private List? ListTimbRich { get; set; } protected string txtMsgInOut { diff --git a/GPW.CORE.WRKLOG/Data/GpwDataService.cs b/GPW.CORE.WRKLOG/Data/GpwDataService.cs index 25133eb..548a10e 100644 --- a/GPW.CORE.WRKLOG/Data/GpwDataService.cs +++ b/GPW.CORE.WRKLOG/Data/GpwDataService.cs @@ -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"; diff --git a/GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj b/GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj index ca66ae4..41d1564 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.2301.1614 + 3.0.2301.1713 enable enable diff --git a/GPW.CORE.WRKLOG/Pages/WeekPlan.razor.cs b/GPW.CORE.WRKLOG/Pages/WeekPlan.razor.cs index 54b5772..8911b92 100644 --- a/GPW.CORE.WRKLOG/Pages/WeekPlan.razor.cs +++ b/GPW.CORE.WRKLOG/Pages/WeekPlan.razor.cs @@ -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); diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index 0e604ba..a5b2186 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ GPW - Gestione Presenze Web -

Versione: 3.0.2301.1614

+

Versione: 3.0.2301.1713


Note di rilascio:
  • diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt index fec5df6..3006e62 100644 --- a/Resources/VersNum.txt +++ b/Resources/VersNum.txt @@ -1 +1 @@ -3.0.2301.1614 +3.0.2301.1713 diff --git a/Resources/manifest.xml b/Resources/manifest.xml index 9075a64..09b26e1 100644 --- a/Resources/manifest.xml +++ b/Resources/manifest.xml @@ -1,6 +1,6 @@ - 3.0.2301.1614 + 3.0.2301.1713 http://nexus.steamware.net/repository/SWS/GWMS/stable/0/GWMS.UI.zip http://nexus.steamware.net/repository/SWS/GWMS/stable/0/ChangeLog.html false