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

Merge branch 'release/Vers_2.1_05'

Browse Source
This commit is contained in:
Samuele Locatelli
2025-01-09 19:52:23 +01:00
parent 24b38c5389 2c846c5a84
commit 28ba05bd7c
11 changed files with 58 additions and 32 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.2501.0710</h4>
<h4>Versione: 2.1.2501.0919</h4>
<br /> Note di rilascio:
<ul>
<li>
LiMan.Api/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
2.1.2501.0710
2.1.2501.0919
LiMan.Api/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>2.1.2501.0710</version>
<version>2.1.2501.0919</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.UI/Components/EnrollList.razor
+7 -4
View File
@@ -5,7 +5,7 @@
else if (SelRecord != null)
{
<div class="row mx-1">
<div class="col-6">
<div class="col-7">
<div class="card shadow shadow-lg m-2">
<div class="card-header text-center">
<h3>@($"{SelRecord.Passcode:00 00 00 00}")</h3>
@@ -22,13 +22,16 @@ else if (SelRecord != null)
</li>
@foreach (var kvp in SelRecord.DictAttrib)
{
<li class="list-group-item">@kvp.Key : <b>@kvp.Value</b></li>
<li class="list-group-item d-flex justify-content-between">
<div class="px-0 small">@kvp.Key:</div>
<div class="px-0"><b>@kvp.Value</b></div>
</li>
}
</ul>
</div>
</div>
</div>
<div class="col-6">
<div class="col-5">
@if (ShowAddLic)
{
<div class="modal fade show" tabindex="-1" style="display:block; background-color: rgba(10,10,10,.6);" aria-modal="true" role="dialog" data-keyboard="true">
@@ -197,7 +200,7 @@ else
@foreach (var kvp in item.DictAttribShort(nShort))
{
<li class="list-group-item d-flex justify-content-between">
<div class="px-0">@kvp.Key:</div>
<div class="px-0 small">@kvp.Key:</div>
<div class="px-0"><b>@kvp.Value</b></div>
</li>
}
LiMan.UI/Components/EnrollList.razor.cs
+11 -1
View File
@@ -31,6 +31,9 @@ namespace LiMan.UI.Components
[Parameter]
public string SearchVal { get; set; } = "";
[Parameter]
public int IdxLicSel { get; set; } = 0;
#endregion Public Properties
#region Public Methods
@@ -82,6 +85,7 @@ namespace LiMan.UI.Components
// aggiungo chiave calcolata
newLic.Chiave = newLic.ChiaveCalc;
await LMDService.LicenzeNextUpdate(newLic);
LMDService.EnrollMessPipe.sendMessage("LicAdded");
ShowAddLic = false;
ShowEditLic = false;
await ReloadLicData();
@@ -102,6 +106,7 @@ namespace LiMan.UI.Components
// aggiorno chiave calcolata
currLic.Chiave = currLic.ChiaveCalc;
await LMDService.LicenzeNextUpdate(currLic);
LMDService.EnrollMessPipe.sendMessage("LicUpdated");
ShowAddLic = false;
ShowEditLic = false;
await ReloadLicData();
@@ -123,6 +128,7 @@ namespace LiMan.UI.Components
SelRecord.UserAppr = user.Identity.Name;
SelRecord.IdxLic = SelIdxLic;
await LMDService.EnrollReqUpsert(SelRecord);
LMDService.EnrollMessPipe.sendMessage("AppApproved");
SelRecord = null;
await ReloadData();
}
@@ -188,7 +194,7 @@ namespace LiMan.UI.Components
/// <summary>
/// num max di dettagli KVP da mostrare
/// </summary>
private int nShort = 2;
private int nShort = 3;
private List<int> PageList = new List<int>() { 4, 8, 12, 16, 24, 48 };
@@ -254,6 +260,10 @@ namespace LiMan.UI.Components
{
isLoading = true;
SearchRecords = await LMDService.EnrollReqGetFilt(OnlyActive, DtStart, DtEnd);
if (IdxLicSel > 0)
{
SearchRecords = SearchRecords.Where(x => x.IdxLic == IdxLicSel).ToList();
}
if (!string.IsNullOrEmpty(SearchVal))
{
SearchRecords = SearchRecords.Where(x => $"{x.Passcode}".Contains(SearchVal)).ToList();
LiMan.UI/Components/SearchEnroll.razor
+16 -18
View File
@@ -24,28 +24,26 @@
<label class="form-check-label">@selMessage</label>
</div>
</div>
@* <div class="px-2">
<div class="input-group input-group-sm">
<span class="input-group-text">Prod</span>
<select @bind="@SelProdId" class="form-select">
<option value="0">--- Tutti ---</option>
@if (ListProd != null)
<div class="form-floating small">
<select id="floatingSelect" @bind="@SelIdxLic" class="form-select form-select-sm">
<option value="0">--- Nessuna selezione ---</option>
@if (ListLicenze != null)
{
foreach (var item in ListLicenze)
{
foreach (var item in ListProd)
if (item.Attivazioni.Count < item.NumLicenze)
{
<option value="@item.ProductID">@item.ProductName</option>
<option value="@item.IdxLic">@item.CodApp | @item.CodInst | @item.Attivazioni.Count / @item.NumLicenze</option>
}
else
{
<option value="@item.IdxLic" disabled>@item.CodApp | @item.CodInst | @item.Attivazioni.Count / @item.NumLicenze | Esaurito</option>
}
}
</select>
</div>
}
</select>
<label for="floatingSelect">Filtro Licenza </label>
</div>
<div class="px-2">
<div class="input-group input-group-sm">
<span class="input-group-text">Key</span>
<input class="form-control" @bind="@SelLockId" />
<button @onclick="reset" class="btn btn-success input-group-text">reset</button>
</div>
</div> *@
<div class="px-2">
<SearchMod ExtCss="input-group"></SearchMod>
</div>
@@ -54,6 +52,6 @@
</div>
</div>
<div class="card-body p-0">
<EnrollList OnlyActive="@(!showAll)" SearchVal="@searchVal"></EnrollList>
<EnrollList OnlyActive="@(!showAll)" SearchVal="@searchVal" IdxLicSel="@SelIdxLic"></EnrollList>
</div>
</div>
LiMan.UI/Components/SearchEnroll.razor.cs
+17 -2
View File
@@ -7,6 +7,7 @@ using System.Threading.Tasks;
using System;
using System.Linq;
using LiMan.DB;
using LiMan.DB.DBModels;
namespace LiMan.UI.Components
{
@@ -44,7 +45,7 @@ namespace LiMan.UI.Components
{
AppMessages.EA_SearchUpdated += AppMessages_EA_SearchUpdated;
LMDService.EnrollMessPipe.EA_NewMessage += async (sender, e) => await EnrollMessPipe_EA_NewMessage(sender, e);
await Task.Delay(1);
await ReloadLicData();
}
/// <summary>
@@ -55,12 +56,26 @@ namespace LiMan.UI.Components
{
await LMDService.EnrollReqPurgeInvalid();
await LMDService.FlushEnrollCache();
LMDService.EnrollMessPipe.sendMessage("PurgedOld");
searchVal = "";
}
/// <summary>
/// Idx licenza selezionata
/// </summary>
private int SelIdxLic = 0;
private List<LicenzaModel> ListLicenze;
private async Task ReloadLicData()
{
SelectNext currFilt = new SelectNext()
{
ApplicazioneSel = "UpdateManager"
};
ListLicenze = await LMDService.LicenzeNextGetFilt(currFilt);
}
#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.2501.0710</Version>
<Version>2.1.2501.0919</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.2501.0710</h4>
<h4>Versione: 2.1.2501.0919</h4>
<br /> Note di rilascio:
<ul>
<li>
LiMan.UI/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
2.1.2501.0710
2.1.2501.0919
LiMan.UI/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>2.1.2501.0710</version>
<version>2.1.2501.0919</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>