Compare commits

..

5 Commits

4 changed files with 17 additions and 10 deletions
Binary file not shown.
@@ -2147,7 +2147,6 @@ namespace RODBInterface
foreach (int chr in chrAry) foreach (int chr in chrAry)
{ {
if (chr > 166) if (chr > 166)
{ {
xmlstrTmp.Append($"\\u{(int)chr}?"); xmlstrTmp.Append($"\\u{(int)chr}?");
} }
@@ -2205,7 +2204,6 @@ namespace RODBInterface
foreach (int chr in chrAry) foreach (int chr in chrAry)
{ {
if (chr > 166) if (chr > 166)
{ {
xmlstrTmp.Append($"\\u{(int)chr}?"); xmlstrTmp.Append($"\\u{(int)chr}?");
} }
@@ -2660,7 +2658,21 @@ namespace RODBInterface
} }
} }
StatMsgWindow.StatusMessage = echild.GetAttribute("MenuTitle"); 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 + "'"; 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") + "';"; str = str + ", ModDateTime = '" + dt + "' WHERE RecID = '" + echild.GetAttribute("RecID") + "';";
DBE.Command(str); DBE.Command(str);
DBE.Reader(); DBE.Reader();
@@ -49,7 +49,7 @@ namespace Volian.Controls.Library
this.btnApplicabilitychg.Size = new System.Drawing.Size(80, 22); this.btnApplicabilitychg.Size = new System.Drawing.Size(80, 22);
this.btnApplicabilitychg.Margin = new System.Windows.Forms.Padding(2); this.btnApplicabilitychg.Margin = new System.Windows.Forms.Padding(2);
this.btnApplicabilitychg.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnApplicabilitychg.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.superTooltip1.SetSuperTooltip(this.btnApplicabilitychg, new DevComponents.DotNetBar.SuperTooltipInfo("Change applicability settings - All At Level", "", "When clicked, all steps at the level of the current step will have their applicability settings changed.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.superTooltip1.SetSuperTooltip(this.btnApplicabilitychg, new DevComponents.DotNetBar.SuperTooltipInfo("Change applicability settings - All At Level", "", "When clicked, all steps at the level of the current step will have their applicability settings changed. Note that for two column procedures, the left column and right column are handled separately.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
this.btnApplicabilitychg.TabIndex = 0; this.btnApplicabilitychg.TabIndex = 0;
this.btnApplicabilitychg.Text = "Set All at Level"; this.btnApplicabilitychg.Text = "Set All at Level";
this.btnApplicabilitychg.ColorTable = DevComponents.DotNetBar.eButtonColor.BlueOrb; this.btnApplicabilitychg.ColorTable = DevComponents.DotNetBar.eButtonColor.BlueOrb;
+2 -7
View File
@@ -2479,10 +2479,8 @@ namespace Volian.Controls.Library
foreach (Match match in Regex.Matches(rtn, pattern, RegexOptions.IgnoreCase)) foreach (Match match in Regex.Matches(rtn, pattern, RegexOptions.IgnoreCase))
{ {
mValue = match.Value; mValue = match.Value;
mValue2 = @"\f1 " + mValue + @"\f0"; mValue2 = $"\\f1 {mValue}\\f0";
rtn = rtn.Replace(match.Value, mValue2); rtn = rtn.Replace(match.Value, mValue2);
// @"\f1\u9474 ?\f0")
// linkValue = linkValue.Replace(match.Value, "\\f1 " + match.Value + "\\f0");
} }
@@ -3840,9 +3838,6 @@ namespace Volian.Controls.Library
this.MergedRanges.Clear(); this.MergedRanges.Clear();
this.Clear(); this.Clear();
this.IsRoTable = true; 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.ParseTableFromText(valtext, GridLinePattern.Single);
this.AutoSizeCols(); this.AutoSizeCols();
this.AutoSizeRows(); this.AutoSizeRows();