diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj index 2ab421b2..5037cd5c 100644 --- a/MP.SPEC/MP.SPEC.csproj +++ b/MP.SPEC/MP.SPEC.csproj @@ -5,7 +5,7 @@ enable enable MP.SPEC - 8.16.2606.408 + 8.16.2606.409 1800a78a-6ff1-40f9-b490-87fb8bfc1394 en diff --git a/MP.SPEC/Pages/Operatori.razor b/MP.SPEC/Pages/Operatori.razor index b1fcb4a3..f70941a2 100644 --- a/MP.SPEC/Pages/Operatori.razor +++ b/MP.SPEC/Pages/Operatori.razor @@ -11,7 +11,18 @@
- @* Edit Massivo Fermi *@ +
+ + @if (ShowDetail) + { + + } + else + { + + } + +
@@ -24,7 +35,7 @@ {
- +
@if (SelRec != null) { diff --git a/MP.SPEC/Pages/Operatori.razor.cs b/MP.SPEC/Pages/Operatori.razor.cs index 75ec7e16..38d664aa 100644 --- a/MP.SPEC/Pages/Operatori.razor.cs +++ b/MP.SPEC/Pages/Operatori.razor.cs @@ -26,28 +26,31 @@ namespace MP.SPEC.Pages #region Private Fields private bool isLoading = false; - private List ListOperatori = new(); private List ListGruppi = new(); + private List ListOperatori = new(); + private string SearchVal = ""; private AnagOperatoriModel? SelRec = null; #endregion Private Fields #region Private Properties + private string btnSearchCss => string.IsNullOrWhiteSpace(SearchVal) ? "btn-secondary" : "btn-primary"; private string cssMain => SelRec == null ? "col-12" : "col-6"; + private bool ShowDetail => SelRec != null; + #endregion Private Properties #region Private Methods - private async Task ReloadDataAsync() + private async Task DoReset() { - isLoading = true; - ListOperatori = await MDService.OperatoriGetFiltAsync("*"); - isLoading = false; + SearchVal = ""; + await ReloadDataAsync(); } - private async Task ShowDetail(AnagOperatoriModel? newRec) + private async Task DoSelect(AnagOperatoriModel? newRec) { SelRec = newRec; if (SelRec == null) @@ -61,6 +64,22 @@ namespace MP.SPEC.Pages } } + private async Task ReloadDataAsync() + { + isLoading = true; + var rawList = await MDService.OperatoriGetFiltAsync("*"); + if (string.IsNullOrEmpty(SearchVal)) + { + ListOperatori = rawList; + } + else + { + ListOperatori = rawList + .Where(x => x.Cognome.Contains(SearchVal, StringComparison.InvariantCultureIgnoreCase) || x.Nome.Contains(SearchVal, StringComparison.InvariantCultureIgnoreCase)).ToList(); + } + isLoading = false; + } + #endregion Private Methods } } \ No newline at end of file diff --git a/MP.SPEC/Pages/RepOper.razor.cs b/MP.SPEC/Pages/RepOper.razor.cs index 0dda2fc3..0f3ec8fa 100644 --- a/MP.SPEC/Pages/RepOper.razor.cs +++ b/MP.SPEC/Pages/RepOper.razor.cs @@ -57,10 +57,7 @@ namespace MP.SPEC.Pages #region Private Properties - private string btnSearchCss - { - get => string.IsNullOrWhiteSpace(SearchVal) ? "btn-secondary" : "btn-primary"; - } + private string btnSearchCss => string.IsNullOrWhiteSpace(SearchVal) ? "btn-secondary" : "btn-primary"; private string CssMain => ShowDetail ? "col-4" : "col-12"; diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html index 6e774415..b6126dfe 100644 --- a/MP.SPEC/Resources/ChangeLog.html +++ b/MP.SPEC/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 8.16.2606.408

+

Versione: 8.16.2606.409


Note di rilascio:
  • diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt index 988a0006..722b7892 100644 --- a/MP.SPEC/Resources/VersNum.txt +++ b/MP.SPEC/Resources/VersNum.txt @@ -1 +1 @@ -8.16.2606.408 +8.16.2606.409 diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml index c43a43f3..85bf0bb0 100644 --- a/MP.SPEC/Resources/manifest.xml +++ b/MP.SPEC/Resources/manifest.xml @@ -1,6 +1,6 @@ - 8.16.2606.408 + 8.16.2606.409 https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/MP.SPEC.zip https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/ChangeLog.html false