From ce30ca1eba059f8dc3ca075435508bf27f4608b3 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 16 Jan 2023 14:30:31 +0100 Subject: [PATCH] Sposstato toggler in componenti --- .../Toggler.razor | 5 --- .../Toggler.razor.cs | 3 +- .../Components/CalendarioAziendale.razor.cs | 2 +- GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj | 4 +- GPW.CORE.WRKLOG/Pages/DayOff.razor.cs | 45 ++++++++++--------- 5 files changed, 30 insertions(+), 29 deletions(-) rename {GPW.CORE.WRKLOG/Components => GPW.CORE.Comp}/Toggler.razor (98%) rename {GPW.CORE.WRKLOG/Components => GPW.CORE.Comp}/Toggler.razor.cs (99%) diff --git a/GPW.CORE.WRKLOG/Components/Toggler.razor b/GPW.CORE.Comp/Toggler.razor similarity index 98% rename from GPW.CORE.WRKLOG/Components/Toggler.razor rename to GPW.CORE.Comp/Toggler.razor index 38e98c0..65578e4 100644 --- a/GPW.CORE.WRKLOG/Components/Toggler.razor +++ b/GPW.CORE.Comp/Toggler.razor @@ -7,8 +7,3 @@ @rightString - - - - - diff --git a/GPW.CORE.WRKLOG/Components/Toggler.razor.cs b/GPW.CORE.Comp/Toggler.razor.cs similarity index 99% rename from GPW.CORE.WRKLOG/Components/Toggler.razor.cs rename to GPW.CORE.Comp/Toggler.razor.cs index 59b5f28..412ecaf 100644 --- a/GPW.CORE.WRKLOG/Components/Toggler.razor.cs +++ b/GPW.CORE.Comp/Toggler.razor.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Components; -namespace GPW.CORE.WRKLOG.Components +namespace GPW.CORE.Comp { public partial class Toggler { @@ -205,6 +205,7 @@ namespace GPW.CORE.WRKLOG.Components #region Protected Methods + protected override async Task OnInitializedAsync() { if (isActive) diff --git a/GPW.CORE.WRKLOG/Components/CalendarioAziendale.razor.cs b/GPW.CORE.WRKLOG/Components/CalendarioAziendale.razor.cs index 683da7d..eb23bc4 100644 --- a/GPW.CORE.WRKLOG/Components/CalendarioAziendale.razor.cs +++ b/GPW.CORE.WRKLOG/Components/CalendarioAziendale.razor.cs @@ -1,7 +1,7 @@ using BlazorCalendar; using BlazorCalendar.Models; using Microsoft.AspNetCore.Components; -using static GPW.CORE.WRKLOG.Components.Toggler; +using static GPW.CORE.Comp.Toggler; namespace GPW.CORE.WRKLOG.Components { diff --git a/GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj b/GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj index 4a46b2e..7dc7f88 100644 --- a/GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj +++ b/GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj @@ -2,13 +2,14 @@ net6.0 - 3.0.2301.1307 + 3.0.2301.1613 enable enable + @@ -16,6 +17,7 @@ + diff --git a/GPW.CORE.WRKLOG/Pages/DayOff.razor.cs b/GPW.CORE.WRKLOG/Pages/DayOff.razor.cs index a362126..d419b36 100644 --- a/GPW.CORE.WRKLOG/Pages/DayOff.razor.cs +++ b/GPW.CORE.WRKLOG/Pages/DayOff.razor.cs @@ -1,9 +1,8 @@ -using BlazorCalendar; using BlazorCalendar.Models; using GPW.CORE.Data.DbModels; using GPW.CORE.WRKLOG.Data; using Microsoft.AspNetCore.Components; -using static GPW.CORE.WRKLOG.Components.Toggler; +using static GPW.CORE.Comp.Toggler; namespace GPW.CORE.WRKLOG.Pages { @@ -32,35 +31,18 @@ namespace GPW.CORE.WRKLOG.Pages protected int idxDipendente { get => AppMServ.IdxDipendente; - //set => AppMServ.IdxDipendente = value; } #endregion Protected Properties #region Protected Methods - private bool showMalattie { get; set; } = false; - protected override async Task OnInitializedAsync() { - ToggleData = new SelectGlobalToggle() - { - leftString = "Malattie", - rightString = "Ferie e Permessi", - placardCss = "bg-light border-light text-dark", - }; + initToggler(); await ReloadData(); } - private async Task evToggled(SelectGlobalToggle newTogData) - { - ToggleData = newTogData; - showMalattie = !ToggleData.isActive; - await Task.Delay(1); - } - - private SelectGlobalToggle ToggleData { get; set; } = new SelectGlobalToggle(); - #endregion Protected Methods #region Private Fields @@ -77,8 +59,10 @@ namespace GPW.CORE.WRKLOG.Pages private List CalendarTasksList { get; set; } = new List(); private List ListFermateAzienda { get; set; } = new List(); - private List ListRichiesteDip { get; set; } = new List(); private List ListMalattie { get; set; } = new List(); + private List ListRichiesteDip { get; set; } = new List(); + private bool showMalattie { get; set; } = false; + private SelectGlobalToggle ToggleData { get; set; } = new SelectGlobalToggle(); #endregion Private Properties @@ -104,11 +88,13 @@ namespace GPW.CORE.WRKLOG.Pages case "MAL": answ = conf ? "#000" : "#696969"; break; + default: break; } return answ; } + private string colorTextByGiustStato(string codGiust, bool conf) { string answ = "#EDEDED"; @@ -136,11 +122,28 @@ namespace GPW.CORE.WRKLOG.Pages return answ; } + private async Task evToggled(SelectGlobalToggle newTogData) + { + ToggleData = newTogData; + showMalattie = !ToggleData.isActive; + await Task.Delay(1); + } + private async Task ForceReloadCal() { await ReloadData(); } + private void initToggler() + { + ToggleData = new SelectGlobalToggle() + { + leftString = "Malattie", + rightString = "Ferie e Permessi", + placardCss = "bg-light border-light text-dark", + }; + } + private async Task ReloadData() { isLoading = true;