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

Merge branch 'Release/MpMon_04'

Browse Source
This commit is contained in:
Samuele Locatelli
2025-03-17 17:38:53 +01:00
parent 3ce03226b7 6c73b51a88
commit f64d6cb76d
7 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP.MON.Client/Components/DetailMapSelector.razor
+2 -2
View File
@@ -3,11 +3,11 @@
@if (useNewDisplay)
{
<DetailViewMSE CurrRecord="@currRecord" currTagConf="@currTagConf" currTagVal="@currTagVal" doAnimate="@doAnimate" keepAliveMin="@keepAliveMin" showArt="@showArt" doBlink="@doBlink" maxChar4Scroll="@maxChar4Scroll" @rendermode="InteractiveAuto"></DetailViewMSE>
<DetailViewMSE CurrRecord="@currRecord" currTagConf="@currTagConf" currTagVal="@currTagVal" doAnimate="@doAnimate" keepAliveMin="@keepAliveMin" showArt="@showArt" doBlink="@doBlink" maxChar4Scroll="@maxChar4Scroll" @rendermode="InteractiveServer"></DetailViewMSE>
}
else
{
<DetailMSE CurrRecord="@currRecord" currTagConf="@currTagConf" currTagVal="@currTagVal" doAnimate="@doAnimate" keepAliveMin="@keepAliveMin" showArt="@showArt" doBlink="@doBlink" maxChar4Scroll="@maxChar4Scroll" cssOverlayOff="@cssOverlayOff" @rendermode="InteractiveAuto"></DetailMSE>
<DetailMSE CurrRecord="@currRecord" currTagConf="@currTagConf" currTagVal="@currTagVal" doAnimate="@doAnimate" keepAliveMin="@keepAliveMin" showArt="@showArt" doBlink="@doBlink" maxChar4Scroll="@maxChar4Scroll" cssOverlayOff="@cssOverlayOff" @rendermode="InteractiveServer"></DetailMSE>
}
@code {
MP.MON/Components/Layout/MainLayout.razor
+2 -2
View File
@@ -5,14 +5,14 @@
<div class="page">
<main>
<div class="top-row px-4 justify-content-between">
<CmpHeader @rendermode="InteractiveAuto"></CmpHeader>
<CmpHeader @rendermode="InteractiveServer"></CmpHeader>
</div>
<article class="content px-4">
@Body
</article>
<div class="fixed-bottom bottom-row px-2">
<CmpFooter @rendermode="InteractiveAuto" version="@version"></CmpFooter>
<CmpFooter @rendermode="InteractiveServer" version="@version"></CmpFooter>
</div>
</main>
</div>
MP.MON/Components/Pages/Index.razor
+4 -4
View File
@@ -12,7 +12,7 @@
{
<div class="row statusMap mx-1 my-1">
<div class="col-12">
<LoadingData @rendermode="InteractiveAuto"></LoadingData>
<LoadingData @rendermode="InteractiveServer"></LoadingData>
</div>
</div>
}
@@ -40,14 +40,14 @@ else
if (currMse != null)
{
<div class="col p-0">
@* <DetailMapSelector CurrRecord="@currMse" currTagConf="@getIobTag(currMse.IdxMacchina)" currTagVal="@getTagVal(currMse.IdxMacchina)" doAnimate="@doAnimate" keepAliveMin="@keepAliveMin" showArt="@showArt" doBlink="@doBlink" maxChar4Scroll="@maxChar4Scroll" cssOverlayOff="@cssOverlayOff" useNewDisplay="@newDisplay" @rendermode="InteractiveAuto"></DetailMapSelector> *@
@* <DetailMapSelector CurrRecord="@currMse" currTagConf="@getIobTag(currMse.IdxMacchina)" currTagVal="@getTagVal(currMse.IdxMacchina)" doAnimate="@doAnimate" keepAliveMin="@keepAliveMin" showArt="@showArt" doBlink="@doBlink" maxChar4Scroll="@maxChar4Scroll" cssOverlayOff="@cssOverlayOff" useNewDisplay="@newDisplay" @rendermode="InteractiveServer"></DetailMapSelector> *@
@if (newDisplay)
{
<DetailViewMSE CurrRecord="@currMse" currTagConf="@getIobTag(currMse.IdxMacchina)" currTagVal="@getTagVal(currMse.IdxMacchina)" doAnimate="@doAnimate" keepAliveMin="@keepAliveMin" showArt="@showArt" doBlink="@doBlink" maxChar4Scroll="@maxChar4Scroll" scrollText="true" @rendermode="InteractiveAuto"></DetailViewMSE>
<DetailViewMSE CurrRecord="@currMse" currTagConf="@getIobTag(currMse.IdxMacchina)" currTagVal="@getTagVal(currMse.IdxMacchina)" doAnimate="@doAnimate" keepAliveMin="@keepAliveMin" showArt="@showArt" doBlink="@doBlink" maxChar4Scroll="@maxChar4Scroll" scrollText="true" @rendermode="InteractiveServer"></DetailViewMSE>
}
else
{
<DetailMSE CurrRecord="@currMse" currTagConf="@getIobTag(currMse.IdxMacchina)" currTagVal="@getTagVal(currMse.IdxMacchina)" doAnimate="@doAnimate" keepAliveMin="@keepAliveMin" showArt="@showArt" doBlink="@doBlink" maxChar4Scroll="@maxChar4Scroll" cssOverlayOff="@cssOverlayOff" @rendermode="InteractiveAuto"></DetailMSE>
<DetailMSE CurrRecord="@currMse" currTagConf="@getIobTag(currMse.IdxMacchina)" currTagVal="@getTagVal(currMse.IdxMacchina)" doAnimate="@doAnimate" keepAliveMin="@keepAliveMin" showArt="@showArt" doBlink="@doBlink" maxChar4Scroll="@maxChar4Scroll" cssOverlayOff="@cssOverlayOff" @rendermode="InteractiveServer"></DetailMSE>
}
</div>
}
MP.MON/MP.MON.csproj
+1 -1
View File
@@ -6,7 +6,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MP.MON</RootNamespace>
<AssemblyName>$(AssemblyName.Replace(' ', '_'))</AssemblyName>
<Version>6.16.2503.1716</Version>
<Version>6.16.2503.1717</Version>
</PropertyGroup>
<ItemGroup>
MP.MON/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MAPOSPEC </i>
<h4>Versione: 6.16.2503.1716</h4>
<h4>Versione: 6.16.2503.1717</h4>
<br /> Note di rilascio:
<ul>
<li>
MP.MON/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2503.1716
6.16.2503.1717
MP.MON/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.16.2503.1716</version>
<version>6.16.2503.1717</version>
<url>https://nexus.steamware.net/repository/SWS/MP-MON/stable/LAST/MP-MON.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/MP-MON/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>