Merge pull request 'Development' (#634) from Development into master

Merging dev into master after successful 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
@@ -2142,20 +2139,7 @@ namespace RODBInterface
 					wraccid = accid;
 				string dt = string.Format("{0:yyyyMMddHHmmss}", System.DateTime.Now);
 				string xmlstr = GenerateXmlString(ro, false);
-				StringBuilder xmlstrTmp = new StringBuilder(); // B2026-025 prep the info field data so it will be saved correctly.
-				char[] chrAry = xmlstr.ToCharArray();
-				foreach (int chr in chrAry)
-				{
-					if (chr > 166)
-					{
-						xmlstrTmp.Append($"\\u{(int)chr}?");
-					}
-					else
-					{
-						xmlstrTmp.Append((char)chr);
-					}
-				}
-				string strUpdate = "UPDATE " + ro.GetAttribute("Table") + " SET Info = '" + xmlstrTmp.ToString() + "'";
+				string strUpdate = "UPDATE " + ro.GetAttribute("Table") + " SET Info = '" + xmlstr + "'";
 				if (movedRO)
 				{
 					VlnXmlElement parent = (VlnXmlElement)ro.ParentNode;
@@ -2198,27 +2182,10 @@ namespace RODBInterface
 				parent.SetAttribute("ChildLoaded", "True");
 			}
 			string xmlstr = GenerateXmlString(ro, false);
-
-			StringBuilder xmlstrTmp = new StringBuilder(); // B2026-025 prep the info field data so it will be saved correctly.
-			char[] chrAry = xmlstr.ToCharArray();
-			foreach (int chr in chrAry)
-			{
-				if (chr > 166)
-				{
-					xmlstrTmp.Append($"\\u{(int)chr}?");
-				}
-				else
-				{
-					xmlstrTmp.Append((char)chr);
-				}
-			}
-
 			string wraccid = null;
 			if (ro.HasAttribute("AccPageID"))
 			{
 				string accid = ro.GetAttribute("AccPageID");
-
-
 				int quote = accid.IndexOf("'");
 				if (quote >= 0)
 					wraccid = accid.Insert(quote, "'");
@@ -2236,13 +2203,13 @@ namespace RODBInterface
 					//    strInsert = "INSERT INTO " + parent.GetAttribute("Table") + "( RecID, RecType, ParentID, AccPageID, ModDateTime, Info ) ";
 					strInsert = "INSERT INTO " + parent.GetAttribute("Table") + "( RecID, RecType, ParentID, ModDateTime, AccPageID, Info ) ";
 					strInsert = strInsert + " VALUES ('" + ro.GetAttribute("RecID") + "'," + (uint)RecordType.Group + ",'" + ro.GetAttribute("ParentID");
-					strInsert = strInsert + "','" + wraccid + "','" + dt + "','" + xmlstrTmp.ToString() + "');";
+					strInsert = strInsert + "','" + wraccid + "','" + dt + "','" + xmlstr + "');";
 				}
 				else
 				{
 					strInsert = "INSERT INTO " + parent.GetAttribute("Table") + "( RecID, RecType, ParentID, ModDateTime, Info ) ";
 					strInsert = strInsert + " VALUES ('" + ro.GetAttribute("RecID") + "'," + (uint)RecordType.Group + ",'" + ro.GetAttribute("ParentID");
-					strInsert = strInsert + "','" + dt + "','" + xmlstrTmp.ToString() + "');";
+					strInsert = strInsert + "','" + dt + "','" + xmlstr + "');";
 				}
 
 			}
@@ -2250,7 +2217,7 @@ namespace RODBInterface
 			{
 				strInsert = "INSERT INTO " + parent.GetAttribute("Table") + "( RecID, RecType, ParentID, AccPageId, ModDateTime, Info ) ";
 				strInsert = strInsert + " VALUES ('" + ro.GetAttribute("RecID") + "'," + (uint)RecordType.RRO + ",'" + ro.GetAttribute("ParentID");
-				strInsert = strInsert + "','" + wraccid + "','" + dt + "','" + xmlstrTmp.ToString() + "');";
+				strInsert = strInsert + "','" + wraccid + "','" + dt + "','" + xmlstr + "');";
 			}
 
 			try
@@ -2284,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();
 
@@ -2658,21 +2625,7 @@ namespace RODBInterface
 										}
 									}
 									StatMsgWindow.StatusMessage = echild.GetAttribute("MenuTitle");
-									StringBuilder tinfo2Tmp = new StringBuilder(); // B2026-025 prep the info field data so it will be saved correctly.
 									str = "UPDATE " + echild.GetAttribute("Table") + " SET Info = '" + tinfo2 + "'";
-									char[] chrAry = tinfo2.ToCharArray();
-									foreach (int chr in chrAry)
-									{
-										if (chr > 166)
-										{
-											tinfo2Tmp.Append($"\\u{(int)chr}?");
-										}
-										else
-										{
-											tinfo2Tmp.Append((char)chr);
-										}
-									}
-									str = "UPDATE " + echild.GetAttribute("Table") + " SET Info = '" + tinfo2Tmp.ToString() + "'";
 									str = str + ", ModDateTime = '" + dt + "' WHERE RecID = '" + echild.GetAttribute("RecID") + "';";
 									DBE.Command(str);
 									DBE.Reader();

PROMS/ReferencedObjects/LibSource/RODBInterface/VlnXml.cs

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

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 System.Text.RegularExpressions;
-using System.Linq;
-using Volian.Base.Library;
-
+//using IniFileIO;
 
 
 
@@ -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 roRichTextBox GraphicsWdtextbox;
-		private roRichTextBox GraphicsHttextbox;
+		private TextBox GraphicsFiletextbox;
+		private TextBox GraphicsWdtextbox;
+		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((roRichTextBox)myHT[field+"b"],msg);
-						DoSet((roRichTextBox)myHT[field+"c"],msg);
-						DoSet((roRichTextBox)myHT[field+"d"],msg);
+						DoSet((TextBox)o,msg);
+						DoSet((TextBox)myHT[field+"b"],msg);
+						DoSet((TextBox)myHT[field+"c"],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 = 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;
+				{	
+					hwnd.Text = nd.InnerText;   // set the field's text from XML
 
 					// 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;
-
-					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();
-
+					hwnd = (TextBox) o;
 					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();
-			Size size3 = tb.Size;
+			TextBox tb = new TextBox();
 			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;
-				mytextbox = new roRichTextBox();
-				Size size3 = mytextbox.Size;
+				TextBox mytextbox;
+				mytextbox = new TextBox();
 				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 = symbcode < 256 ? ((char)symbcode).ToString() : string.Format(@"\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/DlgPrintProcedure.cs

@@ -1099,9 +1099,7 @@ namespace VEPROMS
 					(int)changeBarData.FixedChangeColumn :
 					System.Convert.ToInt32(changeBarData.DefaultCBLoc.Split(" ,".ToCharArray())[System.Convert.ToInt32(cbd.MyChangeBarLoc)]);
 				//cbd.MyChangeBarColumn = (int)changeBarData.FixedChangeColumn;
-				if (cbd.MyChangeBarText == PrintChangeBarText.UserDef && !string.IsNullOrEmpty(ppTxbxChangeBarUserMsgOne.Text))
-					cbd.MyChangeBarMessage = ppTxbxChangeBarUserMsgOne.Text + @"\n" + ppTxbxChangeBarUserMsgTwo.Text;
-				else if (cbd.MyChangeBarText == PrintChangeBarText.UserDef)
+				if (cbd.MyChangeBarText == PrintChangeBarText.UserDef)
 					cbd.MyChangeBarMessage = _DocVersionConfig.Print_UserCBMess1 + @"\n" + _DocVersionConfig.Print_UserCBMess2;
 
 			}

PROMS/VEPROMS User Interface/PROMSFixes.Sql

@@ -1643,11 +1643,7 @@ Begin
 		Select Cast(i.LastChanged as varbinary(8)) as 'ILastChanged',
 			i.ItemID as 'ItemID',
 			zi.VersionID as 'VersionID',
-			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
-			+
+			zi.PPath +
 			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
@@ -19138,7 +19134,7 @@ GO
 			rd.ParentID
 		From vwRofstData_RofstDatabases rd
 		Where rd.RofstID = @RofstID
-		Order By rd.dbiTitle Asc;
+		Order By rd.dbiID Asc;
 
 		Return;
 	End
@@ -19324,7 +19320,7 @@ GO
 			rc.AccPageID
 		From RoParent rp
 			inner join vwRofstData_RofstChildren rc on rc.RofstID = rp.RofstID and rc.dbiID = rp.dbiID and rc.ParentID = rp.ID 
-		Order By rc.title Asc;
+		Order By rc.ID Asc;
 
 
 		Return;
@@ -24329,10 +24325,8 @@ BEGIN
 		   OR FromID in (Select ContentID from tblContents where deletestatus != 0 and ActionDTS < @dte)
 		  )
 	PRINT 'Deleting Items and Parts'
-	    alter table tblParts nocheck constraint FK_Parts_Items
 		delete from tblItems where deletestatus != 0 and DTS < @dte
 		delete from tblParts where deletestatus != 0 and ItemID Not IN (Select ItemID from Items) and DTS < @dte
-		alter table tblParts check constraint FK_Parts_Items
 	PRINT 'Purging Parts with deleted Contents'
 		DELETE from Child
 		 FROM tblParts AS Child
@@ -24357,9 +24351,7 @@ BEGIN
 		   ON Itms.ItemID = tblItems.ItemID AND Itms.deletestatus = tblItems.deletestatus
 	   alter table tblItems check constraint FK_Items_Items
 	PRINT 'Purging Contents'
-		alter table tblEntries nocheck constraint FK_Entries_Contents
 		delete from tblContents where deletestatus != 0 and ActionDTS < @dte 
-		alter table tblEntries check constraint FK_Entries_Contents
 	PRINT 'Phase 3' 
 		delete from AnnotationAudits where DTS < @dte
 		delete from ContentAudits where DTS < @dte
@@ -24440,343 +24432,6 @@ ELSE PRINT 'Procedure Creation: [vesp_GetOtherActiveSessions] Error on Creation'
 GO
 
 
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[vesp_GetROsNotUsed]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
-	DROP PROCEDURE [vesp_GetROsNotUsed];
-
-GO
--- Need to drop vesp_GetROsNotUsed SP first so script can drop and recreate the TableValID table type 
-IF EXISTS( SELECT * FROM INFORMATION_SCHEMA.DOMAINS WHERE Domain_Name = 'TableValID' )
-    DROP TYPE [dbo].[TableValID]
-
-CREATE TYPE [dbo].[TableValID] AS TABLE(
-	[ID] [bigint] NOT NULL
-							
-)
-GO
-
-/****** Object:  StoredProcedure [dbo].[vesp_GetROsNotUsed] ******/
-
--- =============================================
--- Author:		Matthew Schill
--- Create date: 1/5/2026
--- Description:	Returns ROs that are not Used in PROMS
--- =============================================
-CREATE PROCEDURE [dbo].[vesp_GetROsNotUsed]
-(
-	@dbIDs AS dbo.TableValID READONLY
-)
-AS
-BEGIN
-
-	Create table #notused (RofstChildID int NULL, roid [varchar](50) NULL, ID int NOT NULL, ParentID int NOT NULL, dbID int NOT NULL, title varchar(max) not null);
-
-
-	DECLARE @FSTs table (RofstID int primary key NOT NULL, RODbID int NOT NULL)
-
-	INSERT INTO @FSTs
-	Select max(RoFSTID), RODbID from ROFsts
-	GROUP BY RODbID
-
-	--insert the not used ROs
-	INSERT INTO #notused
-	SELECT RofstChild.RofstChildID, RofstChild.roid, RofstChild.ID, RofstChild.ParentID, RofstChild.dbiID, 
-	RofstChild.title + Case When (Not RofstChild.[value] is null) Then ' (' + fstdb.dbiAP + '-' + RofstChild.appid + ')' Else '' End --Add in Accessory Page ID if it exists
-	FROM RofstChild
-	INNER JOIN RofstDatabase fstdb on fstdb.RofstID = RofstChild.RofstID and fstdb.dbiID = RofstChild.dbiID
-	INNER JOIN @FSTs fst on fst.RofstID = fstdb.RofstID AND RofstChild.RofstID = fst.RofstID
-	INNER JOIN @dbIDs dbIDs on dbIDs.ID = RofstChild.dbiID  --downbase to only dbs included
-	LEFT OUTER JOIN RofstChild subchild ON subChild.ParentID = RofstChild.ID --make sure it is not a parent of something else
-	LEFT OUTER JOIN DRoUsages ON [DRoUsages].[ROID] like RofstChild.[ROID] + '%' AND fst.RODbID = DROUsages.RODbID --not used in documents
-	LEFT OUTER JOIN RoUsages ON [RoUsages].[ROID] like RofstChild.[ROID] + '%' AND fst.RODbID = ROUsages.RODbID --not used in regular ROs
-	where
-		subchild.RofstChildID IS NULL --make sure it is not a parent of something else
-	AND DRoUsages.DROUsageID IS NULL --not used in documents
-	AND RoUsages.ROUsageID IS NULL --not used in regular ROs
-
-	--insert thier parents
-	--if they are not already in @notused
-	INSERT INTO #notused 
-	SELECT DISTINCT RofstChild.RofstChildID, RofstChild.roid, RofstChild.ID, RofstChild.ParentID, RofstChild.dbiID, RofstChild.title
-	FROM RofstChild
-	INNER JOIN #notused notusedgetparents on notusedgetparents.ParentID = RofstChild.ID AND RofstChild.dbiID = notusedgetparents.dbID
-	INNER JOIN @FSTs fst on RofstChild.RofstID = fst.RofstID
-	LEFT OUTER JOIN #notused notused on notused.RofstChildID = RofstChild.RofstChildID
-	WHERE notused.RofstChildID IS NULL
-
-	--insert parent dbs
-	--if they are not already in @notused
-	INSERT INTO #notused 
-	SELECT DISTINCT NULL, NULL, RofstDatabase.ID, RofstDatabase.ParentID, RofstDatabase.dbiID, RofstDatabase.dbiTitle
-	FROM RofstDatabase
-	INNER JOIN @FSTs fst on fst.RofstID = RofstDatabase.RofstID
-	INNER JOIN @dbIDs dbIDs on RofstDatabase.dbiID = dbIDs.ID  --downbase to only dbs included
-
-	select * 
-	FROM #notused notused
-	order by RofstChildID, dbID
-
-	drop table #notused 
-
-	RETURN
-END
-
-IF (@@Error = 0) PRINT 'Procedure Creation: [vesp_GetROsNotUsed] Succeeded'
-ELSE PRINT 'Procedure Creation: [vesp_GetROsNotUsed] Error on Creation'
-GO
-
-
-IF EXISTS (SELECT * FROM dbo.sysIndexes WHERE name like 'IX_tblROUsagesRODbIDDeleteStatusROID')
-	DROP INDEX [IX_tblROUsagesRODbIDDeleteStatusROID] ON [dbo].[tblROUsages];
-GO
-
-CREATE NONCLUSTERED INDEX IX_tblROUsagesRODbIDDeleteStatusROID
-ON [dbo].[tblROUsages] ([RODbID],[DeleteStatus],[ROID])
-INCLUDE([ROUsageID],[ContentID],[Config],[DTS],[UserID],[LastChanged]) WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-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
-
-
-/*
-==========================================================================================================
--- Begin: C2026-010 Add Audit Ability for ChangeBars
--- Author:		Matthew Schill
--- Create date: 02/17/2026
-==========================================================================================================
-*/
-	/*
-	----------------------------------------------------------------------------------
-	Tables:
-	----------------------------------------------------------------------------------
-	[ChangeBarAudits]
-
-	----------------------------------------------------------------------------------
-	Indexes:
-	----------------------------------------------------------------------------------
-	[IX_ChangeBarAudits_ItemID] on [dbo].[ChangeBarAudits]
-
-
-
-	*/
-
-
-	IF Not Exists(SELECT * FROM sys.objects Where name = 'ChangeBarAudits' AND type in (N'U'))
-	Begin
-
-		SET ANSI_NULLS ON
-		SET QUOTED_IDENTIFIER ON
-
-		/****** Create Table to hold Audit Information ******/
-		CREATE TABLE [dbo].[ChangeBarAudits](
-			[AuditID] [bigint] IDENTITY(1,1) NOT NULL,
-			[ItemID] [bigint] NOT NULL,
-			[Text] [nvarchar](max) NULL,
-			[DTS] [datetime] NOT NULL,
-			[UserID] [nvarchar](100) NOT NULL,
-			[UnitIndex] [int] NULL,
-		 CONSTRAINT [PK_ChangeBarAudits] PRIMARY KEY CLUSTERED 
-		(
-			[AuditID] ASC
-		)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-		) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
-
-		IF (@@Error = 0) PRINT 'Table Creation: [ChangeBarAudits] Succeeded'
-		ELSE PRINT 'Table Creation: [ChangeBarAudits] Error on Creation'
-
-		/****** Table was not previously created - so intially populate with info from Approvals ******/
-		INSERT into ChangeBarAudits([ItemID],[Text],[DTS],[UserID],[UnitIndex])
-		  select --rr.RevisionID,
-		  rr.ItemID,
-		  Text =  CASE WHEN r1.value('@Index','int') <> 0 AND UnitName IS NOT NULL THEN
-					   '(Unit ' + UnitName + ') '
-				  ELSE
-					   ''
-				  END +
-				  'Approved by (' + rr.UserID + ') on (' + 
-				  CAST(rr.DTS AS VARCHAR) + ')',
-		  rr.DTS,
-		  rr.UserID,
-		  UnitIndex =  r1.value('@Index','int')
-		 -- , UnitName
-			from revisions rr
-			inner join versions vv on rr.revisionid = vv.revisionid
-			inner join stages ss on vv.stageid = ss.stageid
-			outer apply rr.config.nodes('Config/Applicability') t1(r1)
-			outer apply
-			( Select r2.value('@Name','varchar') UnitName
-			  FROM
-				 (select DocVerSions.ItemID, cast(config as xml) xconfig from DocVersions
-					inner join 
-					  vefn_AllSiblingItems(rr.ItemID) Sib ON DocVerSions.ItemID = Sib.ItemID) SDV
-					cross apply
-					xconfig.nodes('Config/Slaves/Slave') t2(r2)
-				  WHERE r2.value('@index','varchar') = r1.value('@Index','int')
-			) UN
-			where ss.isapproved = 1
-			  order by rr.ItemID, rr.RevisionID desc
-
-		IF (@@Error = 0) PRINT '[ChangeBarAudits] Initial Population Succeeded'
-		ELSE PRINT '[ChangeBarAudits] Initial Population Error'
-		
-		/****** Create Index to get ChangeBar Audit Information for Item (ItemID = ProcedureID) ******/
-		CREATE NONCLUSTERED INDEX [IX_ChangeBarAudits_ItemID] ON [dbo].[ChangeBarAudits]
-		(
-			[ItemID] ASC
-		)
-		INCLUDE ([AuditID], [Text], [DTS], [UnitIndex])
-		WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-		
-		IF (@@Error = 0) PRINT 'Index Creation: [IX_ChangeBarAudits_ItemID] Succeeded'
-		ELSE PRINT 'Index Creation: [IX_ChangeBarAudits_ItemID] Error on Creation'
-
-	End	
-
-	-- =============================================
-	-- Description:	Gets ChangeBar Audit History by item
-	-- =============================================
-	IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[GetChangeBarAuditHistoryByItem]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
-		DROP PROCEDURE [GetChangeBarAuditHistoryByItem];
-
-	GO
-
-	CREATE PROCEDURE [dbo].[GetChangeBarAuditHistoryByItem]
-	(
-		@ItemID AS bigint
-	)
-	AS
-	BEGIN
-		Select * FROM ChangeBarAudits where ItemID = @ItemID
-		order by DTS desc
-
-		RETURN
-	END
-
-	IF (@@Error = 0) PRINT 'Procedure Creation: [GetChangeBarAuditHistoryByItem] Succeeded'
-	ELSE PRINT 'Procedure Creation: [GetChangeBarAuditHistoryByItem] Error on Creation'
-	GO
-
-	-- =============================================
-	-- Description:	Adds ChangeBar Audit History
-	-- =============================================
-	IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[AddChangeBarAuditHistory]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
-		DROP PROCEDURE [AddChangeBarAuditHistory];
-
-	GO
-
-	CREATE PROCEDURE [dbo].[AddChangeBarAuditHistory]
-	(
-		@ItemID AS bigint,
-		@Description As nvarchar(max),
-		@DTS AS Datetime,
-		@UserID As nvarchar(100),
-		@UnitIndex AS bigint = NULL
-	)
-	AS
-	BEGIN
-
-		INSERT into ChangeBarAudits([ItemID],[Text],[DTS],[UserID],[UnitIndex])
-		VALUES (@ItemID, @Description, @DTS, @UserID, @UnitIndex)
-
-		RETURN
-	END
-
-	IF (@@Error = 0) PRINT 'Procedure Creation: [AddChangeBarAuditHistory] Succeeded'
-	ELSE PRINT 'Procedure Creation: [AddChangeBarAuditHistory] Error on Creation'
-	GO
-
-/*
-==========================================================================================================
--- End: C2026-010 Add Audit Ability for ChangeBars
-==========================================================================================================
-*/
-
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[GetMissingDocsByUnit]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
-	DROP PROCEDURE [GetMissingDocsByUnit];
-
-GO
-
--- =============================================
--- Author:		Matthew Schill
--- Create date: 02/27/2026
--- Description:	Get Missing Docs by Unit for Generating Pdf table
--- =============================================
-CREATE PROCEDURE [dbo].[GetMissingDocsByUnit]
-AS
-BEGIN
-
-	  select Docs.DocID, UnitID, SectionID = MIN(SectionID)
-	  FROM
-	  (SELECT DISTINCT [DocID]
-	  FROM [VEPROMS_Barakah].[dbo].[tblDocuments]) Docs
-	  INNER JOIN Entries on Docs.DocID = Entries.DocID
-	  INNER JOIN Contents on Entries.ContentID = Contents.ContentID
-	  inner join Items on Items.ContentID = Contents.ContentID
-	  outer apply
-		  (Select UnitID = ID FROM dbo.vefn_SplitInt([dbo].[ve_GetItemDerivedApplicability](Items.ItemID),',')) Unit
-	  outer apply
-		  (Select TOP 1 SectionID = ItemID FROM Contents SecC where SecC.ContentID = Contents.ContentID
-			AND (SecC.Type / 10000) = 1
-			AND dbo.vefn_GetVersionIDByItemID(ItemID) IS NOT NULL
-		  ) Section
-      left outer join Pdfs on Pdfs.DocID = Docs.DocID AND Pdfs.DebugStatus = CASE WHEN UNITID IS NULL THEN 0 ELSE UnitID * 10 END
-	  WHERE Pdfs.DocID IS NULL
-      AND SectionID IS NOT NULL
-	  Group by Docs.DocID, UnitID
-	  order by Docs.DocID, UnitID
-
-	RETURN
-END
-
-IF (@@Error = 0) PRINT 'Procedure Creation: [GetMissingDocsByUnit] Succeeded'
-ELSE PRINT 'Procedure Creation: [GetMissingDocsByUnit] Error on Creation'
-GO
-
 /*
   ---------------------------------------------------------------------------
   |                       ADD New Code Before this Block                    |
@@ -24810,8 +24465,8 @@ BEGIN TRY -- Try Block
 	DECLARE @RevDate varchar(255)
 	DECLARE @RevDescription varchar(255)
 
-	set @RevDate = '03/13/2026 7:00 AM'
-	set @RevDescription = 'Added Get Missing Docs by Unit for Generating Pdf table'
+	set @RevDate = '09/16/2025 7:00 AM'
+	set @RevDescription = 'Added Purge Change History and Index Maintenance functions to Admin Tools'
 
 	Select  cast(@RevDate as datetime) RevDate, @RevDescription  RevDescription
 	PRINT 'SQL Code Revision ' + @RevDate + ' - ' + @RevDescription

PROMS/VEPROMS User Interface/dlgApproveProcedure.cs

@@ -13,8 +13,6 @@ using System.Text.RegularExpressions;
 using System.Globalization;
 using DevComponents.DotNetBar;
 using JR.Utils.GUI.Forms;
-using Volian.Controls.Library;
-using System.Linq;
 
 namespace VEPROMS
 {
@@ -1135,7 +1133,6 @@ namespace VEPROMS
 			ViewPDF = ViewPDF && MyProcedures.Count == 1;
 			StringBuilder sb = new StringBuilder();
 			StageInfo nsi = StageInfo.GetJustStage(RevStage);
-			DateTime now = DateTime.Now; //using variable so dates are consistent
 			foreach (ApprovalProcedure ap in MyProcedures) //spin thru looking for updating current revision
 			{
 				// ric: current revision info record, not new one being created.
@@ -1208,7 +1205,7 @@ namespace VEPROMS
 						cfg.History_StartDate = myDTS;	// if there is a slave, date found from above code
 						cfg.Applicability_Index = ap.ProcInfo.MyDocVersion.DocVersionConfig.SelectedSlave;
 						//cfg.Save();
-						revision = Revision.MakeRevision(pi.ItemID, RevType, ap.RevNumber, ap.RevDate, RevNote, cfg.ToString(), now, Volian.Base.Library.VlnSettings.UserID);
+						revision = Revision.MakeRevision(pi.ItemID, RevType, ap.RevNumber, ap.RevDate, RevNote, cfg.ToString(), DateTime.Now, Volian.Base.Library.VlnSettings.UserID);
 						//					revision.MyConfig.History_StartDate = pi.DTS;
 						//					revision.MyConfig.Save();
 						//					revision = revision.Save();
@@ -1235,7 +1232,7 @@ namespace VEPROMS
 						RevisionConfig cfg = new RevisionConfig();
 						cfg.History_StartDate = pi.DTS;		// todo: this should probably be myDTS, found during fix of B2019-051.
 						//cfg.Save();
-						revision = Revision.MakeRevision(pi.ItemID, RevType, ap.RevNumber, ap.RevDate, RevNote, cfg.ToString(), now, Volian.Base.Library.VlnSettings.UserID);
+						revision = Revision.MakeRevision(pi.ItemID, RevType, ap.RevNumber, ap.RevDate, RevNote, cfg.ToString(), DateTime.Now, Volian.Base.Library.VlnSettings.UserID);
 						//					revision.MyConfig.History_StartDate = pi.DTS;
 						//					revision.MyConfig.Save();
 						//					revision = revision.Save();
@@ -1254,7 +1251,7 @@ namespace VEPROMS
 				byte[] summaryBuf = null;
 				//B2017-149 Allow the user to choose if they want the Summary of Changes report created during the approval process
 				if (doSumChg) summaryBuf = CreateSummary(ref pi, summaryPDF, myDTS);
-				DateTime currentDTS = now;
+				DateTime currentDTS = DateTime.Now;
 				Check check = Check.MakeCheck(revision, Stage.GetJustStage(RevStage), RevisionInfo.BuildRevisionChecks(pi), currentDTS, VlnSettings.UserID);
 				//make pdf with promsprinter and get byte stream
 				// Moved to end so that Item and Content are saved at the same time
@@ -1312,15 +1309,7 @@ namespace VEPROMS
 				pi.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
 				if (si.IsApproved == 1)
 				{
-
-                    //B2026-016 - Fix error pulling Reference Object info into Export
-                    if (pi.MyDocVersion.DocVersionAssociationCount == 0)
-                    {
-                        MessageBox.Show("Prior to Approval you must set the Referenced Object Database", "No RO Database set", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
-                        return false;
-                    }
-
-                    dlgExportImport dlg = new dlgExportImport("Export", pi, MyFrmVEPROMS, (selectedSlave)); // "true tell export to convert ROs and Transitions to text
+					dlgExportImport dlg = new dlgExportImport("Export", pi, MyFrmVEPROMS, (selectedSlave)); // "true tell export to convert ROs and Transitions to text
 					dlg.DocReplace = frm.DocReplace;  // this tells approval to prepare an export file with resolved transitions and ROs, word sections are saved with resolved ROs during approval PDF creation and saved in DocReplace
 					System.Xml.XmlDocument xd = new System.Xml.XmlDocument();
 					dlg.ExportItem(xd, pi, "procedure");
@@ -1328,46 +1317,10 @@ namespace VEPROMS
 					version.ApprovedXML = xd.OuterXml;
 					version.Save();
 					dlg.Dispose();
-					UpdateProcedureConfig(pi, ap.RevNumber, ap.RevDate, now, selectedSlave);
+					UpdateProcedureConfig(pi, ap.RevNumber, ap.RevDate, DateTime.Now, selectedSlave);
 
-                    //CSM - C2026-010 - Add Audit Record for Change Bar Audit History
-                    ChangeBarAuditHistory.AddAudit(pi.ItemID, $"{(selectedSlave > 0 ? $"(Unit {pi.MyDocVersion.UnitNames[selectedSlave - 1]}) " : "")}Approved by ({VlnSettings.UserID}) on ({now})", now, VlnSettings.UserID, selectedSlave);
-
-                    // Clear the change bar override for this procedure:
-                    pi.ClearChangeBarOverrides();
-
-					//B2019-140 Change bars do not get refreshed when approval is run.
-					ProcedureInfo newproc;
-
-                    //// Refresh the StepPanel for the current Procedure
-                    //// 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);
-					if (dti != null)
-					{
-						if (!dti.MyStepTabPanel.MyStepPanel.ContainsFocus)
-							dti.MyStepTabPanel.MyStepPanel.Focus();
-
-						foreach (EditItem eitm in dti.MyStepTabPanel.MyStepPanel.Controls.OfType<EditItem>())
-                        {
-                            eitm.ChangeBar = eitm.MyItemInfo.HasChangeBar;
-                        }
-
-                        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);
+					// Clear the change bar override for this procedure:
+					pi.ClearChangeBarOverrides();
 				}
 				else
 					UpdateProcedureConfig(pi, ap.RevNumber, ap.RevDate, myDTS, selectedSlave);

PROMS/VEPROMS User Interface/dlgExportImport.cs

@@ -1618,15 +1618,8 @@ namespace VEPROMS
 
 		public void ExportItem(XmlDocument xd, ItemInfo ii, string nodename)
 		{
-            //B2026-016 - Fix error pulling Reference Object info into Export
-            if (ii.MyDocVersion.DocVersionAssociationCount == 0)
-            {
-                MessageBox.Show("Prior to Exporting Procedures you must set the Referenced Object Database", "No RO Database set", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
-                return;
-            }
-
-            XmlElement xe = xd.CreateElement(nodename);
-            if (ii.IsProcedure)
+			XmlElement xe = xd.CreateElement(nodename);
+			if (ii.IsProcedure)
 			{
 				xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "rodbid", ii.MyDocVersion.DocVersionAssociations[0].MyROFst.MyRODb.RODbID.ToString()));
 				xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "rofolderpath", ii.MyDocVersion.DocVersionAssociations[0].MyROFst.MyRODb.FolderPath));

PROMS/VEPROMS User Interface/dlgManageSecurity.Designer.cs

@@ -28,416 +28,328 @@ namespace VEPROMS
 		/// </summary>
 		private void InitializeComponent()
 		{
-            this.components = new System.ComponentModel.Container();
-            this.tcSecurity = new System.Windows.Forms.TabControl();
-            this.tpManageFolders = new System.Windows.Forms.TabPage();
-            this.label6 = new System.Windows.Forms.Label();
-            this.tvFolders = new System.Windows.Forms.TreeView();
-            this.cmFolders = new System.Windows.Forms.ContextMenuStrip(this.components);
-            this.createSetAdministratorGroupToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.createWriterGroupToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.createROEToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.createReviewerGroupToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.tpManageGroups = new System.Windows.Forms.TabPage();
-            this.btnAddMember = new System.Windows.Forms.Button();
-            this.btnRemoveMember = new System.Windows.Forms.Button();
-            this.label1 = new System.Windows.Forms.Label();
-            this.lbNonMembers = new System.Windows.Forms.Label();
-            this.btnDeleteGroup = new System.Windows.Forms.Button();
-            this.cbGroupSelection = new System.Windows.Forms.ComboBox();
-            this.lstNonMembers = new System.Windows.Forms.ListBox();
-            this.pnlMembers = new System.Windows.Forms.Panel();
-            this.lstMembers = new System.Windows.Forms.ListBox();
-            this.lblMembers = new System.Windows.Forms.Label();
-            this.label3 = new System.Windows.Forms.Label();
-            this.tpManageUsers = new System.Windows.Forms.TabPage();
-            this.lblUserGroups = new System.Windows.Forms.Label();
-            this.lstGroups = new System.Windows.Forms.ListBox();
-            this.lstUsers = new System.Windows.Forms.ListBox();
-            this.lblUsers = new System.Windows.Forms.Label();
-            this.tpDefault = new System.Windows.Forms.TabPage();
-            this.label8 = new System.Windows.Forms.Label();
-            this.pnlGroups = new System.Windows.Forms.Panel();
-            this.cmMembers = new System.Windows.Forms.ContextMenuStrip(this.components);
-            this.removeMemberToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.cmUsers = new System.Windows.Forms.ContextMenuStrip(this.components);
-            this.addUserToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.editUserToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.deleteUserToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.tt = new System.Windows.Forms.ToolTip(this.components);
-            this.tcSecurity.SuspendLayout();
-            this.tpManageFolders.SuspendLayout();
-            this.cmFolders.SuspendLayout();
-            this.tpManageGroups.SuspendLayout();
-            this.pnlMembers.SuspendLayout();
-            this.tpManageUsers.SuspendLayout();
-            this.tpDefault.SuspendLayout();
-            this.cmUsers.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // tcSecurity
-            // 
-            this.tcSecurity.Controls.Add(this.tpManageFolders);
-            this.tcSecurity.Controls.Add(this.tpManageGroups);
-            this.tcSecurity.Controls.Add(this.tpManageUsers);
-            this.tcSecurity.Controls.Add(this.tpDefault);
-            this.tcSecurity.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tcSecurity.Location = new System.Drawing.Point(0, 0);
-            this.tcSecurity.Name = "tcSecurity";
-            this.tcSecurity.SelectedIndex = 0;
-            this.tcSecurity.Size = new System.Drawing.Size(784, 564);
-            this.tcSecurity.TabIndex = 0;
-            this.tcSecurity.SelectedIndexChanged += new System.EventHandler(this.changedTab);
-            // 
-            // tpManageFolders
-            // 
-            this.tpManageFolders.BackColor = System.Drawing.SystemColors.ButtonFace;
-            this.tpManageFolders.Controls.Add(this.label6);
-            this.tpManageFolders.Controls.Add(this.tvFolders);
-            this.tpManageFolders.Location = new System.Drawing.Point(4, 22);
-            this.tpManageFolders.Name = "tpManageFolders";
-            this.tpManageFolders.Padding = new System.Windows.Forms.Padding(3);
-            this.tpManageFolders.Size = new System.Drawing.Size(776, 538);
-            this.tpManageFolders.TabIndex = 2;
-            this.tpManageFolders.Text = "Manage Folders / Add Groups";
-            // 
-            // label6
-            // 
-            this.label6.AutoSize = true;
-            this.label6.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.75F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))), System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label6.Location = new System.Drawing.Point(8, 5);
-            this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(55, 15);
-            this.label6.TabIndex = 7;
-            this.label6.Text = "Folders";
-            // 
-            // tvFolders
-            // 
-            this.tvFolders.ContextMenuStrip = this.cmFolders;
-            this.tvFolders.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.tvFolders.HideSelection = false;
-            this.tvFolders.Location = new System.Drawing.Point(3, 32);
-            this.tvFolders.Name = "tvFolders";
-            this.tvFolders.Size = new System.Drawing.Size(770, 503);
-            this.tvFolders.TabIndex = 6;
-            this.tvFolders.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.tvFolders_NodeMouseClick);
-            // 
-            // cmFolders
-            // 
-            this.cmFolders.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.components = new System.ComponentModel.Container();
+			this.tcSecurity = new System.Windows.Forms.TabControl();
+			this.tpGroupUsers = new System.Windows.Forms.TabPage();
+			this.pnlMembers = new System.Windows.Forms.Panel();
+			this.lstMembers = new System.Windows.Forms.ListBox();
+			this.lblMembers = new System.Windows.Forms.Label();
+			this.label6 = new System.Windows.Forms.Label();
+			this.tvFolders = new System.Windows.Forms.TreeView();
+			this.cmFolders = new System.Windows.Forms.ContextMenuStrip(this.components);
+			this.createSetAdministratorGroupToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.createWriterGroupToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.createROEToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.createReviewerGroupToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.lstUsers = new System.Windows.Forms.ListBox();
+			this.label5 = new System.Windows.Forms.Label();
+			this.label3 = new System.Windows.Forms.Label();
+			this.lstGroups = new System.Windows.Forms.ListBox();
+			this.tpDefault = new System.Windows.Forms.TabPage();
+			this.label8 = new System.Windows.Forms.Label();
+			this.pnlGroups = new System.Windows.Forms.Panel();
+			this.cmMembers = new System.Windows.Forms.ContextMenuStrip(this.components);
+			this.removeMemberToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.cmUsers = new System.Windows.Forms.ContextMenuStrip(this.components);
+			this.addUserToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.editUserToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.deleteUserToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.addMemberToolStripMenuItemUser = new System.Windows.Forms.ToolStripMenuItem();
+			this.cmGroups = new System.Windows.Forms.ContextMenuStrip(this.components);
+			this.deleteGroupToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.addMemberToolStripMenuItemGroup = new System.Windows.Forms.ToolStripMenuItem();
+			this.tcSecurity.SuspendLayout();
+			this.tpGroupUsers.SuspendLayout();
+			this.pnlMembers.SuspendLayout();
+			this.cmFolders.SuspendLayout();
+			this.tpDefault.SuspendLayout();
+			this.cmMembers.SuspendLayout();
+			this.cmUsers.SuspendLayout();
+			this.cmGroups.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// tcSecurity
+			// 
+			this.tcSecurity.Controls.Add(this.tpGroupUsers);
+			this.tcSecurity.Controls.Add(this.tpDefault);
+			this.tcSecurity.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.tcSecurity.Location = new System.Drawing.Point(0, 0);
+			this.tcSecurity.Name = "tcSecurity";
+			this.tcSecurity.SelectedIndex = 0;
+			this.tcSecurity.Size = new System.Drawing.Size(784, 564);
+			this.tcSecurity.TabIndex = 0;
+			// 
+			// tpGroupUsers
+			// 
+			this.tpGroupUsers.BackColor = System.Drawing.SystemColors.ButtonFace;
+			this.tpGroupUsers.Controls.Add(this.pnlMembers);
+			this.tpGroupUsers.Controls.Add(this.label6);
+			this.tpGroupUsers.Controls.Add(this.tvFolders);
+			this.tpGroupUsers.Controls.Add(this.lstUsers);
+			this.tpGroupUsers.Controls.Add(this.label5);
+			this.tpGroupUsers.Controls.Add(this.label3);
+			this.tpGroupUsers.Controls.Add(this.lstGroups);
+			this.tpGroupUsers.Location = new System.Drawing.Point(4, 22);
+			this.tpGroupUsers.Name = "tpGroupUsers";
+			this.tpGroupUsers.Padding = new System.Windows.Forms.Padding(3);
+			this.tpGroupUsers.Size = new System.Drawing.Size(776, 538);
+			this.tpGroupUsers.TabIndex = 2;
+			this.tpGroupUsers.Text = "Folders, Groups and Users";
+			// 
+			// pnlMembers
+			// 
+			this.pnlMembers.Controls.Add(this.lstMembers);
+			this.pnlMembers.Controls.Add(this.lblMembers);
+			this.pnlMembers.Location = new System.Drawing.Point(384, 304);
+			this.pnlMembers.Name = "pnlMembers";
+			this.pnlMembers.Size = new System.Drawing.Size(386, 232);
+			this.pnlMembers.TabIndex = 12;
+			// 
+			// lstMembers
+			// 
+			this.lstMembers.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.lstMembers.FormattingEnabled = true;
+			this.lstMembers.Location = new System.Drawing.Point(0, 19);
+			this.lstMembers.Name = "lstMembers";
+			this.lstMembers.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended;
+			this.lstMembers.Size = new System.Drawing.Size(386, 212);
+			this.lstMembers.TabIndex = 10;
+			this.lstMembers.MouseUp += new System.Windows.Forms.MouseEventHandler(this.lstMembers_MouseUp);
+			// 
+			// lblMembers
+			// 
+			this.lblMembers.Dock = System.Windows.Forms.DockStyle.Top;
+			this.lblMembers.Location = new System.Drawing.Point(0, 0);
+			this.lblMembers.Name = "lblMembers";
+			this.lblMembers.Size = new System.Drawing.Size(386, 19);
+			this.lblMembers.TabIndex = 2;
+			this.lblMembers.Text = "Members";
+			// 
+			// label6
+			// 
+			this.label6.AutoSize = true;
+			this.label6.Location = new System.Drawing.Point(8, 5);
+			this.label6.Name = "label6";
+			this.label6.Size = new System.Drawing.Size(41, 13);
+			this.label6.TabIndex = 7;
+			this.label6.Text = "Folders";
+			// 
+			// tvFolders
+			// 
+			this.tvFolders.ContextMenuStrip = this.cmFolders;
+			this.tvFolders.HideSelection = false;
+			this.tvFolders.Location = new System.Drawing.Point(8, 21);
+			this.tvFolders.Name = "tvFolders";
+			this.tvFolders.Size = new System.Drawing.Size(370, 511);
+			this.tvFolders.TabIndex = 6;
+			this.tvFolders.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.tvFolders_NodeMouseClick);
+			// 
+			// cmFolders
+			// 
+			this.cmFolders.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.createSetAdministratorGroupToolStripMenuItem,
             this.createWriterGroupToolStripMenuItem,
             this.createROEToolStripMenuItem,
             this.createReviewerGroupToolStripMenuItem});
-            this.cmFolders.Name = "cmFolders";
-            this.cmFolders.Size = new System.Drawing.Size(249, 92);
-            // 
-            // createSetAdministratorGroupToolStripMenuItem
-            // 
-            this.createSetAdministratorGroupToolStripMenuItem.Name = "createSetAdministratorGroupToolStripMenuItem";
-            this.createSetAdministratorGroupToolStripMenuItem.Size = new System.Drawing.Size(248, 22);
-            this.createSetAdministratorGroupToolStripMenuItem.Text = "Create a Set Administrator Group";
-            this.createSetAdministratorGroupToolStripMenuItem.Click += new System.EventHandler(this.createGroupMenuItem);
-            // 
-            // createWriterGroupToolStripMenuItem
-            // 
-            this.createWriterGroupToolStripMenuItem.Name = "createWriterGroupToolStripMenuItem";
-            this.createWriterGroupToolStripMenuItem.Size = new System.Drawing.Size(248, 22);
-            this.createWriterGroupToolStripMenuItem.Text = "Create a Writer Group";
-            this.createWriterGroupToolStripMenuItem.Click += new System.EventHandler(this.createGroupMenuItem);
-            // 
-            // createROEToolStripMenuItem
-            // 
-            this.createROEToolStripMenuItem.Name = "createROEToolStripMenuItem";
-            this.createROEToolStripMenuItem.Size = new System.Drawing.Size(248, 22);
-            this.createROEToolStripMenuItem.Text = "Create a RO Editor Group";
-            this.createROEToolStripMenuItem.Click += new System.EventHandler(this.createGroupMenuItem);
-            // 
-            // createReviewerGroupToolStripMenuItem
-            // 
-            this.createReviewerGroupToolStripMenuItem.Name = "createReviewerGroupToolStripMenuItem";
-            this.createReviewerGroupToolStripMenuItem.Size = new System.Drawing.Size(248, 22);
-            this.createReviewerGroupToolStripMenuItem.Text = "Create a Reviewer Group";
-            this.createReviewerGroupToolStripMenuItem.Click += new System.EventHandler(this.createGroupMenuItem);
-            // 
-            // tpManageGroups
-            // 
-            this.tpManageGroups.Controls.Add(this.btnAddMember);
-            this.tpManageGroups.Controls.Add(this.btnRemoveMember);
-            this.tpManageGroups.Controls.Add(this.label1);
-            this.tpManageGroups.Controls.Add(this.lbNonMembers);
-            this.tpManageGroups.Controls.Add(this.btnDeleteGroup);
-            this.tpManageGroups.Controls.Add(this.cbGroupSelection);
-            this.tpManageGroups.Controls.Add(this.lstNonMembers);
-            this.tpManageGroups.Controls.Add(this.pnlMembers);
-            this.tpManageGroups.Controls.Add(this.label3);
-            this.tpManageGroups.Location = new System.Drawing.Point(4, 22);
-            this.tpManageGroups.Name = "tpManageGroups";
-            this.tpManageGroups.Padding = new System.Windows.Forms.Padding(3);
-            this.tpManageGroups.Size = new System.Drawing.Size(776, 538);
-            this.tpManageGroups.TabIndex = 3;
-            this.tpManageGroups.Text = "Manage Groups";
-            this.tpManageGroups.UseVisualStyleBackColor = true;
-            // 
-            // btnAddMember
-            // 
-            this.btnAddMember.Location = new System.Drawing.Point(337, 190);
-            this.btnAddMember.Name = "btnAddMember";
-            this.btnAddMember.Size = new System.Drawing.Size(36, 29);
-            this.btnAddMember.TabIndex = 19;
-            this.btnAddMember.Text = "<<";
-            this.tt.SetToolTip(this.btnAddMember, "Add User as Members of Group");
-            this.btnAddMember.UseVisualStyleBackColor = true;
-            this.btnAddMember.Click += new System.EventHandler(this.addMember_Click);
-            // 
-            // btnRemoveMember
-            // 
-            this.btnRemoveMember.Location = new System.Drawing.Point(337, 254);
-            this.btnRemoveMember.Name = "btnRemoveMember";
-            this.btnRemoveMember.Size = new System.Drawing.Size(36, 29);
-            this.btnRemoveMember.TabIndex = 18;
-            this.btnRemoveMember.Text = ">>";
-            this.tt.SetToolTip(this.btnRemoveMember, "Remove User From Group");
-            this.btnRemoveMember.UseVisualStyleBackColor = true;
-            this.btnRemoveMember.Click += new System.EventHandler(this.removeMember_Click);
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.75F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))), System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label1.Location = new System.Drawing.Point(386, 42);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(97, 15);
-            this.label1.TabIndex = 17;
-            this.label1.Text = "Non Members";
-            // 
-            // lbNonMembers
-            // 
-            this.lbNonMembers.AutoSize = true;
-            this.lbNonMembers.Location = new System.Drawing.Point(386, 42);
-            this.lbNonMembers.Name = "lbNonMembers";
-            this.lbNonMembers.Size = new System.Drawing.Size(73, 13);
-            this.lbNonMembers.TabIndex = 17;
-            this.lbNonMembers.Text = "Non Members";
-            // 
-            // btnDeleteGroup
-            // 
-            this.btnDeleteGroup.ForeColor = System.Drawing.Color.Red;
-            this.btnDeleteGroup.Location = new System.Drawing.Point(668, 12);
-            this.btnDeleteGroup.Name = "btnDeleteGroup";
-            this.btnDeleteGroup.Size = new System.Drawing.Size(89, 23);
-            this.btnDeleteGroup.TabIndex = 16;
-            this.btnDeleteGroup.Text = "Delete Group";
-            this.btnDeleteGroup.UseVisualStyleBackColor = true;
-            this.btnDeleteGroup.Click += new System.EventHandler(this.deleteGroup_Click);
-            // 
-            // cbGroupSelection
-            // 
-            this.cbGroupSelection.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cbGroupSelection.FormattingEnabled = true;
-            this.cbGroupSelection.Location = new System.Drawing.Point(50, 9);
-            this.cbGroupSelection.Name = "cbGroupSelection";
-            this.cbGroupSelection.Size = new System.Drawing.Size(272, 21);
-            this.cbGroupSelection.TabIndex = 15;
-            this.cbGroupSelection.SelectedIndexChanged += new System.EventHandler(this.cbGroupSelection_SelectedIndexChanged);
-            // 
-            // lstNonMembers
-            // 
-            this.lstNonMembers.FormattingEnabled = true;
-            this.lstNonMembers.Location = new System.Drawing.Point(389, 61);
-            this.lstNonMembers.Name = "lstNonMembers";
-            this.lstNonMembers.Size = new System.Drawing.Size(316, 472);
-            this.lstNonMembers.TabIndex = 14;
-            // 
-            // pnlMembers
-            // 
-            this.pnlMembers.Controls.Add(this.lstMembers);
-            this.pnlMembers.Controls.Add(this.lblMembers);
-            this.pnlMembers.Location = new System.Drawing.Point(6, 42);
-            this.pnlMembers.Name = "pnlMembers";
-            this.pnlMembers.Size = new System.Drawing.Size(316, 493);
-            this.pnlMembers.TabIndex = 13;
-            // 
-            // lstMembers
-            // 
-            this.lstMembers.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.lstMembers.FormattingEnabled = true;
-            this.lstMembers.Location = new System.Drawing.Point(0, 19);
-            this.lstMembers.Name = "lstMembers";
-            this.lstMembers.Size = new System.Drawing.Size(316, 474);
-            this.lstMembers.TabIndex = 10;
-            // 
-            // lblMembers
-            // 
-            this.lblMembers.Dock = System.Windows.Forms.DockStyle.Top;
-            this.lblMembers.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.75F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))), System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblMembers.Location = new System.Drawing.Point(0, 0);
-            this.lblMembers.Name = "lblMembers";
-            this.lblMembers.Size = new System.Drawing.Size(316, 19);
-            this.lblMembers.TabIndex = 2;
-            this.lblMembers.Text = "Selected Group Users";
-            // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(3, 12);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(39, 13);
-            this.label3.TabIndex = 3;
-            this.label3.Text = "Group:";
-            // 
-            // tpManageUsers
-            // 
-            this.tpManageUsers.Controls.Add(this.lblUserGroups);
-            this.tpManageUsers.Controls.Add(this.lstGroups);
-            this.tpManageUsers.Controls.Add(this.lstUsers);
-            this.tpManageUsers.Controls.Add(this.lblUsers);
-            this.tpManageUsers.Location = new System.Drawing.Point(4, 22);
-            this.tpManageUsers.Name = "tpManageUsers";
-            this.tpManageUsers.Size = new System.Drawing.Size(776, 538);
-            this.tpManageUsers.TabIndex = 4;
-            this.tpManageUsers.Text = "Manage Users";
-            this.tpManageUsers.UseVisualStyleBackColor = true;
-            // 
-            // lblUserGroups
-            // 
-            this.lblUserGroups.AutoSize = true;
-            this.lblUserGroups.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.75F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))), System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblUserGroups.Location = new System.Drawing.Point(268, 11);
-            this.lblUserGroups.Name = "lblUserGroups";
-            this.lblUserGroups.Size = new System.Drawing.Size(225, 15);
-            this.lblUserGroups.TabIndex = 9;
-            this.lblUserGroups.Text = "Groups That User Is a Member Of:";
-            // 
-            // lstGroups
-            // 
-            this.lstGroups.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left)));
-            this.lstGroups.FormattingEnabled = true;
-            this.lstGroups.Location = new System.Drawing.Point(271, 36);
-            this.lstGroups.Name = "lstGroups";
-            this.lstGroups.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended;
-            this.lstGroups.Size = new System.Drawing.Size(502, 498);
-            this.lstGroups.TabIndex = 8;
-            this.lstGroups.MouseUp += new System.Windows.Forms.MouseEventHandler(this.lstGroups_MouseUp);
-            // 
-            // lstUsers
-            // 
-            this.lstUsers.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left)));
-            this.lstUsers.FormattingEnabled = true;
-            this.lstUsers.Location = new System.Drawing.Point(8, 36);
-            this.lstUsers.Name = "lstUsers";
-            this.lstUsers.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended;
-            this.lstUsers.Size = new System.Drawing.Size(217, 498);
-            this.lstUsers.TabIndex = 7;
-            this.lstUsers.SelectedIndexChanged += new System.EventHandler(this.lstUsers_SelectedIndexChanged);
-            this.lstUsers.MouseUp += new System.Windows.Forms.MouseEventHandler(this.lstUsers_MouseUp);
-            // 
-            // lblUsers
-            // 
-            this.lblUsers.AutoSize = true;
-            this.lblUsers.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.75F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))), System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblUsers.Location = new System.Drawing.Point(8, 11);
-            this.lblUsers.Name = "lblUsers";
-            this.lblUsers.Size = new System.Drawing.Size(44, 15);
-            this.lblUsers.TabIndex = 6;
-            this.lblUsers.Text = "Users";
-            // 
-            // tpDefault
-            // 
-            this.tpDefault.BackColor = System.Drawing.SystemColors.ButtonFace;
-            this.tpDefault.Controls.Add(this.label8);
-            this.tpDefault.Controls.Add(this.pnlGroups);
-            this.tpDefault.Location = new System.Drawing.Point(4, 22);
-            this.tpDefault.Name = "tpDefault";
-            this.tpDefault.Padding = new System.Windows.Forms.Padding(3);
-            this.tpDefault.Size = new System.Drawing.Size(776, 538);
-            this.tpDefault.TabIndex = 0;
-            this.tpDefault.Text = "Default Group";
-            // 
-            // label8
-            // 
-            this.label8.Location = new System.Drawing.Point(308, 6);
-            this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(460, 172);
-            this.label8.TabIndex = 5;
-            this.label8.Text = "label8";
-            // 
-            // pnlGroups
-            // 
-            this.pnlGroups.AutoScroll = true;
-            this.pnlGroups.Location = new System.Drawing.Point(3, 6);
-            this.pnlGroups.Name = "pnlGroups";
-            this.pnlGroups.Size = new System.Drawing.Size(299, 526);
-            this.pnlGroups.TabIndex = 4;
-            // 
-            // cmMembers
-            // 
-            this.cmMembers.Name = "cmGroupMembers";
-            this.cmMembers.Size = new System.Drawing.Size(61, 4);
-            // 
-            // removeMemberToolStripMenuItem
-            // 
-            this.removeMemberToolStripMenuItem.Name = "removeMemberToolStripMenuItem";
-            this.removeMemberToolStripMenuItem.Size = new System.Drawing.Size(165, 22);
-            this.removeMemberToolStripMenuItem.Text = "Remove Member";
-            this.removeMemberToolStripMenuItem.Click += new System.EventHandler(this.removeMemberToolStripMenuItem_Click);
-            // 
-            // cmUsers
-            // 
-            this.cmUsers.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.cmFolders.Name = "cmFolders";
+			this.cmFolders.Size = new System.Drawing.Size(249, 92);
+			// 
+			// createSetAdministratorGroupToolStripMenuItem
+			// 
+			this.createSetAdministratorGroupToolStripMenuItem.Name = "createSetAdministratorGroupToolStripMenuItem";
+			this.createSetAdministratorGroupToolStripMenuItem.Size = new System.Drawing.Size(248, 22);
+			this.createSetAdministratorGroupToolStripMenuItem.Text = "Create a Set Administrator Group";
+			this.createSetAdministratorGroupToolStripMenuItem.Click += new System.EventHandler(this.createGroupMenuItem);
+			// 
+			// createWriterGroupToolStripMenuItem
+			// 
+			this.createWriterGroupToolStripMenuItem.Name = "createWriterGroupToolStripMenuItem";
+			this.createWriterGroupToolStripMenuItem.Size = new System.Drawing.Size(248, 22);
+			this.createWriterGroupToolStripMenuItem.Text = "Create a Writer Group";
+			this.createWriterGroupToolStripMenuItem.Click += new System.EventHandler(this.createGroupMenuItem);
+			// 
+			// createROEToolStripMenuItem
+			// 
+			this.createROEToolStripMenuItem.Name = "createROEToolStripMenuItem";
+			this.createROEToolStripMenuItem.Size = new System.Drawing.Size(248, 22);
+			this.createROEToolStripMenuItem.Text = "Create a RO Editor Group";
+			this.createROEToolStripMenuItem.Click += new System.EventHandler(this.createGroupMenuItem);
+			// 
+			// createReviewerGroupToolStripMenuItem
+			// 
+			this.createReviewerGroupToolStripMenuItem.Name = "createReviewerGroupToolStripMenuItem";
+			this.createReviewerGroupToolStripMenuItem.Size = new System.Drawing.Size(248, 22);
+			this.createReviewerGroupToolStripMenuItem.Text = "Create a Reviewer Group";
+			this.createReviewerGroupToolStripMenuItem.Click += new System.EventHandler(this.createGroupMenuItem);
+			// 
+			// lstUsers
+			// 
+			this.lstUsers.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+									| System.Windows.Forms.AnchorStyles.Left)));
+			this.lstUsers.FormattingEnabled = true;
+			this.lstUsers.Location = new System.Drawing.Point(630, 21);
+			this.lstUsers.Name = "lstUsers";
+			this.lstUsers.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended;
+			this.lstUsers.Size = new System.Drawing.Size(140, 277);
+			this.lstUsers.TabIndex = 5;
+			this.lstUsers.MouseUp += new System.Windows.Forms.MouseEventHandler(this.lstUsers_MouseUp);
+			this.lstUsers.SelectedIndexChanged += new System.EventHandler(this.lstUsers_SelectedIndexChanged);
+			// 
+			// label5
+			// 
+			this.label5.AutoSize = true;
+			this.label5.Location = new System.Drawing.Point(630, 6);
+			this.label5.Name = "label5";
+			this.label5.Size = new System.Drawing.Size(34, 13);
+			this.label5.TabIndex = 4;
+			this.label5.Text = "Users";
+			// 
+			// label3
+			// 
+			this.label3.AutoSize = true;
+			this.label3.Location = new System.Drawing.Point(381, 6);
+			this.label3.Name = "label3";
+			this.label3.Size = new System.Drawing.Size(41, 13);
+			this.label3.TabIndex = 1;
+			this.label3.Text = "Groups";
+			// 
+			// lstGroups
+			// 
+			this.lstGroups.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+									| System.Windows.Forms.AnchorStyles.Left)));
+			this.lstGroups.FormattingEnabled = true;
+			this.lstGroups.Location = new System.Drawing.Point(384, 21);
+			this.lstGroups.Name = "lstGroups";
+			this.lstGroups.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended;
+			this.lstGroups.Size = new System.Drawing.Size(240, 277);
+			this.lstGroups.TabIndex = 0;
+			this.lstGroups.MouseUp += new System.Windows.Forms.MouseEventHandler(this.lstGroups_MouseUp);
+			this.lstGroups.SelectedIndexChanged += new System.EventHandler(this.lstGroups_SelectedIndexChanged);
+			// 
+			// tpDefault
+			// 
+			this.tpDefault.BackColor = System.Drawing.SystemColors.ButtonFace;
+			this.tpDefault.Controls.Add(this.label8);
+			this.tpDefault.Controls.Add(this.pnlGroups);
+			this.tpDefault.Location = new System.Drawing.Point(4, 22);
+			this.tpDefault.Name = "tpDefault";
+			this.tpDefault.Padding = new System.Windows.Forms.Padding(3);
+			this.tpDefault.Size = new System.Drawing.Size(776, 538);
+			this.tpDefault.TabIndex = 0;
+			this.tpDefault.Text = "Default Group";
+			// 
+			// label8
+			// 
+			this.label8.Location = new System.Drawing.Point(308, 6);
+			this.label8.Name = "label8";
+			this.label8.Size = new System.Drawing.Size(460, 172);
+			this.label8.TabIndex = 5;
+			this.label8.Text = "label8";
+			// 
+			// pnlGroups
+			// 
+			this.pnlGroups.AutoScroll = true;
+			this.pnlGroups.Location = new System.Drawing.Point(3, 6);
+			this.pnlGroups.Name = "pnlGroups";
+			this.pnlGroups.Size = new System.Drawing.Size(299, 526);
+			this.pnlGroups.TabIndex = 4;
+			// 
+			// cmMembers
+			// 
+			this.cmMembers.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.removeMemberToolStripMenuItem});
+			this.cmMembers.Name = "cmGroupMembers";
+			this.cmMembers.Size = new System.Drawing.Size(166, 26);
+			// 
+			// removeMemberToolStripMenuItem
+			// 
+			this.removeMemberToolStripMenuItem.Name = "removeMemberToolStripMenuItem";
+			this.removeMemberToolStripMenuItem.Size = new System.Drawing.Size(165, 22);
+			this.removeMemberToolStripMenuItem.Text = "Remove Member";
+			this.removeMemberToolStripMenuItem.Click += new System.EventHandler(this.removeMemberToolStripMenuItem_Click);
+			// 
+			// cmUsers
+			// 
+			this.cmUsers.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.addUserToolStripMenuItem,
             this.editUserToolStripMenuItem,
-            this.deleteUserToolStripMenuItem});
-            this.cmUsers.Name = "cmUsers";
-            this.cmUsers.Size = new System.Drawing.Size(145, 92);
-            // 
-            // addUserToolStripMenuItem
-            // 
-            this.addUserToolStripMenuItem.Name = "addUserToolStripMenuItem";
-            this.addUserToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
-            this.addUserToolStripMenuItem.Text = "Add User";
-            this.addUserToolStripMenuItem.Click += new System.EventHandler(this.addUserToolStripMenuItem_Click);
-            // 
-            // editUserToolStripMenuItem
-            // 
-            this.editUserToolStripMenuItem.Name = "editUserToolStripMenuItem";
-            this.editUserToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
-            this.editUserToolStripMenuItem.Text = "Edit User";
-            this.editUserToolStripMenuItem.Click += new System.EventHandler(this.editUserToolStripMenuItem_Click);
-            // 
-            // deleteUserToolStripMenuItem
-            // 
-            this.deleteUserToolStripMenuItem.Name = "deleteUserToolStripMenuItem";
-            this.deleteUserToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
-            this.deleteUserToolStripMenuItem.Text = "Delete User";
-            this.deleteUserToolStripMenuItem.Click += new System.EventHandler(this.deleteUserToolStripMenuItem_Click);
-            // 
-            // dlgManageSecurity
-            // 
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
-            this.ClientSize = new System.Drawing.Size(784, 564);
-            this.Controls.Add(this.tcSecurity);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-            this.MaximizeBox = false;
-            this.MinimizeBox = false;
-            this.Name = "dlgManageSecurity";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.Text = "Manage Security";
-            this.Load += new System.EventHandler(this.dlgManageSecurity_Load);
-            this.tcSecurity.ResumeLayout(false);
-            this.tpManageFolders.ResumeLayout(false);
-            this.tpManageFolders.PerformLayout();
-            this.cmFolders.ResumeLayout(false);
-            this.tpManageGroups.ResumeLayout(false);
-            this.tpManageGroups.PerformLayout();
-            this.pnlMembers.ResumeLayout(false);
-            this.tpManageUsers.ResumeLayout(false);
-            this.tpManageUsers.PerformLayout();
-            this.tpDefault.ResumeLayout(false);
-            this.cmUsers.ResumeLayout(false);
-            this.ResumeLayout(false);
+            this.deleteUserToolStripMenuItem,
+            this.addMemberToolStripMenuItemUser});
+			this.cmUsers.Name = "cmUsers";
+			this.cmUsers.Size = new System.Drawing.Size(153, 114);
+			// 
+			// addUserToolStripMenuItem
+			// 
+			this.addUserToolStripMenuItem.Name = "addUserToolStripMenuItem";
+			this.addUserToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+			this.addUserToolStripMenuItem.Text = "Add User";
+			this.addUserToolStripMenuItem.Click += new System.EventHandler(this.addUserToolStripMenuItem_Click);
+			// 
+			// editUserToolStripMenuItem
+			// 
+			this.editUserToolStripMenuItem.Name = "editUserToolStripMenuItem";
+			this.editUserToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+			this.editUserToolStripMenuItem.Text = "Edit User";
+			this.editUserToolStripMenuItem.Click += new System.EventHandler(this.editUserToolStripMenuItem_Click);
+			// 
+			// deleteUserToolStripMenuItem
+			// 
+			this.deleteUserToolStripMenuItem.Name = "deleteUserToolStripMenuItem";
+			this.deleteUserToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+			this.deleteUserToolStripMenuItem.Text = "Delete User";
+			this.deleteUserToolStripMenuItem.Click += new System.EventHandler(this.deleteUserToolStripMenuItem_Click);
+			// 
+			// addMemberToolStripMenuItemUser
+			// 
+			this.addMemberToolStripMenuItemUser.Name = "addMemberToolStripMenuItemUser";
+			this.addMemberToolStripMenuItemUser.Size = new System.Drawing.Size(152, 22);
+			this.addMemberToolStripMenuItemUser.Text = "Add Member";
+			this.addMemberToolStripMenuItemUser.Click += new System.EventHandler(this.addMemberToolStripMenuItem_Click);
+			// 
+			// cmGroups
+			// 
+			this.cmGroups.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.deleteGroupToolStripMenuItem,
+            this.addMemberToolStripMenuItemGroup});
+			this.cmGroups.Name = "cmGroups";
+			this.cmGroups.Size = new System.Drawing.Size(145, 48);
+			// 
+			// deleteGroupToolStripMenuItem
+			// 
+			this.deleteGroupToolStripMenuItem.Name = "deleteGroupToolStripMenuItem";
+			this.deleteGroupToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
+			this.deleteGroupToolStripMenuItem.Text = "Delete Group";
+			this.deleteGroupToolStripMenuItem.Click += new System.EventHandler(this.deleteGroupToolStripMenuItem_Click);
+			// 
+			// addMemberToolStripMenuItemGroup
+			// 
+			this.addMemberToolStripMenuItemGroup.Name = "addMemberToolStripMenuItemGroup";
+			this.addMemberToolStripMenuItemGroup.Size = new System.Drawing.Size(144, 22);
+			this.addMemberToolStripMenuItemGroup.Text = "Add Member";
+			this.addMemberToolStripMenuItemGroup.Click += new System.EventHandler(this.addMemberToolStripMenuItem_Click);
+			// 
+			// dlgManageSecurity
+			// 
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
+			this.ClientSize = new System.Drawing.Size(784, 564);
+			this.Controls.Add(this.tcSecurity);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "dlgManageSecurity";
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Manage Security";
+			this.Load += new System.EventHandler(this.dlgManageSecurity_Load);
+			this.tcSecurity.ResumeLayout(false);
+			this.tpGroupUsers.ResumeLayout(false);
+			this.tpGroupUsers.PerformLayout();
+			this.pnlMembers.ResumeLayout(false);
+			this.cmFolders.ResumeLayout(false);
+			this.tpDefault.ResumeLayout(false);
+			this.cmMembers.ResumeLayout(false);
+			this.cmUsers.ResumeLayout(false);
+			this.cmGroups.ResumeLayout(false);
+			this.ResumeLayout(false);
 
 		}
 
@@ -445,14 +357,20 @@ namespace VEPROMS
 
 		private System.Windows.Forms.TabControl tcSecurity;
 		private System.Windows.Forms.TabPage tpDefault;
-		private System.Windows.Forms.TabPage tpManageFolders;
+		private System.Windows.Forms.TabPage tpGroupUsers;
+		private System.Windows.Forms.ListBox lstGroups;
+		private System.Windows.Forms.Label lblMembers;
+		private System.Windows.Forms.Label label3;
+		private System.Windows.Forms.ContextMenuStrip cmGroups;
+		private System.Windows.Forms.ListBox lstUsers;
+		private System.Windows.Forms.Label label5;
 		private System.Windows.Forms.ContextMenuStrip cmUsers;
 		private System.Windows.Forms.ToolStripMenuItem addUserToolStripMenuItem;
 		private System.Windows.Forms.ToolStripMenuItem editUserToolStripMenuItem;
 		private System.Windows.Forms.ToolStripMenuItem deleteUserToolStripMenuItem;
-        private System.Windows.Forms.ContextMenuStrip cmMembers;
-        private System.Windows.Forms.ToolStripMenuItem removeMemberToolStripMenuItem;
-        private System.Windows.Forms.Label label6;
+		private System.Windows.Forms.ContextMenuStrip cmMembers;
+		private System.Windows.Forms.ToolStripMenuItem removeMemberToolStripMenuItem;
+		private System.Windows.Forms.Label label6;
 		private System.Windows.Forms.TreeView tvFolders;
 		private System.Windows.Forms.ContextMenuStrip cmFolders;
 		private System.Windows.Forms.ToolStripMenuItem createSetAdministratorGroupToolStripMenuItem;
@@ -461,23 +379,10 @@ namespace VEPROMS
 		private System.Windows.Forms.ToolStripMenuItem createReviewerGroupToolStripMenuItem;
 		private System.Windows.Forms.Panel pnlGroups;
 		private System.Windows.Forms.Label label8;
-        private System.Windows.Forms.TabPage tpManageGroups;
-        private System.Windows.Forms.TabPage tpManageUsers;
-        private System.Windows.Forms.Panel pnlMembers;
-        private System.Windows.Forms.ListBox lstMembers;
-        private System.Windows.Forms.Label lblMembers;
-        private System.Windows.Forms.ListBox lstUsers;
-        private System.Windows.Forms.Label lblUsers;
-        private System.Windows.Forms.Label label3;
-        private System.Windows.Forms.ComboBox cbGroupSelection;
-        private System.Windows.Forms.ListBox lstNonMembers;
-        private System.Windows.Forms.Button btnDeleteGroup;
-        private System.Windows.Forms.Label lbNonMembers;
-        private System.Windows.Forms.ListBox lstGroups;
-        private System.Windows.Forms.Button btnAddMember;
-        private System.Windows.Forms.Button btnRemoveMember;
-        private System.Windows.Forms.ToolTip tt;
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.Label lblUserGroups;
-    }
+		private System.Windows.Forms.ToolStripMenuItem deleteGroupToolStripMenuItem;
+		private System.Windows.Forms.Panel pnlMembers;
+		private System.Windows.Forms.ListBox lstMembers;
+		private System.Windows.Forms.ToolStripMenuItem addMemberToolStripMenuItemUser;
+		private System.Windows.Forms.ToolStripMenuItem addMemberToolStripMenuItemGroup;
+	}
 }

PROMS/VEPROMS User Interface/dlgManageSecurity.cs

@@ -7,500 +7,30 @@ using System.Text;
 using System.Windows.Forms;
 using VEPROMS.CSLA.Library;
 using Volian.Base.Library;
-using Volian.Controls.Library;
-using System.Linq;
 
 
 namespace VEPROMS
 {
-	//C2024-047 Redesign PROMS Security Dialog
 	public partial class dlgManageSecurity : Form
 	{
 		#region Log4Net
 		private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
 		#endregion
-
-		#region Main Form / Shared Code
 		private GroupInfoList myGroupInfoList;
 		private UserInfoList myUserInfoList;
 		private List<MembershipInfo> myMembershipInfoList;
 		private Folder myFolder;
-
 		public dlgManageSecurity()
 		{
 			InitializeComponent();
 		}
 		private void dlgManageSecurity_Load(object sender, EventArgs e)
 		{
-			//load all folders
 			myFolder = Folder.Get(1);
-
-			//Default to Users Tab
-			tcSecurity.SelectedIndex = 2;
+			SetupSecurity();
+			SetupGroups();
 		}
-
-		//This is called when the Index Changes for main tab Control
-		//it loads info for the current tab
-		private void changedTab(object sender, EventArgs e)
-		{
-			LoadRefreshGroupUsers();
-
-			switch (tcSecurity.SelectedIndex)
-			{
-				//Manage Folders
-				case 0:
-					SetupFolderOptions();
-					break;
-				//Manage Groups
-				case 1:
-					SetupGroups();
-					break;
-				//Manage Users (note that this is the default)
-				case 2:
-					SetupUserOptions();
-					break;
-                //Default Options tab
-				case 3:
-					SetupDefaultGroupOptions();
-					break;
-			}
-		}
-		//Loads a refreshed list of Groups and Users
-		private void LoadRefreshGroupUsers()
-		{
-			GroupInfoList.Reset();
-			myGroupInfoList = GroupInfoList.Get();
-			UserInfoList.Reset();
-			myUserInfoList = UserInfoList.Get();
-		}
-		#endregion
-
-		#region Manage Folders
-		//Sets up Folders
-		private void SetupFolderOptions()
-		{
-			if (tvFolders.Nodes.Count == 0)
-			{
-				FolderInfo fi = FolderInfo.Get(1);
-				LoadChildFolders(fi, null);
-			}
-		}
-		//loads child folders in tree view
-		private void LoadChildFolders(FolderInfo fi, TreeNode tn)
-		{
-			if (tn == null)
-			{
-				tn = tvFolders.Nodes.Add(fi.Name);
-				tn.Tag = fi;
-			}
-			else
-			{
-				tn = tn.Nodes.Add(fi.Name);
-				tn.Tag = fi;
-			}
-			if (fi.ChildFolderCount > 0)
-			{
-				foreach (FolderInfo fic in fi.SortedChildFolders)
-				{
-					LoadChildFolders(fic, tn);
-				}
-			}
-		}
-		//Handles Creating a New Group
-		private void createGroupMenuItem(object sender, EventArgs e)
-		{
-			try
-			{
-				ToolStripDropDownItem tsddi = sender as ToolStripDropDownItem;
-				TreeNode tn = tvFolders.SelectedNode;
-				FolderInfo fi = tn.Tag as FolderInfo;
-				AddNewGroup(tsddi.Text, fi);
-			}
-			catch (Exception ex)
-			{
-				_MyLog.Warn("createGroupMenuItem", ex);
-			}
-		}
-		private void AddNewGroup(string txt, FolderInfo fi)
-		{
-			txt = txt.Replace("Create", "").Replace(" a ", "").Replace("Group", "").Trim();
-			RoleInfoList ril = RoleInfoList.Get();
-			// B2022-080: cannot add a new group in Proms security.  if the sql database's 'Roles' table was not initialized with the default roles, such as Set Administrator,
-			//   Writer, Reviewer, RO Editor, the Adding of new groups won't work.  Databases should have this loaded by default.
-			//   Promsfixes has queries that insert these, but only gets run if there are no assignments (see commands under --define Roles)
-			if (ril == null || ril.Count < 2)
-			{
-				MessageBox.Show("Roles table is missing entries.\r\nPlease contact Volian to create other groups.", "Cannot create groups", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-				return;
-			}
-
-            foreach (var ri in ril.Where(ri => ri.Name == txt))
-            {
-                string gin = string.Format("{0}s - {1}", ri.Name, fi.Name);
-                if (!myGroupInfoList.Any(gi => gi.GroupName == gin))
-                {
-                    Group group = Group.MakeGroup(gin, null, null);
-                    Assignment.MakeAssignment(group, Role.Get(ri.RID), Folder.Get(fi.FolderID), null);
-                }
-            }
-
-            LoadRefreshGroupUsers();
-
-			// C2026-004 - messagebox when create group
-			MessageBox.Show($"{txt} group successfully created.", "Create group", MessageBoxButtons.OK, MessageBoxIcon.Information);
-		}
-		private void tvFolders_NodeMouseClick(object sender, TreeNodeMouseClickEventArgs e)
-		{
-			tvFolders.SelectedNode = e.Node;
-		}
-
-		#endregion
-
-		#region Manage Groups
-		//Sets up Group Options
 		private void SetupGroups()
-		{
-			cbGroupSelection.Items.Clear();
-			foreach (GroupInfo gi in myGroupInfoList)
-				cbGroupSelection.Items.Add(gi.GroupName);
-			cbGroupSelection.SelectedIndex = 0;
-		}
-
-		private void cbGroupSelection_SelectedIndexChanged(object sender, EventArgs e) => updateMembershipLists();
-
-		//Updates the lists of members / nonMembers
-		private void updateMembershipLists()
-		{
-			myMembershipInfoList = new List<MembershipInfo>();
-			if (cbGroupSelection.SelectedIndex > -1)
-			{
-				GroupInfo gi = myGroupInfoList[cbGroupSelection.SelectedIndex];
-				gi.RefreshGroupMemberships();
-				if (gi.GroupMembershipCount > 0)
-					myMembershipInfoList.AddRange(gi.GroupMemberships.Where(mi => mi.EndDate == null || mi.EndDate == string.Empty).OrderBy(x => x.MyUserUserID));
-			}
-			lstMembers.DataSource = myMembershipInfoList;
-			lstMembers.ValueMember = "UID";
-			lstMembers.DisplayMember = "MyUserUserID";
-
-			//set NonMembers to Users that are not in Members
-			lstNonMembers.DataSource = myUserInfoList.Select(x => x.UserID).Except(myMembershipInfoList.Select(x => x.MyUser.UserID)).ToList();
-		}
-
-		//Add a Member to a Group
-		private void addMember_Click(object sender, EventArgs e)
-		{
-			// B2026-007 PROMS Security - don't error when add a user to a group but no group selected
-			if (lstNonMembers.SelectedValue != null)
-			{
-				int groupIndex = cbGroupSelection.SelectedIndex;
-				string selectedUserID = lstNonMembers.SelectedValue.ToString();
-				int selectedUID = UserInfo.GetByUserID(selectedUserID).UID;
-				GroupInfo gi = myGroupInfoList[groupIndex];
-				User selectedUser = User.Get(selectedUID);
-
-				Membership.MakeMembership(selectedUser, Group.Get(gi.GID), null, "");
-				updateMembershipLists();
-				lstNonMembers.SelectedIndex = -1;
-
-				int index = lstMembers.FindString(selectedUserID);
-				lstMembers.SetSelected(index, true);
-			}
-		}
-
-		//Remove a Member From a Group
-		private void removeMember_Click(object sender, EventArgs e)
-		{
-			if (lstMembers.SelectedIndex > -1)
-			{
-				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.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
-				{
-					if (mi.MyGroup.GroupName == "Administrators" && mi.MyGroup.GroupMemberships.Count(mm => mm.EndDate == null || mm.EndDate == string.Empty) == 1)
-					{
-						MessageBox.Show("You must have at least 1 user assigned to the Administrators group", "One Administrator Required", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-						return;
-					}
-					Membership m = Membership.Get(mi.UGID);
-					m.EndDate = DateTime.Now.ToShortDateString();
-					m.Save();
-					updateMembershipLists();
-					lstMembers.SelectedIndex = -1;
-					lstNonMembers.SelectedItem = selectedUserID;
-				}
-			}
-		}
-
-		//Deletes the Currently Selected Group
-		private void deleteGroup_Click(object sender, EventArgs e)
-		{
-			if (cbGroupSelection.SelectedIndex < 0)
-			{
-				MessageBox.Show("You must select a group to delete", "No Group Selected", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-				return;
-			}
-			GroupInfo gi = myGroupInfoList[cbGroupSelection.SelectedIndex];
-			if(myFolder.FolderConfig.Security_Group == gi.GID)
-			{
-				MessageBox.Show("Cannot Delete Default Group", "Attempt to Delete Default", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-				return;
-			}
-			bool deleteOK = true;
-            if (gi.GroupMembershipCount > 0 && gi.GroupMemberships.Any(mi => mi.EndDate == null || mi.EndDate == string.Empty))
-                deleteOK = false;
-            if (!deleteOK)
-			{
-				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.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
-			{
-				Group.Delete(gi.GID);
-				LoadRefreshGroupUsers();
-				SetupGroups();
-			}
-		}
-
-		#endregion
-
-		#region Manage Users
-
-		//Sets up UserOptions
-		private void SetupUserOptions()
-		{
-			lstUsers.Items.Clear();
-			foreach (UserInfo ui in myUserInfoList)
-				lstUsers.Items.Add(ui.UserID);
-			lstUsers.SelectedIndex = -1;
-			lstGroups.DataSource = null;
-		}
-
-		#region Manage Users - User Options
-
-		//Build Membership list based on selected user
-		private void lstUsers_SelectedIndexChanged(object sender, EventArgs e)
-		{
-			myMembershipInfoList = new List<MembershipInfo>();
-			if (lstUsers.SelectedIndex > -1)
-			{
-				UserInfo ui = myUserInfoList[lstUsers.SelectedIndex];
-				if (ui.UserMembershipCount > 0)
-				{
-					myMembershipInfoList.AddRange(ui.UserMemberships.Where(mi => mi.EndDate == null || mi.EndDate == string.Empty));
-				}
-			}
-
-			lstGroups.DataSource = myMembershipInfoList;
-			lstGroups.ValueMember = "UGID";
-			lstGroups.DisplayMember = "MyGroupName";
-		}
-
-		//Select User and set up Mouse Click Menus based on
-		//where click in User Box
-		private void lstUsers_MouseUp(object sender, MouseEventArgs e)
-		{
-			if (e.Button == MouseButtons.Right)
-			{
-				int k = lstUsers.IndexFromPoint(e.Location);
-				if (k >= 0)
-				{
-					lstUsers.SelectedIndex = k;
-					editUserToolStripMenuItem.Visible = deleteUserToolStripMenuItem.Visible = true;
-				}
-				else
-				{
-					addUserToolStripMenuItem.Visible = true;
-					editUserToolStripMenuItem.Visible = deleteUserToolStripMenuItem.Visible = false;
-				}
-
-				cmUsers.Show(lstUsers, e.Location);
-			}
-			else if (e.Button == MouseButtons.Left)
-			{
-				int k = lstUsers.IndexFromPoint(e.Location);
-				if (k >= 0)
-				{
-					lstUsers.SelectedIndex = k;
-				}
-			}
-		}
-
-		//Adds a new User
-		private void addUserToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			User u = User.MakeUser("[Enter New UserID]", "", "", "", "", "", "", "", "", "", "", DateTime.Now, "");
-			frmManageUser frm = new frmManageUser("add");
-			frm.MyUser = u;
-			frm.Text = "Enter New UserID";   //C2026-002 Change Title bar on Add/Edit User
-			if (frm.ShowDialog(this) == DialogResult.OK)
-			{
-				u = frm.MyUser;
-				u.Save();
-				Membership.MakeMembership(u, Group.Get(myFolder.FolderConfig.Security_Group), "", "");
-
-				//Update the User list to reflect the added user
-				LoadRefreshGroupUsers();
-				SetupUserOptions();
-				lstUsers.SelectedItem = u.UserID;
-			}
-			else
-			{
-				u.Delete();
-			}
-		}
-
-		//Edit a User's details
-		private void editUserToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			if (lstUsers.SelectedIndex == -1)
-			{
-				MessageBox.Show("You must select a user to edit", "No User Selected", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-				return;
-			}
-			UserInfo ui = myUserInfoList[lstUsers.SelectedIndex];
-			using (User u = User.Get(ui.UID))
-			{
-				frmManageUser frm = new frmManageUser("edit");
-				frm.MyUser = u;
-				if (frm.ShowDialog(this) == DialogResult.OK)
-				{
-					frm.MyUser.Save();
-
-					//Update the User list to reflect the edited user
-					//this is done in case the UserID is updated so the list updates to reflect that
-					LoadRefreshGroupUsers();
-					SetupUserOptions();
-					lstUsers.SelectedItem = u.UserID;
-				}
-			}
-		}
-
-		//Delete a User
-		private void deleteUserToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			if (lstUsers.SelectedIndex == -1)
-			{
-				MessageBox.Show("You must select a user to delete", "No User Selected", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-				return;
-			}
-			UserInfo ui = myUserInfoList[lstUsers.SelectedIndex];
-			SessionInfoList sil = SessionInfoList.Get();
-			foreach (SessionInfo si in sil)
-			{
-				if (si.UserID == ui.UserID && (si.DTSEnd == null))
-				{
-					MessageBox.Show("The user selected has an active session.  You may not delete the user at this time.", "User Active Session", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-					return;
-				}
-			}
-			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.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
-			{
-				foreach (MembershipInfo minfo in ui.UserMemberships.Where(mi => mi.EndDate == null || mi.EndDate == string.Empty))
-                {
-					Membership m = Membership.Get(minfo.UGID);
-					m.EndDate = DateTime.Now.ToShortDateString();
-					m.Save();
-				}
-
-				User.Delete(ui.UID);
-
-				//Update the User list to reflect the deleted user
-				LoadRefreshGroupUsers();
-				SetupUserOptions();
-				lstUsers.SelectedIndex = -1;
-				lstGroups.DataSource = null;
-			}
-		}
-
-		#endregion
-
-		#region Manage Users - Member Options
-
-		//Adds Context Menu for when a Group is selected
-		private void lstGroups_MouseUp(object sender, MouseEventArgs e)
-		{
-			cmMembers.Items.Clear();
-			lstGroups.SelectedIndex = -1;
-
-			//shouldn’t be bringing up a menu in the Group box unless a user is 1st selected in the Users box.
-			if (e.Button == MouseButtons.Right && lstUsers.SelectedIndex > -1)
-			{
-				int k = lstGroups.IndexFromPoint(e.Location);
-				if (k >= 0)
-				{
-					lstGroups.SelectedIndex = k;
-					cmMembers.Items.Add(this.removeMemberToolStripMenuItem);
-
-				}
-
-				var groupsCanAddTo = myGroupInfoList.Select(x => new { x.GroupName, x.GID }).Except(myMembershipInfoList.Select(x => new { x.MyGroup.GroupName, x.GID }));
-				foreach (var possiblegroup in groupsCanAddTo)
-				{
-					ToolStripMenuItemwithValue AddToMenuItem = new ToolStripMenuItemwithValue($"Add as Member to Group: {possiblegroup.GroupName}", possiblegroup.GID);
-					AddToMenuItem.Click += addMemberToolStripMenuItem_Click;
-					cmMembers.Items.Add(AddToMenuItem);
-				}
-
-				cmMembers.Show(lstGroups, e.Location);
-
-			}
-			else if (e.Button == MouseButtons.Left)
-			{
-				int k = lstGroups.IndexFromPoint(e.Location);
-				if (k >= 0)
-				{
-					lstGroups.SelectedIndex = k;
-				}
-			}
-		}
-
-		//Adds a User to a Group
-		private void addMemberToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			ToolStripMenuItemwithValue item = (ToolStripMenuItemwithValue)sender;
-			int userIndex = lstUsers.SelectedIndex;
-			UserInfo ui = myUserInfoList[userIndex];
-
-			Membership.MakeMembership(User.Get(ui.UID), Group.Get((int) item.Value), null, "");
-
-			//Update the Group list to reflect the added group
-			LoadRefreshGroupUsers();
-			lstUsers_SelectedIndexChanged(sender, e);
-		}
-
-		//Removes a User from a Group
-		private void removeMemberToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			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.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
-			{
-                if (mi.MyGroup.GroupName == "Administrators" && mi.MyGroup.GroupMemberships.Count(mm => mm.EndDate == null || mm.EndDate == string.Empty) == 1)
-                {
-                    MessageBox.Show("You must have at least 1 user assigned to the Administrators group", "One Administrator Required", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-                    return;
-                }
-                Membership m = Membership.Get(mi.UGID);
-				m.EndDate = DateTime.Now.ToShortDateString();
-				m.Save();
-
-				//Update the Group list to reflect the removed group
-				LoadRefreshGroupUsers();
-				lstUsers_SelectedIndexChanged(sender, e);
-			}
-		}
-
-		#endregion
-
-		#endregion
-
-		#region Default Options
-		//Sets up Default Group options for Default Tab
-		private void SetupDefaultGroupOptions()
 		{
 			pnlGroups.Controls.Clear();
 			foreach (GroupInfo gi in myGroupInfoList)
@@ -526,7 +56,6 @@ namespace VEPROMS
 				}
 			}
 		}
-		//Handles changing the default group
 		private void rb_CheckedChanged(object sender, EventArgs e)
 		{
 			RadioButton rb = sender as RadioButton;
@@ -535,7 +64,446 @@ namespace VEPROMS
 			myFolder.FolderConfig.Security_Group = gi.GID;
 			myFolder.Save();
 		}
-		#endregion
-
+		private void SetupSecurity()
+		{
+			if (tvFolders.Nodes.Count == 0)
+			{
+				FolderInfo fi = FolderInfo.Get(1);
+				LoadChildFolders(fi, null);
+			}
+			lstMembers.Items.Clear();
+			lstUsers.Items.Clear();
+			lstGroups.Items.Clear();
+			GroupInfoList.Reset();
+			UserInfoList.Reset();
+			myGroupInfoList = GroupInfoList.Get();
+			myUserInfoList = UserInfoList.Get();
+			foreach (GroupInfo gi in myGroupInfoList)
+				lstGroups.Items.Add(gi.GroupName);
+			lstGroups.SelectedIndex = 0;
+			foreach (UserInfo ui in myUserInfoList)
+				lstUsers.Items.Add(ui.UserID);
+			lstGroups.SelectedIndex = -1;
+			lstUsers.SelectedIndex = -1;
+		}
+		private void LoadChildFolders(FolderInfo fi, TreeNode tn)
+		{
+			if (tn == null)
+			{
+				tn = tvFolders.Nodes.Add(fi.Name);
+				tn.Tag = fi;
+			}
+			else
+			{
+				tn = tn.Nodes.Add(fi.Name);
+				tn.Tag = fi;
+			}
+			if (fi.ChildFolderCount > 0)
+			{
+				foreach (FolderInfo fic in fi.SortedChildFolders)
+				{
+					LoadChildFolders(fic, tn);
+				}
+			}
+		}
+		private void lstGroups_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			lblMembers.Text = "Selected Group Users";
+			myMembershipInfoList = new List<MembershipInfo>();
+			lstMembers.Items.Clear();
+			if (lstGroups.SelectedIndex > -1)
+			{
+				GroupInfo gi = myGroupInfoList[lstGroups.SelectedIndex];
+				if (gi.GroupMembershipCount > 0)
+					foreach (MembershipInfo mi in gi.GroupMemberships)
+					{
+						if (mi.EndDate == null || mi.EndDate == string.Empty)
+						{
+							myMembershipInfoList.Add(mi);
+							lstMembers.Items.Add(mi.MyUser.UserID);
+						}
+					}
+			}
+		}
+		private void addMemberToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			int groupIndex = lstGroups.SelectedIndex;
+			int userIndex = lstUsers.SelectedIndex;
+			GroupInfo gi = myGroupInfoList[groupIndex];
+			UserInfo ui = myUserInfoList[userIndex];
+			Membership.MakeMembership(User.Get(ui.UID), Group.Get(gi.GID), null, "");
+			SetupSecurity();
+			if ((sender as ToolStripMenuItem).Name.EndsWith("Group"))
+			{
+				lstUsers.SelectedIndex = userIndex;
+				lstGroups.SelectedIndex = groupIndex;
+			}
+			else
+			{
+				lstGroups.SelectedIndex = groupIndex;
+				lstUsers.SelectedIndex = userIndex;
+			}
+		}
+		private void removeMemberToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			MembershipInfo mi = myMembershipInfoList[lstMembers.SelectedIndex];
+			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)
+			{
+				int groupIndex = lstGroups.SelectedIndex;
+				int userIndex = lstUsers.SelectedIndex;
+				if (mi.MyGroup.GroupName == "Administrators")
+				{
+					int k = 0;
+					foreach(MembershipInfo mm in mi.MyGroup.GroupMemberships)
+						if(mm.EndDate == null || mm.EndDate == string.Empty)
+							k++;
+					if (k == 1)
+					{
+						MessageBox.Show("You must have at least 1 user assigned to the Adminstrators group", "One Administrator Required", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+						return;
+					}
+				}
+				Membership m = Membership.Get(mi.UGID);
+				m.EndDate = DateTime.Now.ToShortDateString();
+				m.Save();
+				SetupSecurity();
+				lstGroups.SelectedIndex = groupIndex;
+				lstUsers.SelectedIndex = userIndex;
+			}
+			//  foreach (int gg in lstGroups.SelectedIndices)
+			//  {
+			//    GroupInfo gi = myGroupInfoList[gg];
+			//    if (gi.GroupName == "Administrators" && gi.GroupMembershipCount == 1)
+			//    {
+			//      MessageBox.Show("You must have at least 1 user assigned to the Adminstrators group", "Can Not Delete User", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+			//      return;
+			//    }
+			//    foreach (MembershipInfo mi in gi.GroupMemberships)
+			//    {
+			//      foreach (int mm in lstGroupUsers.SelectedIndices)
+			//      {
+			//        MembershipInfo mig = myMembershipInfoList[mm];
+			//        if (mi.MyUser.UID == mig.MyUser.UID)
+			//        {
+			//          Membership m = Membership.Get(mi.UGID);
+			//          m.EndDate = DateTime.Now.ToShortDateString();
+			//          m.Save();
+			//        }
+			//      }
+			//    }
+			//  }
+			//  SetupSecurity();
+			//}
+		}
+		private void addUserToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			User u = User.MakeUser("[Enter New UserID]","", "", "", "", "", "", "", "", "", "",DateTime.Now,"");
+			frmManageUser frm = new frmManageUser("add");
+			frm.MyUser = u;
+			if (frm.ShowDialog(this) == DialogResult.OK)
+			{
+				u = frm.MyUser;
+				u.Save();
+				Membership.MakeMembership(u, Group.Get(myFolder.FolderConfig.Security_Group), "", "");
+				SetupSecurity();
+			}
+			else
+			{
+				u.Delete();
+			}
+		}
+		private void editUserToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			if (lstUsers.SelectedIndex == -1)
+			{
+				MessageBox.Show("You must select a user to edit", "No User Selected", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+				return;
+			}
+			UserInfo ui = myUserInfoList[lstUsers.SelectedIndex];
+			using (User u = User.Get(ui.UID))
+			{
+				frmManageUser frm = new frmManageUser("edit");
+				frm.MyUser = u;
+				if (frm.ShowDialog(this) == DialogResult.OK)
+				{
+					frm.MyUser.Save();
+          SetupSecurity();
+        }
+			}
+		}
+		private void deleteUserToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			if (lstUsers.SelectedIndex == -1)
+			{
+				MessageBox.Show("You must select a user to delete", "No User Selected", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+				return;
+			}
+			UserInfo ui = myUserInfoList[lstUsers.SelectedIndex];
+			SessionInfoList sil = SessionInfoList.Get();
+			foreach (SessionInfo si in sil)
+			{
+				if (si.UserID == ui.UserID && (si.DTSEnd == null))
+				{
+					MessageBox.Show("The user selected has an active session.  You may not delete the user at this time.", "User Active Session", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+					return;
+				}
+			}
+			int k = 0;
+			if (ui.UserMembershipCount > 0)
+			{
+				foreach (MembershipInfo mi in ui.UserMemberships)
+				{
+					if (mi.EndDate == null || mi.EndDate == string.Empty)
+						k++;
+				}
+			}
+			if (k > 0)
+			{
+				MessageBox.Show("You must remove user from all groups that user is a member of in order to delete user", "User Has Memberships", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+				return;
+			}
+			if (MessageBox.Show("Are you sure you want to delete this user?", "Confirm Deleting User", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question) == DialogResult.Yes)
+			{
+				User.Delete(ui.UID);
+				SetupSecurity();
+			}
+			//to do delete user
+			//end date user memberships
+			//delete user
+		}
+		private void createGroupMenuItem(object sender, EventArgs e)
+		{
+			try
+			{
+				ToolStripDropDownItem tsddi = sender as ToolStripDropDownItem;
+				TreeNode tn = tvFolders.SelectedNode;
+				FolderInfo fi = tn.Tag as FolderInfo;
+				AddNewGroup(tsddi.Text, fi);
+				SetupSecurity();
+			}
+			catch (Exception ex)
+			{
+				_MyLog.Warn("createGroupMenuItem", ex);
+			}
+		}
+		private void AddNewGroup(string txt, FolderInfo fi)
+		{
+			txt = txt.Replace("Create", "").Replace(" a ", "").Replace("Group", "").Trim();
+			RoleInfoList ril = RoleInfoList.Get();
+			// B2022-080: cannot add a new group in Proms security.  if the sql database's 'Roles' table was not initialized with the default roles, such as Set Administrator,
+			//   Writer, Reviewer, RO Editor, the Adding of new groups won't work.  Databases should have this loaded by default.
+			//   Promsfixes has queries that insert these, but only gets run if there are no assignments (see commands under --define Roles)
+			if (ril == null || ril.Count < 2)
+			{
+				MessageBox.Show("Roles table is missing entries.\r\nPlease contact Volian to create other groups.", "Cannot create groups", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+				return;
+			}
+			foreach(RoleInfo ri in ril)
+			{
+				if (ri.Name == txt)
+				{
+					string gin = string.Format("{0}s - {1}", ri.Name, fi.Name);
+					bool addOK = true;
+					foreach (GroupInfo gi in myGroupInfoList)
+					{
+						if (gin == gi.GroupName)
+						{
+							addOK = false;
+							break;
+						}
+					}
+					if (addOK)
+					{
+						Group group = Group.MakeGroup(gin, null, null);
+						Assignment.MakeAssignment(group, Role.Get(ri.RID), Folder.Get(fi.FolderID), null);
+					}
+				}
+			}
+			GroupInfoList.Reset();
+			myGroupInfoList = GroupInfoList.Get();
+			SetupGroups();
+		}
+		private void lstUsers_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			lblMembers.Text = "Selected User Groups";
+			myMembershipInfoList = new List<MembershipInfo>();
+			lstMembers.Items.Clear();
+			if (lstUsers.SelectedIndex > -1)
+			{
+				UserInfo ui = myUserInfoList[lstUsers.SelectedIndex];
+				if (ui.UserMembershipCount > 0)
+				{
+					foreach (MembershipInfo mi in ui.UserMemberships)
+					{
+						if (mi.EndDate == null || mi.EndDate == string.Empty)
+						{
+							myMembershipInfoList.Add(mi);
+							lstMembers.Items.Add(mi.MyGroup.GroupName);
+						}
+					}
+				}
+			}
+		}
+		private void tvFolders_NodeMouseClick(object sender, TreeNodeMouseClickEventArgs e)
+		{
+			tvFolders.SelectedNode = e.Node;
+		}
+		private void deleteGroupToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			if (lstGroups.SelectedIndex < 0)
+			{
+				MessageBox.Show("You must select a group to delete", "No Group Selected", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+				return;
+			}
+			GroupInfo gi = myGroupInfoList[lstGroups.SelectedIndex];
+			if(myFolder.FolderConfig.Security_Group == gi.GID)
+			{
+				MessageBox.Show("Cannot Delete Default Group", "Attempt to Delete Default", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+				return;
+			}
+			bool deleteOK = true;
+			if(gi.GroupMembershipCount > 0)
+			{
+				foreach (MembershipInfo mi in gi.GroupMemberships)
+				{
+					if (mi.EndDate == null || mi.EndDate == string.Empty)
+					{
+						deleteOK = false;
+						break;
+					}
+				}
+			}
+			if (!deleteOK)
+			{
+				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)
+			{
+				Group.Delete(gi.GID);
+				GroupInfoList.Reset();
+				myGroupInfoList = GroupInfoList.Get();
+				SetupGroups();
+				SetupSecurity();
+			}
+		}
+		private void lstGroups_MouseUp(object sender, MouseEventArgs e)
+		{
+			lstGroups.SelectedIndex = -1;
+			if (e.Button == MouseButtons.Right)
+			{
+				int k = lstGroups.IndexFromPoint(e.Location);
+				if (k >= 0)
+				{
+					lstGroups.SelectedIndex = k;
+					if (lstUsers.SelectedIndex >= 0)
+					{
+						GroupInfo gi = myGroupInfoList[k];
+						if (gi.GroupMembershipCount > 0)
+						{
+							addMemberToolStripMenuItemGroup.Visible = true;
+							UserInfo ui = myUserInfoList[lstUsers.SelectedIndex];
+							foreach (MembershipInfo mi in gi.GroupMemberships)
+							{
+								if (mi.MyUser.UserID == ui.UserID && (mi.EndDate == null || mi.EndDate == string.Empty))
+								{
+									addMemberToolStripMenuItemGroup.Visible = false;
+									break;
+								}
+							}
+						}
+					}
+					else
+						addMemberToolStripMenuItemGroup.Visible = false;
+					cmGroups.Show(lstGroups, e.Location);
+				}
+			}
+			else if (e.Button == MouseButtons.Left)
+			{
+				int k = lstGroups.IndexFromPoint(e.Location);
+				if (k >= 0)
+				{
+					lstGroups.SelectedIndex = k;
+				}
+			}
+		}
+		private void lstUsers_MouseUp(object sender, MouseEventArgs e)
+		{
+			lstUsers.SelectedIndex = -1;
+			if (e.Button == MouseButtons.Right)
+			{
+				int k = lstUsers.IndexFromPoint(e.Location);
+				if (k >= 0)
+				{
+					lstUsers.SelectedIndex = k;
+          //addUserToolStripMenuItem.Visible = false;
+					editUserToolStripMenuItem.Visible = deleteUserToolStripMenuItem.Visible = true;
+					if (lstGroups.SelectedIndex >= 0)
+					{
+						UserInfo ui = myUserInfoList[k];
+						if(ui.UserMembershipCount > 0)
+						{
+							addMemberToolStripMenuItemUser.Visible = true;
+							GroupInfo gi = myGroupInfoList[lstGroups.SelectedIndex];
+							foreach(MembershipInfo mi in ui.UserMemberships)
+							{
+								if (mi.MyGroup.GroupName == gi.GroupName && (mi.EndDate == null || mi.EndDate == string.Empty))
+								{
+									addMemberToolStripMenuItemUser.Visible = false;
+									break;
+								}
+							}
+						}
+					}
+					else
+						addMemberToolStripMenuItemUser.Visible = false;
+					cmUsers.Show(lstUsers, e.Location);
+				}
+				else
+				{
+					addUserToolStripMenuItem.Visible = true;
+					editUserToolStripMenuItem.Visible = deleteUserToolStripMenuItem.Visible = addMemberToolStripMenuItemUser.Visible = false;
+					cmUsers.Show(lstUsers, e.Location);
+				}
+			}
+			else if (e.Button == MouseButtons.Left)
+			{
+				int k = lstUsers.IndexFromPoint(e.Location);
+				if (k >= 0)
+				{
+					lstUsers.SelectedIndex = k;
+				}
+			}
+		}
+		private void lstMembers_MouseUp(object sender, MouseEventArgs e)
+		{
+			lstMembers.SelectedIndex = -1;
+			if (e.Button == MouseButtons.Right)
+			{
+				int k = lstMembers.IndexFromPoint(e.Location);
+				if (k >= 0)
+				{
+					lstMembers.SelectedIndex = k;
+					addMemberToolStripMenuItemUser.Visible = false;
+					removeMemberToolStripMenuItem.Visible = true;
+					cmMembers.Show(lstMembers, e.Location);
+				}
+				else
+				{
+					addMemberToolStripMenuItemUser.Visible = true;
+					removeMemberToolStripMenuItem.Visible = false;
+					cmMembers.Show(lstMembers, e.Location);
+				}
+			}
+			else if (e.Button == MouseButtons.Left)
+			{
+				int k = lstMembers.IndexFromPoint(e.Location);
+				if (k >= 0)
+				{
+					lstMembers.SelectedIndex = k;
+				}
+			}
+		}
 	}
 }

PROMS/VEPROMS User Interface/dlgManageSecurity.resx

@@ -112,27 +112,21 @@
     <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="cmFolders.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>234, 17</value>
-  </metadata>
-  <metadata name="tt.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="cmFolders.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>341, 17</value>
   </metadata>
-  <metadata name="cmMembers.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="cmMembers.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="cmUsers.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="cmUsers.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>243, 17</value>
+  </metadata>
+  <metadata name="cmGroups.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>136, 17</value>
   </metadata>
-  <metadata name="tt.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>341, 17</value>
-  </metadata>
-  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>58</value>
-  </metadata>
 </root>

PROMS/VEPROMS User Interface/dlgSetChangeBarStartDate.Designer.cs

@@ -28,158 +28,142 @@
 		/// </summary>
 		private void InitializeComponent()
 		{
-            this.btnOK = new DevComponents.DotNetBar.ButtonX();
-            this.btnCancel = new DevComponents.DotNetBar.ButtonX();
-            this.label1 = new System.Windows.Forms.Label();
-            this.superTooltip1 = new DevComponents.DotNetBar.SuperTooltip();
-            this.dateTimeInput1 = new DevComponents.Editors.DateTimeAdv.DateTimeInput();
-            this.btnNow = new DevComponents.DotNetBar.ButtonX();
-            this.btnResetToApproved = new DevComponents.DotNetBar.ButtonX();
-            ((System.ComponentModel.ISupportInitialize)(this.dateTimeInput1)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // 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.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-            this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK;
-            this.btnOK.Location = new System.Drawing.Point(18, 111);
-            this.btnOK.Name = "btnOK";
-            this.btnOK.Size = new System.Drawing.Size(64, 23);
-            this.btnOK.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.btnOK.TabIndex = 1;
-            this.btnOK.Text = "OK";
-            this.btnOK.Click += new System.EventHandler(this.btnOK_Click);
-            // 
-            // 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.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-            this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.btnCancel.Location = new System.Drawing.Point(179, 111);
-            this.btnCancel.Name = "btnCancel";
-            this.btnCancel.Size = new System.Drawing.Size(64, 23);
-            this.btnCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.btnCancel.TabIndex = 2;
-            this.btnCancel.Text = "Cancel";
-            // 
-            // 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.Location = new System.Drawing.Point(3, 19);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(229, 15);
-            this.label1.TabIndex = 3;
-            this.label1.Text = "Show Change Bars on Changes Starting:";
-            // 
-            // superTooltip1
-            // 
-            this.superTooltip1.DefaultTooltipSettings = new DevComponents.DotNetBar.SuperTooltipInfo("", "", "", null, null, DevComponents.DotNetBar.eTooltipColor.Gray);
-            this.superTooltip1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
-            // 
-            // dateTimeInput1
-            // 
-            // 
-            // 
-            // 
-            this.dateTimeInput1.BackgroundStyle.Class = "DateTimeInputBackground";
-            this.dateTimeInput1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.dateTimeInput1.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown;
-            this.dateTimeInput1.ButtonDropDown.Visible = true;
-            this.dateTimeInput1.CustomFormat = "MM/dd/yyyy HH:mm:ss";
-            this.dateTimeInput1.DateTimeSelectorVisibility = DevComponents.Editors.DateTimeAdv.eDateTimeSelectorVisibility.DateSelector;
-            this.dateTimeInput1.Format = DevComponents.Editors.eDateTimePickerFormat.Custom;
-            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.ClearButtonVisible = true;
-            // 
-            // 
-            // 
-            this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2;
-            this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90;
-            this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
-            this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
-            this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder;
-            this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1;
-            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.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
-            this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.dateTimeInput1.MonthCalendar.TodayButtonVisible = true;
-            this.dateTimeInput1.Name = "dateTimeInput1";
-            this.dateTimeInput1.Size = new System.Drawing.Size(146, 20);
-            this.dateTimeInput1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            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.TabIndex = 4;
-            this.dateTimeInput1.TimeSelectorTimeFormat = DevComponents.Editors.DateTimeAdv.eTimeSelectorFormat.Time24H;
-            this.dateTimeInput1.TimeSelectorType = DevComponents.Editors.DateTimeAdv.eTimeSelectorType.TouchStyle;
-            // 
-            // btnNow
-            // 
-            this.btnNow.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
-            this.btnNow.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-            this.btnNow.Location = new System.Drawing.Point(182, 51);
-            this.btnNow.Name = "btnNow";
-            this.btnNow.Size = new System.Drawing.Size(49, 23);
-            this.btnNow.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            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.TabIndex = 5;
-            this.btnNow.Text = "Today";
-            this.btnNow.Click += new System.EventHandler(this.btnNow_Click);
-            // 
-            // btnResetToApproved
-            // 
-            this.btnResetToApproved.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
-            this.btnResetToApproved.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-            this.btnResetToApproved.Location = new System.Drawing.Point(30, 77);
-            this.btnResetToApproved.Name = "btnResetToApproved";
-            this.btnResetToApproved.Size = new System.Drawing.Size(201, 23);
-            this.btnResetToApproved.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.btnResetToApproved.TabIndex = 6;
-            this.btnResetToApproved.Text = "Reset Change Bar To Approved Date";
-            this.btnResetToApproved.Tooltip = "Reset Change Bar to the last approved date. If no approvals, reset to as if no ch" +
-    "ange bar date. After selecting this, press OK to save.";
-            this.btnResetToApproved.Click += new System.EventHandler(this.btnResetToApproved_Click);
-            // 
-            // dlgSetChangeBarStartDate
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(268, 144);
-            this.Controls.Add(this.btnResetToApproved);
-            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();
+			this.btnOK = new DevComponents.DotNetBar.ButtonX();
+			this.btnCancel = new DevComponents.DotNetBar.ButtonX();
+			this.label1 = new System.Windows.Forms.Label();
+			this.superTooltip1 = new DevComponents.DotNetBar.SuperTooltip();
+			this.dateTimeInput1 = new DevComponents.Editors.DateTimeAdv.DateTimeInput();
+			this.btnNow = new DevComponents.DotNetBar.ButtonX();
+			((System.ComponentModel.ISupportInitialize)(this.dateTimeInput1)).BeginInit();
+			this.SuspendLayout();
+			// 
+			// 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.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+			this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK;
+			this.btnOK.Location = new System.Drawing.Point(18, 111);
+			this.btnOK.Name = "btnOK";
+			this.btnOK.Size = new System.Drawing.Size(64, 23);
+			this.btnOK.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+			this.btnOK.TabIndex = 1;
+			this.btnOK.Text = "OK";
+			this.btnOK.Click += new System.EventHandler(this.btnOK_Click);
+			// 
+			// 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.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+			this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.btnCancel.Location = new System.Drawing.Point(179, 111);
+			this.btnCancel.Name = "btnCancel";
+			this.btnCancel.Size = new System.Drawing.Size(64, 23);
+			this.btnCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+			this.btnCancel.TabIndex = 2;
+			this.btnCancel.Text = "Cancel";
+			// 
+			// 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.Location = new System.Drawing.Point(3, 19);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(229, 15);
+			this.label1.TabIndex = 3;
+			this.label1.Text = "Show Change Bars on Changes Starting:";
+			// 
+			// superTooltip1
+			// 
+			this.superTooltip1.DefaultTooltipSettings = new DevComponents.DotNetBar.SuperTooltipInfo("", "", "", null, null, DevComponents.DotNetBar.eTooltipColor.Gray);
+			this.superTooltip1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
+			// 
+			// dateTimeInput1
+			// 
+			// 
+			// 
+			// 
+			this.dateTimeInput1.BackgroundStyle.Class = "DateTimeInputBackground";
+			this.dateTimeInput1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.dateTimeInput1.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown;
+			this.dateTimeInput1.ButtonDropDown.Visible = true;
+			this.dateTimeInput1.CustomFormat = "MM/dd/yyyy HH:mm:ss";
+			this.dateTimeInput1.DateTimeSelectorVisibility = DevComponents.Editors.DateTimeAdv.eDateTimeSelectorVisibility.DateSelector;
+			this.dateTimeInput1.Format = DevComponents.Editors.eDateTimePickerFormat.Custom;
+			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.ClearButtonVisible = true;
+			// 
+			// 
+			// 
+			this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2;
+			this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90;
+			this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
+			this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
+			this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder;
+			this.dateTimeInput1.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1;
+			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.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
+			this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.dateTimeInput1.MonthCalendar.TodayButtonVisible = true;
+			this.dateTimeInput1.Name = "dateTimeInput1";
+			this.dateTimeInput1.Size = new System.Drawing.Size(146, 20);
+			this.dateTimeInput1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+			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.TabIndex = 4;
+			this.dateTimeInput1.TimeSelectorTimeFormat = DevComponents.Editors.DateTimeAdv.eTimeSelectorFormat.Time24H;
+			this.dateTimeInput1.TimeSelectorType = DevComponents.Editors.DateTimeAdv.eTimeSelectorType.TouchStyle;
+			// 
+			// btnNow
+			// 
+			this.btnNow.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+			this.btnNow.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+			this.btnNow.Location = new System.Drawing.Point(182, 51);
+			this.btnNow.Name = "btnNow";
+			this.btnNow.Size = new System.Drawing.Size(49, 23);
+			this.btnNow.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+			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.TabIndex = 5;
+			this.btnNow.Text = "Today";
+			this.btnNow.Click += new System.EventHandler(this.btnNow_Click);
+			// 
+			// dlgSetChangeBarStartDate
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.ClientSize = new System.Drawing.Size(268, 144);
+			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();
 
 		}
 
@@ -191,6 +175,5 @@
 		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,25 +1,31 @@
 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.Base.Library;
-using Volian.Controls.Library;
+
 
 namespace VEPROMS
 {
 	public partial class dlgSetChangeBarStartDate : DevComponents.DotNetBar.Office2007Form
 	{
-        public ProcedureConfig MyProcConfig { get; set; } = null;
+		private ProcedureConfig _MyProcConfig = null;
 
-        public ProcedureInfo MyProcInfo { get; set; } = null;
+		public ProcedureConfig MyProcConfig
+		{
+			get { return _MyProcConfig; }
+			set { _MyProcConfig = value; }
+		}
 
-        public dlgSetChangeBarStartDate(ProcedureConfig pc, ProcedureInfo pi)
+		public dlgSetChangeBarStartDate(ProcedureConfig pc)
 		{
 			InitializeComponent();
-			MyProcConfig = pc;
-			MyProcInfo = pi;
+			_MyProcConfig = pc;
 		}
 
 		private void dlgSetChangeBarStartDate_Load(object sender, EventArgs e)
@@ -31,7 +37,7 @@ namespace VEPROMS
 			{
 				cbdt = DateTime.Now.ToString("MM/dd/yyyy") + " " + DateTime.Now.ToString("HH:mm:ss");
 				dateTimeInput1.Value = DateTime.Parse(cbdt);
-                return;
+				return;
 			}
 			else
 			{
@@ -66,92 +72,13 @@ namespace VEPROMS
 		private void btnOK_Click(object sender, EventArgs e)
 		{
 			MyProcConfig.Print_ChangeBarDate = dateTimeInput1.Value.ToString("MM/dd/yyyy HH:mm:ss");// ("MM/dd/yyyy HH:mm:ss");
-
-            //CSM - C2026-010 - Add Audit Record for Change Bar Audit History
-            ChangeBarAuditHistory.AddAudit(MyProcInfo.ItemID, $"Set ChangeBars set to ({ dateTimeInput1.Value.ToString("MM/dd/yyyy HH:mm:ss")}) by ({ VlnSettings.UserID}) on ({DateTime.Now})", DateTime.Now, VlnSettings.UserID, 0);
-
-        }
+		}
 
 
-        private void btnNow_Click(object sender, EventArgs e)
+		private void btnNow_Click(object sender, EventArgs e)
 		{
 			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;
-
-                    //CSM - C2026-010 - Add Audit Record for Change Bar Audit History
-                    ChangeBarAuditHistory.AddAudit(MyProcInfo.ItemID, $"Reset ChangeBars performed by ({VlnSettings.UserID}) on ({DateTime.Now}). ChangeBars reset to show all changes.", DateTime.Now, VlnSettings.UserID, 0);
-
-                    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");
-
-                        //CSM - C2026-010 - Add Audit Record for Change Bar Audit History
-                        ChangeBarAuditHistory.AddAudit(MyProcInfo.ItemID, $"Reset ChangeBars performed by ({VlnSettings.UserID}) on ({DateTime.Now}). ChangeBars reset to show since last approval ({Convert.ToDateTime(r["DTS"]):MM/dd/yyyy HH:mm:ss}) for (Unit {r["UnitName"]})", DateTime.Now, VlnSettings.UserID, MyProcConfig.SelectedSlave);
-
-                    }
-                    MyProcConfig.SelectedSlave = 0;
-                    DialogResult = DialogResult.OK;
-
-                    //CSM - C2026-010 - Add Audit Record for Change Bar Audit History
-                    ChangeBarAuditHistory.AddAudit(MyProcInfo.ItemID, $"Reset ChangeBars performed by ({VlnSettings.UserID}) on ({DateTime.Now}). ChangeBars reset to show since last approval ({maxDTS})", DateTime.Now, VlnSettings.UserID, 0);
-
-                    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;
-
-                    //CSM - C2026-010 - Add Audit Record for Change Bar Audit History
-                    ChangeBarAuditHistory.AddAudit(MyProcInfo.ItemID, $"Reset ChangeBars performed by ({VlnSettings.UserID}) on ({DateTime.Now}). ChangeBars reset to show since last approval ({maxDTS})", DateTime.Now, VlnSettings.UserID, 0);
-                    Close();
-                }
-            }
-
-        }
-    }
+	}
 }

PROMS/VEPROMS User Interface/frmBatchRefresh.cs

@@ -62,8 +62,6 @@ namespace VEPROMS
 				swRmObsoleteROData.Enabled = false;
 				swRmOrphanDataRecs.Enabled = false;
 				swRefreshWordAttmts.Enabled = false;
-				swRegenWordAttmts.Enabled = false;
-				swRefreshTblsForSrch.Enabled = false;
 				swStandardHypenChars.Enabled = false;
 
 				//if not full admin, disable Purge Change History
@@ -151,28 +149,7 @@ namespace VEPROMS
 			return false;
 		}
 
-		//C2026-002 Enhancements to new admin Tool for ROs not used.
-		private void ResetmyTV_RO_DBs()
-		{
-			this.Cursor = Cursors.WaitCursor;
-			myTV_RO_DBs.Nodes.Clear();
-
-			TreeNode tn = myTV_RO_DBs.Nodes.Add("Select All");
-			tn.Tag = 0;
-			tn.Checked = true;
-
-			foreach (DataRow rw in GeneralReports.GetRODBs().Rows)
-			{
-				TreeNode tn_db = tn.Nodes.Add(rw["dbiTitle"].ToString());
-				tn_db.Tag = rw["dbiID"].ToString();
-				tn_db.Checked = true;
-			}
-			tn.Expand();
-
-			this.Cursor = Cursors.Default;
-		}
-
-	private void ResetTV(bool noProcs)
+        private void ResetTV(bool noProcs)
 		{
 			btnFixLinks.Enabled = false;
 			this.Cursor = Cursors.WaitCursor;
@@ -650,111 +627,11 @@ namespace VEPROMS
 			this.Cursor = Cursors.Default;
 		}
 
-		private int RegenCounter = 0;
-		private int RegenTotal = 0;
-		private const int TicksToupdate = 300000; //5 minutes(300 seconds).
-
-        // C2026-007 - Generate Missing PDFs
-        // regenerates the saved attachment PDFs from the database
-        // so that this is not needed the next time the procedures are printed.  This also forces ROs to be refreshed in the attachments
-        private void RegenPDFs()
-        {
-            this.Cursor = Cursors.WaitCursor;
-            DateTime pStart = DateTime.Now;
-            txtProcess.AppendText("Generating missing Word Attachments");
-            txtProcess.AppendText(Environment.NewLine);
-            txtProcess.AppendText(string.Format("Started: {0}", pStart.ToString("MM/dd/yyyy @ HH:mm")));
-            txtProcess.AppendText(Environment.NewLine);
-            txtProcess.AppendText("Gathering data for Word Attachments that need generated.");
-            txtProcess.AppendText(Environment.NewLine);
-            Application.DoEvents();
-
-			//get data of missing Docs by Unit that will need regenerated
-			DataTable dt = Maintenance.GetMissingDocsByUnit();
-            RegenCounter = 0;
-            RegenTotal = dt.Rows.Count;
-            txtProcess.AppendText($"Word Attachments to be generated: {RegenTotal}");
-            txtProcess.AppendText(Environment.NewLine);
-            txtProcess.AppendText(Environment.NewLine);
-            txtProcess.AppendText($"Note that this will provide updates approximately every {TicksToupdate/60000} minutes. Some attachments may take longer than others due to size/number of pages/number of ROs. If PROMS is in the middle of generating a large attachment, it may delay the update message until generation of that attachment completes (in that case taking more than 5 minutes between updates).");
-            txtProcess.AppendText(Environment.NewLine);
-            txtProcess.AppendText(Environment.NewLine);
-            txtResults.AppendText($"{RegenTotal} Word Attachments to be generated.");
-            txtResults.AppendText(Environment.NewLine);
-            txtResults.AppendText(Environment.NewLine);
-
-			//generate as if not debug
-			int debugstatus = MSWordToPDF.DebugStatus;
-            MSWordToPDF.DebugStatus = 0;
-            MSWordToPDF.OverrideColor = Color.Transparent;
-
-			Timer timer1 = new Timer();
-            timer1.Tick += new EventHandler(UpdateRegenProgress);
-            timer1.Interval = TicksToupdate;
-            timer1.Start();
-
-            foreach (DataRow dr in dt.Rows)
-			{
-				//Do Generation
-				using (Section sect = Section.Get((int)dr["SectionID"]))
-				{
-					using (DocumentInfo docInfo = DocumentInfo.Get((int)dr["DocID"]))
-					{
-						if (!dr.IsNull("UnitID")) sect.MyItemInfo.MyDocVersion.DocVersionConfig.SelectedSlave = (int)dr["UnitID"];
-						MSWordToPDF.SetDocPdf(docInfo, sect.MyItemInfo);
-					}
-				}
-
-                //Increment - message every _ minutes
-                RegenCounter++;
-			}
-
-			//done with loop - stop timer and destroy it
-			timer1.Stop();
-			timer1.Dispose();
-
-            //Change DebugStatus Back to what it was
-            if (debugstatus == 1)
-            {
-                MSWordToPDF.DebugStatus = 1;
-                MSWordToPDF.OverrideColor = Color.Red;
-            }
-            else
-            {
-                MSWordToPDF.DebugStatus = 0;
-                MSWordToPDF.OverrideColor = Color.Transparent;
-            }
-
-            //end messaging
-            txtProcess.AppendText(Environment.NewLine);
-            txtProcess.AppendText($"Word Attachments Generated: {RegenTotal}");
-            txtProcess.AppendText(Environment.NewLine);
-            txtResults.AppendText(Environment.NewLine);
-            txtResults.AppendText($"{RegenTotal} Word Attachments generated.");
-            txtResults.AppendText(Environment.NewLine);
-            txtResults.AppendText(Environment.NewLine);
-            txtProcess.AppendText($"Completed: {DateTime.Now:G}");
-            txtProcess.AppendText(Environment.NewLine);
-            txtProcess.AppendText(Environment.NewLine);
-            Application.DoEvents();
-            this.Cursor = Cursors.Default;
-        }
-
-		//Outputs the Progress of Regenerating the PDFs every __ minutes
-        private void UpdateRegenProgress(Object myObject, EventArgs myEventArgs)
-        {
-            string progress_str = $"Generated {RegenCounter} of {RegenTotal} ({(decimal)RegenCounter / RegenTotal * 100M:F2}%): {DateTime.Now:G}";
-            txtProcess.AppendText(progress_str);
-            txtProcess.AppendText(Environment.NewLine);
-            txtResults.AppendText(progress_str);
-            txtResults.AppendText(Environment.NewLine);
-        }
-
-        // B2022-047 - refresh the Content/Text field for table, i.e. Grid, Data so that search will find text in the Grid
-        //	NOTE that an out of memeory error occurs when having to process alot of tables.  A config flag is used on the
-        //	grid record to flag that this operation has been run.  And a message is placed in the result window stating to
-        //	rerun until all tables/text fields are completed.
-        private void RefreshTablesForSearch()
+		// B2022-047 - refresh the Content/Text field for table, i.e. Grid, Data so that search will find text in the Grid
+		//	NOTE that an out of memeory error occurs when having to process alot of tables.  A config flag is used on the
+		//	grid record to flag that this operation has been run.  And a message is placed in the result window stating to
+		//	rerun until all tables/text fields are completed.
+		private void RefreshTablesForSearch()
 		{
 			this.Cursor = Cursors.WaitCursor;
 			DateTime pStart = DateTime.Now;
@@ -1194,24 +1071,6 @@ namespace VEPROMS
 		}
 		
 		private void myTV_AfterCheck(object sender, TreeViewEventArgs e)
-		{
-			//B2025 - 013 Admin Tool Tree Behavior
-			//only want to perform this if
-			// not an unknown action
-			// aka is a mouse click
-			// if this is fire-ing because clicked a parent or a child of an item
-			// want this to only fire once - for the item clicked - not for parents/children
-			if (e.Action != TreeViewAction.Unknown)
-			{
-				TreeView_AfterCheck(sender, e);
-
-				btnFixLinks.Enabled = btnDeleteItems.Enabled = AtLeastOneNodeChecked(((TreeView)sender).Nodes); // C2017-030 support for Refresh Transitions/Update RO Values
-			}
-
-		}
-
-		//C2026-002 Enhancements to new admin Tool for ROs not used.
-		private void TreeView_AfterCheck(object sender, TreeViewEventArgs e)
 		{
 			//B2025 - 013 Admin Tool Tree Behavior
 			//only want to perform this if
@@ -1233,9 +1092,12 @@ namespace VEPROMS
 					DiselectParentNodes(e.Node.Parent);
 					DiselectChildNodes(e.Node.Nodes);
 				}
+
+				btnFixLinks.Enabled = btnDeleteItems.Enabled = AtLeastOneNodeChecked(((TreeView)sender).Nodes); // C2017-030 support for Refresh Transitions/Update RO Values
 			}
 
 		}
+
 		private void DiselectParentNodes(TreeNode parent)
 		{
 			while (parent != null)
@@ -1382,7 +1244,6 @@ namespace VEPROMS
 		{
 			AdminToolType = E_AdminToolType.Maintenance;
 			setupProgessSteps1();
-			ResetmyTV_RO_DBs();   //C2026-002 Enhancements to new admin Tool for ROs not used.
 
 			//notify Set Admin user that only Full Admins can run maintenance tools
 			if (!IsAdministratorUser) 
@@ -1407,8 +1268,7 @@ namespace VEPROMS
 		DevComponents.DotNetBar.StepItem siObsoleteROData = new DevComponents.DotNetBar.StepItem("siObsoleteROData", "Obsolete RO Data");
 		DevComponents.DotNetBar.StepItem siStandardHyphens = new DevComponents.DotNetBar.StepItem("siStandardHyphens", "Standardize Hyphens");
 		DevComponents.DotNetBar.StepItem siRefreshAttmts = new DevComponents.DotNetBar.StepItem("siRefreshAttmts", "Refresh Word Attachments");
-        DevComponents.DotNetBar.StepItem siRegenAttmts = new DevComponents.DotNetBar.StepItem("siRegenAttmts", "Regenerate Word Attachments");
-        DevComponents.DotNetBar.StepItem siRefreshTblsSrchTxt = new DevComponents.DotNetBar.StepItem("siRefreshTblsSrchTxt", "Refresh Tables For Search");
+		DevComponents.DotNetBar.StepItem siRefreshTblsSrchTxt = new DevComponents.DotNetBar.StepItem("siRefreshTblsSrchTxt", "Refresh Tables For Search");
 		// this will update/rebuild the progress bar in the bottom panel of Admin Tools
 		private void setupProgessSteps1()
 		{
@@ -1426,9 +1286,7 @@ namespace VEPROMS
 						progressSteps1.Items.Add(siStandardHyphens);
 					if (swRefreshWordAttmts.Value)
 						progressSteps1.Items.Add(siRefreshAttmts);
-					if (swRegenWordAttmts.Value)
-                        progressSteps1.Items.Add(siRegenAttmts);
-                    if (swRefreshTblsForSrch.Value)
+					if (swRefreshTblsForSrch.Value)
 						progressSteps1.Items.Add(siRefreshTblsSrchTxt);
 					splitContainer3.Panel2Collapsed = false;
 					progressSteps1.Visible = true;
@@ -1592,13 +1450,7 @@ namespace VEPROMS
 				DeletePDFs();  // refresh word attachments
 				StepProgress(prgStpIdx, 100);
 			}
-            if (swRegenWordAttmts.Value)
-            {
-                StepProgress(++prgStpIdx, 50);
-                RegenPDFs();  // generate missing pdfs
-                StepProgress(prgStpIdx, 100);
-            }
-            if (swRefreshTblsForSrch.Value)
+			if (swRefreshTblsForSrch.Value)
 			{
 				StepProgress(++prgStpIdx, 50);
 				RefreshTablesForSearch();
@@ -1926,57 +1778,7 @@ namespace VEPROMS
 			return true;
 		}
 
-		//CSM - C2025-043 report RO's that are not used in any of the PROMS data.
-		private void btnROsNotUsed_Click(object sender, EventArgs e)
-		{
-			//Get the path to save the Image to
-			SaveFileDialog sfd = new SaveFileDialog();
-			sfd.DefaultExt = "bmp";
-			sfd.AddExtension = true;
-			sfd.Filter = "Image Files (*.bmp)|*.bmp";
-			sfd.FileName = string.Format("ROsNotUsed_{0}", DateTime.Now.ToString("yyyyMMdd_HHmm"));
-			sfd.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + @"\VEPROMS";
-			DialogResult dr = sfd.ShowDialog();
-
-			if (dr == DialogResult.OK)
-			{
-				//Initial messaging
-				string statmsg = "Generating Snapshot (this may take a few minutes to complete)...";
-				InitialProgressBarMessage = statmsg;
-				txtResults.AppendText(statmsg);
-				txtResults.AppendText(Environment.NewLine);
-
-				//C2026-002 Enhancements to new admin Tool for ROs not used.
-				//Get the selected nodes
-				DataTable dtIDs = new DataTable();
-				dtIDs.Columns.Add("ID");
-
-				foreach (TreeNode tn in myTV_RO_DBs.Nodes[0].Nodes)
-					if (tn.Checked)
-                    {
-                        DataRow dtrw = dtIDs.NewRow();
-                        dtrw["ID"] = int.Parse(tn.Tag.ToString());
-                        dtIDs.Rows.Add(dtrw);
-                    }
-
-                //Generate the data for ROs Not Used and save it to a TreeView
-                TreeView tv = TreeViewExtensions.GetROTree(GeneralReports.GetROsNotUsedInPROMS(dtIDs), true);
-				//Output the TreeView as an Image
-				if (tv.Nodes.Count != 0)
-					tv.SaveTreeViewAsImage(sfd.FileName);
-
-				//Give Messaging demonstrating finished and open file if requested
-				statmsg = "Finished Generating Snapshot of ROs Not Used.";
-				FinalProgressBarMessage = statmsg;
-				txtResults.AppendText(statmsg);
-				txtResults.AppendText(Environment.NewLine);
-				if (tv.Nodes.Count != 0 && MessageBox.Show($"{statmsg}\r\n\r\nDo you wish to open the snapshot now?", "ROs Not Used", MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation) == DialogResult.Yes)
-					System.Diagnostics.Process.Start(sfd.FileName);
-				else if (tv.Nodes.Count == 0)
-					MessageBox.Show("All ROs are currently in use.", "ROs Not Used", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
-			}
-		}
-	}
+    }
 }
 
 

PROMS/VEPROMS User Interface/frmBatchRefresh.resx

@@ -120,24 +120,16 @@
   <metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <data name="swRegenWordAttmts.SuperTooltip" xml:space="preserve">
-    <value>When Word attachments are modified and saved, PROMS will create a PDF of the attachment contents and save it in the database.  When this is done, all of the RO references are resolved as well as pagination of the attachment.  This speeds up the overall printing of the procedure in that PROMS simply inserts the attachment contents. Certain actions like loading a new RO.FST require that these PDFs be regenerated which is normally done at print time.
-
-This function will generate (and save) any missing saved attachment PDFs stored in the database (not the PDFs of the entire procedure that you had previous printed).  This will cause printing to be faster when you print after this as the PDFs will be pre-genrated in those cases (and thus not require regeneration unless changes were made to the Word Sections or ROs after running this).
-</value>
-  </data>
-  <data name="labelX1.SuperTooltip" xml:space="preserve">
-    <value>When Word attachments are modified and saved, PROMS will create a PDF of the attachment contents and save it in the database.  When this is done, all of the RO references are resolved as well as pagination of the attachment.  This speeds up the overall printing of the procedure in that PROMS simply inserts the attachment contents. Certain actions like loading a new RO.FST require that these PDFs be regenerated which is normally done at print time.
-
-This function will generate (and save) any missing saved attachment PDFs stored in the database (not the PDFs of the entire procedure that you had previous printed).  This will cause printing to be faster when you print after this as the PDFs will be pre-genrated in those cases (and thus not require regeneration unless changes were made to the Word Sections or ROs after running this).
-</value>
-  </data>
   <data name="swRefreshTblsForSrch.SuperTooltip" xml:space="preserve">
-    <value>To allow for a quicker search of the contents within a PROMS Step editor table, a text version of the table is stored separately.  If the PROMS Search function is not finding something in a table, this tool will refresh the content of that separately stored table text.  Another search should then be performed for the content that was not originally found.
+    <value>When Word attachments are modified and saved, PROMS will create a PDF of the attachment contents and save it in the database.  When this is done, all the of the RO references are resolved as well as pagination of the attachment.  This speeds up the overall printing of the procedure in that PROMS simply inserts the attachment contents.
+
+This function will remove all of the saved attachment PDFS stored in the database (not the PDFs of the entire procedure that you had previous printed).  This will force PROMS to regenerate (and save) the word attachment PDFs the next time the procedure is printed.
 </value>
   </data>
   <data name="lblRefreshTblForSrch.SuperTooltip" xml:space="preserve">
-    <value>To allow for a quicker search of the contents within a PROMS Step editor table, a text version of the table is stored separately.  If the PROMS Search function is not finding something in a table, this tool will refresh the content of that separately stored table text.  Another search should then be performed for the content that was not originally found.
+    <value>When Word attachments are modified and saved, PROMS will create a PDF of the attachment contents and save it in the database.  When this is done, all the of the RO references are resolved as well as pagination of the attachment.  This speeds up the overall printing of the procedure in that PROMS simply inserts the attachment contents.
+
+This function will remove all of the saved attachment PDFS stored in the database (not the PDFs of the entire procedure that you had previous printed).  This will force PROMS to regenerate (and save) the word attachment PDFs the next time the procedure is printed.
 </value>
   </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
@@ -183,7 +175,7 @@ RO paths, ROFST versions, and the contents of RO figures are stored in the datab
 Be sure  a current backup exists prior to running this function!!</value>
   </data>
   <data name="swRefreshWordAttmts.SuperTooltip" xml:space="preserve">
-    <value>When Word attachments are modified and saved, PROMS will create a PDF of the attachment contents and save it in the database.  When this is done, all of the RO references are resolved as well as pagination of the attachment.  This speeds up the overall printing of the procedure in that PROMS simply inserts the attachment contents.
+    <value>When Word attachments are modified and saved, PROMS will create a PDF of the attachment contents and save it in the database.  When this is done, all the of the RO references are resolved as well as pagination of the attachment.  This speeds up the overall printing of the procedure in that PROMS simply inserts the attachment contents.
 
 This function will remove all of the saved attachment PDFS stored in the database (not the PDFs of the entire procedure that you had previous printed).  This will force PROMS to regenerate (and save) the word attachment PDFs the next time the procedure is printed.
 </value>
@@ -202,9 +194,9 @@ RO paths, ROFST versions, and the contents of RO figures are stored in the datab
 Be sure  a current backup exists prior to running this function!!</value>
   </data>
   <data name="labelX5.SuperTooltip" xml:space="preserve">
-    <value>When Word attachments are modified and saved, PROMS will create a PDF of the attachment contents and save it in the database.  When this is done, all of the RO references are resolved as well as pagination of the attachment.  This speeds up the overall printing of the procedure in that PROMS simply inserts the attachment contents.
+    <value>When Word attachments are modified and saved, PROMS will create a PDF of the attachment contents and save it in the database.  When this is done, all the of the RO references are resolved as well as pagination of the attachment.  This speeds up the overall printing of the procedure in that PROMS simply inserts the attachment contents.
 
-This function will remove all of the saved attachment PDFs stored in the database (not the PDFs of the entire procedure that you had previous printed).  This will force PROMS to regenerate (and save) the word attachment PDFs the next time the procedure is printed.
+This function will remove all of the saved attachment PDFS stored in the database (not the PDFs of the entire procedure that you had previous printed).  This will force PROMS to regenerate (and save) the word attachment PDFs the next time the procedure is printed.
 </value>
   </data>
   <data name="labelX9.SuperTooltip" xml:space="preserve">
@@ -224,6 +216,51 @@ Should an item become orphaned (disconnected) from the rest of the data, it will
 
 Should an item become orphaned (disconnected) from the rest of the data, it will no longer be accessible.  This tool removes any orphaned items from the database.
 </value>
+  </data>
+  <data name="btnIndexMaint.Tooltip" xml:space="preserve">
+    <value>This will perform Index Maintenance to realign indexes to optimize performance. 
+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>
+  <data name="swDeleteFolder.SuperTooltip" xml:space="preserve">
+    <value>This allows the user to remove folders and sub folders as well as their contents.
+
+Be sure a current backup of the database exists prior performing this function.
+
+It is recommended that this be done during off hours.
+
+</value>
+  </data>
+  <data name="labelX13.SuperTooltip" xml:space="preserve">
+    <value>This allows the user to remove folders and sub folders as well as their contents.
+
+Be sure a current backup of the database exists prior performing this function.
+
+It is recommended that this be done during off hours.
+
+</value>
+  </data>
+  <data name="swDeleteAnnotations.SuperTooltip" xml:space="preserve">
+    <value>This function will allow the user to remove annotations from the selected working drafts.
+
+Be sure a current backup of the database exists prior to running this function.
+
+If more than one working draft is selected, it is recommended that this be performed during off hours.</value>
+  </data>
+  <data name="labelX14.SuperTooltip" xml:space="preserve">
+    <value>This function will allow the user to remove annotations from the selected working drafts.
+
+Be sure a current backup of the database exists prior to running this function.
+
+If more than one working draft is selected, it is recommended that this be performed during off hours.</value>
+  </data>
+  <data name="btnDeleteItems.SuperTooltip" xml:space="preserve">
+    <value>This will allow for the deletion of groups of annotations and allow for deleting entire folders within PROMS.  Use the tree nodes to select which items to delete.
+
+Click on the on/off switches to turn on/off each tool.
+
+Note that only one of these tools can be run at a time.</value>
   </data>
   <data name="btnPurgeChange.Tooltip" xml:space="preserve">
     <value>Purges all audit information and change history older than the above date.  
@@ -265,30 +302,24 @@ Only Full PROMS Administrator Users can perform this action.</value>
         dj38fYbVglHy1FGJt57uL9ZS10IN9cxfJPvXCzTgqSKH5xwNzVXSkFBBDsFKA4KV7IKVegQrda2e7j5N
         ud8AKwnMnBpmYFAAAAAASUVORK5CYII=
 </value>
-  </data>
-  <data name="btnIndexMaint.Tooltip" xml:space="preserve">
-    <value>This will perform Index Maintenance to realign indexes to optimize performance. 
-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>
   <data name="swCheckROLinks.SuperTooltip" xml:space="preserve">
-    <value>This allows the user to check referenced object links in procedure step data for multiple working drafts in a batch mode.
+    <value>This allows the user to check referenced objects links in procedure step data for multiple working drafts in a batch mode.
 
-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.
+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.
 
-Be sure a current backup of the database exists prior to performing this function.
+Be sure a current backup of the database exists prior 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 object links in procedure step data for multiple working drafts in a batch mode.
+    <value>This allows the user to check referenced objects links in procedure step data for multiple working drafts in a batch mode.
 
-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.
+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.
 
-Be sure a current backup of the database exists prior to performing this function.
+Be sure a current backup of the database exists prior performing this function.
 
 It is recommended that this be done during off hours.
 </value>
@@ -356,47 +387,8 @@ If more than one procedure is selected, it is recommended that this be performed
         dj38fYbVglHy1FGJt57uL9ZS10IN9cxfJPvXCzTgqSKH5xwNzVXSkFBBDsFKA4KV7IKVegQrda2e7j5N
         ud8AKwnMnBpmYFAAAAAASUVORK5CYII=
 </value>
-  </data>
-  <data name="swDeleteFolder.SuperTooltip" xml:space="preserve">
-    <value>This allows the user to remove folders and sub folders as well as their contents.
-
-Be sure a current backup of the database exists prior performing this function.
-
-It is recommended that this be done during off hours.
-
-</value>
-  </data>
-  <data name="labelX13.SuperTooltip" xml:space="preserve">
-    <value>This allows the user to remove folders and sub folders as well as their contents.
-
-Be sure a current backup of the database exists prior performing this function.
-
-It is recommended that this be done during off hours.
-
-</value>
-  </data>
-  <data name="swDeleteAnnotations.SuperTooltip" xml:space="preserve">
-    <value>This function will allow the user to remove annotations from the selected working drafts.
-
-Be sure a current backup of the database exists prior to running this function.
-
-If more than one working draft is selected, it is recommended that this be performed during off hours.</value>
-  </data>
-  <data name="labelX14.SuperTooltip" xml:space="preserve">
-    <value>This function will allow the user to remove annotations from the selected working drafts.
-
-Be sure a current backup of the database exists prior to running this function.
-
-If more than one working draft is selected, it is recommended that this be performed during off hours.</value>
-  </data>
-  <data name="btnDeleteItems.SuperTooltip" xml:space="preserve">
-    <value>This will allow for the deletion of groups of annotations and allow for deleting entire folders within PROMS.  Use the tree nodes to select which items to delete.
-
-Click on the on/off switches to turn on/off each tool.
-
-Note that only one of these tools can be run at a time.</value>
   </data>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>25</value>
+    <value>137</value>
   </metadata>
 </root>

PROMS/VEPROMS User Interface/frmManageUser.cs

@@ -20,27 +20,7 @@ namespace VEPROMS
 				_MyUser = value;
 				SimpleUser su = new SimpleUser(_MyUser);
 				pgUser.SelectedObject = su;
-
-				//C2026-002 Change Title bar on Add/Edit User
-				string tmp;
-                if (!string.IsNullOrEmpty(su.FirstName) && !string.IsNullOrEmpty(su.LastName))
-                {
-                    tmp = $"{su.UserID} ({su.FirstName} {su.LastName}) Information";
-                }
-                else if (!string.IsNullOrEmpty(su.LastName))
-                {
-                    tmp = $"{su.UserID} ({su.LastName}) Information";
-                }
-                else if (!string.IsNullOrEmpty(su.FirstName))
-                {
-                    tmp = $"{su.UserID} ({su.FirstName}) Information";
-                }
-                else
-                {
-                    tmp = $"{su.UserID} Information";
-                }
-
-                this.Text = tmp;
+				this.Text = string.Format("{0} ({1} {2}) Information",su.UserID,su.FirstName,su.LastName);
 			}
 		}
 		private string _Mode;

PROMS/VEPROMS User Interface/frmSectionProperties.cs

@@ -678,7 +678,7 @@ namespace VEPROMS
 			// to check that there are enough docstyles to map the selected type of section.
 			PlantFormat pf = _SectionConfig.MyFormat != null ? _SectionConfig.MyFormat.PlantFormat : _SectionConfig.MyDefaultFormat.PlantFormat;
 			if (!_Initializing && ppCmbxFormat.SelectedIndex >= 0)
-				pf = ((FormatInfo) ppCmbxFormat.SelectedItem).PlantFormat;
+				pf = FormatInfoList.SortedFormatInfoList[ppCmbxFormat.SelectedIndex].PlantFormat;
 			else if (!_Initializing)    // if the format was changed, it may have been set to default.
 				pf = _SectionConfig.MyDefaultFormat.PlantFormat;
 			_Initializing = true;

PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs

@@ -877,7 +877,7 @@ namespace VEPROMS
 			this.infoPanel.ExpandOnTitleClick = true;
 			this.infoPanel.Location = new System.Drawing.Point(614, 57);
 			this.infoPanel.Name = "infoPanel";
-			this.infoPanel.Size = new System.Drawing.Size(300, 490);
+			this.infoPanel.Size = new System.Drawing.Size(230, 490);
 			this.infoPanel.Style.Alignment = System.Drawing.StringAlignment.Center;
 			this.infoPanel.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
 			this.infoPanel.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;

PROMS/VEPROMS User Interface/frmVEPROMS.cs

@@ -98,8 +98,6 @@ namespace VEPROMS
 					_SelectedStepTabPanel.MyStepTabRibbon.ContActionSummaryRequest += MyStepTabRibbon_ContActionSummaryRequest;
 					_SelectedStepTabPanel.MyStepTabRibbon.AddProcToDVInTree -= new StepTabRibbonEvent(MyStepTabRibbon_AddProcToDocVersionInTree);
 					_SelectedStepTabPanel.MyStepTabRibbon.AddProcToDVInTree += new StepTabRibbonEvent(MyStepTabRibbon_AddProcToDocVersionInTree);
-					_SelectedStepTabPanel.MyStepTabRibbon.EnableDisableStepProperties -= EnableDisableStepProperties;
-					_SelectedStepTabPanel.MyStepTabRibbon.EnableDisableStepProperties += new StepTabRibbonEvent(EnableDisableStepProperties);
 					// F2022-024 Time Critical Action Summary
 					_SelectedStepTabPanel.MyStepTabRibbon.TimeCriticalActionSummaryRequest -= MyStepTabRibbon_TimeCriticalActionSummaryRequest;
 					_SelectedStepTabPanel.MyStepTabRibbon.TimeCriticalActionSummaryRequest += MyStepTabRibbon_TimeCriticalActionSummaryRequest;
@@ -121,7 +119,7 @@ namespace VEPROMS
 
 			//added by jcb 20130718 to support create pdf button when multi-unit and user selects a unit
 			pi.MyDocVersion.DocVersionConfig.SelectedSlave = pi.ProcedureConfig.SelectedSlave;
-
+			
 			DlgPrintProcedure prnDlg = new DlgPrintProcedure(pi);
 
 			//added by jcb 20130718 to support create pdf button when multi-unit and user selects a unit
@@ -374,12 +372,12 @@ namespace VEPROMS
 			cmbFont.SelectedIndex = -1;
 			string[] parameters = System.Environment.CommandLine.Split(" ".ToCharArray());
 			string db = Volian.Base.Library.VlnSettings.GetDB();
-
+			
 			if (db != null)
 				Database.SelectedDatabase = db;
 
 			//B2018-129 Most Recently Used list was being cleared. Needed to remove a (string) type case in the IF statement
-			if (!string.IsNullOrEmpty((string)Properties.Settings.Default["DefaultDB"]))
+			if (!string.IsNullOrEmpty((string)Properties.Settings.Default["DefaultDB"])) 
 				Database.LastDatabase = Properties.Settings.Default.DefaultDB;
 
 			// Setup the Context menu for DisplaySearch including the symbols
@@ -418,7 +416,7 @@ namespace VEPROMS
 			// B2019-107 Error Log message for inconsistent PromsFixes
 			_MyLog.InfoFormat("\r\nSession Beginning\r\n<===={0}[SQL:{1:yyMM.ddHH}]====== User: {2}/{3} Started {4} ===============>{5}"
 				, Application.ProductVersion, Database.RevDate, Environment.UserDomainName, Environment.UserName, DateTime.Now.ToString("dddd MMMM d, yyyy h:mm:ss tt"), FormatInfo.Failed ?? "");
-
+			
 			// C2022-030 Notify the user if the stored procedure in the database are not update to date
 			//           with those in the PROMSFixes.sql delivered with the PROMS executable
 			string pfVersion = ExeInfo.GetAssocicatedPROMSFixesVersion();
@@ -548,7 +546,7 @@ namespace VEPROMS
 			tv.ProcedureCheckedOutTo += new vlnTreeViewEvent(tv_ProcedureCheckedOutTo);
 			tv.ViewPDF += new vlnTreeViewPdfEvent(tv_ViewPDF);
 			displayApplicability.ApplicabilityViewModeChanged += new DisplayApplicability.DisplayApplicabilityEvent(displayApplicability_ApplicabilityViewModeChanged);
-
+			
 			tv.ExportImportProcedureSets += new vlnTreeViewEvent(tv_ExportImportProcedureSets);
 			tv.PrintTransitionReport += new vlnTreeViewEvent(tv_PrintTransitionReport);
 			tv.ProcessingComplete += tv_ProcessingComplete;
@@ -556,23 +554,10 @@ namespace VEPROMS
 			tv.CreateContinuousActionSummary += new vlnTreeViewEvent(tv_CreateContinuousActionSummary);
 			tv.SelectDateToStartChangeBars += tv_SelectDateToStartChangeBars;
 			tv.CreateTimeCriticalActionSummary += new vlnTreeViewEvent(tv_CreateTimeCriticalActionSummary);
-			tv.RefreshFormats += new vlnTreeViewStatusEvent(RefreshFormats);
 
 			displayBookMarks.ResetBookMarksInPROMSWindows += displayBookMarks_ResetBookMarksInPROMSWindows;
 		}
 
-		//C2021-035 Add Refresh Tree Option at highest level
-		void RefreshFormats(object sender, vlnTreeStatusEventArgs args)
-		{
-			Format.ClearFormatCache();
-			FormatInfo.ClearFormatInfoCache();
-			FormatInfo.Reset();
-			FormatInfoList.Reset();
-			Format.Reset();
-			FormatList.Reset();
-			displaySearch1.SetupContextMenu();
-		}
-
 		// Part of Separate Windows upgrade C2015-022
 		// Extend Changes to BookMark information to all of the child windows
 		void displayBookMarks_ResetBookMarksInPROMSWindows(object sender, EventArgs args)
@@ -589,26 +574,7 @@ namespace VEPROMS
 			}
 		}
 
-		//B2019-140 Change bars do not get refreshed when approval is run.
-		// Get the displaytab containing the procedure
-		// if none exists, return null
-		public DisplayTabItem GetTabContainingProcedure(int procid) => tc?.MyBar?.Items?.OfType<DisplayTabItem>().FirstOrDefault(x => x.MyItemInfo?.ItemID == procid);
-        // Refresh Node in Tree
-        //  Used for when Change Bar Updates as part of approval.
-        public void RefreshProcedureNode(ProcedureInfo itm)
-        {
-			VETreeNode tn = tv.FindNode(itm, tv.Nodes);
-			var tmp = (ProcedureInfo)tn?.VEObject;
-			if (tmp != null)
-            {
-                tmp.ChangeBarDate = itm.ChangeBarDate;
-				tmp.MyConfig = itm.MyConfig;
-            }
-
-            tn?.RefreshNode();
-        }
-
-        void tv_SelectDateToStartChangeBars(object sender, vlnTreeEventArgs args)
+		void tv_SelectDateToStartChangeBars(object sender, vlnTreeEventArgs args)
 		{
 			ProcedureInfo pi = (args.Node as VETreeNode).VEObject as ProcedureInfo;
 			if (pi == null) return;
@@ -617,7 +583,7 @@ namespace VEPROMS
 			ProcedureConfig pc = pi.MyConfig as ProcedureConfig;
 			if (pc == null) return;
 
-			dlgSetChangeBarStartDate cbdDlg = new dlgSetChangeBarStartDate(pc, pi);
+			dlgSetChangeBarStartDate cbdDlg = new dlgSetChangeBarStartDate(pc);
 			if (cbdDlg.ShowDialog() == DialogResult.OK)
 			{
 				using (Item itm = Item.Get(pi.ItemID))
@@ -625,28 +591,6 @@ namespace VEPROMS
 					itm.MyContent.Config = pc.ToString();
 					itm.UserID = Volian.Base.Library.VlnSettings.UserID;
 					itm.Save();
-
-                    //B2019-140 Change bars do not get refreshed when approval is run.
-                    // Reset a Procedure and sub items in the cache
-                    ProcedureInfo newproc = ItemInfo.ResetProcedure(pi.ItemID);
-
-                    //// Refresh the StepPanel for the current Procedure
-                    //// 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 = GetTabContainingProcedure(pi.ItemID);
-					if (dti != null)
-					{
-
-                        if (!dti.MyStepTabPanel.MyStepPanel.ContainsFocus)
-							dti.MyStepTabPanel.MyStepPanel.Focus();
-
-						foreach (EditItem eitm in dti.MyStepTabPanel.MyStepPanel.Controls.OfType<EditItem>())
-						{
-							eitm.ChangeBar = eitm.MyItemInfo.HasChangeBar;
-						}
-					}
 				}
 			}
 		}
@@ -1239,7 +1183,6 @@ namespace VEPROMS
 
 			if (!MySessionInfo.CanCheckOutItem(pi.ItemID, CheckOutType.Procedure, ref message))
 			{
-				message = message.Replace("\r\nWould You like to open the procedure in View Only Mode?", "");
 				MessageBox.Show(this, message, "Procedure Already Checked Out", MessageBoxButtons.OK, MessageBoxIcon.Warning);
 				return;
 			}
@@ -2129,10 +2072,7 @@ namespace VEPROMS
 				{
 					foreach (DisplayTabItem dti in tc.MyBar.Items)
 					{
-						//C2019-036 View Only mode work with Checked Out Procedures
-						// View Only Mode is no longer checked out, so no longer has an OwnerID
-						// This will keep those tabs from auto-closing based on the timer
-						if (!myList.Contains(dti.OwnerID) && dti.MyStepTabPanel.MyStepPanel.VwMode != E_ViewMode.View)
+						if (!myList.Contains(dti.OwnerID))
 						{
 							MyCloseTabList.PushDTI(dti);
 						}
@@ -2538,7 +2478,7 @@ namespace VEPROMS
 			//and set checkboxes based on what they are set to
 			UserSettings usersettings = new UserSettings(VlnSettings.UserID);
 
-			if (!Settings.Default.SeparateWindows && DisPlayTabState.Rows.Count > 0 && (usersettings.UserSetting_OpenTabs_AutoOpen || !usersettings.UserSetting_OpenTabs_Remember))
+			if (DisPlayTabState.Rows.Count > 0 && (usersettings.UserSetting_OpenTabs_AutoOpen || !usersettings.UserSetting_OpenTabs_Remember))
 			{
 				//will open tabs by default / ask by default
 				DialogResult result = DialogResult.Yes;
@@ -3973,7 +3913,6 @@ namespace VEPROMS
 					string message = string.Empty;
 					if (!MySessionInfo.CanCheckOutItem(args.ProcedureConfig.MyProcedure.ItemID, CheckOutType.Procedure, ref message))
 					{
-						message = message.Replace("\r\nWould You like to open the procedure in View Only Mode?", "");
 						MessageBox.Show(this, message, "Procedure Already Checked Out", MessageBoxButtons.OK, MessageBoxIcon.Warning);
 						this.Cursor = Cursors.Default;
 						return DialogResult.None;
@@ -3997,7 +3936,6 @@ namespace VEPROMS
 					string message = string.Empty;
 					if (!MySessionInfo.CanCheckOutItem(args.SectionConfig.MySection.MySectionInfo.MyProcedure.ItemID, CheckOutType.Procedure, ref message))
 					{
-						message = message.Replace("\r\nWould You like to open the procedure in View Only Mode?", "");
 						MessageBox.Show(this, message, "Procedure Already Checked Out", MessageBoxButtons.OK, MessageBoxIcon.Warning);
 						this.Cursor = Cursors.Default;
 						return DialogResult.None;
@@ -4798,11 +4736,6 @@ namespace VEPROMS
 					// B2022-026 RO Memory reduction coding (Jakes Merge)
 					displayRO.SetFindDocROButton(false);
 					displayRO.LoadTree();
-
-                    //C2019-036 View Only mode work with Checked Out Procedures
-                    //In View Only Mode - Step Properties should be disabled
-                    EnableDisableStepProperties(sender, new StepTabRibbonEventArgs(args.MyEditItem.MyItemInfo, 0, args.MyEditItem.MyStepPanel.VwMode));
-
 				}
 				else
 				{
@@ -4834,22 +4767,6 @@ namespace VEPROMS
 
 		}
 
-		//C2019-036 View Only mode work with Checked Out Procedures
-		//In View Only Mode - Step Properties should be disabled
-		public void EnableDisableStepProperties(object sender, StepTabRibbonEventArgs args)
-		{
-            if (args.ViewMode == E_ViewMode.View && (infoTabs.Enabled || infoTabs.SelectedTab != infotabTags))
-            {
-				infoTabs.Enabled = true;
-				infoTabs.SelectedTab = infotabTags;
-                infoTabs.Enabled = false;
-            }
-			else if (args.ViewMode != E_ViewMode.View && !infoTabs.Enabled)
-			{
-                infoTabs.Enabled = true;
-            }
-        }
-
 		void _LastStepRTB_EditModeChanged(object sender, EventArgs args)
 		{
 			if (_LastStepRTB.EditMode)  // going into edit mode in a cell of the grid.
@@ -5385,8 +5302,6 @@ namespace VEPROMS
 		private void btnUpdateFormat_Click(object sender, EventArgs e)
 		{
             UpdateFormats(null);
-			//C2025-060 When format is updated in PROMS, auto-update the format cache so it doesn't require exiting PROMS and going back in.
-			RefreshFormats(sender, null);
 		}
 
 		private void UpdateFormats(string mypath)

PROMS/VEPROMS User Interface/frmVersionsProperties.cs

@@ -1113,34 +1113,13 @@ namespace VEPROMS
 			if (_Apples == null)
 			{
 				_Apples = new List<MiniConfig>();
-            }
-
-            //B2026-017 Use Pre-typed in information when adding New Applicability
-            if (_Apples.Count == 0)
-            {
-                cfg.ID = textBox1.Text;
-                if (!string.IsNullOrEmpty(textBox2.Text))
-                {
-                    cfg.Name = textBox2.Text;
-                }
-                cfg.Number = textBox3.Text;
-                cfg.Text = textBox4.Text;
-                cfg.OtherID = textBox8.Text;
-                cfg.OtherName = textBox9.Text;
-                cfg.OtherNumber = textBox10.Text;
-                cfg.OtherText = textBox11.Text;
-                cfg.ProcedureNumber = textBox5.Text;
-                cfg.SetID = textBox6.Text;
-                cfg.SetName = textBox7.Text;
-            }
-            _Apples.Add(cfg);
+			}
+			_Apples.Add(cfg);
 
 			bsApples.DataSource = null;
 			bsApples.DataSource = _Apples;
-            lbApplicabilities.SelectedItem = cfg;
-			lbApplicabilities_SelectedIndexChanged(sender, e);
-
-        }
+			lbApplicabilities.SelectedItem = cfg;
+		}
 		
 		private bool ApplicIsUsed(MiniConfig cfg) // B2017-230 - don't allow user to remove an applicability that is being used (specified)
 		{

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

@@ -2291,7 +2291,7 @@ OnPropertyChanged("Default_BkColor");
 		public void RemoveSlave(int index)
 		{
 			XmlNode dd = _Xp.XmlContents.SelectSingleNode("//Slave[@index='" + index.ToString() + "']");
-			dd?.ParentNode?.RemoveChild(dd);
+			dd.ParentNode.RemoveChild(dd);
 		}
 		public int MaxSlaveIndex
 		{

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))
@@ -2100,15 +2098,6 @@ namespace VEPROMS.CSLA.Library
 			{
 				string resstr = rtnstr.Substring(0, indx);
 				int endHsp = rtnstr.IndexOf(")", indx);
-
-				//B2026 - 002 handle if parens inside a HSP
-				int startpos = indx + 5;
-				while (rtnstr.Substring(startpos, endHsp - startpos).Contains("("))
-				{
-					startpos = rtnstr.IndexOf("(", startpos + 1, endHsp - startpos) + 1;
-					endHsp = rtnstr.IndexOf(")", endHsp + 1);
-				}
-
 				string tmpstr = rtnstr.Substring(indx + 5, endHsp - indx - 5);
 
 				// B2017-012 Don't convert space to hard spaces for XY Plots.
@@ -2164,7 +2153,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/DocVersionExt.cs

@@ -765,19 +765,6 @@ namespace VEPROMS.CSLA.Library
 				foreach (DocVersionInfo dvi in _CacheByPrimaryKey[key])
 					dvi.ResetProcedures();
 		}
-
-		//C2021-035 Add Refresh Tree Option at highest level
-		public static void ResetAllProcedures()
-		{
-			foreach (string key in _CacheByPrimaryKey.Keys)
-            {
-                foreach (DocVersionInfo dvi in _CacheByPrimaryKey[key])
-					dvi.ResetProcedures();
-            }
-
-			foreach (DocVersionInfo dvi in _CacheList)
-					dvi.ResetProcedures();
-		}
 		#region IVEReadOnlyItem
 		public System.Collections.IList GetChildren()
 		{

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

@@ -1003,34 +1003,40 @@ namespace VEPROMS.CSLA.Library
 			if (pdfTmp == null) return false;
 
 			FileInfo pdfFile = new FileInfo(pdfTmp);
-            Byte[] buf = new byte[pdfFile.Length];
+			FileStream fs = pdfFile.Open(FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
+			Byte[] buf = new byte[pdfFile.Length];
+			fs.Read(buf, 0, buf.Length);
+			fs.Close();
 
-			using (FileStream fs = pdfFile.Open(FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+			// B2023-022 & B2023-023 commented out the deletion of the temporary Word section PDF file
+			//    These files are deleted when the procedure pdf file is closed after being generated.
+			//    PROMS was crashing because it could not find these temporary files to delete.
+			//try
+			//{
+			//	pdfFile.Delete();
+			//}
+			//catch { }
+
+			using (Document doc = docInfo.Get())
 			{
-				fs.Read(buf, 0, buf.Length);
-				fs.Close();
+				DocStyle myDocStyle = sect.ActiveSection.MyDocStyle;
+				SectionConfig sc = sect.ActiveSection.MyConfig as SectionConfig;
+				int ss = sect.MyDocVersion.DocVersionConfig.SelectedSlave;
+
+				if (sc != null && sc.Section_WordMargin == "Y")
+				{
+					using (Pdf myPdf = Pdf.MakePdf(doc, ss * 10 + MSWordToPDF.DebugStatus, 0, 0, 0, 0, (double)sect.MSWordPageCount, buf)) {; }
+				}
+				else
+				{
+					using (Pdf myPdf1 = Pdf.MakePdf(doc, ss * 10 + MSWordToPDF.DebugStatus, (int)myDocStyle.Layout.TopMargin, (int)myDocStyle.Layout.PageLength,
+					(int)myDocStyle.Layout.LeftMargin, (int)myDocStyle.Layout.PageWidth, (double)sect.MSWordPageCount, buf)) {; }
+				}
+
+				doc.UpdateDRoUsages(roids);
+				doc.Save();
 			}
 
-            using (Document doc = docInfo.Get())
-            {
-                DocStyle myDocStyle = sect.ActiveSection.MyDocStyle;
-                SectionConfig sc = sect.ActiveSection.MyConfig as SectionConfig;
-                int ss = sect.MyDocVersion.DocVersionConfig.SelectedSlave;
-
-                if (sc != null && sc.Section_WordMargin == "Y")
-                {
-                    using (Pdf myPdf = Pdf.MakePdf(doc, ss * 10 + MSWordToPDF.DebugStatus, 0, 0, 0, 0, (double)sect.MSWordPageCount, buf)) {; }
-                }
-                else
-                {
-                    using (Pdf myPdf1 = Pdf.MakePdf(doc, ss * 10 + MSWordToPDF.DebugStatus, (int)myDocStyle.Layout.TopMargin, (int)myDocStyle.Layout.PageLength,
-                    (int)myDocStyle.Layout.LeftMargin, (int)myDocStyle.Layout.PageWidth, (double)sect.MSWordPageCount, buf)) {; }
-                }
-
-                doc.UpdateDRoUsages(roids);
-                doc.Save();
-            }
-
 			docInfo.RefreshConfig();
 
 			return true;
@@ -1357,14 +1363,9 @@ namespace VEPROMS.CSLA.Library
 								// An X/Y Plot RO type might have text preceding the Plot Commands
 								int pstart = roValue.IndexOf("<<G"); //  find the starting Plot Command
 
-								//B2025-065 When Printing a Word Section containing XY Plot ROs - when there is a title on the XY Plot, only the first line is indented.
-								//get x-offset
-								float fx1 = (float)MyApp.ActiveDocument.Range(sel.Start, sel.Start).get_Information(LBWdInformation.wdHorizontalPositionRelativeToPage);
-								fx1 -= (float)MyApp.ActiveDocument.Range(0, 0).get_Information(LBWdInformation.wdHorizontalPositionRelativeToPage);
-
 								// B2017-217 Added logic so that underscores are not converted to underline
 								// C2018-003 fixed use of getting the active section
-								AddPrecedingText(sel, roValue.Substring(0, pstart), fx1, (sect.ActiveSection != null) ? sect.ActiveSection.ActiveFormat.PlantFormat.FormatData.SectData.ConvertUnderscoreToUnderline : false);// replace the RO token with what's in front of the X/Y Plot
+								AddPrecedingText(sel, roValue.Substring(0, pstart), 0.0F, (sect.ActiveSection != null) ? sect.ActiveSection.ActiveFormat.PlantFormat.FormatData.SectData.ConvertUnderscoreToUnderline : false);// replace the RO token with what's in front of the X/Y Plot
 								roValue = roValue.Substring(pstart); // set rovalue to the start of the plot commands
 
 								pngFile = VlnSettings.TemporaryFolder + @"\XYPlot1.png"; //@"C:\Temp\XYPlot1.png";
@@ -1385,10 +1386,6 @@ namespace VEPROMS.CSLA.Library
 
 								float yAdjust = sel.Font.Size;
 								float yyy = yAdjust + y + plotRect.Y;
-
-								//B2025-065 When Printing a Word Section containing XY Plot ROs - when there is a title on the XY Plot, only the first line is indented.
-								xxx += fx1; //shift by x-offset
-
 								LBShape shape = myDoc.Shapes.AddPicture(pngFile, xxx, yyy, sel.Range);
 
 								try
@@ -1476,22 +1473,12 @@ namespace VEPROMS.CSLA.Library
 				}
 				catch { }
 
-                try
-                {
-                    if (CloseWordWhenDone)
-					{
-						CloseAppAfterWait();
-					}
-                }
-                catch (Exception ex)
+				if (CloseWordWhenDone)
 				{
-                    System.Windows.Forms.Application.DoEvents();
-                    _MyLog.Error("Failed to close Microsoft Word. Collecting reclaimable memory.", ex);
-                    GC.Collect();
-                    _MyLog.Warn("Finished collecting reclaimable memory.");
-                }
+					CloseAppAfterWait();
+				}
 
-                if (statusChange != null) statusChange(VolianStatusType.Complete, 0, string.Empty);
+				if (statusChange != null) statusChange(VolianStatusType.Complete, 0, string.Empty);
 				if (Volian.Base.Library.BaselineMetaFile.IsOpen && Volian.Base.Library.BaselineMetaFile.IncludeWordSecText) Volian.Base.Library.BaselineMetaFile.WriteLine("++EndTxt++");
 
 				// [jpr 2022.07.26] - For memory optimization

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

@@ -275,14 +275,6 @@ namespace VEPROMS.CSLA.Library
 			}
 		}
 
-		//C2021-035 Add Refresh Tree Option at highest level
-		public static void Reset()
-		{
-			_LookupFormats?.Clear();
-			_LookupFormats = null;
-			_ = LookupFormats;
-		}
-
 		private static Format AddFormatToDB(Format parent, string format, bool issub, DateTime Dts, string Userid, string fmtPath, string genmacPath)
 		{
 			string fmtdata = null;
@@ -517,12 +509,7 @@ public partial class FormatInfo : IFormatOrFormatInfo
 				return _PROMSBaseFormat; 
 			}
 		}
-        public static void Reset()
-        {
-            _PROMSBaseFormat = null;
-        }
-
-        public static FormatInfo Get(string name)
+		public static FormatInfo Get(string name)
 		{
 			try
 			{

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

@@ -3312,26 +3312,7 @@ namespace VEPROMS.CSLA.Library
 				return retval;
 			}
 		}
-
-        //B2026-011 Improve the resolution of unit numbers in multi-unit background documents when printing.
-		// for enhanced documents, when copying content, need to not resolve the 
-		//unit designators until print time
-        public string DisplayTextKeepSpecialCharsKeepUnitSpecific
-        {
-            get
-            {
-                string str = MyContent.Text;
-                foreach (string key in SpecialCharacters.Keys)
-                    str = str.Replace(key, SpecialCharacters[key]);
-                string retval = ConvertToDisplayText(str);
-                foreach (string key in SpecialCharacters.Keys)
-                    retval = retval.Replace(SpecialCharacters[key], key);
-                return retval;
-            }
-        }
-
-
-        public string DisplayNumber
+		public string DisplayNumber
 		{
 			get
 			{
@@ -3838,60 +3819,6 @@ namespace VEPROMS.CSLA.Library
 			_Tables = null;
 			_SupInfos = null;
 		}
-
-        //B2019-140 Change bars do not get refreshed when approval is run.
-        // Reset a Procedure and sub items in the cache
-        // **********************
-        // Be carefull calling this when the Procedure is Open
-        // When the Procedure is Open - use StepTabRibbon.RefreshProcedure(); instead
-        // When a Procedure is open and you try to refresh it,
-        // events can fire behind the scenes - causing data to try to be accessed while you are trying to refresh it
-        // When This occurs, it will cause a 
-        // "ThreadException ... Collection was modified; enumeration operation may not execute.”
-        // **********************
-        public static ProcedureInfo ResetProcedure(int procID)
-		{
-			// The following lines reload the procedure info cache
-			ProcedureInfo newproc = ProcedureInfo.Get(procID, true);
-			newproc.RefreshConfig();
-
-            //the following is needed to force the ProcedureConfig to reload
-			#pragma warning disable S1656 // Variables should not be self-assigned
-            newproc.MyConfig = newproc.MyConfig;
-			#pragma warning restore S1656 // Variables should not be self-assigned
-
-            //reload the Content Cache for the procedure
-            ContentInfo.Refresh(Content.Get(newproc.MyContent.ContentID, true));
-
-			// The following line actually reloads the item info cache
-			ItemInfo newprocitem = Get(procID, true);
-			newprocitem.RefreshConfig();
-
-            //Reload all the child/sub items
-#pragma warning disable S2971 // LINQ expressions should be simplified - need initial ToList to force enumeration
-            //otherwise will get a "Collection was modified; enumeration operation may not execute" error
-            List<int> itemIDs = _CacheByPrimaryKey.SelectMany(kvp => kvp.Value).ToList().Where(t => t?.ActiveParent != null && (t.ActiveParent is ItemInfo) && t.MyProcedure.ItemID == procID).Select(x => (x.ActiveParent as ItemInfo).ItemID).Distinct().ToList();
-#pragma warning restore S2971 // LINQ expressions should be simplified
-            for (int index = 0; index < itemIDs.Count; index++)
-            {
-                ResetParts(itemIDs[index]);
-            }
-
-            //reset the procedure config for all items attached to current procedure
-#pragma warning disable S2971 // LINQ expressions should be simplified - need initial ToList to force enumeration
-            //otherwise will get a "Collection was modified; enumeration operation may not execute" error
-            List<ItemInfo> pconfigrefresh_items = _CacheByPrimaryKey.SelectMany(kvp => kvp.Value).ToList().Where(t => t?.MyProcedure?.ItemID == procID).Distinct().ToList();
-#pragma warning restore S2971 // LINQ expressions should be simplified
-            for (int index = 0; index < pconfigrefresh_items.Count; index++)
-            {
-                pconfigrefresh_items[index].MyProcedure = newproc;
-            }
-
-
-            //return the changed procedure info
-            return newproc;
-		}
-
 		private ItemInfoList _Procedures;
 		public ItemInfoList Procedures
 		{ get { return Lookup(E_FromType.Procedure, ref _Procedures); } }
@@ -4773,26 +4700,6 @@ namespace VEPROMS.CSLA.Library
 						{
 							_MyTab.Text = _MyTab.Text.Substring(1);
 						}
-						// C2026-003 Vogtle Continuous Action high level RNO (AER is not continuous action)
-						if (ActiveFormat.MyStepSectionLayoutData.AddContActTagToHighLevelRNOWhenIncludedOnCAS &&
-							IsInRNO && !MyParent.IsInRNO && FormatStepData.TabData.CASPrintMacro != null)
-						{
-							// B2026-009 needed to make sure parent wasn't a continuous action step type
-							//           the ExcludeFromContActSum is set to False for continuous action
-							//           step types and True for all others
-							StepConfig psc = MyParent.MyConfig as StepConfig;
-							if (MyParent.FormatStepData.ExcludeFromContActSum && psc != null && psc.Step_CAS != "True")
-							{
-								StepConfig sc = MyConfig as StepConfig;
-								if (sc != null && sc.Step_CAS == "True")
-								{
-									if (FormatStepData.TabData.CASPrintMacro != null)
-										_MyTab.Text = FormatStepData.TabData.CASPrintMacro + _MyTab.Text;
-									if (FormatStepData.TabData.CASEditTag != null)
-										_MyTab.CleanText = FormatStepData.TabData.CASEditTag + _MyTab.CleanText;
-								}
-							}
-						}
 						_MyTab.RNOTabWidthAdjust = ((ItemInfo)ActiveParent).FormatStepData.TabData.RNOAdjustTabSize ?? 0;
 						if (((ItemInfo)ActiveParent).MyTab.Offset != 0) _MyTab.Offset = ((ItemInfo)ActiveParent).MyTab.Offset;
 						if (((ItemInfo)ActiveParent).FormatStepData.TabData.RNOExcludeMacros)
@@ -8077,20 +7984,12 @@ namespace VEPROMS.CSLA.Library
 		public ProcedureInfo(SafeDataReader dr) : base(dr) { }
 #endif
 		private ProcedureInfo() : base() { ;}
-		public new static ProcedureInfo Get(int itemID, bool forcerefresh = false)
+		public new static ProcedureInfo Get(int itemID)
 		{
 			//if (!CanGetObject())
 			//    throw new System.Security.SecurityException("User not authorized to view a Item");
 			try
 			{
-				//C2019-036 View Only mode work with Checked Out Procedures
-				//  fixes caching issue
-				//   so this forces a refresh of the cache
-				if (forcerefresh)
-				{
-					_CacheByPrimaryKey.Remove(itemID.ToString());
-				}
-
 				ProcedureInfo tmp = GetCachedByPrimaryKey(itemID);
 				if (tmp == null)
 				{
@@ -8385,11 +8284,8 @@ namespace VEPROMS.CSLA.Library
 					if (seds != null && seds.Count != 0)
 					{
 						ItemInfo srcItem = ItemInfo.Get(seds[0].ItemID);
-                        // B2022-049: Copy/paste of enhanced procedure and bad links between source and enhanced.  Null reference check
-                        //B2026-011 Improve the resolution of unit numbers in multi-unit background documents when printing.
-                        // for enhanced documents, when copying content, need to not resolve the 
-                        //unit designators until print time
-                        if (srcItem != null && srcItem.DisplayTextKeepSpecialCharsKeepUnitSpecific != ii.DisplayTextKeepSpecialCharsKeepUnitSpecific)
+						// B2022-049: Copy/paste of enhanced procedure and bad links between source and enhanced.  Null reference check
+						if (srcItem != null && srcItem.DisplayTextKeepSpecialChars != ii.DisplayTextKeepSpecialChars)
 						{
 							if (retiil == null) retiil = new ItemInfoList(ii);
 							else retiil.AddItem(ii);
@@ -8415,10 +8311,7 @@ namespace VEPROMS.CSLA.Library
 						ItemInfo srcItem = ItemInfo.Get(seds[0].ItemID);
 						using (Item enhItem = Item.Get(ii.ItemID))
 						{
-                            //B2026-011 Improve the resolution of unit numbers in multi-unit background documents when printing.
-                            // for enhanced documents, when copying content, need to not resolve the 
-                            //unit designators until print time
-                            enhItem.MyContent.Text = srcItem.DisplayTextKeepSpecialCharsKeepUnitSpecific;
+							enhItem.MyContent.Text = srcItem.DisplayTextKeepSpecialChars;
 							enhItem.Save();
 						}
 					}

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

@@ -1638,7 +1638,7 @@ namespace VEPROMS.CSLA.Library
 						// get the first enhanced section, there may be non-linked sections before first linked section:
 						SectionConfig firstEnhSectionConfig = pastedEnhancedProc.Sections == null ? null : pastedEnhancedProc.Sections[0].MyConfig as SectionConfig;
 						ItemInfo pastedEnhancedCurrentSection = null;
-						if (firstEnhSectionConfig?.MyEnhancedDocuments.Count > 0) pastedEnhancedCurrentSection = pastedEnhancedProc.Sections[0];
+						if (firstEnhSectionConfig.MyEnhancedDocuments.Count > 0) pastedEnhancedCurrentSection = pastedEnhancedProc.Sections[0];
 						else pastedEnhancedCurrentSection = GetNextEnhancedSection(pastedEnhancedProc.Sections[0]);
 
 						// newly pasted procedure has sections/steps, need to adjust 'MyEnhancedDocuments' config items to point to correct
@@ -1647,7 +1647,7 @@ namespace VEPROMS.CSLA.Library
 							foreach (ItemInfo sourceSect in Sections)
 							{
 								SectionConfig srcCfg = sourceSect.MyConfig as SectionConfig;
-								if (srcCfg != null && (srcCfg.Section_LnkEnh != "N") && srcCfg.MyEnhancedDocuments != null && srcCfg.MyEnhancedDocuments.Count > 0)
+								if (srcCfg != null && (srcCfg.Section_LnkEnh=="Y" || srcCfg.Section_LnkEnh=="T") && srcCfg.MyEnhancedDocuments != null && srcCfg.MyEnhancedDocuments.Count > 0)
 								{
 									// use pastedEnhancedCurrentSection to link to:
 									foreach (EnhancedDocument ed in srcCfg.MyEnhancedDocuments)
@@ -1664,7 +1664,7 @@ namespace VEPROMS.CSLA.Library
 									enhSectCfg.MyEnhancedDocuments[0].ItemID = sourceSect.ItemID;
 									enhSectCfg.SaveEnhancedDocuments();
 									pastedEnhancedCurrentSection.SaveConfig(enhSectCfg.ToString());
-									if (srcCfg.Section_LnkEnh != "T") EnhancedSetStepLinks(sourceSect, enhProc.Type); //if steps, do them for this type
+									if (srcCfg.Section_LnkEnh == "Y") EnhancedSetStepLinks(sourceSect, enhProc.Type); //if steps, do them for this type
 									pastedEnhancedCurrentSection = GetNextEnhancedSection(pastedEnhancedCurrentSection);
 								}
 							}

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

@@ -186,7 +186,7 @@ namespace VEPROMS.CSLA.Library
 						if (string.IsNullOrEmpty(name))
 						{ name = tmpproc.DisplayText; }
 
-						message = string.Format("The procedure {0} is already checked out to {1}.\r\nWould You like to open the procedure in View Only Mode?", name, si.UserID);
+						message = string.Format("The procedure {0} is already checked out to {1}", name, si.UserID);
 						rv = rv && false;
 					}
 					else if (si.ProcessID != this.ProcessID && objectType == CheckOutType.Document)

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

@@ -97,12 +97,6 @@ namespace VEPROMS.CSLA.Library
 				if (formatInfo != null && formatInfo.ToString() == formatName) return formatInfo.Get();
 			return null;
 		}
-		//C2021-035 Add Refresh Tree Option at highest level
-		public static void Reset()
-        {
-			_MyFormatInfoList?.Clear();
-			_MyFormatInfoList = null;
-		}
 	}
 	public class DocStyleListConverter : System.ComponentModel.StringConverter
 	{

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

@@ -597,6 +597,13 @@ 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/Extension/TransitionExt.cs

@@ -1145,12 +1145,8 @@ namespace VEPROMS.CSLA.Library
 					{
 						//string thisTab = StepInfo.Get(pitem.ItemID).MyTab.CleanText;
 						string thisTab = pitem.MyTab.CleanText;// StepInfo.Get(pitem.ItemID).MyTab.CleanText;
-						//B2025-058 remove continuous action indicator
-						string medittag = pitem.FormatStepData.TabData.MacroEditTag;
-						if (medittag != null && thisTab.StartsWith(medittag))
-							thisTab = thisTab.Substring(medittag.Length);
 						// remove delimiters of '.' and ')' in tab.
-					if (!hasDelim)
+						if (!hasDelim)
 						{
 							// get list of delimiters to remove from the format:
 							foreach (string rmvDelim in DelimList) thisTab = thisTab.Replace(rmvDelim, "");

PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs

@@ -1148,15 +1148,6 @@ namespace VEPROMS.CSLA.Library
 			}
 		}
 
-		private LazyLoad<bool> _DontIncludeRNOTabIfHasAERParent;
-		public bool DontIncludeRNOTabIfHasAERParent   // F2026-002: Vogtle Units 3&4 Top Continue Message.
-		{
-			get
-			{
-				return LazyLoad(ref _DontIncludeRNOTabIfHasAERParent, "@DontIncludeRNOTabIfHasAERParent");
-			}
-		}
-
 		private LazyLoad<string> _Message;
 		[Category("Continue Msg")]
 		[DisplayName("Top Continue Msg")]

PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs

@@ -3814,18 +3814,6 @@ namespace VEPROMS.CSLA.Library
 			}
 		}
 
-		// C2026-003 (for Vogtle Units 3&4) Adds the continuous action tag to a high level RNO
-		//            only when it as a tab and the parent is an AER step that is not tagged as a continuous action
-		//            Use this with the setting of CASPrintMacro and CASEditTag on the RNO step type TabData definition
-		private LazyLoad<bool> _AddContActTagToHighLevelRNOWhenIncludedOnCAS;
-		public bool AddContActTagToHighLevelRNOWhenIncludedOnCAS
-		{
-			get
-			{
-				return LazyLoad(ref _AddContActTagToHighLevelRNOWhenIncludedOnCAS, "@AddContActTagToHighLevelRNOWhenIncludedOnCAS");
-			}
-		}
-
 		// treat sub-sections and High Level Steps as if they are at the same procedure structure level. This is used with the TieTabToLevel flag
 		private LazyLoad<bool> _SubSectAndHighSameLevel;
 		public bool SubSectAndHighSameLevel
@@ -4353,26 +4341,6 @@ public LeftJustifyList(XmlNodeList xmlNodeList) : base(xmlNodeList) { }
 				return LazyLoad(ref _IncludeSectionNumAndTitle, "@IncludeSectionNumAndTitle");
 			}
 		}
-
-		//F2025-038 default (in base format) is True. The lable "SECTION" will precede the section number an title
-		private LazyLoad<bool> _IncludeSectionLabel;
-		public bool IncludeSectionLabel
-		{
-			get
-			{
-				return LazyLoad(ref _IncludeSectionLabel, "@IncludeSectionLabel");
-			}
-		}
-		//F2026-001 default (in base format) is False. Put in for Vogtle Units 3 & 4.
-		//         this will add the parent sub-step tab if the parent is not identified as a continueous action step
-		private LazyLoad<bool> _AddParentTabToSubStepTab;
-		public bool AddParentTabToSubStepTab
-		{
-			get
-			{
-				return LazyLoad(ref _AddParentTabToSubStepTab, "@AddParentTabToSubStepTab");
-			}
-		}
 		// the font and font styles to use for the continuous action summary
 		private VE_Font _Font;
 		public VE_Font Font
@@ -5720,30 +5688,6 @@ public StepData Equation		// equation has a parent of embedded object.
 				return LazyLoad(ref _RNOIdentPrint, "TabData/@RNOIdent");
 			}
 		}
-		// Adds a print macro for the high level RNO when the user want it to be a Continuous Action
-		// while the corresponding AER is not a continuous action
-		// C2026-003 used in RNO step definition for Vogtle 3&4 two column format
-		// use with AddContActTagToHighLevelRNOWhenIncludedOnCAS set to True in the format file's StpSectLayData
-		private LazyLoad<string> _CASPrintMacro;
-		public string CASPrintMacro
-		{
-			get
-			{
-				return LazyLoad(ref _CASPrintMacro, "TabData/@CASPrintMacro");
-			}
-		}
-		// Adds a character indicator in the step editor for the high level RNO when the user want it to be a Continuous Action
-		// while the corresponding AER is not a continuous action
-		// C2026-003 used in RNO step definition for Vogtle 3&4 two colmn format
-		// use with AddContActTagToHighLevelRNOWhenIncludedOnCAS set to True in the format file's StpSectLayData
-		private LazyLoad<string> _CASEditTag;
-		public string CASEditTag
-		{
-			get
-			{
-				return LazyLoad(ref _CASEditTag, "TabData/@CASEditTag");
-			}
-		}
 
 		// don't use the defined macro when creating a step tab for the step type's RNO 
 		private LazyLoad<bool> _RNOExcludeMacros;

PROMS/VEPROMS.CSLA.Library/Generated/Content.cs

@@ -990,21 +990,12 @@ namespace VEPROMS.CSLA.Library
             }
             return tmp;
         }
-        public static Content Get(int contentID, bool forcerefresh = false)
+        public static Content Get(int contentID)
         {
             if (!CanGetObject())
                 throw new System.Security.SecurityException("User not authorized to view a Content");
             try
             {
-                //C2019-036 View Only mode work with Checked Out Procedures
-                //  fixes caching issue
-                //   this forces a refresh of the cache for a case when need to do a hard refresh
-                if (forcerefresh)
-                {
-                    ConvertListToDictionary();
-                    _CacheByPrimaryKey.Remove(contentID.ToString());
-                }
-
                 Content tmp = GetCachedByPrimaryKey(contentID);
                 if (tmp == null)
                 {

PROMS/VEPROMS.CSLA.Library/Generated/FolderInfo.cs

@@ -502,15 +502,6 @@ namespace VEPROMS.CSLA.Library
             _FolderInfoExtension.Refresh(this);
             OnChange();// raise an event
         }
-
-        //C2021-035 Add Refresh Tree Option at highest level
-        public static void ClearFolderInfoCache()
-        {
-            _CacheByPrimaryKey.Clear();
-            while (_CacheList.Count > 0)
-            { _CacheList[0].Dispose(); }
-        }
-
         public static FolderInfo Get(int folderID)
         {
             //if (!CanGetObject())

PROMS/VEPROMS.CSLA.Library/Generated/Format.cs

@@ -143,14 +143,6 @@ namespace VEPROMS.CSLA.Library
             if (_CacheByParentID_Name.ContainsKey(key)) return _CacheByParentID_Name[key][0];
             return null;
         }
-
-        //C2021-035 Add Refresh Tree Option at highest level
-        public static void ClearFormatCache()
-        {
-            _CacheByPrimaryKey.Clear();
-            while (_CacheList.Count > 0)
-            { _CacheList[0].Dispose(); }
-        }
         #endregion
         #region Business Methods
         private string _ErrorMessage = string.Empty;

PROMS/VEPROMS.CSLA.Library/Generated/FormatInfo.cs

@@ -71,13 +71,6 @@ namespace VEPROMS.CSLA.Library
             if (_CacheByPrimaryKey.ContainsKey(key)) return _CacheByPrimaryKey[key][0];
             return null;
         }
-        //C2021-035 Add Refresh Tree Option at highest level
-        public static void ClearFormatInfoCache()
-        {
-            _CacheByPrimaryKey.Clear();
-            while (_CacheList.Count > 0)
-            { _CacheList[0].Dispose(); }
-        }
         #endregion
         #region Business Methods
         private string _ErrorMessage = string.Empty;

PROMS/VEPROMS.CSLA.Library/Generated/MembershipInfo.cs

@@ -119,15 +119,6 @@ namespace VEPROMS.CSLA.Library
                 return _MyUser;
             }
         }
-        public string MyUserUserID
-        {
-            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-            get
-            {
-                if (_MyUser == null && _UID != 0) _MyUser = UserInfo.Get(_UID);
-                return _MyUser?.UserID;
-            }
-        }
         private int _GID;
         public int GID
         {
@@ -148,15 +139,6 @@ namespace VEPROMS.CSLA.Library
                 return _MyGroup;
             }
         }
-        public string MyGroupName
-        {
-            [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-            get
-            {
-                if (_MyGroup == null && _GID != 0) _MyGroup = GroupInfo.Get(_GID);
-                return _MyGroup?.GroupName;
-            }
-        }
         private string _StartDate = string.Empty;
         public string StartDate
         {

PROMS/VEPROMS.CSLA.Library/Generated/Pdf.cs

@@ -522,22 +522,19 @@ namespace VEPROMS.CSLA.Library
         }
         public static Pdf MakePdf(Document myDocument, int debugStatus, int topRow, int pageLength, int leftMargin, int pageWidth, double pageCount, byte[] docPdf)
         {
-            using (Pdf tmp = Pdf.New(myDocument, debugStatus, topRow, pageLength, leftMargin, pageWidth, pageCount, docPdf))
+            Pdf tmp = Pdf.New(myDocument, debugStatus, topRow, pageLength, leftMargin, pageWidth, pageCount, docPdf);
+            if (tmp.IsSavable)
+                tmp = tmp.Save();
+            else
             {
-                if (tmp.IsSavable)
-                    return tmp.Save();
-                else
+                Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules();
+                tmp._ErrorMessage = "Failed Validation:";
+                foreach (Csla.Validation.BrokenRule br in brc)
                 {
-                    Csla.Validation.BrokenRulesCollection brc = tmp.ValidationRules.GetBrokenRules();
-                    tmp._ErrorMessage = "Failed Validation:";
-                    foreach (Csla.Validation.BrokenRule br in brc)
-                    {
-                        tmp._ErrorMessage += "\r\n\tFailure: " + br.RuleName;
-                    }
-                    return tmp;
+                    tmp._ErrorMessage += "\r\n\tFailure: " + br.RuleName;
                 }
             }
-
+            return tmp;
         }
         public static Pdf Get(int docID, int debugStatus, int topRow, int pageLength, int leftMargin, int pageWidth)
         {

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

@@ -1,72 +0,0 @@
-using System;
-using Csla.Data;
-using System.Data;
-using System.Data.SqlClient;
-
-//CSM - C2026-010 - Minimal Class for Managing Change Bar Audit History
-namespace VEPROMS.CSLA.Library
-{
-    public static class ChangeBarAuditHistory
-	{
-
-		#region Add Audit Record for ChangeBar History
-		public static void AddAudit(int itemID, string description, DateTime dts, string userID, int unitIndex)
-		{
-			try
-			{
-				using (SqlConnection cn = Database.VEPROMS_SqlConnection)
-				{
-					using (SqlCommand cm = cn.CreateCommand())
-					{
-						cm.CommandType = CommandType.StoredProcedure;
-						cm.CommandText = "AddChangeBarAuditHistory";
-						cm.Parameters.AddWithValue("@ItemID", itemID);
-						cm.Parameters.AddWithValue("@Description", description);
-						cm.Parameters.AddWithValue("@DTS", dts);
-						cm.Parameters.AddWithValue("@UserID", userID);
-						if (unitIndex != 0) cm.Parameters.AddWithValue("@UnitIndex", unitIndex);
-
-						cm.CommandTimeout = 0;
-						cm.ExecuteNonQuery();
-					}
-				}
-			}
-			catch (Exception ex)
-			{
-				throw new DbCslaException("Error in ChangeBarAuditHistory.AddAudit: ", ex);
-			}
-		}
-
-		#endregion
-
-		#region Get Change Bar Audit History
-		public static DataTable GetChangeBarAuditHistory(int itemID)
-		{
-			try
-			{
-				using (SqlConnection cn = Database.VEPROMS_SqlConnection)
-				{
-					using (SqlCommand cm = cn.CreateCommand())
-					{
-						cm.CommandType = CommandType.StoredProcedure;
-						cm.CommandText = "GetChangeBarAuditHistoryByItem";
-						cm.Parameters.AddWithValue("@ItemID", itemID);
-						cm.CommandTimeout = Database.DefaultTimeout;
-						using (SqlDataAdapter da = new SqlDataAdapter(cm))
-						{
-							DataTable dt = new DataTable();
-							da.Fill(dt);
-							return dt;
-						}
-					}
-				}
-			}
-			catch (Exception ex)
-			{
-				throw new DbCslaException("Error in ChangeBarAuditHistory.GetChangeBarAuditHistoryByItem: retrieving data failed", ex);
-			}
-		}
-		#endregion
-
-	}
-}

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

@@ -1,76 +0,0 @@
-using System;
-using Csla.Data;
-using System.Data;
-using System.Data.SqlClient;
-
-//CSM - C2025-043 - Minimal Class for General Reports
-namespace VEPROMS.CSLA.Library
-{
-    public static class GeneralReports
-    {
-
-		#region Get General Reports
-		//CSM - C2025-043 report RO's that are not used in any of the PROMS data.
-		public static DataTable GetROsNotUsedInPROMS(DataTable dtDBids)
-		{
-			try
-			{
-				using (SqlConnection cn = Database.VEPROMS_SqlConnection)
-				{
-					using (SqlCommand cm = cn.CreateCommand())
-					{
-					cm.CommandType = CommandType.StoredProcedure;
-					cm.CommandText = "vesp_GetROsNotUsed";
-					cm.CommandTimeout = 0;
-					//Pass table Valued parameter to Store Procedure
-					SqlParameter sqlParam = cm.Parameters.AddWithValue("@dbIDs", dtDBids);
-					sqlParam.SqlDbType = SqlDbType.Structured;
-
-						using (SqlDataAdapter da = new SqlDataAdapter(cm))
-						{
-							DataTable dt = new DataTable();
-							da.Fill(dt);
-							return dt;
-						}
-					}
-				}
-			}
-			catch (Exception ex)
-			{
-				throw new DbCslaException("Error in GetROsNotUsedInPROMS Report: retrieving data failed", ex);
-			}
-		}
-
-		//C2026-002 Enhancements to new admin Tool for ROs not used.
-		//used to build checkboxes of dbs to include
-		public static DataTable GetRODBs()
-		{
-			try
-			{
-				using (SqlConnection cn = Database.VEPROMS_SqlConnection)
-				{
-					using (SqlCommand cm = cn.CreateCommand())
-					{
-						cm.CommandType = CommandType.Text;
-                        cm.CommandText = "select RofstDatabase.*, RODbID FROM RofstDatabase INNER JOIN (Select FSTID = max(RoFSTID), RODbID from ROFsts GROUP BY RODbID) fsts ON fsts.FSTID = RofstDatabase.RofstID ORDER BY RofstID, RODbID, dbiTitle";
-						
-						cm.CommandTimeout = 0;
-						using (SqlDataAdapter da = new SqlDataAdapter(cm))
-						{
-							DataTable dt = new DataTable();
-							da.Fill(dt);
-							return dt;
-						}
-					}
-				}
-			}
-			catch (Exception ex)
-			{
-				throw new DbCslaException("Error in GetROsNotUsedInPROMS Report - GetRODBs: retrieving data failed", ex);
-			}
-		}
-
-		#endregion
-
-	}
-}

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

@@ -86,38 +86,7 @@ namespace VEPROMS.CSLA.Library
 				throw new DbCslaException("Error in vesp_GetOtherActiveSessions: retrieving data failed", ex);
 			}
 		}
-        #endregion
+		#endregion
 
-        #region Get Docs by Unit
-        //C2026-007 Get Missing Docs by Unit
-        // for Generating/Regenerating Pdf table
-        // can be ran overnight to assist with Printing when RO Updates 
-        // and large Word Sections conatining ROs
-        public static DataTable GetMissingDocsByUnit()
-        {
-            try
-            {
-                using (SqlConnection cn = Database.VEPROMS_SqlConnection)
-                {
-                    using (SqlCommand cm = cn.CreateCommand())
-                    {
-                        cm.CommandType = CommandType.StoredProcedure;
-                        cm.CommandText = "GetMissingDocsByUnit";
-                        cm.CommandTimeout = Database.DefaultTimeout;
-                        using (SqlDataAdapter da = new SqlDataAdapter(cm))
-                        {
-                            DataTable dt = new DataTable();
-                            da.Fill(dt);
-                            return dt;
-                        }
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                throw new DbCslaException("Error in GetMissingDocsByUnit: retrieving data failed", ex);
-            }
-        }
-        #endregion
-    }
+	}
 }

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

@@ -1,53 +0,0 @@
-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

@@ -389,10 +389,7 @@
     <Compile Include="Generated\ZTransition.cs" />
     <Compile Include="Generated\ZTransitionInfo.cs" />
     <Compile Include="Minimal\AnnotationstypeSections.cs" />
-    <Compile Include="Minimal\ChangeBarAuditHistory.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

@@ -1,121 +0,0 @@
-namespace Volian.Controls.Library
-{
-    partial class CustomMessageBox
-    {
-        /// <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 Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            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(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(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.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btn2.AutoSize = true;
-            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(60, 20);
-            this.btn2.TabIndex = 1;
-            this.btn2.UseVisualStyleBackColor = true;
-            this.btn2.Click += new System.EventHandler(this.Btn2_Click);
-            // 
-            // lblMessage
-            // 
-            this.lblMessage.AutoSize = true;
-            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(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.tableLP1);
-            this.Name = "CustomMessageBox";
-            this.ShowIcon = false;
-            this.Text = "CustomMessageBox";
-            this.tableLP1.ResumeLayout(false);
-            this.tableLP1.PerformLayout();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        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

@@ -1,62 +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;
-
-namespace Volian.Controls.Library
-{
-    public partial class CustomMessageBox : Form
-    {
-        //Custome Message Box Class to allow renaming of buttons
-        // originally devleoped for use with 
-        // C2025-062 When Search clicked - Load the Incoming transitions for the Active Procedure
-        // in order to allow the user to decide if they wanted to search on the selected step or the selected procedure
-        public CustomMessageBox(string message, string title, string button1Text = "OK", string button2Text = "")
-        {
-            InitializeComponent();
-            this.Text = title;
-            lblMessage.Text = message;
-            btn1.Text = button1Text;
-
-            if (!string.IsNullOrEmpty(button2Text))
-            {
-                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
-            {
-                btn2.Visible = false;
-            }
-        }
-
-        private void Btn1_Click(object sender, EventArgs e)
-        {
-            DialogResult = DialogResult.Yes;
-            Close();
-        }
-
-        private void Btn2_Click(object sender, EventArgs e)
-        {
-            DialogResult = DialogResult.No;
-            Close();
-        }
-
-        //static method for calling custommessagebox directly
-        public static DialogResult Show(string message, string title, string button1Text = "OK", string button2Text = "")
-        {
-            using (var messageBox = new CustomMessageBox(message, title, button1Text, button2Text))
-            {
-                return messageBox.ShowDialog();
-            }
-        }
-    }
-}

PROMS/Volian.Controls.Library/CustomMessageBox.resx

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <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>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

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

@@ -1,6 +1,3 @@
-using System.Security.Cryptography;
-using VEPROMS.CSLA.Library;
-
 namespace Volian.Controls.Library
 {
 	partial class DisplayApplicability
@@ -23,7 +20,6 @@ namespace Volian.Controls.Library
 			base.Dispose(disposing);
 		}
 
-
 		#region Component Designer generated code
 
 		/// <summary> 
@@ -34,41 +30,19 @@ namespace Volian.Controls.Library
 		{
 			this.gpMode = new DevComponents.DotNetBar.Controls.GroupPanel();
 			this.gpItem = new DevComponents.DotNetBar.Controls.GroupPanel();
-			this.btnApplicabilitychg2 = new DevComponents.DotNetBar.ButtonItem();
-			this.btnApplicabilitychg = new DevComponents.DotNetBar.ButtonX();
-			this.superTooltip1 = new DevComponents.DotNetBar.SuperTooltip();
-			this.gpItem.SuspendLayout();
 			this.SuspendLayout();
 			// 
-			// btnApplicabilitychg
-			// 
-			this.btnApplicabilitychg.Location = new System.Drawing.Point(60, 8);
-			this.btnApplicabilitychg.Margin = new System.Windows.Forms.Padding(4);
-			this.btnApplicabilitychg.BackColor = System.Drawing.SystemColors.Control;
-			this.btnApplicabilitychg.Name = "btnApplicabilitychg";
-			this.btnApplicabilitychg.Size = new System.Drawing.Size(80, 22);
-			this.btnApplicabilitychg.Margin = new System.Windows.Forms.Padding(2);
-			this.btnApplicabilitychg.RightToLeft = System.Windows.Forms.RightToLeft.No;
-			this.superTooltip1.SetSuperTooltip(this.btnApplicabilitychg, new DevComponents.DotNetBar.SuperTooltipInfo("Change applicability settings - All At Level", "", "When clicked, all steps at the level of the current step will have their applicability settings changed. Note that for two column procedures, the left column and right column are handled separately.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
-			this.btnApplicabilitychg.TabIndex = 0;
-			this.btnApplicabilitychg.Text = "Set All at Level";
-			this.btnApplicabilitychg.ColorTable = DevComponents.DotNetBar.eButtonColor.BlueOrb;
-			this.btnApplicabilitychg.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.btnApplicabilitychg.Click += new System.EventHandler(this.BtnApplicabilitychg_Click);
-			// 
 			// gpMode
 			// 
 			this.gpMode.AutoSize = true;
 			this.gpMode.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
 			this.gpMode.CanvasColor = System.Drawing.SystemColors.Control;
 			this.gpMode.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
-			this.gpMode.DisabledBackColor = System.Drawing.Color.Empty;
 			this.gpMode.Dock = System.Windows.Forms.DockStyle.Top;
 			this.gpMode.Location = new System.Drawing.Point(0, 0);
-			this.gpMode.Margin = new System.Windows.Forms.Padding(4);
 			this.gpMode.Name = "gpMode";
-			this.gpMode.Padding = new System.Windows.Forms.Padding(13, 12, 13, 37);
-			this.gpMode.Size = new System.Drawing.Size(432, 49);
+			this.gpMode.Padding = new System.Windows.Forms.Padding(10, 10, 10, 30);
+			this.gpMode.Size = new System.Drawing.Size(324, 40);
 			// 
 			// 
 			// 
@@ -84,6 +58,7 @@ namespace Volian.Controls.Library
 			this.gpMode.Style.BorderRightWidth = 1;
 			this.gpMode.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
 			this.gpMode.Style.BorderTopWidth = 1;
+			this.gpMode.Style.Class = "";
 			this.gpMode.Style.CornerDiameter = 4;
 			this.gpMode.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
 			this.gpMode.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
@@ -92,10 +67,12 @@ namespace Volian.Controls.Library
 			// 
 			// 
 			// 
+			this.gpMode.StyleMouseDown.Class = "";
 			this.gpMode.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			// 
 			// 
 			// 
+			this.gpMode.StyleMouseOver.Class = "";
 			this.gpMode.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			this.gpMode.TabIndex = 0;
 			this.gpMode.Text = "Viewing Mode";
@@ -106,14 +83,11 @@ namespace Volian.Controls.Library
 			this.gpItem.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
 			this.gpItem.CanvasColor = System.Drawing.SystemColors.Control;
 			this.gpItem.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
-			//this.gpItem.Controls.Add(this.btnApplicabilitychg);
-			this.gpItem.DisabledBackColor = System.Drawing.Color.Empty;
 			this.gpItem.Dock = System.Windows.Forms.DockStyle.Top;
-			this.gpItem.Location = new System.Drawing.Point(0, 49);
-			this.gpItem.Margin = new System.Windows.Forms.Padding(4);
+			this.gpItem.Location = new System.Drawing.Point(0, 40);
 			this.gpItem.Name = "gpItem";
-			this.gpItem.Padding = new System.Windows.Forms.Padding(13, 12, 13, 37);
-			this.gpItem.Size = new System.Drawing.Size(432, 85);
+			this.gpItem.Padding = new System.Windows.Forms.Padding(10, 10, 10, 30);
+			this.gpItem.Size = new System.Drawing.Size(324, 40);
 			// 
 			// 
 			// 
@@ -129,6 +103,7 @@ namespace Volian.Controls.Library
 			this.gpItem.Style.BorderRightWidth = 1;
 			this.gpItem.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
 			this.gpItem.Style.BorderTopWidth = 1;
+			this.gpItem.Style.Class = "";
 			this.gpItem.Style.CornerDiameter = 4;
 			this.gpItem.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
 			this.gpItem.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
@@ -137,31 +112,26 @@ namespace Volian.Controls.Library
 			// 
 			// 
 			// 
+			this.gpItem.StyleMouseDown.Class = "";
 			this.gpItem.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			// 
 			// 
 			// 
+			this.gpItem.StyleMouseOver.Class = "";
 			this.gpItem.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			this.gpItem.TabIndex = 1;
 			this.gpItem.Text = "Item Mode";
 			// 
 			// DisplayApplicability
 			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
 			this.Controls.Add(this.gpItem);
 			this.Controls.Add(this.gpMode);
-			this.Margin = new System.Windows.Forms.Padding(4);
 			this.Name = "DisplayApplicability";
-			this.Size = new System.Drawing.Size(432, 807);
-			this.gpItem.ResumeLayout(false);
+			this.Size = new System.Drawing.Size(324, 656);
 			this.ResumeLayout(false);
-			this.PerformLayout(); 
-			// 
-			// superTooltip1
-			// 
-			this.superTooltip1.DefaultTooltipSettings = new DevComponents.DotNetBar.SuperTooltipInfo("", "", "", null, null, DevComponents.DotNetBar.eTooltipColor.Gray);
-			this.superTooltip1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
+			this.PerformLayout();
 
 		}
 
@@ -169,9 +139,6 @@ namespace Volian.Controls.Library
 
 		private DevComponents.DotNetBar.Controls.GroupPanel gpMode;
 		private DevComponents.DotNetBar.Controls.GroupPanel gpItem;
-		private DevComponents.DotNetBar.ButtonItem btnApplicabilitychg2;
-		private DevComponents.DotNetBar.ButtonX btnApplicabilitychg;
-		private DevComponents.DotNetBar.SuperTooltip superTooltip1;
 
 	}
 }

PROMS/Volian.Controls.Library/DisplayApplicability.cs

@@ -1,14 +1,12 @@
-using JR.Utils.GUI.Forms;
-using log4net.Util;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Data;
 using System.Drawing;
-using System.Linq;
+using System.Data;
 using System.Text;
 using System.Windows.Forms;
 using VEPROMS.CSLA.Library;
+using JR.Utils.GUI.Forms;
 
 namespace Volian.Controls.Library
 {
@@ -53,22 +51,15 @@ namespace Volian.Controls.Library
 						i++;
 						AddViewMode(name.Trim(), i.ToString(), apple == i);
 					}
-
 					AddItemMode("All", "-1");
 					i = 0;
 					foreach (string name in names)
 						AddItemMode(name.Trim(), (++i).ToString());
 					AddItemMode("None", "0");
-					gpItem.Controls.Add(btnApplicabilitychg);
-					btnApplicabilitychg.BringToFront();
 					if (_MyDisplayTabItem.MyStepTabPanel != null)
-					{
 						MyItemInfo = _MyDisplayTabItem.MyStepTabPanel.MyStepPanel.SelectedItemInfo;
-					}
 					else
-					{
 						MyItemInfo = _MyDisplayTabItem.MyItemInfo;
-					}
 				}
 			}
 		}
@@ -184,8 +175,7 @@ namespace Volian.Controls.Library
 					}
 					break;
 			}
-
-		WireCheckboxes();
+			WireCheckboxes();
 			MyApplicability = string.Empty;
 			string sep = string.Empty;
 			foreach (int i in MyCheckBoxes.Keys)
@@ -226,8 +216,8 @@ namespace Volian.Controls.Library
 			//	return internal and external for the procedure level)
 			if ((!MyItemInfo.IsProcedure && invalidTrans.Count == 0) || IsProcWithNoExternalTrans(MyItemInfo, invalidTrans))
 			{
-                // C2021 - 027: Procedure level PC/PC
-                if (MyItemInfo.IsProcedure && MyItemInfo.ActiveFormat.PlantFormat.FormatData.ProcData.ProcAppl)
+				// C2021 - 027: Procedure level PC/PC
+				if (MyItemInfo.IsProcedure && MyItemInfo.ActiveFormat.PlantFormat.FormatData.ProcData.ProcAppl)
 				{
 					ProcedureConfig sc = MyItemInfo.MyConfig as ProcedureConfig;
 					sc.MasterSlave_Applicability = Volian.Base.Library.BigNum.MakeBigNum(MyApplicability);
@@ -280,61 +270,8 @@ namespace Volian.Controls.Library
 			//  s.Save();
 			//}
 		}
-		private void BtnApplicabilitychg_Click(object sender, System.EventArgs e)
-		{
-			Volian.Base.Library.BigNum MasterSlave_ApplicabilityTmp;
-			StepConfig sc = MyItemInfo.MyConfig as StepConfig;
-			MasterSlave_ApplicabilityTmp = sc.MasterSlave_Applicability;
-            StringBuilder sb = new StringBuilder();
-
-
-            ItemInfo startitm = MyItemInfo.FirstSibling;
-			while (startitm != null)
-			{
-
-                // C2026-023: Check for Transitions when setting Applicability to all for a level
-                List<InvalidTransition> invalidTrans = WillTransitionsBeValidCommand.Execute(startitm.ItemID, MasterSlave_ApplicabilityTmp.ToString());
-                if (IsProcWithNoExternalTrans(startitm, invalidTrans))
-                {
-                    StepConfig sc2 = startitm.MyConfig as StepConfig;
-                    using (Content cnt = Content.Get(startitm.MyContent.ContentID))
-                    {
-                        sc2.MasterSlave_Applicability = (MasterSlave_ApplicabilityTmp);
-                        cnt.Config = sc2.ToString();
-                        cnt.Save();
-                    }
-				}
-                else
-                {
-					if (sb.Length == 0)
-					{
-                        sb.AppendLine("The applicability for some Step(s) cannot be changed due to transition links.");
-                        sb.AppendLine("Applicability settings for these steps will return to original settings when OK is selected.");
-                        sb.AppendLine("Changing the applicability for would invalidate a transition in the following steps:");
-                        sb.AppendLine();
-                    }
-
-                    foreach (InvalidTransition inv in invalidTrans.Where(x => !x.TgtStep.StartsWith(x.SrcStep)))
-                    {
-                        sb.AppendLine(string.Format("{0} : From {1} to {2}.", startitm.MyTab.CleanTextNoSymbols.Trim(), inv.TgtStep, inv.SrcStep));
-                    }
-
-                    invalidTrans.Clear();
-                }
-
-				startitm = startitm.GetNext();
-			}
-
-			_MyDisplayTabItem.MyStepTabPanel.MyStepTabRibbon.RefreshProcedure();
-
-            if (sb.Length > 0)
-				FlexibleMessageBox.Show(sb.ToString(), "Transitions Affected By Applicability Change");
-
-
-        }
-
-        // B2021-149: for procedure, only consider external transitions as invalid
-        private bool IsProcWithNoExternalTrans(ItemInfo ii, List<InvalidTransition> invalidTrans)
+		// B2021-149: for procedure, only consider external transitions as invalid
+		private bool IsProcWithNoExternalTrans(ItemInfo ii, List<InvalidTransition> invalidTrans)
 		{
 			if (invalidTrans.Count == 0) return true;
 			foreach (InvalidTransition iT in invalidTrans)

PROMS/Volian.Controls.Library/DisplayHistory.cs

@@ -11,7 +11,7 @@ using System.Text.RegularExpressions;
 using JR.Utils.GUI.Forms;
 using Volian.Base.Library;
 using System.Linq;
- 
+
 namespace Volian.Controls.Library
 {
 	public partial class DisplayHistory : UserControl
@@ -56,20 +56,7 @@ namespace Volian.Controls.Library
 			set
 			{
 				if (DesignMode) return; // B2019-043 need to check if we are just saving changes to the user interface
-
-                //CSM - C2026-010 - Set/Show Change Bar Audit History
-                if (value != null)
-                {
-                    lbChangeBarHistory.DataSource = ChangeBarAuditHistory.GetChangeBarAuditHistory(value.ItemID);
-					lbChangeBarHistory.ValueMember = "AuditID";
-					lbChangeBarHistory.DisplayMember = "Text";
-                }
-                else
-                {
-                    lbChangeBarHistory.DataSource = null;
-                }
-
-                if (value is ProcedureInfo && _MyProcedureInfo is ProcedureInfo && value.ItemID == _MyProcedureInfo.ItemID)
+				if (value is ProcedureInfo && _MyProcedureInfo is ProcedureInfo && value.ItemID == _MyProcedureInfo.ItemID)
 					return;
 				_MyProcedureInfo = value;
 				if (value == null) return;
@@ -197,15 +184,6 @@ namespace Volian.Controls.Library
 			InitializeComponent();
 			myRTB.FormatFont = null;
 			RefreshRequired = true;
-
-			if (MyProcedureInfo != null)
-			{
-				lbChangeBarHistory.DataSource = ChangeBarAuditHistory.GetChangeBarAuditHistory(MyProcedureInfo.ItemID);
-            }
-			else
-			{
-				lbChangeBarHistory.DataSource = null;
-            }
 		}
 
 		private void lbChanges_VisibleChanged(object sender, System.EventArgs e)
@@ -1097,25 +1075,7 @@ namespace Volian.Controls.Library
 		{
 			tvAudits.Height = ((tcpDetail.Height - btnRestore.Height) / 4) * 3;
 		}
-
-        //CSM - C2026-010 - Set/Show Change Bar Audit History
-		//Display a Tooltip for what was in the list
-        private void LbChangeBarHistory_MouseMove(object sender, MouseEventArgs e)
-        {
-            // Just use the item's value for the tooltip.
-            int index = lbChangeBarHistory.IndexFromPoint(e.Location);
-
-            if (index != ListBox.NoMatches)
-			{
-                DataRow rw = (lbChangeBarHistory.Items[index] as DataRowView)?.Row;
-
-                // Display the item's value as a tooltip.
-                if (tipCBHistory.GetToolTip(lbChangeBarHistory) != rw["Text"].ToString())
-                    tipCBHistory.SetToolTip(lbChangeBarHistory, rw["Text"].ToString());
-            }
-        }
-
-        public void RefreshChangeList()
+		public void RefreshChangeList()
 		{
 			myTimer.Enabled = false;
 			myTimer.Enabled = true;

PROMS/Volian.Controls.Library/DisplayHistory.resx

@@ -112,13 +112,13 @@
     <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>
   <data name="myVFG.MyBorderDetailString" xml:space="preserve">
-    <value>&lt;?xml version="1.0" encoding="utf-16"?&gt;
+    <value>&lt;?xml version="1.0" encoding="utf-8"?&gt;
 &lt;VlnBorders Rows="4" Columns="3"&gt;
   &lt;VerticalLines Rows="4" Columns="4"&gt;
     &lt;Lines&gt;
@@ -160,35 +160,8 @@
     &lt;/Lines&gt;
   &lt;/HorizontalLines&gt;
 &lt;/VlnBorders&gt;</value>
-  </data>
-  <data name="myVFG.MyShadingDetailString" xml:space="preserve">
-    <value>&lt;?xml version="1.0" encoding="utf-16"?&gt;
-&lt;VlnGridCellShading Rows="4" Columns="3"&gt;
-  &lt;TableShadingInfo Rows="4" Columns="3"&gt;
-    &lt;CellShadingColor&gt;
-      &lt;string&gt;[A=255, R=255, G=255, B=255]&lt;/string&gt;
-      &lt;string&gt;[A=255, R=255, G=255, B=255]&lt;/string&gt;
-      &lt;string&gt;[A=255, R=255, G=255, B=255]&lt;/string&gt;
-      &lt;string&gt;[A=255, R=255, G=255, B=255]&lt;/string&gt;
-      &lt;string&gt;[A=255, R=255, G=255, B=255]&lt;/string&gt;
-      &lt;string&gt;[A=255, R=255, G=255, B=255]&lt;/string&gt;
-      &lt;string&gt;[A=255, R=255, G=255, B=255]&lt;/string&gt;
-      &lt;string&gt;[A=255, R=255, G=255, B=255]&lt;/string&gt;
-      &lt;string&gt;[A=255, R=255, G=255, B=255]&lt;/string&gt;
-      &lt;string&gt;[A=255, R=255, G=255, B=255]&lt;/string&gt;
-      &lt;string&gt;[A=255, R=255, G=255, B=255]&lt;/string&gt;
-      &lt;string&gt;[A=255, R=255, G=255, B=255]&lt;/string&gt;
-    &lt;/CellShadingColor&gt;
-  &lt;/TableShadingInfo&gt;
-&lt;/VlnGridCellShading&gt;</value>
   </data>
   <data name="myVFG.StyleInfo" xml:space="preserve">
-    <value>Normal{Font:Microsoft Sans Serif, 8.25pt;BackColor:White;TextAlign:LeftTop;Border:Flat,1,Black,Both;}	Alternate{BackColor:White;}	Fixed{BackColor:Control;ForeColor:ControlText;Border:Flat,1,ControlDark,Both;BackgroundImageLayout:Hide;}	Highlight{BackColor:LightCyan;ForeColor:Black;}	Focus{BackColor:LightCyan;}	Editor{}	Search{BackColor:Highlight;ForeColor:HighlightText;}	Frozen{BackColor:Beige;}	FrozenAlternate{}	NewRow{ForeColor:GrayText;}	EmptyArea{BackColor:Transparent;Border:None,1,Black,Both;}	SelectedColumnHeader{}	SelectedRowHeader{}	GrandTotal{BackColor:Black;ForeColor:White;}	Subtotal0{BackColor:ControlDarkDark;ForeColor:White;}	Subtotal1{BackColor:ControlDarkDark;ForeColor:White;}	Subtotal2{BackColor:ControlDarkDark;ForeColor:White;}	Subtotal3{BackColor:ControlDarkDark;ForeColor:White;}	Subtotal4{BackColor:ControlDarkDark;ForeColor:White;}	Subtotal5{BackColor:ControlDarkDark;ForeColor:White;}	FilterEditor{}	FirstCustomStyle{}	</value>
+    <value>Normal{Font:Microsoft Sans Serif, 8.25pt;BackColor:White;TextAlign:LeftTop;Border:Flat,1,Black,Both;}	Alternate{BackColor:White;}	Fixed{BackColor:Control;ForeColor:ControlText;Border:Flat,1,ControlDark,Both;BackgroundImageLayout:Hide;}	Highlight{BackColor:LightCyan;ForeColor:Black;}	Focus{BackColor:LightCyan;}	Editor{}	Search{BackColor:Highlight;ForeColor:HighlightText;}	Frozen{BackColor:Beige;}	NewRow{ForeColor:GrayText;}	EmptyArea{BackColor:Transparent;Border:None,1,Black,Both;}	SelectedColumnHeader{}	SelectedRowHeader{}	GrandTotal{BackColor:Black;ForeColor:White;}	Subtotal0{BackColor:ControlDarkDark;ForeColor:White;}	Subtotal1{BackColor:ControlDarkDark;ForeColor:White;}	Subtotal2{BackColor:ControlDarkDark;ForeColor:White;}	Subtotal3{BackColor:ControlDarkDark;ForeColor:White;}	Subtotal4{BackColor:ControlDarkDark;ForeColor:White;}	Subtotal5{BackColor:ControlDarkDark;ForeColor:White;}	FilterEditor{}	FirstCustomStyle{}	</value>
   </data>
-  <metadata name="myTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <metadata name="tipCBHistory.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>119, 17</value>
-  </metadata>
 </root>

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.Linq;
+using System.Data;
 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
 {
@@ -379,7 +379,6 @@ namespace Volian.Controls.Library
 
 				if (chld.value != null)
 				{
-					chld.value = Regex.Replace(chld.value, @"\\u([0-9]{1,4})\?", m => int.TryParse(m?.Groups[1]?.Value, out int result) ? Convert.ToChar(result).ToString() : "");
 					RoUsageInfo SavROLink = null;
 					if (_savCurROLink != null) SavROLink = _savCurROLink;
 
@@ -771,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);
@@ -928,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
-							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));
-
+						MyRTB.OnRoInsert(this, new StepRTBRoEventArgs(valtxt, selectedChld.value, linktxt, padroid, MyROFST.RODbID));
 					}
 				}
 
@@ -1164,23 +1156,13 @@ namespace Volian.Controls.Library
 			tbROValue.Text = null;
 			lbROId.Text = string.Empty;
 
-			// Disable all buttons by default			
+			// Disable all buttons by default
+			btnGoToRO.Enabled = false;
 			btnSaveRO.Enabled = false;
 			btnCancelRO.Enabled = false;
 			btnPreviewRO.Enabled = false;
-
-            //B2026-030 GoTo sometimes requires being pressed twice
-            if (MyUserInfo != null && MyDvi != null && selectedChld.value != null)
-            {
-                btnGoToRO.Enabled = UserInfo.CanEditROs(MyUserInfo, MyDvi);  // Writers and Reviewers cannot edit ROs (run the RO Editor)
-            }
-			else
-			{
-                btnGoToRO.Enabled = false;
-            }
-        }
+		}
 
 		#endregion
 	}
 }
-

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/DisplaySearch.Designer.cs

@@ -188,6 +188,7 @@ namespace Volian.Controls.Library
 			this.tabSearchTypes.Controls.Add(this.tabControlPanel5);
 			this.tabSearchTypes.Controls.Add(this.tabControlPanel2);
 			this.tabSearchTypes.Controls.Add(this.tabControlPanel3);
+			this.tabSearchTypes.Controls.Add(this.tabControlPanel1);
 			this.tabSearchTypes.Controls.Add(this.contextMenuBar1);
 			this.tabSearchTypes.Dock = System.Windows.Forms.DockStyle.Top;
 			this.tabSearchTypes.Location = new System.Drawing.Point(0, 0);
@@ -982,6 +983,7 @@ namespace Volian.Controls.Library
 			this.tabControlPanel1.Controls.Add(this.lblSrchIncTran);
 			this.tabControlPanel1.Controls.Add(this.groupBox1);
 			this.tabControlPanel1.DisabledBackColor = System.Drawing.Color.Empty;
+			this.tabControlPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.tabControlPanel1.Location = new System.Drawing.Point(0, 34);
 			this.tabControlPanel1.Name = "tabControlPanel1";
 			this.tabControlPanel1.Padding = new System.Windows.Forms.Padding(1);
@@ -995,8 +997,6 @@ namespace Volian.Controls.Library
 			this.tabControlPanel1.Style.GradientAngle = 90;
 			this.tabControlPanel1.TabIndex = 17;
 			this.tabControlPanel1.TabItem = this.tabIncTrans;
-			this.tabControlPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(( System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-			this.tabControlPanel1.RightToLeft = System.Windows.Forms.RightToLeft.No;
 			// 
 			// btnTranCvtSelToTxt
 			// 
@@ -1732,12 +1732,6 @@ namespace Volian.Controls.Library
 			this.Controls.Add(this.xpStepTypes);
 			this.Controls.Add(this.xpSetToSearch);
 			this.Controls.Add(this.tabSearchTypes);
-			this.Controls.Add(this.tabControlPanel1);
-			//B2025-056 Click on Incoming Transitions
-			// This needs to be part of overall control
-			// since if it is part of tabSearchTypes,
-			// then when that is disabled, buttons on
-			// this will be also
 			this.Margin = new System.Windows.Forms.Padding(2);
 			this.Name = "DisplaySearch";
 			this.RightToLeft = System.Windows.Forms.RightToLeft.Yes;

PROMS/Volian.Controls.Library/DisplaySearch.cs

@@ -414,15 +414,6 @@ namespace Volian.Controls.Library
 			lbSrchResults.Visible = true;
 			lbSrchResultsIncTrans.Visible = false;
 			cbxRnoOnly.Visible = true;
-
-			// C2025-062 When Search clicked - Load the Incoming transitions for the Active Procedure
-			//don't allow changing the Style for Incoming Transitions
-			//but allow them to change it if there are search results and it is another tab
-			if (_SearchResults != null && _SearchResults.Count > 0)
-			{
-				cmbResultsStyle.Enabled = true;
-			}
-
 			if (e.NewTab == tabIncTrans)        // C2020-033: Incoming transitions
 			{
 				xpSetToSearch.Enabled = false;
@@ -431,7 +422,7 @@ namespace Volian.Controls.Library
 				lbSrchResultsIncTrans.Visible = true;
 				lbSrchResultsIncTrans.CheckBoxesVisible = true;
 				lbSrchResultsIncTrans.AutoScroll = true;
-				cmbResultsStyle.Enabled = false;
+				btnSearch.Enabled = false; // C2021 - 002: disable search button - no functionality for Incoming Transitions
 				cbxRnoOnly.Visible = false;
 			}
 			else if (e.NewTab == tabROSearch)
@@ -657,6 +648,7 @@ namespace Volian.Controls.Library
 			}
 			btnTranCvtAllToTxt.Enabled = IncTransCvtAllToTextPerm();
 			btnTranCvtSelToTxt.Enabled = false;
+			btnSearch.Enabled = false;  // C2021 - 002: disable search button - no functionality for Incoming Transitions
 		}
 
 		public bool IncTranCvtPerm()
@@ -1773,8 +1765,7 @@ namespace Volian.Controls.Library
 				btnClearSearchResults.Enabled = true;
 				btnCopySearchResults.Enabled = true;
 				btnSaveSearchResults.Enabled = true;
-				if (tabSearchTypes.SelectedTab != tabIncTrans) 
-					cmbResultsStyle.Enabled = true;
+				cmbResultsStyle.Enabled = true;
 			}
 			else
 			{
@@ -1866,15 +1857,14 @@ namespace Volian.Controls.Library
 				lbSrchResultsIncTrans.Enabled = false;
 				lbSrchResultsIncTrans.UseWaitCursor = true;
 			}
-			//B2025-056 Click on Incoming Transitions
-			// Clicking on Incoming Transitions
-			// will now open that item
-			ListBox mylb_lbSrchResults = sender as ListBox;
-			ListBoxAdv mylb_lbSrchResultsIncTrans = sender as ListBoxAdv;
+			ListBox mylb = sender as ListBox;
 
 			// If the list is being refreshed, then set the selection index to -1 (no selection)
 			// B2022-044: don't set selection to top of list (commented out/changed if)
-			if ((mylb_lbSrchResults != null || mylb_lbSrchResultsIncTrans != null) && !_SearchResults.RefreshingList)
+			//if (mylb != null && _SearchResults.RefreshingList && mylb.SelectedIndex != -1)
+			//	//mylb.SelectedIndex = -1;
+			//else
+			if (mylb != null && !_SearchResults.RefreshingList)
 			{
 				_ItemInfo = (tabSearchTypes.SelectedTab == tabSearchTypes.Tabs[4]) ? lbSrchResultsIncTrans.SelectedValue as ItemInfo : lbSrchResults.SelectedValue as ItemInfo;
 				if ((tabSearchTypes.SelectedTab == tabSearchTypes.Tabs[1]) && (_ItemInfo != null))
@@ -2197,39 +2187,21 @@ namespace Volian.Controls.Library
 											   // C2019-001: Search in RNO steps only
 					if (cbxRnoOnlyTrans.Checked) GetInRNOResults();
 				}
-				else if (tabSearchTypes.SelectedTab == tabIncTrans)
+				else if (tabSearchTypes.SelectedTab == tabSearchTypes.Tabs[4])
 				{
-					// C2025-062 When Search clicked - Load the Incoming transitions for the Active Procedure
-
-					if (_TabControl?.MyEditItem?.MyItemInfo?.MyProcedure != null)
+					// C2020-033: Incoming Transitions: Make an iteminfolist from the list returned from
+					//	GetExternalTransitionsToChildren (also gets transitions to the item itself)
+					// B2021-010: Use IncomingTranGetMergedTranList to get a complete list of incoming transitions (transitions to procedure
+					//	were only included if there were NO transitions to items within procedure)
+					ReportTitle = string.Format("Search For Incoming Transitions to {0}: ", SearchIncTransII.Path);
+					SearchResults = IncomingTranGetMergedTranList();
+					cmbResultsStyleIndex = 1;  //display step locations in results
+					if (SearchResults == null || SearchResults.Count == 0)
 					{
-
-                        if (_TabControl?.MyEditItem?.MyItemInfo?.MyProcedure.ItemID == _TabControl?.MyEditItem?.MyItemInfo?.ItemID)
-                        {
-                            _ = _TabControl.OnSearchIncTrans(this, new vlnTreeItemInfoEventArgs(_TabControl?.MyEditItem?.MyItemInfo?.MyProcedure));
-                        }
-                        else
-                        {
-							//if on a step, check if the user wants to load incoming transitions for that step or the entire procedure
-							switch (CustomMessageBox.Show("Would you like to load incoming transitions for this procedure or this step?", "Load Incoming Transitions", "This Procedure", "This Step"))
-							{
-                                case DialogResult.Yes:
-                                    _ = _TabControl.OnSearchIncTrans(this, new vlnTreeItemInfoEventArgs(_TabControl?.MyEditItem?.MyItemInfo?.MyProcedure));
-                                    break;
-                                case DialogResult.No:
-                                    _ = _TabControl.OnSearchIncTrans(this, new vlnTreeItemInfoEventArgs(_TabControl?.MyEditItem?.MyItemInfo));
-                                    break;
-                                default:   //Cancel was pressed
-                                    break;
-                            }
-                        }
-					}
-					else
-					{
-						FlexibleMessageBox.Show("Please open a procedure before selecting this option to load incoming transitions for that procedure.", "Search");
+						FlexibleMessageBox.Show("No Matches Found.", "Search");
 					}
 				}
-				if (SearchResults != null && tabSearchTypes.SelectedTab != tabIncTrans)
+				if (SearchResults != null)
 				{
 					AddMessageForEmptyAnnotations();
 					if (cmbResultsStyleIndex == 3 && cmbResultsStyle.Items.Count == 3) cmbResultsStyleIndex--;
@@ -2330,18 +2302,7 @@ namespace Volian.Controls.Library
 			cmbResultsStyle.Items.Add(comboItem2);
 			if (hasAnnot) cmbResultsStyle.Items.Add(comboItem3);
 			cmbResultsStyle.Items.Add(comboItem4);
-
-			// C2025-062 When Search clicked - Load the Incoming transitions for the Active Procedure
-			if (tabSearchTypes.SelectedTab == tabIncTrans)
-            {
-				cmbResultsStyle.SelectedIndex = -1;
-				cmbResultsStyle.Enabled = false;
-			}				
-			else
-            {
-                cmbResultsStyle.Enabled = true;
-            }
-        }
+		}
 
 		private void cbxTextSearchText_Leave(object sender, EventArgs e)
 		{

PROMS/Volian.Controls.Library/DisplayTabControl.cs

@@ -603,8 +603,6 @@ namespace Volian.Controls.Library
 		{
 			ItemInfo myItemInfo = myItemInfo2;
 
-			bool viewonlymode = false;
-
 			//B2025-046 Remember Tabs failing when swapping versions of PROMS
 			if (myItemInfo?.MyDocVersion == null) // bug fix: B2016-108 disconnected data will not have a MyDocVersion
 			{
@@ -622,20 +620,8 @@ namespace Volian.Controls.Library
 			{
 				if (!MySessionInfo.CanCheckOutItem(myItemInfo.MyProcedure.ItemID, CheckOutType.Procedure, ref message))
 				{
-					DisplayTabItem dti = MyBar?.Items?.OfType<DisplayTabItem>().FirstOrDefault(x => x.MyItemInfo?.ItemID == myItemInfo.MyProcedure.ItemID);
-
-					//C2019-036 View Only mode work with Checked Out Procedures
-					//shouldn't prompt - should just auto put in view only if already in open tab
-					//in view only
-					if (
-						(dti != null && dti.MyStepTabPanel.MyStepPanel.VwMode == E_ViewMode.View)
-						||
-						(SeparateWindows && VersionID == myItemInfo.MyDocVersion.VersionID)
-						||                                                                                              //to handle special case where item will be opened in a separate window
-						MessageBox.Show(this, message, "Procedure Already Checked Out", MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.Yes)
-						viewonlymode = true;
-					else
-						return null;
+					FlexibleMessageBox.Show(this, message, "Procedure Already Checked Out", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+					return null;
 				}
 			}
 			else
@@ -696,7 +682,7 @@ namespace Volian.Controls.Library
 			// C2023-016 if a Word section and doing Find/Replace don't open Word section, position to section title in step editor instead
 			if (myItemInfo.MyContent.MyEntry == null || doingFindReplace) // If it is not a Word document open in step editor
 			{
-				return OpenStepTabPage(myItemInfo, setFocus, viewonlymode);
+				return OpenStepTabPage(myItemInfo, setFocus);
 			}
 			else // Otherwise open it in the Word editor
 			{
@@ -1192,7 +1178,7 @@ namespace Volian.Controls.Library
 		//}
 		//public Dictionary<DocVersionInfo, frmEnhanced> dicEnhancedDocuments = new Dictionary<DocVersionInfo, frmEnhanced>();
 
-		private DisplayTabItem OpenStepTabPage(ItemInfo myItemInfo, bool setFocus, bool viewonlymode = false)
+		private DisplayTabItem OpenStepTabPage(ItemInfo myItemInfo, bool setFocus)
 		{
 			ItemInfo proc = myItemInfo.MyProcedure; // Find procedure Item
 			string key = "Item - " + proc.ItemID.ToString();
@@ -1211,7 +1197,7 @@ namespace Volian.Controls.Library
 			}
 			else // If not already open, create a new Page
 			{
-				pg = new DisplayTabItem(this.components, this, proc, key, viewonlymode); // Open a new Procedure Tab
+				pg = new DisplayTabItem(this.components, this, proc, key); // Open a new Procedure Tab
 				_MyDisplayTabItems.Add(key, pg);
 				if (setFocus)
 				{

PROMS/Volian.Controls.Library/DisplayTabItem.cs

@@ -98,18 +98,13 @@ namespace Volian.Controls.Library
 		}
 		#endregion
 		#region Constructors
-		public DisplayTabItem(IContainer container, DisplayTabControl myDisplayTabControl, ItemInfo myItemInfo, string myKey, bool viewonlymode = false)
+		public DisplayTabItem(IContainer container, DisplayTabControl myDisplayTabControl, ItemInfo myItemInfo, string myKey)
 		{
 			_MyItemInfo = myItemInfo;
-			//C2019-036 View Only mode work with Checked Out Procedures
-			//don't want to check out if opening in View Only Mode Due to someone else having it checked out
-			if (!viewonlymode)
-            {
-				if (MyItemInfo.MyContent.MyEntry == null)
-					OwnerID = myDisplayTabControl.MySessionInfo.CheckOutItem(myItemInfo.MyProcedure.ItemID, CheckOutType.Procedure);
-				else
-					OwnerID = myDisplayTabControl.MySessionInfo.CheckOutItem(myItemInfo.MyContent.MyEntry.DocID, CheckOutType.Document);
-			}
+			if (MyItemInfo.MyContent.MyEntry == null)
+				OwnerID = myDisplayTabControl.MySessionInfo.CheckOutItem(myItemInfo.MyProcedure.ItemID, CheckOutType.Procedure);
+			else
+				OwnerID = myDisplayTabControl.MySessionInfo.CheckOutItem(myItemInfo.MyContent.MyEntry.DocID, CheckOutType.Document);
 			//Console.WriteLine("DisplayTabItem");
 			_MyKey = myKey;
 			_MyDisplayTabControl = myDisplayTabControl;
@@ -117,7 +112,7 @@ namespace Volian.Controls.Library
 			InitializeComponent();
 			this.Click += new EventHandler(DisplayTabItem_Click);
 			if (myItemInfo.MyContent.MyEntry == null)
-				SetupStepTabPanel(viewonlymode);
+				SetupStepTabPanel();
 			else
 				SetupDSOTabPanel();
 			SetupSecurity(myItemInfo);
@@ -133,37 +128,7 @@ namespace Volian.Controls.Library
 		private bool MesssageShown = false;
 		public void SetupSecurity(ItemInfo myItem)
 		{
-			//C2019-036 View Only mode work with Checked Out Procedures
-			//is in View Only Mode, so do not set up the Security
-			if (OwnerID == 0)
-            {
-
-                UserInfo uiViewOnly = UserInfo.GetByUserID(Base.Library.VlnSettings.UserID);
-                if (uiViewOnly.IsAdministrator())
-				{
-					MyUserRole = $"{Base.Library.VlnSettings.UserID} - Administrator";
-				}
-                else if (uiViewOnly.IsSetAdministrator(myItem.MyDocVersion))
-				{
-					MyUserRole = $"{Base.Library.VlnSettings.UserID} - Set Administrator";
-				}
-                else if (uiViewOnly.IsWriter(myItem.MyDocVersion))
-                {
-                    MyUserRole = $"{Base.Library.VlnSettings.UserID} - Writer";
-				}
-				else if (uiViewOnly.IsROEditor(myItem.MyDocVersion))
-				{
-					MyUserRole = $"{Base.Library.VlnSettings.UserID} - RO Editor";
-				}
-				else
-				{
-                    MyUserRole = $"{Base.Library.VlnSettings.UserID} - Reviewer";
-				}
-
-				return;
-            }
-
-            UserInfo ui = UserInfo.GetByUserID(OwnerInfo.Get(OwnerID).SessionUserID);
+			UserInfo ui = UserInfo.GetByUserID(OwnerInfo.Get(OwnerID).SessionUserID);
 
 			if (ui == null)
 			{
@@ -281,7 +246,7 @@ namespace Volian.Controls.Library
 		/// <summary>
 		/// Creates and sets-up a StepTabPanel
 		/// </summary>
-		private void SetupStepTabPanel(bool viewonlymode = false)
+		private void SetupStepTabPanel()
 		{
 			((System.ComponentModel.ISupportInitialize)(_MyDisplayTabControl.MyBar)).BeginInit();
 			_MyDisplayTabControl.MyBar.SuspendLayout();
@@ -311,7 +276,7 @@ namespace Volian.Controls.Library
 			_MyDisplayTabControl.MyBar.ResumeLayout(false);
 			DocVersionInfo dvi = _MyItemInfo.MyProcedure.ActiveParent as DocVersionInfo; //MyRTBItem.MyItemInfo.MyProcedure.ActiveParent as DocVersionInfo;
 			if (dvi == null) return;
-			if (dvi.VersionType > 127 || viewonlymode)
+			if (dvi.VersionType > 127)
 				MyStepTabPanel.MyStepPanel.VwMode = E_ViewMode.View;
 			// C2021 - 027: Procedure level PC/PC - add _MyIteminfo to argument list
 			if (dvi.MultiUnitCount > 1)

PROMS/Volian.Controls.Library/DisplayTags.cs

@@ -647,10 +647,6 @@ namespace Volian.Controls.Library
 			MyEditItem.ChangeBarForConfigItemChange = false;
 			sc.Step_CAS = (cbCAS.Checked) ? "True" : "False";
 			MyEditItem.ChangeBarForConfigItemChange = true;
-			// C2026-003 (put in for Vogtle 3&4) refresh the RNO step tab if including it on the Continuous Action Summary
-			if (MyEditItem.MyItemInfo.ActiveFormat.MyStepSectionLayoutData.AddContActTagToHighLevelRNOWhenIncludedOnCAS &&
-				MyEditItem.MyItemInfo.IsInRNO && !MyEditItem.MyItemInfo.MyParent.IsInRNO)
-				MyEditItem.RefreshTab();
 		}
 		private void cbTCAS_CheckedChanged(object sender, EventArgs e)
 		{

PROMS/Volian.Controls.Library/EditItem.cs

@@ -4162,11 +4162,8 @@ namespace Volian.Controls.Library
 		}
 		void MyConfig_PropertyChanged(object sender, PropertyChangedEventArgs e)
 		{
-            //B2026-024 Change bars should not show when updating Applicability.
-            if (e.PropertyName == "MasterSlave_Applicability") ChangeBarForConfigItemChange = false;
-            SaveConfig();
-            if (e.PropertyName == "MasterSlave_Applicability") ChangeBarForConfigItemChange = true;
-        }
+			SaveConfig();
+		}
 		public void SaveConfig()
 		{
 			if (!MyItemInfo.MyConfig.IsDirty) return;

PROMS/Volian.Controls.Library/GridItem.cs

@@ -537,10 +537,6 @@ namespace Volian.Controls.Library
 			// if it is a modify and there will be no usages if it is new (the usage gets created on the save)
 			if (!MyFlexGrid.IsRoTable)
 			{
-				// B2026-003 we where using a string.format on this inside the while loop - allocating memory each time
-				//           so I move it outside the while loop and did a simple assigment of text
-				string lookForLinks = @"<START\](\\[^v \\]+)*\\v0(\\[^v '?{{}}~\\]+)*( |\\u[0-9]{{1,4}}?|\\'[0-9a-fA-F]{{2}}|\\[{{}}~])(.*?)(\\[^v '?{{}}~\\]+)*\\v(\\[^v \\]+)* #Link:(ReferencedObject|Transition[^:]*?):.*?\[END>";
-
 				while (r < h)
 				{
 					CellRange cr = MyFlexGrid.GetMergedRange(r, c);
@@ -550,7 +546,8 @@ namespace Volian.Controls.Library
 						{
 							// see if there are any links and save these so that any deleted ROs or transitions in the
 							// steprtb can have associated usages/transitions records removed from the database.
-							MatchCollection matches = Regex.Matches((string)MyFlexGrid[r, c], lookForLinks);
+							string lookFor = string.Format(@"<START\](\\[^v \\]+)*\\v0(\\[^v '?{{}}~\\]+)*( |\\u[0-9]{{1,4}}?|\\'[0-9a-fA-F]{{2}}|\\[{{}}~])(.*?)(\\[^v '?{{}}~\\]+)*\\v(\\[^v \\]+)* #Link:(ReferencedObject|Transition[^:]*?):.*?\[END>");
+							MatchCollection matches = Regex.Matches((string)MyFlexGrid[r, c], lookFor);
 							for (int i = matches.Count - 1; i >= 0; i--)
 							{
 								Match m = matches[i];
@@ -572,15 +569,15 @@ namespace Volian.Controls.Library
 									{
 										int tid = int.Parse(myMatch.Groups[2].Value);
 										RtfTransList.Add(tid);
-										int myIndex = m.Groups[4].Index;
-										int myLength = m.Groups[4].Length;
-										if (m.Groups[3].Value != " ")
-										{
-											myIndex = m.Groups[3].Index;
-											myLength += m.Groups[3].Length;
-										}
-										string gg = ((string)MyFlexGrid[r, c]).Substring(myIndex, myLength);
-										if (gg.ToUpper().Contains("(PAGE ~)")) RtfTransPageNumList.Add(tid);  // B2020-089, check for upper case Page ~ in case step was upper cased
+                    int myIndex = m.Groups[4].Index;
+                    int myLength = m.Groups[4].Length;
+                    if (m.Groups[3].Value != " ")
+                    {
+                      myIndex = m.Groups[3].Index;
+                      myLength += m.Groups[3].Length;
+                    }
+                    string gg = ((string)MyFlexGrid[r, c]).Substring(myIndex, myLength);
+					if (gg.ToUpper().Contains("(PAGE ~)")) RtfTransPageNumList.Add(tid);  // B2020-089, check for upper case Page ~ in case step was upper cased
 									}
 								}
 							}

PROMS/Volian.Controls.Library/StepPanel.cs

@@ -9,7 +9,6 @@ using System.Drawing;
 using System.Text.RegularExpressions;
 using Volian.Base.Library;
 using JR.Utils.GUI.Forms;
-using System.Linq;
 
 namespace Volian.Controls.Library
 {
@@ -387,26 +386,6 @@ namespace Volian.Controls.Library
 			// The following line expands the items needed to display SelectedItemInfo
 			ExpandAsNeeded(myItemInfo);
 		}
-
-		//C2019-036 View Only mode work with Checked Out Procedures
-		public void ResetAll()
-		{
-			List<int> itemIDs = Controls.OfType<RTBItem>().Where(t => t?.MyItemInfo?.ActiveParent != null && t.MyItemInfo.ActiveParent.GetType() == typeof(ItemInfo)).Select(x => (x.MyItemInfo.ActiveParent as ItemInfo).ItemID).Distinct().ToList();
-
-			foreach (int itemID in itemIDs)
-			{
-				ItemInfo.ResetParts(itemID);
-			}
-
-			// The following line actually reloads the procedure item
-			MyProcedureItemInfo = ItemInfo.Get(MyProcedureItemInfo.ItemID, true);
-			MyProcedureItemInfo.RefreshConfig();
-            ContentInfo.Refresh(Content.Get(MyProcedureItemInfo.MyContent.ContentID, true));
-
-			// The following line expands the items needed to display SelectedItemInfo
-			ExpandAsNeeded(SelectedItemInfo);
-		}
-
 		/// <summary>
 		/// Currently selected StepRTB
 		/// </summary>

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;
-
-			var pattern = @"\\u([0-9]{1,4})\?"; // RO Editor add symbols C2022 - 003
-			foreach (Match match in Regex.Matches(linkValue, pattern, RegexOptions.IgnoreCase))
-			{
-				linkValue = linkValue.Replace(match.Value, "\\f1 " + match.Value + "\\f0");
-			}
-
+			linkValue = linkValue.Replace("\\u8209?", "\\f1\\u8209?\\f0 ");
+			linkValue = linkValue.Replace("\\u9586?", "\\f1\\u9586?\\f0 "); // backslash symbol
+			linkValue = linkValue.Replace("\\u916?", "\\f1\\u916?\\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/StepTabRibbon.cs

@@ -16,8 +16,6 @@ using DevComponents.DotNetBar;
 using Microsoft.Win32;
 using System.Diagnostics;
 using JR.Utils.GUI.Forms;
-using System.Collections.Concurrent;
-using System.Threading.Tasks;
 
 namespace Volian.Controls.Library
 {
@@ -908,11 +906,6 @@ namespace Volian.Controls.Library
 		//    //SetButtonAndMenuEnabling(false);
 		//}
 		private Bitmap createTextBitmap(char ch)
-		{
-			return createTextBitmap(ch, new Font("FreeMono", 18, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel));
-		}
-
-		private Bitmap createTextBitmap(char ch, Font objFont)
 		{
 			string txt = string.Format("{0}", ch);
 			Bitmap objBmpImage = new Bitmap(1, 1);
@@ -923,6 +916,8 @@ namespace Volian.Controls.Library
 			// Create the Font object for the image text drawing.
 			// later on, we could add logic to use either FreeMono or Arial Unicode MS based on the format being used
 			// but for now, we are going to use FreeMono to create the symbol list
+			Font objFont = new Font("FreeMono", 18, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel);
+			//Font objFont = new Font("Arial Unicode MS", 18, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel);
 
 			// Create a graphics object to measure the text's width and height.
 			Graphics objGraphics = Graphics.FromImage(objBmpImage);
@@ -942,6 +937,7 @@ namespace Volian.Controls.Library
 			objGraphics.SmoothingMode = SmoothingMode.AntiAlias;
 			objGraphics.TextContrast = 0;
 			objGraphics.TextRenderingHint = TextRenderingHint.AntiAlias;
+			//objGraphics.DrawString(txt, objFont, new SolidBrush(Color.FromArgb(102, 102, 102)), 0, 0);
 			objGraphics.DrawString(txt, objFont, new SolidBrush(Color.Black),0,0);
 			objGraphics.Flush();
 			return (objBmpImage);
@@ -1667,9 +1663,8 @@ namespace Volian.Controls.Library
 							}
 						}
 						Clipboard.Clear();
-
 						Clipboard.SetDataObject(myDO); // this saves the cleaned up information to the Windows clipboard
-                    }
+					}
 					iData = Clipboard.GetDataObject();
 					bool noEquationData = true;
 					// part of bug B2017-117 we were running out of window handles when printing, found this similar use of
@@ -2072,9 +2067,6 @@ namespace Volian.Controls.Library
 					rtabHome.Select();
 				rtabTableGridTools.Visible = false;
 				SetButtonMenuEnabledDisabledOnStepType(false);
-				//C2019-036 View Only mode work with Checked Out Procedures
-				//Is in View Only Mode so show button as selected
-				btnEditMode.Checked = btnCMEditMode1.Checked = true;
 				this.Refresh();
 				return;
 			}
@@ -3346,43 +3338,10 @@ namespace Volian.Controls.Library
 		public void SetupAdminMode()
 		{
 		}
-
-		//C2019-036 View Only mode work with Checked Out Procedures
-		public event StepTabRibbonEvent EnableDisableStepProperties;
-		private void OnEnableDisableStepProperties(StepTabRibbonEventArgs args)
-		{
-			if (EnableDisableStepProperties != null)
-				EnableDisableStepProperties(this, args);
-		}
 		private void btnToggleEditView_Click(object sender, EventArgs e)
 		{
 			if (MyEditItem == null) return;
-
-			//C2019-036 View Only mode work with Checked Out Procedures
-			string message = string.Empty;
-			if (MyEditItem.MyStepPanel.VwMode == E_ViewMode.View && !MySessionInfo.CanCheckOutItem(MyEditItem.MyItemInfo.MyProcedure.ItemID, CheckOutType.Procedure, ref message))
-			{
-				//someone else has the procedure checked out so cannot swap out of view only mode
-				message = message.Replace("\r\nWould You like to open the procedure in View Only Mode?", "\r\n\r\nYou will be unable to turn off View Only Mode for this procedure until it is checked in by the user specified above.");
-				MessageBox.Show(this, message, "Procedure Already Checked Out", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-				return;
-			}
-			else if (MyEditItem.MyStepPanel.VwMode == E_ViewMode.View)
-            {
-				//swapping into edit mode, so check out procedure and Setup Security
-				(this.Parent as StepTabPanel).MyDisplayTabItem.OwnerID = MySessionInfo.CheckOutItem(MyEditItem.MyItemInfo.MyProcedure.ItemID, 0);
-				(this.Parent as StepTabPanel).MyDisplayTabItem.SetupSecurity(MyItemInfo);
-			}
-            else 
-			{
-				//swapping into View Only mode, so check in procedure
-				OwnerInfo oi = OwnerInfo.GetByItemID(MyEditItem.MyItemInfo.MyProcedure.ItemID, CheckOutType.Procedure);
-				MySessionInfo.CheckInItem(oi.OwnerID);
-			}
-
 			MyEditItem.MyStepPanel.VwMode = MyEditItem.MyStepPanel.VwMode == E_ViewMode.Edit ? E_ViewMode.View : E_ViewMode.Edit;
-            //enable / disable the Step Properties Panel based on the ViewMode
-            OnEnableDisableStepProperties(new StepTabRibbonEventArgs(MyEditItem.MyItemInfo, 0, MyEditItem.MyStepPanel.VwMode));
 			MyEditItem.ToggleEditView(MyEditItem.MyStepPanel.VwMode);
 			SetButtonAndMenuEnabling(true);
 			SetStepButtonAndMenuEnabling(true);
@@ -3396,62 +3355,7 @@ namespace Volian.Controls.Library
 		//	btnEnhancedDocSync.Checked = !btnEnhancedDocSync.Checked;
 		//}
 
-		//C2019-036 View Only mode work with Checked Out Procedures
-		// using a blocking collection to make it thread safe in case someone 
-		// spams hitting the refresh button
-		private BlockingCollection<bool> blockingRefreshProcedure = new BlockingCollection<bool>();
 
-        //C2019-036 View Only mode work with Checked Out Procedures
-        private void btnRefreshProcedure_Click(object sender, EventArgs e)
-        {
-			//Consumer
-			Task.Run(() =>
-			{
-				//Blocks until a newRefresh Procedure Run is available
-				while (!blockingRefreshProcedure.IsCompleted)
-				{
-					_ = blockingRefreshProcedure.Take();
-					RefreshProcedure();
-				}
-			});
-
-			//Producer
-			Task.Run(() => { blockingRefreshProcedure.Add(true); });
-		}
-
-		public void RefreshProcedure()
-		{
-			StepTabPanel stab_Panel = Parent as StepTabPanel;
-
-			if (MyEditItem != null)
-			{
-                if (!MyEditItem.MyStepPanel.ContainsFocus)
-					this.Invoke((Action)(() => { MyEditItem.MyStepPanel.Focus(); })); 
-
-                E_ViewMode mode = MyEditItem.MyStepPanel.VwMode;
-				Application.DoEvents();
-				this.Invoke((Action)(() => {MyEditItem.MyStepPanel.ResetAll();}));
-				Application.DoEvents();
-				this.Invoke((Action)(() => {MyEditItem.MyStepPanel.Refresh();}));
-				Application.DoEvents();
-				MyEditItem.MyStepPanel.VwMode = mode;
-				Application.DoEvents();
-			}
-			else if (stab_Panel != null)
-			{
-				if (!stab_Panel.MyStepPanel.ContainsFocus)
-					this.Invoke((Action)(() => {stab_Panel.MyStepPanel.Focus();}));
-
-				E_ViewMode mode = stab_Panel.MyStepPanel.VwMode;
-				Application.DoEvents();
-				this.Invoke((Action)(() => {stab_Panel.MyStepPanel.ResetAll();}));
-				Application.DoEvents();
-				this.Invoke((Action)(() => {stab_Panel.MyStepPanel.Refresh();})); 
-				Application.DoEvents();
-				stab_Panel.MyStepPanel.VwMode = mode;
-				Application.DoEvents();
-			}
-		}
 		private void btnROEdit_Click(object sender, EventArgs e)
 		{
 			if (VlnSettings.ReleaseMode.Equals("DEMO"))
@@ -4286,19 +4190,15 @@ namespace Volian.Controls.Library
 			if (oring == eEventSource.Keyboard)
 				_OringFlg = 1;
 
-			int selectedSlave = MyItemInfo.MyProcedure.ProcedureConfig.SelectedSlave;
 			if (MyItemInfo == null) return;   // if creating a pdf before rtb exists, return;
 			if (MyEditItem != null) MyEditItem.SaveCurrentAndContents();
-			MyItemInfo.MyProcedure.ProcedureConfig.SelectedSlave = selectedSlave;
 			OnPrintRequest(new StepTabRibbonEventArgs(MyItemInfo.MyProcedure, _OringFlg), 0);
 		}
 
 		private void btnPdfQuickCreate_Click(object sender, EventArgs e)
 		{
-			int selectedSlave = MyItemInfo.MyProcedure.ProcedureConfig.SelectedSlave;
 			if (MyItemInfo == null) return;   // if creating a pdf before rtb exists, return;
 			if (MyEditItem != null) MyEditItem.SaveCurrentAndContents();
-			MyItemInfo.MyProcedure.ProcedureConfig.SelectedSlave = selectedSlave;
 			OnPrintRequest(new StepTabRibbonEventArgs(MyItemInfo.MyProcedure, _OringFlg), 1);
 		}
 
@@ -4961,11 +4861,10 @@ namespace Volian.Controls.Library
 	public class StepTabRibbonEventArgs : EventArgs
 	{
 		public StepTabRibbonEventArgs() { ; }
-		public StepTabRibbonEventArgs(ItemInfo proc, int oringFlg = 0, E_ViewMode viewMode = E_ViewMode.Edit)
+		public StepTabRibbonEventArgs(ItemInfo proc, int oringFlg = 0)
 		{
 			_Proc = proc;
 			OringFlg = oringFlg;
-			ViewMode = viewMode;
 		}
 		private ItemInfo _Proc;
 
@@ -4981,9 +4880,6 @@ namespace Volian.Controls.Library
 			get { return _OringFlg; }
 			set { _OringFlg = value; }
 		}
-
-		//C2019-036 View Only mode work with Checked Out Procedures
-		public E_ViewMode ViewMode { get; set; }
 	}
 	public delegate void StepTabRibbonEvent(object sender, StepTabRibbonEventArgs args);
 

PROMS/Volian.Controls.Library/ToolStripMenuItemwithValue.cs

@@ -1,16 +0,0 @@
-using System.Windows.Forms;
-
-namespace Volian.Controls.Library
-{
-	//ToolStripMenuItem with Added Value Property
-	public class ToolStripMenuItemwithValue : ToolStripMenuItem
-	{
-		public readonly object Value;
-
-		public ToolStripMenuItemwithValue(string text, object value)
-		{
-			Value = value;
-			Text = text;
-		}
-	}
-}

PROMS/Volian.Controls.Library/TreeViewExtensions.cs

@@ -1,115 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Drawing;
-using System.Windows.Forms;
-using System.Data;
-
-namespace Volian.Controls.Library
-{
-	//CSM - C2025-043 report RO's that are not used in any of the PROMS data.
-	// extend the TreeView class with a couple added functions 
-	// to allow support for what is needed for ROs
-	public static class TreeViewExtensions
-	{
-        #region public functions
-        //Returns a ROTreeView based on the data in the datatable dt
-        // builds tree based on the following:
-        //   ParentID = 0 is top level
-        //   links (defined parent) based on same dbID and ID = ParentID
-        //   nodes will have the text of the title
-        public static TreeView GetROTree(DataTable dt, bool isExpanded = false)
-		{
-			TreeView tv = new TreeView();
-
-			var tempnodes = GetTreeNodes(
-					dt.AsEnumerable(),
-					(r) => r.Field<int?>("ParentID") == 0,                                                   //top level of tree
-					(r, s) => s.Where(x => r["ID"].Equals(x["ParentID"]) && r["dbID"].Equals(x["dbID"])),    //how to match parents and children
-					(r) => new TreeNode { Text = r.Field<string>("title") }                                  //what to display in the tree
-			);
-			tv.Nodes.AddRange(tempnodes.ToArray());
-
-			//if set to expand, sets the height to the combined height of all nodes + 20
-			//so will show whole tree
-			if (isExpanded)
-			{
-				tv.ExpandAll();
-				tv.SetTreeViewHeighttoFull();
-				tv.Width = 1200;
-			}
-
-			//sorts the tree in alphabetical order to match the way the tree is sorted in the RO Editor
-			tv.Sorted = true;
-
-			return tv;
-		}
-
-		//Saves the Tree to an Image at the specified path
-		public static void SaveTreeViewAsImage(this TreeView tv, string filePath)
-		{
-			// Create a Bitmap with the size of the TreeView
-			Bitmap bitmap = new Bitmap(tv.Width, tv.Height);
-			// Draw the TreeView onto the Bitmap
-			tv.DrawToBitmap(bitmap, new Rectangle(0, 0, bitmap.Width, bitmap.Height));
-			// Save the Bitmap as an image file
-			bitmap.Save(filePath, System.Drawing.Imaging.ImageFormat.Png);
-		}
-		#endregion
-
-		#region height functions
-		//This is a function to calculate and set the TreeView Height based
-		//on the height of all sub nodes + 20
-		public static void SetTreeViewHeighttoFull(this TreeView tv)
-		{
-			int totalHeight = 0;
-			foreach (TreeNode node in tv.Nodes)
-			{
-				totalHeight += GetNodeHeight(node);
-			}
-			tv.Height = totalHeight + 20;
-		}
-
-		//This function recursively adds the height of sub nodes to the running total
-		private static int GetNodeHeight(TreeNode node)
-		{
-			int curheight = node.Bounds.Height;
-			foreach (TreeNode child in node.Nodes)
-			{
-				curheight += GetNodeHeight(child);
-			}
-			return curheight;
-		}
-		#endregion
-
-		#region generic private tree structure functions
-		//This is a Generic Function to help build the Tree Structure
-		private static IEnumerable<TreeNode> GetTreeNodes<T>(
-			IEnumerable<T> source,
-			Func<T, Boolean> isRoot,
-			Func<T, IEnumerable<T>, IEnumerable<T>> getChilds,
-			Func<T, TreeNode> getItem)
-		{
-			IEnumerable<T> roots = source.Where(x => isRoot(x));
-			foreach (T root in roots)
-				yield return ConvertEntityToTreeNode(root, source, getChilds, getItem); ;
-		}
-
-		//This is a Generic Function to help build the Tree Structure
-		private static TreeNode ConvertEntityToTreeNode<T>(
-			T entity,
-			IEnumerable<T> source,
-			Func<T, IEnumerable<T>, IEnumerable<T>> getChilds,
-			Func<T, TreeNode> getItem)
-		{
-			TreeNode node = getItem(entity);
-			var childs = getChilds(entity, source);
-			foreach (T child in childs)
-				node.Nodes.Add(ConvertEntityToTreeNode(child, source, getChilds, getItem));
-			return node;
-		}
-		#endregion
-
-	}
-
-}

PROMS/Volian.Controls.Library/VlnFlexGrid.cs

@@ -272,24 +272,21 @@ namespace Volian.Controls.Library
 			for (int i = 0; i < rows * cols; i++)
 				datum.Add("|");
 			XmlNodeList nl = xd.SelectNodes("C1FlexGrid/Cells/Cell/Data");
-			// B2026-003 use StringBuilder a "using" statement around the RichTextBox for better mememory management
-			StringBuilder data = new StringBuilder();
+			string data = string.Empty;
 			foreach (XmlNode xn in nl)
 			{
-				using (RichTextBox rtb = new RichTextBox())
-				{
-					rtb.Rtf = xn.InnerText;
-					XmlAttribute xa = xn.ParentNode.Attributes.GetNamedItem("index") as XmlAttribute;
-					string[] rc = xa.InnerText.Split(',');
-					int r = int.Parse(rc[0]);
-					int c = int.Parse(rc[1]);
-					int index = r * cols + c;
-					datum[index] = "|" + (rtb.Text == "" ? "" : rtb.Text);
-				}
+				RichTextBox rtb = new RichTextBox();
+				rtb.Rtf = xn.InnerText;
+				XmlAttribute xa = xn.ParentNode.Attributes.GetNamedItem("index") as XmlAttribute;
+				string[] rc = xa.InnerText.Split(',');
+				int r = int.Parse(rc[0]);
+				int c = int.Parse(rc[1]);
+				int index = r * cols + c;
+				datum[index] = "|" + (rtb.Text == "" ? "" : rtb.Text);
 			}
 			foreach (string s in datum)
-				data.Append(s);
-			return data.ToString();
+				data += s;
+			return data;
 		}
 		private string GetCellFormatString(XmlDocument xd)
 		{
@@ -2473,17 +2470,6 @@ namespace Volian.Controls.Library
 		private string ConvertTableText(string str)
 		{
 			string rtn = str;
-			string pattern = @"\\u([0-9]{1,4})\?";
-
-				string mValue, mValue2 = "";
-				foreach (Match match in Regex.Matches(rtn, pattern, RegexOptions.IgnoreCase))
-				{
-					mValue = match.Value;
-					mValue2 = $"\\f1 {mValue}\\f0";
-				rtn = rtn.Replace(match.Value, mValue2);
-				}
-
-
 			//ShowRawString(str, "ConvertTableText IN");
 			rtn = rtn.Replace(@"START]\v0", @"START]\cf1\v0");
 			rtn = rtn.Replace(@"\v #Link:", @"\cf0\v #Link:");

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

@@ -118,7 +118,6 @@
       <HintPath>..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.5\System.Core.dll</HintPath>
     </Reference>
     <Reference Include="System.Data" />
-    <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Design" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
@@ -154,12 +153,6 @@
     <Compile Include="ConvertTable.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="CustomMessageBox.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="CustomMessageBox.Designer.cs">
-      <DependentUpon>CustomMessageBox.cs</DependentUpon>
-    </Compile>
     <Compile Include="DisplayApplicability.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -302,7 +295,6 @@
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
       <DependentUpon>Settings.settings</DependentUpon>
     </Compile>
-    <Compile Include="TreeViewExtensions.cs" />
     <Compile Include="RTBItem.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -392,9 +384,6 @@
     <Compile Include="TablePropertiesControl.Designer.cs">
       <DependentUpon>TablePropertiesControl.cs</DependentUpon>
     </Compile>
-    <Compile Include="ToolStripMenuItemwithValue.cs">
-      <SubType>Component</SubType>
-    </Compile>
     <Compile Include="TransPanel.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -460,17 +449,12 @@
       <DependentUpon>AnnotationSearch.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="CustomMessageBox.resx">
-      <DependentUpon>CustomMessageBox.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="DisplayBookMarks.resx">
       <DependentUpon>DisplayBookMarks.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="DisplayHistory.resx">
       <DependentUpon>DisplayHistory.cs</DependentUpon>
-      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="DisplayLibDocs.resx">
       <DependentUpon>DisplayLibDocs.cs</DependentUpon>

PROMS/Volian.Controls.Library/vlnTreeView.cs

@@ -1269,11 +1269,6 @@ namespace Volian.Controls.Library
 					if (ok)
 						if (pia == null && tn.VEObject as StepInfo == null) cm.MenuItems.Add("Properties...", new EventHandler(mi_Click));
 					#endregion
-					#region Refresh_Tree
-					//C2021-035 Add Refresh Tree Option at highest level
-					if (tn == (VETreeNode)Nodes[0])
-						cm.MenuItems.Add("Refresh Tree", new EventHandler(mi_Click));
-					#endregion
 					//_MyLog.WarnFormat("Context Menu 7 - {0}", GC.GetTotalMemory(true));
 
 					if (fi != null && fi.HasWorkingDraft)
@@ -1601,11 +1596,12 @@ 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 include the export filename
+			string str = (applIdx > 0) ? _currentPri.MyDocVersion.UnitNames[applIdx - 1] + "_" : ""; // if parent/child get the defined child name to inlcude 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;
@@ -1614,13 +1610,8 @@ 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);
-				fNametmp = Regex.Replace(fNametmp, @"\<U-NAME\>", str, RegexOptions.IgnoreCase);
-			}
-
-            string fileName = PEIPath + "\\" + str + "Approved_Rev_" + ri.RevisionNumber.Replace(" ", "_").Replace("\\", "-").Replace("/", "-") + "_" + fNametmp;
+			if (applIdx > 0) fNametmp = Regex.Replace(fNametmp, @"\<U-ID\>", 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);
 		}
@@ -2361,10 +2352,6 @@ namespace Volian.Controls.Library
 				case "Print All Approved Procedures": //C2025-017 print all approved procedures
 					OnPrintAllApprovedProcedures(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0));
 					break;
-				//C2021-035 Add Refresh Tree Option at highest level
-				case "Refresh Tree":
-					RefreshTree();
-					break;
 				default:
 					if (mi.Text.StartsWith("Showing Change Bars Starting"))
 						OnSelectDateToStartChangeBars(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0));
@@ -3939,13 +3926,6 @@ namespace Volian.Controls.Library
 			if (Processing != null)
 				Processing(this, new vlnTreeStatusEventArgs(status, message));
 		}
-		//C2021-035 Add Refresh Tree Option at highest level
-		public event vlnTreeViewStatusEvent RefreshFormats;
-		private void OnRefreshFormats(bool status, string message)
-		{
-			if (RefreshFormats != null)
-				RefreshFormats(this, new vlnTreeStatusEventArgs(status, message));
-		}
 		#endregion
 		#region SetLastValuesAndSaveIfChangedStuff
 		private void SetLastValues(VETreeNode node)
@@ -4668,36 +4648,6 @@ namespace Volian.Controls.Library
 				if (myFolder.FolderID == ((FolderInfo)obj2).FolderID) return true;
 			return false;
 		}
-
-		//C2021-035 Add Refresh Tree Option at highest level
-		public void RefreshTree()
-        {
-			//reload the base node
-			VETreeNode tbase = (VETreeNode) Nodes[0];
-			tbase.ChildrenLoaded = false;
-
-			//Refresh the formats
-			OnRefreshFormats(true, "Refreshing Formats");
-
-			//reset the procedure lists so db is re-queried in case they changed
-			//also clear other caches in case added steps / sections / etc...
-			PartInfo.ClearPartInfoCache();
-			ItemInfo.ClearItemInfoCache();
-			DocVersionInfo.ResetAllProcedures();
-			FolderInfo.ClearFolderInfoCache();
-
-			//Refresh the base VEPROMS object
-			var fldr = tbase.VEObject as FolderInfo;
-			if (fldr != null)
-			{
-				Invoke((Action)(() => { tbase.VEObject = FolderInfo.Get(fldr.FolderID); }));
-			}
-
-			//refresh the tree
-			Invoke((Action)(() => { tbase.RefreshNode(); }));
-			this.Invoke((Action)(() => { this.Update(); }));
-		}
-
 	}
 	#region DragHelper
 	public class DragHelper

PROMS/Volian.Print.Library/ContActionSum.cs

@@ -47,10 +47,9 @@ namespace Volian.Print.Library
 			AddHeader(doingTimeCriticalSummary); // F2022-024 pass flag when creating a Time Critical Action Summary report
 			foreach (pkParagraph myContAct in myContActSteps)
 			{
-				bool addParentTab = myContAct.MyParagraph.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.AccSectionData.ContinuousActionSummaryData.AddParentTabToSubStepTab; // F2026-001 prefix Continuous Action sub-step with parent tab
 				if (myContAct.MyChildren.Count > 0)
 					if (myContAct.MyParagraph.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.AccSectionData.ContinuousActionSummaryData.IncludeSectionNumAndTitle) // only print the section title if it has Continuous Action Steps
-						AddSectionHeader(myContAct.MyParagraph.MyItemInfo.DisplayNumber, myContAct.MyParagraph.MyItemInfo.FormattedDisplayText, myContAct.MyParagraph.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.AccSectionData.ContinuousActionSummaryData.IncludeSectionLabel);
+						AddSectionHeader(myContAct.MyParagraph.MyItemInfo.DisplayNumber, myContAct.MyParagraph.MyItemInfo.FormattedDisplayText);
 				foreach (pkParagraph pgh in myContAct.MyChildren) // within each section...
 				{
 					ItemInfo hlsii = GetHLSii(pgh.MyParagraph.MyItemInfo);
@@ -80,27 +79,8 @@ namespace Volian.Print.Library
 					}
 					else if (!pgh.MyParagraph.MyItemInfo.IsHigh) // if the high level step was not included, adjust the tab for a sub-step/RNO
 					{
-						string tabPre = "";
-						StringBuilder sbTabPre = new StringBuilder();
-						ItemInfo prevItemInfo = pgh.MyParagraph.MyItemInfo.MyParent;
-						// F2026-001 The while loop below will build a sub-step prefix of the continuous action sub-step
-						//           if the format flag (AddParentTabToSubStepTab) is set - the base format has this set to false
-						//           it will not add the parent tab
-						//           - if the parent is a continuous action step or sub-step as that information would be redundant
-						//           - if the current is a RNO step type and the Parent is NOT a RNO step type 
-						if (prevItemInfo.IncludeOnContActSum || !addParentTab) prevItemInfo = null;
-						while (prevItemInfo != null && !prevItemInfo.IsHigh && !prevItemInfo.IncludeOnContActSum)
-						{
-							sbTabPre.Insert(0, prevItemInfo.MyTab.CleanText.Trim());
-							if ((prevItemInfo.IsInRNO && !prevItemInfo.MyParent.IsInRNO) || prevItemInfo.MyParent.IncludeOnContActSum)
-								prevItemInfo = null;
-							else
-								prevItemInfo = prevItemInfo.MyParent;
-						}
-						if (_FirstLine) // the first of a CAS on the report include the High Level Step tab
-							sbTabPre.Insert(0, (hlsii != null) ? hlsii.MyTab.Text.Trim() + "   " : "");
-						tabPre = sbTabPre.ToString();
-						if (!_FirstLine) // if not the first line we indent the size of high level step tab
+						string tabPre = (_FirstLine) ? hlsii.MyTab.Text.Trim() + "   " : "";
+						if (!_FirstLine)
 							preTabLen = GetTextWidth(hlsii.MyTab.Text.Trim() + "   ") / 72f;
 						if (pgh.MyParagraph.MyItemInfo.IsInRNO)
 						{
@@ -123,13 +103,10 @@ namespace Volian.Print.Library
 
 		private void AddChildren(pkParagraph pgh, int level)
 		{
-			StringBuilder sbPreTab = new StringBuilder();
-			bool addParentTab = pgh.MyParagraph.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.AccSectionData.ContinuousActionSummaryData.AddParentTabToSubStepTab; // F2026-001 flag to add parent tab to CAS sub-step
 			if (pgh.MyChildren.Count > 0)
 				level++;
 			foreach (pkParagraph cpgh in pgh.MyChildren)
 			{
-				sbPreTab.Clear();
 				if (cpgh.MyCautionsAndNotes.Count > 0)
 					AddNotesOrCautions(cpgh,level);
 				string stpTab = cpgh.MyParagraph.MyItemInfo.MyTab.CleanText.Trim() +  (cpgh.MyParagraph.MyItemInfo.IsInRNO ? "[R]  ":  "  ");
@@ -137,18 +114,6 @@ namespace Volian.Print.Library
 				{
 					stpTab = string.Format("{0}  ", cpgh.MyParagraph.MyParent.MyTab.Text.Trim()) + "  " + stpTab;
 				}
-				ItemInfo prevItmInfo = cpgh.MyParagraph.MyItemInfo.MyParent;
-				// F2026-001 the while loop below will add the sub-step's parent tab if applicable
-				if (prevItmInfo.IncludeOnContActSum || !addParentTab) prevItmInfo = null; // don't try to add parent tab
-				while (prevItmInfo != null && !prevItmInfo.IsHigh)
-				{
-					sbPreTab.Insert(0, prevItmInfo.MyTab.CleanText.Trim());
-					if ((prevItmInfo.IsInRNO && !prevItmInfo.MyParent.IsInRNO) || prevItmInfo.MyParent.IncludeOnContActSum)
-						prevItmInfo = null;
-					else
-						prevItmInfo = prevItmInfo.MyParent;
-				}
-				stpTab = sbPreTab.ToString() + stpTab;
 				AddContinuousAction(stpTab, GetContActStepText(cpgh.MyParagraph.MyItemInfo), "", (cpgh.MyParagraph.MyItemInfo.PageNumber + 1).ToString(),level,0);
 				AddChildren(cpgh, level);
 			}
@@ -210,7 +175,7 @@ namespace Volian.Print.Library
 			WriteCell("DONE", true, true);
 			WriteCell("PAGE", true, false);
 		}
-		private void AddSectionHeader(string number, string title, bool IncludeSectionLabel)
+		private void AddSectionHeader(string number, string title)
 		{
 			if (!_FirstSection)
 			{
@@ -222,10 +187,7 @@ namespace Volian.Print.Library
 			_FirstSection = false;
 			Advance(2);
 			SetIndent(0, 0);
-			if (IncludeSectionLabel) 
-				WriteCell("SECTION " + number, true, false);
-			else
-				WriteCell(number, true, false); // F2025-038 don't include the word SECTION  before number and title
+			WriteCell("SECTION " + number, true, false);
 			WriteCell("   " + title, false, true);
 			Advance();
 		}

PROMS/Volian.Print.Library/vlnParagraph.cs

@@ -1855,10 +1855,7 @@ namespace Volian.Print.Library
 					if (doSectionContinue) DoTopContinueMsg(cb, ref yPageStart, yTopMargin, docstyle, null);
 					// If "ContinueSectionHeader" (format flag) is true then print the section title with "(Continued)" appended to it
 					// B2020-164 added check for SpecialCaseCalvert to bypass IsSeparateSubsection STP O-67B-2 step 6.5
-					// B2025-060 no section continue message if previous was not in same section or sub-section
-					//           fixes Vogtle units 3&4 3-AOP-116 Attachments 2 & 3
-					if ((!MyItemInfo.IsSection || MyItemInfo.IsSubsection) &&
-						(MyItemInfo.MyPrevious != null && MyItemInfo.ActiveSection == MyItemInfo.MyPrevious.ActiveSection) &&
+					if ((!MyItemInfo.IsSection || MyItemInfo.IsSubsection) && 
 						MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.ContinueSectionHeader && 
 						(!MyItemInfo.IsSection || (MyItemInfo.IsSeparateSubsection || MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert)))
 					{
@@ -2819,9 +2816,6 @@ namespace Volian.Print.Library
 					{
 						// F2020-023: tab includes parent tab and if caution/note don't use its parent, go up another level
 						string noBullet = MyItemInfo.IsCautionOrNotePart ? MyItemInfo.MyParent.MyParent.CombinedTab : MyItemInfo.MyParent.CombinedTab;
-						// F2026-002 Vogtle Units 3&4, don't include the RNO sub-step tab if the parent is an AER sub-step
-						if (docstyle.Continue.Top.DontIncludeRNOTabIfHasAERParent && MyItemInfo.MyParent.IsRNOPart && !MyItemInfo.MyParent.MyParent.IsRNOPart)
-							noBullet = MyItemInfo.MyParent.MyParent.CombinedTab;
 						// C2021-024: WCN1 if bullet exists in combined tab, stop right before bullet.
 						// B2021-085 & 087: crash if noBullet was null.  Also, if null, see if text in parent. if no text, replace the
 						//	"%s." with noBullet (null) which won't put out just a '.' as step number.
@@ -6459,11 +6453,8 @@ namespace Volian.Print.Library
 					{
 						if (itemInfo.MyDocStyle.AlignHLSTabWithSect || itemInfo.FormatStepData.AlignHLSTabWithSectOvride)
 						{
-							float orgXOffset = MyTab.XOffset;
 							myTab.XOffset = (float)itemInfo.MyDocStyle.Layout.LeftMargin + (float)formatInfo.PlantFormat.FormatData.SectData.SectionHeader.Pos;
 							XOffset = myTab.XOffset + myTab.Width;
-							// F2025-040 Adjust the Cont Act box position around HLS number
-							if (myTab.MyMacro != null) myTab.MyMacro.XOffset += (MyTab.XOffset - orgXOffset);
 						}
 						else
 						{