Merge branch 'Development' into B2026-025_Unicode_removed_from_RO_menu_titles_in_treeview

good for testing

PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs

@@ -2142,7 +2142,20 @@ namespace RODBInterface
 					wraccid = accid;
 				string dt = string.Format("{0:yyyyMMddHHmmss}", System.DateTime.Now);
 				string xmlstr = GenerateXmlString(ro, false);
-				string strUpdate = "UPDATE " + ro.GetAttribute("Table") + " SET Info = '" + xmlstr + "'";
+				StringBuilder xmlstrTmp = new StringBuilder(); // B2026-025 prep the info field data so it will be saved correctly.
+				char[] chrAry = xmlstr.ToCharArray();
+				foreach (int chr in chrAry)
+				{
+					if (chr > 166)
+					{
+						xmlstrTmp.Append($"\\u{(int)chr}?");
+					}
+					else
+					{
+						xmlstrTmp.Append((char)chr);
+					}
+				}
+				string strUpdate = "UPDATE " + ro.GetAttribute("Table") + " SET Info = '" + xmlstrTmp.ToString() + "'";
 				if (movedRO)
 				{
 					VlnXmlElement parent = (VlnXmlElement)ro.ParentNode;
@@ -2186,6 +2199,20 @@ namespace RODBInterface
 			}
 			string xmlstr = GenerateXmlString(ro, false);
 
+			StringBuilder xmlstrTmp = new StringBuilder(); // B2026-025 prep the info field data so it will be saved correctly.
+			char[] chrAry = xmlstr.ToCharArray();
+			foreach (int chr in chrAry)
+			{
+				if (chr > 166)
+				{
+					xmlstrTmp.Append($"\\u{(int)chr}?");
+				}
+				else
+				{
+					xmlstrTmp.Append((char)chr);
+				}
+			}
+
 			string wraccid = null;
 			if (ro.HasAttribute("AccPageID"))
 			{
@@ -2209,13 +2236,13 @@ namespace RODBInterface
 					//    strInsert = "INSERT INTO " + parent.GetAttribute("Table") + "( RecID, RecType, ParentID, AccPageID, ModDateTime, Info ) ";
 					strInsert = "INSERT INTO " + parent.GetAttribute("Table") + "( RecID, RecType, ParentID, ModDateTime, AccPageID, Info ) ";
 					strInsert = strInsert + " VALUES ('" + ro.GetAttribute("RecID") + "'," + (uint)RecordType.Group + ",'" + ro.GetAttribute("ParentID");
-					strInsert = strInsert + "','" + wraccid + "','" + dt + "','" + xmlstr + "');";
+					strInsert = strInsert + "','" + wraccid + "','" + dt + "','" + xmlstrTmp.ToString() + "');";
 				}
 				else
 				{
 					strInsert = "INSERT INTO " + parent.GetAttribute("Table") + "( RecID, RecType, ParentID, ModDateTime, Info ) ";
 					strInsert = strInsert + " VALUES ('" + ro.GetAttribute("RecID") + "'," + (uint)RecordType.Group + ",'" + ro.GetAttribute("ParentID");
-					strInsert = strInsert + "','" + dt + "','" + xmlstr + "');";
+					strInsert = strInsert + "','" + dt + "','" + xmlstrTmp.ToString() + "');";
 				}
 
 			}
@@ -2223,7 +2250,7 @@ namespace RODBInterface
 			{
 				strInsert = "INSERT INTO " + parent.GetAttribute("Table") + "( RecID, RecType, ParentID, AccPageId, ModDateTime, Info ) ";
 				strInsert = strInsert + " VALUES ('" + ro.GetAttribute("RecID") + "'," + (uint)RecordType.RRO + ",'" + ro.GetAttribute("ParentID");
-				strInsert = strInsert + "','" + wraccid + "','" + dt + "','" + xmlstr + "');";
+				strInsert = strInsert + "','" + wraccid + "','" + dt + "','" + xmlstrTmp.ToString() + "');";
 			}
 
 			try
@@ -2631,7 +2658,20 @@ namespace RODBInterface
 										}
 									}
 									StatMsgWindow.StatusMessage = echild.GetAttribute("MenuTitle");
-									str = "UPDATE " + echild.GetAttribute("Table") + " SET Info = '" + tinfo2 + "'";
+									StringBuilder tinfo2Tmp = new StringBuilder(); // B2026-025 prep the info field data so it will be saved correctly.
+									char[] chrAry = tinfo2.ToCharArray();
+									foreach (int chr in chrAry)
+									{
+										if (chr > 166)
+										{
+											tinfo2Tmp.Append($"\\u{(int)chr}?");
+										}
+										else
+										{
+											tinfo2Tmp.Append((char)chr);
+										}
+									}
+									str = "UPDATE " + echild.GetAttribute("Table") + " SET Info = '" + tinfo2Tmp.ToString() + "'";
 									str = str + ", ModDateTime = '" + dt + "' WHERE RecID = '" + echild.GetAttribute("RecID") + "';";
 									DBE.Command(str);
 									DBE.Reader();

PROMS/ReferencedObjects/LibSource/RODBInterface/VlnXml.cs

@@ -96,6 +96,7 @@ using System.IO;
 using System.Windows.Forms;
 using ROFields;
 using VlnStatus;
+using System.Text.RegularExpressions;
 //using VlnProfiler; //don't forget to add VlnProfiler to the reference list
 
 namespace RODBInterface
@@ -517,7 +518,8 @@ namespace RODBInterface
 								strtmp.Append(" ");
 								cnt++;
 							}
-							if ((cnt + text.Length) > frmt2) // longer than the field length?
+							text = Regex.Replace(text, @"\\u([0-9]{1,4})\?", m => int.TryParse(m?.Groups[1]?.Value, out int result) ? Convert.ToChar(result).ToString() : ""); //B2026-025 Unicode removed from RO menu titles in treeview.
+							if ((cnt + text.Length) > frmt2) // longer than the field length?								
 								strtmp.Append(text.Substring(0,frmt2-cnt));
 							else
 								strtmp.Append(text);

PROMS/Volian.Controls.Library/DisplayRO.cs

@@ -372,12 +372,14 @@ namespace Volian.Controls.Library
 		{
 			// B2022-088: [JPR] Find Doc Ro button not working in Word Sections
 			// B2022-098: [JPR] ROs not being resolved in Word Sections
-			if (e.Node.Tag is ROFSTLookup.rochild){
+			if (e.Node.Tag is ROFSTLookup.rochild)
+			{
 				ROFSTLookup.rochild chld = (ROFSTLookup.rochild)e.Node.Tag;
 				selectedChld = chld;
 
 				if (chld.value != null)
 				{
+					chld.value = Regex.Replace(chld.value, @"\\u([0-9]{1,4})\?", m => int.TryParse(m?.Groups[1]?.Value, out int result) ? Convert.ToChar(result).ToString() : "");
 					RoUsageInfo SavROLink = null;
 					if (_savCurROLink != null) SavROLink = _savCurROLink;
 
@@ -1172,3 +1174,4 @@ namespace Volian.Controls.Library
 		#endregion
 	}
 }
+

PROMS/Volian.Controls.Library/StepRTB.cs

@@ -1404,7 +1404,7 @@ namespace Volian.Controls.Library
 			var pattern = @"\\u([0-9]{1,4})\?"; // RO Editor add symbols C2022 - 003
 			foreach (Match match in Regex.Matches(linkValue, pattern, RegexOptions.IgnoreCase))
 			{
-				linkValue = linkValue.Replace(match.Value, "\\f1 " + match.Value + " \\f0");
+				linkValue = linkValue.Replace(match.Value, "\\f1 " + match.Value + "\\f0");
 			}
 
 			linkValue = linkValue.Replace(@"{", @"\{");