diff --git a/MP-TAB-SERV/Components/TechSheet_ST_Detail.razor b/MP-TAB-SERV/Components/TechSheet_ST_Detail.razor
index 72acf8e2..8e41f52f 100644
--- a/MP-TAB-SERV/Components/TechSheet_ST_Detail.razor
+++ b/MP-TAB-SERV/Components/TechSheet_ST_Detail.razor
@@ -1,7 +1,4 @@
-
- @CurrRec.Value
+
+
+ @CurrRec.Label
+
+
+ @if (CurrRec.ShowMissingData && enableForceParamSchedaTecnica)
+ {
+ if (hasDeroga)
+ {
+ Deroga Attiva
+ }
+ else
+ {
+
+ }
+ }
+ (@CurrRec.ValueRead) @CurrRec.Value
+
+
+ @if (showError)
+ {
+
+ }
+ @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 2733452b..d65b35a2 100644
--- a/MP-TAB-SERV/Components/TechSheet_ST_ObjView.razor.cs
+++ b/MP-TAB-SERV/Components/TechSheet_ST_ObjView.razor.cs
@@ -20,12 +20,73 @@ 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
{
[Parameter]
- public ST_ActRow CurrRec { get; set; } = null !;
+ 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
+ {
+ get
+ {
+ string answ = "";
+ if (CurrRec.Required)
+ {
+ if (CurrRec.Value != CurrRec.ExtCode)
+ {
+ answ = " text-danger";
+ }
+ else
+ {
+ answ = " text-success";
+ }
+ }
+ return answ;
+ }
+ }
+
+ public string derogaCss
+ {
+ get
+ {
+ string answ = enableForceParamSchedaTecnica && hasDeroga ? " bg-warning" : "";
+
+ return answ;
+ }
+ }
+
+
+ private bool hasDeroga = false;
+ private bool showError = false;
+ private bool showChecked = false;
+
+
}
}
\ 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 a2c856dd..8557a415 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.2611
+ 6.16.2310.2612
enable
MP_TAB_SERV
diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html
index 07286903..ef182c56 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.2611
+
Versione: 6.16.2310.2612
Note di rilascio:
-
diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt
index 215e26d9..767b41ea 100644
--- a/MP-TAB-SERV/Resources/VersNum.txt
+++ b/MP-TAB-SERV/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2310.2611
+6.16.2310.2612
diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml
index 906d4d4c..d2f0d8d0 100644
--- a/MP-TAB-SERV/Resources/manifest.xml
+++ b/MP-TAB-SERV/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 6.16.2310.2611
+ 6.16.2310.2612
https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip
https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html
false
diff --git a/MP.Data/DatabaseModels/ST_ActRow.cs b/MP.Data/DatabaseModels/ST_ActRow.cs
index 7248effa..c458e5ca 100644
--- a/MP.Data/DatabaseModels/ST_ActRow.cs
+++ b/MP.Data/DatabaseModels/ST_ActRow.cs
@@ -27,5 +27,10 @@ namespace MP.Data.DatabaseModels
public string ValueRead { get; set; } = "";
public string Note { get; set; } = "";
+ [NotMapped]
+ public bool ShowMissingData
+ {
+ get => Required && (Value != ExtCode);
+ }
}
}
\ No newline at end of file