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

Merge branch 'release/InstallStats_04'

Browse Source
This commit is contained in:
Samuele Locatelli
2025-01-13 17:16:39 +01:00
parent d0db8f0c72 bff1753a64
commit 022c80d17e
9 changed files with 43 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
LiMan.Api/Controllers/ReleaseController.cs
+1
View File
@@ -63,6 +63,7 @@ namespace LiMan.APi.Controllers
public async Task<List<ReleaseDTO>> GetFilt(string id, string VersMin)
{
var result = await dataService.ReleaseGetByAppVers(id, VersMin);
Log.Warn($"Chiamato metodo legacy api/release/filt | id: {id} | vers: {VersMin}");
await dataService.recordCall(id, id, $"GET:api/release/filt/{id}");
return result;
}
LiMan.Api/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>License Manager</i>
<h4>Versione: 2.1.2501.1315</h4>
<h4>Versione: 2.1.2501.1316</h4>
<br /> Note di rilascio:
<ul>
<li>
LiMan.Api/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
2.1.2501.1315
2.1.2501.1316
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.1315</version>
<version>2.1.2501.1316</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.DB/Controllers/DbController.cs
+35 -3
View File
@@ -6,6 +6,7 @@ using LiMan.DB.Migrations;
using Microsoft.Data.SqlClient;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration;
using Newtonsoft.Json;
using NLog;
using Org.BouncyCastle.Asn1.Crmf;
using System;
@@ -1426,13 +1427,13 @@ namespace LiMan.DB.Controllers
.FirstOrDefault(x => x.Chiave == upRec.AppKey && x.CodImpiego == upRec.CodImp);
if (recIst != null)
{
upRec.IdxSubLic = recIst.IdxSubLic;
upRec.IdxLic = recIst.IdxLic;
currRec.IdxSubLic = recIst.IdxSubLic;
currRec.IdxLic = recIst.IdxLic;
}
}
// se trovo aggiorno...
currRec.DtCheck = upRec.DtCheck;
currRec.IdxSubLic = upRec.IdxSubLic;
//currRec.IdxSubLic = upRec.IdxSubLic;
currRec.MastKey = upRec.MastKey;
currRec.NumImp = upRec.NumImp;
currRec.VersNum = upRec.VersNum;
@@ -1562,6 +1563,17 @@ namespace LiMan.DB.Controllers
.DbSetReleases
.ToList();
// elenco subLic x verifica validità
var listSubLic = localDbCtx
.DbSetSubLicenze
.ToList();
// recupero list enroll x recuperare nomi PC...
var listEnroll = localDbCtx
.DbSetEnrollReq
.Where(x => x.IdxLic > 0)
.ToList();
// raggruppo x calcolare ultimo...
var lastRel = listAllVers
.Where(i => i.IsReleased)
@@ -1572,6 +1584,8 @@ namespace LiMan.DB.Controllers
.First())
.ToList();
string kMachName = "MachineName";
// aggiungo info cliente/installazione + vers corrente applicativi
foreach (var item in instRelList)
{
@@ -1581,6 +1595,24 @@ namespace LiMan.DB.Controllers
item.Cliente = recInst.CodInst;
}
var recSubLic = listSubLic.FirstOrDefault(x => x.IdxSubLic == item.IdxSubLic);
if (recSubLic != null)
{
// in questo caso controllo enroll x recuperare nome PC
var recEnroll = listEnroll
.Where(x => x.IdxLic == item.IdxLic)
.FirstOrDefault(x => x.ReqPayload.Contains(recSubLic.CodImpiego));
//var listCliEnroll = listEnroll.Where(x => x.IdxLic == item.IdxLic).ToList();
//var recEnroll = listCliEnroll.FirstOrDefault(x => x.ReqPayload.Contains(recSubLic.CodImpiego));
if (recEnroll != null && !string.IsNullOrEmpty(recEnroll.ReqPayload))
{
var dictPayload = JsonConvert.DeserializeObject<Dictionary<string, string>>(recEnroll.ReqPayload);
if (dictPayload != null && dictPayload.ContainsKey(kMachName))
{
item.PcInst = dictPayload[kMachName];
}
}
}
var recRel = lastRel.FirstOrDefault(x => x.CodApp == item.CodApp);
if (recRel != null)
{
LiMan.UI/LiMan.UI.csproj
+1 -1
View File
@@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Version>2.1.2501.1315</Version>
<Version>2.1.2501.1316</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.1315</h4>
<h4>Versione: 2.1.2501.1316</h4>
<br /> Note di rilascio:
<ul>
<li>
LiMan.UI/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
2.1.2501.1315
2.1.2501.1316
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.1315</version>
<version>2.1.2501.1316</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>