diff --git a/MP-TAB-SERV/Components/TechSheet_ST_ObjView.razor b/MP-TAB-SERV/Components/TechSheet_ST_ObjView.razor index f9d796a1..ee9e55fd 100644 --- a/MP-TAB-SERV/Components/TechSheet_ST_ObjView.razor +++ b/MP-TAB-SERV/Components/TechSheet_ST_ObjView.razor @@ -1,6 +1,6 @@ 
- @CurrRec.Label + @(Traduci(CurrRec.Label))
@if (CurrRec.ShowMissingData && enableForceParamSchedaTecnica) @@ -14,15 +14,16 @@ } } - (@CurrRec.ValueRead) @CurrRec.Value + @if (!string.IsNullOrEmpty(CurrRec.ValueRead)) + { + (@CurrRec.ValueRead)  + } + @CurrRec.Value - @if (showError) + @if (CurrRec.ShowMissingData) { - } - @if (showChecked) - { } diff --git a/MP-TAB-SERV/Components/TechSheet_ST_ObjView.razor.cs b/MP-TAB-SERV/Components/TechSheet_ST_ObjView.razor.cs index d65b35a2..a0c20621 100644 --- a/MP-TAB-SERV/Components/TechSheet_ST_ObjView.razor.cs +++ b/MP-TAB-SERV/Components/TechSheet_ST_ObjView.razor.cs @@ -1,56 +1,15 @@ -using global::System; -using global::System.Collections.Generic; -using global::System.Linq; -using global::System.Threading.Tasks; using global::Microsoft.AspNetCore.Components; -using System.Net.Http; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Components.Authorization; -using Microsoft.AspNetCore.Components.Forms; -using Microsoft.AspNetCore.Components.Routing; -using Microsoft.AspNetCore.Components.Web; -using Microsoft.AspNetCore.Components.Web.Virtualization; -using Microsoft.JSInterop; -using MP_TAB_SERV; -using MP_TAB_SERV.Shared; -using MP_TAB_SERV.Components; -using MP.Data; using MP.Data.DatabaseModels; -using MP.Data.DTO; using MP.Data.Services; -using Newtonsoft.Json; -using NLog; -using System.ComponentModel.DataAnnotations; namespace MP_TAB_SERV.Components { public partial class TechSheet_ST_ObjView { + #region Public Properties + [Parameter] public ST_ActRow CurrRec { get; set; } = null!; - [Inject] - protected SharedMemService SMServ { get; set; } = null!; - - protected override void OnParametersSet() - { - enableForceParamSchedaTecnica = SMServ.GetConfBool("enableForceParamSchedaTecnica"); - hasDeroga = false; -#if false - try - { - var currDeroga = DataLayerObj.getDerogaSt(idxST); - answ = (currDeroga != null); - if (answ) - { - answ = (currDeroga.CanForce && currDeroga.Num == dataNum && currDeroga.CodGruppo == dataGroup && currDeroga.CodTipo == dataType && currDeroga.Oggetto == dataOggetto); - } - } - catch - { } -#endif - } - - private bool enableForceParamSchedaTecnica = false; public string dataCss { @@ -82,11 +41,54 @@ namespace MP_TAB_SERV.Components } } + #endregion Public Properties + #region Public Methods + + public string Traduci(string lemma) + { + return SMServ.Traduci($"{baseLang}_{lemma}"); + } + + #endregion Public Methods + + #region Protected Properties + + [Inject] + protected SharedMemService SMServ { get; set; } = null!; + + #endregion Protected Properties + + #region Protected Methods + + protected override void OnParametersSet() + { + enableForceParamSchedaTecnica = SMServ.GetConfBool("enableForceParamSchedaTecnica"); + baseLang = SMServ.GetConf("baseLang"); + hasDeroga = false; +#if false + try + { + var currDeroga = DataLayerObj.getDerogaSt(idxST); + answ = (currDeroga != null); + if (answ) + { + answ = (currDeroga.CanForce && currDeroga.Num == dataNum && currDeroga.CodGruppo == dataGroup && currDeroga.CodTipo == dataType && currDeroga.Oggetto == dataOggetto); + } + } + catch + { } +#endif + } + + #endregion Protected Methods + + #region Private Fields + + private string baseLang = "IT"; + private bool enableForceParamSchedaTecnica = false; private bool hasDeroga = false; - private bool showError = false; - private bool showChecked = false; - + #endregion Private Fields } } \ No newline at end of file diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj index 8557a415..3892bde8 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.2310.2612 + 6.16.2310.2615 enable MP_TAB_SERV diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html index ef182c56..fc02882c 100644 --- a/MP-TAB-SERV/Resources/ChangeLog.html +++ b/MP-TAB-SERV/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2310.2612

+

Versione: 6.16.2310.2615


Note di rilascio: