diff --git a/GPW.CORE.ADM/Components/Compo/DipendentiMan.razor b/GPW.CORE.ADM/Components/Compo/DipendentiMan.razor index 174492b..d9366a8 100644 --- a/GPW.CORE.ADM/Components/Compo/DipendentiMan.razor +++ b/GPW.CORE.ADM/Components/Compo/DipendentiMan.razor @@ -3,7 +3,8 @@
-

Gestione Dipendenti

+

Gestione Dipendenti

(togliere card esterna) +
@@ -12,12 +13,20 @@
-
-
-

Dipendenti

+
+
+
+

Dipendenti

+
+
+ filtro attivi +
+
+ +
-
- +
+ elenco switch QRCode
@@ -53,7 +62,7 @@ Dati anagrafici Gruppo Stato licenza - Responsabile + Responsabile @@ -86,7 +95,16 @@ @($"{item.LuogoNascita}") - @($"{item.ProvNascita}") - @($"{item.NazNascita}") - @($"{item.DataNascita:dd/MM/yyyy}") @item.Gruppo @($"{item.DataAssunzione:dd/MM/yyyy}") - @($"{item.DataCessazione:dd/MM/yyyy}") - + + + + } diff --git a/GPW.CORE.ADM/Components/Compo/DipendentiMan.razor.cs b/GPW.CORE.ADM/Components/Compo/DipendentiMan.razor.cs index 3c7d916..ab40415 100644 --- a/GPW.CORE.ADM/Components/Compo/DipendentiMan.razor.cs +++ b/GPW.CORE.ADM/Components/Compo/DipendentiMan.razor.cs @@ -11,6 +11,9 @@ namespace GPW.CORE.ADM.Components.Compo { #region Protected Properties + [Inject] + protected MessageService AppMServ { get; set; } = null!; + [Inject] protected GpwDataService GDataServ { get; set; } = null!; @@ -28,6 +31,10 @@ namespace GPW.CORE.ADM.Components.Compo return answ; } + protected async Task CreateNew() + { + } + protected void DoEdit(DipendentiModel? selItem) { SelItem = selItem; @@ -45,22 +52,53 @@ namespace GPW.CORE.ADM.Components.Compo await ReloadData(); } + protected override async Task OnInitializedAsync() + { + await ReloadData(); + } + + protected async Task SetNumRec(int newNum) + { + numRecord = newNum; + currPage = 1; + await AppMServ.NumRowGridSet(gridKey, newNum); + await InvokeAsync(ReloadData); + } + + protected async Task SetPage(int newNum) + { + currPage = newNum; + await InvokeAsync(ReloadData); + } + + protected async Task SortRequested(Sorter.SortCallBack e) + { + sortField = e.ParamName; + sortAsc = e.IsAscending; + await ReloadData(); + } + #endregion Protected Methods #region Private Fields private static Logger Log = LogManager.GetCurrentClassLogger(); private int currPage = 1; + private string gridKey = "DipendentiMan"; private bool isLoading = false; private int numRecord = 10; private string searchVal = ""; private DipendentiModel? SelItem = null; private bool ShowInatt = false; + private bool sortAsc = true; + private string sortField = ""; + #endregion Private Fields #region Private Properties + private List? ListDipendenti { get; set; } = null; private List? ListRecords { get; set; } = null; private string mainDivCss @@ -72,11 +110,6 @@ namespace GPW.CORE.ADM.Components.Compo private DipendentiModel? SelRecord { get; set; } = null; private int totalCount { get; set; } = 0; - private bool sortAsc = true; - - private string sortField = ""; - - #endregion Private Properties #region Private Methods @@ -85,14 +118,14 @@ namespace GPW.CORE.ADM.Components.Compo { isLoading = true; ListRecords = null; - var rawList = await GDataServ.DipendentiGetAll(); + ListDipendenti = await GDataServ.DipendentiGetAll(); if (ShowInatt) { - SearchRecords = rawList; + SearchRecords = ListDipendenti; } else { - SearchRecords = rawList.Where(x => (x.Attivo ?? false)).ToList(); + SearchRecords = ListDipendenti.Where(x => (x.Attivo ?? false)).ToList(); } // eseguo filtro ricerca @@ -114,23 +147,6 @@ namespace GPW.CORE.ADM.Components.Compo isLoading = false; } - - - protected async Task CreateNew() - { - - } - - - protected async Task SortRequested(Sorter.SortCallBack e) - { - sortField = e.ParamName; - sortAsc = e.IsAscending; - await ReloadData(); - } - - - private void SortTable() { if (SearchRecords != null) @@ -302,11 +318,6 @@ namespace GPW.CORE.ADM.Components.Compo } } - protected override async Task OnInitializedAsync() - { - await ReloadData(); - } - #endregion Private Methods } } \ No newline at end of file diff --git a/GPW.CORE.ADM/GPW.CORE.ADM.csproj b/GPW.CORE.ADM/GPW.CORE.ADM.csproj index 34fa867..dee8c86 100644 --- a/GPW.CORE.ADM/GPW.CORE.ADM.csproj +++ b/GPW.CORE.ADM/GPW.CORE.ADM.csproj @@ -4,7 +4,7 @@ net8.0 enable enable - 4.1.2506.2311 + 4.1.2506.2312 diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index cb874a3..c39be88 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ GPW - Gestione Presenze Web -

Versione: 4.1.2506.2311

+

Versione: 4.1.2506.2312


Note di rilascio:
  • diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt index cfc4b0f..694a590 100644 --- a/Resources/VersNum.txt +++ b/Resources/VersNum.txt @@ -1 +1 @@ -4.1.2506.2311 +4.1.2506.2312 diff --git a/Resources/manifest.xml b/Resources/manifest.xml index 88ec20c..d1b5113 100644 --- a/Resources/manifest.xml +++ b/Resources/manifest.xml @@ -1,6 +1,6 @@ - 4.1.2506.2311 + 4.1.2506.2312 http://nexus.steamware.net/repository/SWS/GPW/stable/GPW.UI.zip http://nexus.steamware.net/repository/SWS/GPW/stable/ChangeLog.html false