diff --git a/MP-TAB3/Components/MachineBlock.razor b/MP-TAB3/Components/MachineBlock.razor
index 90e8c256..6b16571f 100644
--- a/MP-TAB3/Components/MachineBlock.razor
+++ b/MP-TAB3/Components/MachineBlock.razor
@@ -21,7 +21,11 @@ else
- @CRecMSE.Nome
+ @CRecMSE.Nome
+ @if(isManual)
+ {
+
+ }
@@ -86,6 +90,10 @@ else
@CRecMSE.Nome
+ @if (isManual)
+ {
+
+ }
@@ -151,6 +159,10 @@ else
@CRecMSE.Nome
+ @if (isManual)
+ {
+
+ }
diff --git a/MP-TAB3/Components/MachineBlock.razor.cs b/MP-TAB3/Components/MachineBlock.razor.cs
index feb4696e..24463263 100644
--- a/MP-TAB3/Components/MachineBlock.razor.cs
+++ b/MP-TAB3/Components/MachineBlock.razor.cs
@@ -34,6 +34,7 @@ namespace MP_TAB3.Components
private bool inAttr = false;
private bool isLoading = false;
private bool isMulti = false;
+ private bool isManual = false;
private bool LastFullMode = true;
private string LastIdxMacchSub = "";
private int LastKeepAliveMin = 5;
@@ -441,7 +442,24 @@ namespace MP_TAB3.Components
{
datiProdAct = SDService.MachProdStGet(IdxMaccCur);
}
- isMulti = SMServ.DictMacchMulti[IdxMaccMain] == 1;
+ // fix multi
+ if (SMServ.DictMacchMulti.ContainsKey(IdxMaccMain))
+ {
+ isMulti = SMServ.DictMacchMulti[IdxMaccMain] == 1;
+ }
+ else
+ {
+ isMulti = false;
+ }
+ // fix manual
+ if (SMServ.DictMacchManual.ContainsKey(IdxMaccMain))
+ {
+ isManual = SMServ.DictMacchManual[IdxMaccMain];
+ }
+ else
+ {
+ isManual = false;
+ }
// verificare
if (!FullMode || !detailLoaded || doForce)
{
@@ -504,6 +522,8 @@ namespace MP_TAB3.Components
{
// salvo idxMacch
await MServ.IdxMaccSet(RecMSE!.IdxMacchina);
+ // salvo se sia manuale...
+
await MServ.LastOpenedPageSet("machine-detail");
// navigo!
NavMan.NavigateTo($"machine-detail");
diff --git a/MP-TAB3/Components/SlideMenu.razor b/MP-TAB3/Components/SlideMenu.razor
index 7a4f65b1..05ba1295 100644
--- a/MP-TAB3/Components/SlideMenu.razor
+++ b/MP-TAB3/Components/SlideMenu.razor
@@ -28,7 +28,14 @@
@foreach (var item in MenuItems)
{
-
+ if (IsManual && item.ordine > 20)
+ {
+
+ }
+ else
+ {
+
+ }
}
diff --git a/MP-TAB3/Components/SlideMenu.razor.cs b/MP-TAB3/Components/SlideMenu.razor.cs
index 165b6728..855c00d9 100644
--- a/MP-TAB3/Components/SlideMenu.razor.cs
+++ b/MP-TAB3/Components/SlideMenu.razor.cs
@@ -18,6 +18,9 @@ namespace MP_TAB3.Components
[Inject]
protected MessageService MsgServ { get; set; } = null!;
+ [Inject]
+ protected SharedMemService MStor { get; set; } = null!;
+
[Inject]
protected NavigationManager navManager { get; set; } = null!;
@@ -30,6 +33,19 @@ namespace MP_TAB3.Components
return navManager.Uri.Contains(currUri) ? "bg-dark text-light" : "";
}
+ protected override async Task OnAfterRenderAsync(bool firstRender)
+ {
+ idxMaccSel = await MsgServ.IdxMaccGet();
+ if (!string.IsNullOrEmpty(idxMaccSel) && MStor.DictMacchManual.ContainsKey(idxMaccSel))
+ {
+ IsManual = MStor.DictMacchManual[idxMaccSel];
+ }
+ else
+ {
+ IsManual = false;
+ }
+ }
+
protected override void OnInitialized()
{
var rawVers = typeof(Program).Assembly.GetName().Version;
@@ -51,6 +67,8 @@ namespace MP_TAB3.Components
#region Private Fields
+ private string idxMaccSel = "";
+ private bool IsManual = false;
private Version version = null!;
#endregion Private Fields
diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj
index 420429a6..bbe3c472 100644
--- a/MP-TAB3/MP-TAB3.csproj
+++ b/MP-TAB3/MP-TAB3.csproj
@@ -3,7 +3,7 @@
net6.0
enable
- 6.16.2503.3107
+ 6.16.2503.3120
enable
MP_TAB3
diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html
index 0a154808..763bd923 100644
--- a/MP-TAB3/Resources/ChangeLog.html
+++ b/MP-TAB3/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
Modulo MAPOSPEC
- Versione: 6.16.2503.3107
+ Versione: 6.16.2503.3120
Note di rilascio:
-
diff --git a/MP-TAB3/Resources/VersNum.txt b/MP-TAB3/Resources/VersNum.txt
index 013cfcba..4e014262 100644
--- a/MP-TAB3/Resources/VersNum.txt
+++ b/MP-TAB3/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2503.3107
+6.16.2503.3120
diff --git a/MP-TAB3/Resources/manifest.xml b/MP-TAB3/Resources/manifest.xml
index b7600eaf..d1295926 100644
--- a/MP-TAB3/Resources/manifest.xml
+++ b/MP-TAB3/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 6.16.2503.3107
+ 6.16.2503.3120
https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/MP-TAB3.zip
https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/ChangeLog.html
false
diff --git a/MP-TAB3/Shared/MainLayout.razor.cs b/MP-TAB3/Shared/MainLayout.razor.cs
index 49cb8174..adace7e8 100644
--- a/MP-TAB3/Shared/MainLayout.razor.cs
+++ b/MP-TAB3/Shared/MainLayout.razor.cs
@@ -270,7 +270,7 @@ namespace MP_TAB3.Shared
{
// Logger.LogInformation("URL of new location: {Location}", e.Location);
CurrLevel = MStor.PageLevel(NavMan.Uri);
- // recupero men�
+ // recupero menu
if (MStor.DictMenu.ContainsKey(CurrLevel))
{
CurrMenuItems = MStor.DictMenu[CurrLevel];
diff --git a/MP-TAB3/Shared/NavMenu.razor b/MP-TAB3/Shared/NavMenu.razor
index a0f7405c..e978481f 100644
--- a/MP-TAB3/Shared/NavMenu.razor
+++ b/MP-TAB3/Shared/NavMenu.razor
@@ -1,5 +1,4 @@
-@inject NavigationManager NavMan
-@inject ListSelectDataSrv MDataService
+@inject ListSelectDataSrv MDataService
@@ -22,9 +21,19 @@
}
else
{
- SetPage(item.NavigateUrl)">
- @item.Testo
-
+ if (IsManual && item.ordine > 20)
+ {
+
+ @item.Testo
+
+
+ }
+ else
+ {
+ SetPage(item.NavigateUrl)">
+ @item.Testo
+
+ }
}
}
@@ -40,19 +49,36 @@
[Inject]
protected MessageService MsgServ { get; set; } = null!;
+
[Inject]
- protected NavigationManager navManager { get; set; } = null!;
+ protected SharedMemService MStor { get; set; } = null!;
+
+ [Inject]
+ protected NavigationManager NavMan { get; set; } = null!;
protected bool linkActive(string objUrl)
{
bool answ = false;
- if (navManager.Uri.Contains(objUrl))
+ if (NavMan.Uri.Contains(objUrl))
{
answ = true;
}
return answ;
}
+ protected override async Task OnAfterRenderAsync(bool firstRender)
+ {
+ idxMaccSel = await MsgServ.IdxMaccGet();
+ if (!string.IsNullOrEmpty(idxMaccSel) && MStor.DictMacchManual.ContainsKey(idxMaccSel))
+ {
+ IsManual = MStor.DictMacchManual[idxMaccSel];
+ }
+ else
+ {
+ IsManual = false;
+ }
+ }
+
protected async Task SetPage(string tgtUrl)
{
if (tgtUrl.Contains("status-map"))
@@ -61,6 +87,9 @@
}
await MsgServ.LastOpenedPageSet(tgtUrl);
// navManager.NavigateTo(tgtUrl, true);
- navManager.NavigateTo(tgtUrl, false);
+ NavMan.NavigateTo(tgtUrl, false);
}
+
+ private string idxMaccSel = "";
+ private bool IsManual = false;
}
diff --git a/MP.Data/DbModels/VMSFDModel.cs b/MP.Data/DbModels/VMSFDModel.cs
index deb9fbb5..3c3e7b9a 100644
--- a/MP.Data/DbModels/VMSFDModel.cs
+++ b/MP.Data/DbModels/VMSFDModel.cs
@@ -8,14 +8,15 @@ namespace MP.Data.DbModels
//
public partial class VMSFDModel
{
- public string IdxMacchina { get; set; }
- public string Codmacchina { get; set; }
- public bool PalletChange { get; set; }
- public string CodArticoloA { get; set; }
- public string CodArticoloB { get; set; }
- public bool SimplePallet { get; set; }
- public bool InsEnabled { get; set; }
- public bool SLogEnabled { get; set; }
+ public string IdxMacchina { get; set; } = "ND";
+ public string Codmacchina { get; set; } = "000";
+ public bool PalletChange { get; set; } = false;
+ public string CodArticoloA { get; set; } = "ND";
+ public string CodArticoloB { get; set; } = "ND";
+ public bool SimplePallet { get; set; } = true;
+ public bool InsEnabled { get; set; } = true;
+ public bool SLogEnabled { get; set; } = false;
+ public bool IsManual { get; set; } = false;
public int IdxFamigliaIngresso { get; set; }
public int Multi { get; set; }
public int BitFilt { get; set; }
diff --git a/MP.Data/Services/SharedMemService.cs b/MP.Data/Services/SharedMemService.cs
index 0f02f88c..b1f97a21 100644
--- a/MP.Data/Services/SharedMemService.cs
+++ b/MP.Data/Services/SharedMemService.cs
@@ -42,10 +42,15 @@ namespace MP.Data.Services
public Dictionary DictMacchine { get; set; } = new Dictionary();
///
- /// Dizionario macchine con info multi(bool)
+ /// Dizionario macchine con info multi(int)
///
public Dictionary DictMacchMulti { get; set; } = new Dictionary();
+ ///
+ /// Dizionario macchine con info manual(bool)
+ ///
+ public Dictionary DictMacchManual { get; set; } = new Dictionary();
+
///
/// Dizionario Menu
///
@@ -224,6 +229,7 @@ namespace MP.Data.Services
ListMSFD = newList ?? new List();
// salvo dizionario MULTI
DictMacchMulti = ListMSFD.ToDictionary(x => x.IdxMacchina, x => x.Multi);
+ DictMacchManual = ListMSFD.ToDictionary(x => x.IdxMacchina, x => x.IsManual);
Log.Info("SharedMemService | SetMsfd executed!");
}