From 440e49f14bb60250af2df5f98e914dd8cfcf461d Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Wed, 8 Nov 2023 08:55:35 +0100 Subject: [PATCH 1/2] fix classi richiamate due volte --- MP-TAB-SERV/Components/OdlMan.razor.cs | 3 --- MP-TAB-SERV/MP-TAB-SERV.csproj | 2 +- MP-TAB-SERV/Resources/ChangeLog.html | 2 +- MP-TAB-SERV/Resources/VersNum.txt | 2 +- MP-TAB-SERV/Resources/manifest.xml | 2 +- 5 files changed, 4 insertions(+), 7 deletions(-) diff --git a/MP-TAB-SERV/Components/OdlMan.razor.cs b/MP-TAB-SERV/Components/OdlMan.razor.cs index 3c2f4aad..1a9529b7 100644 --- a/MP-TAB-SERV/Components/OdlMan.razor.cs +++ b/MP-TAB-SERV/Components/OdlMan.razor.cs @@ -57,9 +57,6 @@ namespace MP_TAB_SERV.Components protected SharedMemService SMServ { get; set; } = null!; [Inject] protected MessageService MServ { get; set; } = null!; - protected SharedMemService SMServ { get; set; } = null!; - [Inject] - protected MessageService MServ { get; set; } = null!; /// /// Verifica ODL OK (ovvero caricato x macchina...) diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj index 972a0e06..48e529aa 100644 --- a/MP-TAB-SERV/MP-TAB-SERV.csproj +++ b/MP-TAB-SERV/MP-TAB-SERV.csproj @@ -3,7 +3,7 @@ net6.0 enable - 6.16.2311.716 + 6.16.2311.808 enable MP_TAB_SERV diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html index 8c31ce1a..49809050 100644 --- a/MP-TAB-SERV/Resources/ChangeLog.html +++ b/MP-TAB-SERV/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2311.716

+

Versione: 6.16.2311.808


Note di rilascio: @@ -97,6 +106,11 @@ await Task.Delay(1); langIns = lang; } + protected async Task setDefCardMode(string defCardMode) + { + await Task.Delay(1); + defCardModeIns = defCardMode; + } protected string btnMsStyle { @@ -130,6 +144,38 @@ return answ; } } + protected string btnShrinkStyle + { + get + { + string answ = ""; + if (defCardModeIns == "shrink") + { + answ = "btn-primary"; + } + else + { + answ = "btn-outline-secondary"; + } + return answ; + } + } + protected string btnFullStyle + { + get + { + string answ = ""; + if (defCardModeIns == "full") + { + answ = "btn-primary"; + } + else + { + answ = "btn-outline-secondary"; + } + return answ; + } + } protected string _tcModIns { get; set; } = ""; @@ -145,6 +191,7 @@ } } } + protected string _langIns { get; set; } = ""; protected string langIns @@ -159,6 +206,20 @@ } } } + protected string _defCardMode { get; set; } = ""; + + protected string defCardModeIns + { + get => _defCardMode; + set + { + if (_defCardMode != value) + { + _defCardMode = value; + MsgServ.UserPrefSave("DefCardMode", value); + } + } + } public int Height { get; set; } = 0; public int Width { get; set; } = 0; @@ -191,6 +252,11 @@ { langIns = langPrefItem; } + var defCardPrefItem = MsgServ.UserPrefGet("DefCardMode"); + if (defCardPrefItem != null) + { + langIns = defCardPrefItem; + } await Task.Delay(1); if (string.IsNullOrEmpty(currIpv4)) { diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html index 49809050..2715a404 100644 --- a/MP-TAB-SERV/Resources/ChangeLog.html +++ b/MP-TAB-SERV/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2311.808

+

Versione: 6.16.2311.810


Note di rilascio: