diff --git a/MP.Land/MP.Land.csproj b/MP.Land/MP.Land.csproj index aae4f27f..7e60dd87 100644 --- a/MP.Land/MP.Land.csproj +++ b/MP.Land/MP.Land.csproj @@ -3,7 +3,7 @@ net6.0 MP.Land - 6.16.2506.3014 + 6.16.2506.3015 Debug;Release;Debug_LiManDebug en True diff --git a/MP.Land/Pages/IobList.razor b/MP.Land/Pages/IobList.razor index 46dc2ba6..b1b7b3b9 100644 --- a/MP.Land/Pages/IobList.razor +++ b/MP.Land/Pages/IobList.razor @@ -75,15 +75,14 @@ IdxMacc Nome - Cod - Descr - Note - IOB Type - IOB IP - IOB Name - Count - Tipo - Vers + @if (IsSuperAdmin) + { + Descr + } + OS + PC IOB + Software + CNC/PLC Conf @@ -92,56 +91,60 @@ { var cIobInfo = CurrIobInfo(item.IdxMacchina); - @item.IdxMacchina - @item.Nome - @item.CodMacchina - @item.Descrizione - @item.Note - @cIobInfo.iType - @cIobInfo.IP - @cIobInfo.name + @item.IdxMacchina - @{ - string icnCol = cIobInfo.CNC_Counter ? "fa-solid fa-thumbs-up text-success" : "fa-solid fa-thumbs-down text-secondary"; - } - +
+ @item.Nome +
+
+ @item.CodMacchina +
+ + @if (IsSuperAdmin) + { + +
+ @item.Descrizione +
+
+ @item.Note +
+ + } + @cIobInfo.iType + +
+ @cIobInfo.name +
+
@cIobInfo.IP
+ + + @if (MacIobConf(item.IdxMacchina, "IobVersion").Length > 1) + { +
+ @* @MacIobConf(item.IdxMacchina, "IobExe") *@ + @IobExeTrim(item.IdxMacchina) +
+
+ @MacIobConf(item.IdxMacchina, "IobType") | @MacIobConf(item.IdxMacchina, "IobVersion") +
+ } + + + @MacIobConf(item.IdxMacchina, "MachIp") +
+ port: @MacIobConf(item.IdxMacchina, "MachPort") +
- @MacIobConf(item.IdxMacchina, "IobType") - @MacIobConf(item.IdxMacchina, "IobVersion") - @*
-
-

- -

-
-
-
    - @foreach (var item in MachineData) - { -
  • -
    -
    @item.Key
    -
    @item.Value
    -
    -
  • - } -
-
-
-
-
*@ - } - + diff --git a/MP.Land/Pages/IobList.razor.cs b/MP.Land/Pages/IobList.razor.cs index 38a15781..7009a323 100644 --- a/MP.Land/Pages/IobList.razor.cs +++ b/MP.Land/Pages/IobList.razor.cs @@ -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; diff --git a/MP.Land/Resources/ChangeLog.html b/MP.Land/Resources/ChangeLog.html index 332e05bc..65b6d6b4 100644 --- a/MP.Land/Resources/ChangeLog.html +++ b/MP.Land/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo Tablet MAPO - DotNet6 -

Versione: 6.16.2506.3014

+

Versione: 6.16.2506.3015


Note di rilascio: