From 50d77248f93d544f1b5e4ef0da0f4e2c551893e4 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Tue, 25 Mar 2025 18:03:51 +0100
Subject: [PATCH] LiMan.UI - fix ricerca ultime attivazioni con sel periodo -
 trim elenco clienti attivazioni da elenco

---
 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/SearchEnroll.razor    | 14 ++++++++++---
 LiMan.UI/Components/SearchEnroll.razor.cs | 25 +++++++++++++++++++++--
 LiMan.UI/LiMan.UI.csproj                  |  2 +-
 LiMan.UI/Resources/ChangeLog.html         |  2 +-
 LiMan.UI/Resources/VersNum.txt            |  2 +-
 LiMan.UI/Resources/manifest.xml           |  2 +-
 12 files changed, 44 insertions(+), 15 deletions(-)
diff --git a/LiMan.Api/Resources/ChangeLog.html b/LiMan.Api/Resources/ChangeLog.html
index 5cdfb65..5dc8d86 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.2502.0617</h4>
+    <h4>Versione: 2.1.2503.2517</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/LiMan.Api/Resources/VersNum.txt b/LiMan.Api/Resources/VersNum.txt
index 7ae6b6f..3f5e047 100644
--- a/LiMan.Api/Resources/VersNum.txt
+++ b/LiMan.Api/Resources/VersNum.txt
@@ -1 +1 @@
-2.1.2502.0617
+2.1.2503.2517
diff --git a/LiMan.Api/Resources/manifest.xml b/LiMan.Api/Resources/manifest.xml
index 6f10c3b..f6a2176 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.2502.0617</version>
+  <version>2.1.2503.2517</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 52eddc9..77e866d 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.2502.0617</h4>
+    <h4>Versione: 2.1.2503.2517</h4>
     <br />
     Note di rilascio:
     <ul>
diff --git a/LiMan.Transfer/Resources/VersNum.txt b/LiMan.Transfer/Resources/VersNum.txt
index 7ae6b6f..3f5e047 100644
--- a/LiMan.Transfer/Resources/VersNum.txt
+++ b/LiMan.Transfer/Resources/VersNum.txt
@@ -1 +1 @@
-2.1.2502.0617
+2.1.2503.2517
diff --git a/LiMan.Transfer/Resources/manifest.xml b/LiMan.Transfer/Resources/manifest.xml
index afce252..691e63e 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.2502.0617</version>
+  <version>2.1.2503.2517</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/SearchEnroll.razor b/LiMan.UI/Components/SearchEnroll.razor
index 76c9b58..50c61ed 100644
--- a/LiMan.UI/Components/SearchEnroll.razor
+++ b/LiMan.UI/Components/SearchEnroll.razor
@@ -24,6 +24,14 @@
                             <label class="form-check-label">@selMessage</label>
                         </div>
                     </div>
+                    <div class="form-floating small">
+                        <input type="date" class="form-control" id="dtStart" @bind=@dtStart>
+                        <label>Inizio Periodo</label>
+                    </div>
+                    <div class="form-floating small">
+                        <input type="date" class="form-control" id="dtEnd" @bind=@dtEnd>
+                        <label>Fine Periodo</label>
+                    </div>
                     <div class="form-floating small">
                         <select id="floatingSelect" @bind="@SelIdxLic" class="form-select form-select-sm">
                             <option value="0">--- Nessuna selezione ---</option>
@@ -33,11 +41,11 @@
                                 {
                                     if (item.Attivazioni.Count < item.NumLicenze)
                                     {
-                                        <option value="@item.IdxLic">@item.CodApp | @item.CodInst  | @item.Attivazioni.Count / @item.NumLicenze</option>
+                                        <option value="@item.IdxLic" title="@formatLic(item, false)">@formatLic(item, true)</option>
                                     }
                                     else
                                     {
-                                        <option value="@item.IdxLic" disabled>@item.CodApp | @item.CodInst  | @item.Attivazioni.Count / @item.NumLicenze | Esaurito</option>
+                                        <option value="@item.IdxLic" disabled title="@formatLic(item, false)">@formatLic(item, true) | Esaurito</option>
                                     }
                                 }
                             }
@@ -52,6 +60,6 @@
         </div>
     </div>
     <div class="card-body p-0">
-        <EnrollList OnlyActive="@(!showAll)" SearchVal="@searchVal" IdxLicSel="@SelIdxLic"></EnrollList>
+        <EnrollList OnlyActive="@(!showAll)" SearchVal="@searchVal" IdxLicSel="@SelIdxLic" DtStart="@dtStart" DtEnd="@dtEnd"></EnrollList>
     </div>
 </div>
diff --git a/LiMan.UI/Components/SearchEnroll.razor.cs b/LiMan.UI/Components/SearchEnroll.razor.cs
index d28b1fa..58b952f 100644
--- a/LiMan.UI/Components/SearchEnroll.razor.cs
+++ b/LiMan.UI/Components/SearchEnroll.razor.cs
@@ -70,16 +70,37 @@ namespace LiMan.UI.Components
             {
                 ApplicazioneSel = "UpdateManager"
             };
-            var rawList= await LMDService.LicenzeNextGetFilt(currFilt);
+            var rawList = await LMDService.LicenzeNextGetFilt(currFilt);
             ListLicenze = rawList
                             .OrderBy(x => x.CodApp)
                             .ThenBy(x => x.CodInst)
                             .ToList();
         }
 
+        /// <summary>
+        /// formattazione opzione licenza da mostrare in select
+        /// </summary>
+        /// <param name="licItem"></param>
+        /// <param name="doShort"></param>
+        /// <returns></returns>
+        protected string formatLic(LicenzaModel licItem, bool doShort)
+        {
+
+            string answ = $"{licItem.CodApp} | {licItem.CodInst} | {licItem.Attivazioni.Count} / {licItem.NumLicenze}";
+            if (doShort)
+            {
+                answ = $"{licItem.CodApp.Substring(0, 5)}...{licItem.CodApp.Substring(licItem.CodApp.Length - 3)} | {licItem.CodInst} | {licItem.Attivazioni.Count} / {licItem.NumLicenze}";
+            }
+            return answ;
+        }
+
+
+        private DateTime dtStart = new DateTime(2024, 1, 1);
+        private DateTime dtEnd = DateTime.Today.AddDays(1);
+
         #endregion Protected Methods
 
-            #region Private Fields
+        #region Private Fields
 
         private bool isLoading = false;
 
diff --git a/LiMan.UI/LiMan.UI.csproj b/LiMan.UI/LiMan.UI.csproj
index 60ce002..ab76d12 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.2502.0716</Version>
+        <Version>2.1.2503.2518</Version>
         <RootNamespace>LiMan.UI</RootNamespace>
         <AssemblyName>LiMan.UI</AssemblyName>
     </PropertyGroup>
diff --git a/LiMan.UI/Resources/ChangeLog.html b/LiMan.UI/Resources/ChangeLog.html
index d3d3e97..6046949 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.2502.0716</h4>
+    <h4>Versione: 2.1.2503.2518</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/LiMan.UI/Resources/VersNum.txt b/LiMan.UI/Resources/VersNum.txt
index 515fb59..2f463bf 100644
--- a/LiMan.UI/Resources/VersNum.txt
+++ b/LiMan.UI/Resources/VersNum.txt
@@ -1 +1 @@
-2.1.2502.0716
+2.1.2503.2518
diff --git a/LiMan.UI/Resources/manifest.xml b/LiMan.UI/Resources/manifest.xml
index 5f8b522..db66d5a 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.2502.0716</version>
+  <version>2.1.2503.2518</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>
