B2026-014 Approved Procedure Export

Format only change - good for testing

PROMS/ReferencedObjects/Exe/RefObj/ROEditor/FieldCombFrm.cs

@@ -77,7 +77,6 @@ using System.Xml.Schema;
 using System.Text;
 using ROFields;
 using RODBInterface;
-using System.Linq;
 
 namespace ROEditor
 {
@@ -281,7 +280,6 @@ namespace ROEditor
 			this.tbXYPlotWid.Size = new System.Drawing.Size(40, 22);
 			this.tbXYPlotWid.TabIndex = 11;
 			this.tbXYPlotWid.Text = "";
-			this.tbXYPlotWid.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtBox_KeyDown);
 			// 
 			// tbTableWid
 			// 
@@ -290,7 +288,6 @@ namespace ROEditor
 			this.tbTableWid.Size = new System.Drawing.Size(40, 22);
 			this.tbTableWid.TabIndex = 10;
 			this.tbTableWid.Text = "";
-			this.tbTableWid.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtBox_KeyDown);
 			// 
 			// tbVariableTxtWid
 			// 
@@ -299,7 +296,6 @@ namespace ROEditor
 			this.tbVariableTxtWid.Size = new System.Drawing.Size(40, 22);
 			this.tbVariableTxtWid.TabIndex = 9;
 			this.tbVariableTxtWid.Text = "";
-			this.tbVariableTxtWid.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtBox_KeyDown);
 			// 
 			// tbSingleTxtWid
 			// 
@@ -308,7 +304,6 @@ namespace ROEditor
 			this.tbSingleTxtWid.Size = new System.Drawing.Size(40, 22);
 			this.tbSingleTxtWid.TabIndex = 8;
 			this.tbSingleTxtWid.Text = "";
-			this.tbSingleTxtWid.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtBox_KeyDown);
 			// 
 			// lblW4
 			// 
@@ -591,18 +586,5 @@ namespace ROEditor
 			
 			this.Close();
 		}
-		private void txtBox_KeyDown(object sender, KeyEventArgs e)
-		{
-			if (Clipboard.GetDataObject().GetDataPresent(DataFormats.Text))
-			{
-				string clpBrd = Clipboard.GetText();
-				if (clpBrd.Any(c => c > 166))
-				{
-					MessageBox.Show("Symbols are not allowed in the field. Clipbroad: '" + clpBrd + "'");
-					Clipboard.Clear();
-				}
-			}
-		}
 	}
 }
-

PROMS/ReferencedObjects/Exe/RefObj/ROEditor/FieldTextFrm.cs

@@ -77,7 +77,6 @@ using System.Xml.Schema;
 using System.Text;
 using ROFields;
 using RODBInterface;
-using System.Linq;
 
 namespace ROEditor
 {
@@ -317,22 +316,6 @@ namespace ROEditor
 			}
 			base.Dispose( disposing );
 		}
-		private void txtBox_KeyDown(object sender, KeyEventArgs e)
-		{
-			bool symFlg = false;
-			if (Clipboard.GetDataObject().GetDataPresent(DataFormats.Text))
-			{
-				if (Clipboard.GetDataObject().GetDataPresent(DataFormats.Text))
-				{
-					string clpBrd = Clipboard.GetText();
-					if (clpBrd.Any(c => c > 166))
-					{
-						MessageBox.Show("Symbols are not allowed in the field. Clipbroad: '" + clpBrd + "'");
-						Clipboard.Clear();
-					}
-				}
-			}
-		}
 
 		#region Windows Form Designer generated code
 		/// <summary>
@@ -374,7 +357,6 @@ namespace ROEditor
 			this.tbFieldName.Size = new System.Drawing.Size(320, 22);
 			this.tbFieldName.TabIndex = 2;
 			this.tbFieldName.Text = "";
-			this.tbFieldName.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtBox_KeyDown);
 			// 
 			// tbWidth
 			// 
@@ -383,7 +365,6 @@ namespace ROEditor
 			this.tbWidth.Size = new System.Drawing.Size(32, 22);
 			this.tbWidth.TabIndex = 3;
 			this.tbWidth.Text = "";
-			this.tbWidth.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtBox_KeyDown);
 			// 
 			// btnOK
 			// 
@@ -421,7 +402,6 @@ namespace ROEditor
 			this.tbPattern.TabIndex = 7;
 			this.tbPattern.Text = "";
 			this.tbPattern.Visible = false;
-			this.tbPattern.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtBox_KeyDown);
 			// 
 			// FieldTextFrm
 			// 
@@ -445,4 +425,3 @@ namespace ROEditor
 		#endregion
 	}
 }
-

PROMS/ReferencedObjects/Exe/RefObj/ROEditor/FieldTypeDefFrm.cs

@@ -72,7 +72,6 @@ using System.Xml;
 using System.Text;
 using RODBInterface;
 using ROFields;
-using System.Linq;
 
 namespace ROEditor
 {
@@ -278,22 +277,6 @@ namespace ROEditor
 
 			this.Close();
 		}
-		private void txtBox_KeyDown(object sender, KeyEventArgs e)
-		{
-			bool symFlg = false;
-			if (Clipboard.GetDataObject().GetDataPresent(DataFormats.Text))
-			{
-				if (Clipboard.GetDataObject().GetDataPresent(DataFormats.Text))
-				{
-					string clpBrd = Clipboard.GetText();
-					if (clpBrd.Any(c => c > 166))
-					{
-						MessageBox.Show("Symbols are not allowed in the field. Clipbroad: '" + clpBrd + "'");
-						Clipboard.Clear();
-					}
-				}
-			}
-		}
 		#region Windows Form Designer generated code
 		/// <summary>
 		/// Required method for Designer support - do not modify
@@ -332,7 +315,6 @@ namespace ROEditor
 			this.tbFieldName.Size = new System.Drawing.Size(368, 22);
 			this.tbFieldName.TabIndex = 1;
 			this.tbFieldName.Text = "";
-			this.tbFieldName.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtBox_KeyDown);
 			// 
 			// gbFldType
 			// 
@@ -455,4 +437,3 @@ namespace ROEditor
 		#endregion
 	}
 }
-

PROMS/ReferencedObjects/Exe/RefObj/ROEditor/GroupNewFrm.cs

@@ -52,7 +52,6 @@ using System.Xml;
 using System.Text;
 using ROFields;
 using RODBInterface;
-using System.Linq;
 
 namespace ROEditor
 {
@@ -156,7 +155,6 @@ namespace ROEditor
 			this.tbGroup.Size = new System.Drawing.Size(248, 22);
 			this.tbGroup.TabIndex = 8;
 			this.tbGroup.Text = "";
-			this.tbGroup.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtBox_KeyDown);
 			// 
 			// lblGroup
 			// 
@@ -423,21 +421,5 @@ namespace ROEditor
 			GroupDefFrm grdef = new GroupDefFrm(nelem,myrodb,nelem.InnerText,dbtype);
 			grdef.ShowDialog();
 		}
-		private void txtBox_KeyDown(object sender, KeyEventArgs e)
-		{		
-			if (Clipboard.GetDataObject().GetDataPresent(DataFormats.Text))
-			{
-				if (Clipboard.GetDataObject().GetDataPresent(DataFormats.Text))
-				{
-					string clpBrd = Clipboard.GetText();
-					if (clpBrd.Any(c => c > 166))
-					{
-						MessageBox.Show("Symbols are not allowed in the field. Clipbroad: '" + clpBrd + "'");
-						Clipboard.Clear();
-					}
-				}
-			}
-		}
 	}
 }
-

PROMS/ReferencedObjects/Exe/RefObj/ROEditor/RODefFrm.cs

@@ -106,7 +106,6 @@ using ROFields;
 using RODBInterface;
 using VlnStatus;
 using System.Collections.Generic;
-using System.Linq;
 
 
 namespace ROEditor
@@ -1312,22 +1311,6 @@ namespace ROEditor
 					}
 			}
 		}
-		private void txtBox_KeyDown(object sender, KeyEventArgs e)
-		{
-			bool symFlg = false;
-			if (Clipboard.GetDataObject().GetDataPresent(DataFormats.Text))
-			{
-				if (Clipboard.GetDataObject().GetDataPresent(DataFormats.Text))
-				{
-					string clpBrd = Clipboard.GetText();
-					if (clpBrd.Any(c => c > 166))
-					{
-						MessageBox.Show("Symbols are not allowed in the field. Clipbroad: '" + clpBrd + "'");
-						Clipboard.Clear();
-					}
-				}
-			}
-		}
 
 		#region Windows Form Designer generated code
 		/// <summary>
@@ -1392,7 +1375,6 @@ namespace ROEditor
 			this.tbRetVal.Size = new System.Drawing.Size(464, 22);
 			this.tbRetVal.TabIndex = 4;
 			this.tbRetVal.Text = "textBox1";
-			this.tbRetVal.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtBox_KeyDown);
 			// 
 			// tbMenuVal
 			// 
@@ -1401,7 +1383,6 @@ namespace ROEditor
 			this.tbMenuVal.Size = new System.Drawing.Size(464, 22);
 			this.tbMenuVal.TabIndex = 5;
 			this.tbMenuVal.Text = "textBox1";
-			this.tbMenuVal.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtBox_KeyDown);
 			// 
 			// lblGroupText
 			// 
@@ -1627,4 +1608,3 @@ namespace ROEditor
 		#endregion
 	}
 }
-

PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ROEditor.csproj

@@ -109,10 +109,6 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\3rdPartyLibraries\DotNetBar\DotNetBar4.6Build\DevComponents.DotNetBar2.dll</HintPath>
-    </Reference>
     <Reference Include="System">
       <Name>System</Name>
     </Reference>
@@ -128,6 +124,10 @@
     <Reference Include="System.Xml">
       <Name>System.XML</Name>
     </Reference>
+    <Reference Include="Volian.Base.Library, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\Volian.Base.Library\bin\Debug\Volian.Base.Library.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AboutROEditor.cs">
@@ -168,7 +168,6 @@
     <Compile Include="RO_FST.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Content Include="Symbols.xml" />
     <EmbeddedResource Include="AboutROEditor.resx">
       <SubType>Designer</SubType>
       <DependentUpon>AboutROEditor.cs</DependentUpon>

PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ROEditor.resx

@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACE
-        CAAAAk1TRnQBSQFMAgEBAgEAAUQBAAFEAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CAAAAk1TRnQBSQFMAgEBAgEAASwBAAEsAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -175,7 +175,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAe
-        CwAAAk1TRnQBSQFMAgEBBgEAAUQBAAFEAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CwAAAk1TRnQBSQFMAgEBBgEAASwBAAEsAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

PROMS/ReferencedObjects/Exe/RefObj/ROEditor/RO_FST.cs

@@ -101,6 +101,7 @@ using System.Runtime.InteropServices;
 using VlnStatus;
 using System.Collections.Specialized;
 using ROFST_FILE;
+using Volian.Base.Library;
 
 //using VlnProfiler; //don't forget to add VlnProfiler to the reference list
 
@@ -884,4 +885,3 @@ namespace ROEditor
 
 	}
 }
-

PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs

@@ -263,7 +263,6 @@ using System.Collections.Specialized;
 using Org.Mentalis.Files;
 using System.Data.SqlClient;
 using System.Collections.Generic;
-using System.Text.RegularExpressions;
 
 
 namespace RODBInterface
@@ -1910,8 +1909,6 @@ namespace RODBInterface
 				string Info = DBE.GetString(3);
 				//B2022-043 &pos; was missing the ;
 				Info = Info.Replace("'", "\'");		// B2021-071: crash when getting/saving field names
-				Info = Regex.Replace(Info, @"\\u([0-9]{1,4})\?", m => Convert.ToChar(int.Parse(m.Groups[1].Value)).ToString());  // RO Editor add symbols C2022 - 003
-
 				node.SetAttribute("HasChild", "True");
 
 				// Store data in the VlnXmlElement as a subgroup
@@ -2185,13 +2182,10 @@ namespace RODBInterface
 				parent.SetAttribute("ChildLoaded", "True");
 			}
 			string xmlstr = GenerateXmlString(ro, false);
-
 			string wraccid = null;
 			if (ro.HasAttribute("AccPageID"))
 			{
 				string accid = ro.GetAttribute("AccPageID");
-
-
 				int quote = accid.IndexOf("'");
 				if (quote >= 0)
 					wraccid = accid.Insert(quote, "'");
@@ -2257,7 +2251,7 @@ namespace RODBInterface
 				// select all of the field definition records in this table.
 				//			strGetFields = "SELECT RecID, Info from " + elem.GetAttribute("Table");
 				strGetFields = "SELECT RecID, Info from " + TableName;
-				strGetFields = strGetFields + " where RecType = 2";  
+				strGetFields = strGetFields + " where RecType = 2";  //  + rtype.ToString();
 				DBE.Command(strGetFields);
 				DBE.Reader();
 

PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ZoomDialog.cs

@@ -39,7 +39,7 @@ namespace ctlXMLEditLib
 	{
 		private System.Windows.Forms.Button btnSave;
 		private System.Windows.Forms.Button btnCancel;
-		private ctlXMLEditLib.roRichTextBox tbZoom; // RO Editor add symbols C2022 - 003
+		private System.Windows.Forms.TextBox tbZoom;
 		/// <summary>
 		/// Required designer variable.
 		/// </summary>
@@ -88,7 +88,7 @@ namespace ctlXMLEditLib
 		/// </summary>
 		private void InitializeComponent()
 		{
-			this.tbZoom = new ctlXMLEditLib.roRichTextBox(); // RO Editor add symbols C2022 - 003
+			this.tbZoom = new System.Windows.Forms.TextBox();
 			this.btnSave = new System.Windows.Forms.Button();
 			this.btnCancel = new System.Windows.Forms.Button();
 			this.SuspendLayout();
@@ -99,7 +99,7 @@ namespace ctlXMLEditLib
 			this.tbZoom.Location = new System.Drawing.Point(24, 16);
 			this.tbZoom.Multiline = true;
 			this.tbZoom.Name = "tbZoom";
-			this.tbZoom.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.Vertical; // RO Editor add symbols C2022 - 003
+			this.tbZoom.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
 			this.tbZoom.Size = new System.Drawing.Size(576, 392);
 			this.tbZoom.TabIndex = 0;
 			// 
@@ -149,4 +149,3 @@ namespace ctlXMLEditLib
 		
 	}
 }
-

PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEdit.cs

@@ -200,11 +200,7 @@ using System.Xml.Schema;
 using System.Text;
 using RODBInterface;
 using Org.Mentalis.Files;
-using System.Windows;
+//using IniFileIO;
-using System.Text.RegularExpressions;
-using System.Linq;
-using Volian.Base.Library;
-
 
 
 
@@ -225,7 +221,6 @@ namespace ctlXMLEditLib
 	///	  
 	///    
 	/// </summary>
-
 	public class ctlXMLEdit : System.Windows.Forms.UserControl
 	{
 		/// <summary>
@@ -242,12 +237,12 @@ namespace ctlXMLEditLib
 		private bool dosaveflag;
 		private VlnXmlElement editelem;
 		private XmlDocument editdoc;
-		private roRichTextBox zoomtextbox;
+		private TextBox zoomtextbox;
 		// the following is used for handling images. Note that if we want to have more
 		// than one image defined in an ro, this should be become a list.
-		private roRichTextBox GraphicsFiletextbox;
+		private TextBox GraphicsFiletextbox;
-		private roRichTextBox GraphicsWdtextbox;
+		private TextBox GraphicsWdtextbox;
-		private roRichTextBox GraphicsHttextbox;
+		private TextBox GraphicsHttextbox;
 		private System.Windows.Forms.Button btnFindFile;
 		private string GraphicsText;
 		private ToolTip zmtooltip;
@@ -270,19 +265,6 @@ namespace ctlXMLEditLib
 		private GroupBox pcGrpBox = null;
 		/** end C2021-026 **/
 
-		public string _RO_IDEN;
-		public string RO_IDEN
-		{
-			get
-			{
-				return _RO_IDEN;
-			}
-			set
-			{
-				_RO_IDEN = value;
-			}
-		}
-
 		// use this struct to define attributes for the text box fields, storing
 		// the pattern, radio button association, required field flag, etc.
 		struct TextBoxAttrTag
@@ -329,19 +311,10 @@ namespace ctlXMLEditLib
 			public string GetParentHTId { get { return parenthtid; } }
 			public void SetParentHTId(string id) { this.parenthtid = id; }
 		}
-		private roRichTextBox _TextBoxFocus;  // RO Editor add symbols C2022 - 003
+
-		public roRichTextBox TextBoxFocus
-		{
-			get { return _TextBoxFocus; }
-			set
-			{
-				_TextBoxFocus = value;
-			}
-		}
 		public ctlXMLEdit(VlnXmlElement myelem, XmlSchema myschema, ArrayList reqfields, ArrayList fldsWithApplic, string [] pckids)
 		{
 			// This call is required by the Windows.Forms Form Designer.
-
 			InitializeComponent();
 			FieldsWithApplic = fldsWithApplic;
 			PCChildren = pckids; //C2021-026 list of Parent/Child children
@@ -386,12 +359,11 @@ namespace ctlXMLEditLib
 			// Set required fields based on list. (can add message later).
 			SetRequiredFields(reqfields);
 			dosaveflag=true;
-			RO_IDEN = myelem.GetAccPageIDTemplate();
 		}
 
 		// set the required fields tag on those fields which are included in the passed
 		// in required fields list.
-		private void DoSet(roRichTextBox hwnd, string msg) // RO Editor add symbols C2022 - 003
+		private void DoSet(TextBox hwnd, string msg)
 		{
 			if (hwnd == null) return;
 			if (hwnd.Tag != null)
@@ -406,7 +378,7 @@ namespace ctlXMLEditLib
 		private void SetRequiredFields(ArrayList reqfields)
 		{
 			Object o;
-			roRichTextBox hwnd;
+			TextBox hwnd;
 			string field, msg;
 			int indx;
 			foreach (string strfld in reqfields)
@@ -425,15 +397,15 @@ namespace ctlXMLEditLib
 					o = myHT[field+"a"];
 					if (o != null)   // set all combo types required, the checker
 					{
-						DoSet((roRichTextBox)o,msg);
+						DoSet((TextBox)o,msg);
-						DoSet((roRichTextBox)myHT[field+"b"],msg);
+						DoSet((TextBox)myHT[field+"b"],msg);
-						DoSet((roRichTextBox)myHT[field+"c"],msg);
+						DoSet((TextBox)myHT[field+"c"],msg);
-						DoSet((roRichTextBox)myHT[field+"d"],msg);
+						DoSet((TextBox)myHT[field+"d"],msg);
 					}
 				}
 				else if (o != null)
 				{
-					hwnd = (roRichTextBox) o;
+					hwnd = (TextBox) o;
 					if (hwnd.Tag != null)
 					{
 						TextBoxAttrTag tag = (TextBoxAttrTag) hwnd.Tag;
@@ -447,7 +419,7 @@ namespace ctlXMLEditLib
 		
 		// C2021-026 If this is a Parent/Child field that has no value saved in the database
 		//           then use the parent's value and display it as grey colored text.
-		private void GetDefaultParentValue(roRichTextBox tb, XmlNode node, string chldName)
+		private void GetDefaultParentValue(TextBox tb, XmlNode node, string chldName)
 		{
 			XmlNode parentNode = null;
 			// PCChildren contains a list strings reprenting the Children setup in the current Working Draft Parent/Child property
@@ -491,23 +463,21 @@ namespace ctlXMLEditLib
 		private void DisplayFieldContents(XmlNode node)
 		{
 			Object o;
-			roRichTextBox hwnd;
+			TextBox hwnd;
 			XmlNode nd;
 			// if we have an image, check it for validity, i.e. file exists, etc.??
 			foreach (string str in myHT.Keys)
 			{
 				o = myHT[str];
-				hwnd = (roRichTextBox) o;
+				hwnd = (TextBox) o;
 				nd = node.SelectSingleNode(str);
 				// if not found with just the string, search the tree.
 				if (nd==null)nd = node.SelectSingleNode("*/"+str);
 				if (nd == null || nd.InnerText.Length==0) // B2024-004 use Parent value if Child text length is zero
 					GetDefaultParentValue(hwnd, node, str); // C2021-026 Parent/Child Field has no value so use parent's value
 				else
-				{
+				{	
-
+					hwnd.Text = nd.InnerText;   // set the field's text from XML
-					hwnd.Text = Regex.Replace(nd.InnerText, @"\\u([0-9]{1,4})\?", m => Convert.ToChar(int.Parse(m.Groups[1].Value)).ToString());   // set the field's text from XML
-					Size size = hwnd.Size;
 
 					// check if this window has a button name as part of its tag. If
 					// so it's a combo type & the radio button/visibility may need to
@@ -576,7 +546,7 @@ namespace ctlXMLEditLib
 			// height/width data of the image.
 			if (GraphicsFiletextbox != null && GraphicsFiletextbox.Text != "") UpdateHtWd();
 		}
-		public roRichTextBox GetGraphicsFiletextbox()
+		public TextBox GetGraphicsFiletextbox()
 		{
 			return GraphicsFiletextbox;
 		}
@@ -615,13 +585,13 @@ namespace ctlXMLEditLib
 		{
 			dosaveflag=false;
 			mysavexml=false;
-			roRichTextBox hwnd;
+			TextBox hwnd;
 			// first, clear out all of the text boxes.
 
 			foreach (string str in myHT.Keys)
 			{
 				object o = myHT[str];
-				hwnd = (roRichTextBox) o;
+				hwnd = (TextBox) o;
 				hwnd.Text = "";
 				TextBoxAttrTag tag = (TextBoxAttrTag) hwnd.Tag;
 				RadioButton radio;
@@ -653,7 +623,7 @@ namespace ctlXMLEditLib
 		//          to the parent's value, then clear the child's textbox so that nothing is saved
 		//          to the database.  This allow us to know that a specific value was not set
 		//          for this Parent/Child child
-		private void RemovePCChildTextIfSameAsParent(XmlNode node, roRichTextBox tb, string chldName)
+		private void RemovePCChildTextIfSameAsParent(XmlNode node, TextBox tb, string chldName)
 		{
 			XmlNode parentNode = null;
 			// if this is a child node get the parent's value
@@ -690,35 +660,18 @@ namespace ctlXMLEditLib
 		// true if success, false if fail.
 		// Note that the Parent and Child XML node variables below are not coding for Parent/Child Applicabily Fields
 		public bool SaveData()
-		
 		{
 			if (mysavexml) 
 			{				
-				roRichTextBox hwnd;
+				TextBox hwnd;
 				TextBoxAttrTag tag;
 				string imgdate;
 
 				//go thru the hash table to get textboxes. Find the ones that have text.
-				foreach (string str in myHT.Keys)  // RO Editor add symbols C2022 - 003
+				foreach (string str in myHT.Keys)
 				{
 					object o = myHT[str];
-					hwnd = (roRichTextBox) o;
+					hwnd = (TextBox) o;
-
-					StringBuilder result1 = new StringBuilder();
-					char[] chrAry = hwnd.Text.ToCharArray();
-					foreach (int chr in chrAry)
-					{
-						if (chr > 166)
-						{
-							result1.Append($"\\u{(int)chr}?");
-						}
-						else
-						{
-							result1.Append((char)chr);
-						}
-					}
-					hwnd.Text = result1.ToString();
-
 					imgdate = null;
 					// if this is a required field and there is no text, put out an error
 					// message and get out of here.
@@ -835,7 +788,6 @@ namespace ctlXMLEditLib
 			return (false);
 		}
 
-
 		#region Component Designer generated code
 		/// <summary>
 		/// Required method for Designer support - do not modify 
@@ -906,7 +858,7 @@ namespace ctlXMLEditLib
 		//  'normalizedString') or a multiline text box(type is 'string'). Also, a radio 
 		//  button is passed in if this was called to handle an element within a combo type.
 		//  This button is saved for a given text box so that initialization of these combo types can occur.
-		private string DisplayXmlSchemaSimpleType(XmlSchemaSimpleType simpleType, roRichTextBox mytextbox, RadioButton radio, 
+		private string DisplayXmlSchemaSimpleType(XmlSchemaSimpleType simpleType, TextBox mytextbox, RadioButton radio, 
 			bool img, string imgname)
 		{
 			// set up for text box tag, which stores whether field is required and
@@ -936,17 +888,12 @@ namespace ctlXMLEditLib
 						if (getannot.IndexOf("Lines")>=0)
 						{
 							GraphicsHttextbox = mytextbox;
-							
-							Size size = GraphicsHttextbox.Size;
 							mytextbox.LostFocus += new System.EventHandler(this.GraphicsHt_lostfocus);
-
 						}
 						if (getannot.IndexOf("Character")>=0)
 						{
 							GraphicsWdtextbox = mytextbox;
-							
 							mytextbox.LostFocus += new System.EventHandler(this.GraphicsWd_lostfocus);
-							
 						}
 					}
 				}
@@ -957,17 +904,14 @@ namespace ctlXMLEditLib
 			{
 				// A Schema Type Restriction is used to define single or multi-line boxes.
 				XmlSchemaSimpleTypeRestriction myRestrictions = (XmlSchemaSimpleTypeRestriction) simpleType.Content;
-				if (myRestrictions.BaseTypeName.Name == "normalizedString")
+				if (myRestrictions.BaseTypeName.Name == "normalizedString") 
-				{
 					mytextbox.Multiline = false;
-					mytextbox.Size = new Size(300, 40);
-				}
 				else
 				{
 					mytextbox.Multiline = true;
-					mytextbox.AcceptsTab = true;
+					mytextbox.AcceptsReturn = true;
 					mytextbox.Height = (int) mytextbox.Font.GetHeight() * 4;
-					mytextbox.ScrollBars = RichTextBoxScrollBars.Vertical;
+					mytextbox.ScrollBars = ScrollBars.Vertical;
 					zmtooltip.SetToolTip(mytextbox, "Press Shift F2 To Zoom");
 				}
 
@@ -1048,8 +992,7 @@ namespace ctlXMLEditLib
 			radio.CheckedChanged += new System.EventHandler(this.radiocheckchg);
 			gbox.Controls.Add(radio);
 
-			roRichTextBox tb = new roRichTextBox();
+			TextBox tb = new TextBox();
-			Size size3 = tb.Size;
 			tb.Location = new Point(boxx+20, y+25);
 			if (!first) tb.Visible = false;
 			myHT.Add(element.Name,tb);
@@ -1058,7 +1001,7 @@ namespace ctlXMLEditLib
 			// the groupbox.
 			Controls.Add(tb);
 			tb.TextChanged += new System.EventHandler(this.textbox_change);
-			tb.GotFocus += new System.EventHandler(this.currentTextBox);
+			tb.GotFocus += new System.EventHandler(this.textbox_zoombtn);
 			tb.KeyDown += new KeyEventHandler(MyOnKeyDown);
 			gbox.Contains(tb);
 			// the following will set attributes on the text boxes such as maxlength, multiline, etc.
@@ -1201,9 +1144,8 @@ namespace ctlXMLEditLib
 			}
 			else
 			{
-				roRichTextBox mytextbox;
+				TextBox mytextbox;
-				mytextbox = new roRichTextBox();
+				mytextbox = new TextBox();
-				Size size3 = mytextbox.Size;
 				mytextbox.Location = new Point(screenx+indent, screeny);
 				string tFieldName = (pcChildIdx == 0) ? CvtUserFldToFld(element.Name) : CvtUserFldToFld(pcChildFldName);
 				mytextbox.Name = tFieldName;
@@ -1213,7 +1155,7 @@ namespace ctlXMLEditLib
 				screeny = screeny + 10;
 				mytextbox.TextChanged += new System.EventHandler(this.textbox_change);
 				mytextbox.Validating += new System.ComponentModel.CancelEventHandler(this.textbox_Validating);
-				mytextbox.GotFocus += new System.EventHandler(this.currentTextBox);
+				mytextbox.GotFocus += new System.EventHandler(this.textbox_zoombtn);
 				mytextbox.KeyDown += new KeyEventHandler(MyOnKeyDown);
 				if (pcChildIdx > 0)
 				{
@@ -1250,18 +1192,9 @@ namespace ctlXMLEditLib
 		// the following is needed to load the control.
 		private void ctlXMLEdit_Load(object sender, System.EventArgs e)
 		{
-
+		
 		}
-
+		
-
-		public delegate void ctlXMLEditEvent(object sender, ctlXMLEditEventArgs args); // RO Editor add symbols C2022 - 003 for turning off symbols btn for RO ID field.
-		public event ctlXMLEditEvent EnableDisableSymbolsBtn;
-		private void OnEnableDisableSymbolsBtn(ctlXMLEditEventArgs args)
-		{
-			if (EnableDisableSymbolsBtn != null)
-				EnableDisableSymbolsBtn(this, args);
-		}
-
 		// when data in a text box has changed, flag it (except for when this
 		// happens during loading of original data). This flag will be used
 		// later to know whether to save data.
@@ -1277,7 +1210,7 @@ namespace ctlXMLEditLib
 		//           When leaving the textbox
 		private void txtBox_Leave(object sender, EventArgs e)
 		{
-			roRichTextBox tb = sender as roRichTextBox;
+			TextBox tb = sender as TextBox;
 			string dfTxt = "";
 			try
 			{
@@ -1286,7 +1219,7 @@ namespace ctlXMLEditLib
 				{
 					object o = myHT[parentid];
 					if (o != null)
-						dfTxt = (o as roRichTextBox).Text; // set to use the parent's value (default)				
+						dfTxt = (o as TextBox).Text; // set to use the parent's value (default)				
 				}
 				else
                 {
@@ -1294,7 +1227,7 @@ namespace ctlXMLEditLib
 					string parName = pcGrpBox.Name.Substring(5);
 					object o = myHT[parName];
 					if (o != null)
-						dfTxt = (o as roRichTextBox).Text; // set to use the parent's value (default)
+						dfTxt = (o as TextBox).Text; // set to use the parent's value (default)
 				}
 			}
             catch 
@@ -1302,7 +1235,7 @@ namespace ctlXMLEditLib
 				string parName = pcGrpBox.Name.Substring(5);
 				object o = myHT[parName];
 				if (o != null)
-					dfTxt = (o as roRichTextBox).Text; // set to use the parent's value (default)
+					dfTxt = (o as TextBox).Text; // set to use the parent's value (default)
 			}
 
 			if (dosaveflag) mysavexml = true;
@@ -1318,7 +1251,7 @@ namespace ctlXMLEditLib
 		//           so clear the textbox so that user can enter the value for that child
 		private void txtBox_Enter(object sender, EventArgs e)
 		{
-			roRichTextBox tb = sender as roRichTextBox;
+			TextBox tb = sender as TextBox;
 			if (tb.ForeColor == SystemColors.GrayText) // currently no value set - using parent's value
 			{
 				tb.Text = "";
@@ -1331,7 +1264,7 @@ namespace ctlXMLEditLib
 		private void radiocheckchg(object sender, System.EventArgs e)
 		{
 			RadioButton btnsel = (RadioButton) sender;
-			roRichTextBox assocbox;
+			TextBox assocbox;
 			string btntext, str;
 
 			if(dosaveflag)mysavexml = true;
@@ -1344,7 +1277,7 @@ namespace ctlXMLEditLib
 			str = btnsel.Name.Replace(btntext,"");
 			object o = myHT[str];
 			if (o == null) return;
-			assocbox = (roRichTextBox) o;
+			assocbox = (TextBox) o;
 			// make the text box visible if checked, otherwise, invisible
 			assocbox.Visible = btnsel.Checked;
 			// C2021-026 show or hide the Parent/Child appicability group box
@@ -1366,7 +1299,7 @@ namespace ctlXMLEditLib
 								c.Visible = vsblState; // show or hide the lable inside the group box
 								object oo = myHT[c.Name];
 								if (oo != null)
-									(oo as roRichTextBox).Visible = vsblState; // show or hide the associated text box
+									(oo as TextBox).Visible = vsblState; // show or hide the associated text box
 							}
 					}
 				}
@@ -1458,7 +1391,7 @@ namespace ctlXMLEditLib
 
 		// The following can be used to validate the text, i.e. check the text against
 		// the pattern. this needs written yet (5/16/02)
-		private void MyValidatingCode(roRichTextBox tb)
+		private void MyValidatingCode(TextBox tb)
 		{
 			//get the text box's tag which contains a flag for whether this is required &
 			//if it has a pattern. If it has a pattern, validate the field against the pattern.
@@ -1487,33 +1420,20 @@ namespace ctlXMLEditLib
 		}
 
 		// save which box we're on, for zoom processing.
-		private void currentTextBox(object sender, System.EventArgs e)
+		private void textbox_zoombtn(object sender, System.EventArgs e)
 		{
-			roRichTextBox textbox = (roRichTextBox) sender;
+			TextBox textbox = (TextBox) sender;
 			if (textbox.Multiline == true || textbox == GraphicsFiletextbox) 
 				zoomtextbox = textbox;
 			else
 				zoomtextbox = null;
-
-			TextBoxFocus = textbox;
-
-			string RO_IDENDITY = RO_IDEN.Substring(1, RO_IDEN.Length - 2); // RO Editor add symbols C2022 - 003 for turning off symbols btn for RO ID.
-			if (textbox.Name == RO_IDENDITY)
-			{
-				OnEnableDisableSymbolsBtn(new ctlXMLEditEventArgs(DisplaySymBolBtn:false));
-			}
-			else
-			{
-				OnEnableDisableSymbolsBtn(new ctlXMLEditEventArgs(DisplaySymBolBtn:true));
-			}
-
 		}
 
 		private void textbox_Validating(object sender, System.ComponentModel.CancelEventArgs e)
 		{ 
 			try
 			{
-				MyValidatingCode((roRichTextBox) sender);
+				MyValidatingCode((TextBox) sender);
 			}
 
 			catch(Exception ex)
@@ -1539,18 +1459,11 @@ namespace ctlXMLEditLib
 				}
 				btnZoom_click(null, null);
 			}
-			if (Clipboard.GetDataObject().GetDataPresent(DataFormats.Text))
-			{
-				if (((kea.Modifiers & Keys.ControlKey) == Keys.ControlKey) && kea.KeyCode == Keys.V)
-				{
-					roRichTextBox o = (roRichTextBox)objSender;
-					o.rchtxtBox_KeyDown(objSender, RO_IDEN);
-				}
-			}
 		}
-
+		
 		public void btnZoom_click(object sender, System.EventArgs e)
 		{
+			//TextBox tb = (TextBox) sender;
 			TextBoxAttrTag tag;
 			bool doimage = false;
 			if (zoomtextbox.Tag != null)
@@ -1594,7 +1507,7 @@ namespace ctlXMLEditLib
 		// file local & keep width/height of file proportional.
 		private void GraphicText_lostfocus(object sender, System.EventArgs e)
 		{
-			roRichTextBox fnamebox = (roRichTextBox) sender;
+			TextBox fnamebox = (TextBox) sender;
 			if (fnamebox.Text != "" && fnamebox.Modified == true)
 			{
 				FileInfo ifi = new FileInfo(fnamebox.Text);
@@ -1803,7 +1716,7 @@ namespace ctlXMLEditLib
 		// if changed height, calculate associated width
 		private void GraphicsHt_lostfocus(object sender, System.EventArgs e)
 		{
-			roRichTextBox ht = (roRichTextBox) sender;
+			TextBox ht = (TextBox) sender;
 			if (ht.Modified == true)
 			{
 				try
@@ -1820,7 +1733,7 @@ namespace ctlXMLEditLib
 		// if changed width, calculate associated height
 		private void GraphicsWd_lostfocus(object sender, System.EventArgs e)
 		{
-			roRichTextBox wd = (roRichTextBox) sender;
+			TextBox wd = (TextBox) sender;
 			if (wd.Modified == true)
 			{
 				try
@@ -1975,7 +1888,7 @@ namespace ctlXMLEditLib
 	 * and overload a couple of it's functions in order to use it.
 	 * - called in CalculatePromsDate() above.
 	 */ 
-	public class ThisTimeZone : TimeZone
+		public class ThisTimeZone : TimeZone
 	{
 		private TimeZone curTZ;
 		public TimeSpan SpanTZ;
@@ -2016,31 +1929,5 @@ namespace ctlXMLEditLib
 			return curTZ.GetDaylightChanges(year);
 		}
 	}
-
-	public class ctlXMLEditEventArgs : EventArgs // RO Editor add symbols C2022 - 003 for turning off symbols btn for RO ID.
-	{
-		public ctlXMLEditEventArgs() {; }
-		public ctlXMLEditEventArgs(bool DisplaySymBolBtn)
-		{
-			_DisplaySymBolBtn = DisplaySymBolBtn;
-		}
-		private bool _DisplaySymBolBtn;
-
-		public bool DisplaySymBolBtn
-		{
-			get { return _DisplaySymBolBtn; }
-			set { _DisplaySymBolBtn = value; }
-		}
-	}
-
-	public enum E_FontStyle : byte
-	{
-		FS_NONE = 0,
-		FS_BOLD = 0x01,
-		FS_UNDERLINE = 0x02,
-		FS_ITALIC = 0x04,
-		FS_SUPERSCRIPT = 0x08,
-		FS_SUBSCRIPT = 0x10
-	}
 }
 

PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEditLib.csproj

@@ -126,9 +126,6 @@
     <Reference Include="System.Xml">
       <Name>System.XML</Name>
     </Reference>
-    <Reference Include="Volian.Base.Library">
-      <HintPath>..\..\..\Volian.Base.Library\bin\Debug\Volian.Base.Library.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs">
@@ -140,12 +137,6 @@
     <Compile Include="ImageDialog.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="roRichTextBox.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="roRichTextBox.Designer.cs">
-      <DependentUpon>roRichTextBox.cs</DependentUpon>
-    </Compile>
     <Compile Include="ZoomDialog.cs">
       <SubType>Form</SubType>
     </Compile>

PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/roRichTextBox.Designer.cs

@@ -1,40 +0,0 @@
-
-namespace ctlXMLEditLib
-{
-	partial class roRichTextBox
-	{
-		/// <summary> 
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary> 
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-			{
-				components.Dispose();
-			}
-			base.Dispose(disposing);
-		}
-
-		#region Component Designer generated code
-
-		/// <summary> 
-		/// Required method for Designer support - do not modify 
-		/// the contents of this method with the code editor.
-		/// </summary>
-		System.Windows.Forms.AutoScaleMode AutoScaleMode;
-		private void InitializeComponent()
-		{
-		
-		components = new System.ComponentModel.Container();
-		this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-		}
-
-		#endregion
-	}
-}

PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/roRichTextBox.cs

@@ -1,100 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using Volian.Base.Library;
-
-namespace ctlXMLEditLib
-{
-	public partial class roRichTextBox : RichTextBox  // C2022-003 Symbols in RO Editor.  Customized RichTextBox for RO Editor.
-	{
-		public roRichTextBox()
-		{
-			InitializeComponent();
-		}
-		private string _RtfPrefix;  // contains Font table and styles (bold/underline/italics) for rtb from step style
-		public string RtfPrefixForSymbols
-		{
-			get
-			{
-				//B2020-100 RHM Use SelectionFont rather than the font from the format file.
-				StringBuilder selectedRtfSB = new StringBuilder();
-				AddFontTable(selectedRtfSB, FormatFont, true);
-				_RtfPrefix = selectedRtfSB.ToString();
-				return _RtfPrefix + @"\f1\fs" + 10 * 2 + " ";
-			}
-		}
-		public void InsertSymbol( int symbcode)
-		{
-			int position = this.SelectionStart;
-			string sym = string.Format(symbcode < 256 ? "\'{0:X2}" : @"\u{0}", symbcode);
-			this.SelectedRtf = RtfPrefixForSymbols + sym + @"}";
-			Select(position, -1);
-			Select(position + 1, 0);
-		}
-		public void rchtxtBox_KeyDown(object sender,string RO_IDEN) // C2022-003 code used to prevent a symbol from being inserted into RO ID.
-		{
-			bool symFlg = false;
-
-			roRichTextBox o = (roRichTextBox)sender;
-			if (o.Name == RO_IDEN)
-			{
-				if (Clipboard.GetDataObject().GetDataPresent(DataFormats.Text))
-				{
-					string clpBrd = Clipboard.GetText();
-					if (clpBrd.Any(c => c > 166))
-					{
-						MessageBox.Show("Symbols are not allowed in the field. Clipbroad: '" + clpBrd + "'");
-						Clipboard.Clear();
-					}
-				}
-			}
-		}
-		private static void AddFontTable(StringBuilder selectedRtfSB, Font myFont, bool isFixed)
-		{
-			StringBuilder sbbeg = new StringBuilder();
-			StringBuilder sbend = new StringBuilder();
-			if (myFont.Bold)
-			{
-				sbbeg.Append(@"\b");
-				sbend.Append(@"\b0");
-			}
-			if (myFont.Underline)
-			{
-				sbbeg.Append(@"\ul");
-				sbend.Insert(0, @"\ulnone");
-			}
-			if (myFont.Italic)
-			{
-				sbbeg.Append(@"\i");
-				sbend.Insert(0, @"\i0");
-			}
-				// RO Editor add symbols C2022-003
-			selectedRtfSB.Append(@"{\rtf1\ansi\ansicpg1252\deff0\deflang1033{\fonttbl{\f0\fnil\fcharset2 " + myFont.FontFamily.Name + @";}"); 
-				selectedRtfSB.Append(@"{\f1\fnil\fcharset0 FreeMono;}}{\colortbl ;\red255\green0\blue0;\red0\green0\blue255;}");  // FreeMono is now used for symbols display. 
-			selectedRtfSB.Append("\r\n");
-			selectedRtfSB.Append(@"\viewkind4\uc1\pard" + sbbeg.ToString() + @"\fs" + Convert.ToInt32(myFont.SizeInPoints * 2).ToString() + @" "); 
-		}
-		private Font _FormatFont;
-		public Font FormatFont
-		{
-			get
-			{
-				if (_FormatFont == null)
-				{
-					Font formatFont;
-					formatFont = Font;
-					_FormatFont = formatFont;
-				}
-				return _FormatFont;
-			}
-			set { _FormatFont = value; }
-		}
-	}
-}
-

PROMS/VEPROMS User Interface/PROMSFixes.Sql

@@ -1643,7 +1643,11 @@ Begin
 		Select Cast(i.LastChanged as varbinary(8)) as 'ILastChanged',
 			i.ItemID as 'ItemID',
 			zi.VersionID as 'VersionID',
-			zi.PPath +
+			CASE WHEN c.[Type] % 20000 = 6 THEN REPLACE(zi.PPath,'Note','Caution')
+			     WHEN c.[Type] % 20000 = 7 THEN REPLACE(zi.PPath,'Caution','Note')
+			     ELSE zi.PPath 
+			    END
+			+
 			Case (c.[Type]/10000)
 				When 0 Then @Delim + @UnitPrefix + IsNull(c.Number,'') + @DelimNumber + IsNull(c.Text,'') -- Procedure
 				When 1 Then @Delim + IsNull(c.Number,'') + @DelimNumber + IsNull(c.Text,'') -- Section
@@ -24529,6 +24533,51 @@ GO
 PRINT 'Added IX_tblROUsagesRODbIDDeleteStatusROID Index.  Speeds up RO queries'
 GO
 
+
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[GetCurrentApprovedRevisions]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
+	DROP PROCEDURE [GetCurrentApprovedRevisions];
+
+GO
+
+/****** Object:  StoredProcedure [dbo].[GetCurrentApprovedRevisions]    Script Date: 02/05/2026 7:54:42 AM ******/
+
+-- =============================================
+-- Author:		Matthew Schill
+-- Create date: 02/05/2026
+-- Description:	Gets all current approved revisions
+-- =============================================
+CREATE PROCEDURE [dbo].[GetCurrentApprovedRevisions]
+(
+	@ItemID AS bigint
+)
+AS
+BEGIN
+
+		select max(rr.revisionid) revisionid, UnitId, UnitVal.name UnitName, max(rr.DTS) DTS
+		from items ii
+		inner join revisions rr on ii.itemid = rr.itemid
+		inner join versions vv on rr.revisionid = vv.revisionid
+		inner join stages ss on vv.stageid = ss.stageid
+		outer apply 
+		(Select UnitId = r1.value('@Index','int') FROM rr.config.nodes('Config/Applicability') t1(r1)) App
+		left outer join
+		(select  r1.value('@index','int') indx
+		,r1.value('@Name','varchar') name
+		from (select *,cast(config as xml) xconfig from DocVersions 
+		where ItemID in(select itemID from vefn_AllSiblingItems(@ItemID))) SDV
+		cross apply
+		xconfig.nodes('Config/Slaves/Slave') t1(r1)) UnitVal ON UnitVal.indx = UnitId
+		where ss.isapproved = 1
+		and ii.itemid = @ItemID
+		group by UnitId, UnitVal.name
+
+	RETURN
+END
+
+IF (@@Error = 0) PRINT 'Procedure Creation: [GetCurrentApprovedRevisions] Succeeded'
+ELSE PRINT 'Procedure Creation: [GetCurrentApprovedRevisions] Error on Creation'
+GO
+
 /*
   ---------------------------------------------------------------------------
   |                       ADD New Code Before this Block                    |
@@ -24562,8 +24611,8 @@ BEGIN TRY -- Try Block
 	DECLARE @RevDate varchar(255)
 	DECLARE @RevDescription varchar(255)
 
-	set @RevDate = '01/19/2026 5:00 PM'
+	set @RevDate = '02/09/2026 7:00 AM'
-	set @RevDescription = 'Sync tree list Sort order between in RO Editor and PROMS'
+	set @RevDescription = 'Added procedure for getting current revisions'
 
 	Select  cast(@RevDate as datetime) RevDate, @RevDescription  RevDescription
 	PRINT 'SQL Code Revision ' + @RevDate + ' - ' + @RevDescription

PROMS/VEPROMS User Interface/dlgManageSecurity.cs

@@ -216,7 +216,7 @@ namespace VEPROMS
 				MembershipInfo mi = (MembershipInfo)lstMembers.SelectedItem;
 				string selectedUserID = mi.MyUserUserID;
 				string msg = "Are you sure you want to remove this Group Member?";
-				if (MessageBox.Show(this, msg, "Confirm Group Member Removal", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question) == DialogResult.Yes)
+				if (MessageBox.Show(this, msg, "Confirm Group Member Removal", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
 				{
 					if (mi.MyGroup.GroupName == "Administrators" && mi.MyGroup.GroupMemberships.Count(mm => mm.EndDate == null || mm.EndDate == string.Empty) == 1)
 					{
@@ -255,7 +255,7 @@ namespace VEPROMS
 				MessageBox.Show("There are still users who are members of this group.  You need to delete all members in order to delete this group.", "Group Has Members", MessageBoxButtons.OK, MessageBoxIcon.Warning);
 				return;
 			}
-			if (MessageBox.Show("Are you sure you want to delete this group?", "Confirm Deleting Group", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question) == DialogResult.Yes)
+			if (MessageBox.Show("Are you sure you want to delete this group?", "Confirm Deleting Group", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
 			{
 				Group.Delete(gi.GID);
 				LoadRefreshGroupUsers();
@@ -397,7 +397,7 @@ namespace VEPROMS
 			}
 			int nummemberships = ui.UserMemberships.Count(mi => mi.EndDate == null || mi.EndDate == string.Empty);
 			string mem_text = nummemberships > 0 ? "\r\nNote that this will remove all memberships that this user has." : "";
-			if (MessageBox.Show($"Are you sure you want to delete this user?{mem_text}", "Confirm Deleting User", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question) == DialogResult.Yes)
+			if (MessageBox.Show($"Are you sure you want to delete this user?{mem_text}", "Confirm Deleting User", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
 			{
 				foreach (MembershipInfo minfo in ui.UserMemberships.Where(mi => mi.EndDate == null || mi.EndDate == string.Empty))
                 {
@@ -477,7 +477,7 @@ namespace VEPROMS
 		{
 			MembershipInfo mi = (MembershipInfo)lstGroups.SelectedItem;
 			string msg = "Are you sure you want to remove this Group Member?";
-			if (MessageBox.Show(this, msg, "Confirm Group Member Removal", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question) == DialogResult.Yes)
+			if (MessageBox.Show(this, msg, "Confirm Group Member Removal", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
 			{
                 if (mi.MyGroup.GroupName == "Administrators" && mi.MyGroup.GroupMemberships.Count(mm => mm.EndDate == null || mm.EndDate == string.Empty) == 1)
                 {

PROMS/VEPROMS User Interface/dlgSetChangeBarStartDate.Designer.cs

@@ -28,142 +28,158 @@
 		/// </summary>
 		private void InitializeComponent()
 		{
-			this.btnOK = new DevComponents.DotNetBar.ButtonX();
+            this.btnOK = new DevComponents.DotNetBar.ButtonX();
-			this.btnCancel = new DevComponents.DotNetBar.ButtonX();
+            this.btnCancel = new DevComponents.DotNetBar.ButtonX();
-			this.label1 = new System.Windows.Forms.Label();
+            this.label1 = new System.Windows.Forms.Label();
-			this.superTooltip1 = new DevComponents.DotNetBar.SuperTooltip();
+            this.superTooltip1 = new DevComponents.DotNetBar.SuperTooltip();
-			this.dateTimeInput1 = new DevComponents.Editors.DateTimeAdv.DateTimeInput();
+            this.dateTimeInput1 = new DevComponents.Editors.DateTimeAdv.DateTimeInput();
-			this.btnNow = new DevComponents.DotNetBar.ButtonX();
+            this.btnNow = new DevComponents.DotNetBar.ButtonX();
-			((System.ComponentModel.ISupportInitialize)(this.dateTimeInput1)).BeginInit();
+            this.btnResetToApproved = new DevComponents.DotNetBar.ButtonX();
-			this.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dateTimeInput1)).BeginInit();
-			// 
+            this.SuspendLayout();
-			// btnOK
+            // 
-			// 
+            // btnOK
-			this.btnOK.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            // 
-			this.btnOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.btnOK.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
-			this.btnOK.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.btnOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-			this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK;
+            this.btnOK.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-			this.btnOK.Location = new System.Drawing.Point(18, 111);
+            this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK;
-			this.btnOK.Name = "btnOK";
+            this.btnOK.Location = new System.Drawing.Point(18, 111);
-			this.btnOK.Size = new System.Drawing.Size(64, 23);
+            this.btnOK.Name = "btnOK";
-			this.btnOK.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnOK.Size = new System.Drawing.Size(64, 23);
-			this.btnOK.TabIndex = 1;
+            this.btnOK.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-			this.btnOK.Text = "OK";
+            this.btnOK.TabIndex = 1;
-			this.btnOK.Click += new System.EventHandler(this.btnOK_Click);
+            this.btnOK.Text = "OK";
-			// 
+            this.btnOK.Click += new System.EventHandler(this.btnOK_Click);
-			// btnCancel
+            // 
-			// 
+            // btnCancel
-			this.btnCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            // 
-			this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
-			this.btnCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.btnCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-			this.btnCancel.Location = new System.Drawing.Point(179, 111);
+            this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.btnCancel.Name = "btnCancel";
+            this.btnCancel.Location = new System.Drawing.Point(179, 111);
-			this.btnCancel.Size = new System.Drawing.Size(64, 23);
+            this.btnCancel.Name = "btnCancel";
-			this.btnCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnCancel.Size = new System.Drawing.Size(64, 23);
-			this.btnCancel.TabIndex = 2;
+            this.btnCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-			this.btnCancel.Text = "Cancel";
+            this.btnCancel.TabIndex = 2;
-			// 
+            this.btnCancel.Text = "Cancel";
-			// label1
+            // 
-			// 
+            // label1
-			this.label1.AutoSize = true;
+            // 
-			this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.label1.AutoSize = true;
-			this.label1.Location = new System.Drawing.Point(3, 19);
+            this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.label1.Name = "label1";
+            this.label1.Location = new System.Drawing.Point(3, 19);
-			this.label1.Size = new System.Drawing.Size(229, 15);
+            this.label1.Name = "label1";
-			this.label1.TabIndex = 3;
+            this.label1.Size = new System.Drawing.Size(229, 15);
-			this.label1.Text = "Show Change Bars on Changes Starting:";
+            this.label1.TabIndex = 3;
-			// 
+            this.label1.Text = "Show Change Bars on Changes Starting:";
-			// superTooltip1
+            // 
-			// 
+            // superTooltip1
-			this.superTooltip1.DefaultTooltipSettings = new DevComponents.DotNetBar.SuperTooltipInfo("", "", "", null, null, DevComponents.DotNetBar.eTooltipColor.Gray);
+            // 
-			this.superTooltip1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
+            this.superTooltip1.DefaultTooltipSettings = new DevComponents.DotNetBar.SuperTooltipInfo("", "", "", null, null, DevComponents.DotNetBar.eTooltipColor.Gray);
-			// 
+            this.superTooltip1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
-			// dateTimeInput1
+            // 
-			// 
+            // dateTimeInput1
-			// 
+            // 
-			// 
+            // 
-			// 
+            // 
-			this.dateTimeInput1.BackgroundStyle.Class = "DateTimeInputBackground";
+            // 
-			this.dateTimeInput1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.dateTimeInput1.BackgroundStyle.Class = "DateTimeInputBackground";
-			this.dateTimeInput1.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown;
+            this.dateTimeInput1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.dateTimeInput1.ButtonDropDown.Visible = true;
+            this.dateTimeInput1.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown;
-			this.dateTimeInput1.CustomFormat = "MM/dd/yyyy HH:mm:ss";
+            this.dateTimeInput1.ButtonDropDown.Visible = true;
-			this.dateTimeInput1.DateTimeSelectorVisibility = DevComponents.Editors.DateTimeAdv.eDateTimeSelectorVisibility.DateSelector;
+            this.dateTimeInput1.CustomFormat = "MM/dd/yyyy HH:mm:ss";
-			this.dateTimeInput1.Format = DevComponents.Editors.eDateTimePickerFormat.Custom;
+            this.dateTimeInput1.DateTimeSelectorVisibility = DevComponents.Editors.DateTimeAdv.eDateTimeSelectorVisibility.DateSelector;
-			this.dateTimeInput1.IsPopupCalendarOpen = false;
+            this.dateTimeInput1.Format = DevComponents.Editors.eDateTimePickerFormat.Custom;
-			this.dateTimeInput1.Location = new System.Drawing.Point(30, 51);
+            this.dateTimeInput1.IsPopupCalendarOpen = false;
-			// 
+            this.dateTimeInput1.Location = new System.Drawing.Point(30, 51);
-			// 
+            // 
-			// 
+            // 
-			// 
+            // 
-			// 
+            // 
-			// 
+            // 
-			this.dateTimeInput1.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
-			this.dateTimeInput1.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1);
+            this.dateTimeInput1.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.dateTimeInput1.MonthCalendar.ClearButtonVisible = true;
+            this.dateTimeInput1.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1);
-			// 
+            this.dateTimeInput1.MonthCalendar.ClearButtonVisible = true;
-			// 
+            // 
-			// 
+            // 
-			this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2;
+            // 
-			this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90;
+            this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2;
-			this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
+            this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90;
-			this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
-			this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder;
+            this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1;
+            this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder;
-			this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1;
-			this.dateTimeInput1.MonthCalendar.DisplayMonth = new System.DateTime(2016, 2, 1, 0, 0, 0, 0);
+            this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			// 
+            this.dateTimeInput1.MonthCalendar.DisplayMonth = new System.DateTime(2016, 2, 1, 0, 0, 0, 0);
-			// 
+            // 
-			// 
+            // 
-			this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
+            // 
-			this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90;
+            this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
-			this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
+            this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90;
-			this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
-			this.dateTimeInput1.MonthCalendar.TodayButtonVisible = true;
+            this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.dateTimeInput1.Name = "dateTimeInput1";
+            this.dateTimeInput1.MonthCalendar.TodayButtonVisible = true;
-			this.dateTimeInput1.Size = new System.Drawing.Size(146, 20);
+            this.dateTimeInput1.Name = "dateTimeInput1";
-			this.dateTimeInput1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.dateTimeInput1.Size = new System.Drawing.Size(146, 20);
-			this.superTooltip1.SetSuperTooltip(this.dateTimeInput1, new DevComponents.DotNetBar.SuperTooltipInfo("Change Bar Start Date", "", "Only the changes made after this date will have change bars.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(138, 67)));
+            this.dateTimeInput1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-			this.dateTimeInput1.TabIndex = 4;
+            this.superTooltip1.SetSuperTooltip(this.dateTimeInput1, new DevComponents.DotNetBar.SuperTooltipInfo("Change Bar Start Date", "", "Only the changes made after this date will have change bars.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(138, 67)));
-			this.dateTimeInput1.TimeSelectorTimeFormat = DevComponents.Editors.DateTimeAdv.eTimeSelectorFormat.Time24H;
+            this.dateTimeInput1.TabIndex = 4;
-			this.dateTimeInput1.TimeSelectorType = DevComponents.Editors.DateTimeAdv.eTimeSelectorType.TouchStyle;
+            this.dateTimeInput1.TimeSelectorTimeFormat = DevComponents.Editors.DateTimeAdv.eTimeSelectorFormat.Time24H;
-			// 
+            this.dateTimeInput1.TimeSelectorType = DevComponents.Editors.DateTimeAdv.eTimeSelectorType.TouchStyle;
-			// btnNow
+            // 
-			// 
+            // btnNow
-			this.btnNow.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            // 
-			this.btnNow.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.btnNow.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
-			this.btnNow.Location = new System.Drawing.Point(182, 51);
+            this.btnNow.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-			this.btnNow.Name = "btnNow";
+            this.btnNow.Location = new System.Drawing.Point(182, 51);
-			this.btnNow.Size = new System.Drawing.Size(49, 23);
+            this.btnNow.Name = "btnNow";
-			this.btnNow.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnNow.Size = new System.Drawing.Size(49, 23);
-			this.superTooltip1.SetSuperTooltip(this.btnNow, new DevComponents.DotNetBar.SuperTooltipInfo("Now", "", "This will set the Change Bar Start date to today.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+            this.btnNow.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-			this.btnNow.TabIndex = 5;
+            this.superTooltip1.SetSuperTooltip(this.btnNow, new DevComponents.DotNetBar.SuperTooltipInfo("Now", "", "This will set the Change Bar Start date to today.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
-			this.btnNow.Text = "Today";
+            this.btnNow.TabIndex = 5;
-			this.btnNow.Click += new System.EventHandler(this.btnNow_Click);
+            this.btnNow.Text = "Today";
-			// 
+            this.btnNow.Click += new System.EventHandler(this.btnNow_Click);
-			// dlgSetChangeBarStartDate
+            // 
-			// 
+            // btnResetToApproved
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            // 
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.btnResetToApproved.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
-			this.ClientSize = new System.Drawing.Size(268, 144);
+            this.btnResetToApproved.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-			this.Controls.Add(this.btnNow);
+            this.btnResetToApproved.Location = new System.Drawing.Point(30, 77);
-			this.Controls.Add(this.dateTimeInput1);
+            this.btnResetToApproved.Name = "btnResetToApproved";
-			this.Controls.Add(this.label1);
+            this.btnResetToApproved.Size = new System.Drawing.Size(201, 23);
-			this.Controls.Add(this.btnCancel);
+            this.btnResetToApproved.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-			this.Controls.Add(this.btnOK);
+            this.btnResetToApproved.TabIndex = 6;
-			this.DoubleBuffered = true;
+            this.btnResetToApproved.Text = "Reset Change Bar To Approved Date";
-			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+            this.btnResetToApproved.Tooltip = "Reset Change Bar to the last approved date. If no approvals, reset to as if no ch" +
-			this.MaximizeBox = false;
+    "ange bar date. After selecting this, press OK to save.";
-			this.MinimizeBox = false;
+            this.btnResetToApproved.Click += new System.EventHandler(this.btnResetToApproved_Click);
-			this.Name = "dlgSetChangeBarStartDate";
+            // 
-			this.ShowIcon = false;
+            // dlgSetChangeBarStartDate
-			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            // 
-			this.Text = "Change Bar Start Date";
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.Load += new System.EventHandler(this.dlgSetChangeBarStartDate_Load);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			((System.ComponentModel.ISupportInitialize)(this.dateTimeInput1)).EndInit();
+            this.ClientSize = new System.Drawing.Size(268, 144);
-			this.ResumeLayout(false);
+            this.Controls.Add(this.btnResetToApproved);
-			this.PerformLayout();
+            this.Controls.Add(this.btnNow);
+            this.Controls.Add(this.dateTimeInput1);
+            this.Controls.Add(this.label1);
+            this.Controls.Add(this.btnCancel);
+            this.Controls.Add(this.btnOK);
+            this.DoubleBuffered = true;
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "dlgSetChangeBarStartDate";
+            this.ShowIcon = false;
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "Change Bar Start Date";
+            this.Load += new System.EventHandler(this.dlgSetChangeBarStartDate_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.dateTimeInput1)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
 
 		}
 
@@ -175,5 +191,6 @@
 		private DevComponents.DotNetBar.SuperTooltip superTooltip1;
 		private DevComponents.Editors.DateTimeAdv.DateTimeInput dateTimeInput1;
 		private DevComponents.DotNetBar.ButtonX btnNow;
-	}
+        private DevComponents.DotNetBar.ButtonX btnResetToApproved;
+    }
 }

PROMS/VEPROMS User Interface/dlgSetChangeBarStartDate.cs

@@ -1,31 +1,23 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
 using System.Data;
-using System.Drawing;
 using System.Text;
 using System.Windows.Forms;
-using DevComponents.DotNetBar;
-using DevComponents.DotNetBar.Controls;
 using VEPROMS.CSLA.Library;
-
+using Volian.Controls.Library;
 
 namespace VEPROMS
 {
 	public partial class dlgSetChangeBarStartDate : DevComponents.DotNetBar.Office2007Form
 	{
-		private ProcedureConfig _MyProcConfig = null;
+        public ProcedureConfig MyProcConfig { get; set; } = null;
 
-		public ProcedureConfig MyProcConfig
+        public ProcedureInfo MyProcInfo { get; set; } = null;
-		{
-			get { return _MyProcConfig; }
-			set { _MyProcConfig = value; }
-		}
 
-		public dlgSetChangeBarStartDate(ProcedureConfig pc)
+        public dlgSetChangeBarStartDate(ProcedureConfig pc, ProcedureInfo pi)
 		{
 			InitializeComponent();
-			_MyProcConfig = pc;
+			MyProcConfig = pc;
+			MyProcInfo = pi;
 		}
 
 		private void dlgSetChangeBarStartDate_Load(object sender, EventArgs e)
@@ -80,5 +72,65 @@ namespace VEPROMS
 			dateTimeInput1.Value = DateTime.Now;
 		}
 
-	}
+		//C2026-009 Add Option to Reset Change Bar to Last Approved Date/Time
+        private void btnResetToApproved_Click(object sender, EventArgs e)
+        {
+            System.Data.DataTable dt = RevisionData.GetRevisionDataByUnit(MyProcInfo.ItemID);
+
+			if (dt.Rows.Count == 0)
+			{
+                //no records, remove 
+				if (MessageBox.Show("There are currently no approvals set. Selecting yes will set ChangeBars to show all changes since the creation of the procedure.\r\nAre you sure you wish to reset ChangeBars?", "Reset ChangeBar Date", MessageBoxButtons.YesNo) == DialogResult.Yes)
+				{
+                    MyProcConfig.Print_ChangeBarDate = "";
+                    DialogResult = DialogResult.OK;
+                    Close();
+                }
+            }
+			else if (RevisionData.HasUnits(dt))
+			{
+                //any with units
+                string maxDTS = RevisionData.MaxDTS(dt).ToString("MM/dd/yyyy HH:mm:ss");
+
+				//create wording for ChangeBar changes
+				StringBuilder sb = new StringBuilder();
+				sb.Append($"     The Procedure Viewer Change Bar Date will be set to ({maxDTS}).");
+                foreach (DataRow r in dt.Rows)
+                {
+                    sb.Append($"\r\n     The Change Bar Date for Unit ({r["UnitName"]}) will be set to ({Convert.ToDateTime(r["DTS"]):MM/dd/yyyy HH:mm:ss}).");
+                }
+
+                sb.Append("\r\n     Any Change Bars for Units not listed above will use the Overall/Procedure Viewer Change Bar Date (as these Units have no approvals).");
+
+                if (CustomMessageBox.Show($"This will reset ChangeBars to show for changes newer than the last approval.\r\nThis includes the following changes:\r\n{sb.ToString()}\r\n\r\nAre you sure you wish to reset ChangeBars?", "Reset ChangeBar Date", "Yes", "No") == DialogResult.Yes)
+                {
+					//Change the overall ChangeBarDate
+                    MyProcConfig.Print_ChangeBarDate = maxDTS;
+
+					//Change the ChangeBarDate for each unit
+					foreach (DataRow r in dt.Rows)
+					{
+                        MyProcConfig.SelectedSlave = Convert.ToInt32(r["UnitID"]);
+                        MyProcConfig.Print_ChangeBarDate = Convert.ToDateTime(r["DTS"]).ToString("MM / dd / yyyy HH: mm: ss");
+                    }
+                    MyProcConfig.SelectedSlave = 0;
+
+                    DialogResult = DialogResult.OK;
+                    Close();
+                }
+            }
+			else
+			{
+                //no units
+                string maxDTS = RevisionData.MaxDTS(dt).ToString("MM/dd/yyyy HH:mm:ss");
+                if (MessageBox.Show($"This will reset ChangeBars to show for changes newer than the last approval ({maxDTS}).\r\nAre you sure you wish to reset ChangeBars?", "Reset ChangeBar Date", MessageBoxButtons.YesNo) == DialogResult.Yes)
+                {
+                    MyProcConfig.Print_ChangeBarDate = maxDTS;
+                    DialogResult = DialogResult.OK;
+                    Close();
+                }
+            }
+
+        }
+    }
 }

PROMS/VEPROMS User Interface/frmBatchRefresh.resx

@@ -165,9 +165,9 @@ This function will cause no change to data or records in PROMS.
 It should however be performed when other users are not in PROMS, as it could 
 cause slowdown or errors for other users while it is running.</value>
   </data>
-  <metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <data name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing">
     <value>17, 17</value>
-  </metadata>
+  </data>
   <data name="swDeleteFolder.SuperTooltip" xml:space="preserve">
     <value>This allows the user to remove folders and sub folders as well as their contents.
 
@@ -304,22 +304,22 @@ Should an item become orphaned (disconnected) from the rest of the data, it will
 </value>
   </data>
   <data name="swCheckROLinks.SuperTooltip" xml:space="preserve">
-    <value>This allows the user to check referenced objects links in procedure step data for multiple working drafts in a batch mode.
+    <value>This allows the user to check referenced object links in procedure step data for multiple working drafts in a batch mode.
 
-Bad referenced bject links will be identified with an Bad RO Link annotation. Use the PROMS Search tool to list all of the steps that have this annotation.
+Bad referenced object links will be identified with a Bad RO Link annotation. Use the PROMS Search tool to list all of the steps that have this annotation.
 
-Be sure a current backup of the database exists prior performing this function.
+Be sure a current backup of the database exists prior to performing this function.
 
 It is recommended that this be done during off hours.
 
 </value>
   </data>
   <data name="labelX12.SuperTooltip" xml:space="preserve">
-    <value>This allows the user to check referenced objects links in procedure step data for multiple working drafts in a batch mode.
+    <value>This allows the user to check referenced object links in procedure step data for multiple working drafts in a batch mode.
 
-Bad referenced bject links will be identified with an Bad RO Link annotation. Use the PROMS Search tool to list all of the steps that have this annotation.
+Bad referenced object links will be identified with a Bad RO Link annotation. Use the PROMS Search tool to list all of the steps that have this annotation.
 
-Be sure a current backup of the database exists prior performing this function.
+Be sure a current backup of the database exists prior to performing this function.
 
 It is recommended that this be done during off hours.
 </value>
@@ -388,7 +388,8 @@ If more than one procedure is selected, it is recommended that this be performed
         ud8AKwnMnBpmYFAAAAAASUVORK5CYII=
 </value>
   </data>
-  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="$this.TrayHeight" type="System.Int32, mscorlib">
     <value>25</value>
-  </metadata>
+  </data>
 </root>

PROMS/VEPROMS User Interface/frmVEPROMS.cs

@@ -617,7 +617,7 @@ namespace VEPROMS
 			ProcedureConfig pc = pi.MyConfig as ProcedureConfig;
 			if (pc == null) return;
 
-			dlgSetChangeBarStartDate cbdDlg = new dlgSetChangeBarStartDate(pc);
+			dlgSetChangeBarStartDate cbdDlg = new dlgSetChangeBarStartDate(pc, pi);
 			if (cbdDlg.ShowDialog() == DialogResult.OK)
 			{
 				using (Item itm = Item.Get(pi.ItemID))

PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs

@@ -1,14 +1,14 @@
-using Csla.Data;
 using System;
 using System.Collections.Generic;
+using System.Text;
 using System.ComponentModel;
+using System.Text.RegularExpressions;
 using System.Data;
 using System.Data.SqlClient;
 using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
 using System.Threading;
-using static System.Net.Mime.MediaTypeNames;
+
+using Csla.Data;
 
 
 namespace VEPROMS.CSLA.Library
@@ -494,8 +494,6 @@ namespace VEPROMS.CSLA.Library
 		{
 			roid = FormatRoidKey(roid, true);
 
-
-
 			string retval = GetRoChild(roid).value;
 
 			if (string.IsNullOrEmpty(retval))
@@ -2164,7 +2162,7 @@ namespace VEPROMS.CSLA.Library
 				return s2;
 
 			s2 = s2.Replace(@"\u160?", "<HSP>");        // convert hard spaces bug fix:  B2016-206
-			s2 = Regex.Replace(s2, @"\\(?!u)", @"\u9586?"); // convert backslashes to a backslash symbol
+			s2 = s2.Replace(@"\", @"\u9586?");          // convert backslashes to a backslash symbol
 			s2 = s2.Replace("<HSP>", @"\u160?");        // convert hard spaces bug fix:  B2016-206
 			s2 = s2.Replace("`", @"\'b0");              // convert backquote to degree - left over from DOS days.
 			s2 = s2.Replace("\xf8", @"\'b0");           // convert \xf8 to degree.

PROMS/VEPROMS.CSLA.Library/Extension/RevisionInfoExt.cs

@@ -597,13 +597,6 @@ namespace VEPROMS.CSLA.Library
 				//if (_RevisionInfoList != null)
 				//  return _RevisionInfoList;
 				RevisionInfoList tmp = DataPortal.Fetch<RevisionInfoList>(new ItemUnitCriteria(itemID, unitID));
-
-				foreach (var x in tmp)
-				{
-					x.LatestVersion.ApprovedXML = x.RevisionID.ToString();
-					x.LatestVersion.PDF = Encoding.ASCII.GetBytes(x.RevisionID.ToString());
-					x.LatestVersion.SummaryPDF = Encoding.ASCII.GetBytes(x.RevisionID.ToString());
-				}
 				RevisionInfo.AddList(tmp);
 				tmp.AddEvents();
 				//_RevisionInfoList = tmp;

PROMS/VEPROMS.CSLA.Library/Minimal/RevisionData.cs

@@ -0,0 +1,53 @@
+using Csla.Data;
+using System;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+
+//CSM - C2026-009 - Minimal Class for Getting Revision Data
+namespace VEPROMS.CSLA.Library
+{
+    public static class RevisionData
+    {
+        #region Check Data
+        //Check if Data Has Units
+        public static bool HasUnits(DataTable dt) => dt.AsEnumerable().Any(x => x.Field<int?>("UnitID") > 0);
+
+        //Get Maximum Date Time Stamp
+        public static DateTime MaxDTS(DataTable dt) => dt.AsEnumerable().Max(x => x.Field<DateTime>("DTS"));
+
+        #endregion
+
+        #region Get Revision Data
+        //CSM - C2026-009 Get Current Revision Data by Unit
+        public static DataTable GetRevisionDataByUnit(int itemID)
+		{
+			try
+			{
+				using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+				{
+					using (SqlCommand cm = cn.CreateCommand())
+					{
+					cm.CommandType = CommandType.StoredProcedure;
+					cm.CommandText = "GetCurrentApprovedRevisions";
+					cm.CommandTimeout = Database.DefaultTimeout;
+                    cm.Parameters.AddWithValue("@ItemID", itemID);
+
+                        using (SqlDataAdapter da = new SqlDataAdapter(cm))
+						{
+							DataTable dt = new DataTable();
+							da.Fill(dt);
+							return dt;
+						}
+					}
+				}
+			}
+			catch (Exception ex)
+			{
+				throw new DbCslaException("Error in GetRevisionDataByUnit: retrieving data failed", ex);
+			}
+		}
+		#endregion
+
+	}
+}

PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj

@@ -391,6 +391,7 @@
     <Compile Include="Minimal\AnnotationstypeSections.cs" />
     <Compile Include="Minimal\Maintenance.cs" />
     <Compile Include="Minimal\GeneralReports.cs" />
+    <Compile Include="Minimal\RevisionData.cs" />
     <Compile Include="Minimal\UserReports.cs" />
     <Compile Include="Minimal\UserSettings.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

PROMS/Volian.Controls.Library/CustomMessageBox.Designer.cs

@@ -31,25 +31,32 @@
             this.btn1 = new System.Windows.Forms.Button();
             this.btn2 = new System.Windows.Forms.Button();
             this.lblMessage = new System.Windows.Forms.Label();
+            this.tableLP1 = new System.Windows.Forms.TableLayoutPanel();
+            this.tableLP1.SuspendLayout();
             this.SuspendLayout();
             // 
             // btn1
             // 
+            this.btn1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.btn1.AutoSize = true;
-            this.btn1.Location = new System.Drawing.Point(12, 99);
+            this.btn1.Location = new System.Drawing.Point(18, 102);
+            this.btn1.Margin = new System.Windows.Forms.Padding(10);
+            this.btn1.MinimumSize = new System.Drawing.Size(60, 20);
             this.btn1.Name = "btn1";
-            this.btn1.Size = new System.Drawing.Size(75, 23);
+            this.btn1.Size = new System.Drawing.Size(60, 20);
             this.btn1.TabIndex = 0;
             this.btn1.UseVisualStyleBackColor = true;
             this.btn1.Click += new System.EventHandler(this.Btn1_Click);
             // 
             // btn2
             // 
-            this.btn2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btn2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.btn2.AutoSize = true;
-            this.btn2.Location = new System.Drawing.Point(322, 99);
+            this.btn2.Location = new System.Drawing.Point(335, 102);
+            this.btn2.Margin = new System.Windows.Forms.Padding(10);
+            this.btn2.MinimumSize = new System.Drawing.Size(60, 20);
             this.btn2.Name = "btn2";
-            this.btn2.Size = new System.Drawing.Size(75, 23);
+            this.btn2.Size = new System.Drawing.Size(60, 20);
             this.btn2.TabIndex = 1;
             this.btn2.UseVisualStyleBackColor = true;
             this.btn2.Click += new System.EventHandler(this.Btn2_Click);
@@ -57,24 +64,48 @@
             // lblMessage
             // 
             this.lblMessage.AutoSize = true;
-            this.lblMessage.Location = new System.Drawing.Point(33, 41);
+            this.tableLP1.SetColumnSpan(this.lblMessage, 2);
+            this.lblMessage.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.lblMessage.Location = new System.Drawing.Point(11, 8);
+            this.lblMessage.MaximumSize = new System.Drawing.Size(413, 0);
             this.lblMessage.Name = "lblMessage";
-            this.lblMessage.Size = new System.Drawing.Size(0, 13);
+            this.lblMessage.Size = new System.Drawing.Size(391, 84);
             this.lblMessage.TabIndex = 2;
             this.lblMessage.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
+            // tableLP1
+            // 
+            this.tableLP1.AutoSize = true;
+            this.tableLP1.ColumnCount = 2;
+            this.tableLP1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
+            this.tableLP1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
+            this.tableLP1.Controls.Add(this.lblMessage, 0, 0);
+            this.tableLP1.Controls.Add(this.btn1);
+            this.tableLP1.Controls.Add(this.btn2);
+            this.tableLP1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tableLP1.Location = new System.Drawing.Point(0, 0);
+            this.tableLP1.MaximumSize = new System.Drawing.Size(413, 0);
+            this.tableLP1.MinimumSize = new System.Drawing.Size(413, 130);
+            this.tableLP1.Name = "tableLP1";
+            this.tableLP1.Padding = new System.Windows.Forms.Padding(8);
+            this.tableLP1.RowCount = 2;
+            this.tableLP1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
+            this.tableLP1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F));
+            this.tableLP1.Size = new System.Drawing.Size(413, 130);
+            this.tableLP1.TabIndex = 0;
+            // 
             // CustomMessageBox
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.AutoSize = true;
             this.ClientSize = new System.Drawing.Size(419, 130);
-            this.Controls.Add(this.lblMessage);
+            this.Controls.Add(this.tableLP1);
-            this.Controls.Add(this.btn2);
-            this.Controls.Add(this.btn1);
             this.Name = "CustomMessageBox";
             this.ShowIcon = false;
             this.Text = "CustomMessageBox";
+            this.tableLP1.ResumeLayout(false);
+            this.tableLP1.PerformLayout();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -85,5 +116,6 @@
         private System.Windows.Forms.Button btn1;
         private System.Windows.Forms.Button btn2;
         private System.Windows.Forms.Label lblMessage;
+        private System.Windows.Forms.TableLayoutPanel tableLP1;
     }
 }

PROMS/Volian.Controls.Library/CustomMessageBox.cs

@@ -27,6 +27,10 @@ namespace Volian.Controls.Library
             {
                 btn2.Text = button2Text;
                 btn2.Visible = true;
+
+                //make buttons uniform
+                btn1.Height = btn2.Height = btn1.Height > btn2.Height ? btn1.Height : btn2.Height;
+                btn1.Width = btn2.Width = btn1.Width > btn2.Width ? btn1.Width : btn2.Width;
             }
             else
             {

PROMS/Volian.Controls.Library/DisplayRO.Designer.cs

@@ -81,7 +81,7 @@ namespace Volian.Controls.Library
 			this.lbROId.Dock = System.Windows.Forms.DockStyle.Left;
 			this.lbROId.ForeColor = System.Drawing.SystemColors.Highlight;
 			this.lbROId.Location = new System.Drawing.Point(48, 24);
-			this.lbROId.Margin = new System.Windows.Forms.Padding(2);
+			this.lbROId.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
 			this.lbROId.Name = "lbROId";
 			this.lbROId.Size = new System.Drawing.Size(183, 33);
 			this.superTooltip1.SetSuperTooltip(this.lbROId, new DevComponents.DotNetBar.SuperTooltipInfo("RO ID", "", "The RO ID for the selected RO Value will be displayed here.  Double-Click to open" +
@@ -97,7 +97,7 @@ namespace Volian.Controls.Library
 			this.lblROID.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			this.lblROID.Dock = System.Windows.Forms.DockStyle.Left;
 			this.lblROID.Location = new System.Drawing.Point(0, 24);
-			this.lblROID.Margin = new System.Windows.Forms.Padding(2);
+			this.lblROID.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
 			this.lblROID.Name = "lblROID";
 			this.lblROID.Size = new System.Drawing.Size(48, 33);
 			this.superTooltip1.SetSuperTooltip(this.lblROID, new DevComponents.DotNetBar.SuperTooltipInfo("RO ID", "", "The RO ID for the selected RO Value will be displayed here.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(150, 80)));
@@ -139,7 +139,7 @@ namespace Volian.Controls.Library
 			this.btnGoToRO.Dock = System.Windows.Forms.DockStyle.Top;
 			this.btnGoToRO.Enabled = false;
 			this.btnGoToRO.Location = new System.Drawing.Point(0, 55);
-			this.btnGoToRO.Margin = new System.Windows.Forms.Padding(2);
+			this.btnGoToRO.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
 			this.btnGoToRO.Name = "btnGoToRO";
 			this.btnGoToRO.Size = new System.Drawing.Size(233, 18);
 			this.btnGoToRO.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -155,7 +155,7 @@ namespace Volian.Controls.Library
 			this.btnPreviewRO.Dock = System.Windows.Forms.DockStyle.Top;
 			this.btnPreviewRO.Enabled = false;
 			this.btnPreviewRO.Location = new System.Drawing.Point(0, 37);
-			this.btnPreviewRO.Margin = new System.Windows.Forms.Padding(2);
+			this.btnPreviewRO.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
 			this.btnPreviewRO.Name = "btnPreviewRO";
 			this.btnPreviewRO.Size = new System.Drawing.Size(233, 18);
 			this.superTooltip1.SetSuperTooltip(this.btnPreviewRO, new DevComponents.DotNetBar.SuperTooltipInfo("Preview", "", "This will Preview the selected RO Table, X/Y Plot, or Image.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(150, 80)));
@@ -263,7 +263,6 @@ namespace Volian.Controls.Library
 			this.Controls.Add(this.tvROFST);
 			this.Controls.Add(this.lbFound);
 			this.Controls.Add(this.panelValue);
-			this.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
 			this.Name = "DisplayRO";
 			this.Size = new System.Drawing.Size(233, 507);
 			this.panelValue.ResumeLayout(false);

PROMS/Volian.Controls.Library/DisplayRO.cs

@@ -1,18 +1,18 @@
-using DevComponents.DotNetBar;
-using JR.Utils.GUI.Forms;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Data;
 using System.Drawing;
-using System.IO;
+using System.Data;
-using System.Linq;
 using System.Text;
-using System.Text.RegularExpressions;
+using System.IO;
 using System.Windows.Forms;
 using VEPROMS.CSLA.Library;
-using Volian.Base.Library;
 using XYPlots;
+using DevComponents.DotNetBar;
+using System.Text.RegularExpressions;
+using Volian.Base.Library;
+using JR.Utils.GUI.Forms;
+using System.Linq;
 
 namespace Volian.Controls.Library
 {
@@ -372,7 +372,8 @@ 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;
 
@@ -769,15 +770,9 @@ namespace Volian.Controls.Library
 					}
 					else
 					{
-
 						tmp = new TreeNode(roc.title);
 						tmp.Tag = roc;
 
-						if (tmp.Text.IndexOf("\\u") > -1) // RO Editor add symbols C2022 - 003
-						{
-							tmp.Text = Regex.Replace(tmp.Text, @"\\u([0-9]{1,4})\?", m => Convert.ToChar(int.Parse(m.Groups[1].Value)).ToString());
-						}
-
 						if (roc.roid.Length == 16)
 						{
 							tn.Nodes.Add(tmp);
@@ -926,12 +921,11 @@ namespace Volian.Controls.Library
 						// Pad to 16 to store in the RoUsage table.
 						string padroid = ROFSTLookup.FormatRoidKey(roc.roid, true);
 						string linktxt = string.Format(@"#Link:ReferencedObject:<NewID> {0} {1}", padroid, MyROFST.RODbID);
+						
+						// Resolve symbols and scientific notation in the RO return value
+						string valtxt = MyROFSTLookup.GetTranslatedRoValue(padroid, MyRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, MyRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false, MyRTB.MyItemInfo);
 
-							// Resolve symbols and scientific notation in the RO return value
+						MyRTB.OnRoInsert(this, new StepRTBRoEventArgs(valtxt, selectedChld.value, linktxt, padroid, MyROFST.RODbID));
-							string valtxt = MyROFSTLookup.GetTranslatedRoValue(padroid, MyRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, MyRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false, MyRTB.MyItemInfo);
-
-							MyRTB.OnRoInsert(this, new StepRTBRoEventArgs(valtxt, selectedChld.value, linktxt, padroid, MyROFST.RODbID));
-
 					}
 				}
 

PROMS/Volian.Controls.Library/DisplayRO.resx

@@ -112,12 +112,20 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
+  <data name="btnSaveRO.SuperTooltip" xml:space="preserve">
+    <value>For Step Editor sections:
+- This will place the selected RO at the cursor position.
+- This will replace an RO with the selected RO.
+
+For Word sections
+- This will place the needed RO ID on the clipboard.</value>
+  </data>
 </root>

PROMS/Volian.Controls.Library/StepRTB.cs

@@ -1400,13 +1400,9 @@ namespace Volian.Controls.Library
 			if (SelectionLength > 0)HandleDeleteKeyWithSelectedText(new KeyEventArgs(Keys.None), null);
 			int position = SelectionStart;
 			SelectionLength = 0;
-
+			linkValue = linkValue.Replace("\\u8209?", "\\f1\\u8209?\\f0 ");
-			var pattern = @"\\u([0-9]{1,4})\?"; // RO Editor add symbols C2022 - 003
+			linkValue = linkValue.Replace("\\u9586?", "\\f1\\u9586?\\f0 "); // backslash symbol
-			foreach (Match match in Regex.Matches(linkValue, pattern, RegexOptions.IgnoreCase))
+			linkValue = linkValue.Replace("\\u916?", "\\f1\\u916?\\f0 ");
-			{
-				linkValue = linkValue.Replace(match.Value, "\\f1 " + match.Value + " \\f0");
-			}
-
 			linkValue = linkValue.Replace(@"{", @"\{");
 			linkValue = linkValue.Replace(@"}", @"\}");
 			SelectedRtf = @"{\rtf1\ansi" + FontTable + @"{\colortbl ;\red255\green0\blue0;\red0\green0\blue255;}\v" + FontSize + @" <START]\v0\cf1 " + linkValue + @"\cf0\v " + linkUrl + @"[END>\v0 }";

PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj

@@ -462,6 +462,7 @@
     </EmbeddedResource>
     <EmbeddedResource Include="CustomMessageBox.resx">
       <DependentUpon>CustomMessageBox.cs</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="DisplayBookMarks.resx">
       <DependentUpon>DisplayBookMarks.cs</DependentUpon>

PROMS/Volian.Controls.Library/vlnTreeView.cs

@@ -1601,12 +1601,11 @@ namespace Volian.Controls.Library
 		//B2024-024 create import file for parent/child procedure set
 		void MultiUnitImportProcedure_Click(object sender, EventArgs e)
 		{
-			//RevisionInfo ri = (sender as MenuItem).Tag as RevisionInfo;
 			RevisionInfo ri = RevisionInfo.Get(int.Parse((sender as MenuItem).Tag.ToString()));
 			RevisionConfig rc = ri.MyConfig as RevisionConfig;
 			// bug fix:  B2016-183 - add the child's name (ex Unit 1) to the export file name for Parent/Child procedures.
 			int applIdx = rc.Applicability_Index;
-			string str = (applIdx > 0) ? _currentPri.MyDocVersion.UnitNames[applIdx - 1] + "_" : ""; // if parent/child get the defined child name to inlcude the export filename
+			string str = (applIdx > 0) ? _currentPri.MyDocVersion.UnitNames[applIdx - 1] + "_" : ""; // if parent/child get the defined child name to include the export filename
 			System.Xml.XmlDocument xd = new System.Xml.XmlDocument();
 			xd.LoadXml(ri.LatestVersion.ApprovedXML);
 			string PEIPath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + @"\VEPROMS\PEI_" + Database.VEPROMS_SqlConnection.Database;
@@ -1615,8 +1614,13 @@ namespace Volian.Controls.Library
 			// B2022-048: Crash when creating Procedure to Import from versions.  Couldn't handle '/' in proc number.
 			string fNametmp = xd.SelectSingleNode("procedure/content/@number").InnerText.Replace(" ", "_").Replace(@"\u8209?", "-").Replace(@"\u9586?", "_").Replace("/", "-") + ".pxml";
 			// B2022-112: If applicability, need to resolve the '<' and '>' characters.  Just use the UnitNames, i.e. str, from above.
-			if (applIdx > 0) fNametmp = Regex.Replace(fNametmp, @"\<U-ID\>", str, RegexOptions.IgnoreCase);
+			if (applIdx > 0)
-			string fileName = PEIPath + "\\" + str + "Approved_Rev_" + ri.RevisionNumber.Replace(" ", "_").Replace("\\", "-").Replace("/", "-") + "_" + fNametmp;
+            {
+                fNametmp = Regex.Replace(fNametmp, @"\<U-ID\>", str, RegexOptions.IgnoreCase);
+				fNametmp = Regex.Replace(fNametmp, @"\<U-NAME\>", str, RegexOptions.IgnoreCase);
+			}
+
+            string fileName = PEIPath + "\\" + str + "Approved_Rev_" + ri.RevisionNumber.Replace(" ", "_").Replace("\\", "-").Replace("/", "-") + "_" + fNametmp;
 			xd.Save(fileName);
 			FlexibleMessageBox.Show("Approved procedure saved to import file " + fileName, "Creating Export of Approved Procedure", MessageBoxButtons.OK, MessageBoxIcon.Information);
 		}