Merge branch 'develop' into WasmTest

GPW.CORE.ADM/Components/Compo/SpostaOreMan.razor.cs

@@ -6,12 +6,20 @@ using GPW.CORE.Data.Services;
 using Microsoft.AspNetCore.Components;
 using Microsoft.JSInterop;
 using NLog;
-using System.Diagnostics;
 
 namespace GPW.CORE.ADM.Components.Compo
 {
-    public partial class SpostaOreMan
+    public partial class SpostaOreMan : IDisposable
     {
+        #region Public Methods
+
+        public void Dispose()
+        {
+            AppMServ.EA_SearchUpdated -= AppMServ_EA_SearchUpdated;
+        }
+
+        #endregion Public Methods
+
         #region Protected Properties
 
         [Inject]
@@ -236,6 +244,7 @@ namespace GPW.CORE.ADM.Components.Compo
 
         protected override async Task OnInitializedAsync()
         {
+            AppMServ.EA_SearchUpdated += AppMServ_EA_SearchUpdated;
             await ReloadBaseData();
         }
 
@@ -317,28 +326,49 @@ namespace GPW.CORE.ADM.Components.Compo
         #region Private Fields
 
         private static Logger Log = LogManager.GetCurrentClassLogger();
+
         private bool allSel = false;
+
         private int currPage = 1;
+
         private string gridKey = "TimbMan";
+
         private int idxCliFrom = 0;
+
         private int idxCliTo = 0;
+
         private int idxDipendente = 0;
+
         private int idxFaseFrom = 0;
+
         private int idxFaseTo = 0;
+
         private int idxProjFrom = 0;
+
         private int idxProjTo = 0;
+
         private bool isAncest = false;
 
         private bool isLoading = false;
+
         private int numRecord = 10;
+
         private bool ShowCliInattFrom = false;
+
         private bool ShowCliInattTo = false;
+
         private bool ShowDipInatt = false;
+
         private bool ShowFaseInattFrom = false;
+
         private bool ShowFaseInattTo = false;
+
         private bool ShowProjInattFrom = false;
+
         private bool ShowProjInattTo = false;
+
         private bool sortAsc = true;
+
         private string sortField = "";
 
         private int totalCount = 0;
@@ -348,10 +378,15 @@ namespace GPW.CORE.ADM.Components.Compo
         #region Private Properties
 
         private DtUtils.Periodo CurrPeriodo { get; set; } = new DtUtils.Periodo(DtUtils.PeriodSet.ThisMonth);
+
         private List<AnagClientiModel> ListClienti { get; set; } = new List<AnagClientiModel>();
+
         private List<DipendentiModel> ListDipendenti { get; set; } = new List<DipendentiModel>();
+
         private List<AnagFasiModel> ListFasi { get; set; } = new List<AnagFasiModel>();
+
         private List<AnagProgettiModel> ListProgetti { get; set; } = new List<AnagProgettiModel>();
+
         private List<RegAttDayExpDTO>? ListRecords { get; set; } = null;
 
         private string mainDivCss
@@ -360,12 +395,18 @@ namespace GPW.CORE.ADM.Components.Compo
         }
 
         private List<RegAttDayExpDTO>? SearchRecords { get; set; } = null;
+
         private RegAttDayExpDTO? SelRecord { get; set; } = null;
 
         #endregion Private Properties
 
         #region Private Methods
 
+        private async void AppMServ_EA_SearchUpdated()
+        {
+            await ReloadData();
+        }
+
         /// <summary>
         /// Caricamento dati "statici" dei selettori
         /// </summary>
@@ -380,11 +421,22 @@ namespace GPW.CORE.ADM.Components.Compo
 
         private async Task ReloadData()
         {
+            isLoading = true;
+            await InvokeAsync(StateHasChanged);
             // tolgo selezione toggle
             allSel = false;
 
             // carico i dati della tabella
             List<RegAttivitaDayExplModel> rawData = await GDataServ.RegAttDayExplList(idxDipendente, CurrPeriodo.Inizio, CurrPeriodo.Fine, idxCliFrom, idxProjFrom, idxFaseFrom, isAncest);
+
+            // se ho ricerca filtro (descrizione)
+            if (!string.IsNullOrWhiteSpace(AppMServ.SearchVal))
+            {
+                rawData = rawData
+                            .Where(x => x.Descrizione.Contains(AppMServ.SearchVal, StringComparison.InvariantCultureIgnoreCase))
+                            .ToList();
+            }
+
             // converto da model a DTO...
             SearchRecords = rawData
                             .Select(x => new RegAttDayExpDTO(x))
@@ -393,6 +445,9 @@ namespace GPW.CORE.ADM.Components.Compo
 
             // paginazione e sorting
             SortTable();
+
+            isLoading = false;
+            await InvokeAsync(StateHasChanged);
         }
 
         private async Task SavePeriodo(DtUtils.Periodo newPeiodo)

GPW.CORE.ADM/GPW.CORE.ADM.csproj

@@ -4,7 +4,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Version>4.1.2603.2810</Version>
+    <Version>4.1.2605.0611</Version>
   </PropertyGroup>
 
   <ItemGroup>

GPW.CORE.Smart8/GPW.CORE.Smart8.csproj

@@ -4,7 +4,7 @@
         <TargetFramework>net8.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
-        <Version>4.1.2603.3010</Version>
+        <Version>4.1.2604.0309</Version>
     </PropertyGroup>
 
     <ItemGroup>

Resources/ChangeLog.html

@@ -1,6 +1,6 @@
 <body>
     <i>GPW - Gestione Presenze Web</i>
-    <h4>Versione: 4.1.2603.3010</h4>
+    <h4>Versione: 4.1.2605.0611</h4>
     <br /> Note di rilascio:
     <ul>
         <li>

Resources/VersNum.txt

@@ -1 +1 @@
-4.1.2603.3010
+4.1.2605.0611

Resources/manifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>4.1.2603.3010</version>
-  <url>http://nexus.steamware.net/repository/SWS/GPW/stable/GPW.Smart.zip</url>
+  <version>4.1.2605.0611</version>
+  <url>http://nexus.steamware.net/repository/SWS/GPW/stable/GPW.UI.zip</url>
   <changelog>http://nexus.steamware.net/repository/SWS/GPW/stable/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
 </item>