Completo rimozione pacchetto cache vecchio + riferimenti e nuget

This commit is contained in:
Samuele Locatelli
2025-01-29 10:12:57 +01:00
parent 1a3ee2a946
commit 290af1b978
26 changed files with 789 additions and 859 deletions
-2
View File
@@ -47,7 +47,6 @@ namespace LiMan.APi.Data
/// <param name="redisCacheClient"></param>
/// <param name="redisConnMult"></param>
public ApiDataService(IConfiguration configuration, ILogger<ApiDataService> logger, IEmailSender emailSender, IRedisCacheClient redisCacheClient, IConnectionMultiplexer redisConnMult)
//public ApiDataService(IConfiguration configuration, ILogger<ApiDataService> logger, IDistributedCache distributedCache, IEmailSender emailSender, IRedisCacheClient redisCacheClient)
{
_logger = logger;
_configuration = configuration;
@@ -1733,7 +1732,6 @@ namespace LiMan.APi.Data
private readonly IEmailSender _emailSender;
//private readonly IDistributedCache distributedCache;
private readonly IRedisCacheClient _redisCacheClient;
/// <summary>
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>License Manager</i>
<h4>Versione: 2.1.2501.2909</h4>
<h4>Versione: 2.1.2501.2910</h4>
<br /> Note di rilascio:
<ul>
<li>
+1 -1
View File
@@ -1 +1 @@
2.1.2501.2909
2.1.2501.2910
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>2.1.2501.2909</version>
<version>2.1.2501.2910</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.2501.2909</h4>
<h4>Versione: 2.1.2501.2910</h4>
<br />
Note di rilascio:
<ul>
+1 -1
View File
@@ -1 +1 @@
2.1.2501.2909
2.1.2501.2910
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>2.1.2501.2909</version>
<version>2.1.2501.2910</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>
+1 -1
View File
@@ -179,7 +179,7 @@ namespace LiMan.UI.Components
private async Task fullReload()
{
await DataService.InvalidateAllCache();
await DataService.FlushRedisCache();
await ReloadAllData();
}
@@ -281,7 +281,7 @@ namespace LiMan.UI.Components
{
recordEdit = null;
recordSel = null;
await DataService.InvalidateAllCache();
await DataService.FlushRedisCache();
await ReloadAllData();
}
@@ -11,6 +11,91 @@ namespace LiMan.UI.Components
{
public partial class ListApplicazioniGLS : ComponentBase, IDisposable
{
#region Public Methods
public string checkSelect(string Applicativo)
{
string answ = "";
if (currRecord != null)
{
try
{
answ = (currRecord.Applicativo == Applicativo) ? "table-info" : "";
}
catch
{ }
}
return answ;
}
public void Dispose()
{
}
#endregion Public Methods
#region Protected Fields
protected int totalCount = 0;
#endregion Protected Fields
#region Protected Properties
[Inject]
protected MessageService AppMService { get; set; }
[Inject]
protected LiManDataService DataService { get; set; }
[Inject]
protected IJSRuntime JSRuntime { get; set; }
[Inject]
protected NavigationManager NavManager { get; set; }
protected bool showCamera { get; set; } = false;
#endregion Protected Properties
#region Protected Methods
protected void Edit(AnagApplicazioni selRecord)
{
currRecord = selRecord;
}
protected override async Task OnInitializedAsync()
{
await ReloadAllData();
}
protected async Task PagerReloadNum(int newNum)
{
numRecord = newNum;
await ReloadAllData();
isLoading = false;
}
protected async Task PagerReloadPage(int newNum)
{
currPage = newNum;
await ReloadAllData();
isLoading = false;
}
protected async Task ResetData()
{
await FullReload();
}
protected async Task UpdateData()
{
await FullReload();
}
#endregion Protected Methods
#region Private Fields
private AnagApplicazioni currRecord = null;
@@ -19,12 +104,6 @@ namespace LiMan.UI.Components
#endregion Private Fields
#region Protected Fields
protected int totalCount = 0;
#endregion Protected Fields
#region Private Properties
private int currPage
@@ -55,30 +134,12 @@ namespace LiMan.UI.Components
#endregion Private Properties
#region Protected Properties
[Inject]
protected MessageService AppMService { get; set; }
[Inject]
protected LiManDataService DataService { get; set; }
[Inject]
protected IJSRuntime JSRuntime { get; set; }
[Inject]
protected NavigationManager NavManager { get; set; }
protected bool showCamera { get; set; } = false;
#endregion Protected Properties
#region Private Methods
private async Task fullReload()
private async Task FullReload()
{
currRecord = null;
await DataService.InvalidateAllCache();
await DataService.FlushRedisCache();
await ReloadAllData();
}
@@ -94,66 +155,5 @@ namespace LiMan.UI.Components
}
#endregion Private Methods
#region Protected Methods
protected void Edit(AnagApplicazioni selRecord)
{
currRecord = selRecord;
}
protected override async Task OnInitializedAsync()
{
await ReloadAllData();
}
protected async Task PagerReloadNum(int newNum)
{
numRecord = newNum;
await ReloadAllData();
isLoading = false;
}
protected async Task PagerReloadPage(int newNum)
{
currPage = newNum;
await ReloadAllData();
isLoading = false;
}
protected async Task ResetData()
{
await fullReload();
}
protected async Task UpdateData()
{
await fullReload();
}
#endregion Protected Methods
#region Public Methods
public string checkSelect(string Applicativo)
{
string answ = "";
if (currRecord != null)
{
try
{
answ = (currRecord.Applicativo == Applicativo) ? "table-info" : "";
}
catch
{ }
}
return answ;
}
public void Dispose()
{
}
#endregion Public Methods
}
}
+32 -11
View File
@@ -1,10 +1,7 @@
using Core;
using LiMan.DB.DBModels;
using LiMan.DB.DTO;
using LiMan.UI.Data;
using Microsoft.AspNetCore.Components;
using Microsoft.JSInterop;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
@@ -13,29 +10,51 @@ namespace LiMan.UI.Components
{
public partial class ListAttach
{
private List<FileAttachModel> ListRecords;
#region Public Properties
[Parameter]
public EventCallback<int> DataReset { get; set; }
#endregion Public Properties
#region Protected Fields
protected int totalCount = 0;
#endregion Protected Fields
#region Protected Properties
[Inject]
protected LiManDataService DataService { get; set; }
#endregion Protected Properties
#region Private Fields
private List<FileAttachModel> ListRecords;
#endregion Private Fields
//protected override async Task OnInitializedAsync()
//{
// await ReloadAllData();
//}
#region Private Properties
private bool isLoading { get; set; } = false;
[Inject]
private IJSRuntime JSRuntime { get; set; }
[Inject]
protected LiManDataService DataService { get; set; }
#endregion Private Properties
#region Private Methods
[Parameter]
public EventCallback<int> DataReset { get; set; }
private async Task fullReload()
private async Task FullReload()
{
await DataService.InvalidateAllCache();
await DataService.FlushRedisCache();
await ReloadAllData();
}
@@ -50,5 +69,7 @@ namespace LiMan.UI.Components
totalCount = ListRecords.Count();
//isLoading = false;
}
#endregion Private Methods
}
}
+72 -72
View File
@@ -11,13 +11,28 @@ namespace LiMan.UI.Components
{
public partial class ListInstallazioni : ComponentBase, IDisposable
{
#region Private Fields
#region Public Methods
private InstallazioneModel currRecord = null;
private List<InstallazioneModel> ListRecords;
private List<InstallazioneModel> SearchRecords;
public string checkSelect(string CodInst)
{
string answ = "";
if (currRecord != null)
{
try
{
answ = (currRecord.CodInst == CodInst) ? "table-info" : "";
}
catch
{ }
}
return answ;
}
#endregion Private Fields
public void Dispose()
{
}
#endregion Public Methods
#region Protected Fields
@@ -25,36 +40,6 @@ namespace LiMan.UI.Components
#endregion Protected Fields
#region Private Properties
private int currPage
{
get
{
return AppMService.PageNum;
}
set
{
AppMService.PageNum = value;
}
}
private bool isLoading { get; set; } = false;
private int numRecord
{
get
{
return AppMService.PageSize;
}
set
{
AppMService.PageSize = value;
}
}
#endregion Private Properties
#region Protected Properties
[Inject]
@@ -73,28 +58,6 @@ namespace LiMan.UI.Components
#endregion Protected Properties
#region Private Methods
private async Task fullReload()
{
currRecord = null;
await DataService.InvalidateAllCache();
await ReloadAllData();
}
private async Task ReloadAllData()
{
isLoading = true;
await Task.Delay(1);
//SearchRecords = null;
SearchRecords = await DataService.InstallazioniNextGetAll();
totalCount = SearchRecords.Count();
ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList();
isLoading = false;
}
#endregion Private Methods
#region Protected Methods
protected void AddNew()
@@ -135,37 +98,74 @@ namespace LiMan.UI.Components
protected async Task ResetData()
{
await fullReload();
await FullReload();
}
protected async Task UpdateData()
{
await fullReload();
await FullReload();
}
#endregion Protected Methods
#region Public Methods
#region Private Fields
public string checkSelect(string CodInst)
private InstallazioneModel currRecord = null;
private List<InstallazioneModel> ListRecords;
private List<InstallazioneModel> SearchRecords;
#endregion Private Fields
#region Private Properties
private int currPage
{
string answ = "";
if (currRecord != null)
get
{
try
{
answ = (currRecord.CodInst == CodInst) ? "table-info" : "";
}
catch
{ }
return AppMService.PageNum;
}
set
{
AppMService.PageNum = value;
}
return answ;
}
public void Dispose()
private bool isLoading { get; set; } = false;
private int numRecord
{
get
{
return AppMService.PageSize;
}
set
{
AppMService.PageSize = value;
}
}
#endregion Public Methods
#endregion Private Properties
#region Private Methods
private async Task FullReload()
{
currRecord = null;
await DataService.FlushRedisCache();
await ReloadAllData();
}
private async Task ReloadAllData()
{
isLoading = true;
await Task.Delay(1);
//SearchRecords = null;
SearchRecords = await DataService.InstallazioniNextGetAll();
totalCount = SearchRecords.Count();
ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList();
isLoading = false;
}
#endregion Private Methods
}
}
@@ -11,13 +11,28 @@ namespace LiMan.UI.Components
{
public partial class ListInstallazioniGLS : ComponentBase, IDisposable
{
#region Private Fields
#region Public Methods
private AnagInstallazioni currRecord = null;
private List<AnagInstallazioni> ListRecords;
private List<AnagInstallazioni> SearchRecords;
public string checkSelect(string Installazione)
{
string answ = "";
if (currRecord != null)
{
try
{
answ = (currRecord.Installazione == Installazione) ? "table-info" : "";
}
catch
{ }
}
return answ;
}
#endregion Private Fields
public void Dispose()
{
}
#endregion Public Methods
#region Protected Fields
@@ -25,36 +40,6 @@ namespace LiMan.UI.Components
#endregion Protected Fields
#region Private Properties
private int currPage
{
get
{
return AppMService.PageNum;
}
set
{
AppMService.PageNum = value;
}
}
private bool isLoading { get; set; } = false;
private int numRecord
{
get
{
return AppMService.PageSize;
}
set
{
AppMService.PageSize = value;
}
}
#endregion Private Properties
#region Protected Properties
[Inject]
@@ -73,28 +58,6 @@ namespace LiMan.UI.Components
#endregion Protected Properties
#region Private Methods
private async Task fullReload()
{
currRecord = null;
await DataService.InvalidateAllCache();
await ReloadAllData();
}
private async Task ReloadAllData()
{
isLoading = true;
await Task.Delay(1);
//SearchRecords = null;
SearchRecords = await DataService.InstallazioniGLSGetAll();
totalCount = SearchRecords.Count();
ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList();
isLoading = false;
}
#endregion Private Methods
#region Protected Methods
protected void Edit(AnagInstallazioni selRecord)
@@ -126,37 +89,74 @@ namespace LiMan.UI.Components
protected async Task ResetData()
{
await fullReload();
await FullReload();
}
protected async Task UpdateData()
{
await fullReload();
await FullReload();
}
#endregion Protected Methods
#region Public Methods
#region Private Fields
public string checkSelect(string Installazione)
private AnagInstallazioni currRecord = null;
private List<AnagInstallazioni> ListRecords;
private List<AnagInstallazioni> SearchRecords;
#endregion Private Fields
#region Private Properties
private int currPage
{
string answ = "";
if (currRecord != null)
get
{
try
{
answ = (currRecord.Installazione == Installazione) ? "table-info" : "";
}
catch
{ }
return AppMService.PageNum;
}
set
{
AppMService.PageNum = value;
}
return answ;
}
public void Dispose()
private bool isLoading { get; set; } = false;
private int numRecord
{
get
{
return AppMService.PageSize;
}
set
{
AppMService.PageSize = value;
}
}
#endregion Public Methods
#endregion Private Properties
#region Private Methods
private async Task FullReload()
{
currRecord = null;
await DataService.FlushRedisCache();
await ReloadAllData();
}
private async Task ReloadAllData()
{
isLoading = true;
await Task.Delay(1);
//SearchRecords = null;
SearchRecords = await DataService.InstallazioniGLSGetAll();
totalCount = SearchRecords.Count();
ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList();
isLoading = false;
}
#endregion Private Methods
}
}
+7 -8
View File
@@ -60,8 +60,6 @@ namespace LiMan.UI.Components
aTimer.Start();
}
private bool UserCanEdit { get; set; } = false;
#endregion Public Methods
#region Protected Fields
@@ -191,7 +189,7 @@ namespace LiMan.UI.Components
protected async Task ResetData()
{
await fullReload();
await FullReload();
}
protected void resetShowDetail()
@@ -223,7 +221,7 @@ namespace LiMan.UI.Components
protected async Task UpdateActivData()
{
int idxLic = currRecord.IdxLic;
await fullReload();
await FullReload();
currRecord = ListRecords.Where(x => x.IdxLic == idxLic).FirstOrDefault();
resetShowDetail();
showActivations = true;
@@ -232,7 +230,7 @@ namespace LiMan.UI.Components
protected async Task UpdateTicketData()
{
int idxLic = currRecord.IdxLic;
await fullReload();
await FullReload();
currRecord = ListRecords.Where(x => x.IdxLic == idxLic).FirstOrDefault();
resetShowDetail();
showTickets = true;
@@ -256,7 +254,6 @@ namespace LiMan.UI.Components
private bool showActivations = false;
private bool showTickets = false;
private Dictionary<string, bool> UserClaimsLUT = new Dictionary<string, bool>();
private string userName = "";
#endregion Private Fields
@@ -365,6 +362,8 @@ namespace LiMan.UI.Components
}
}
private bool UserCanEdit { get; set; } = false;
#endregion Private Properties
#region Private Methods
@@ -376,11 +375,11 @@ namespace LiMan.UI.Components
pUpd.Wait();
}
private async Task fullReload()
private async Task FullReload()
{
currRecord = null;
resetShowDetail();
await DataService.InvalidateAllCache();
await DataService.FlushRedisCache();
await ReloadAllData();
}
+115 -115
View File
@@ -11,6 +11,119 @@ namespace LiMan.UI.Components
{
public partial class ListLicenzeGLS : ComponentBase, IDisposable
{
#region Public Methods
public string checkSelect(int IdxLic)
{
string answ = "";
if (currRecord != null)
{
try
{
answ = (currRecord.IdxLic == IdxLic) ? "table-info" : "";
}
catch
{ }
}
return answ;
}
public void Dispose()
{
}
#endregion Public Methods
#region Protected Fields
protected int totalCount = 0;
#endregion Protected Fields
#region Protected Properties
[Inject]
protected MessageService AppMService { get; set; }
[Inject]
protected LiManDataService DataService { get; set; }
[Inject]
protected IJSRuntime JSRuntime { get; set; }
[Inject]
protected NavigationManager NavManager { get; set; }
protected bool showCamera { get; set; } = false;
#endregion Protected Properties
#region Protected Methods
/// <summary>
/// formatta testo secondo scadenza:
/// scadenza > 60gg --> verde
/// 0 < scadenza < 60 gg --> giallo
/// scadenza < 0 --> rosso
/// </summary>
/// <param name="scadenza"></param>
/// <returns></returns>
protected string cssScadenza(DateTime scadenza)
{
string answ = "text-dark";
double periodo = scadenza.Subtract(DateTime.Today).TotalDays;
if (periodo > 60)
{
answ = "text-success";
}
else if (periodo > 0)
{
answ = "text-warning";
}
else
{
answ = "text-danger";
}
return answ;
}
protected void Edit(LicenzeAttive selRecord)
{
currRecord = selRecord;
}
protected override async Task OnInitializedAsync()
{
await ReloadAllData();
}
protected async Task PagerReloadNum(int newNum)
{
numRecord = newNum;
await ReloadAllData();
isLoading = false;
}
protected async Task PagerReloadPage(int newNum)
{
currPage = newNum;
await ReloadAllData();
isLoading = false;
}
protected async Task ResetData()
{
await FullReload();
}
protected async Task UpdateData()
{
await FullReload();
}
#endregion Protected Methods
#region Private Fields
private LicenzeAttive currRecord = null;
@@ -22,12 +135,6 @@ namespace LiMan.UI.Components
#endregion Private Fields
#region Protected Fields
protected int totalCount = 0;
#endregion Protected Fields
#region Private Properties
private int currPage
@@ -146,30 +253,12 @@ namespace LiMan.UI.Components
#endregion Private Properties
#region Protected Properties
[Inject]
protected MessageService AppMService { get; set; }
[Inject]
protected LiManDataService DataService { get; set; }
[Inject]
protected IJSRuntime JSRuntime { get; set; }
[Inject]
protected NavigationManager NavManager { get; set; }
protected bool showCamera { get; set; } = false;
#endregion Protected Properties
#region Private Methods
private async Task fullReload()
private async Task FullReload()
{
currRecord = null;
await DataService.InvalidateAllCache();
await DataService.FlushRedisCache();
await ReloadAllData();
}
@@ -187,94 +276,5 @@ namespace LiMan.UI.Components
}
#endregion Private Methods
#region Protected Methods
/// <summary>
/// formatta testo secondo scadenza:
/// scadenza > 60gg --> verde
/// 0 < scadenza < 60 gg --> giallo
/// scadenza < 0 --> rosso
/// </summary>
/// <param name="scadenza"></param>
/// <returns></returns>
protected string cssScadenza(DateTime scadenza)
{
string answ = "text-dark";
double periodo = scadenza.Subtract(DateTime.Today).TotalDays;
if (periodo > 60)
{
answ = "text-success";
}
else if (periodo > 0)
{
answ = "text-warning";
}
else
{
answ = "text-danger";
}
return answ;
}
protected void Edit(LicenzeAttive selRecord)
{
currRecord = selRecord;
}
protected override async Task OnInitializedAsync()
{
await ReloadAllData();
}
protected async Task PagerReloadNum(int newNum)
{
numRecord = newNum;
await ReloadAllData();
isLoading = false;
}
protected async Task PagerReloadPage(int newNum)
{
currPage = newNum;
await ReloadAllData();
isLoading = false;
}
protected async Task ResetData()
{
await fullReload();
}
protected async Task UpdateData()
{
await fullReload();
}
#endregion Protected Methods
#region Public Methods
public string checkSelect(int IdxLic)
{
string answ = "";
if (currRecord != null)
{
try
{
answ = (currRecord.IdxLic == IdxLic) ? "table-info" : "";
}
catch
{ }
}
return answ;
}
public void Dispose()
{
}
#endregion Public Methods
}
}
+1 -1
View File
@@ -37,7 +37,7 @@
<thead>
<tr>
<th>
<button type="button" class="btn btn-sm btn-primary" @onclick="() => fullReload()"><i class="fas fa-sync"></i></button>
<button type="button" class="btn btn-sm btn-primary" @onclick="() => FullReload()"><i class="fas fa-sync"></i></button>
</th>
<th>Anno</th>
<th>Codice</th>
+5 -5
View File
@@ -69,7 +69,7 @@ namespace LiMan.UI.Components
protected async Task ResetData()
{
await fullReload();
await FullReload();
}
protected void Select(StatsCallModel selRecord)
@@ -79,7 +79,7 @@ namespace LiMan.UI.Components
protected async Task UpdateData()
{
await fullReload();
await FullReload();
}
#endregion Protected Methods
@@ -162,15 +162,15 @@ namespace LiMan.UI.Components
{
var pUpd = Task.Run(async () =>
{
await fullReload();
await FullReload();
});
pUpd.Wait();
}
private async Task fullReload()
private async Task FullReload()
{
currRecord = null;
await DataService.InvalidateAllCache();
await DataService.FlushRedisCache();
await ReloadAllData();
}
+202 -215
View File
@@ -15,212 +15,80 @@ namespace LiMan.UI.Components
{
public partial class Tickets
{
#region Private Fields
#region Public Methods
private List<TicketDTO> ListRecords;
private List<TicketDTO> SearchRecords;
private List<InstallazioneModel> ListInstall;
private List<SubLicenzaModel> ListActivations;
private List<ApplicativoModel> ListApp;
protected int totalCount = 0;
public string checkSelect(int IdxSubLic)
{
string answ = "";
if (currRecord != null)
{
try
{
answ = (currRecord.IdxSubLic == IdxSubLic) ? "table-info" : "";
}
catch
{ }
}
return answ;
}
protected TipologiaTicket currTipo = TipologiaTicket.ND;
public string decryptAuthKey(string authKey)
{
string answ = authKey;
try
{
answ = SteamCrypto.DecryptString(authKey, "AuthGPW");
}
catch
{ }
return answ;
}
private List<FileAttachModel> FileAttached;
public string selTick(int idxTicket)
{
string answ = " ";
private bool showTickets = false;
if (idxTicketSel == idxTicket)
{
answ = "table-primary";
}
return answ;
}
#endregion Private Fields
#endregion Public Methods
#region Protected Fields
protected SubLicenzaModel _currRecord = new SubLicenzaModel();
protected LicenzaModel _masterLic = new LicenzaModel();
protected TipologiaTicket currTipo = TipologiaTicket.ND;
protected int idxTicketSel = 0;
protected StatoRichiesta StatusSel = StatoRichiesta.ND;
protected bool showKey = false;
protected StatoRichiesta StatusSel = StatoRichiesta.ND;
protected int totalCount = 0;
#endregion Protected Fields
#region Private Properties
private SubLicenzaModel currRecord
{
get
{
return _currRecord;
}
set
{
_currRecord = value;
}
}
protected override async Task OnInitializedAsync()
{
await ReloadAllData();
}
private bool isLoading { get; set; } = false;
[Inject]
private IJSRuntime JSRuntime { get; set; }
#endregion Private Properties
#region Protected Properties
[Inject]
protected LiManDataService DataService { get; set; }
#endregion Protected Properties
#region Public Properties
//[Parameter]
//public EventCallback<int> DataReset { get; set; }
//[Parameter]
//public EventCallback<int> DataUpdated { get; set; }
//[Parameter]
//public LicenzaModel MasterLicence
//{
// get
// {
// return _masterLic;
// }
// set
// {
// _masterLic = value;
// var pUpd = Task.Run(async () => await ReloadAllData());
// pUpd.Wait();
// }
//}
#endregion Public Properties
#region Private Methods
[Inject]
protected MessageService AppMService { get; set; }
private async Task fullReload()
{
await DataService.InvalidateAllCache();
await ReloadAllData();
}
[Inject]
protected LiManDataService DataService { get; set; }
protected string mainCss
{
get => idxTicketSel == 0 ? "col-12" : "col-8";
}
private async Task ReloadAllData()
#endregion Protected Properties
#region Protected Methods
protected async void closeDet()
{
isLoading = true;
idxTicketSel = 0;
await Task.Delay(1);
showTickets = false;
ListApp = await DataService.ApplicazioniNextGetAll();
ListInstall = await DataService.InstallazioniNextGetAll();
//bool StatoRichiesta = true;
//SearchRecords = await LMDService.LicenzeNextGetFilt(AppMServ.DetailDBFilter);
SearchRecords = await DataService.TicketsGetFilt(true, SelApp, SelInst);
//totalCount = SearchRecords.Count();
//SearchRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList();
//SearchRecords = await LMDService.TicketsGetAll();
ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList();
totalCount = SearchRecords.Count();
isLoading = false;
}
private string SelInst
{
get
{
string answ = "";
if (AppMService.DetailDBFilter != null)
{
answ = AppMService.DetailDBFilter.InstallazioneSel;
}
return answ;
}
set
{
if (!AppMService.DetailDBFilter.InstallazioneSel.Equals(value))
{
AppMService.DetailDBFilter.InstallazioneSel = value;
var pUpd = Task.Run(async () => await ReloadAllData());
pUpd.Wait();
}
}
}
private string SelApp
{
get
{
string answ = "";
if (AppMService.DetailDBFilter != null)
{
answ = AppMService.DetailDBFilter.ApplicazioneSel;
}
return answ;
}
set
{
if (!AppMService.DetailDBFilter.ApplicazioneSel.Equals(value))
{
AppMService.DetailDBFilter.ApplicazioneSel = value;
var pUpd = Task.Run(async () => await ReloadAllData());
pUpd.Wait();
}
}
}
private int numRecord
{
get
{
return AppMService.PageSize;
}
set
{
AppMService.PageSize = value;
}
}
private int currPage
{
get
{
return AppMService.PageNum;
}
set
{
AppMService.PageNum = value;
}
}
protected async Task PagerReloadNum(int newNum)
{
numRecord = newNum;
await ReloadAllData();
isLoading = false;
}
protected async Task PagerReloadPage(int newNum)
{
currPage = newNum;
await ReloadAllData();
isLoading = false;
}
//private async void DownloadFileFromURL(string fileName, string rawUrl)
@@ -231,16 +99,6 @@ namespace LiMan.UI.Components
// //var fileName = FileAttached;
// await JS.InvokeVoidAsync("triggerFileDownload", fileName, fileURL);
//}
#endregion Private Methods
#region Protected Methods
protected async void closeDet()
{
await ReloadAllData();
}
/// <summary>
/// formatta testo secondo scadenza:
/// scadenza < oggi --> verde
@@ -264,9 +122,28 @@ namespace LiMan.UI.Components
return answ;
}
protected override async Task OnInitializedAsync()
{
await ReloadAllData();
}
protected async Task PagerReloadNum(int newNum)
{
numRecord = newNum;
await ReloadAllData();
isLoading = false;
}
protected async Task PagerReloadPage(int newNum)
{
currPage = newNum;
await ReloadAllData();
isLoading = false;
}
protected async Task ResetData()
{
await fullReload();
await FullReload();
}
protected void showDecrypt()
@@ -316,46 +193,156 @@ namespace LiMan.UI.Components
#endregion Protected Methods
#region Public Methods
#region Private Fields
public string checkSelect(int IdxSubLic)
private List<FileAttachModel> FileAttached;
private List<SubLicenzaModel> ListActivations;
private List<ApplicativoModel> ListApp;
private List<InstallazioneModel> ListInstall;
private List<TicketDTO> ListRecords;
private List<TicketDTO> SearchRecords;
private bool showTickets = false;
#endregion Private Fields
#region Private Properties
private int currPage
{
string answ = "";
if (currRecord != null)
get
{
try
return AppMService.PageNum;
}
set
{
AppMService.PageNum = value;
}
}
private SubLicenzaModel currRecord
{
get
{
return _currRecord;
}
set
{
_currRecord = value;
}
}
private bool isLoading { get; set; } = false;
[Inject]
private IJSRuntime JSRuntime { get; set; }
//[Parameter]
//public EventCallback<int> DataReset { get; set; }
//[Parameter]
//public EventCallback<int> DataUpdated { get; set; }
private int numRecord
{
get
{
return AppMService.PageSize;
}
set
{
AppMService.PageSize = value;
}
}
private string SelApp
{
get
{
string answ = "";
if (AppMService.DetailDBFilter != null)
{
answ = (currRecord.IdxSubLic == IdxSubLic) ? "table-info" : "";
answ = AppMService.DetailDBFilter.ApplicazioneSel;
}
catch
{ }
return answ;
}
return answ;
}
public string decryptAuthKey(string authKey)
{
string answ = authKey;
try
set
{
answ = SteamCrypto.DecryptString(authKey, "AuthGPW");
if (!AppMService.DetailDBFilter.ApplicazioneSel.Equals(value))
{
AppMService.DetailDBFilter.ApplicazioneSel = value;
var pUpd = Task.Run(async () => await ReloadAllData());
pUpd.Wait();
}
}
catch
{ }
return answ;
}
public string selTick(int idxTicket)
private string SelInst
{
string answ = " ";
if (idxTicketSel == idxTicket)
get
{
answ = "table-primary";
string answ = "";
if (AppMService.DetailDBFilter != null)
{
answ = AppMService.DetailDBFilter.InstallazioneSel;
}
return answ;
}
set
{
if (!AppMService.DetailDBFilter.InstallazioneSel.Equals(value))
{
AppMService.DetailDBFilter.InstallazioneSel = value;
var pUpd = Task.Run(async () => await ReloadAllData());
pUpd.Wait();
}
}
return answ;
}
#endregion Public Methods
#endregion Private Properties
#region Private Methods
//[Parameter]
//public LicenzaModel MasterLicence
//{
// get
// {
// return _masterLic;
// }
// set
// {
// _masterLic = value;
// var pUpd = Task.Run(async () => await ReloadAllData());
// pUpd.Wait();
// }
//}
private async Task FullReload()
{
await DataService.FlushRedisCache();
await ReloadAllData();
}
private async Task ReloadAllData()
{
isLoading = true;
idxTicketSel = 0;
await Task.Delay(1);
showTickets = false;
ListApp = await DataService.ApplicazioniNextGetAll();
ListInstall = await DataService.InstallazioniNextGetAll();
//bool StatoRichiesta = true;
//SearchRecords = await LMDService.LicenzeNextGetFilt(AppMServ.DetailDBFilter);
SearchRecords = await DataService.TicketsGetFilt(true, SelApp, SelInst);
//totalCount = SearchRecords.Count();
//SearchRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList();
//SearchRecords = await LMDService.TicketsGetAll();
ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList();
totalCount = SearchRecords.Count();
isLoading = false;
}
#endregion Private Methods
}
}
+173 -182
View File
@@ -10,69 +10,10 @@ using System.Linq;
using System.Threading.Tasks;
using static Core.Enum;
namespace LiMan.UI.Components
{
public partial class TicketsHP
{
#region Private Fields
private List<SubLicenzaModel> ListActivations;
private List<TicketModel> ListRecords;
#endregion Private Fields
#region Protected Fields
protected SubLicenzaModel _currRecord = new SubLicenzaModel();
protected LicenzaModel _masterLic = new LicenzaModel();
private List<FileAttachModel> FileAttached;
protected int idxTicketSel = 0;
protected TipologiaTicket currTipo = TipologiaTicket.ND;
protected StatoRichiesta StatusSel = StatoRichiesta.ND;
protected bool showKey = false;
[Inject]
protected LiManDataService DataService { get; set; }
#endregion Protected Fields
#region Private Properties
private SubLicenzaModel currRecord
{
get
{
return _currRecord;
}
set
{
_currRecord = value;
}
}
protected override async Task OnInitializedAsync()
{
await ReloadAllData();
}
private bool isLoading { get; set; } = false;
[Inject]
private IJSRuntime JSRuntime { get; set; }
#endregion Private Properties
#region Protected Properties
#endregion Protected Properties
#region Public Properties
[Parameter]
@@ -98,129 +39,6 @@ namespace LiMan.UI.Components
#endregion Public Properties
#region Private Methods
private async Task fullReload()
{
await DataService.InvalidateAllCache();
await ReloadAllData();
}
private async Task ReloadAllData()
{
isLoading = true;
ListActivations = null;
idxTicketSel = 0;
await Task.Delay(1);
ListRecords = MasterLicence.Tickets.ToList();
isLoading = false;
}
#endregion Private Methods
#region Protected Methods
protected async void close()
{
await DataReset.InvokeAsync(0);
}
protected async void closeDet()
{
await ReloadAllData();
}
//protected string rowsel = "background:red";
/// <summary>
/// formatta testo secondo scadenza:
/// scadenza < oggi --> verde
/// scadenza > oggi --> rosso
/// </summary>
/// <param name="scadenza"></param>
/// <returns></returns>
protected string cssScadenza(DateTime scadenza)
{
string answ = "text-dark";
double periodo = scadenza.Subtract(DateTime.Today).TotalDays;
if (periodo <= 0)
{
answ = "text-success";
}
else
{
answ = "text-danger";
}
return answ;
}
protected async Task ResetData()
{
await fullReload();
}
protected void showDecrypt()
{
showKey = !showKey;
}
//protected void showDet(TicketModel currTicket)
//{
// // salvo ticket sel
// idxTicketSel = currTicket.IdxTicket;
// StatusSel = currTicket.Status;
// currTipo = currTicket.TType;
// FileAttached = await LMDService.FileGetFilt(idxTicketSel);
// // mostro SOLO le attivazioni di cui ho ticket attivi...
// ListActivations = MasterLicence
// .Attivazioni
// .Where(a => a.IdxSubLic == currTicket.IdxSubLic)
// .ToList();
//}
protected async Task showDet(TicketModel currTicket)
{
// salvo ticket sel
idxTicketSel = currTicket.IdxTicket;
StatusSel = currTicket.Status;
currTipo = currTicket.TType;
FileAttached = await DataService.FileGetFilt(idxTicketSel);
//rowsel = "background-color:red";
// mostro SOLO le attivazioni di cui ho ticket attivi...
ListActivations = MasterLicence
.Attivazioni
.Where(a => a.IdxSubLic == currTicket.IdxSubLic)
.ToList();
}
protected async Task UnLock(SubLicenzaModel selRecord)
{
if (!await JSRuntime.InvokeAsync<bool>("confirm", "Sicuro di voler eliminare il blocco? la data di scadenza verrà impostata a ieri liberando la licenza per cancellazioni o rimozioni."))
return;
// chiamo procedura sblocco...
await DataService.AttivazioneUnlock(selRecord.IdxSubLic);
await DataUpdated.InvokeAsync(0);
}
protected async void updateStato(StatoRichiesta nuovoStato)
{
if (nuovoStato == StatoRichiesta.Approvata || nuovoStato == StatoRichiesta.Rifiutata)
{
if (!await JSRuntime.InvokeAsync<bool>("confirm", "Confermi l'azione richiesta? Ricorda che in caso di approvazione/rifiuto va modificato preventivamente il record dell'Attivazione coinvolta."))
return;
}
if (idxTicketSel > 0)
{
// salvo presa in carico ticket
await DataService.TicketUpdateState(idxTicketSel, nuovoStato);
await DataUpdated.InvokeAsync(0);
}
}
#endregion Protected Methods
#region Public Methods
public string checkSelect(int IdxSubLic)
@@ -266,5 +84,178 @@ namespace LiMan.UI.Components
}
#endregion Public Methods
#region Protected Fields
protected SubLicenzaModel _currRecord = new SubLicenzaModel();
protected LicenzaModel _masterLic = new LicenzaModel();
protected TipologiaTicket currTipo = TipologiaTicket.ND;
protected int idxTicketSel = 0;
protected bool showKey = false;
protected StatoRichiesta StatusSel = StatoRichiesta.ND;
#endregion Protected Fields
#region Protected Properties
[Inject]
protected LiManDataService DataService { get; set; }
#endregion Protected Properties
#region Protected Methods
protected async void close()
{
await DataReset.InvokeAsync(0);
}
protected async void closeDet()
{
await ReloadAllData();
}
/// <summary>
/// formatta testo secondo scadenza:
/// scadenza < oggi --> verde
/// scadenza > oggi --> rosso
/// </summary>
/// <param name="scadenza"></param>
/// <returns></returns>
protected string cssScadenza(DateTime scadenza)
{
string answ = "text-dark";
double periodo = scadenza.Subtract(DateTime.Today).TotalDays;
if (periodo <= 0)
{
answ = "text-success";
}
else
{
answ = "text-danger";
}
return answ;
}
protected override async Task OnInitializedAsync()
{
await ReloadAllData();
}
//protected string rowsel = "background:red";
protected async Task ResetData()
{
await FullReload();
}
protected void showDecrypt()
{
showKey = !showKey;
}
protected async Task showDet(TicketModel currTicket)
{
// salvo ticket sel
idxTicketSel = currTicket.IdxTicket;
StatusSel = currTicket.Status;
currTipo = currTicket.TType;
FileAttached = await DataService.FileGetFilt(idxTicketSel);
//rowsel = "background-color:red";
// mostro SOLO le attivazioni di cui ho ticket attivi...
ListActivations = MasterLicence
.Attivazioni
.Where(a => a.IdxSubLic == currTicket.IdxSubLic)
.ToList();
}
//protected void showDet(TicketModel currTicket)
//{
// // salvo ticket sel
// idxTicketSel = currTicket.IdxTicket;
// StatusSel = currTicket.Status;
// currTipo = currTicket.TType;
// FileAttached = await LMDService.FileGetFilt(idxTicketSel);
// // mostro SOLO le attivazioni di cui ho ticket attivi...
// ListActivations = MasterLicence
// .Attivazioni
// .Where(a => a.IdxSubLic == currTicket.IdxSubLic)
// .ToList();
//}
protected async Task UnLock(SubLicenzaModel selRecord)
{
if (!await JSRuntime.InvokeAsync<bool>("confirm", "Sicuro di voler eliminare il blocco? la data di scadenza verrà impostata a ieri liberando la licenza per cancellazioni o rimozioni."))
return;
// chiamo procedura sblocco...
await DataService.AttivazioneUnlock(selRecord.IdxSubLic);
await DataUpdated.InvokeAsync(0);
}
protected async void updateStato(StatoRichiesta nuovoStato)
{
if (nuovoStato == StatoRichiesta.Approvata || nuovoStato == StatoRichiesta.Rifiutata)
{
if (!await JSRuntime.InvokeAsync<bool>("confirm", "Confermi l'azione richiesta? Ricorda che in caso di approvazione/rifiuto va modificato preventivamente il record dell'Attivazione coinvolta."))
return;
}
if (idxTicketSel > 0)
{
// salvo presa in carico ticket
await DataService.TicketUpdateState(idxTicketSel, nuovoStato);
await DataUpdated.InvokeAsync(0);
}
}
#endregion Protected Methods
#region Private Fields
private List<FileAttachModel> FileAttached;
private List<SubLicenzaModel> ListActivations;
private List<TicketModel> ListRecords;
#endregion Private Fields
#region Private Properties
private SubLicenzaModel currRecord
{
get
{
return _currRecord;
}
set
{
_currRecord = value;
}
}
private bool isLoading { get; set; } = false;
[Inject]
private IJSRuntime JSRuntime { get; set; }
#endregion Private Properties
#region Private Methods
private async Task FullReload()
{
await DataService.FlushRedisCache();
await ReloadAllData();
}
private async Task ReloadAllData()
{
isLoading = true;
ListActivations = null;
idxTicketSel = 0;
await Task.Delay(1);
ListRecords = MasterLicence.Tickets.ToList();
isLoading = false;
}
#endregion Private Methods
}
}
+1 -68
View File
@@ -39,11 +39,8 @@ namespace LiMan.UI.Data
#region Public Constructors
public LiManDataService(IConfiguration configuration, IMemoryCache memoryCache, IDistributedCache distributedCache, IConnectionMultiplexer redisConnMult, IEmailSender emailSender) : base(configuration, redisConnMult, emailSender)
public LiManDataService(IConfiguration configuration, IConnectionMultiplexer redisConnMult, IEmailSender emailSender) : base(configuration, redisConnMult, emailSender)
{
// conf cache
this.memoryCache = memoryCache;
this.distributedCache = distributedCache;
// conf DB
string connStrGLS = _configuration.GetConnectionString("LiMan.GLS");
if (string.IsNullOrEmpty(connStrGLS))
@@ -110,7 +107,6 @@ namespace LiMan.UI.Data
try
{
done = dbControllerGLS.UpdateApplicazioni(currItem);
await InvalidateAllCache();
await FlushRedisCache();
}
catch (Exception exc)
@@ -167,7 +163,6 @@ namespace LiMan.UI.Data
if (!hasCHild)
{
done = dbControllerNext.ApplicazioniNextDelete(currItem);
await InvalidateAllCache();
await FlushRedisCache();
}
}
@@ -227,7 +222,6 @@ namespace LiMan.UI.Data
try
{
done = dbControllerNext.ApplicazioniNextUpdate(currItem);
await InvalidateAllCache();
await FlushRedisCache();
}
catch (Exception exc)
@@ -367,7 +361,6 @@ namespace LiMan.UI.Data
try
{
done = dbControllerGLS.UpdateInstallazioni(currItem);
await InvalidateAllCache();
await FlushRedisCache();
}
catch (Exception exc)
@@ -451,7 +444,6 @@ namespace LiMan.UI.Data
try
{
done = dbControllerNext.UpsertInstallazione(currItem);
await InvalidateAllCache();
await FlushRedisCache();
}
catch (Exception exc)
@@ -513,23 +505,6 @@ namespace LiMan.UI.Data
return dbResult;
}
/// <summary>
/// invalida tutta la cache in caso di update
/// </summary>
/// <returns></returns>
public async Task InvalidateAllCache()
{
await distributedCache.RemoveAsync(mHash("GLS:Applicazioni"));
await distributedCache.RemoveAsync(mHash("Next:Applicazioni"));
await distributedCache.RemoveAsync(mHash("GLS:Installazioni"));
await distributedCache.RemoveAsync(mHash("Next:Installazioni"));
await distributedCache.RemoveAsync(mHash("GLS:Licenze"));
await distributedCache.RemoveAsync(mHash("Next:Licenze"));
//await distributedCache.RemoveAsync(mHash("SUPPL:List"));
//await distributedCache.RemoveAsync(mHash("TRANSP:List"));
//await distributedCache.RemoveAsync(mHash("WEEKPLAN:List"));
}
/// <summary>
/// Trasferisce una licenza da GLS a Next come LOG di una licenza scaduta
/// </summary>
@@ -809,7 +784,6 @@ namespace LiMan.UI.Data
try
{
done = dbControllerNext.UpsertLicenza(currItem);
await InvalidateAllCache();
await FlushRedisCache();
}
catch (Exception exc)
@@ -830,7 +804,6 @@ namespace LiMan.UI.Data
try
{
done = await dbControllerNext.ReleaseUpsert(currItem);
await InvalidateAllCache();
await FlushRedisCache();
}
catch (Exception exc)
@@ -1057,45 +1030,5 @@ namespace LiMan.UI.Data
}
#endregion Protected Methods
#region Private Fields
private readonly IDistributedCache distributedCache;
private readonly IMemoryCache memoryCache;
/// <summary>
/// Durata assoluta massima della cache IN SECONDI
/// </summary>
private int chAbsExp = 60 * 5;
/// <summary>
/// Durata della cache IN SECONDI in modalità inattiva (non acceduta) prima di venire
/// rimossa NON estende oltre il tempo massimo di validità della cache (chAbsExp)
/// </summary>
private int chSliExp = 60 * 1;
#endregion Private Fields
#region Private Methods
/// <summary>
/// Hash Redis contenente i dati MP di una specifico TYPE (es StatusMacchina,
/// StateMachineIngressi, ...)
/// </summary>
/// <param name="dataType"></param>
/// <returns></returns>
private static string mHash(string dataType)
{
return $"DATA:{dataType}";
}
private DistributedCacheEntryOptions cacheOpt(bool fastCache)
{
var numSecAbsExp = fastCache ? chAbsExp : chAbsExp * 10;
var numSecSliExp = fastCache ? chSliExp : chSliExp * 10;
return new DistributedCacheEntryOptions().SetAbsoluteExpiration(DateTime.Now.AddSeconds(numSecAbsExp)).SetSlidingExpiration(TimeSpan.FromSeconds(numSecSliExp));
}
#endregion Private Methods
}
}
+3 -4
View File
@@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Version>2.1.2501.2909</Version>
<Version>2.1.2501.2910</Version>
<RootNamespace>LiMan.UI</RootNamespace>
<AssemblyName>LiMan.UI</AssemblyName>
</PropertyGroup>
@@ -43,8 +43,8 @@
<ItemGroup>
<PackageReference Include="Blazored.LocalStorage" Version="4.5.0" />
<PackageReference Include="Blazored.SessionStorage" Version="2.4.0" />
<PackageReference Include="EgwCoreLib.Razor" Version="1.5.2501.1509" />
<PackageReference Include="EgwCoreLib.Utils" Version="1.5.2501.1509" />
<PackageReference Include="EgwCoreLib.Razor" Version="1.5.2501.1716" />
<PackageReference Include="EgwCoreLib.Utils" Version="1.5.2501.1716" />
<PackageReference Include="EgwProxy.MP.Core" Version="1.0.2412.2310" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Negotiate" Version="6.0.28" />
<PackageReference Include="Microsoft.AspNetCore.Components" Version="6.0.21" />
@@ -52,7 +52,6 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.3" />
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="6.36.0" />
<PackageReference Include="Microsoft.IdentityModel.Logging" Version="6.36.0" />
<PackageReference Include="Microsoft.IdentityModel.Protocols" Version="6.36.0" />
+1 -1
View File
@@ -18,13 +18,13 @@ namespace LiMan.UI.Pages
[Inject]
protected MessageService MServ { get; set; } = null!;
#endregion Protected Properties
#region Protected Methods
protected override async Task OnInitializedAsync()
{
await DataService.InvalidateAllCache();
await DataService.FlushRedisCache();
await CCService.FlushRedisCache();
await MServ.FlushRedisCache();
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>License Manager</i>
<h4>Versione: 2.1.2501.2909</h4>
<h4>Versione: 2.1.2501.2910</h4>
<br /> Note di rilascio:
<ul>
<li>
+1 -1
View File
@@ -1 +1 @@
2.1.2501.2909
2.1.2501.2910
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>2.1.2501.2909</version>
<version>2.1.2501.2910</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>
+7 -5
View File
@@ -139,12 +139,14 @@ namespace LiMan.UI
o.SlidingExpiration = true;
});
#if false
services.AddStackExchangeRedisCache(options =>
{
//options.Configuration = "localhost:6379";
options.ConfigurationOptions = new StackExchange.Redis.ConfigurationOptions() { KeepAlive = 180, DefaultDatabase = 5, EndPoints = { { "localhost", 6379 } } };
options.InstanceName = "LiMan";
});
{
//options.Configuration = "localhost:6379";
options.ConfigurationOptions = new StackExchange.Redis.ConfigurationOptions() { KeepAlive = 180, DefaultDatabase = 5, EndPoints = { { "localhost", 6379 } } };
options.InstanceName = "LiMan";
});
#endif
// REDIS setup
var redisConnString = Configuration.GetConnectionString("Redis");