From 2f45acb4879151c1125c1b9012fb63a5b41add53 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Wed, 9 Jul 2025 14:37:28 +0200
Subject: [PATCH] Update display IOB-INFO

---
 MP.Data/DTO/IobDTO.cs            |  4 ++--
 MP.Land/MP.Land.csproj           |  2 +-
 MP.Land/Pages/IobList.razor      | 28 ++++++++++++++++++++--------
 MP.Land/Resources/ChangeLog.html |  2 +-
 MP.Land/Resources/VersNum.txt    |  2 +-
 MP.Land/Resources/manifest.xml   |  2 +-
 6 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/MP.Data/DTO/IobDTO.cs b/MP.Data/DTO/IobDTO.cs
index 90bfc883..02171544 100644
--- a/MP.Data/DTO/IobDTO.cs
+++ b/MP.Data/DTO/IobDTO.cs
@@ -59,8 +59,8 @@ namespace MP.Data.DTO
             this.IdxMacchina = recRRL.IdxMacchina;
             this.Locazione = "NA";
             this.OS = $"{iobInfo.iType}";
-            this.IobName = iobInfo.name;
-            this.IobIpv4 = iobInfo.IP;
+            this.IobName = recRRL.Agent;
+            this.IobIpv4 = recRRL.IPv4;
             this.IobMac = recRRL.MacAddr;
             if (macInfo != null && macInfo.Count > 0)
             {
diff --git a/MP.Land/MP.Land.csproj b/MP.Land/MP.Land.csproj
index ef5c9dad..c8f71b9f 100644
--- a/MP.Land/MP.Land.csproj
+++ b/MP.Land/MP.Land.csproj
@@ -3,7 +3,7 @@
     <PropertyGroup>
         <TargetFramework>net6.0</TargetFramework>
         <RootNamespace>MP.Land</RootNamespace>
-        <Version>6.16.2507.0411</Version>
+        <Version>6.16.2507.0910</Version>
         <Configurations>Debug;Release;Debug_LiManDebug</Configurations>
         <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
         <RunAnalyzersDuringBuild>True</RunAnalyzersDuringBuild>
diff --git a/MP.Land/Pages/IobList.razor b/MP.Land/Pages/IobList.razor
index 70a03b07..7a61521d 100644
--- a/MP.Land/Pages/IobList.razor
+++ b/MP.Land/Pages/IobList.razor
@@ -82,8 +82,8 @@
                                         <th>OS <Sorter ParamName="OS" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter></th>
                                         <th><i class="fa-solid fa-computer"></i> PC IOB <Sorter ParamName="IobName" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter></th>
                                         <th><i class="fa-solid fa-laptop-code"></i> Adapter <Sorter ParamName="AdapName" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter></th>
-                                        <th><i class="fa-solid fa-network-wired"></i> CNC/PLC <Sorter ParamName="TargetIp" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter></th>
-                                        <th>Conf</th>
+                                        <th class="text-end"><i class="fa-solid fa-network-wired"></i> CNC/PLC <Sorter ParamName="TargetIp" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter></th>
+                                        <th class="text-end">Conf</th>
                                     </tr>
                                 </thead>
                                 <tbody>
@@ -117,7 +117,14 @@
                                                     <div class="fw-bold">
                                                         @item.IobName
                                                     </div>
-                                                    <div class="small">@item.IobIpv4</div>
+                                                    <div class="small d-flex justify-content-between">
+                                                        <div class="px-0">
+                                                            @item.IobIpv4
+                                                        </div>
+                                                        <div class="px-0">
+                                                            @item.IobMac
+                                                        </div>
+                                                    </div>
                                                 }
                                                 else
                                                 {
@@ -130,8 +137,13 @@
                                                     <div class="fw-bold">
                                                         @item.AdapName
                                                     </div>
-                                                    <div class="small">
-                                                        <span><i class="fa-solid fa-arrow-right"></i> @item.AdapType</span> | @item.AdapVers
+                                                    <div class="small d-flex justify-content-between">
+                                                        <div class="px-0">
+                                                            <span><i class="fa-solid fa-arrow-right"></i> @item.AdapType</span>
+                                                        </div>
+                                                        <div class="px-0">
+                                                            @item.AdapVers
+                                                        </div>
                                                     </div>
                                                 }
                                                 else
@@ -139,7 +151,7 @@
                                                     <div>-</div>
                                                 }
                                             </td>
-                                            <td>
+                                            <td class="text-end">
                                                 @if (!string.IsNullOrEmpty(item.TargetIp))
                                                 {
                                                     <b>@item.TargetIp</b>
@@ -152,12 +164,12 @@
                                                     <div>-</div>
                                                 }
                                             </td>
-                                            <td>
+                                            <td class="text-end">
                                                 <a class="btn btn-primary btn-sm" target="_blank" href="@($"ConfDetail?idxMacc={item.IdxMacchina}")"><i class="fa-solid fa-gear"></i></a>
                                             </td>
                                         </tr>
                                     }
-                             
+
                                 </tbody>
                                 <tfoot>
                                     <tr>
diff --git a/MP.Land/Resources/ChangeLog.html b/MP.Land/Resources/ChangeLog.html
index 9c851c87..db3a3436 100644
--- a/MP.Land/Resources/ChangeLog.html
+++ b/MP.Land/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo Tablet MAPO - DotNet6</i>
-    <h4>Versione: 6.16.2507.0411</h4>
+    <h4>Versione: 6.16.2507.0910</h4>
     <br />
     Note di rilascio:
     <ul>
diff --git a/MP.Land/Resources/VersNum.txt b/MP.Land/Resources/VersNum.txt
index cd93bcba..0e06f603 100644
--- a/MP.Land/Resources/VersNum.txt
+++ b/MP.Land/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2507.0411
+6.16.2507.0910
diff --git a/MP.Land/Resources/manifest.xml b/MP.Land/Resources/manifest.xml
index 61b93620..10ef2977 100644
--- a/MP.Land/Resources/manifest.xml
+++ b/MP.Land/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2507.0411</version>
+  <version>6.16.2507.0910</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/MP.Land.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>