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

TAB:

Browse Source 
- Fix comportamento dismiss sliderMenu
- fix update dichiarazione prod
This commit is contained in:
Samuele Locatelli
2023-10-27 18:15:59 +02:00
parent 7b54f3f05d
commit a2dab9fcea
8 changed files with 50 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-TAB-SERV/Components/ProdConfirm.razor.cs
+10 -3
View File
@@ -18,7 +18,7 @@ namespace MP_TAB_SERV.Components
/// registrato nuovo valore
/// </summary>
[Parameter]
public EventCallback<bool> E_newVal { get; set; }
public EventCallback<List<MappaStatoExpl>> E_Updated { get; set; }
/// <summary>
/// registrato nuovo valore
@@ -183,9 +183,16 @@ namespace MP_TAB_SERV.Components
dtReqUpdate = DateTime.Now;
numPzLasciati = 0;
await doUpdate();
isProcessing = false;
await Task.Delay(1);
await E_newVal.InvokeAsync(true);
await RefreshData();
isProcessing = false;
}
private async Task RefreshData()
{
List<MappaStatoExpl> ListMSE = await MDataService.MseGetAll(true);
await MServ.SaveMse(ListMSE);
await E_Updated.InvokeAsync(ListMSE);
}
protected void setConfirmBtn(bool newVal)
MP-TAB-SERV/Components/SlideMenu.razor
+33 -6
View File
@@ -4,15 +4,15 @@
<div class="offcanvas offcanvas-end text-start" tabindex="-1" id="offcanvasTabMenu" aria-labelledby="offcanvasTabMenuLabel">
<div class="offcanvas-header bg-secondary text-light" style="z-index: 9999">
<div class="d-flex flex-row">
<div class="p-0">
<img src="images/LogoSteamware.png" class="img-fluid" width="40px" />
<div class="py-0 px-2">
<img src="images/LogoEgw.png" class="img-fluid" width="60" />
</div>
<div class="p-0 pl-1">
<div class="flex-row">
<b class="modal-title fs-2">EgalWare</b>
</div>
<div class="flex-row">
<small>Main Menu</small>
<small>MES Solutions</small>
</div>
</div>
</div>
@@ -26,16 +26,30 @@
</div>
<div class="d-flex flex-column">
<div class="list-group">
@foreach (var item in MenuItems)
{
<a class="p-2 list-group-item list-group-item-action" href="@item.NavigateUrl" style="@isActive(item.NavigateUrl)"><i class="fa fa-lg @item.icona pe-2"></i> @item.Testo</a>
<button class="p-2 list-group-item list-group-item-action @cssActive(item.NavigateUrl) link-underline link-underline-opacity-0 link-underline-opacity-75-hover" @onclick="() => SetPage(item.NavigateUrl)" data-bs-dismiss="offcanvas"><i class="fa fa-lg @item.icona pe-2"></i> @item.Testo</button>
}
</div>
</div>
<div class="my-4">
<button type="button" class="btn btn-secondary w-100" data-bs-dismiss="offcanvas" aria-label="Close">Chiudi</button>
</div>
<div class="my-4">
<div class="d-flex justify-content-center">
<div class="py-0 px-2">
<img src="images/LogoSteamware.png" class="img-fluid" width="60" />
</div>
<div class="p-0 pl-1">
<div class="flex-row">
<b class="modal-title fs-1">MAPO MES</b>
</div>
<div class="flex-row">
<small>TAB Controller - MES Suite</small>
</div>
</div>
</div>
</div>
</div>
</div>
@@ -52,10 +66,23 @@
string answ = "";
if (navManager.Uri.Contains(currUri))
{
answ = "background-color: #212427; color: #fff";
answ = "background-color: #212427; color: #fff";
}
return answ;
}
protected async Task SetPage(string tgtUrl)
{
await Task.Delay(1);
navManager.NavigateTo(tgtUrl);
}
protected string cssActive(string currUri)
{
return navManager.Uri.Contains(currUri)?"bg-dark text-light" : "";
}
}
MP-TAB-SERV/MP-TAB-SERV.csproj
+1 -1
View File
@@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<Version>6.16.2310.2711</Version>
<Version>6.16.2310.2718</Version>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MP_TAB_SERV</RootNamespace>
</PropertyGroup>
MP-TAB-SERV/Pages/MachineDetail.razor
+1 -1
View File
@@ -9,6 +9,6 @@
else
{
<MachineBlock RecMSE="CurrMSE" FullMode="false"></MachineBlock>
<ProdConfirm RecMSE="CurrMSE" E_newVal="RefreshMBlock"></ProdConfirm>
<ProdConfirm RecMSE="CurrMSE" E_Updated="RefreshData"></ProdConfirm>
<ProdStat RecMSE="CurrMSE"></ProdStat>
}
MP-TAB-SERV/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MAPOSPEC </i>
<h4>Versione: 6.16.2310.2711</h4>
<h4>Versione: 6.16.2310.2718</h4>
<br /> Note di rilascio:
<ul>
<li>
MP-TAB-SERV/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2310.2711
6.16.2310.2718
MP-TAB-SERV/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.16.2310.2711</version>
<version>6.16.2310.2718</version>
<url>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>
MP.Data/Services/StatusData.cs
+2 -2
View File
@@ -102,7 +102,7 @@ namespace MP.Data.Services
return Task.FromResult(dbController.MacchineGetAll());
}
public async Task<List<MappaStatoExpl>> MseGetAll()
public async Task<List<MappaStatoExpl>> MseGetAll(bool forceDb = false)
{
int maxAge = 2000;
int.TryParse(_configuration.GetValue<string>("ServerConf:maxAge"), out maxAge);
@@ -111,7 +111,7 @@ namespace MP.Data.Services
List<MappaStatoExpl>? result = new List<MappaStatoExpl>();
// cerco in redis...
RedisValue rawData = redisDb.StringGet(redisMseKey);
if (rawData.HasValue)
if (rawData.HasValue && !forceDb)
{
result = JsonConvert.DeserializeObject<List<MappaStatoExpl>>($"{rawData}");
stopWatch.Stop();