From 5d72d21fb1dcd153ad200aa60f1276b0a8b2aedd Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 3 Apr 2025 17:47:31 +0200
Subject: [PATCH] Stat installazioni: Update gestione paginazione (visibile
 solo dove serve) + fix calcolo di alcuni intems male filtrati

---
 LiMan.Api/Resources/ChangeLog.html                |  2 +-
 LiMan.Api/Resources/VersNum.txt                   |  2 +-
 LiMan.Api/Resources/manifest.xml                  |  2 +-
 LiMan.Transfer/Resources/ChangeLog.html           |  2 +-
 LiMan.Transfer/Resources/VersNum.txt              |  2 +-
 LiMan.Transfer/Resources/manifest.xml             |  2 +-
 LiMan.UI/Components/EnrollList.razor              |  5 ++++-
 LiMan.UI/Components/EnrollList.razor.cs           |  1 +
 LiMan.UI/Components/InstAppPareto.razor           | 13 ++++++++-----
 LiMan.UI/Components/InstAppPareto.razor.cs        |  3 ++-
 LiMan.UI/Components/InstAppRelStatus.razor        |  5 ++++-
 LiMan.UI/Components/InstAppRelStatus.razor.cs     |  1 +
 LiMan.UI/Components/InstallInfoStats.razor.cs     |  6 ------
 LiMan.UI/Components/ListAppShort.razor            | 11 ++++++++---
 LiMan.UI/Components/ListAppShort.razor.cs         |  1 +
 LiMan.UI/Components/ListApplicazioni.razor        |  5 ++++-
 LiMan.UI/Components/ListApplicazioni.razor.cs     |  5 +++--
 LiMan.UI/Components/ListApplicazioniGLS.razor     |  5 ++++-
 LiMan.UI/Components/ListApplicazioniGLS.razor.cs  |  5 +++--
 LiMan.UI/Components/ListDevicesDTO.razor          |  5 ++++-
 LiMan.UI/Components/ListDevicesDTO.razor.cs       |  1 +
 LiMan.UI/Components/ListInfoShort.razor           | 11 +++++++----
 LiMan.UI/Components/ListInfoShort.razor.cs        |  1 +
 LiMan.UI/Components/ListInstallazioni.razor       |  5 ++++-
 LiMan.UI/Components/ListInstallazioni.razor.cs    |  5 +++--
 LiMan.UI/Components/ListInstallazioniGLS.razor    |  5 ++++-
 LiMan.UI/Components/ListInstallazioniGLS.razor.cs |  5 +++--
 LiMan.UI/Components/ListLicenze.razor             |  5 ++++-
 LiMan.UI/Components/ListLicenze.razor.cs          |  5 +++--
 LiMan.UI/Components/ListLicenzeGLS.razor          |  5 ++++-
 LiMan.UI/Components/ListLicenzeGLS.razor.cs       |  5 +++--
 LiMan.UI/Components/ListReleases.razor            |  5 ++++-
 LiMan.UI/Components/ListReleases.razor.cs         |  1 +
 LiMan.UI/Components/StatsCallList.razor           |  5 ++++-
 LiMan.UI/Components/StatsCallList.razor.cs        |  4 ++--
 LiMan.UI/Components/TargetSetup.razor             |  3 +--
 LiMan.UI/Components/Tickets.razor                 |  5 ++++-
 LiMan.UI/Components/Tickets.razor.cs              |  5 +++--
 LiMan.UI/Components/UserMan.razor                 |  5 ++++-
 LiMan.UI/Components/UserMan.razor.cs              |  1 +
 LiMan.UI/LiMan.UI.csproj                          |  2 +-
 LiMan.UI/Pages/LicenseManager.razor               |  5 ++++-
 LiMan.UI/Pages/LicenseManager.razor.cs            |  5 +++--
 LiMan.UI/Resources/ChangeLog.html                 |  2 +-
 LiMan.UI/Resources/VersNum.txt                    |  2 +-
 LiMan.UI/Resources/manifest.xml                   |  2 +-
 46 files changed, 125 insertions(+), 63 deletions(-)
diff --git a/LiMan.Api/Resources/ChangeLog.html b/LiMan.Api/Resources/ChangeLog.html
index 5dc8d86..e9ba6d4 100644
--- a/LiMan.Api/Resources/ChangeLog.html
+++ b/LiMan.Api/Resources/ChangeLog.html
@@ -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>
diff --git a/LiMan.Api/Resources/VersNum.txt b/LiMan.Api/Resources/VersNum.txt
index 3f5e047..753de7c 100644
--- a/LiMan.Api/Resources/VersNum.txt
+++ b/LiMan.Api/Resources/VersNum.txt
@@ -1 +1 @@
-2.1.2503.2517
+2.1.2504.0316
diff --git a/LiMan.Api/Resources/manifest.xml b/LiMan.Api/Resources/manifest.xml
index f6a2176..5869473 100644
--- a/LiMan.Api/Resources/manifest.xml
+++ b/LiMan.Api/Resources/manifest.xml
@@ -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>
diff --git a/LiMan.Transfer/Resources/ChangeLog.html b/LiMan.Transfer/Resources/ChangeLog.html
index 77e866d..d4a1646 100644
--- a/LiMan.Transfer/Resources/ChangeLog.html
+++ b/LiMan.Transfer/Resources/ChangeLog.html
@@ -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>
diff --git a/LiMan.Transfer/Resources/VersNum.txt b/LiMan.Transfer/Resources/VersNum.txt
index 3f5e047..753de7c 100644
--- a/LiMan.Transfer/Resources/VersNum.txt
+++ b/LiMan.Transfer/Resources/VersNum.txt
@@ -1 +1 @@
-2.1.2503.2517
+2.1.2504.0316
diff --git a/LiMan.Transfer/Resources/manifest.xml b/LiMan.Transfer/Resources/manifest.xml
index 691e63e..1f2cce8 100644
--- a/LiMan.Transfer/Resources/manifest.xml
+++ b/LiMan.Transfer/Resources/manifest.xml
@@ -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>
diff --git a/LiMan.UI/Components/EnrollList.razor b/LiMan.UI/Components/EnrollList.razor
index 77c3927..32213fb 100644
--- a/LiMan.UI/Components/EnrollList.razor
+++ b/LiMan.UI/Components/EnrollList.razor
@@ -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>
diff --git a/LiMan.UI/Components/EnrollList.razor.cs b/LiMan.UI/Components/EnrollList.razor.cs
index 38ebdfd..918b292 100644
--- a/LiMan.UI/Components/EnrollList.razor.cs
+++ b/LiMan.UI/Components/EnrollList.razor.cs
@@ -231,6 +231,7 @@ namespace LiMan.UI.Components
 
         protected async Task setNumRec(int newNum)
         {
+            currPage = 1;
             numRecord = newNum;
             await ReloadData();
             isLoading = false;
diff --git a/LiMan.UI/Components/InstAppPareto.razor b/LiMan.UI/Components/InstAppPareto.razor
index ae4485f..1558ef7 100644
--- a/LiMan.UI/Components/InstAppPareto.razor
+++ b/LiMan.UI/Components/InstAppPareto.razor
@@ -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>
diff --git a/LiMan.UI/Components/InstAppPareto.razor.cs b/LiMan.UI/Components/InstAppPareto.razor.cs
index f55b564..6b223ce 100644
--- a/LiMan.UI/Components/InstAppPareto.razor.cs
+++ b/LiMan.UI/Components/InstAppPareto.razor.cs
@@ -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;
diff --git a/LiMan.UI/Components/InstAppRelStatus.razor b/LiMan.UI/Components/InstAppRelStatus.razor
index b3669c1..5edfda7 100644
--- a/LiMan.UI/Components/InstAppRelStatus.razor
+++ b/LiMan.UI/Components/InstAppRelStatus.razor
@@ -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>
\ No newline at end of file
diff --git a/LiMan.UI/Components/InstAppRelStatus.razor.cs b/LiMan.UI/Components/InstAppRelStatus.razor.cs
index 079e033..5c2d5b7 100644
--- a/LiMan.UI/Components/InstAppRelStatus.razor.cs
+++ b/LiMan.UI/Components/InstAppRelStatus.razor.cs
@@ -101,6 +101,7 @@ namespace LiMan.UI.Components
         protected void setNumRec(int newNum)
         {
             numRecord = newNum;
+            currPage = 1;
             UpdateTable();
             isLoading = false;
         }
diff --git a/LiMan.UI/Components/InstallInfoStats.razor.cs b/LiMan.UI/Components/InstallInfoStats.razor.cs
index efb6f55..74ef3b5 100644
--- a/LiMan.UI/Components/InstallInfoStats.razor.cs
+++ b/LiMan.UI/Components/InstallInfoStats.razor.cs
@@ -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);
diff --git a/LiMan.UI/Components/ListAppShort.razor b/LiMan.UI/Components/ListAppShort.razor
index 59fcde1..f293a40 100644
--- a/LiMan.UI/Components/ListAppShort.razor
+++ b/LiMan.UI/Components/ListAppShort.razor
@@ -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>
 
diff --git a/LiMan.UI/Components/ListAppShort.razor.cs b/LiMan.UI/Components/ListAppShort.razor.cs
index c2d528c..c79f9e2 100644
--- a/LiMan.UI/Components/ListAppShort.razor.cs
+++ b/LiMan.UI/Components/ListAppShort.razor.cs
@@ -62,6 +62,7 @@ namespace LiMan.UI.Components
 
         protected void setNumRec(int newNum)
         {
+            currPage = 1;
             numRecord = newNum;
             ReloadData();
             isLoading = false;
diff --git a/LiMan.UI/Components/ListApplicazioni.razor b/LiMan.UI/Components/ListApplicazioni.razor
index 307fa8d..c54d2f7 100644
--- a/LiMan.UI/Components/ListApplicazioni.razor
+++ b/LiMan.UI/Components/ListApplicazioni.razor
@@ -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>
\ No newline at end of file
diff --git a/LiMan.UI/Components/ListApplicazioni.razor.cs b/LiMan.UI/Components/ListApplicazioni.razor.cs
index 111b2e3..f9c4f25 100644
--- a/LiMan.UI/Components/ListApplicazioni.razor.cs
+++ b/LiMan.UI/Components/ListApplicazioni.razor.cs
@@ -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();
diff --git a/LiMan.UI/Components/ListApplicazioniGLS.razor b/LiMan.UI/Components/ListApplicazioniGLS.razor
index eeeae6c..a3729f4 100644
--- a/LiMan.UI/Components/ListApplicazioniGLS.razor
+++ b/LiMan.UI/Components/ListApplicazioniGLS.razor
@@ -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>
\ No newline at end of file
diff --git a/LiMan.UI/Components/ListApplicazioniGLS.razor.cs b/LiMan.UI/Components/ListApplicazioniGLS.razor.cs
index cec8fa0..4707fd1 100644
--- a/LiMan.UI/Components/ListApplicazioniGLS.razor.cs
+++ b/LiMan.UI/Components/ListApplicazioniGLS.razor.cs
@@ -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();
diff --git a/LiMan.UI/Components/ListDevicesDTO.razor b/LiMan.UI/Components/ListDevicesDTO.razor
index 34db49f..a2ffdef 100644
--- a/LiMan.UI/Components/ListDevicesDTO.razor
+++ b/LiMan.UI/Components/ListDevicesDTO.razor
@@ -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>
diff --git a/LiMan.UI/Components/ListDevicesDTO.razor.cs b/LiMan.UI/Components/ListDevicesDTO.razor.cs
index 281ad6b..de76fcb 100644
--- a/LiMan.UI/Components/ListDevicesDTO.razor.cs
+++ b/LiMan.UI/Components/ListDevicesDTO.razor.cs
@@ -32,6 +32,7 @@ namespace LiMan.UI.Components
 
         protected void setNumRec(int newNum)
         {
+            currPage = 1;
             numRecord = newNum;
             ReloadData();
             isLoading = false;
diff --git a/LiMan.UI/Components/ListInfoShort.razor b/LiMan.UI/Components/ListInfoShort.razor
index e41b44b..7de55b8 100644
--- a/LiMan.UI/Components/ListInfoShort.razor
+++ b/LiMan.UI/Components/ListInfoShort.razor
@@ -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>
 
diff --git a/LiMan.UI/Components/ListInfoShort.razor.cs b/LiMan.UI/Components/ListInfoShort.razor.cs
index 6c4e4cd..6676a8a 100644
--- a/LiMan.UI/Components/ListInfoShort.razor.cs
+++ b/LiMan.UI/Components/ListInfoShort.razor.cs
@@ -59,6 +59,7 @@ namespace LiMan.UI.Components
 
         protected void setNumRec(int newNum)
         {
+            currPage = 1;
             numRecord = newNum;
             ReloadData();
             isLoading = false;
diff --git a/LiMan.UI/Components/ListInstallazioni.razor b/LiMan.UI/Components/ListInstallazioni.razor
index 02f63ab..c6083aa 100644
--- a/LiMan.UI/Components/ListInstallazioni.razor
+++ b/LiMan.UI/Components/ListInstallazioni.razor
@@ -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>
\ No newline at end of file
diff --git a/LiMan.UI/Components/ListInstallazioni.razor.cs b/LiMan.UI/Components/ListInstallazioni.razor.cs
index 291cce3..bc76a36 100644
--- a/LiMan.UI/Components/ListInstallazioni.razor.cs
+++ b/LiMan.UI/Components/ListInstallazioni.razor.cs
@@ -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();
diff --git a/LiMan.UI/Components/ListInstallazioniGLS.razor b/LiMan.UI/Components/ListInstallazioniGLS.razor
index 73b693c..56ee533 100644
--- a/LiMan.UI/Components/ListInstallazioniGLS.razor
+++ b/LiMan.UI/Components/ListInstallazioniGLS.razor
@@ -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>
\ No newline at end of file
diff --git a/LiMan.UI/Components/ListInstallazioniGLS.razor.cs b/LiMan.UI/Components/ListInstallazioniGLS.razor.cs
index f29306b..6550673 100644
--- a/LiMan.UI/Components/ListInstallazioniGLS.razor.cs
+++ b/LiMan.UI/Components/ListInstallazioniGLS.razor.cs
@@ -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();
diff --git a/LiMan.UI/Components/ListLicenze.razor b/LiMan.UI/Components/ListLicenze.razor
index cb7f050..231585d 100644
--- a/LiMan.UI/Components/ListLicenze.razor
+++ b/LiMan.UI/Components/ListLicenze.razor
@@ -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>
\ No newline at end of file
diff --git a/LiMan.UI/Components/ListLicenze.razor.cs b/LiMan.UI/Components/ListLicenze.razor.cs
index 0d582b8..7385541 100644
--- a/LiMan.UI/Components/ListLicenze.razor.cs
+++ b/LiMan.UI/Components/ListLicenze.razor.cs
@@ -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();
diff --git a/LiMan.UI/Components/ListLicenzeGLS.razor b/LiMan.UI/Components/ListLicenzeGLS.razor
index 4a249ec..67274fb 100644
--- a/LiMan.UI/Components/ListLicenzeGLS.razor
+++ b/LiMan.UI/Components/ListLicenzeGLS.razor
@@ -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>
\ No newline at end of file
diff --git a/LiMan.UI/Components/ListLicenzeGLS.razor.cs b/LiMan.UI/Components/ListLicenzeGLS.razor.cs
index f8d2e78..7412332 100644
--- a/LiMan.UI/Components/ListLicenzeGLS.razor.cs
+++ b/LiMan.UI/Components/ListLicenzeGLS.razor.cs
@@ -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();
diff --git a/LiMan.UI/Components/ListReleases.razor b/LiMan.UI/Components/ListReleases.razor
index 156e9bb..ceb7d53 100644
--- a/LiMan.UI/Components/ListReleases.razor
+++ b/LiMan.UI/Components/ListReleases.razor
@@ -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>
\ No newline at end of file
diff --git a/LiMan.UI/Components/ListReleases.razor.cs b/LiMan.UI/Components/ListReleases.razor.cs
index 4beb2a8..a30d5ba 100644
--- a/LiMan.UI/Components/ListReleases.razor.cs
+++ b/LiMan.UI/Components/ListReleases.razor.cs
@@ -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();
diff --git a/LiMan.UI/Components/StatsCallList.razor b/LiMan.UI/Components/StatsCallList.razor
index e640395..3999b85 100644
--- a/LiMan.UI/Components/StatsCallList.razor
+++ b/LiMan.UI/Components/StatsCallList.razor
@@ -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>
 
diff --git a/LiMan.UI/Components/StatsCallList.razor.cs b/LiMan.UI/Components/StatsCallList.razor.cs
index 686ebe4..fa52316 100644
--- a/LiMan.UI/Components/StatsCallList.razor.cs
+++ b/LiMan.UI/Components/StatsCallList.razor.cs
@@ -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();
diff --git a/LiMan.UI/Components/TargetSetup.razor b/LiMan.UI/Components/TargetSetup.razor
index 3b9904f..72075fb 100644
--- a/LiMan.UI/Components/TargetSetup.razor
+++ b/LiMan.UI/Components/TargetSetup.razor
@@ -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>
                                         }
diff --git a/LiMan.UI/Components/Tickets.razor b/LiMan.UI/Components/Tickets.razor
index 8ceb2b7..e43c078 100644
--- a/LiMan.UI/Components/Tickets.razor
+++ b/LiMan.UI/Components/Tickets.razor
@@ -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>
diff --git a/LiMan.UI/Components/Tickets.razor.cs b/LiMan.UI/Components/Tickets.razor.cs
index b69fd3b..752ffaa 100644
--- a/LiMan.UI/Components/Tickets.razor.cs
+++ b/LiMan.UI/Components/Tickets.razor.cs
@@ -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();
diff --git a/LiMan.UI/Components/UserMan.razor b/LiMan.UI/Components/UserMan.razor
index db63488..3e79e0c 100644
--- a/LiMan.UI/Components/UserMan.razor
+++ b/LiMan.UI/Components/UserMan.razor
@@ -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>
\ No newline at end of file
diff --git a/LiMan.UI/Components/UserMan.razor.cs b/LiMan.UI/Components/UserMan.razor.cs
index 33b8617..df15c68 100644
--- a/LiMan.UI/Components/UserMan.razor.cs
+++ b/LiMan.UI/Components/UserMan.razor.cs
@@ -113,6 +113,7 @@ namespace LiMan.UI.Components
 
         protected async Task SetNumRec(int newNum)
         {
+            currPage = 1;
             numRecord = newNum;
             currPage = 1;
             await InvokeAsync(ReloadData);
diff --git a/LiMan.UI/LiMan.UI.csproj b/LiMan.UI/LiMan.UI.csproj
index ab76d12..55a7443 100644
--- a/LiMan.UI/LiMan.UI.csproj
+++ b/LiMan.UI/LiMan.UI.csproj
@@ -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>
diff --git a/LiMan.UI/Pages/LicenseManager.razor b/LiMan.UI/Pages/LicenseManager.razor
index 0b6c8c6..d139046 100644
--- a/LiMan.UI/Pages/LicenseManager.razor
+++ b/LiMan.UI/Pages/LicenseManager.razor
@@ -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>
\ No newline at end of file
diff --git a/LiMan.UI/Pages/LicenseManager.razor.cs b/LiMan.UI/Pages/LicenseManager.razor.cs
index c3a8eee..8a17fc7 100644
--- a/LiMan.UI/Pages/LicenseManager.razor.cs
+++ b/LiMan.UI/Pages/LicenseManager.razor.cs
@@ -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();
diff --git a/LiMan.UI/Resources/ChangeLog.html b/LiMan.UI/Resources/ChangeLog.html
index 6046949..e9ba6d4 100644
--- a/LiMan.UI/Resources/ChangeLog.html
+++ b/LiMan.UI/Resources/ChangeLog.html
@@ -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>
diff --git a/LiMan.UI/Resources/VersNum.txt b/LiMan.UI/Resources/VersNum.txt
index 2f463bf..753de7c 100644
--- a/LiMan.UI/Resources/VersNum.txt
+++ b/LiMan.UI/Resources/VersNum.txt
@@ -1 +1 @@
-2.1.2503.2518
+2.1.2504.0316
diff --git a/LiMan.UI/Resources/manifest.xml b/LiMan.UI/Resources/manifest.xml
index db66d5a..5869473 100644
--- a/LiMan.UI/Resources/manifest.xml
+++ b/LiMan.UI/Resources/manifest.xml
@@ -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>
