diff --git a/Core/Enum.cs b/Core/Enum.cs
index e071fa1..291abae 100644
--- a/Core/Enum.cs
+++ b/Core/Enum.cs
@@ -1,5 +1,7 @@
-using System;
+using Newtonsoft.Json.Converters;
+using System;
using System.Collections.Generic;
+using System.Text.Json.Serialization;
namespace Core
{
@@ -73,39 +75,74 @@ namespace Core
{ "WinApp", "WinApp" }
};
+#if false
+ [JsonConverter(typeof(StringEnumConverter))]
+ public enum AppType
+ {
+ None,
+ Cli,
+ Machine,
+ WebApp,
+ WinApp,
+ LicenceApp
+ }
+#endif
+
///
/// Elenco tipi di azioni che si possono chiedere ad EgwACC
///
+ [JsonConverter(typeof(StringEnumConverter))]
public enum EgwAccTask
{
///
/// Non definito (init)
///
ND = 0,
+
+ ///
+ /// Richiesta ricerca generica app da sorgenti mappate (registro, path...) ricevute in input
+ ///
+ AppSearch,
+
///
/// Richiesta info device (analoghe a quelle del setup iniziale in Enroll)
///
DeviceInfoGet,
+
///
/// Richiesta verifica forzata da remoto
///
ForceCheck,
+
+ ///
+ /// Richiede reload forzato (come da tray menu con Reload senza check update)
+ ///
+ ForceReload,
+
///
/// Richiede update forzato (come da tray menu con restart tramite bootstrap process esterno)
///
ForceUpdate,
+
///
/// Info tipo License (Oxysec key)
///
OxyLicenseGet,
+
///
/// Forza Reset parametri opzionali impostabili da remoto
///
ParamDictReset,
+
///
/// Upsert di parametri operativi (gestiti in remoto)
///
- ParamUpsert
+ ParamUpsert,
+
+ ///
+ /// Upsert valori TargetList (gestiti in remoto)
+ ///
+ TargetListUpsert
}
}
}
\ No newline at end of file
diff --git a/Core/Models/ControlTarget.cs b/Core/Models/ControlTarget.cs
new file mode 100644
index 0000000..510cdb7
--- /dev/null
+++ b/Core/Models/ControlTarget.cs
@@ -0,0 +1,45 @@
+using Newtonsoft.Json.Converters;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Core.Models
+{
+ public class ControlTarget
+ {
+ [Key]
+ public int Idx { get; set; } = 0;
+
+ ///
+ /// Tipo applicazione da monitorare
+ ///
+ public string ApplicationType { get; set; } = "";
+#if false
+ [JsonConverter(typeof(StringEnumConverter))]
+ public CoreEnum.AppType ApplicationType { get; set; } = CoreEnum.AppType.None;
+#endif
+
+ ///
+ /// Path di base da monitorare
+ ///
+ public string BasePath { get; set; } = "";
+
+ ///
+ /// Pattern di ricerca
+ ///
+ public string SearchPattern { get; set; } = "";
+
+ ///
+ /// Indica se il path sia abilitato
+ ///
+ public bool IsEnabled { get; set; } = true;
+
+ ///
+ /// Indica se sia abilitato l'update x l'item
+ ///
+ public bool UpdateEnabled { get; set; } = false;
+ }
+}
diff --git a/LiMan.Api/Resources/ChangeLog.html b/LiMan.Api/Resources/ChangeLog.html
index 14505f6..139cfe3 100644
--- a/LiMan.Api/Resources/ChangeLog.html
+++ b/LiMan.Api/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
License Manager
- Versione: 2.1.2501.2019
+ Versione: 2.1.2501.2110
Note di rilascio:
-
diff --git a/LiMan.Api/Resources/VersNum.txt b/LiMan.Api/Resources/VersNum.txt
index 2b2cbba..a7069d4 100644
--- a/LiMan.Api/Resources/VersNum.txt
+++ b/LiMan.Api/Resources/VersNum.txt
@@ -1 +1 @@
-2.1.2501.2019
+2.1.2501.2110
diff --git a/LiMan.Api/Resources/manifest.xml b/LiMan.Api/Resources/manifest.xml
index 4fd40ee..4960d3d 100644
--- a/LiMan.Api/Resources/manifest.xml
+++ b/LiMan.Api/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 2.1.2501.2019
+ 2.1.2501.2110
https://nexus.steamware.net/repository/SWS/LiMan/stable/LAST/LiMan.UI.zip
https://nexus.steamware.net/repository/SWS/LiMan/stable/LAST/ChangeLog.html
false
diff --git a/LiMan.Transfer/Resources/ChangeLog.html b/LiMan.Transfer/Resources/ChangeLog.html
index bf03488..0c0726d 100644
--- a/LiMan.Transfer/Resources/ChangeLog.html
+++ b/LiMan.Transfer/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
License Manager
-
Versione: 2.1.2501.2018
+ Versione: 2.1.2501.2109
Note di rilascio:
diff --git a/LiMan.Transfer/Resources/VersNum.txt b/LiMan.Transfer/Resources/VersNum.txt
index 381c8d3..46bcf79 100644
--- a/LiMan.Transfer/Resources/VersNum.txt
+++ b/LiMan.Transfer/Resources/VersNum.txt
@@ -1 +1 @@
-2.1.2501.2018
+2.1.2501.2109
diff --git a/LiMan.Transfer/Resources/manifest.xml b/LiMan.Transfer/Resources/manifest.xml
index 496c222..c2efb4e 100644
--- a/LiMan.Transfer/Resources/manifest.xml
+++ b/LiMan.Transfer/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 2.1.2501.2018
+ 2.1.2501.2109
https://nexus.steamware.net/repository/SWS/LiMan/stable/LAST/LiMan.Transfer.zip
https://nexus.steamware.net/repository/SWS/LiMan/stable/LAST/ChangeLog.html
false
diff --git a/LiMan.UI/Components/InstAppPareto.razor.cs b/LiMan.UI/Components/InstAppPareto.razor.cs
index 642a615..3cf30b2 100644
--- a/LiMan.UI/Components/InstAppPareto.razor.cs
+++ b/LiMan.UI/Components/InstAppPareto.razor.cs
@@ -102,6 +102,7 @@ namespace LiMan.UI.Components
MServ.UsrParamSet("PcInst", "");
MServ.UsrParamSet("PcRestart", "");
MServ.UsrParamSet("PcIP", "");
+ MServ.UsrParamSet("Version", "");
// Richiedo azione x gestione dettaglio info
MServ.ReportSelCodInst();
}
@@ -119,6 +120,7 @@ namespace LiMan.UI.Components
MServ.UsrParamSet("PcInst", "");
MServ.UsrParamSet("PcRestart", "");
MServ.UsrParamSet("PcIP", "");
+ MServ.UsrParamSet("Version", "");
// Richiedo azione x gestione dettaglio info
MServ.ReportSelCodImp();
}
@@ -138,6 +140,7 @@ namespace LiMan.UI.Components
MServ.UsrParamSet("PcInst", "");
MServ.UsrParamSet("PcRestart", "");
MServ.UsrParamSet("PcIP", "");
+ MServ.UsrParamSet("Version", "");
// Richiedo azione x gestione dettaglio info
MServ.ReportSelCodInst();
// se era selezionato impianto lo deseleziona...
@@ -173,6 +176,7 @@ namespace LiMan.UI.Components
MServ.UsrParamSet("PcInst", currRec.PcInst);
MServ.UsrParamSet("PcRestart", "");
MServ.UsrParamSet("PcIP", "");
+ MServ.UsrParamSet("Version", "");
ReloadTaskStatus();
ReloadTaskResults();
// cerco in stats info
@@ -182,6 +186,10 @@ namespace LiMan.UI.Components
{
MServ.UsrParamSet("PcRestart", RunStats["Startup"]);
}
+ if (RunStats.ContainsKey("Version"))
+ {
+ MServ.UsrParamSet("Version", RunStats["Version"]);
+ }
}
// cerco nei device info
if (DevInfo != null && DevInfo.Count > 0)
diff --git a/LiMan.UI/Components/InstAppRelStatus.razor.cs b/LiMan.UI/Components/InstAppRelStatus.razor.cs
index d3768ad..55c1287 100644
--- a/LiMan.UI/Components/InstAppRelStatus.razor.cs
+++ b/LiMan.UI/Components/InstAppRelStatus.razor.cs
@@ -1,13 +1,10 @@
using LiMan.DB.DTO;
+using LiMan.UI.Data;
using Microsoft.AspNetCore.Components;
using System;
using System.Collections.Generic;
using System.Linq;
using static EgwCoreLib.Razor.Sorter;
-using System.Threading.Tasks;
-using LiMan.UI.Data;
-using Org.BouncyCastle.Asn1.IsisMtt.X509;
-using Newtonsoft.Json.Linq;
namespace LiMan.UI.Components
{
diff --git a/LiMan.UI/Components/InstallInfoStats.razor b/LiMan.UI/Components/InstallInfoStats.razor
index 0a325cb..7f5c04d 100644
--- a/LiMan.UI/Components/InstallInfoStats.razor
+++ b/LiMan.UI/Components/InstallInfoStats.razor
@@ -62,6 +62,25 @@
}
else
{
+ @if (DoEditConfig)
+ {
+
+ }