From 247f74a575e09ff6a167cf197a9e2ebf3ee6ae4b Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Sat, 18 Jan 2025 16:58:59 +0100
Subject: [PATCH] Completata UI + API x richiesta task e display task specifici
 (da completare lato EgwAppControlCenter ora)

---
 LiMan.Api/Resources/ChangeLog.html         |  2 +-
 LiMan.Api/Resources/VersNum.txt            |  2 +-
 LiMan.Api/Resources/manifest.xml           |  2 +-
 LiMan.Transfer/Resources/ChangeLog.html    |  2 +-
 LiMan.Transfer/Resources/VersNum.txt       |  2 +-
 LiMan.Transfer/Resources/manifest.xml      |  2 +-
 LiMan.UI/Components/InstAppPareto.razor    | 67 ++++++----------------
 LiMan.UI/Components/InstAppPareto.razor.cs | 31 +++++++++-
 LiMan.UI/Components/InstallInfoStats.razor |  2 +-
 LiMan.UI/Components/ListAppShort.razor     |  3 +
 LiMan.UI/Components/ListInfoShort.razor    | 52 ++++++++++-------
 LiMan.UI/Components/ListInfoShort.razor.cs |  2 +-
 LiMan.UI/LiMan.UI.csproj                   |  2 +-
 LiMan.UI/Resources/ChangeLog.html          |  2 +-
 LiMan.UI/Resources/VersNum.txt             |  2 +-
 LiMan.UI/Resources/manifest.xml            |  2 +-
 16 files changed, 91 insertions(+), 86 deletions(-)
diff --git a/LiMan.Api/Resources/ChangeLog.html b/LiMan.Api/Resources/ChangeLog.html
index e4683f5..cb9e216 100644
--- a/LiMan.Api/Resources/ChangeLog.html
+++ b/LiMan.Api/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>License Manager</i>
-    <h4>Versione: 2.1.2501.1815</h4>
+    <h4>Versione: 2.1.2501.1816</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/LiMan.Api/Resources/VersNum.txt b/LiMan.Api/Resources/VersNum.txt
index 272b836..d40a16b 100644
--- a/LiMan.Api/Resources/VersNum.txt
+++ b/LiMan.Api/Resources/VersNum.txt
@@ -1 +1 @@
-2.1.2501.1815
+2.1.2501.1816
diff --git a/LiMan.Api/Resources/manifest.xml b/LiMan.Api/Resources/manifest.xml
index 4cc49c9..2971efc 100644
--- a/LiMan.Api/Resources/manifest.xml
+++ b/LiMan.Api/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>2.1.2501.1815</version>
+  <version>2.1.2501.1816</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>
diff --git a/LiMan.Transfer/Resources/ChangeLog.html b/LiMan.Transfer/Resources/ChangeLog.html
index 33bb932..2af5250 100644
--- a/LiMan.Transfer/Resources/ChangeLog.html
+++ b/LiMan.Transfer/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>License Manager</i>
-    <h4>Versione: 2.1.2501.1815</h4>
+    <h4>Versione: 2.1.2501.1816</h4>
     <br />
     Note di rilascio:
     <ul>
diff --git a/LiMan.Transfer/Resources/VersNum.txt b/LiMan.Transfer/Resources/VersNum.txt
index 272b836..d40a16b 100644
--- a/LiMan.Transfer/Resources/VersNum.txt
+++ b/LiMan.Transfer/Resources/VersNum.txt
@@ -1 +1 @@
-2.1.2501.1815
+2.1.2501.1816
diff --git a/LiMan.Transfer/Resources/manifest.xml b/LiMan.Transfer/Resources/manifest.xml
index d2f2a71..f953cea 100644
--- a/LiMan.Transfer/Resources/manifest.xml
+++ b/LiMan.Transfer/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>2.1.2501.1815</version>
+  <version>2.1.2501.1816</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>
diff --git a/LiMan.UI/Components/InstAppPareto.razor b/LiMan.UI/Components/InstAppPareto.razor
index 5d946fc..b3ae9bb 100644
--- a/LiMan.UI/Components/InstAppPareto.razor
+++ b/LiMan.UI/Components/InstAppPareto.razor
@@ -55,59 +55,24 @@
             </div>
         </div>
     </div>
-    <div class="@CssDivDetail px-1">
+    <div class="@CssDivDetail px-2">
         @if (HasFiltImp)
         {
-            <div class="card shadow">
-                <div class="card-body p-2">
-                    <div class="row">
-                        <div class="col-5 px-1">
-                            <ListAppShort AppList="AppInstList"></ListAppShort>
-                            <div class="card shadow mt-2">
-                                <div class="card-header">
-                                    <b>Detail Info</b>
-                                </div>
-                                <div class="card-body p-1">
-                                    <ul class="list-group">
-                                        <li class="list-group-item">TDB Info 5</li>
-                                        <li class="list-group-item">TDB Info 6</li>
-                                        <li class="list-group-item">TDB Info 7</li>
-                                        <li class="list-group-item">TDB Info 8</li>
-                                        <li class="list-group-item">TDB Info 9</li>
-                                    </ul>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-7 px-1">
-                            <div class="card shadow">
-                                <div class="card-header">
-                                    <b>Device Info</b>
-                                </div>
-                                <div class="card-body p-1">
-                                    @if (DevInfo != null && DevInfo.Count > 0)
-                                    {
-                                        <ListInfoShort DetailInfo="DevInfo"></ListInfoShort>
-                                        // <ul class="list-group small">
-                                        //     @foreach (var item in DevInfo)
-                                        //     {
-                                        //         <li class="list-group-item d-flex justify-content-between align-items-start px-1">
-                                        //             <div class="px-1">
-                                        //                 @item.Key
-                                        //             </div>
-                                        //             <div class="px-1">
-                                        //                 <b>@item.Value</b>
-                                        //             </div>
-                                        //         </li>
-                                        //     }
-                                        // </ul>
-                                    }
-                                    else
-                                    {
-                                        <div class="alert alert-warning p-2 text-center">No Info Present</div>
-                                    }
-                                </div>
-                            </div>
-                        </div>
+            <div class="row">
+                <div class="col-6 px-1">
+                    <div class="mb-1">
+                        <ListAppShort AppList="AppInstList"></ListAppShort>
+                    </div>
+                    <div class="mb-1">
+                        <ListInfoShort Title="License Data" DetailInfo="LicInfo"></ListInfoShort>
+                    </div>
+                </div>
+                <div class="col-6 px-1">
+                    <div class="mb-1">
+                        <ListInfoShort Title="Device Info" DetailInfo="DevInfo"></ListInfoShort>
+                    </div>
+                    <div class="mb-1">
+                        <ListInfoShort Title="Updater Stats" DetailInfo="RunStats"></ListInfoShort>
                     </div>
                 </div>
             </div>
diff --git a/LiMan.UI/Components/InstAppPareto.razor.cs b/LiMan.UI/Components/InstAppPareto.razor.cs
index 7aed64b..94b1e51 100644
--- a/LiMan.UI/Components/InstAppPareto.razor.cs
+++ b/LiMan.UI/Components/InstAppPareto.razor.cs
@@ -223,6 +223,8 @@ namespace LiMan.UI.Components
         private bool showDetail = false;
 
         private Dictionary<string, string> DevInfo = new Dictionary<string, string>();
+        private Dictionary<string, string> RunStats = new Dictionary<string, string>();
+        private Dictionary<string, string> LicInfo = new Dictionary<string, string>();
 
 
         #region Private Properties
@@ -460,17 +462,42 @@ namespace LiMan.UI.Components
         private void ReloadTaskResults()
         {
             DevInfo = new Dictionary<string, string>();
+            RunStats = new Dictionary<string, string>();
+            LicInfo = new Dictionary<string, string>();
             if (TaskDone != null && TaskDone.Count > 0)
             {
-                if (TaskDone.ContainsKey($"{EgwAccTask.DeviceInfoGet}"))
+                // cerco Device Info specifiche
+                string devInfoKey = $"{EgwAccTask.DeviceInfoGet}";
+                if (TaskDone.ContainsKey(devInfoKey))
                 {
-                    string rawData = TaskDone[$"{EgwAccTask.DeviceInfoGet}"];
+                    string rawData = TaskDone[devInfoKey];
                     if (!string.IsNullOrEmpty(rawData) && rawData.Count() > 2)
                     {
 
                         DevInfo = JsonConvert.DeserializeObject<Dictionary<string, string>>(rawData);
                     }
                 }
+
+                // cerco Info Stats
+                if (TaskDone.ContainsKey("RunStats"))
+                {
+                    string rawData = TaskDone["RunStats"];
+                    if (!string.IsNullOrEmpty(rawData) && rawData.Count() > 2)
+                    {
+
+                        RunStats = JsonConvert.DeserializeObject<Dictionary<string, string>>(rawData);
+                    }
+                }
+                // cerco Info License
+                if (TaskDone.ContainsKey("LicInfo"))
+                {
+                    string rawData = TaskDone["LicInfo"];
+                    if (!string.IsNullOrEmpty(rawData) && rawData.Count() > 2)
+                    {
+
+                        LicInfo = JsonConvert.DeserializeObject<Dictionary<string, string>>(rawData);
+                    }
+                }
             }
         }
 
diff --git a/LiMan.UI/Components/InstallInfoStats.razor b/LiMan.UI/Components/InstallInfoStats.razor
index 1dc6cc6..08b3ac7 100644
--- a/LiMan.UI/Components/InstallInfoStats.razor
+++ b/LiMan.UI/Components/InstallInfoStats.razor
@@ -119,7 +119,7 @@
                                     <button class="btn w-100 btn-sm btn-info" @onclick="() => SendTask(Core.Enum.EgwAccTask.DeviceInfoGet)">Update Device Info</button>
                                 </div>
                                 <div class="py-1">
-                                    <button class="btn w-100 btn-sm btn-warning disabled" @onclick="() => SendTask(Core.Enum.EgwAccTask.OxyLicenseGet)">Update Info Licenza</button>
+                                    <button class="btn w-100 btn-sm btn-warning" @onclick="() => SendTask(Core.Enum.EgwAccTask.OxyLicenseGet)">Update Info Licenza</button>
                                 </div>
                                 <div class="py-1">
                                     <button class="btn w-100 btn-sm btn-danger" @onclick="() => SendTask(Core.Enum.EgwAccTask.ForceUpdate)">Force Reboot</button>
diff --git a/LiMan.UI/Components/ListAppShort.razor b/LiMan.UI/Components/ListAppShort.razor
index ad3fef8..33a867b 100644
--- a/LiMan.UI/Components/ListAppShort.razor
+++ b/LiMan.UI/Components/ListAppShort.razor
@@ -1,4 +1,7 @@
 ﻿<div class="card shadow">
+    <div class="card-header">
+        <b>App Info</b>
+    </div>
     <div class="card-body p-1">
         <table class="table table-sm table-striped table-responsive-lg small">
             <thead>
diff --git a/LiMan.UI/Components/ListInfoShort.razor b/LiMan.UI/Components/ListInfoShort.razor
index 2f51172..f916f53 100644
--- a/LiMan.UI/Components/ListInfoShort.razor
+++ b/LiMan.UI/Components/ListInfoShort.razor
@@ -1,28 +1,38 @@
 ﻿<div class="card shadow">
+    <div class="card-header">
+        <b>Device Info</b>
+    </div>
     <div class="card-body p-1">
-        <table class="table table-sm table-striped table-responsive-lg small">
-            <thead>
-                <tr>
-                    <th>
-                        Key
-                        <Sorter ParamName="Key" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter>
-                    </th>
-                    <th class="text-right">
-                        Value
-                        <Sorter ParamName="Value" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter>
-                    </th>
-                </tr>
-            </thead>
-            <tbody>
-                @foreach (var item in ListRecord)
-                {
+        @if (DetailInfo == null && totalCount == 0)
+        {
+            <div class="alert alert-warning p-2 text-center">No Info Present</div>
+        }
+        else
+        {
+            <table class="table table-sm table-striped table-responsive-lg small">
+                <thead>
                     <tr>
-                        <td>@item.Key</td>
-                        <td class="text-right small">@item.Value</td>
+                        <th>
+                            Key
+                            <Sorter ParamName="Key" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter>
+                        </th>
+                        <th class="text-right">
+                            Value
+                            <Sorter ParamName="Value" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter>
+                        </th>
                     </tr>
-                }
-            </tbody>
-        </table>
+                </thead>
+                <tbody>
+                    @foreach (var item in ListRecord)
+                    {
+                        <tr>
+                            <td>@item.Key</td>
+                            <td class="text-right small">@item.Value</td>
+                        </tr>
+                    }
+                </tbody>
+            </table>
+        }
     </div>
     <div class="card-footer p-0 small">
         <DataPager PageSize="numRecord" currPage="currPage" numRecordChanged="setNumRec" numPageChanged="setNumPage" totalCount="totalCount" showLoading="isLoading" DisplSize="DataPager.ObjSize.small" NumPages="3" />
diff --git a/LiMan.UI/Components/ListInfoShort.razor.cs b/LiMan.UI/Components/ListInfoShort.razor.cs
index 6b65a03..cf2da84 100644
--- a/LiMan.UI/Components/ListInfoShort.razor.cs
+++ b/LiMan.UI/Components/ListInfoShort.razor.cs
@@ -63,7 +63,7 @@ namespace LiMan.UI.Components
         private int currPage = 1;
         private bool isLoading = false;
         private Dictionary<string, string> ListRecord = new Dictionary<string, string>();
-        private int numRecord = 10;
+        private int numRecord = 5;
         private Dictionary<string, string> SearchRecord = new Dictionary<string, string>();
         private string sKey = "ListAppShort";
         private int totalCount = 0;
diff --git a/LiMan.UI/LiMan.UI.csproj b/LiMan.UI/LiMan.UI.csproj
index f8b5ba5..9d3f5aa 100644
--- a/LiMan.UI/LiMan.UI.csproj
+++ b/LiMan.UI/LiMan.UI.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <TargetFramework>net6.0</TargetFramework>
-        <Version>2.1.2501.1815</Version>
+        <Version>2.1.2501.1816</Version>
         <RootNamespace>LiMan.UI</RootNamespace>
         <AssemblyName>LiMan.UI</AssemblyName>
     </PropertyGroup>
diff --git a/LiMan.UI/Resources/ChangeLog.html b/LiMan.UI/Resources/ChangeLog.html
index e4683f5..cb9e216 100644
--- a/LiMan.UI/Resources/ChangeLog.html
+++ b/LiMan.UI/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>License Manager</i>
-    <h4>Versione: 2.1.2501.1815</h4>
+    <h4>Versione: 2.1.2501.1816</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/LiMan.UI/Resources/VersNum.txt b/LiMan.UI/Resources/VersNum.txt
index 272b836..d40a16b 100644
--- a/LiMan.UI/Resources/VersNum.txt
+++ b/LiMan.UI/Resources/VersNum.txt
@@ -1 +1 @@
-2.1.2501.1815
+2.1.2501.1816
diff --git a/LiMan.UI/Resources/manifest.xml b/LiMan.UI/Resources/manifest.xml
index 4cc49c9..2971efc 100644
--- a/LiMan.UI/Resources/manifest.xml
+++ b/LiMan.UI/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>2.1.2501.1815</version>
+  <version>2.1.2501.1816</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>
