diff --git a/MP.Prog/Components/SearchMod.razor b/MP.Prog/Components/SearchMod.razor index 1e5d7677..b1d4e49e 100644 --- a/MP.Prog/Components/SearchMod.razor +++ b/MP.Prog/Components/SearchMod.razor @@ -6,10 +6,7 @@
- -
- -
+
@code { diff --git a/MP.Prog/MP.Prog.csproj b/MP.Prog/MP.Prog.csproj index 8a1a91a0..5bf46fe1 100644 --- a/MP.Prog/MP.Prog.csproj +++ b/MP.Prog/MP.Prog.csproj @@ -3,7 +3,7 @@ net6.0 MP.Prog - 6.16.2410.2317 + 6.16.2410.2318 True diff --git a/MP.Prog/Pages/Archive.razor b/MP.Prog/Pages/Archive.razor index 51bf960a..9908e1b8 100644 --- a/MP.Prog/Pages/Archive.razor +++ b/MP.Prog/Pages/Archive.razor @@ -6,7 +6,7 @@

Elenco Programmi

- @if (OnlyMod && totalCount >= 0) @@ -60,11 +60,11 @@
@if (!string.IsNullOrEmpty(SelFileName)) { - @TextReduce(SelFileName, 20) + } @if (!string.IsNullOrEmpty(SelUserName)) { - @TextReduce(SelUserName, 20) + }
diff --git a/MP.Prog/Pages/Archive.razor.cs b/MP.Prog/Pages/Archive.razor.cs index 7d5039fd..934a7bf3 100644 --- a/MP.Prog/Pages/Archive.razor.cs +++ b/MP.Prog/Pages/Archive.razor.cs @@ -116,6 +116,25 @@ namespace MP.Prog.Pages return MeasureUtils.SizeSuffix(origSize, 1); } + /// + /// Elimina record (non approvato) corrente e riattiva precedente + /// + /// + protected async Task DeleteRec(FileModel CurrRec) + { + if (!await JSRuntime.InvokeAsync("confirm", "Sicuro di voler eliminare il record e riattivare la revisione antecedente? Il file potrebbe risultare modificato")) + return; + + // elimino + await FDService.FileDelete(CurrRec); + //// verifico eventuali modifiche + //var numCheck = await FDService.UpdateMachineArchive(CurrRec.IdxMacchina, 30, false, false, ""); + + isLoading = true; + await ReloadData(); + isLoading = false; + } + protected async Task Edit(FileModel selRecord) { if (!selRecord.Active) @@ -144,25 +163,10 @@ namespace MP.Prog.Pages } /// - /// Elimina record (non approvato) corrente e riattiva precedente + /// Esegue filtraggio sul Path di ricerca /// + /// /// - protected async Task DeleteRec(FileModel CurrRec) - { - if (!await JSRuntime.InvokeAsync("confirm", "Sicuro di voler eliminare il record e riattivare la revisione antecedente? Il file potrebbe risultare modificato")) - return; - - // elimino - await FDService.FileDelete(CurrRec); - //// verifico eventuali modifiche - //var numCheck = await FDService.UpdateMachineArchive(CurrRec.IdxMacchina, 30, false, false, ""); - - isLoading = true; - await ReloadData(); - isLoading = false; - } - - protected async Task FilterPath(string searchVal) { SelFileName = searchVal; @@ -172,6 +176,21 @@ namespace MP.Prog.Pages isLoading = false; } + /// + /// Elimina il filtro x path file + /// + /// + protected async Task FilterPathRemove() + { + await FilterPath(""); + OnlyActive = true; + } + + /// + /// Imposta filtro x Tags + /// + /// + /// protected async Task FilterTag(string searchVal) { SelTag = searchVal; @@ -180,6 +199,11 @@ namespace MP.Prog.Pages isLoading = false; } + /// + /// Imposta filtro x utente + /// + /// + /// protected async Task FilterUserName(string userName) { SelUserName = userName; @@ -189,6 +213,15 @@ namespace MP.Prog.Pages isLoading = false; } + /// + /// Resetta filtro x utente + /// + /// + protected async Task FilterUserNameRemove() + { + await FilterUserName(""); + } + /// /// Esegue comparazione tra dati DB e filesystem (modificati entro numDays) /// @@ -216,7 +249,7 @@ namespace MP.Prog.Pages return; //verifico che sia cliccato solo modificati... - if(OnlyMod) + if (OnlyMod) { foreach (var item in ListRecords) { diff --git a/MP.Prog/Resources/ChangeLog.html b/MP.Prog/Resources/ChangeLog.html index 8fc47a9f..16ff1099 100644 --- a/MP.Prog/Resources/ChangeLog.html +++ b/MP.Prog/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo gestione Programmi MAPO -

Versione: 6.16.2410.2317

+

Versione: 6.16.2410.2318


Note di rilascio:
    diff --git a/MP.Prog/Resources/VersNum.txt b/MP.Prog/Resources/VersNum.txt index 87e7119a..608cd781 100644 --- a/MP.Prog/Resources/VersNum.txt +++ b/MP.Prog/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2410.2317 +6.16.2410.2318 diff --git a/MP.Prog/Resources/manifest.xml b/MP.Prog/Resources/manifest.xml index 7422f1c2..d54cba42 100644 --- a/MP.Prog/Resources/manifest.xml +++ b/MP.Prog/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2410.2317 + 6.16.2410.2318 https://nexus.steamware.net/repository/SWS/MP-PROG/stable/LAST/MP.Prog.zip https://nexus.steamware.net/repository/SWS/MP-PROG/stable/LAST/ChangeLog.html false