diff --git a/Lux.UI/Components/Compo/OfferRowMan.razor b/Lux.UI/Components/Compo/OfferRowMan.razor
index 5bc96f77..4e53ee6a 100644
--- a/Lux.UI/Components/Compo/OfferRowMan.razor
+++ b/Lux.UI/Components/Compo/OfferRowMan.razor
@@ -112,7 +112,18 @@ else
@if (isNote)
{
- | @item.Note |
+
+ @if (CurrEditMode == EditMode.RecData && EditRecord != null && EditRecord.OfferRowID == item.OfferRowID)
+ {
+
+
+
+ }
+ else
+ {
+ @HtmlConv(item.Note)
+ }
+ |
}
else
{
diff --git a/Lux.UI/Components/Compo/OfferRowMan.razor.cs b/Lux.UI/Components/Compo/OfferRowMan.razor.cs
index 6cfd2e95..03a92552 100644
--- a/Lux.UI/Components/Compo/OfferRowMan.razor.cs
+++ b/Lux.UI/Components/Compo/OfferRowMan.razor.cs
@@ -93,6 +93,14 @@ namespace Lux.UI.Components.Compo
#endregion Protected Fields
+ ///
+ /// Formattazione testo come html x display
+ ///
+ protected MarkupString HtmlConv(string rawData)
+ {
+ return (MarkupString)rawData.Replace(Environment.NewLine, "
").Replace("\n", "
");//.Replace(" ", " ");
+ }
+
#region Protected Properties
[Inject]
@@ -815,7 +823,6 @@ namespace Lux.UI.Components.Compo
string serKey = envRec != null ? envRec.SerStrucKey : "Jwd";
// cablata la BOM
DictExec.Add("Mode", $"{(int)Egw.Window.Data.Enums.QuestionModes.BOM}");
- //DictExec.Add("Mode", "2");
// UID cablato x ora...
DictExec.Add("UID", currRec.OfferRowUID);
DictExec.Add(serKey, currRec.SerStruct);
diff --git a/Lux.UI/Lux.UI.csproj b/Lux.UI/Lux.UI.csproj
index ba4acefa..1575852b 100644
--- a/Lux.UI/Lux.UI.csproj
+++ b/Lux.UI/Lux.UI.csproj
@@ -5,7 +5,7 @@
enable
enable
aspnet-Lux.UI-a758c101-a2f4-4e38-977d-1c4887dbbd50
- 0.9.2510.2111
+ 0.9.2510.2115
diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html
index 77d0dccb..c21ba89f 100644
--- a/Resources/ChangeLog.html
+++ b/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
LUX - Web Windows MES
- Versione: 0.9.2510.2111
+ Versione: 0.9.2510.2115
Note di rilascio:
-
diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt
index 94401a3c..18bc8ad2 100644
--- a/Resources/VersNum.txt
+++ b/Resources/VersNum.txt
@@ -1 +1 @@
-0.9.2510.2111
+0.9.2510.2115
diff --git a/Resources/manifest.xml b/Resources/manifest.xml
index bc7f6220..1647fa08 100644
--- a/Resources/manifest.xml
+++ b/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 0.9.2510.2111
+ 0.9.2510.2115
http://nexus.steamware.net/repository/SWS/GPW/stable/GPW.UI.zip
http://nexus.steamware.net/repository/SWS/GPW/stable/ChangeLog.html
false