diff --git a/PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs b/PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs index 2beac2bd..ee29fbcd 100644 --- a/PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs +++ b/PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs @@ -2147,7 +2147,6 @@ namespace RODBInterface foreach (int chr in chrAry) { if (chr > 166) - { xmlstrTmp.Append($"\\u{(int)chr}?"); } @@ -2205,7 +2204,6 @@ namespace RODBInterface foreach (int chr in chrAry) { if (chr > 166) - { xmlstrTmp.Append($"\\u{(int)chr}?"); } @@ -2660,7 +2658,21 @@ namespace RODBInterface } } StatMsgWindow.StatusMessage = echild.GetAttribute("MenuTitle"); + StringBuilder tinfo2Tmp = new StringBuilder(); // B2026-025 prep the info field data so it will be saved correctly. str = "UPDATE " + echild.GetAttribute("Table") + " SET Info = '" + tinfo2 + "'"; + 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(); diff --git a/PROMS/Volian.Controls.Library/VlnFlexGrid.cs b/PROMS/Volian.Controls.Library/VlnFlexGrid.cs index 465d323a..f7f2310f 100644 --- a/PROMS/Volian.Controls.Library/VlnFlexGrid.cs +++ b/PROMS/Volian.Controls.Library/VlnFlexGrid.cs @@ -2479,10 +2479,8 @@ namespace Volian.Controls.Library foreach (Match match in Regex.Matches(rtn, pattern, RegexOptions.IgnoreCase)) { mValue = match.Value; - mValue2 = @"\f1 " + mValue + @"\f0"; - rtn = rtn.Replace(match.Value, mValue2); - // @"\f1\u9474 ?\f0") - // linkValue = linkValue.Replace(match.Value, "\\f1 " + match.Value + "\\f0"); + mValue2 = $"\\f1 {mValue}\\f0"; + rtn = rtn.Replace(match.Value, mValue2); } @@ -3840,9 +3838,6 @@ namespace Volian.Controls.Library this.MergedRanges.Clear(); this.Clear(); this.IsRoTable = true; - //valtext = valtext.Replace(@"\u8209?", "-"); - //valtext = Regex.Replace(valtext, @"\\u([0-9]{1,4})\?", m => int.TryParse(m?.Groups[1]?.Value, out int result) ? Convert.ToChar(result).ToString() : ""); - //valtext = valtext.Replace("-", @"\u8209?"); this.ParseTableFromText(valtext, GridLinePattern.Single); this.AutoSizeCols(); this.AutoSizeRows();