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

Minor Update x reload

Browse Source
This commit is contained in:
Samuele Locatelli
2022-09-15 19:25:51 +02:00
parent 687a254a8d
commit 11934fcae2
3 changed files with 101 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP.SPEC/Components/ParamsFilter.razor
+90 -83
View File
@@ -1,96 +1,103 @@
<div class="d-flex justify-content-between">
<div class="px-0">
@if (!liveUpdate)
{
<button class="btn btn-secondary" type="button" @onclick="() => toggleUpdate()">
<small>@lastUpdate</small>
</button>
}
else
{
<button class="btn btn-primary" type="button" @onclick="() => toggleUpdate()">
<span class="spinner-grow spinner-grow-sm" role="status" aria-hidden="true"></span>
Valori live
</button>
}
</div>
<div class="px-0">
<div class="d-flex justify-content-end">
@if (showEditPar)
@if (ListFlux == null || ListMacchine == null)
{
<LoadingDataSmall></LoadingDataSmall>
}
else
{
<div class="d-flex justify-content-between">
<div class="px-0">
@if (!liveUpdate)
{
<div class="px-2">
<button class="btn btn-primary" @onclick="() => toggleParams()"> <i class="fa-solid fa-arrow-right"></i></button>
</div>
<div class="px-2">
<select @bind="@selTempoAgg" class="form-select">
<option value="2">2</option>
<option value="3">3</option>
<option value="4">4</option>
<option value="5">5</option>
<option value="6">6</option>
<option value="7">7</option>
<option value="8">8</option>
<option value="9">9</option>
<option value="10">10</option>
<option value="11">11</option>
<option value="12">12</option>
<option value="13">13</option>
<option value="14">14</option>
<option value="15">15</option>
<option value="16">16</option>
<option value="17">17</option>
<option value="18">18</option>
<option value="19">19</option>
<option value="20">20</option>
</select>
</div>
<div class="px-2">
<select @bind="@selMaxRecord" class="form-select">
<option value="50">50</option>
<option value="100">100</option>
<option value="150">150</option>
<option value="200">200</option>
<option value="250">250</option>
<option value="300">300</option>
<option value="350">350</option>
<option value="400">400</option>
<option value="450">450</option>
<option value="500">500</option>
</select>
</div>
<button class="btn btn-secondary" type="button" @onclick="() => toggleUpdate()">
<small>@lastUpdate</small>
</button>
}
else
{
<div class="px-2">
<button class="btn btn-primary" @onclick="() => toggleParams()"><i class="fa-solid fa-arrow-left"></i></button>
</div>
<button class="btn btn-primary" type="button" @onclick="() => toggleUpdate()">
<span class="spinner-grow spinner-grow-sm" role="status" aria-hidden="true"></span>
Valori live
</button>
}
<div class="px-2">
<select @bind="@selMacchina" class="form-select">
<option value="*">--- Tutti ---</option>
@if (ListMacchine != null)
{
foreach (var item in ListMacchine)
</div>
<div class="px-0">
<div class="d-flex justify-content-end">
@if (showEditPar)
{
<div class="px-2">
<button class="btn btn-primary" @onclick="() => toggleParams()"> <i class="fa-solid fa-arrow-right"></i></button>
</div>
<div class="px-2">
<select @bind="@selTempoAgg" class="form-select">
<option value="2">2</option>
<option value="3">3</option>
<option value="4">4</option>
<option value="5">5</option>
<option value="6">6</option>
<option value="7">7</option>
<option value="8">8</option>
<option value="9">9</option>
<option value="10">10</option>
<option value="11">11</option>
<option value="12">12</option>
<option value="13">13</option>
<option value="14">14</option>
<option value="15">15</option>
<option value="16">16</option>
<option value="17">17</option>
<option value="18">18</option>
<option value="19">19</option>
<option value="20">20</option>
</select>
</div>
<div class="px-2">
<select @bind="@selMaxRecord" class="form-select">
<option value="50">50</option>
<option value="100">100</option>
<option value="150">150</option>
<option value="200">200</option>
<option value="250">250</option>
<option value="300">300</option>
<option value="350">350</option>
<option value="400">400</option>
<option value="450">450</option>
<option value="500">500</option>
</select>
</div>
}
else
{
<div class="px-2">
<button class="btn btn-primary" @onclick="() => toggleParams()"><i class="fa-solid fa-arrow-left"></i></button>
</div>
}
<div class="px-2">
<select @bind="@selMacchina" class="form-select">
<option value="*">--- Tutti ---</option>
@if (ListMacchine != null)
{
<option value="@item">@item</option>
foreach (var item in ListMacchine)
{
<option value="@item">@item</option>
}
}
}
</select>
</div>
<div class="px-2">
<select @bind="@selFlux" class="form-select">
<option value="*">--- Tutti ---</option>
@if (ListFlux != null)
{
foreach (var item in ListFlux)
</select>
</div>
<div class="px-2">
<select @bind="@selFlux" class="form-select">
<option value="*">--- Tutti ---</option>
@if (ListFlux != null)
{
<option value="@item">@item</option>
foreach (var item in ListFlux)
{
<option value="@item">@item</option>
}
}
}
</select>
</select>
</div>
</div>
</div>
</div>
</div>
}
MP.SPEC/Components/ParamsFilter.razor.cs
+3 -9
View File
@@ -127,6 +127,7 @@ namespace MP.SPEC.Components
SelFilter = new SelectFluxParams();
ListMacchine = await MDService.MacchineWithFlux();
ListFlux = await MDService.ParametriGetFilt(selMacchina);
await FilterChanged.InvokeAsync(SelFilter);
}
protected void toggleParams()
@@ -148,8 +149,8 @@ namespace MP.SPEC.Components
#region Private Fields
private List<string>? ListFlux;
private List<string>? ListMacchine;
private List<string>? ListFlux = null;
private List<string>? ListMacchine = null;
#endregion Private Fields
@@ -161,13 +162,6 @@ namespace MP.SPEC.Components
#region Private Methods
private async Task reloadFiltFlux()
{
await Task.Delay(1);
ListFlux = await MDService.ParametriGetFilt(selMacchina);
await InvokeAsync(() => StateHasChanged());
}
private void reportChange()
{
FilterChanged.InvokeAsync(SelFilter);
MP.SPEC/Pages/PARAMS.razor.cs
+8 -15
View File
@@ -8,14 +8,14 @@ namespace MP.SPEC.Pages
{
#region Protected Fields
protected DataPager pagerODL;
protected DataPager pagerODL = null!;
#endregion Protected Fields
#region Protected Properties
[Inject]
protected MessageService MsgService { get; set; }
protected MessageService MsgService { get; set; } = null!;
#endregion Protected Properties
@@ -33,17 +33,15 @@ namespace MP.SPEC.Pages
StateHasChanged();
}
protected override async Task OnInitializedAsync()
protected override void OnInitialized()
{
isLoading = true;
// abilito ricerca...
MsgService.ShowSearch = false;
// resetto search
// disabilito ricerca...
MsgService.SearchVal = "";
MsgService.ShowSearch = false;
// fix pagina
currFilter.CurrPage = 1;
currFilter.LiveUpdate = (currPage == 1);
await Task.Delay(1);
isLoading = false;
}
protected async Task pgResetReq(bool doReset)
@@ -63,7 +61,6 @@ namespace MP.SPEC.Pages
#region Private Fields
private int _totalCount = 0;
#endregion Private Fields
@@ -77,7 +74,7 @@ namespace MP.SPEC.Pages
set => MsgService.currPage = value;
}
private bool isLoading { get; set; } = false;
private bool isLoading { get; set; } = true;
private int numRecord
{
@@ -85,11 +82,7 @@ namespace MP.SPEC.Pages
set => MsgService.numRecord = value;
}
private int totalCount
{
get => _totalCount;
set => _totalCount = value;
}
private int totalCount { get; set; } = 0;
#endregion Private Properties