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

Reorg componenti in modalità server/client

Browse Source
This commit is contained in:
Samuele Locatelli
2025-03-19 11:04:20 +01:00
parent 813ee7e591
commit 4cc77d52e0
13 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-MON.sln
+6
View File
@@ -11,6 +11,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP.Core", "MP.Core\MP.Core.
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP.TaskMan", "MP.TaskMan\MP.TaskMan.csproj", "{3447D4AF-13C2-47BB-8C5F-74299A46D063}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP.MON.Client", "MP.MON.Client\MP.MON.Client.csproj", "{7038E415-3F9B-A8C6-C92F-32185AD31DBC}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -33,6 +35,10 @@ Global
{3447D4AF-13C2-47BB-8C5F-74299A46D063}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3447D4AF-13C2-47BB-8C5F-74299A46D063}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3447D4AF-13C2-47BB-8C5F-74299A46D063}.Release|Any CPU.Build.0 = Release|Any CPU
{7038E415-3F9B-A8C6-C92F-32185AD31DBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7038E415-3F9B-A8C6-C92F-32185AD31DBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7038E415-3F9B-A8C6-C92F-32185AD31DBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7038E415-3F9B-A8C6-C92F-32185AD31DBC}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
MP.MON.Client/Components/CmpFooter.razor
+2 -2
View File
@@ -9,9 +9,9 @@
}
<small class="ps-1 small align-items-center">@(OperatingSystem.IsBrowser() ? "WASM" : "Server")</small>
@* <span class="">
<span class="">
@($"{DateTime.Now:HH:mm:ss}")
</span> *@
</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>
MP.MON.Client/Components/CmpFooter.razor.cs
+1 -1
View File
@@ -34,7 +34,7 @@ namespace MP.MON.Client.Components
public void StartTimer()
{
int tOutPeriod = 1000;
int tOutPeriod = 5000;
aTimer = new System.Timers.Timer(tOutPeriod);
aTimer.Elapsed += ElapsedTimer;
aTimer.Enabled = true;
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="InteractiveServer"></CmpHeader>
<CmpHeader @rendermode="InteractiveWebAssembly"></CmpHeader>
</div>
<article class="content px-4">
@Body
</article>
<div class="fixed-bottom bottom-row px-2">
<CmpFooter @rendermode="InteractiveServer" version="@version"></CmpFooter>
<CmpFooter @rendermode="InteractiveWebAssembly" 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 ></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" ></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="@scrollText" brightCss="@brightCss" titleMult="@titleMult" showTC="@showTC" ></DetailViewMSE>
<DetailViewMSE CurrRecord="@currMse" currTagConf="@getIobTag(currMse.IdxMacchina)" currTagVal="@getTagVal(currMse.IdxMacchina)" doAnimate="@doAnimate" keepAliveMin="@keepAliveMin" showArt="@showArt" doBlink="@doBlink" maxChar4Scroll="@maxChar4Scroll" scrollText="@scrollText" brightCss="@brightCss" titleMult="@titleMult" showTC="@showTC" @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" ></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/Components/Routes.razor
+1 -1
View File
@@ -1,4 +1,4 @@
<Router AppAssembly="typeof(Program).Assembly">
<Router AppAssembly="typeof(Program).Assembly" AdditionalAssemblies="new[] { typeof(Client._Imports).Assembly }">
<Found Context="routeData">
<RouteView RouteData="routeData" DefaultLayout="typeof(Layout.MainLayout)" />
<FocusOnNavigate RouteData="routeData" Selector="h1" />
MP.MON/Components/_Imports.razor
+2 -1
View File
@@ -16,6 +16,7 @@
@using MP.Data.DTO
@using MP.Data.Services
@using MP.MON
@using MP.MON.Client
@using MP.MON.Client.Components
@using MP.MON.Components
@using MP.MON.Components.Compo
@using MP.MON.Components.Pages
MP.MON/MP.MON.csproj
+2 -4
View File
@@ -6,7 +6,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MP.MON</RootNamespace>
<AssemblyName>$(AssemblyName.Replace(' ', '_'))</AssemblyName>
<Version>6.16.2503.1908</Version>
<Version>6.16.2503.1911</Version>
</PropertyGroup>
<ItemGroup>
@@ -34,10 +34,8 @@
<ItemGroup>
<ProjectReference Include="..\MP.Data\MP.Data.csproj" />
<PackageReference Include="Microsoft.AspNetCore.Components" Version="8.0.14" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.14" />
<ProjectReference Include="..\MP.MON.Client\MP.MON.Client.csproj" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.13" />
<PackageReference Include="Microsoft.AspNetCore.Http.Connections.Common" Version="8.0.14" />
<PackageReference Include="NLog.Web.AspNetCore" Version="5.3.14" />
</ItemGroup>
MP.MON/Program.cs
+8 -5
View File
@@ -1,5 +1,8 @@
using MP.MON.Client.Components;
using MP.Data.Services;
using MP.MON.Components;
using MP.MON.Components.Layout;
using MP.MON.Components.Pages;
using NLog;
using NLog.Web;
using StackExchange.Redis;
@@ -8,8 +11,8 @@ var builder = WebApplication.CreateBuilder(args);
// Add services to the container.
builder.Services.AddRazorComponents()
.AddInteractiveServerComponents();
//.AddInteractiveWebAssemblyComponents();
.AddInteractiveServerComponents()
.AddInteractiveWebAssemblyComponents();
var logger = LogManager.Setup()
@@ -57,9 +60,9 @@ app.UseStaticFiles();
app.UseAntiforgery();
app.MapRazorComponents<App>()
.AddInteractiveServerRenderMode();
//.AddInteractiveWebAssemblyRenderMode()
//.AddAdditionalAssemblies(typeof(MP.MON.Client._Imports).Assembly);
.AddInteractiveServerRenderMode()
.AddInteractiveWebAssemblyRenderMode()
.AddAdditionalAssemblies(typeof(MP.MON.Client._Imports).Assembly);
logger.Info("App: Run stage");
app.Run();
MP.MON/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MAPOSPEC </i>
<h4>Versione: 6.16.2503.1908</h4>
<h4>Versione: 6.16.2503.1911</h4>
<br /> Note di rilascio:
<ul>
<li>
MP.MON/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2503.1908
6.16.2503.1911
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.1908</version>
<version>6.16.2503.1911</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>
MP.MON/wwwroot/lib/WindowSize.js
-6
View File
@@ -1,6 +0,0 @@
window.getWindowDimensions = function () {
return {
width: window.innerWidth,
height: window.innerHeight
};
};