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

Minor fix finali

Browse Source
This commit is contained in:
Samuele Locatelli
2025-03-15 11:58:26 +01:00
parent c0fec71b5d
commit d69303ef03
12 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP.MON.Client/Components/CmpFooter.razor
+4 -5
View File
@@ -1,15 +1,14 @@
<div class="d-flex justify-content-between text-light">
<div class="px-1">
<b>Mapo MON .net 8 @(DateTime.Today.Year)</b> | <span class="small">v.@version</span>
@if (OperatingSystem.IsBrowser())
@if (Width > 0)
{
<small class="small align-items-center"> |@Width x @Height | </small>
<small class="small align-items-center"> | @Width x @Height | </small>
}
<small class="ps-1 small align-items-center">@(OperatingSystem.IsBrowser() ? "WASM" : "Server")</small>
</div>
<div class="px-2">
<span class="small">@($"{DateTime.Now:HH:mm:ss}")</span> | <a class="text-light" href="https://www.egalware.com/" target="_blank"><img class="img-fluid" width="16" src="images/LogoEgw.png" /> Egalware </a>
</div>
</div>
</div>
MP.MON.Client/Components/CmpHeader.razor
+3 -1
View File
@@ -1,6 +1,8 @@
<div class="px-2">
<img class="logoImg img-fluid" src="images/LogoMapo.png" height="24" />
<span class="mainHead p-3 align-middle"><b><span style="color: #DEDEDE;">MP MON</span>itor</b></span>
<NavLink class="mainHead p-3 align-middle" href="force-reload" style="text-decoration:none;">
<span><b><span style="color: #DEDEDE;">MP MON</span>itor</b></span>
</NavLink>
</div>
<div class="px-2">
<span id="text-white text-right">
MP.MON.Client/Components/LoadingData.razor
+1 -1
View File
@@ -4,7 +4,7 @@
EgalWare MES suite <img class="logoImg img-fluid" src="images/logoCliente.png" />
</div>
<div class="col-6 text-center mt-4 py-3 bg-light">
<h3>loading data</h3>
<h3>loading data | <b>@(OperatingSystem.IsBrowser() ? "WASM" : "Server")</b> mode</h3>
<i class="fas fa-spinner fa-spin fa-4x"></i>
</div>
</div>
MP.MON/Components/App.razor
-5
View File
@@ -5,11 +5,6 @@
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
@* <base href="/" /> *@
@* <link rel="stylesheet" href="bootstrap/bootstrap.min.css" />
<link rel="stylesheet" href="app.css" />
<link rel="stylesheet" href="MP-MON.styles.css" />
<link rel="icon" type="image/png" href="favicon.png" /> *@
@* <base href="~/" /> *@
<link rel="stylesheet" href="lib/bootstrap/css/bootstrap.min.css" />
<link rel="stylesheet" href="css/site.min.css" />
MP.MON/Components/Layout/MainLayout.razor
+1 -1
View File
@@ -12,7 +12,7 @@
@Body
</article>
<div class="fixed-bottom bottom-row px-2">
<CmpFooter @rendermode="new InteractiveWebAssemblyRenderMode(prerender: true)" version="@version"></CmpFooter>
<CmpFooter @rendermode="InteractiveWebAssembly" version="@version"></CmpFooter>
</div>
</main>
</div>
MP.MON/Components/Pages/ForceReload.razor
+6 -1
View File
@@ -3,6 +3,11 @@
@attribute [StreamRendering(true)]
@rendermode InteractiveServer
<h3>ForceReload</h3>
<div class="d-flex justify-content-around text-white">
<div class="px-2 w-100">
<LoadingData></LoadingData>
</div>
</div>
MP.MON/Components/Pages/Index.razor
+1 -2
View File
@@ -5,7 +5,6 @@
@attribute [StreamRendering(false)]
@rendermode InteractiveServer
@* @rendermode InteractiveAuto *@
<PageTitle>MP MON</PageTitle>
@@ -13,7 +12,7 @@
{
<div class="row statusMap mx-1 my-1">
<div class="col-12">
<LoadingData></LoadingData>
<LoadingData @rendermode="InteractiveAuto"></LoadingData>
</div>
</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.1510</Version>
<Version>6.16.2503.1511</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.1510</h4>
<h4>Versione: 6.16.2503.1511</h4>
<br /> Note di rilascio:
<ul>
<li>
MP.MON/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2503.1510
6.16.2503.1511
MP.MON/Resources/manifest.xml
+3 -3
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.16.2503.1510</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>
<version>6.16.2503.1511</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>
</item>
MP.MON/post-build.ps1
+4 -2
View File
@@ -18,12 +18,14 @@ $csprojUpdated = $csproj -replace $find, $replace
Set-Content -Path $ProjectPath -Value $csprojUpdated
Set-Content -Path $FileVers -Value $currRelNum
Write-Host "Versione: $currRelNum"
# replace x manifest
$manData = Get-Content $FileManIn
$manData = $manData -replace "1.0.0.0", $currRelNum
$manData = $manData -replace "{{DIRNAME}}", "MP-TAB3"
$manData = $manData -replace "{{DIRNAME}}", "MP-MON"
$manData = $manData -replace "{{BRANCHNAME}}", "stable/LAST"
$manData = $manData -replace "{{PACKNAME}}", "MP-TAB3"
$manData = $manData -replace "{{PACKNAME}}", "MP-MON"
Set-Content -Path $FileManOut -Value $manData
# replace x ChangeLog