diff --git a/MP-TAB3/Components/DisabledAlert.razor b/MP-TAB3/Components/DisabledAlert.razor index e8918760..35be8378 100644 --- a/MP-TAB3/Components/DisabledAlert.razor +++ b/MP-TAB3/Components/DisabledAlert.razor @@ -1,14 +1,14 @@ 
-

@Title

+

@FixTxt(Title)

- @Subtitle + @FixTxt(Subtitle)

- @Message + @FixTxt(Message)
diff --git a/MP-TAB3/Components/DisabledAlert.razor.cs b/MP-TAB3/Components/DisabledAlert.razor.cs index a1ba87c6..ca52bff4 100644 --- a/MP-TAB3/Components/DisabledAlert.razor.cs +++ b/MP-TAB3/Components/DisabledAlert.razor.cs @@ -16,5 +16,14 @@ namespace MP_TAB3.Components public string Title { get; set; } = ""; #endregion Public Properties + + #region Protected Methods + + protected MarkupString FixTxt(string origText) + { + return new MarkupString(origText); + } + + #endregion Protected Methods } } \ No newline at end of file diff --git a/MP-TAB3/Components/MachineBlock.razor b/MP-TAB3/Components/MachineBlock.razor index 73a97bf0..2a8f0ff5 100644 --- a/MP-TAB3/Components/MachineBlock.razor +++ b/MP-TAB3/Components/MachineBlock.razor @@ -179,7 +179,12 @@ else else {
-
+
+
+

+ @RecMSE.Nome +

+
@@ -221,10 +226,7 @@ else }
-
-

- @RecMSE.Nome -

+
diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj index 5b81e06d..4414b4e6 100644 --- a/MP-TAB3/MP-TAB3.csproj +++ b/MP-TAB3/MP-TAB3.csproj @@ -3,7 +3,7 @@ net6.0 enable - 6.16.2410.1418 + 6.16.2410.1511 enable MP_TAB3 diff --git a/MP-TAB3/Pages/TechSheet.razor.cs b/MP-TAB3/Pages/TechSheet.razor.cs index ea9dfbbb..0f7014a5 100644 --- a/MP-TAB3/Pages/TechSheet.razor.cs +++ b/MP-TAB3/Pages/TechSheet.razor.cs @@ -24,7 +24,7 @@ namespace MP_TAB3.Pages #region Private Fields - private string disMessage = "Gestione schede tecniche di attrezzaggio, collaudo e verifica procedure di setup. Il modulo opzionale ` attivabile su richiesta."; + private string disMessage = "Gestione schede tecniche di attrezzaggio, collaudo e verifica procedure di setup. Il modulo opzionale è attivabile su richiesta."; private string disSubtitle = "Funzionalità disattivata"; diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html index 94b7baaf..452b90b0 100644 --- a/MP-TAB3/Resources/ChangeLog.html +++ b/MP-TAB3/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2410.1418

+

Versione: 6.16.2410.1511


Note di rilascio:
  • diff --git a/MP-TAB3/Resources/VersNum.txt b/MP-TAB3/Resources/VersNum.txt index 111af859..db885e1c 100644 --- a/MP-TAB3/Resources/VersNum.txt +++ b/MP-TAB3/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2410.1418 +6.16.2410.1511 diff --git a/MP-TAB3/Resources/manifest.xml b/MP-TAB3/Resources/manifest.xml index 3f96fec3..a9c20d09 100644 --- a/MP-TAB3/Resources/manifest.xml +++ b/MP-TAB3/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2410.1418 + 6.16.2410.1511 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/appsettings.Production.json b/MP-TAB3/appsettings.Production.json index 924ae125..077a3fb3 100644 --- a/MP-TAB3/appsettings.Production.json +++ b/MP-TAB3/appsettings.Production.json @@ -23,7 +23,7 @@ "BaseAddr": "https://iis04.egalware.com/MP/TAB3/", "BasePathDisegni": "C:\\Steamware\\disegni", "BaseUrlTab": "/MP/TAB3", - "ImgBasePath": "https://iis04.egalware.com/MP/images/macchine/small/", + "ImgBasePath": "https://iis04.egalware.com/MP/macchine/small/", "MpIoNS": "MoonPro:SQL2016DEV:MoonPro" }, "AlarmDest": "samuele.locatelli@egalware.com, ceo@steamware.net" diff --git a/MP-TAB3/appsettings.json b/MP-TAB3/appsettings.json index 09876947..0272dcfd 100644 --- a/MP-TAB3/appsettings.json +++ b/MP-TAB3/appsettings.json @@ -67,7 +67,7 @@ "BaseAddr": "https://localhost:7295/MP/TAB3/", "BasePathDisegni": "\\\\iis01\\W$\\Files\\Disegni", "BaseUrlTab": "/MP/TAB3", - "ImgBasePath": "https://iis01.egalware.com/MP/images/macchine/small/", + "ImgBasePath": "https://iis01.egalware.com/MP/macchine/small/", "MpIoNS": "MoonPro:SQL2016DEV:MoonPro", "maxChar4Scroll": 21 },