diff --git a/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs b/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs index 60266e0e..6062ac78 100644 --- a/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs +++ b/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs @@ -1343,31 +1343,23 @@ namespace VEPROMS //// so change bars update //// on any open StepPanel - //B2026-019 Attempt to prevent an Access Error by utilizing a different Refresh if a Procedure is Open - DisplayTabItem dti = MyFrmVEPROMS.GetTabContainingProcedure(pi.ItemID); + newproc = ItemInfo.ResetProcedure(pi.ItemID); + + //B2026-019 Attempt to prevent an Access Error by utilizing a different Refresh if a Procedure is Open + DisplayTabItem dti = MyFrmVEPROMS.GetTabContainingProcedure(pi.ItemID); if (dti != null) { if (!dti.MyStepTabPanel.MyStepPanel.ContainsFocus) dti.MyStepTabPanel.MyStepPanel.Focus(); - foreach (EditItem eitm in dti.MyStepTabPanel.MyStepPanel.Controls.OfType()) - { - eitm.ChangeBar = eitm.MyItemInfo.HasChangeBar; - } + dti.MyStepTabPanel.MyStepTabRibbon.RefreshProcedure(); + Application.DoEvents(); - dti.MyStepTabPanel.MyStepTabRibbon.RefreshProcedure(); - Application.DoEvents(); - newproc = ProcedureInfo.Get(pi.ItemID); + } - } - else - { - newproc = ItemInfo.ResetProcedure(pi.ItemID); - } - - //since in a separate form, need to update the tree view - //so "Showing Change Bars" Content Menu Item is correct - MyFrmVEPROMS.RefreshProcedureNode(newproc); + //since in a separate form, need to update the tree view + //so "Showing Change Bars" Content Menu Item is correct + MyFrmVEPROMS.RefreshProcedureNode(newproc); } else UpdateProcedureConfig(pi, ap.RevNumber, ap.RevDate, myDTS, selectedSlave); diff --git a/PROMS/Volian.Controls.Library/AnnotationDetails.cs b/PROMS/Volian.Controls.Library/AnnotationDetails.cs index 27577b01..45cbeb1d 100644 --- a/PROMS/Volian.Controls.Library/AnnotationDetails.cs +++ b/PROMS/Volian.Controls.Library/AnnotationDetails.cs @@ -1,16 +1,17 @@ +using JR.Utils.GUI.Forms; using System; using System.Collections.Generic; using System.ComponentModel; -using System.Drawing; using System.Data; +using System.Diagnostics; +using System.Drawing; using System.Text; +using System.Text.RegularExpressions; using System.Windows.Forms; +using System.Xml; using VEPROMS.CSLA.Library; using Volian.Base.Library; using Volian.Pipe.Library; -using System.Xml; -using System.Diagnostics; -using JR.Utils.GUI.Forms; namespace Volian.Controls.Library { @@ -220,7 +221,10 @@ namespace Volian.Controls.Library { if (!DesignMode) // B2019-043 need to check if we are just saving changes to the user interface { - rtxbComment.Text = value; + if (value != null) + { + rtxbComment.Text = Regex.Replace(value, @"\\u([0-9]{1,4})\?", m => Convert.ToChar(int.Parse(m.Groups[1].Value)).ToString()); + } if (rtxbComment.Text != string.Empty) rtxbComment.SelectionStart = rtxbComment.TextLength; // position cursor to end of text }