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

TAB3:

Browse Source 
- fix condizione errori in caso di cambio reparto/impianti
- aggiunta pagina force-reset che fa cleanup completo dati browser
This commit is contained in:
Samuele Locatelli
2025-02-28 15:12:07 +01:00
parent 3be139fe0a
commit 60fcf7aa8d
13 changed files with 100 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-TAB3/Components/CmpTop.razor.cs
+23 -3
View File
@@ -155,12 +155,23 @@ namespace MP_TAB3.Components
await RefreshScadLogIn(currOprTokLsDeco);
await EA_UserIsOk.InvokeAsync(true);
}
#if false
// infine controllo sia valida macchina richiesta rispetto a memoria...
// cerco MSE macchina
var machMse = MsgServ.GetMachineMse(CurrMacc);
if (machMse != null)
{
MsgServ.LastIdxMacchina = "";
NavMan.NavigateTo("status-map");
}
#endif
}
protected async Task RefreshScadLogIn(string decodValue)
{
bool done = false;
// solo se non è logout!!!
// solo se non � logout!!!
if (!NavMan.Uri.Contains("logout"))
{
if (listT2H == null || listT2H.Count == 0)
@@ -177,14 +188,23 @@ namespace MP_TAB3.Components
}
if (done && !string.IsNullOrEmpty(LastOpenedPage))
{
// se è nelle pagine "T2H" lascio proseguire...
// se � nelle pagine "T2H" lascio proseguire...
if (listT2H != null && listT2H.Find(x => x.NavigateUrl == LastOpenedPage) != null)
{
NavMan.NavigateTo(LastOpenedPage);
}
else if (!string.IsNullOrEmpty(CurrMacc))
{
NavMan.NavigateTo(LastOpenedPage);
var machMse = await MsgServ.GetMachineMse(CurrMacc);
if (machMse == null)
{
await MsgServ.IdxMaccSet("");
NavMan.NavigateTo("status-map");
}
else
{
NavMan.NavigateTo(LastOpenedPage);
}
}
else
{
MP-TAB3/Components/SlideMenu.razor
+3
View File
@@ -51,6 +51,9 @@
</div>
</div>
</div>
<div class="my-5">
<a href="force-reset" type="button" class="btn btn-danger w-100" aria-label="Reset">Reset Cache</a>
</div>
</div>
</div>
MP-TAB3/MP-TAB3.csproj
+1 -1
View File
@@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<Version>6.16.2502.2411</Version>
<Version>6.16.2502.2815</Version>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MP_TAB3</RootNamespace>
</PropertyGroup>
MP-TAB3/Pages/ForceReset.razor
+41
View File
@@ -0,0 +1,41 @@
@page "/force-reset"
<div class="card shadow mt-5">
<div class="card-header">
<img class="img-fluid" src="./images/LogoMapoFull.png" />
</div>
<div class="card-body">
<LoadingData DisplaySize="LoadingData.CtrlSize.Large" Title="Cleaning Up cache..." DisplayMode="LoadingData.SpinMode.Growl"></LoadingData>
</div>
</div>
@* <ul class="list-group">
<li class="list-group-item active">Reset and reload data</li>
<li class="list-group-item">Redis Cache reset</li>
<li class="list-group-item">Browser Local Data reset</li>
<li class="list-group-item">Browser Session Data reset</li>
</ul> *@
@code {
[Inject]
protected NavigationManager navManager { get; set; } = null!;
[Inject]
protected MessageService MsgServ { get; set; } = null!;
/// <summary>
/// Esecuzione task di reset...
/// </summary>
/// <returns></returns>
protected override async Task OnInitializedAsync()
{
// svuoto cache
MsgServ.LastIdxMacchina = "";
await MsgServ.ClearLocalStor();
await MsgServ.ClearSessionStor();
// attendo
await Task.Delay(1000);
// rimando alla home...
navManager.NavigateTo("", true);
}
}
MP-TAB3/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MAPOSPEC </i>
<h4>Versione: 6.16.2502.2411</h4>
<h4>Versione: 6.16.2502.2815</h4>
<br /> Note di rilascio:
<ul>
<li>
MP-TAB3/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2502.2411
6.16.2502.2815
MP-TAB3/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.16.2502.2411</version>
<version>6.16.2502.2815</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>
MP-TAB3/Shared/MainLayout.razor
+24 -9
View File
@@ -6,23 +6,38 @@
<div class="page" @onclick="()=>HandleBodyClick()">
<main>
<CmpTop TypeScadLogin="@typeScadLogin" CurrMenuItems="@CurrMenuItems" EA_UserIsOk="SetUserOk" EA_ReloadMStor="ForceReloadMStor"></CmpTop>
@if (userIsOk || NavMan.Uri.Contains("reg-new-device"))
@if (NavMan.Uri.Contains("force-reset"))
{
<article class="content pt-1 d-flex mb-5">
<div class="" id="@bodyType">
@Body
</div>
@if (!HideMenu)
{
<div class="sidebar ps-2" id="barLat">
<NavMenu MenuItems="@CurrMenuItems"></NavMenu>
</div>
}
</article>
}
else
{
<CmpTop TypeScadLogin="@typeScadLogin" CurrMenuItems="@CurrMenuItems" EA_UserIsOk="SetUserOk" EA_ReloadMStor="ForceReloadMStor"></CmpTop>
@if (userIsOk || NavMan.Uri.Contains("reg-new-device"))
{
<article class="content pt-1 d-flex mb-5">
<div class="" id="@bodyType">
@Body
</div>
@if (!HideMenu)
{
<div class="sidebar ps-2" id="barLat">
<NavMenu MenuItems="@CurrMenuItems"></NavMenu>
</div>
}
</article>
}
}
</main>
</div>
<div class="fixed-bottom">
<CmpFooter TypeScadLogin="@typeScadLogin" DtScadLogin="@dtScadLogin" MatrOper="@MatrOpr" CurrDevGuid="@currDevGuid"></CmpFooter>
@if (!NavMan.Uri.Contains("force-reset"))
{
<CmpFooter TypeScadLogin="@typeScadLogin" DtScadLogin="@dtScadLogin" MatrOper="@MatrOpr" CurrDevGuid="@currDevGuid"></CmpFooter>
}
</div>
MP-TAB3/Shared/NavMenu.razor
-1
View File
@@ -55,7 +55,6 @@
protected async Task SetPage(string tgtUrl)
{
await Task.Delay(1);
if (tgtUrl.Contains("status-map"))
{
await MsgServ.IdxMaccSet("");
MP.Stats/MP.Stats.csproj
+2 -2
View File
@@ -4,8 +4,8 @@
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>MP.Stats</RootNamespace>
<UserSecretsId>826e877c-ba70-4253-84cb-d0b1cafd4440</UserSecretsId>
<Version>6.16.2502.2416</Version>
<Version>6.16.2502.2416</Version>
<Version>6.16.2502.2508</Version>
<Version>6.16.2502.2508</Version>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<NoWarn>$(NoWarn);1591</NoWarn>
<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
MP.Stats/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo statistiche MAPO</i>
<h4>Versione: 6.16.2502.2416</h4>
<h4>Versione: 6.16.2502.2508</h4>
<br />
Note di rilascio:
<ul>
MP.Stats/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2502.2416
6.16.2502.2508
MP.Stats/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.16.2502.2416</version>
<version>6.16.2502.2508</version>
<url>https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/MP.Stats.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>