Merge branch 'Release/Tab3ReviewDim02'
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net6.0</TargetFramework>
|
||||
<Nullable>enable</Nullable>
|
||||
<Version>6.16.2405.818</Version>
|
||||
<Version>6.16.2405.819</Version>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<RootNamespace>MP_TAB3</RootNamespace>
|
||||
</PropertyGroup>
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
@page "/status-map"
|
||||
|
||||
<div class="pe-2">
|
||||
<div class="pe-0">
|
||||
<div class="row mb-2">
|
||||
@if (ListMSE == null || ListMSE.Count == 0 || isCalcSize)
|
||||
{
|
||||
<EgwCoreLib.Razor.LoadingData></EgwCoreLib.Razor.LoadingData>
|
||||
<div class="p-3">
|
||||
<EgwCoreLib.Razor.LoadingData DisplaySize="LoadingData.CtrlSize.Large"></EgwCoreLib.Razor.LoadingData>
|
||||
</div>
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -13,7 +15,7 @@
|
||||
@foreach (var item in ListMSE)
|
||||
{
|
||||
currIdx++;
|
||||
<div class="col px-1">
|
||||
<div class="col ps-0 pe-1">
|
||||
<MachineBlock RecMSE="@item" FullMode="true" Width="@Width" Height="@Height" showCard="@ShowCard" doBlink="@doBlink"></MachineBlock>
|
||||
</div>
|
||||
@if (currIdx >= maxBlocks)
|
||||
@@ -27,7 +29,7 @@
|
||||
int currNum = (currIdx % maxBlocks);
|
||||
while (currNum < (maxBlocks))
|
||||
{
|
||||
@((MarkupString)"<div class=\"col px-1 bloccoMacc\"> </div>")
|
||||
@((MarkupString)"<div class=\"col ps-0 pe-1 bloccoMacc\"> </div>")
|
||||
currNum++;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -101,11 +101,11 @@ namespace MP_TAB3.Pages
|
||||
{
|
||||
if (Width < 1024)
|
||||
{
|
||||
answ = (int)Math.Floor((decimal)Width / 240);
|
||||
answ = (int)Math.Floor((decimal)Width / 200);
|
||||
}
|
||||
else
|
||||
{
|
||||
answ = (int)Math.Floor((decimal)Width / 240) - 1;
|
||||
answ = (int)Math.Floor((decimal)Width / 220) - 1;
|
||||
}
|
||||
}
|
||||
return answ;
|
||||
@@ -142,8 +142,6 @@ namespace MP_TAB3.Pages
|
||||
{
|
||||
await getWDim();
|
||||
isCalcSize = false;
|
||||
|
||||
//ListMSE = await MDataService.MseGetAll(true);
|
||||
AllDataMSE = await MDataService.MseGetAll(true);
|
||||
FiltOprMse();
|
||||
await InvokeAsync(StateHasChanged);
|
||||
@@ -270,7 +268,7 @@ namespace MP_TAB3.Pages
|
||||
List<MappaStatoExpl>? dataList = JsonConvert.DeserializeObject<List<MappaStatoExpl>>(currArgs.newMessage);
|
||||
if (dataList != null)
|
||||
{
|
||||
SaveData(dataList);
|
||||
InvokeAsync(() => SaveData(dataList));
|
||||
}
|
||||
}
|
||||
catch
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<body>
|
||||
<i>Modulo MAPOSPEC </i>
|
||||
<h4>Versione: 6.16.2405.818</h4>
|
||||
<h4>Versione: 6.16.2405.819</h4>
|
||||
<br /> Note di rilascio:
|
||||
<ul>
|
||||
<li>
|
||||
|
||||
@@ -1 +1 @@
|
||||
6.16.2405.818
|
||||
6.16.2405.819
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<item>
|
||||
<version>6.16.2405.818</version>
|
||||
<version>6.16.2405.819</version>
|
||||
<url>https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/MP-TAB3.zip</url>
|
||||
<changelog>https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/ChangeLog.html</changelog>
|
||||
<mandatory>false</mandatory>
|
||||
|
||||
Reference in New Issue
Block a user