Egalware/limanapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/EnrollSearchFix_01'

Browse Source
This commit is contained in:
Samuele Locatelli
2025-03-25 18:08:51 +01:00
parent 1f0bcf7de2 50d77248f9
commit 079eefa03e
12 changed files with 44 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
LiMan.Api/Resources/ChangeLog.html
+1 -1
View File
@@ -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>
LiMan.Api/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
2.1.2502.0617
2.1.2503.2517
LiMan.Api/Resources/manifest.xml
+1 -1
View File
@@ -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>
LiMan.Transfer/Resources/ChangeLog.html
+1 -1
View File
@@ -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>
LiMan.Transfer/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
2.1.2502.0617
2.1.2503.2517
LiMan.Transfer/Resources/manifest.xml
+1 -1
View File
@@ -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>
LiMan.UI/Components/SearchEnroll.razor
+11 -3
View File
@@ -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>
LiMan.UI/Components/SearchEnroll.razor.cs
+23 -2
View File
@@ -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;
LiMan.UI/LiMan.UI.csproj
+1 -1
View File
@@ -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>
LiMan.UI/Resources/ChangeLog.html
+1 -1
View File
@@ -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>
LiMan.UI/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
2.1.2502.0716
2.1.2503.2518
LiMan.UI/Resources/manifest.xml
+1 -1
View File
@@ -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>