Stat installazioni:

Update gestione paginazione (visibile solo dove serve) + fix calcolo di alcuni intems male filtrati
This commit is contained in:
Samuele Locatelli
2025-04-03 17:47:31 +02:00
parent 8c0aee6662
commit 5d72d21fb1
46 changed files with 125 additions and 63 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>License Manager</i>
<h4>Versione: 2.1.2503.2517</h4>
<h4>Versione: 2.1.2504.0316</h4>
<br /> Note di rilascio:
<ul>
<li>
+1 -1
View File
@@ -1 +1 @@
2.1.2503.2517
2.1.2504.0316
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>2.1.2503.2517</version>
<version>2.1.2504.0316</version>
<url>https://nexus.steamware.net/repository/SWS/LiMan/stable/LAST/LiMan.UI.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/LiMan/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>License Manager</i>
<h4>Versione: 2.1.2503.2517</h4>
<h4>Versione: 2.1.2504.0316</h4>
<br />
Note di rilascio:
<ul>
+1 -1
View File
@@ -1 +1 @@
2.1.2503.2517
2.1.2504.0316
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>2.1.2503.2517</version>
<version>2.1.2504.0316</version>
<url>https://nexus.steamware.net/repository/SWS/LiMan/stable/LAST/LiMan.Transfer.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/LiMan/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>
+4 -1
View File
@@ -274,7 +274,10 @@ else
<div class="row">
<div class="col-12">
<div class="card-footer">
<DataPager PageSize="numRecord" currPage="currPage" numRecordChanged="setNumRec" numPageChanged="setNumPage" totalCount="totalCount" showLoading="isLoading" PageSizeList="PageList" />
@if (totalCount > numRecord)
{
<DataPager PageSize="numRecord" currPage="currPage" numRecordChanged="setNumRec" numPageChanged="setNumPage" totalCount="totalCount" showLoading="isLoading" PageSizeList="PageList" />
}
</div>
</div>
</div>
+1
View File
@@ -231,6 +231,7 @@ namespace LiMan.UI.Components
protected async Task setNumRec(int newNum)
{
currPage = 1;
numRecord = newNum;
await ReloadData();
isLoading = false;
+8 -5
View File
@@ -34,10 +34,10 @@
{
<tr>
<td>
<button class="btn btn-sm @CssBtnInst(record.CodInst)" title="Fissa Cliente" @onclick="() => SetCliente(record)"><i class="fa-solid fa-location-crosshairs"></i> @record.Cliente</button>
<button class="btn btn-sm @CssBtnInst(record.CodInst) py-1 text-truncate" title="Fissa Cliente" @onclick="() => SetCliente(record)"><i class="fa-solid fa-location-crosshairs"></i> @record.Cliente</button>
</td>
<td>
<button class="btn btn-sm @CssBtnImp(record.CodImp) py-1" title="Fissa Dispositivo" @onclick="() => SetCodImp(record)"><i class="fa-solid fa-location-crosshairs"></i> @record.PcInst</button>
<button class="btn btn-sm @CssBtnImp(record.CodImp) py-1 text-truncate" title="Fissa Dispositivo" @onclick="() => SetCodImp(record)"><i class="fa-solid fa-location-crosshairs"></i> @record.PcInst</button>
</td>
@if (!HasFiltImp)
@@ -51,7 +51,10 @@
</table>
</div>
<div class="card-footer">
<DataPager PageSize="numRecord" currPage="currPage" numRecordChanged="setNumRec" numPageChanged="setNumPage" totalCount="totalCount" showLoading="isLoading" />
@if (totalCount > numRecord)
{
<DataPager PageSize="numRecord" currPage="currPage" numRecordChanged="setNumRec" numPageChanged="setNumPage" totalCount="totalCount" showLoading="isLoading" />
}
</div>
</div>
</div>
@@ -59,7 +62,7 @@
@if (HasFiltImp)
{
<div class="row">
<div class="col-6 px-1">
<div class="col-5 px-1">
<div class="mb-1">
<ListAppShort AppList="AppInstList" EC_ReqUpdateApp="ProcReqUpdate"></ListAppShort>
</div>
@@ -67,7 +70,7 @@
<ListInfoShort Title="License Data" DetailInfo="LicInfo" EnabAbbrev="true" MaxKeyChar="30"></ListInfoShort>
</div>
</div>
<div class="col-6 px-1">
<div class="col-7 px-1">
<div class="mb-1">
<ListInfoShort Title="Device Info" DetailInfo="DevInfo"></ListInfoShort>
</div>
+2 -1
View File
@@ -163,7 +163,7 @@ namespace LiMan.UI.Components
HasFiltImp = true;
CodImpSel = currRec.CodImp;
AppInstList = AppDetList
.Where(x => x.CodImp == currRec.CodImp)
.Where(x => x.CodImp == currRec.CodImp && x.IdxSubLic == currRec.IdxSubLic)
.ToList();
// se era selezionato cliente lo riseleziono...
if (HasFlitCli)
@@ -221,6 +221,7 @@ namespace LiMan.UI.Components
protected void setNumRec(int newNum)
{
currPage = 1;
numRecord = newNum;
ReloadData();
isLoading = false;
+4 -1
View File
@@ -92,6 +92,9 @@
}
</div>
<div class="card-footer">
<DataPager PageSize="numRecord" currPage="currPage" numRecordChanged="setNumRec" numPageChanged="setNumPage" totalCount="totalCount" showLoading="isLoading" />
@if (totalCount > numRecord)
{
<DataPager PageSize="numRecord" currPage="currPage" numRecordChanged="setNumRec" numPageChanged="setNumPage" totalCount="totalCount" showLoading="isLoading" />
}
</div>
</div>
@@ -101,6 +101,7 @@ namespace LiMan.UI.Components
protected void setNumRec(int newNum)
{
numRecord = newNum;
currPage = 1;
UpdateTable();
isLoading = false;
}
@@ -440,12 +440,6 @@ namespace LiMan.UI.Components
if (!string.IsNullOrEmpty(currArgs.newMessage))
{
isLoading = true;
#if false
// verifico se sia il cod impianto selezionato, nel faso forzo refreesh...
if (!string.IsNullOrEmpty(CodImpSel) && CodImpSel.Equals(currArgs.newMessage))
{
}
#endif
ReloadTaskStatus();
isLoading = false;
await InvokeAsync(StateHasChanged);
+8 -3
View File
@@ -20,7 +20,9 @@
@foreach (var item in ListRecord)
{
<tr>
<td>@item.CodApp</td>
<td>
@item.CodApp
</td>
<td class="text-end small">
@if (item.UpToDateStatus < 4 && item.CodApp.StartsWith("IOB-"))
{
@@ -29,14 +31,17 @@
</button>
}
@item.VersNumInstall
</td>
</td>
</tr>
}
</tbody>
</table>
</div>
<div class="card-footer p-0 small">
<DataPager PageSize="numRecord" currPage="currPage" numRecordChanged="setNumRec" numPageChanged="setNumPage" totalCount="totalCount" showLoading="isLoading" DisplSize="DataPager.ObjSize.small" NumPages="3" />
@if (totalCount > numRecord)
{
<DataPager PageSize="numRecord" currPage="currPage" numRecordChanged="setNumRec" numPageChanged="setNumPage" totalCount="totalCount" showLoading="isLoading" DisplSize="DataPager.ObjSize.small" NumPages="3" />
}
</div>
</div>
@@ -62,6 +62,7 @@ namespace LiMan.UI.Components
protected void setNumRec(int newNum)
{
currPage = 1;
numRecord = newNum;
ReloadData();
isLoading = false;
+4 -1
View File
@@ -146,6 +146,9 @@
}
</div>
<div class="card-footer">
<DataPager PageSize="numRecord" currPage="currPage" numRecordChanged="SetNum" numPageChanged="SetPage" totalCount="totalCount" showLoading="isLoading" />
@if (totalCount > numRecord)
{
<DataPager PageSize="numRecord" currPage="currPage" numRecordChanged="SetNumRecord" numPageChanged="SetPageNum" totalCount="totalCount" showLoading="isLoading" />
}
</div>
</div>
@@ -165,15 +165,16 @@ namespace LiMan.UI.Components
await fullReload();
}
protected async Task SetNum(int newNum)
protected async Task SetNumRecord(int newNum)
{
currPage = 1;
numRecord = newNum;
await AppMServ.NumRowGridSet(gridKey, newNum);
await ReloadAllData();
isLoading = false;
}
protected async Task SetPage(int newNum)
protected async Task SetPageNum(int newNum)
{
currPage = newNum;
await ReloadAllData();
@@ -65,6 +65,9 @@
}
</div>
<div class="card-footer bg-secondary text-light">
<DataPager PageSize="numRecord" currPage="currPage" numRecordChanged="PagerReloadNum" numPageChanged="PagerReloadPage" totalCount="totalCount" showLoading="isLoading" />
@if (totalCount > numRecord)
{
<DataPager PageSize="numRecord" currPage="currPage" numRecordChanged="SetNumRec" numPageChanged="SetPageNum" totaSetPagealCount" showLoading="isLoading" />
}
</div>
</div>
@@ -70,14 +70,15 @@ namespace LiMan.UI.Components
await ReloadAllData();
}
protected async Task PagerReloadNum(int newNum)
protected async Task SetNumRec(int newNum)
{
currPage = 1;
numRecord = newNum;
await ReloadAllData();
isLoading = false;
}
protected async Task PagerReloadPage(int newNum)
protected async Task SetPageNum(int newNum)
{
currPage = newNum;
await ReloadAllData();
+4 -1
View File
@@ -42,7 +42,10 @@
</table>
</div>
<div class="card-footer">
<DataPager PageSize="numRecord" currPage="currPage" numRecordChanged="setNumRec" numPageChanged="setNumPage" totalCount="totalCount" showLoading="isLoading" />
@if (totalCount > numRecord)
{
<DataPager PageSize="numRecord" currPage="currPage" numRecordChanged="setNumRec" numPageChanged="setNumPage" totalCount="totalCount" showLoading="isLoading" />
}
</div>
</div>
</div>
@@ -32,6 +32,7 @@ namespace LiMan.UI.Components
protected void setNumRec(int newNum)
{
currPage = 1;
numRecord = newNum;
ReloadData();
isLoading = false;
+7 -4
View File
@@ -25,7 +25,7 @@
<tbody>
@foreach (var item in ListRecord)
{
<tr>
<tr class="text-truncate">
@if (EnabAbbrev)
{
<td title="@item.Key">@(Abbrev(item.Key, MaxKeyChar))</td>
@@ -50,7 +50,7 @@
else
{
<td>@item.Key</td>
<td class="text-end small">@item.Value</td>
<td class="text-end small text-truncate" style="max-width: 15rem;" title="@item.Value">@item.Value</td>
}
</tr>
@if (!string.IsNullOrEmpty(keySelected) && item.Key.Equals(keySelected))
@@ -69,8 +69,11 @@
</table>
}
</div>
<div class="card-footer p-0 small">
<DataPager PageSize="numRecord" currPage="currPage" numRecordChanged="setNumRec" numPageChanged="setNumPage" totalCount="totalCount" showLoading="isLoading" DisplSize="DataPager.ObjSize.small" NumPages="3" />
<div class="card-footer p-0 small">
@if (totalCount > numRecord)
{
<DataPager PageSize="numRecord" currPage="currPage" numRecordChanged="setNumRec" numPageChanged="setNumPage" totalCount="totalCount" showLoading="isLoading" DisplSize="DataPager.ObjSize.small" NumPages="3" />
}
</div>
</div>
@@ -59,6 +59,7 @@ namespace LiMan.UI.Components
protected void setNumRec(int newNum)
{
currPage = 1;
numRecord = newNum;
ReloadData();
isLoading = false;
+4 -1
View File
@@ -81,6 +81,9 @@
}
</div>
<div class="card-footer">
<DataPager PageSize="numRecord" currPage="currPage" numRecordChanged="PagerReloadNum" numPageChanged="PagerReloadPage" totalCount="totalCount" showLoading="isLoading" />
@if (totalCount > numRecord)
{
<DataPager PageSize="numRecord" currPage="currPage" numRecordChanged="SetNumRec" numPageChanged="SetPageNum" totalCount="totalCount" showLoading="isLoading" />
}
</div>
</div>
@@ -82,14 +82,15 @@ namespace LiMan.UI.Components
await ReloadAllData();
}
protected async Task PagerReloadNum(int newNum)
protected async Task SetNumRec(int newNum)
{
currPage = 1;
numRecord = newNum;
await ReloadAllData();
isLoading = false;
}
protected async Task PagerReloadPage(int newNum)
protected async Task SetPageNum(int newNum)
{
currPage = newNum;
await ReloadAllData();
@@ -73,6 +73,9 @@
}
</div>
<div class="card-footer bg-secondary text-light">
<DataPager PageSize="numRecord" currPage="currPage" numRecordChanged="PagerReloadNum" numPageChanged="PagerReloadPage" totalCount="totalCount" showLoading="isLoading" />
@if (totalCount > numRecord)
{
<DataPager PageSize="numRecord" currPage="currPage" numRecordChanged="SetNumRec" numPageChanged="SetNumPage" totalCount="totalCount" showLoading="isLoading" />
}
</div>
</div>
@@ -73,14 +73,15 @@ namespace LiMan.UI.Components
await ReloadAllData();
}
protected async Task PagerReloadNum(int newNum)
protected async Task SetNumRec(int newNum)
{
currPage = 1;
numRecord = newNum;
await ReloadAllData();
isLoading = false;
}
protected async Task PagerReloadPage(int newNum)
protected async Task SetNumPage(int newNum)
{
currPage = newNum;
await ReloadAllData();
+4 -1
View File
@@ -226,6 +226,9 @@
}
</div>
<div class="card-footer">
<DataPager PageSize="numRecord" currPage="currPage" numRecordChanged="PagerReloadNum" numPageChanged="PagerReloadPage" totalCount="totalCount" showLoading="isLoading" />
@if (totalCount > numRecord)
{
<DataPager PageSize="numRecord" currPage="currPage" numRecordChanged="SetNumRec" numPageChanged="SetNumPage" totalCount="totalCount" showLoading="isLoading" />
}
</div>
</div>
+3 -2
View File
@@ -173,14 +173,15 @@ namespace LiMan.UI.Components
await ReloadAllData();
}
protected async Task PagerReloadNum(int newNum)
protected async Task SetNumRec(int newNum)
{
currPage = 1;
numRecord = newNum;
await ReloadAllData();
isLoading = false;
}
protected async Task PagerReloadPage(int newNum)
protected async Task SetNumPage(int newNum)
{
currPage = newNum;
await ReloadAllData();
+4 -1
View File
@@ -152,6 +152,9 @@
}
</div>
<div class="card-footer bg-secondary text-light">
<DataPager PageSize="numRecord" currPage="currPage" numRecordChanged="PagerReloadNum" numPageChanged="PagerReloadPage" totalCount="totalCount" showLoading="isLoading" />
@if (totalCount > numRecord)
{
<DataPager PageSize="numRecord" currPage="currPage" numRecordChanged="SetNumRec" numPageChanged="SetNumPage" totalCount="totalCount" showLoading="isLoading" />
}
</div>
</div>
+3 -2
View File
@@ -98,14 +98,15 @@ namespace LiMan.UI.Components
await ReloadAllData();
}
protected async Task PagerReloadNum(int newNum)
protected async Task SetNumRec(int newNum)
{
currPage = 1;
numRecord = newNum;
await ReloadAllData();
isLoading = false;
}
protected async Task PagerReloadPage(int newNum)
protected async Task SetNumPage(int newNum)
{
currPage = newNum;
await ReloadAllData();
+4 -1
View File
@@ -96,6 +96,9 @@
}
</div>
<div class="card-footer">
<DataPager PageSize="numRecord" currPage="currPage" numRecordChanged="SetNumRec" numPageChanged="SetPage" totalCount="totalCount" showLoading="isLoading" />
@if (totalCount > numRecord)
{
<DataPager PageSize="numRecord" currPage="currPage" numRecordChanged="SetNumRec" numPageChanged="SetPage" totalCount="totalCount" showLoading="isLoading" />
}
</div>
</div>
@@ -100,6 +100,7 @@ namespace LiMan.UI.Components
protected async Task SetNumRec(int newNum)
{
currPage = 1;
numRecord = newNum;
await AppMServ.NumRowGridSet(gridKey, newNum);
await ReloadAllData();
+4 -1
View File
@@ -84,7 +84,10 @@
}
</div>
<div class="card-footer">
<DataPager PageSize="numRecord" currPage="currPage" numRecordChanged="PagerReloadNum" numPageChanged="PagerReloadPage" totalCount="totalCount" showLoading="isLoading" />
@if (totalCount > numRecord)
{
<DataPager PageSize="numRecord" currPage="currPage" numRecordChanged="SetNumRec" numPageChanged="SetNumPage" totalCount="totalCount" showLoading="isLoading" />
}
</div>
</div>
+2 -2
View File
@@ -53,14 +53,14 @@ namespace LiMan.UI.Components
await ReloadAllData();
}
protected async Task PagerReloadNum(int newNum)
protected async Task SetNumRec(int newNum)
{
numRecord = newNum;
await ReloadAllData();
isLoading = false;
}
protected async Task PagerReloadPage(int newNum)
protected async Task SetNumPage(int newNum)
{
currPage = newNum;
await ReloadAllData();
+1 -2
View File
@@ -69,8 +69,7 @@
{
<tr>
<td class="text-center">
@if (item.Idx == 1)
@if (item.Idx == 1)
{
<button class="btn btn-sm btn-light text-secondary opacity-50 disabled"><i class="fa-solid fa-caret-up"></i></button>
}
+4 -1
View File
@@ -130,7 +130,10 @@
</div>
<div class="card-footer">
<DataPager PageSize="numRecord" currPage="currPage" numRecordChanged="PagerReloadNum" numPageChanged="PagerReloadPage" totalCount="totalCount" showLoading="isLoading" />
@if (totalCount > numRecord)
{
<DataPager PageSize="numRecord" currPage="currPage" numRecordChanged="SetNumRec" numPageChanged="SetNumPage" totalCount="totalCount" showLoading="isLoading" />
}
</div>
</div>
+3 -2
View File
@@ -127,14 +127,15 @@ namespace LiMan.UI.Components
await ReloadAllData();
}
protected async Task PagerReloadNum(int newNum)
protected async Task SetNumRec(int newNum)
{
currPage = 1;
numRecord = newNum;
await ReloadAllData();
isLoading = false;
}
protected async Task PagerReloadPage(int newNum)
protected async Task SetNumPage(int newNum)
{
currPage = newNum;
await ReloadAllData();
+4 -1
View File
@@ -199,6 +199,9 @@
</table>
</div>
<div class="card-footer">
<DataPager PageSize="@numRecord" currPage="@currPage" numRecordChanged="SetNumRec" numPageChanged="SetPage" totalCount="@totalCount" showLoading="@isLoading"></DataPager>
@if (totalCount > numRecord)
{
<DataPager PageSize="@numRecord" currPage="@currPage" numRecordChanged="SetNumRec" numPageChanged="SetPage" totalCount="@totalCount" showLoading="@isLoading"></DataPager>
}
</div>
</div>
+1
View File
@@ -113,6 +113,7 @@ namespace LiMan.UI.Components
protected async Task SetNumRec(int newNum)
{
currPage = 1;
numRecord = newNum;
currPage = 1;
await InvokeAsync(ReloadData);
+1 -1
View File
@@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Version>2.1.2503.2518</Version>
<Version>2.1.2504.0316</Version>
<RootNamespace>LiMan.UI</RootNamespace>
<AssemblyName>LiMan.UI</AssemblyName>
</PropertyGroup>
+4 -1
View File
@@ -96,6 +96,9 @@
}
</div>
<div class="card-footer py-1">
<DataPager PageSize="numRecord" currPage="currPage" numRecordChanged="PagerReloadNum" numPageChanged="PagerReloadPage" totalCount="totalCount" showLoading="isLoading" />
@if (totalCount > numRecord)
{
<DataPager PageSize="numRecord" currPage="currPage" numRecordChanged="SetNumRec" numPageChanged="SetCurrPage" totalCount="totalCount" showLoading="isLoading" />
}
</div>
</div>
+3 -2
View File
@@ -128,14 +128,15 @@ namespace LiMan.UI.Pages
await ReloadAllData();
}
protected async Task PagerReloadNum(int newNum)
protected async Task SetNumRec(int newNum)
{
currPage = 1;
numRecord = newNum;
await ReloadAllData();
isLoading = false;
}
protected async Task PagerReloadPage(int newNum)
protected async Task SetCurrPage(int newNum)
{
currPage = newNum;
await ReloadAllData();
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>License Manager</i>
<h4>Versione: 2.1.2503.2518</h4>
<h4>Versione: 2.1.2504.0316</h4>
<br /> Note di rilascio:
<ul>
<li>
+1 -1
View File
@@ -1 +1 @@
2.1.2503.2518
2.1.2504.0316
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>2.1.2503.2518</version>
<version>2.1.2504.0316</version>
<url>https://nexus.steamware.net/repository/SWS/LiMan/stable/LAST/LiMan.UI.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/LiMan/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>