Update pagina LAND x display info dettagliate
This commit is contained in:
Samuele Locatelli
@@ -3,7 +3,7 @@
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net6.0</TargetFramework>
|
||||
<RootNamespace>MP.Land</RootNamespace>
|
||||
<Version>6.16.2506.3014</Version>
|
||||
<Version>6.16.2506.3015</Version>
|
||||
<Configurations>Debug;Release;Debug_LiManDebug</Configurations>
|
||||
<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
|
||||
<RunAnalyzersDuringBuild>True</RunAnalyzersDuringBuild>
|
||||
|
||||
+52
-49
@@ -75,15 +75,14 @@
|
||||
<tr>
|
||||
<th>IdxMacc</th>
|
||||
<th>Nome</th>
|
||||
<th>Cod</th>
|
||||
<th>Descr</th>
|
||||
<th>Note</th>
|
||||
<th>IOB Type</th>
|
||||
<th>IOB IP</th>
|
||||
<th>IOB Name</th>
|
||||
<th>Count</th>
|
||||
<th>Tipo</th>
|
||||
<th>Vers</th>
|
||||
@if (IsSuperAdmin)
|
||||
{
|
||||
<th>Descr</th>
|
||||
}
|
||||
<th>OS</th>
|
||||
<th><i class="fa-solid fa-computer"></i> PC IOB</th>
|
||||
<th><i class="fa-solid fa-laptop-code"></i> Software</th>
|
||||
<th><i class="fa-solid fa-network-wired"></i> CNC/PLC</th>
|
||||
<th>Conf</th>
|
||||
</tr>
|
||||
</thead>
|
||||
@@ -92,56 +91,60 @@
|
||||
{
|
||||
var cIobInfo = CurrIobInfo(item.IdxMacchina);
|
||||
<tr class="@checkSelect(item)">
|
||||
<td>@item.IdxMacchina</td>
|
||||
<td>@item.Nome</td>
|
||||
<td>@item.CodMacchina</td>
|
||||
<td>@item.Descrizione</td>
|
||||
<td>@item.Note</td>
|
||||
<td>@cIobInfo.iType</td>
|
||||
<td>@cIobInfo.IP</td>
|
||||
<td>@cIobInfo.name</td>
|
||||
<td class="fs-4 fw-bold">@item.IdxMacchina</td>
|
||||
<td>
|
||||
@{
|
||||
string icnCol = cIobInfo.CNC_Counter ? "fa-solid fa-thumbs-up text-success" : "fa-solid fa-thumbs-down text-secondary";
|
||||
}
|
||||
<i class="@icnCol"></i>
|
||||
<div>
|
||||
@item.Nome
|
||||
</div>
|
||||
<div class="small">
|
||||
@item.CodMacchina
|
||||
</div>
|
||||
</td>
|
||||
@if (IsSuperAdmin)
|
||||
{
|
||||
<td>
|
||||
<div>
|
||||
@item.Descrizione
|
||||
</div>
|
||||
<div class="small">
|
||||
@item.Note
|
||||
</div>
|
||||
</td>
|
||||
}
|
||||
<td>@cIobInfo.iType</td>
|
||||
<td>
|
||||
<div class="fw-bold">
|
||||
@cIobInfo.name
|
||||
</div>
|
||||
<div class="small">@cIobInfo.IP</div>
|
||||
</td>
|
||||
<td>
|
||||
@if (MacIobConf(item.IdxMacchina, "IobVersion").Length > 1)
|
||||
{
|
||||
<div class="fw-bold">
|
||||
@* @MacIobConf(item.IdxMacchina, "IobExe") *@
|
||||
@IobExeTrim(item.IdxMacchina)
|
||||
</div>
|
||||
<div class="small">
|
||||
<span><i class="fa-solid fa-arrow-right"></i> @MacIobConf(item.IdxMacchina, "IobType")</span> | @MacIobConf(item.IdxMacchina, "IobVersion")
|
||||
</div>
|
||||
}
|
||||
</td>
|
||||
<td>
|
||||
<b>@MacIobConf(item.IdxMacchina, "MachIp")</b>
|
||||
<div class="small">
|
||||
port: @MacIobConf(item.IdxMacchina, "MachPort")
|
||||
</div>
|
||||
</td>
|
||||
<td>@MacIobConf(item.IdxMacchina, "IobType")</td>
|
||||
<td>@MacIobConf(item.IdxMacchina, "IobVersion")</td>
|
||||
<td>
|
||||
<a class="btn btn-primary btn-sm" target="_blank" href="@($"ConfDetail?idxMacc={item.IdxMacchina}")"><i class="fa-solid fa-gear"></i></a>
|
||||
@* <div class="accordion" id="AccordGrp">
|
||||
<div class="accordion-item">
|
||||
<h2 class="accordion-header" id="headingOne">
|
||||
<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
|
||||
Show All Opt.Params
|
||||
</button>
|
||||
</h2>
|
||||
<div id="collapseOne" class="accordion-collapse collapse" aria-labelledby="headingOne" data-bs-parent="#AccordGrp">
|
||||
<div class="accordion-body">
|
||||
<ul class="list-group list-group-sm">
|
||||
@foreach (var item in MachineData)
|
||||
{
|
||||
<li class="list-group-item list-group-item-dark">
|
||||
<div class="d-flex justify-content-between">
|
||||
<div class="px-0">@item.Key</div>
|
||||
<div class="px-0 fw-bold">@item.Value</div>
|
||||
</div>
|
||||
</li>
|
||||
}
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div> *@
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
}
|
||||
</tbody>
|
||||
<tfoot>
|
||||
<tr>
|
||||
<td colspan="12">
|
||||
<td colspan="8">
|
||||
|
||||
<DataPager PageSize="numRecord" currPage="currPage" numRecordChanged="SetNumRec" numPageChanged="SetPage" totalCount="totalCount" showLoading="isLoading" />
|
||||
</td>
|
||||
|
||||
@@ -203,6 +203,16 @@ namespace MP.Land.Pages
|
||||
return answ;
|
||||
}
|
||||
|
||||
protected string IobExeTrim(string IdxMacchina)
|
||||
{
|
||||
string answ = MacIobConf(IdxMacchina, "IobExe");
|
||||
if (!string.IsNullOrEmpty(answ) && answ.Contains(","))
|
||||
{
|
||||
answ = answ.Substring(0, answ.IndexOf(','));
|
||||
}
|
||||
return answ;
|
||||
}
|
||||
|
||||
protected override async Task OnInitializedAsync()
|
||||
{
|
||||
ListRecords = null;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<body>
|
||||
<i>Modulo Tablet MAPO - DotNet6</i>
|
||||
<h4>Versione: 6.16.2506.3014</h4>
|
||||
<h4>Versione: 6.16.2506.3015</h4>
|
||||
<br />
|
||||
Note di rilascio:
|
||||
<ul>
|
||||
|
||||
@@ -1 +1 @@
|
||||
6.16.2506.3014
|
||||
6.16.2506.3015
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<item>
|
||||
<version>6.16.2506.3014</version>
|
||||
<version>6.16.2506.3015</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>
|
||||
|
||||
Reference in New Issue
Block a user