Egalware/mapo-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PROG

Browse Source 
- correzione disabilitazione filtro path file e username
This commit is contained in:
Samuele Locatelli
2024-10-23 18:14:55 +02:00
parent 4ee2ef1eb9
commit b3b81de6a8
7 changed files with 59 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP.Prog/Components/SearchMod.razor
+1 -4
View File
@@ -6,10 +6,7 @@
<div class="input-group input-group-sm">
<DebounceInput id="sVal" class="form-control" placeholder="@("Ricerca (min " + _minChar + " char)")" autocomplete="off" @ref="debInput" @bind-Value="@_searchVal" @bind-Value:event="OnInput" DebounceTime="@_debMsec" MinLength="@_minChar" OnValueChanged="e => { searchVal = e; }" ForceNotifyByEnter="true" ForceNotifyOnBlur="true" />
<div class="input-group-append">
<button @onclick="reset" class="btn btn-success">reset</button>
</div>
<button @onclick="reset" class="btn btn-success"><i class="fa-solid fa-xmark"></i></button>
</div>
@code {
MP.Prog/MP.Prog.csproj
+1 -1
View File
@@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>MP.Prog</RootNamespace>
<Version>6.16.2410.2317</Version>
<Version>6.16.2410.2318</Version>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
</PropertyGroup>
MP.Prog/Pages/Archive.razor
+3 -3
View File
@@ -6,7 +6,7 @@
<div class="px-0">
<h4>Elenco Programmi</h4>
<div class="form-group mb-0">
<button class="btn btn-warning btn-sm" @onclick="() => ForceCheck(30)" title="Analisi Modifiche ultimi 30gg">
<button class="btn btn-outline-warning btn-sm" @onclick="() => ForceCheck(30)" title="Analisi Modifiche ultimi 30gg">
<i class="fas fa-sync-alt"></i> Update (30gg) <i class="far fa-folder-open"></i>
</button>
@if (OnlyMod && totalCount >= 0)
@@ -60,11 +60,11 @@
<div class="px-0 text-truncate">
@if (!string.IsNullOrEmpty(SelFileName))
{
<span class="badge bg-secondary me-1" title="@SelFileName">@TextReduce(SelFileName, 20)</span>
<button class="btn btn-sm btn-secondary py-0 me-1" title="@SelFileName" @onclick="FilterPathRemove">@TextReduce(SelFileName, 25) <i class="fa-solid fa-xmark"></i></button>
}
@if (!string.IsNullOrEmpty(SelUserName))
{
<span class="badge bg-dark text-light" title="@SelUserName">@TextReduce(SelUserName, 20)</span>
<button class="btn btn-sm btn-dark text-light py-0" title="@SelUserName" @onclick="FilterUserNameRemove">@TextReduce(SelUserName, 20) <i class="fa-solid fa-xmark"></i></button>
}
</div>
<div class="px-0">
MP.Prog/Pages/Archive.razor.cs
+51 -18
View File
@@ -116,6 +116,25 @@ namespace MP.Prog.Pages
return MeasureUtils.SizeSuffix(origSize, 1);
}
/// <summary>
/// Elimina record (non approvato) corrente e riattiva precedente
/// </summary>
/// <returns></returns>
protected async Task DeleteRec(FileModel CurrRec)
{
if (!await JSRuntime.InvokeAsync<bool>("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
}
/// <summary>
/// Elimina record (non approvato) corrente e riattiva precedente
/// Esegue filtraggio sul Path di ricerca
/// </summary>
/// <param name="searchVal"></param>
/// <returns></returns>
protected async Task DeleteRec(FileModel CurrRec)
{
if (!await JSRuntime.InvokeAsync<bool>("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;
}
/// <summary>
/// Elimina il filtro x path file
/// </summary>
/// <returns></returns>
protected async Task FilterPathRemove()
{
await FilterPath("");
OnlyActive = true;
}
/// <summary>
/// Imposta filtro x Tags
/// </summary>
/// <param name="searchVal"></param>
/// <returns></returns>
protected async Task FilterTag(string searchVal)
{
SelTag = searchVal;
@@ -180,6 +199,11 @@ namespace MP.Prog.Pages
isLoading = false;
}
/// <summary>
/// Imposta filtro x utente
/// </summary>
/// <param name="userName"></param>
/// <returns></returns>
protected async Task FilterUserName(string userName)
{
SelUserName = userName;
@@ -189,6 +213,15 @@ namespace MP.Prog.Pages
isLoading = false;
}
/// <summary>
/// Resetta filtro x utente
/// </summary>
/// <returns></returns>
protected async Task FilterUserNameRemove()
{
await FilterUserName("");
}
/// <summary>
/// Esegue comparazione tra dati DB e filesystem (modificati entro numDays)
/// </summary>
@@ -216,7 +249,7 @@ namespace MP.Prog.Pages
return;
//verifico che sia cliccato solo modificati...
if(OnlyMod)
if (OnlyMod)
{
foreach (var item in ListRecords)
{
MP.Prog/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo gestione Programmi MAPO</i>
<h4>Versione: 6.16.2410.2317</h4>
<h4>Versione: 6.16.2410.2318</h4>
<br />
Note di rilascio:
<ul>
MP.Prog/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2410.2317
6.16.2410.2318
MP.Prog/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.16.2410.2317</version>
<version>6.16.2410.2318</version>
<url>https://nexus.steamware.net/repository/SWS/MP-PROG/stable/LAST/MP.Prog.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/MP-PROG/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>