Egalware/mapo-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Release/Update202506_10'

Browse Source
This commit is contained in:
Samuele Locatelli
2025-07-10 08:37:59 +02:00
parent 3d37dc5771 2f45acb487
commit f62380d008
6 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP.Data/DTO/IobDTO.cs
+2 -2
View File
@@ -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)
{
MP.Land/MP.Land.csproj
+1 -1
View File
@@ -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>
MP.Land/Pages/IobList.razor
+20 -8
View File
@@ -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>
MP.Land/Resources/ChangeLog.html
+1 -1
View File
@@ -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>
MP.Land/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2507.0411
6.16.2507.0910
MP.Land/Resources/manifest.xml
+1 -1
View File
@@ -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>