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

Merging dev into master after successful testing.

PROMS/Baseline/frmBaseline.cs

@@ -456,7 +456,7 @@ namespace Baseline
 				switch (myLast)
 				{
 					case LastWas.Pagination:
-						OpenPDF(line);
+						line = OpenPDF(line);
 						break;
 					case LastWas.Baseline: // TODO: Need to add code here to open matching file
 						OpenOnePDF(myLine,1);
@@ -479,7 +479,7 @@ namespace Baseline
 			switch (myLast)
 			{
 				case LastWas.Pagination:
-					OpenPDF(line);
+					line = OpenPDF(line);
 					break;
 				case LastWas.Baseline: // TODO: Need to add code here to open matching file
 					OpenOnePDF(myLine,2);
@@ -491,99 +491,34 @@ namespace Baseline
 					break;
 			}
 		}
-
-		/// <summary>
-		/// This will return the full path to the PDF file
-		/// </summary>
-		/// <param name="fi"></param>
-		/// <param name="patern"></param>
-		/// <returns></returns>
-		private string GetPFDFileAndPath(FileInfo fi, string patern)
-		{
-			string[] fileList = Directory.GetFiles(fi.DirectoryName, patern);
-			// sort the list of file list
-			Array.Sort((string[])fileList);
-			return fileList.First(); // the PDF file that we what should be top of the list then.
-		}
-
-		/// <summary>
-		/// This will parse out the procedure number for the PROMS ShortPath representation of a procedure section or step part
-		/// In the PROMS ShortPath, ".S" is used to delimit the procedure number, section then uses "..S" for the step parts
-		/// This method was written to handle cases where ".S" is used as part of the procedure number
-		/// </summary>
-		/// <param name="txt"></param>
-		/// <returns></returns>
-		private string ParseOutProcedureNumberFromLine(string txt)
-		{
-			// old logic was looking for the first occurence of ".S" in the txt string as the ending point of the procedure nuumber
-			// Beaver Valley has a procedure number "1.SBGEN" in which the old logic would not work
-			// 1.SBGEN.SC. ==> short path of attachment section "C"
-			// 1.SBGEN.SC..S1. ==> short path of Step 1 in attachment section "C"
-			string rtnstr = null;
-			int lidx = -1;
-			// if the item is to a high levels step or sub-step the short path as "..S" for each part of the step
-			// so look for the last occurence of ".." which will be the end of the section information
-			lidx = txt.LastIndexOf("..");
-			if (lidx > 0)
-			{
-				lidx = txt.LastIndexOf(".S", lidx); // this will position us to the end of the procedure number
-			}
-			else
-			{
-				lidx = txt.LastIndexOf(".S"); // this will position us to the end of the procedure number if there was no step information
-			}
-			// B2018-113 - Replace slashes and backslashes with underscores just as PROMS does when creating a PDF file.
-			rtnstr = txt.Substring(8, lidx - 8).Replace("/", "_").Replace("\\", "_");
-			return rtnstr;
-		}
-
 		string exePath;
-		private void OpenPDF(string line)
+		private string OpenPDF(string line)
 		{
-			int pageNum = int.Parse(line.Substring(0, 6));
+			int page = int.Parse(line.Substring(0, 6));
 			// B2018-113 - Replace slashes and backslashes with underscores just as PROMS does when creating a PDF file.
-			string ProcNum = ParseOutProcedureNumberFromLine(line);
-			string procPatern = string.Format("*{0}*.pdf", string.IsNullOrEmpty(line) ? "noProcNumber" : ProcNum);
-
+			line = line.Substring(8, line.IndexOf(".S") - 8).Replace("/", "_").Replace("\\", "_");
 			FindFile ff = lbDifferent.SelectedItem as FindFile;
 			FileInfo fi1 = new FileInfo(ff.File1);
 			FileInfo fi2 = new FileInfo(ff.File2);
-			string PDFfileName1 = GetPFDFileAndPath(fi1,procPatern);
-			string PDFfileName2 = GetPFDFileAndPath(fi2,procPatern);
-			if (string.IsNullOrEmpty(PDFfileName1) || string.IsNullOrEmpty(PDFfileName2)) return;
-
 			// If you don't know where the Reader executable is for PDFs Open a PDF and Check to see where the path points
 			if (exePath == null)
 			{
-				try
-				{
-					System.Diagnostics.Process p = System.Diagnostics.Process.Start(PDFfileName1);
-					exePath = TryToGetPath(p);
-					p.Kill(); // No need to keep it open
-				}
-				catch (Exception ex)
-				{
-					Application.DoEvents();
-					string msg = string.Format("{0} - {1}", ex.GetType().Name, ex.Message);
-					Console.WriteLine(msg);
-					MessageBox.Show(msg, "Error opening default PDF Viewer");
-					return;
-				}
+				System.Diagnostics.Process p = System.Diagnostics.Process.Start(fi1.DirectoryName + "\\" + line + ".pdf");
+				exePath = TryToGetPath(p);
+				p.Kill(); // No need to keep it open
 			}
-
 			// Open the first PDF on a Specific Page
-			System.Diagnostics.ProcessStartInfo psi1 = new System.Diagnostics.ProcessStartInfo(exePath, string.Format(" /A \"page={0}\" \"{1}\" ", pageNum,PDFfileName1));
+			System.Diagnostics.ProcessStartInfo psi1 = new System.Diagnostics.ProcessStartInfo(exePath, string.Format("/A page={0} ", page) + fi1.DirectoryName + "\\" + line + ".pdf ");
 			System.Diagnostics.Process p1 = System.Diagnostics.Process.Start(psi1);
 			// Move the PDF Reader window to 0,0
 			MoveProcess(p1, 0, 0);
-
-			// Open the second PDF on a Specific Page
-			System.Diagnostics.ProcessStartInfo psi2 = new System.Diagnostics.ProcessStartInfo(exePath, string.Format(" /A \"page={0}\" \"{1}\" ", pageNum, PDFfileName2));
+			// Open the first PDF on a Specific Page
+			System.Diagnostics.ProcessStartInfo psi2 = new System.Diagnostics.ProcessStartInfo(exePath, string.Format("/A page={0} ", page) + fi2.DirectoryName + "\\" + line + ".pdf ");
 			System.Diagnostics.Process p2 = System.Diagnostics.Process.Start(psi2);
 			// Move the PDF Reader window to 960,0
 			// TODO: This Offset could be a Setting
 			MoveProcess(p2, 960, 0);
-			return;
+			return line;
 		}
 		/// <summary>
 		/// Try to get the location of the PDF Reader executable
@@ -595,7 +530,7 @@ namespace Baseline
 			p.WaitForInputIdle();
 			while (p.MainModule == null)
 			{
-				Console.WriteLine("{0} -  {1}", p.MainWindowTitle, p.ProcessName);
+				Console.WriteLine("{0} -  {1}", p.MainWindowTitle,p.ProcessName);
 				p.WaitForInputIdle();
 				Application.DoEvents();
 			}
@@ -659,52 +594,40 @@ namespace Baseline
 		/// <param name="list"></param>
 		private void OpenOnePDF(Line myLine, int list)
 		{
-			if (myLine == null) return; // no PDF to open
 			// B2018-113 - Replace slashes and backslashes with underscores just as PROMS does when creating a PDF file.
 			string proc = myLine.MyProc.Number.Replace("/","_").Replace("\\","_");
-
-			// if no procedure number, PROMS creates pdf filename "NoProcNumber.pdf"
-			// create pattern to use to get the PDF from the directory
-			// add wildcards (*) to file the file if any prefix or suffix was added to the filename
-			string procPatern = string.Format("*{0}*.pdf", proc == string.Empty ? "noProcNumber" : proc);
 			int pagenum = myLine.MyPage.Number;
 			FindFile ff = lbDifferent.SelectedItem as FindFile;
-			string PDFfileName = null;
-			if (list == 1)
-			{
-				FileInfo fi1 = new FileInfo(ff.File1);
-				PDFfileName = GetPFDFileAndPath(fi1, procPatern);
-			}
-			else // list == 2
-			{
-				FileInfo fi2 = new FileInfo(ff.File2);
-				PDFfileName = GetPFDFileAndPath(fi2, procPatern);
-			}
-			if (string.IsNullOrEmpty(PDFfileName)) return; // no PDF to open
-
-			// if exePath is null, then open the found PDF with the default PDF viewer and
-			// capture/save the entire name and path of the default PDF viewer
+			FileInfo fi1 = new FileInfo(ff.File1);
+			FileInfo fi2 = new FileInfo(ff.File2);
 			if (exePath == null)
 			{
-				try
+				System.Diagnostics.Process p = System.Diagnostics.Process.Start(fi1.DirectoryName + "\\" + proc + ".pdf");
+				while (exePath == null)
 				{
-					System.Diagnostics.Process tp = System.Diagnostics.Process.Start(PDFfileName);
-					exePath = TryToGetPath(tp);
-					tp.Kill();
-				}
-				catch (Exception ex)
-				{
-					Application.DoEvents();
-					string msg = string.Format("{0} - {1}", ex.GetType().Name, ex.Message);
-					Console.WriteLine(msg);
-					MessageBox.Show(msg, "Error opening default PDF Viewer");
-					return;
+					try
+					{
+
+						exePath = p.MainModule.FileName;
+					}
+					catch (Exception ex)
+					{
+						Application.DoEvents();
+						Console.WriteLine("{0} - {1}", ex.GetType().Name, ex.Message);
+					}
 				}
+				p.Kill();
+			}
+			if (list == 1)
+			{
+				System.Diagnostics.ProcessStartInfo psi1 = new System.Diagnostics.ProcessStartInfo(exePath, string.Format("/A page={0} ", pagenum) + fi1.DirectoryName + "\\" + proc + ".pdf ");
+				System.Diagnostics.Process p1 = System.Diagnostics.Process.Start(psi1);
+			}
+			else
+			{
+				System.Diagnostics.ProcessStartInfo psi2 = new System.Diagnostics.ProcessStartInfo(exePath, string.Format("/A page={0} ", pagenum) + fi2.DirectoryName + "\\" + proc + ".pdf ");
+				System.Diagnostics.Process p1 = System.Diagnostics.Process.Start(psi2);
 			}
-			// open the PDF and jump to the page number
-			System.Diagnostics.ProcessStartInfo psi1 = new System.Diagnostics.ProcessStartInfo(exePath, string.Format("/A \"page={0}\" \"{1}\" ", pagenum,PDFfileName));
-			psi1.UseShellExecute = false;
-			System.Diagnostics.Process p1 = System.Diagnostics.Process.Start(psi1);
 		}
 		/// <summary>
 		/// Perform Debug Meta file comparison for all of the folders within the automated testing folders 
@@ -786,12 +709,11 @@ namespace Baseline
 		private void lbProcedures_SelectedIndexChanged(object sender, EventArgs e)
 		{
 			//Initialize Results List Box
+			lbResults1.Items.Clear();
 			Procedure myProc = lbProcedures.SelectedItem as Procedure;
-			if (myProc == null) return; // clicked on the white space (blank line) in the list of different procedures
 			//TODO: May need to consider if there are duplicate procedure numers and titles
 			Procedure myProc1 = MyProcs1.Find(x => x.Number == myProc.Number && x.Title == myProc.Title);
 			// Build the results ListBox for the left window
-			lbResults1.Items.Clear();
 			if (myProc1 != null)
 			{
 				foreach (Page myPage in myProc1.MyPages)

PROMS/LBWordLibrary/LBObjectExtension.cs

@@ -422,6 +422,150 @@ namespace LBWordLibrary
 					return true;
 			return false;
 		}
+		/// <summary>
+		/// If document contains symbol characters, returns problem font.
+		/// </summary>
+		public string FontHasSymbolCharacters
+		{
+			get
+			{
+				LBRange myRange = Range();
+				myRange = myRange.GoTo(LBWdGoToItem.wdGoToPercent, LBWdGoToDirection.wdGoToLast, 100);
+				myRange.Start = 0;
+				int end = myRange.End;
+				string myText = GetRangeText(myRange);
+				//return _RegFindSymbol.IsMatch(myText);
+				MatchCollection problems = _RegFindSymbol.Matches(myText);
+				int offset = 0;
+				List<string> alreadyProcessed = new List<string>();
+				List<string> fontHasSymbols = new List<string>();
+				foreach (Match problem in problems)
+				{
+					if (!alreadyProcessed.Contains(problem.Value))
+						{
+						myRange.Start = problem.Index + offset;
+						myRange.End = problem.Index + problem.Length + offset;
+						int newOffset = FindRangeOffset(myRange, problem, offset, end);
+						string fontName = myRange.Font.Name;
+						if (IsSymbolFont(fontName))
+						{
+							if( !fontHasSymbols.Contains(fontName))
+							{
+								fontHasSymbols.Add(fontName);
+								// Found symbol font
+								_MyLog.InfoFormat("Font '{0}' has Symbols", fontName);
+							}
+							//Console.WriteLine("Font '{0}' has Symbols", myRange.Font.Name);
+							//return true;
+						}
+						else
+							return myRange.Font.Name;
+						offset = newOffset;
+						alreadyProcessed.Add(problem.Value);
+					}
+				}
+				return null;
+			}
+		}
+		/// <summary>
+		/// Debug Tool - Return a string containing a list of the fonts that have symbol characters.
+		/// </summary>
+		public string FontsHaveSymbolCharacters
+		{
+			get
+			{
+				string sep = "";
+				StringBuilder sb = new StringBuilder();
+				List<string> fonts=new List<string>();
+				LBRange myRange = Range();
+				myRange = myRange.GoTo(LBWdGoToItem.wdGoToPercent, LBWdGoToDirection.wdGoToLast, 100);
+				myRange.Start = 0;
+				int end = myRange.End;
+				string myText = GetRangeText(myRange);
+				//return _RegFindSymbol.IsMatch(myText);
+				MatchCollection problems = _RegFindSymbol.Matches(myText);
+				int offset = 0;
+				foreach (Match problem in problems)
+				{
+					myRange.Start = problem.Index + offset;
+					myRange.End = problem.Index + problem.Length + offset;
+					int newOffset = FindRangeOffset(myRange, problem, offset, end);
+					if (!fonts.Contains(myRange.Font.Name))
+					{
+						fonts.Add(myRange.Font.Name);
+						sb.Append(sep + "'" + myRange.Font.Name + "'");
+						sep = ",";
+					}
+					offset = newOffset;
+				}
+				if (sb.Length > 0) return sb.ToString();
+				return null;
+			}
+		}
+		/// <summary>
+		/// Debug Tool - Return a list of symbol characters using VESYMB font.
+		/// </summary>
+		public string FontsHaveSymbolCharacters2
+		{
+			get
+			{
+				try
+				{
+					Dictionary<string, List<int>> fonts = new Dictionary<string, List<int>>();
+					LBRange myRange = Range();
+					myRange = myRange.GoTo(LBWdGoToItem.wdGoToPercent, LBWdGoToDirection.wdGoToLast, 100);
+					myRange.Start = 0;
+					int end = myRange.End;
+					string myText = GetRangeText(myRange);
+					//return _RegFindSymbol.IsMatch(myText);
+					MatchCollection problems = _RegFindSymbol.Matches(myText);
+					int offset = 0;
+					foreach (Match problem in problems)
+					{
+						myRange.Start = problem.Index + offset;
+						myRange.End = problem.Index + problem.Length + offset;
+						int newOffset = FindRangeOffset(myRange, problem, offset, end);
+						string sFont = myRange.Font.Name;
+						if (sFont.ToUpper().StartsWith("VESYM"))
+						{
+							if (!fonts.ContainsKey(sFont))
+							{
+								fonts.Add(sFont, new List<int>());
+							}
+							List<int> symbols = fonts[sFont];
+							string myTextSymb = GetRangeText(myRange);
+							foreach (char c in myTextSymb)
+							{
+								if (!symbols.Contains((int)c))
+									symbols.Add((int)c);
+							}
+						}
+						offset = newOffset;
+					}
+					if (fonts.Count > 0)
+					{
+						string sep = "";
+						StringBuilder sb = new StringBuilder();
+						foreach (string font in fonts.Keys)
+						{
+							sb.Append(sep + "'" + font + "'");
+							sep = ",";
+							foreach (int i in fonts[font])
+							{
+								sb.Append(sep);
+								sb.Append(i);
+							}
+						}
+						return sb.ToString();
+					}
+				}
+				catch (Exception ex)
+				{
+					Console.WriteLine("{0},{1},{2}", ex.GetType().Name, ex.Message, ex.StackTrace);
+				}
+				return null;
+			}
+		}
 	
 		/// <summary>
 		/// Checks to see if the document contains symbol characters
@@ -457,7 +601,86 @@ namespace LBWordLibrary
 			}
 		}
 		Regex _RegFindSymbol = new Regex("[\\uF020-\\uF07F]+");
-
+		/// <summary>
+		/// FixSymbolCharacters - Fix any symbol characters in the document
+		/// </summary>
+		public void FixSymbolCharacters()
+		{
+			// Set up range object to be used to process text
+			LBRange myRange = Range();
+			myRange = myRange.GoTo(LBWdGoToItem.wdGoToPercent, LBWdGoToDirection.wdGoToLast, 100);
+			int end = myRange.End;
+			myRange.Start = 0;
+			string myText = GetRangeText(myRange);
+			MatchCollection problems = _RegFindSymbol.Matches(myText);
+			int offset = 0;
+			foreach (Match problem in problems)
+			{
+				myRange.Start = problem.Index + offset;
+				myRange.End = problem.Index + problem.Length + offset;
+				int newOffset = FindRangeOffset(myRange, problem, offset, end);
+				if (myRange.Font.Name == "")
+				{
+					int wrdStart = myRange.Start;
+					int wrdEnd = myRange.End;
+					int wrdMiddle = wrdStart;
+					while (myRange.Font.Name == "")
+					{
+						do
+						{
+							myRange.End = ++wrdMiddle;
+						} while(myRange.Font.Name != "");
+						myRange.End = wrdMiddle - 1;
+						ReplaceSymbolCharacters(myRange);
+						myRange.Start = wrdMiddle -1;
+						myRange.End = wrdEnd;
+					}
+					ReplaceSymbolCharacters(myRange);
+				}
+				else
+				{
+					ReplaceSymbolCharacters(myRange);
+				}
+				offset = newOffset;
+			}
+		}
+		/// <summary>
+		/// Try to fix the first character in the symbol range F000 to F0FF.  If it cannot be
+		/// fixed, it is an indicator that the font is not installed properly.  Regardless of
+		/// whether there is success, the change is undone so that the document will not be
+		/// considered dirty, i.e. will not prompt user for save.
+		/// </summary>
+		/// <returns></returns>
+		public bool AttemptToFixASymbolCharacter()
+		{
+			// Set up range object to be used to process text
+			LBRange myRange = Range();
+			myRange = myRange.GoTo(LBWdGoToItem.wdGoToPercent, LBWdGoToDirection.wdGoToLast, 100);
+			
+			int end = myRange.End;
+			myRange.Start = 0;
+			string myText = GetRangeText(myRange);
+			MatchCollection problems = _RegFindSymbol.Matches(myText);
+			if (problems.Count>0)
+			{
+				Match problem = problems[0];
+				myRange.Start = problem.Index;
+				myRange.End = myRange.Start + 1;
+				if (IsSymbolFont(myRange.Font.Name)) return true;   // if it's a symbol font already, no issue.
+				string before = GetRangeText(myRange);
+				string updated = ReplaceSymbolCharacters(before);
+				myRange.Text = updated;
+				string after = GetRangeText(myRange);
+				Undo(1);
+				//Console.WriteLine("Undo1 results = {0}", tst);
+				//tst = Undo(1);
+				//Console.WriteLine("Undo2 results = {0}", tst);
+				//tst = Undo(1);
+				//Console.WriteLine("Undo3 results = {0}", tst);
+				return (updated == after);
+			}
+			return true;
+		}
 		/// <summary>
 		/// Get the Range Text with error handling.  myRange.Text sometimes will get a null reference exception.
 		/// </summary>
@@ -514,6 +737,35 @@ namespace LBWordLibrary
 			return myRange.Start - problem.Index;
 		}
 		/// <summary>
+		/// ReplaceSymbolCharacters Replaces any symbol characters in the specified range
+		/// </summary>
+		/// <param name="myRange"></param>
+		private static void ReplaceSymbolCharacters(LBRange myRange)
+		{
+			try
+			{
+				if (IsSymbolFont(myRange.Font.Name)) 
+					return;
+				string before = GetRangeText(myRange);
+				string updated = ReplaceSymbolCharacters(before);
+				myRange.Text = updated;
+				string after = GetRangeText(myRange);
+				if (after != updated)  // If the Word text doesn't match try including a character before and after and do it again.
+				{
+					Console.WriteLine("'TryEntireRange Failed',{0},{1},'{2}','{3}','{4}'", myRange.Start, myRange.End, before, updated, after);
+					int end = myRange.End;
+					myRange.Start = myRange.Start - 1;
+					myRange.End = end + 1;
+					myRange.Text = ReplaceSymbolCharacters(GetRangeText(myRange));
+					Console.WriteLine("'TryEntireRange Failed',{0},{1},'{2}'", myRange.Start, myRange.End, GetRangeText(myRange));
+				}
+			}
+			catch (Exception ex)
+			{
+				Console.WriteLine("'TryEntireRange Exception',{0},{1},'{2}'", myRange.Start, myRange.End, ex.Message);
+			}
+		}
+		/// <summary>
 		/// ReplaceSymbolCharacters processes the string returned and changes any symbols (0xF0??) to normal characters
 		/// </summary>
 		/// <param name="str"></param>

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/SQL/ClientSpecific/BNPP_CoverPageConsolidation.sql

@@ -1,147 +0,0 @@
- /*****************************************************************************
-   Volian Enterprises - Proprietary Information - DO NOT COPY OR DISTRIBUTE
-       Copyright 2026 - Volian Enterprises, Inc. All rights reserved.
-*****************************************************************************/
-
--- =============================================
--- Author:		Matthew Schill
--- Create date: 03/20/2026
--- Description:	Script to consolidate Cover Pages for Barakah
---  by Converting multi-unit procedures with Cover Pages
---  to use 1 Library Document Cover Page
--- =============================================
-
- select Contents.ContentID
- 	  , Contenttext = Contents.Text
-	  , Items.ItemID
- 	  , tblDocuments.DocID
- 	  , ParentContentID
- 	  , ParentItemID
- 	  , LibTitle = ISNULL(LibTitle,'')
- 	  , numLibCP
- 	  , numCP
- 	  ,BaseFlag = 0
- INTO #tmpUpdate
- from Contents 
- inner join Entries on Contents.ContentID = Entries.ContentID
- inner join tblDocuments on tblDocuments.DocID = Entries.DocID
- inner join Items on Items.ContentID = Contents.ContentID
- outer apply
- (select ParentContentID=ContentID, ParentItemID = PItm.ItemID
-  FROM dbo.vefn_ParentItems(Items.ItemID) PItm
-  where PItm.ItemID <> Items.ItemID
- ) parent
- outer apply
- (select numLibCP = Count(*)
-  FROM dbo.vefn_ChildItems(ParentItemID) PItm
-  INNER JOIN Contents on Contents.ContentID = PItm.ContentID
-  INNER JOIN Entries on Contents.ContentID = Entries.ContentID
-  INNER JOIN tblDocuments on tblDocuments.DocID = Entries.DocID
-  where PItm.ItemID <> ParentItemID
-  AND Contents.text like 'Cover Page%' and ISNULL(tblDocuments.LibTitle,'') <> ''
- ) childWithLibTitle
- outer apply
- (select numCP = Count(*)
-  FROM dbo.vefn_ChildItems(ParentItemID) PItm
-  INNER JOIN Contents on Contents.ContentID = PItm.ContentID
-  where PItm.ItemID <> ParentItemID
-  AND Contents.text like 'Cover Page%'
- ) child
- where Contents.text like 'Cover Page%'
- order by ParentContentID asc, CASE WHEN ISNULL(LibTitle,'') <> '' THEN 1 ELSE 2 END asc, Contents.Text asc
-
- UPDATE #tmpUpdate SET BaseFlag = 1 where LibTitle <> '' and numLibCP = 1
-
- UPDATE #tmpUpdate SET BaseFlag = CASE WHEN tU.LibTitle <> '' THEN 1 ELSE 2 END FROM #tmpUpdate tU
- where BaseFlag = 0 AND tU.ContentID IN
- (
- Select ContentID FROM
- (SELECT sub.ContentID,
-        row_number() OVER(PARTITION BY sub.ParentContentID ORDER BY CASE WHEN ISNULL(sub.LibTitle,'') <> '' THEN 1 ELSE 2 END asc, sub.Contenttext asc) as pos
-      FROM #tmpUpdate sub
-     ) x
- WHERE x.pos = 1
- )
-
- declare @Cont TABLE
- (
- 	ContentID int,
- 	ItemID int,
- 	xConfig xml
- )
- insert into @Cont
- SELECT tU.ContentID, ItemID, xConfig = CAST(tblContents.config AS xml) FROM 
- tblContents
- INNER JOIN 
- #tmpUpdate tU ON tU.ContentID = tblContents.ContentID
- where tU.BaseFlag > 0
-
- Update @Cont Set  xConfig.modify('delete //MasterSlave') From @Cont;
-
- 	Update tblContents SET Text = 'Cover Page', Config = CAST(xConfig AS varchar(max)), 
- 	   DTS = GETDATE(), UserID = 'CPVolian2026'
- 	FROM 
- 	@Cont CNT INNER JOIN 
- 	tblContents ON CNT.ContentID = tblContents.ContentID;
- 
-    --Update items PreviousIds
-	UPDATE tblItems Set PreviousID = IdToSwapTO.ItemID
-	FROM
-	tblItems
-	INNER JOIN
-    #tmpUpdate tU ON tblItems.PreviousID = tU.ItemID AND tU.BaseFlag = 0
- 	INNER JOIN #tmpUpdate IdToSwapTO ON IdToSwapTO.ParentContentID = tU.ParentContentID AND IdToSwapTO.BaseFlag IN (1,2) 
-
- 	UPDATE tblItems Set DeleteStatus = 1, DTS = GETDATE(), UserID = 'CPVolian2026'
- 	FROM
- 	#tmpUpdate tU INNER JOIN 
- 	tblItems ON tU.ContentID = tblItems.ContentID
- 	WHERE tU.BaseFlag = 0;
- 
- 	UPDATE tblContents Set DeleteStatus = 1, DTS = GETDATE(), UserID = 'CPVolian2026'
- 	FROM
- 	#tmpUpdate tU INNER JOIN 
- 	tblContents ON tU.ContentID = tblContents.ContentID
- 	WHERE tU.BaseFlag = 0;
-
- 	DELETE FROM
-	tblEntries
-	FROM
-	tblEntries
-	INNER JOIN 
- 	#tmpUpdate tU ON tU.ContentID = tblEntries.ContentID
- 	WHERE tU.BaseFlag in (0,2);
- 
- 	INSERT INTO [dbo].[tblEntries]
- 			   ([ContentID]
- 			   ,[DocID]
- 			   ,[DTS]
- 			   ,[UserID]
- 			   ,[DeleteStatus])
- 	SELECT
- 		DISTINCT tU.ContentID,
- 		766,  -- docid 766 "Cover Page 1"
- 		GETDATE(),
- 		'CPVolian2026',
- 		0
- 	FROM
- 	#tmpUpdate tU 
- 	INNER JOIN 
- 	@Cont CNT ON tU.ContentID = CNT.ContentID
- 	WHERE tU.BaseFlag = 2;
-
- drop table #tmpUpdate;
-
-IF (@@Error = 0) SELECT '[Barakah Cover Page Consolidation] Succeeded'
-ELSE SELECT '[Barakah Cover Page Consolidation] Error'
-go
-
-
-
-
-
-
-
-
-
-

PROMS/SQL/ClientSpecific/BNPP_CoverPageConsolidation_Test.sql

@@ -1,263 +0,0 @@
- 
--- =============================================
--- Author:		Matthew Schill
--- Create date: 03/20/2026
--- Description:	Script to consolidate Cover Pages for Barakah
---  by Converting multi-unit procedures with Cover Pages
---  to use 1 Library Document Cover Page
--- =============================================
-
- ----@isTest = 0 will change data
- ----@isTest = 1 for internal testing (no data will be changed)
-DECLARE  @isTest bit = 1;
-
- ----Per Cover Page, pull how many cover pages
- ----Each Cover Page's procedure has
- ----and how many of those are library documents
- select Contents.ContentID
- 	  , Contenttext = Contents.Text
-	  , Items.ItemID
- 	  , tblDocuments.DocID
- 	  , ParentContentID
- 	  , ParentItemID
- 	  , LibTitle = ISNULL(LibTitle,'')
- 	  , numLibCP
- 	  , numCP
- 	  ,BaseFlag = 0
- INTO #tmpUpdate
- from Contents 
- inner join Entries on Contents.ContentID = Entries.ContentID
- inner join tblDocuments on tblDocuments.DocID = Entries.DocID
- inner join Items on Items.ContentID = Contents.ContentID
- outer apply
- (select ParentContentID=ContentID, ParentItemID = PItm.ItemID
-  FROM dbo.vefn_ParentItems(Items.ItemID) PItm
-  where PItm.ItemID <> Items.ItemID
- ) parent
- outer apply
- (select numLibCP = Count(*)
-  FROM dbo.vefn_ChildItems(ParentItemID) PItm
-  INNER JOIN Contents on Contents.ContentID = PItm.ContentID
-  INNER JOIN Entries on Contents.ContentID = Entries.ContentID
-  INNER JOIN tblDocuments on tblDocuments.DocID = Entries.DocID
-  where PItm.ItemID <> ParentItemID
-  AND Contents.text like 'Cover Page%' and ISNULL(tblDocuments.LibTitle,'') <> ''
- ) childWithLibTitle
- outer apply
- (select numCP = Count(*)
-  FROM dbo.vefn_ChildItems(ParentItemID) PItm
-  INNER JOIN Contents on Contents.ContentID = PItm.ContentID
-  where PItm.ItemID <> ParentItemID
-  AND Contents.text like 'Cover Page%'
- ) child
- where Contents.text like 'Cover Page%'
- order by ParentContentID asc, CASE WHEN ISNULL(LibTitle,'') <> '' THEN 1 ELSE 2 END asc, Contents.Text asc
-
---BaseFlag
--- 0 = a Cover Page that will be deleted
--- 1 = is base item (Cover Page will get renamed and applicability set to all)
--- 2 = would be base item but not linked to Lib document (Cover Page will get renamed and applicability set to all + will need linked to library doc)
-
----- If only 1 Library Doc CP for the CP's procedure and this is it, then mark this CP as the one we will keep
- UPDATE #tmpUpdate SET BaseFlag = 1 where LibTitle <> '' and numLibCP = 1
-
----- If multiple Library Document CPs, pick the first one as the one we will keep (BaseFlag = 1)
----- If no Library Document CPs, pick the first one as the one we will repurpose (BaseFlag = 2)
- UPDATE #tmpUpdate SET BaseFlag = CASE WHEN tU.LibTitle <> '' THEN 1 ELSE 2 END FROM #tmpUpdate tU
- where BaseFlag = 0 AND tU.ContentID IN
- (
- Select ContentID FROM
- (SELECT sub.ContentID,
-        row_number() OVER(PARTITION BY sub.ParentContentID ORDER BY CASE WHEN ISNULL(sub.LibTitle,'') <> '' THEN 1 ELSE 2 END asc, sub.Contenttext asc) as pos
-      FROM #tmpUpdate sub
-     ) x
- WHERE x.pos = 1
- )
-
-----BEGIN TESTS--
- if(@isTest = 1)
-  BEGIN
-		select Count(*), 'Should be Zero - not exactly one BaseFlag set to non 0 for each Parent Item' FROM #tmpUpdate TU
-		OUTER APPLY
-		 (select numBaseFlagSet = SUM(CASE WHEN sub.BaseFlag > 0 THEN 1 ELSE 0 END)
-		  FROM #tmpUpdate sub
-		  where sub.ParentContentID = TU.ParentContentID
-		 ) sub
-		where numBaseFlagSet <> 1
-
-		select Count(*), 'Should be Zero - 0 Lib Docs, BaseFlag is 1' FROM #tmpUpdate TU
-		where numLibCP = 0 and BaseFlag = 1
-
-		select Count(*), 'Should be Zero - at least 1 Lib Docs, BaseFlag is 2' FROM #tmpUpdate TU
-		where numLibCP > 0 and BaseFlag = 2
-
-		select Count(*), 'Should be Zero - 1 Lib Docs, BaseFlag not 1 for that Lib doc' FROM #tmpUpdate TU
-		where numLibCP = 1 and LibTitle <> '' and BaseFlag <> 1
-
-		select Count(*), 'Should be Zero - 1 Lib Docs, BaseFlag not 0 for ones without Lib Doc' FROM #tmpUpdate TU
-		where numLibCP = 1 and LibTitle = '' and BaseFlag <> 0
-
-		select Count(*), 'Should be Zero - 1 CP, no Lib Docs, BaseFlag not 2' FROM #tmpUpdate TU
-		where numLibCP = 0 and numCP = 1 and BaseFlag <> 2
-
-		select Count(*), 'Should be Zero - more than 1 Lib Docs, BaseFlag is 1' FROM #tmpUpdate TU
-		where numLibCP = 0 and BaseFlag = 1
-
-		select Count(*), 'Should be Zero - not exactly one BaseFlag set to non 0 for each Parent Item' FROM #tmpUpdate TU
-		OUTER APPLY
-		 (select numBaseFlagSet = SUM(CASE WHEN sub.BaseFlag > 0 THEN 1 ELSE 0 END)
-		  FROM #tmpUpdate sub
-		  where sub.ParentContentID = TU.ParentContentID
-		 ) sub
-		where numBaseFlagSet <> 1
-
-		select Count(*), 'Should be Zero - 0 Lib Docs, BaseFlag is 1' FROM #tmpUpdate TU
-		where numLibCP = 0
-		and BaseFlag = 1
-
-		--all Parents should have exactly 1 Baseflag=1 or BaseFlage = 2
-		select 'Should be No Records where not a BaseFlag 1 or 2' 
-		select NumNotBaseFlag12 = Count(*) 
-		FROM #tmpUpdate TU
-		Group by ParentContentID 
-		HAVING SUM(CASE WHEN BaseFlag in (1,2) THEN 1 ELSE 0 END) <> 1
-
-		select 'Should be No Records where with both a BaseFlag 1 and 2' 
-		select NumBothBaseFlag12 = Count(*) 
-		FROM #tmpUpdate TU
-		Group by ParentContentID 
-		HAVING SUM(BaseFlag) > 2
-
-  END 
-  --END TESTS--
-
---BaseFlag
--- 0 = a Cover Page that will be deleted
--- 1 = is base item (Cover Page will get renamed and applicability set to all)
--- 2 = would be base item but not linked to Lib document (Cover Page will get renamed and applicability set to all + will need linked to library doc)
-
-----Update config for Coverpage 1 to remove <MasterSlave Applicability="1" />
-----from that config
-----cover page 1s
- declare @Cont TABLE
- (
- 	ContentID int,
- 	ItemID int,
- 	xConfig xml
- )
- insert into @Cont
- SELECT tU.ContentID, ItemID, xConfig = CAST(tblContents.config AS xml) FROM 
- tblContents
- INNER JOIN 
- #tmpUpdate tU ON tU.ContentID = tblContents.ContentID
- where tU.BaseFlag > 0
- 
- if(@isTest = 1)
- BEGIN
- 	select WRD='Have Masterslave in xconfig', NumwithMasterSlave = Count(*) FROM @Cont CNT
- 	INNER JOIN 
- 	tblContents ON CNT.ContentID = tblContents.ContentID
- 	where CAST(xConfig AS varchar(max)) like '%MasterSlave%'
- END
- 
- Update @Cont Set  xConfig.modify('delete //MasterSlave') From @Cont;
- 
- if(@isTest = 1)
-  BEGIN
- 	select WRD='None should have Masterslave Removed in xconfig', NumwithMasterSlave = Count(*) FROM @Cont CNT
- 	INNER JOIN 
- 	tblContents ON CNT.ContentID = tblContents.ContentID
- 	where CAST(xConfig AS varchar(max)) like '%MasterSlave%'
-
-	select 'Show Records and how the ids will be re-linked'
-
-	Select tblItems.ItemID, tblItems.ContentID, tblItems.PreviousID, tblContents.Text,
-	PreviousItemID = tU.ItemID, PreviousContentID = tU.ContentID, PreviousText = tUCont.Text,
-	RelinkToItemID = IdToSwapTO.ItemID, RelinkToContentID = IdToSwapTO.ContentID, RelinkToText = IdToSwapTOCont.Text
-	FROM
-	tblItems
-	INNER JOIN
-	tblContents on tblContents.ContentID = tblItems.ContentID
-	INNER JOIN
-    #tmpUpdate tU ON tblItems.PreviousID = tU.ItemID AND tU.BaseFlag = 0
-	INNER JOIN
-	tblContents tUCont on tUCont.ContentID = tU.ContentID
- 	LEFT OUTER JOIN #tmpUpdate IdToSwapTO ON IdToSwapTO.ParentContentID = tU.ParentContentID AND IdToSwapTO.BaseFlag IN (1,2) 
-	LEFT OUTER JOIN tblContents IdToSwapTOCont on IdToSwapTOCont.ContentID = IdToSwapTO.ContentID
-
-  END
- ELSE
- BEGIN
- 	--Update Config for Contents and set Text = 'Cover Page'
- 	Update tblContents SET Text = 'Cover Page', Config = CAST(xConfig AS varchar(max)), 
- 	   DTS = GETDATE(), UserID = 'CPVolian2026'
- 	FROM 
- 	@Cont CNT INNER JOIN 
- 	tblContents ON CNT.ContentID = tblContents.ContentID;
- 
-    --Update items PreviousIds
-	UPDATE tblItems Set PreviousID = IdToSwapTO.ItemID
-	FROM
-	tblItems
-	INNER JOIN
-    #tmpUpdate tU ON tblItems.PreviousID = tU.ItemID AND tU.BaseFlag = 0
- 	INNER JOIN #tmpUpdate IdToSwapTO ON IdToSwapTO.ParentContentID = tU.ParentContentID AND IdToSwapTO.BaseFlag IN (1,2) 
-
- 	--delete where BaseFlag = 0 ---Items,Content,Entries, --set DeleteStatus = 1
- 	--these are ones that will be replaced by a library document
- 	UPDATE tblItems Set DeleteStatus = 1, DTS = GETDATE(), UserID = 'CPVolian2026'
- 	FROM
- 	#tmpUpdate tU INNER JOIN 
- 	tblItems ON tU.ContentID = tblItems.ContentID
- 	WHERE tU.BaseFlag = 0;
- 
- 	UPDATE tblContents Set DeleteStatus = 1, DTS = GETDATE(), UserID = 'CPVolian2026'
- 	FROM
- 	#tmpUpdate tU INNER JOIN 
- 	tblContents ON tU.ContentID = tblContents.ContentID
- 	WHERE tU.BaseFlag = 0;
-
- --delete entries where Baseflag = 2
- --create new entries where Baseflag = 2
- 
- 	DELETE FROM
-	tblEntries
-	FROM
-	tblEntries
-	INNER JOIN 
- 	#tmpUpdate tU ON tU.ContentID = tblEntries.ContentID
- 	WHERE tU.BaseFlag in (0,2);
- 
- 	INSERT INTO [dbo].[tblEntries]
- 			   ([ContentID]
- 			   ,[DocID]
- 			   ,[DTS]
- 			   ,[UserID]
- 			   ,[DeleteStatus])
- 	SELECT
- 		DISTINCT tU.ContentID,
- 		766,  -- docid 766 "Cover Page 1"
- 		GETDATE(),
- 		'CPVolian2026',
- 		0
- 	FROM
- 	#tmpUpdate tU 
- 	INNER JOIN 
- 	@Cont CNT ON tU.ContentID = CNT.ContentID
- 	WHERE tU.BaseFlag = 2;
- 
- END;
-
- drop table #tmpUpdate;
-
-
-
-
-
-
-
-
-
-
-
-

PROMS/VEPROMS User Interface/PROMSFixes.Sql

@@ -24329,10 +24329,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 +24355,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
@@ -24537,246 +24533,6 @@ 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 [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 +24566,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 = '02/06/2026 1:00 PM'
+	set @RevDescription = 'Updated Search Tool to better handle Cautions and Notes at the same level'
 
 	Select  cast(@RevDate as datetime) RevDate, @RevDescription  RevDescription
 	PRINT 'SQL Code Revision ' + @RevDate + ' - ' + @RevDescription

PROMS/VEPROMS User Interface/dlgApproveProcedure.cs

@@ -1135,7 +1135,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 +1207,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 +1234,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 +1253,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 +1311,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,33 +1319,25 @@ 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();
+					// Clear the change bar override for this procedure:
+					pi.ClearChangeBarOverrides();
 
 					//B2019-140 Change bars do not get refreshed when approval is run.
-					ProcedureInfo newproc;
+					ProcedureInfo newproc = ItemInfo.ResetProcedure(pi.ItemID);
 
-                    //// Refresh the StepPanel for the current Procedure
-                    //// so change bars update
-                    //// on any open StepPanel
-
-                    newproc = ItemInfo.ResetProcedure(pi.ItemID);
-
-					//B2026-019 Attempt to prevent an Access Error by utilizing a different Refresh if a Procedure is Open
+					//// Refresh the StepPanel for the current Procedure
+					//// so change bars update
+					//// on any open StepPanel
 					DisplayTabItem dti = MyFrmVEPROMS.GetTabContainingProcedure(pi.ItemID);
 					if (dti != null)
 					{
 						if (!dti.MyStepTabPanel.MyStepPanel.ContainsFocus)
 							dti.MyStepTabPanel.MyStepPanel.Focus();
 
-						dti.MyStepTabPanel.MyStepTabRibbon.RefreshProcedure();
-						Application.DoEvents();
-
+						foreach (EditItem eitm in dti.MyStepTabPanel.MyStepPanel.Controls.OfType<EditItem>())
+							eitm.ChangeBar = eitm.MyItemInfo.HasChangeBar;
 					}
 
 					//since in a separate form, need to update the tree view
@@ -1470,34 +1453,19 @@ namespace VEPROMS
 		{
 			ProcedureConfig pc = procedureInfo.MyConfig as ProcedureConfig;
 			if (pc == null) return;
-
-            pc.SelectedSlave = selectedSlave;
+			pc.SelectedSlave = selectedSlave;
 			pc.Print_Rev = revNumber;
 			//AppRevDate Change
 			pc.Print_RevDate = revDate.ToString("MM/dd/yyyy");
-			pc.Print_ChangeBarDate = dts.ToString("MM/dd/yyyy HH:mm:ss");  //this is needed to set the changebar date for an indeividual unit also
+			pc.Print_ChangeBarDate = dts.ToString("MM/dd/yyyy HH:mm:ss");
 			using (Item itm = Item.Get(procedureInfo.ItemID))
 			{
 				itm.MyContent.Config = pc.ToString();
 				//itm.DTS = dts;
 				itm.UserID = Volian.Base.Library.VlnSettings.UserID;
 				itm.Save();
-
-				//C2026-015 set overall change bar date
-				if (selectedSlave > 0)
-				{
-					pc.SelectedSlave = 0;
-					pc.Print_Rev = revNumber;
-					pc.Print_RevDate = revDate.ToString("MM/dd/yyyy");
-					pc.Print_ChangeBarDate = dts.ToString("MM/dd/yyyy HH:mm:ss");  //this is needed to set the changebar date for an indeividual unit also
-					using (Item itm2 = Item.Get(procedureInfo.ItemID))
-					{
-						itm2.MyContent.Config = pc.ToString();
-						itm2.UserID = Volian.Base.Library.VlnSettings.UserID;
-						itm2.Save();
-					}
-				}
 			}
+
 		}
 	}
 	public class RevType

PROMS/VEPROMS User Interface/dlgExportImport.cs

@@ -947,16 +947,14 @@ namespace VEPROMS
 						pi = AddProcedure(xd.DocumentElement, dvi, pi);
 						GC.Collect(); // need to cleanup memory after importing each procedure due to use of Regular Expressions in processing RO and Transition links
 					}
-					lblImportStatus.Text = "Updating Transitions";
-					AddTransitions();
-					FixFloatingFoldouts();
-					SaveTransitionAndItemContentIDs();
-					// B2026-034 remove the folders created from un-ziping the import set file - this was done prior to updating transitions
-					//           so if there was an issue deleting these temporay folders and files, the actual importing will be completed
 					DirectoryInfo di = new DirectoryInfo(PEIPath);
 					DirectoryInfo[] dis = di.GetDirectories();
 					for (int d = 0; d < dis.Length; d++)
 						dis[d].Delete(true);
+					lblImportStatus.Text = "Updating Transitions";
+					AddTransitions();
+					FixFloatingFoldouts();
+					SaveTransitionAndItemContentIDs();
 					return true;
 				}
 			}
@@ -1620,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/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,115 +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);
-
-            //CSM C2026-014 if multi-unit, set for each unit
-            System.Data.DataTable dt = RevisionData.GetRevisionDataByUnit(MyProcInfo.ItemID);
-            if (RevisionData.HasUnits(dt))
-            {
-                //Change the ChangeBarDate for each unit
-                foreach (DataRow r in dt.Rows)
-                {
-                    if (!r.IsNull("UnitID"))
-                    {
-                        MyProcConfig.SelectedSlave = Convert.ToInt32(r["UnitID"]);
-                        MyProcConfig.Print_ChangeBarDate = dateTimeInput1.Value.ToString("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}) for (Unit {r["UnitName"]})", DateTime.Now, VlnSettings.UserID, MyProcConfig.SelectedSlave);
-                    }
-                }
-                MyProcConfig.SelectedSlave = 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)
-                {
-                    if (!r.IsNull("UnitID"))
-                    {
-                        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)
-					{
-                        if (!r.IsNull("UnitID"))
-                        {
-                            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.Designer.cs

@@ -113,8 +113,6 @@
             this.lblAdmToolProgressType = new DevComponents.DotNetBar.LabelX();
             this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem();
             this.superTooltip1 = new DevComponents.DotNetBar.SuperTooltip();
-            this.swRegenWordAttmts = new DevComponents.DotNetBar.Controls.SwitchButton();
-            this.labelX1 = new DevComponents.DotNetBar.LabelX();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).BeginInit();
             this.splitContainer3.Panel1.SuspendLayout();
             this.splitContainer3.Panel2.SuspendLayout();
@@ -904,8 +902,6 @@
             // 
             // sideNavPanel2
             // 
-            this.sideNavPanel2.Controls.Add(this.swRegenWordAttmts);
-            this.sideNavPanel2.Controls.Add(this.labelX1);
             this.sideNavPanel2.Controls.Add(this.swRefreshTblsForSrch);
             this.sideNavPanel2.Controls.Add(this.lblRefreshTblForSrch);
             this.sideNavPanel2.Controls.Add(this.warningBox4);
@@ -934,11 +930,11 @@
             // 
             // 
             this.swRefreshTblsForSrch.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.swRefreshTblsForSrch.Location = new System.Drawing.Point(10, 178);
+            this.swRefreshTblsForSrch.Location = new System.Drawing.Point(10, 153);
             this.swRefreshTblsForSrch.Name = "swRefreshTblsForSrch";
             this.swRefreshTblsForSrch.Size = new System.Drawing.Size(91, 22);
             this.swRefreshTblsForSrch.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.superTooltip1.SetSuperTooltip(this.swRefreshTblsForSrch, new DevComponents.DotNetBar.SuperTooltipInfo("Refesh Tables For Search", "", resources.GetString("swRefreshTblsForSrch.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(300, 125)));
+            this.superTooltip1.SetSuperTooltip(this.swRefreshTblsForSrch, new DevComponents.DotNetBar.SuperTooltipInfo("Refresh Word Attachments", "", resources.GetString("swRefreshTblsForSrch.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(300, 200)));
             this.swRefreshTblsForSrch.SwitchClickTogglesValue = true;
             this.swRefreshTblsForSrch.TabIndex = 32;
             this.swRefreshTblsForSrch.Value = true;
@@ -953,10 +949,10 @@
             // 
             this.lblRefreshTblForSrch.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
             this.lblRefreshTblForSrch.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblRefreshTblForSrch.Location = new System.Drawing.Point(107, 178);
+            this.lblRefreshTblForSrch.Location = new System.Drawing.Point(107, 153);
             this.lblRefreshTblForSrch.Name = "lblRefreshTblForSrch";
             this.lblRefreshTblForSrch.Size = new System.Drawing.Size(186, 22);
-            this.superTooltip1.SetSuperTooltip(this.lblRefreshTblForSrch, new DevComponents.DotNetBar.SuperTooltipInfo("Refresh Tables For Search", "", resources.GetString("lblRefreshTblForSrch.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(300, 125)));
+            this.superTooltip1.SetSuperTooltip(this.lblRefreshTblForSrch, new DevComponents.DotNetBar.SuperTooltipInfo("Refresh Word Attachments", "", resources.GetString("lblRefreshTblForSrch.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(300, 200)));
             this.lblRefreshTblForSrch.TabIndex = 31;
             this.lblRefreshTblForSrch.Text = "Refresh Tables For Search";
             // 
@@ -965,7 +961,7 @@
             this.warningBox4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(196)))), ((int)(((byte)(219)))), ((int)(((byte)(249)))));
             this.warningBox4.CloseButtonVisible = false;
             this.warningBox4.Image = ((System.Drawing.Image)(resources.GetObject("warningBox4.Image")));
-            this.warningBox4.Location = new System.Drawing.Point(12, 287);
+            this.warningBox4.Location = new System.Drawing.Point(12, 264);
             this.warningBox4.Margin = new System.Windows.Forms.Padding(4);
             this.warningBox4.Name = "warningBox4";
             this.warningBox4.OptionsButtonVisible = false;
@@ -978,7 +974,7 @@
             this.warningBox2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(196)))), ((int)(((byte)(219)))), ((int)(((byte)(249)))));
             this.warningBox2.CloseButtonVisible = false;
             this.warningBox2.Image = ((System.Drawing.Image)(resources.GetObject("warningBox2.Image")));
-            this.warningBox2.Location = new System.Drawing.Point(12, 325);
+            this.warningBox2.Location = new System.Drawing.Point(12, 302);
             this.warningBox2.Margin = new System.Windows.Forms.Padding(4);
             this.warningBox2.Name = "warningBox2";
             this.warningBox2.OptionsButtonVisible = false;
@@ -1132,7 +1128,7 @@
             // line2
             // 
             this.line2.BackColor = System.Drawing.Color.Transparent;
-            this.line2.Location = new System.Drawing.Point(4, 260);
+            this.line2.Location = new System.Drawing.Point(4, 237);
             this.line2.Name = "line2";
             this.line2.Size = new System.Drawing.Size(281, 12);
             this.line2.TabIndex = 20;
@@ -1144,7 +1140,7 @@
             this.btnRunRepair.Checked = true;
             this.btnRunRepair.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
             this.btnRunRepair.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btnRunRepair.Location = new System.Drawing.Point(5, 221);
+            this.btnRunRepair.Location = new System.Drawing.Point(5, 198);
             this.btnRunRepair.Name = "btnRunRepair";
             this.btnRunRepair.Size = new System.Drawing.Size(280, 23);
             this.btnRunRepair.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -1307,38 +1303,6 @@
             this.superTooltip1.DefaultTooltipSettings = new DevComponents.DotNetBar.SuperTooltipInfo("", "", "", null, null, DevComponents.DotNetBar.eTooltipColor.Gray);
             this.superTooltip1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
             // 
-            // swRegenWordAttmts
-            // 
-            // 
-            // 
-            // 
-            this.swRegenWordAttmts.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.swRegenWordAttmts.Location = new System.Drawing.Point(10, 150);
-            this.swRegenWordAttmts.Name = "swRegenWordAttmts";
-            this.swRegenWordAttmts.Size = new System.Drawing.Size(91, 22);
-            this.swRegenWordAttmts.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.superTooltip1.SetSuperTooltip(this.swRegenWordAttmts, new DevComponents.DotNetBar.SuperTooltipInfo("Generate Word Attachments", "", resources.GetString("swRegenWordAttmts.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(300, 250)));
-            this.swRegenWordAttmts.SwitchClickTogglesValue = true;
-            this.swRegenWordAttmts.TabIndex = 34;
-            this.swRegenWordAttmts.Value = true;
-            this.swRegenWordAttmts.ValueObject = "Y";
-            this.swRegenWordAttmts.ValueChanged += new System.EventHandler(this.swCk_ValueChanged);
-            // 
-            // labelX1
-            // 
-            this.labelX1.BackColor = System.Drawing.Color.Transparent;
-            // 
-            // 
-            // 
-            this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.labelX1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.labelX1.Location = new System.Drawing.Point(107, 150);
-            this.labelX1.Name = "labelX1";
-            this.labelX1.Size = new System.Drawing.Size(186, 22);
-            this.superTooltip1.SetSuperTooltip(this.labelX1, new DevComponents.DotNetBar.SuperTooltipInfo("Generate Word Attachments", "", resources.GetString("labelX1.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(300, 250)));
-            this.labelX1.TabIndex = 33;
-            this.labelX1.Text = "Generate Missing Word Attachments";
-            // 
             // frmBatchRefresh
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -1466,8 +1430,6 @@
         private DevComponents.DotNetBar.PanelEx itemPanel2;
         private DevComponents.DotNetBar.PanelEx itemPanel3;
         private DevComponents.DotNetBar.ButtonX btnROsNotUsed;
-        private DevComponents.DotNetBar.Controls.SwitchButton swRegenWordAttmts;
-        private DevComponents.DotNetBar.LabelX labelX1;
     }
 }
 

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
@@ -650,111 +648,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;
@@ -1407,8 +1305,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 +1323,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 +1487,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();

PROMS/VEPROMS User Interface/frmBatchRefresh.resx

@@ -117,30 +117,108 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.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">
-    <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).
+  <data name="btnPurgeChange.Tooltip" xml:space="preserve">
+    <value>Purges all audit information and change history older than the above date.  
+It is recommended that you perform a database backup before performing this action. 
+Note after purging the information, this will automatically perform the Index 
+Maintenance function to realign indexes with the cut down audit data.
+Only Full PROMS Administrator Users can perform this action.</value>
+  </data>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="warningBox3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAp5JREFUOE+F
+        k11Ik1Ecxv9zouJ2E4TWnR8V5tAppJmYsLnNlaLTxAoiKIQiibpYSmEEmSSa0IVGISMUw7rpE+yiQiuk
+        /IhROssPyjanpL4udeq29z3nCdcH+Wb1g+fq/zzP+R8Oh+gvPK4kNWujp1IrPek8S5Hy+X9hbXSN9aVC
+        eq1FwEYN8vk/mWqiDPZwI+NOHbhLj8CdDaK7npLlvnWpO0AKqZV62YgO/GMquDMN0rAevkbqlHvXZdlG
+        h6Rn8eATu4GJncB0Fvh8HnwPYuGpJ4vcvwZbGYWJrcpPzGXG8ngGtsZFQJOggrS0B9J0MbwNIR9uHqRQ
+        ee4XPhuVSy814IIB/lk9QkIIanUomFgIzkux0qHB/CUqk+eCtB2jCLEl1M1mLcBSLthKHlQqJaKjw8FZ
+        Mbi/ENKXEizUKD/f2k9h8jz5mumk2K0F9xUAUgE4K0JUVDji4yLBvflgMyYwlxFL9zSYq6ITa8I3DlNY
+        wKZ0soVSgFkAXgwuFSEmJhJJiWqwCR3YSCbY2x0QB4zwnFc6W4p+22KxiY4EXiQF74kf6/L5vdi+TYV0
+        rRpsMB2sPxWsRwvpTTq87QmYOUNHg+HqQlL4ryscbK4UPGD5vu60CWw8G7evbkN7bSykXm0w/FMBew6E
+        CsXQFQMpaLKezP6OLeDL+8AFM5hLBzaciennKcFXUCgI7o7ENQWSfRcWmmPgPEW5tNJIj8QxM9hkDthY
+        FthAGlh/SvAPXC7fjOrjmyC+Sl5TsCpfdzYEK92llUbllDiaD3HEDPG9CaLDCGnI9IdEhwnioBHiOwMC
+        dj38fYbVglHy1FGJt57uL9ZS10IN9cxfJPvXCzTgqSKH5xwNzVXSkFBBDsFKA4KV7IKVegQrda2e7j5N
+        ud8AKwnMnBpmYFAAAAAASUVORK5CYII=
 </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).
+  <data name="warningBox6.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAp5JREFUOE+F
+        k11Ik1Ecxv9zouJ2E4TWnR8V5tAppJmYsLnNlaLTxAoiKIQiibpYSmEEmSSa0IVGISMUw7rpE+yiQiuk
+        /IhROssPyjanpL4udeq29z3nCdcH+Wb1g+fq/zzP+R8Oh+gvPK4kNWujp1IrPek8S5Hy+X9hbXSN9aVC
+        eq1FwEYN8vk/mWqiDPZwI+NOHbhLj8CdDaK7npLlvnWpO0AKqZV62YgO/GMquDMN0rAevkbqlHvXZdlG
+        h6Rn8eATu4GJncB0Fvh8HnwPYuGpJ4vcvwZbGYWJrcpPzGXG8ngGtsZFQJOggrS0B9J0MbwNIR9uHqRQ
+        ee4XPhuVSy814IIB/lk9QkIIanUomFgIzkux0qHB/CUqk+eCtB2jCLEl1M1mLcBSLthKHlQqJaKjw8FZ
+        Mbi/ENKXEizUKD/f2k9h8jz5mumk2K0F9xUAUgE4K0JUVDji4yLBvflgMyYwlxFL9zSYq6ITa8I3DlNY
+        wKZ0soVSgFkAXgwuFSEmJhJJiWqwCR3YSCbY2x0QB4zwnFc6W4p+22KxiY4EXiQF74kf6/L5vdi+TYV0
+        rRpsMB2sPxWsRwvpTTq87QmYOUNHg+HqQlL4ryscbK4UPGD5vu60CWw8G7evbkN7bSykXm0w/FMBew6E
+        CsXQFQMpaLKezP6OLeDL+8AFM5hLBzaciennKcFXUCgI7o7ENQWSfRcWmmPgPEW5tNJIj8QxM9hkDthY
+        FthAGlh/SvAPXC7fjOrjmyC+Sl5TsCpfdzYEK92llUbllDiaD3HEDPG9CaLDCGnI9IdEhwnioBHiOwMC
+        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="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing">
+    <value>17, 17</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="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" />
   <data name="warningBox4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAp5JREFUOE+F
@@ -183,7 +261,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 +280,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,53 +302,6 @@ 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="btnPurgeChange.Tooltip" xml:space="preserve">
-    <value>Purges all audit information and change history older than the above date.  
-It is recommended that you perform a database backup before performing this action. 
-Note after purging the information, this will automatically perform the Index 
-Maintenance function to realign indexes with the cut down audit data.
-Only Full PROMS Administrator Users can perform this action.</value>
-  </data>
-  <data name="warningBox3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAp5JREFUOE+F
-        k11Ik1Ecxv9zouJ2E4TWnR8V5tAppJmYsLnNlaLTxAoiKIQiibpYSmEEmSSa0IVGISMUw7rpE+yiQiuk
-        /IhROssPyjanpL4udeq29z3nCdcH+Wb1g+fq/zzP+R8Oh+gvPK4kNWujp1IrPek8S5Hy+X9hbXSN9aVC
-        eq1FwEYN8vk/mWqiDPZwI+NOHbhLj8CdDaK7npLlvnWpO0AKqZV62YgO/GMquDMN0rAevkbqlHvXZdlG
-        h6Rn8eATu4GJncB0Fvh8HnwPYuGpJ4vcvwZbGYWJrcpPzGXG8ngGtsZFQJOggrS0B9J0MbwNIR9uHqRQ
-        ee4XPhuVSy814IIB/lk9QkIIanUomFgIzkux0qHB/CUqk+eCtB2jCLEl1M1mLcBSLthKHlQqJaKjw8FZ
-        Mbi/ENKXEizUKD/f2k9h8jz5mumk2K0F9xUAUgE4K0JUVDji4yLBvflgMyYwlxFL9zSYq6ITa8I3DlNY
-        wKZ0soVSgFkAXgwuFSEmJhJJiWqwCR3YSCbY2x0QB4zwnFc6W4p+22KxiY4EXiQF74kf6/L5vdi+TYV0
-        rRpsMB2sPxWsRwvpTTq87QmYOUNHg+HqQlL4ryscbK4UPGD5vu60CWw8G7evbkN7bSykXm0w/FMBew6E
-        CsXQFQMpaLKezP6OLeDL+8AFM5hLBzaciennKcFXUCgI7o7ENQWSfRcWmmPgPEW5tNJIj8QxM9hkDthY
-        FthAGlh/SvAPXC7fjOrjmyC+Sl5TsCpfdzYEK92llUbllDiaD3HEDPG9CaLDCGnI9IdEhwnioBHiOwMC
-        dj38fYbVglHy1FGJt57uL9ZS10IN9cxfJPvXCzTgqSKH5xwNzVXSkFBBDsFKA4KV7IKVegQrda2e7j5N
-        ud8AKwnMnBpmYFAAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="warningBox6.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAp5JREFUOE+F
-        k11Ik1Ecxv9zouJ2E4TWnR8V5tAppJmYsLnNlaLTxAoiKIQiibpYSmEEmSSa0IVGISMUw7rpE+yiQiuk
-        /IhROssPyjanpL4udeq29z3nCdcH+Wb1g+fq/zzP+R8Oh+gvPK4kNWujp1IrPek8S5Hy+X9hbXSN9aVC
-        eq1FwEYN8vk/mWqiDPZwI+NOHbhLj8CdDaK7npLlvnWpO0AKqZV62YgO/GMquDMN0rAevkbqlHvXZdlG
-        h6Rn8eATu4GJncB0Fvh8HnwPYuGpJ4vcvwZbGYWJrcpPzGXG8ngGtsZFQJOggrS0B9J0MbwNIR9uHqRQ
-        ee4XPhuVSy814IIB/lk9QkIIanUomFgIzkux0qHB/CUqk+eCtB2jCLEl1M1mLcBSLthKHlQqJaKjw8FZ
-        Mbi/ENKXEizUKD/f2k9h8jz5mumk2K0F9xUAUgE4K0JUVDji4yLBvflgMyYwlxFL9zSYq6ITa8I3DlNY
-        wKZ0soVSgFkAXgwuFSEmJhJJiWqwCR3YSCbY2x0QB4zwnFc6W4p+22KxiY4EXiQF74kf6/L5vdi+TYV0
-        rRpsMB2sPxWsRwvpTTq87QmYOUNHg+HqQlL4ryscbK4UPGD5vu60CWw8G7evbkN7bSykXm0w/FMBew6E
-        CsXQFQMpaLKezP6OLeDL+8AFM5hLBzaciennKcFXUCgI7o7ENQWSfRcWmmPgPEW5tNJIj8QxM9hkDthY
-        FthAGlh/SvAPXC7fjOrjmyC+Sl5TsCpfdzYEK92llUbllDiaD3HEDPG9CaLDCGnI9IdEhwnioBHiOwMC
-        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.
@@ -357,46 +388,8 @@ If more than one procedure is selected, it is recommended that this be performed
         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">
+  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="$this.TrayHeight" type="System.Int32, mscorlib">
     <value>25</value>
-  </metadata>
+  </data>
 </root>

PROMS/VEPROMS User Interface/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

@@ -83,6 +83,7 @@ namespace VEPROMS
 			this.lblUser = new DevComponents.DotNetBar.LabelItem();
 			this.lblLastChange = new DevComponents.DotNetBar.LabelItem();
 			this.btnStepRTF = new DevComponents.DotNetBar.ButtonItem();
+			this.btnFixMSWord = new DevComponents.DotNetBar.ButtonItem();
 			this.epAnnotations = new DevComponents.DotNetBar.ExpandablePanel();
 			this.ctrlAnnotationDetails = new Volian.Controls.Library.AnnotationDetails();
 			this.btnAnnoDetailsPushPin = new DevComponents.DotNetBar.ButtonX();
@@ -540,7 +541,8 @@ namespace VEPROMS
 			this.btnEditItem,
 			this.lblUser,
 			this.lblLastChange,
-			this.btnStepRTF});
+			this.btnStepRTF,
+			this.btnFixMSWord});
 			this.bottomBar.Location = new System.Drawing.Point(5, 573);
 			this.bottomBar.Name = "bottomBar";
 			this.bottomBar.Size = new System.Drawing.Size(1185, 25);
@@ -726,6 +728,14 @@ namespace VEPROMS
 			this.btnStepRTF.Text = "Step RTF";
 			this.btnStepRTF.Click += new System.EventHandler(this.btnStepRTF_Click);
 			// 
+			// btnFixMSWord
+			// 
+			this.btnFixMSWord.ForeColor = System.Drawing.Color.Black;
+			this.btnFixMSWord.Name = "btnFixMSWord";
+			this.btnFixMSWord.Text = "Fix Symbol Fonts";
+			this.btnFixMSWord.Visible = false;
+			this.btnFixMSWord.Click += new System.EventHandler(this.btnFixMSWord_Click);
+			// 
 			// epAnnotations
 			// 
 			this.epAnnotations.CanvasColor = System.Drawing.SystemColors.Control;
@@ -867,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;
@@ -1765,6 +1775,7 @@ namespace VEPROMS
 		private DevComponents.DotNetBar.ButtonItem btnItemInfo;
 		private DevComponents.DotNetBar.ButtonItem btnFilter;
 		private DevComponents.DotNetBar.TextBoxItem txtFilter;
+		private DevComponents.DotNetBar.ButtonItem btnFixMSWord;
 		private Volian.Controls.Library.DisplayBookMarks displayBookMarks;
 		//private DevComponents.DotNetBar.LabelItem lblLocked;
 		private DevComponents.DotNetBar.ButtonItem btnShortCuts;

PROMS/VEPROMS User Interface/frmVEPROMS.cs

@@ -234,7 +234,7 @@ namespace VEPROMS
 			System.Threading.Thread.CurrentThread.CurrentCulture = new System.Globalization.CultureInfo("en-US");
 			displayRO.TabControl = tc; // B2019-043 this was being passed in as a parameter for DisplayRO which caused issues with the Visual Studio designer
 
-            SetupFolder(MyDocVersion.FolderID);
+			SetupFolder(MyDocVersion.FolderID);
 			tc.MySessionInfo = MyParent.MySessionInfo;
 			displaySearch1.TopFolderID = myDocVersion.FolderID;
 			SelectedDVI = myDocVersion;
@@ -617,7 +617,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))
@@ -626,26 +626,21 @@ namespace VEPROMS
 					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)
-					{
+					//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
+					DisplayTabItem dti = GetTabContainingProcedure(pi.ItemID);
+                    if (dti != null)
+                    {
                         if (!dti.MyStepTabPanel.MyStepPanel.ContainsFocus)
-							dti.MyStepTabPanel.MyStepPanel.Focus();
+                            dti.MyStepTabPanel.MyStepPanel.Focus();
 
 						foreach (EditItem eitm in dti.MyStepTabPanel.MyStepPanel.Controls.OfType<EditItem>())
-						{
 							eitm.ChangeBar = eitm.MyItemInfo.HasChangeBar;
-						}
 					}
 				}
 			}
@@ -1578,13 +1573,13 @@ namespace VEPROMS
 						}
 						else
 						{
-                            SelectedROFst = myDTP.MyDisplayTabItem.MyItemInfo.MyDocVersion.DocVersionAssociations[0].MyROFst;
+							SelectedROFst = myDTP.MyDisplayTabItem.MyItemInfo.MyDocVersion.DocVersionAssociations[0].MyROFst;
 						}
 					}
 				}
 				else if (tc.MyEditItem != null && displayRO.MyROFST != null && tc.MyEditItem.MyItemInfo.MyDocVersion.DocVersionAssociations[0].ROFstID != displayRO.MyROFST.ROFstID)
 				{
-                    SelectedROFst = tc.MyEditItem.MyItemInfo.MyDocVersion.DocVersionAssociations[0].MyROFst;
+					SelectedROFst = tc.MyEditItem.MyItemInfo.MyDocVersion.DocVersionAssociations[0].MyROFst;
 				}
 
 				// need this to update RO Tree after UpdateRofst (B2015-226)
@@ -1592,9 +1587,9 @@ namespace VEPROMS
 				if (displayRO.MyROFST != SelectedROFst)
 				{
 					displayRO.MyROFST = SelectedROFst;
-                    // B2023-021: force Load of Step Prop/RO panel RO tree by passing in
-                    //   true to LoadTree
-                    displayRO.LoadTree(true);
+					// B2023-021: force Load of Step Prop/RO panel RO tree by passing in
+					//   true to LoadTree
+					displayRO.LoadTree(true);
 				}
 			}
 
@@ -2396,8 +2391,8 @@ namespace VEPROMS
 			tv.MyUserInfo = MyUserInfo;
 			StepTabRibbon.MySessionInfo = MySessionInfo;
 
-            // Initialize Caption with Server name and Database name.
-            SetCaption(tv.TopNode as VETreeNode);
+			// Initialize Caption with Server name and Database name.
+			SetCaption(tv.TopNode as VETreeNode);
 			System.Threading.AutoResetEvent autoEvent = new System.Threading.AutoResetEvent(false);
 
 			//System.Threading.TimerCallback timerDelegate = new System.Threading.TimerCallback(MySessionInfo.PingSession);
@@ -4552,8 +4547,8 @@ namespace VEPROMS
 
 			SetCaption(tv.SelectedNode as VETreeNode);
 			displayApplicability.MyDisplayTabItem = tc.SelectedDisplayTabItem;
-
-            if (tc.SelectedDisplayTabItem.MyItemInfo.MyDocVersion.DocVersionAssociationCount > 0)
+			
+			if (tc.SelectedDisplayTabItem.MyItemInfo.MyDocVersion.DocVersionAssociationCount > 0)
 			{
 				displayRO.MyROFST = tc.SelectedDisplayTabItem.MyItemInfo.MyDocVersion.DocVersionAssociations[0].MyROFst;
 			}
@@ -4628,6 +4623,8 @@ namespace VEPROMS
 			if (args != null && args.MyEditItem != null && !args.MyEditItem.MyStepPanel.ContainsFocus)
 				return;
 
+			btnFixMSWord.Visible = (args != null && (args.MyItemInfo != null && args.MyEditItem == null));
+
 			if (_LastStepRTB != null && !_LastStepRTB.Disposing && !_LastStepRTB.Closed)
 				_LastStepRTB.EditModeChanged -= new StepRTBEvent(_LastStepRTB_EditModeChanged);
 
@@ -4765,9 +4762,9 @@ namespace VEPROMS
 					// B2022-026 RO Memory reduction coding (Jakes Merge)
 					displayRO.ProgressBar = bottomProgBar;
 					displayRO.MyRTB = args.MyEditItem.MyStepRTB;
-					displayRO.LoadTree();
+					displayRO.LoadTree(); 
 
-                    displayBookMarks.MyEditItem = args.MyEditItem;
+					displayBookMarks.MyEditItem = args.MyEditItem;
 					displayHistory.MyEditItem = args.MyEditItem;
 
 					lblEditView.Text = args.MyEditItem.MyStepPanel.VwMode == E_ViewMode.Edit ? "Edit" : "View";
@@ -4930,7 +4927,7 @@ namespace VEPROMS
 
 			// B2022-026 RO Memory reduction coding (Jakes Merge)
 			displayRO.LoadTree();
-        }
+		}
 
 		#endregion
 
@@ -5239,6 +5236,19 @@ namespace VEPROMS
 				Clipboard.SetDataObject(mydo);
 			}
 		}
+		private void btnFixMSWord_Click(object sender, EventArgs e)
+		{
+			if (tc.SelectedDisplayTabItem != null && tc.SelectedDisplayTabItem.MyDSOTabPanel != null)
+			{
+				string btnText = btnFixMSWord.Text;
+				btnFixMSWord.FixedSize = btnFixMSWord.Size;
+				btnFixMSWord.Text = "Processing  ...";
+				this.Cursor = Cursors.WaitCursor;
+				tc.SelectedDisplayTabItem.MyDSOTabPanel.FixSymbolCharacters();
+				btnFixMSWord.Text = btnText;
+				this.Cursor = Cursors.Default;
+			}
+		}
 
 		private void epAnnotations_Resize(object sender, EventArgs e)
 		{

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))
@@ -2164,7 +2162,7 @@ namespace VEPROMS.CSLA.Library
 				return s2;
 
 			s2 = s2.Replace(@"\u160?", "<HSP>");        // convert hard spaces bug fix:  B2016-206
-			s2 = Regex.Replace(s2, @"\\(?!u)", @"\u9586?"); // convert backslashes to a backslash symbol
+			s2 = s2.Replace(@"\", @"\u9586?");          // convert backslashes to a backslash symbol
 			s2 = s2.Replace("<HSP>", @"\u160?");        // convert hard spaces bug fix:  B2016-206
 			s2 = s2.Replace("`", @"\'b0");              // convert backquote to degree - left over from DOS days.
 			s2 = s2.Replace("\xf8", @"\'b0");           // convert \xf8 to degree.

PROMS/VEPROMS.CSLA.Library/Extension/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;
@@ -1476,22 +1482,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/ItemExt.cs

@@ -3839,17 +3839,9 @@ namespace VEPROMS.CSLA.Library
 			_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)
+		//B2019-140 Change bars do not get refreshed when approval is run.
+		// Reset a Procedure and sub items in the cache
+		public static ProcedureInfo ResetProcedure(int procID)
 		{
 			// The following lines reload the procedure info cache
 			ProcedureInfo newproc = ProcedureInfo.Get(procID, true);
@@ -3867,27 +3859,26 @@ namespace VEPROMS.CSLA.Library
 			ItemInfo newprocitem = Get(procID, true);
 			newprocitem.RefreshConfig();
 
-            //Reload all the child/sub items
+			//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();
+			//otherwise will get a "Collection was modified; enumeration operation may not execute" error
+			List<int> itemIDs = _CacheByPrimaryKey.Values.ToList().SelectMany(y => y).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]);
-            }
+			{
+				ResetParts(itemIDs[index]);
+			}
 
-            //reset the procedure config for all items attached to current procedure
+			//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();
+			//otherwise will get a "Collection was modified; enumeration operation may not execute" error
+			List<ItemInfo> pconfigrefresh_items = _CacheByPrimaryKey.Values.ToList().SelectMany(y => y).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++)
+			for (int index = 0; index < pconfigrefresh_items.Count; index++)
             {
-                pconfigrefresh_items[index].MyProcedure = newproc;
+				pconfigrefresh_items[index].MyProcedure = newproc;
             }
 
-
             //return the changed procedure info
             return newproc;
 		}
@@ -4054,7 +4045,7 @@ namespace VEPROMS.CSLA.Library
 				// date). Print_ViewableAfterChangeBarDate was created to get only that user specified date, if it exists.  If it does exist, we compare
 				// that with the Content datetime, otherwise we proceed as before.
 				DateTime? viewableStartingDateTime = (MyProcedure.MyConfig as ProcedureConfig).Print_ViewableStartingChangeBarDate;
-				if (viewableStartingDateTime != null && viewableStartingDateTime > MyProcedure.ChangeBarDate && (MyProcedure.MyConfig as ProcedureConfig).SelectedSlave == 0)
+				if (viewableStartingDateTime != null && viewableStartingDateTime > MyProcedure.ChangeBarDate)
 					return (MyContent.DTS > viewableStartingDateTime);
 				return (MyContent.DTS > MyProcedure.ChangeBarDate);
 			}
@@ -6215,13 +6206,8 @@ namespace VEPROMS.CSLA.Library
 			if (!SectionHasCheckOffs()) return null;
 			int stpCoIndx = CheckOffIndex();		// this step has a checkoff defined
 			if (stpCoIndx == -1) return null;
-            //B2026-040 - Signoff/Checkoffs not printing unless set to Section Default
-            if (stpCoIndx > 1)
-            {
-                return ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffData.CheckOffList[stpCoIndx];        // DO override of CheckOffList[]	
-            }
 
-            int sectCoIndx = SectionDefaultCheckOffIndex();  // no checkoff on step, see if there is a section default.
+			int sectCoIndx = SectionDefaultCheckOffIndex();  // no checkoff on step, see if there is a section default.
 			if (sectCoIndx == -1) return null;
 			if ((ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffData.CheckOffOnHLSOnly && IsHigh)
 				|| (!ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffData.CheckOffOnHLSOnly && IsLowestLevelStep && stpCheckOff)) // && !RNOsHighHasCheckOff()))

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/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/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,8 @@
     <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/AnnotationDetails.cs

@@ -1,17 +1,16 @@
-using JR.Utils.GUI.Forms;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Data;
-using System.Diagnostics;
 using System.Drawing;
+using System.Data;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Windows.Forms;
-using System.Xml;
 using VEPROMS.CSLA.Library;
 using Volian.Base.Library;
 using Volian.Pipe.Library;
+using System.Xml;
+using System.Diagnostics;
+using JR.Utils.GUI.Forms;
 
 namespace Volian.Controls.Library
 {
@@ -221,10 +220,7 @@ namespace Volian.Controls.Library
 			{
 				if (!DesignMode) // B2019-043 need to check if we are just saving changes to the user interface
 				{
-					if (value != null)
-					{
-						rtxbComment.Text = Regex.Replace(value, @"\\u([0-9]{1,4})\?", m => Convert.ToChar(int.Parse(m.Groups[1].Value)).ToString());
-					}
+					rtxbComment.Text = value;
 					if (rtxbComment.Text != string.Empty)
 						rtxbComment.SelectionStart = rtxbComment.TextLength; // position cursor to end of text
 				}

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

@@ -31,32 +31,25 @@
             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.Location = new System.Drawing.Point(12, 99);
             this.btn1.Name = "btn1";
-            this.btn1.Size = new System.Drawing.Size(60, 20);
+            this.btn1.Size = new System.Drawing.Size(75, 23);
             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.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | 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.Location = new System.Drawing.Point(322, 99);
             this.btn2.Name = "btn2";
-            this.btn2.Size = new System.Drawing.Size(60, 20);
+            this.btn2.Size = new System.Drawing.Size(75, 23);
             this.btn2.TabIndex = 1;
             this.btn2.UseVisualStyleBackColor = true;
             this.btn2.Click += new System.EventHandler(this.Btn2_Click);
@@ -64,48 +57,24 @@
             // 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.Location = new System.Drawing.Point(33, 41);
             this.lblMessage.Name = "lblMessage";
-            this.lblMessage.Size = new System.Drawing.Size(391, 84);
+            this.lblMessage.Size = new System.Drawing.Size(0, 13);
             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.Controls.Add(this.lblMessage);
+            this.Controls.Add(this.btn2);
+            this.Controls.Add(this.btn1);
             this.Name = "CustomMessageBox";
             this.ShowIcon = false;
             this.Text = "CustomMessageBox";
-            this.tableLP1.ResumeLayout(false);
-            this.tableLP1.PerformLayout();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -116,6 +85,5 @@
         private System.Windows.Forms.Button btn1;
         private System.Windows.Forms.Button btn2;
         private System.Windows.Forms.Label lblMessage;
-        private System.Windows.Forms.TableLayoutPanel tableLP1;
     }
 }

PROMS/Volian.Controls.Library/CustomMessageBox.cs

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

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

@@ -1,6 +1,3 @@
-using System.Security.Cryptography;
-using VEPROMS.CSLA.Library;
-
 namespace Volian.Controls.Library
 {
 	partial class DisplayApplicability
@@ -33,40 +30,19 @@ namespace Volian.Controls.Library
 		{
 			this.gpMode = new DevComponents.DotNetBar.Controls.GroupPanel();
 			this.gpItem = new DevComponents.DotNetBar.Controls.GroupPanel();
-			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(90, 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(87, 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("Set All at Level", "", "When clicked, all steps at that level of the current step will be set to the selected applicability.  Note that the Set All at Level button is disabled for RNO step types unless they are substeps off of a RNO step.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); // C2026-034 fix tool tip text.
-			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);
 			// 
 			// 
 			// 
@@ -82,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;
@@ -90,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";
@@ -104,13 +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.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(0, 20, 0, 0);
-			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);
 			// 
 			// 
 			// 
@@ -126,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;
@@ -134,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();
 
 		}
 
@@ -166,9 +139,6 @@ namespace Volian.Controls.Library
 
 		private DevComponents.DotNetBar.Controls.GroupPanel gpMode;
 		private DevComponents.DotNetBar.Controls.GroupPanel gpItem;
-		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
 {
@@ -21,24 +19,20 @@ namespace Volian.Controls.Library
 			if (ApplicabilityViewModeChanged != null)
 				ApplicabilityViewModeChanged(this, new EventArgs());
 		}
-		
 		private DisplayTabItem _MyDisplayTabItem = null;
 		public DisplayTabItem MyDisplayTabItem
 		{
 			get { return _MyDisplayTabItem; }
 			set
 			{
-				 if (DesignMode) return; // B2019-043 need to check if we are just saving changes to the user interface
+				if (DesignMode) return; // B2019-043 need to check if we are just saving changes to the user interface
 				_MyDisplayTabItem = value;
 				gpMode.Controls.Clear();
 				gpItem.Controls.Clear();
 				MyCheckBoxes.Clear();
 				if (_MyDisplayTabItem != null)
 				{
-						//B2026-043 Fix "Set All At Level" button.
-					DevComponents.DotNetBar.Controls.GroupPanel gpSubItem =  InitializegpSubItem();
-
-						DocVersionConfig dcfg = _MyDisplayTabItem.MyItemInfo.MyDocVersion.MyConfig as DocVersionConfig;
+					DocVersionConfig dcfg = _MyDisplayTabItem.MyItemInfo.MyDocVersion.MyConfig as DocVersionConfig;
 					List<string> names = new List<string>();
 					for (int n = 1; n <= dcfg.Unit_Count; n++)
 					{
@@ -46,7 +40,7 @@ namespace Volian.Controls.Library
 						names.Add(dcfg.Unit_Name);
 					}
 					dcfg.SelectedSlave = 0;
-					//					string[] names = dcfg.Unit_Name.Split(',');
+//					string[] names = dcfg.Unit_Name.Split(',');
 					int apple = -1;
 					if(_MyDisplayTabItem.MyStepTabPanel != null)
 						apple = _MyDisplayTabItem.MyStepTabPanel.MyStepPanel.ApplDisplayMode;
@@ -57,24 +51,15 @@ namespace Volian.Controls.Library
 						i++;
 						AddViewMode(name.Trim(), i.ToString(), apple == i);
 					}
-
-					AddItemMode("All", "-1", ref gpSubItem);
+					AddItemMode("All", "-1");
 					i = 0;
 					foreach (string name in names)
-						AddItemMode(name.Trim(), (++i).ToString(), ref gpSubItem);
-					AddItemMode("None", "0", ref gpSubItem);
-					gpItem.Controls.Add(gpSubItem);						
-					gpSubItem.BringToFront();
-					gpItem.Controls.Add(btnApplicabilitychg);
-					btnApplicabilitychg.BringToFront();
+						AddItemMode(name.Trim(), (++i).ToString());
+					AddItemMode("None", "0");
 					if (_MyDisplayTabItem.MyStepTabPanel != null)
-					{
 						MyItemInfo = _MyDisplayTabItem.MyStepTabPanel.MyStepPanel.SelectedItemInfo;
-					}
 					else
-					{
 						MyItemInfo = _MyDisplayTabItem.MyItemInfo;
-					}
 				}
 			}
 		}
@@ -91,37 +76,6 @@ namespace Volian.Controls.Library
 				return 0;
 			}
 		}
-		private DevComponents.DotNetBar.Controls.GroupPanel InitializegpSubItem() //B2026-043 Fix "Set All At Level" button.
-		{
-			DevComponents.DotNetBar.Controls.GroupPanel gpSubItem;
-			gpSubItem = new DevComponents.DotNetBar.Controls.GroupPanel
-			{
-				//
-				// gpSubItem
-				//
-				AutoSize = true,
-				AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink,
-				CanvasColor = System.Drawing.SystemColors.Control,
-				ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007,
-				DisabledBackColor = System.Drawing.Color.Empty,
-				Dock = System.Windows.Forms.DockStyle.Top,
-				Location = new System.Drawing.Point(0, 49),
-				Margin = new System.Windows.Forms.Padding(4),
-				Name = "gpSubItem",
-				Padding = new System.Windows.Forms.Padding(13, 12, 13, 37)
-			};
-			gpSubItem.BackColor = Color.Transparent;
-			gpSubItem.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
-			gpSubItem.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
-			gpSubItem.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
-			gpSubItem.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			gpSubItem.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			gpSubItem.TabIndex = 1;
-			gpSubItem.Text = "";
-			gpSubItem.Location = new System.Drawing.Point(0, 49);
-			gpSubItem.Size = new System.Drawing.Size(400, 250);
-			return gpSubItem;
-		}
 		private Dictionary<int, CheckBox> MyCheckBoxes = new Dictionary<int, CheckBox>();
 		private string _MyApplicability = string.Empty;
 		public string MyApplicability
@@ -165,25 +119,20 @@ namespace Volian.Controls.Library
 			//  }
 			//}
 		//}
-		private void AddItemMode(string name, string value, ref DevComponents.DotNetBar.Controls.GroupPanel gpSubItem)
+		private void AddItemMode(string name, string value)
 		{
 			CheckBox cb = new CheckBox();
 			cb.BackColor = Color.Transparent;
-			cb.Height = 24;
-			cb.Width = 75;
-			cb.AutoSize = true;
 			cb.Text = name;
 			cb.Tag = value;
 			cb.Dock = DockStyle.Top;
-			gpSubItem.Controls.Add(cb);
+			gpItem.Controls.Add(cb);
 			cb.BringToFront();
 			cb.CheckedChanged += new EventHandler(cb_CheckedChanged);
 			MyCheckBoxes.Add(value == null ? -1 : int.Parse(value), cb);
 		}
 		private void cb_CheckedChanged(object sender, EventArgs e)
 		{
-			EditItem ei = MyDisplayTabItem.MyStepTabPanel.SelectedEditItem;
-			ei.SaveCurrentAndContents();  // C2026-035 save unsaved step text.
 			UnwireCheckboxes(false);
 			CheckBox cb = sender as CheckBox;
 			CheckState cs = cb.CheckState;
@@ -226,8 +175,7 @@ namespace Volian.Controls.Library
 					}
 					break;
 			}
-
-		WireCheckboxes();
+			WireCheckboxes();
 			MyApplicability = string.Empty;
 			string sep = string.Empty;
 			foreach (int i in MyCheckBoxes.Keys)
@@ -268,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);
@@ -322,65 +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();
-
-			EditItem ei = MyDisplayTabItem.MyStepTabPanel.SelectedEditItem;
-			ei.SaveCurrentAndContents(); // C2026-035 save unsaved step text.
-
-
-
-			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)
@@ -436,18 +327,10 @@ namespace Volian.Controls.Library
 						}
 					}
 				}
-				_MyItemInfo = value;								
+				_MyItemInfo = value;
 				if (_MyItemInfo != null)
 				{
 					if (this.Visible == false) return;
-					if (_MyItemInfo.IsRNOPart == true)  // Check if step is an RNO disable "Set All To Level" button.
-					{
-						btnApplicabilitychg.Enabled = false;
-					}
-					else
-					{
-						btnApplicabilitychg.Enabled = true;
-					}				
 					IItemConfig cfg = _MyItemInfo.MyConfig as IItemConfig;
 					List<int> apples = cfg.MasterSlave_Applicability.GetFlags();
 					UnwireCheckboxes(true);
@@ -543,7 +426,7 @@ namespace Volian.Controls.Library
 
 		public DisplayApplicability()
 		{
-			InitializeComponent(); //B2026-043 Fix "Set All At Level" button.
+			InitializeComponent();
 			this.VisibleChanged += new EventHandler(DisplayApplicability_VisibleChanged);
 		}
 
@@ -554,4 +437,3 @@ namespace Volian.Controls.Library
 		}
 	}
 }
-

PROMS/Volian.Controls.Library/DisplayHistory.cs

@@ -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

@@ -188,7 +188,4 @@
   <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/DisplayTags.Designer.cs

@@ -215,8 +215,7 @@ namespace Volian.Controls.Library
             this.groupPanelCheckoff.CanvasColor = System.Drawing.SystemColors.Control;
             this.groupPanelCheckoff.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
             this.groupPanelCheckoff.Controls.Add(this.cmbCheckoff);
-			this.groupPanelCheckoff.Controls.Add(this.cbInitialLine);
-			this.groupPanelCheckoff.DisabledBackColor = System.Drawing.Color.Empty;
+            this.groupPanelCheckoff.DisabledBackColor = System.Drawing.Color.Empty;
             this.groupPanelCheckoff.Dock = System.Windows.Forms.DockStyle.Top;
             this.groupPanelCheckoff.Location = new System.Drawing.Point(0, 231);
             this.groupPanelCheckoff.Margin = new System.Windows.Forms.Padding(2);
@@ -266,7 +265,8 @@ namespace Volian.Controls.Library
             this.cbInitialLine.Margin = new System.Windows.Forms.Padding(2);
             this.cbInitialLine.Name = "cbInitialLine";
             this.cbInitialLine.Size = new System.Drawing.Size(112, 15);
-            this.superTooltipTags.SetSuperTooltip(this.cbInitialLine, new DevComponents.DotNetBar.SuperTooltipInfo("Disable Initial Line", "", "When set, The initial line will be removed from this step.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+            this.superTooltipTags.SetSuperTooltip(this.cbInitialLine, new DevComponents.DotNetBar.SuperTooltipInfo("Manual Page Break", "", "When set, starts this step at the top of a page.\r\n\r\nkeyboard command: <Ctrl><Ente" +
+            "r>", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
             this.cbInitialLine.TabIndex = 1;
             this.cbInitialLine.Text = "Disable Initial Line";
             this.cbInitialLine.Visible = false;
@@ -276,6 +276,7 @@ namespace Volian.Controls.Library
             // 
             this.groupPanelcmbShwRplWds.CanvasColor = System.Drawing.SystemColors.Control;
             this.groupPanelcmbShwRplWds.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
+            this.groupPanelcmbShwRplWds.Controls.Add(this.cbInitialLine);
             this.groupPanelcmbShwRplWds.Controls.Add(this.cmbShwRplWds);
             this.groupPanelcmbShwRplWds.DisabledBackColor = System.Drawing.Color.Empty;
             this.groupPanelcmbShwRplWds.Dock = System.Windows.Forms.DockStyle.Top;
@@ -879,4 +880,3 @@ namespace Volian.Controls.Library
         private System.Windows.Forms.Button btnSaveChangeID;
     }
 }
-

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/StepRTB.cs

@@ -1400,25 +1400,11 @@ namespace Volian.Controls.Library
 			if (SelectionLength > 0)HandleDeleteKeyWithSelectedText(new KeyEventArgs(Keys.None), null);
 			int position = SelectionStart;
 			SelectionLength = 0;
-			// B2026-036  fixed issue where numbers after a dash character (in an RO return value) were trucated
-			//            Needed to add a space after the \f0 in the string replace below. RTF was getting confused
-			//            when there are number right after the \f0.  Note also remove the space charcter after
-			//            the \f1 command, as it is not needed since the \u commdn follows it.
-			//            Here is the old code prior to when the foreach loop was added to handle symbols in RO value:
-			//
-			//            linkValue = linkValue.Replace("\\u8209?", "\\f1\\u8209?\\f0 "); // dash character
-			//            linkValue = linkValue.Replace("\\u9586?", "\\f1\\u9586?\\f0 "); // backslash symbol
-			//            linkValue = linkValue.Replace("\\u916?", "\\f1\\u916?\\f0 "); // delta symbol
-
-			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 }";
 			this.SelectionLength = 0;
 			this.SelectionStart = position;

PROMS/Volian.Controls.Library/StepTabRibbon.cs

@@ -1669,7 +1669,7 @@ 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

PROMS/Volian.Controls.Library/VlnFlexGrid.cs

@@ -2473,17 +2473,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

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

PROMS/Volian.Controls.Library/vlnTreeView.cs

@@ -1601,11 +1601,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 +1615,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);
 		}

PROMS/Volian.Print.Library/PromsPrinter.cs

@@ -960,9 +960,7 @@ namespace Volian.Print.Library
 			OnStatusChanged("After NewPage", PromsPrinterStatusType.NewPage);
 			if (myProcedure.Sections == null)
 			{
-				// C2026-033 if we are running baselines, don't display the empty procedure message box, instead continue on as if OK was pressed.
-				if (!BaselineTesting)
-					MessageBox.Show("This procedure has no content and will not be printed.", "Empty Procedure", MessageBoxButtons.OK, MessageBoxIcon.Information);
+				MessageBox.Show("This procedure has no content and will not be printed.", "Empty Procedure", MessageBoxButtons.OK, MessageBoxIcon.Information);
 				ProfileTimer.Pop(profileDepth);
 				// B2024-062 Added check for EmptyProcedure. This is to prevent the Try Again message 
 				// from appearing after the user clicks on the OK button from the Empty Procedure message

PROMS/XYPlots/XYPlots.cs

@@ -491,12 +491,10 @@ namespace XYPlots
 			// remove an extra spaces between ><
 			//Buff = Regex.Replace(Buff, @"[ ]+<", "<");
 			Buff = Buff.Replace(">\r ", ">\r\n ");
-			Buff = Buff.Replace(">\n ", ">\r\n ");  // C2022-003 if RO has symbols
 			Buff = Regex.Replace(Buff, @"[ ]+<", "<");
 			// some data only had carriage return, replace these with cr/nl so that following code
 			// will work
 			Buff = Buff.Replace(">\r<", ">\r\n<");
-			Buff = Buff.Replace(">\n<", ">\r\n<");  // C2022-003 if RO has symbols
 			Buff = Buff.Replace("><", ">\r\n<");
 			// some data had cr/cr/nl, change to cr/nl
 			Buff = Buff.Replace("\r\r\n", "\r\n");
@@ -522,7 +520,6 @@ namespace XYPlots
 				Buff = Buff.Substring(0, Buff.Length - 2) + "  \r\n\0x00"; // needs to end with null
 			else if (Buff.EndsWith(">")) // doesn't end with return chars...
 				Buff = Buff.Substring(0, Buff.Length - 1) + " \r\n\0x00"; // needs to end with null
-			Buff = Regex.Replace(Buff, @"\\u([0-9]{1,4})\?", m => int.TryParse(m?.Groups[1]?.Value, out int result) ? Convert.ToChar(result).ToString() : ""); // C2022-003 RO Symbols. Convert unicode to character.
 			Buff = Regex.Replace(Buff, @"([0-9])\r\n([0-9])", "$1 $2");
 		}
 		private void CloseGraph()

PROMS/XYPlots/frmXYPlot.cs

@@ -2,14 +2,13 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
-using System.Diagnostics;
 using System.Drawing;
-using System.Drawing.Imaging;
 using System.Drawing.Printing;
-using System.IO;
+using System.Drawing.Imaging;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Windows.Forms;
+using System.Diagnostics;
+using System.IO;
 using VG;
 //using XYPlots;
 
@@ -22,10 +21,6 @@ namespace XYPlots
 		public frmXYPlot(string title,string xyPlot)
 		{
 			InitializeComponent();
-
-			title = Regex.Replace(title, @"\\u([0-9]{1,4})\?", m => int.TryParse(m?.Groups[1]?.Value, out int result) ? Convert.ToChar(result).ToString() : ""); // C2022-003 RO Symbols. Convert unicode to character.
-			xyPlot = Regex.Replace(xyPlot, @"\\u([0-9]{1,4})\?", m => int.TryParse(m?.Groups[1]?.Value, out int result) ? Convert.ToChar(result).ToString() : ""); // C2022-003 RO Symbols. Convert unicode to character.
-
 			int pstart = xyPlot.IndexOf("<<G"); //  find the starting Plot Command
 			xyPlot = xyPlot.Substring(pstart); // set val to the start of the plot commands
 			_XYPlot =xyPlot;