Bring branch up to date

format only change - good for testing

.gitignore

@@ -401,4 +401,5 @@ FodyWeavers.xsd
 
 /fmtall
 /genmacall
-*AssemblyInfo.cs
+*AssemblyInfo.cs
+/PROMS/Baseline/Baseline.sln

PROMS/AdjustBuildRevision/Program.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.IO;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
@@ -35,31 +33,7 @@ namespace AdjustBuildRevision
 								outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.4.yyMM.dHH") + "\")");
 							else
 								outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.3.yyMM.dHH") + "\")");
-					//		if (outline != line)
-					//		{
-					//			Console.WriteLine("Before: '{0}'", line);
-					//			Console.WriteLine("After:  '{0}'", outline);
-					//			lines[i] = outline;
-					//			changed = true;
-					//		}
-					//		else
-					//		{
-					//			Console.WriteLine("No change: '{0}'", line);
-					//		}
-					//	}
-					//}
-					//if (changed)
-					//{
-					//	if (!fi.IsReadOnly) fi.IsReadOnly = false;
-					//	StreamWriter sw = fi.CreateText();
-					//	foreach (string line in lines)
-					//		sw.WriteLine(line);
-					//	sw.Close();
-					//	string line = lines[i];
-					//	string outline = line;
-					//	if (line.Contains("AssemblyVersion") || line.Contains("AssemblyFileVersion"))
-					//	{
-							//outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("1.1.yyMM.dHH") + "\")");
+							
 							if (outline != line)
 							{
 								Console.WriteLine("Before: '{0}'", line);
@@ -84,7 +58,7 @@ namespace AdjustBuildRevision
 				}
 				else
 				{
-					MessageBox.Show("File " + fi.FullName + " does not exist");
+					MessageBox.Show($"File {fi.FullName} does not exist");
 				}
 			}
 			catch (Exception ex)
@@ -93,10 +67,6 @@ namespace AdjustBuildRevision
 			}
 		}
 
-		//private static DateTime GetLatestDateTime(string path)
-		//{
-		//	return GetLatestDateTime(new DirectoryInfo(path));
-		//}
 		private static DateTime GetLatestDateTime(DirectoryInfo di, DateTime dtCheck)
 		{
 			DateTime dtMax = dtCheck;
@@ -104,24 +74,14 @@ namespace AdjustBuildRevision
 			foreach(FileInfo myFile in myFiles)
 			{
 				DateTime dt = myFile.LastWriteTime;
-				//if (dt > dtCheck)
-				//{
-					//Console.WriteLine("\"File\"\t\"{0}\"\t\"{1}\"\t{2}\t{3}",myFile.FullName,dt.ToString("1.1.yyMM.dHH"),dt,dtCheck);
-					if(dtMax < dt) dtMax = dt;
-				//}
+				if(dtMax < dt) dtMax = dt;
 			}
 			DirectoryInfo[] myFolders = di.GetDirectories();
 			foreach (DirectoryInfo diChild in myFolders)
 			{
 				DateTime dtChild = GetLatestDateTime(diChild,dtCheck);
-				//if (dtChild > dtCheck)
-				//{
-					//Console.WriteLine("\"SubFolder\"\t\"{0}\"\t\"{1}\"\t{2}\t{3}", diChild.FullName, dtChild.ToString("1.1.yyMM.dHH"),dtChild,dtCheck);
-					if(dtChild > dtMax) dtMax = dtChild;
-				//}
+				if(dtChild > dtMax) dtMax = dtChild;
 			}
-			//if(dtMax > dtCheck)
-			//	Console.WriteLine("\"Folder\"\t\"{0}\"\t\"{1}\"", di.FullName, dtMax.ToString("1.1.yyMM.dHH"));
 			return dtMax;
 		}
 	}

PROMS/Baseline/Baseline.csproj

@@ -67,6 +67,7 @@
     <Compile Include="frmSettings.Designer.cs">
       <DependentUpon>frmSettings.cs</DependentUpon>
     </Compile>
+    <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <EmbeddedResource Include="frmBaseline.resx">

PROMS/Baseline/GlobalSuppressions.cs

@@ -0,0 +1,8 @@
+// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Not modifying Naming Styles")]

PROMS/Baseline/Program.cs

@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace Baseline

PROMS/Baseline/frmBaseline.cs

@@ -43,12 +43,9 @@ 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 System.Collections.Specialized;
 using System.IO;
 using System.Text.RegularExpressions;
 using System.Xml.Serialization;
@@ -73,13 +70,8 @@ namespace Baseline
 	}
 	public partial class frmBaseline : Form
 	{
-		private IgnoreLines _MyIgnore = new IgnoreLines();
-		public IgnoreLines MyIgnore
-		{
-			get { return _MyIgnore; }
-			set { _MyIgnore = value; }
-		}
-		private LastWas myLast = LastWas.Search;
+        public IgnoreLines MyIgnore { get; set; } = new IgnoreLines();
+        private LastWas myLast = LastWas.Search;
 		private Settings MySettings;
 		public string MyStatus
 		{
@@ -151,9 +143,11 @@ namespace Baseline
 			this.WindowState = Properties.Settings.Default.WidnowState;
 			if(Properties.Settings.Default.Ignore != null && Properties.Settings.Default.Ignore != "")
 				MyIgnore = IgnoreLines.Get(Properties.Settings.Default.Ignore);
-			MySettings= new Settings();
-			MySettings.IgnoreLines = new BindingList<string>();
-			splitContainer1.SplitterDistance = Properties.Settings.Default.Split1;
+            MySettings = new Settings
+            {
+                IgnoreLines = new BindingList<string>()
+            };
+            splitContainer1.SplitterDistance = Properties.Settings.Default.Split1;
 			splitContainer2.SplitterDistance = Properties.Settings.Default.Split2;
 			splitContainer3.SplitterDistance = Properties.Settings.Default.Split3;
 			if (Properties.Settings.Default.MRU1 != null && Properties.Settings.Default.MRU1.Count > 0)
@@ -240,28 +234,27 @@ namespace Baseline
 			lbProcedures.Items.Clear();
 			lbResults1.Items.Clear();
 			lbResults2.Items.Clear();
-			FindFile ff = lbDifferent.SelectedItem as FindFile;
-			if (ff != null)
-			{
-				// Fill Procedure or Result ListBoxes
-				switch (myLast)
-				{
-					case LastWas.Pagination:
-						CompareContent(ff.File1, ff.File2);// Compare DebugPagination
-						break;
-					case LastWas.Baseline:
-						CompareContent3(ff.File1, ff.File2);// Compare DebugMeta
-						break;
-					case LastWas.Search:
-						ShowSearchResults(ff.File1, ff.File2);// Perform search on DebugMeta
-						break;
-					default:
-						CompareContent(ff.File1, ff.File2);//Default DebugPagination
-						break;
-				}
-				//CompareOneFile(ff.File1, ff.File2);
-			}
-		}
+            if (lbDifferent.SelectedItem is FindFile ff)
+            {
+                // Fill Procedure or Result ListBoxes
+                switch (myLast)
+                {
+                    case LastWas.Pagination:
+                        CompareContent(ff.File1, ff.File2);// Compare DebugPagination
+                        break;
+                    case LastWas.Baseline:
+                        CompareContent3(ff.File1, ff.File2);// Compare DebugMeta
+                        break;
+                    case LastWas.Search:
+                        ShowSearchResults(ff.File1, ff.File2);// Perform search on DebugMeta
+                        break;
+                    default:
+                        CompareContent(ff.File1, ff.File2);//Default DebugPagination
+                        break;
+                }
+                //CompareOneFile(ff.File1, ff.File2);
+            }
+        }
 		Procedures MyProcs1;
 		Procedures MyProcs2;
 		/// <summary>
@@ -361,13 +354,6 @@ namespace Baseline
 			lines1 = list1.AsEnumerable<string>();// Convert back to Enumerable to work with LINQ
 			return lines1;
 		}
-		private string GetProcNum(string line)
-		{
-			string retval =  line.Substring(3, line.IndexOf(" | ") - 3);
-			if (retval.Contains("_"))
-				retval = retval.Substring(0, retval.IndexOf("_") - 1);
-			return retval;
-		}
 		/// <summary>
 		/// Include lines for Procedure or Page or Search is true
 		/// Account for Case Insensitive CheckBox
@@ -450,13 +436,13 @@ namespace Baseline
 		private void lbResults1_SelectedIndexChanged(object sender, EventArgs e)
 		{
 			string line=null;
-			if (lbResults1.SelectedItem is string)
-				line = (string)lbResults1.SelectedItem;
+			if (lbResults1.SelectedItem is string v)
+				line = v;
 			Line myLine = lbResults1.SelectedItem as Line;
 				switch (myLast)
 				{
 					case LastWas.Pagination:
-						line = OpenPDF(line);
+						OpenPDF(line);
 						break;
 					case LastWas.Baseline: // TODO: Need to add code here to open matching file
 						OpenOnePDF(myLine,1);
@@ -472,14 +458,14 @@ namespace Baseline
 		{
 
 			string line=null;
-			if(lbResults2.SelectedItem is string)
-				line = (string)lbResults2.SelectedItem;
+			if(lbResults2.SelectedItem is string v)
+				line = v;
 			Line myLine = lbResults2.SelectedItem as Line;
 
 			switch (myLast)
 			{
 				case LastWas.Pagination:
-					line = OpenPDF(line);
+					OpenPDF(line);
 					break;
 				case LastWas.Baseline: // TODO: Need to add code here to open matching file
 					OpenOnePDF(myLine,2);
@@ -491,34 +477,97 @@ namespace Baseline
 					break;
 			}
 		}
-		string exePath;
-		private string OpenPDF(string line)
+
+		/// <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)
 		{
-			int page = int.Parse(line.Substring(0, 6));
+			string[] fileList = Directory.GetFiles(fi.DirectoryName, patern);
+			// sort the list of file list
+			Array.Sort((string[])fileList);
+			return fileList.FirstOrDefault(); // 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)
+		{
+            // 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
+            int 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
+			}
+            // 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"
+            // B2018-113 - Replace slashes and backslashes with underscores just as PROMS does when creating a PDF file.
+            string rtnstr = txt.Substring(8, lidx - 8).Replace("/", "_").Replace("\\", "_");
+            return rtnstr;
+		}
+
+		string exePath;
+		private void OpenPDF(string line)
+		{
+			int pageNum = int.Parse(line.Substring(0, 6));
 			// B2018-113 - Replace slashes and backslashes with underscores just as PROMS does when creating a PDF file.
-			line = line.Substring(8, line.IndexOf(".S") - 8).Replace("/", "_").Replace("\\", "_");
+			string ProcNum = ParseOutProcedureNumberFromLine(line);
+			string procPatern = string.Format("*{0}*.pdf", string.IsNullOrEmpty(line) ? "noProcNumber" : ProcNum);
+
 			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)
 			{
-				System.Diagnostics.Process p = System.Diagnostics.Process.Start(fi1.DirectoryName + "\\" + line + ".pdf");
-				exePath = TryToGetPath(p);
-				p.Kill(); // No need to keep it open
+				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;
+				}
 			}
+
 			// Open the first PDF on a Specific Page
-			System.Diagnostics.ProcessStartInfo psi1 = new System.Diagnostics.ProcessStartInfo(exePath, string.Format("/A page={0} ", page) + fi1.DirectoryName + "\\" + line + ".pdf ");
+			System.Diagnostics.ProcessStartInfo psi1 = new System.Diagnostics.ProcessStartInfo(exePath, string.Format(" /A \"page={0}\" \"{1}\" ", pageNum,PDFfileName1));
 			System.Diagnostics.Process p1 = System.Diagnostics.Process.Start(psi1);
 			// Move the PDF Reader window to 0,0
 			MoveProcess(p1, 0, 0);
-			// 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 ");
+
+			// 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));
 			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 line;
+			return;
 		}
 		/// <summary>
 		/// Try to get the location of the PDF Reader executable
@@ -530,7 +579,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();
 			}
@@ -551,10 +600,10 @@ namespace Baseline
 				progname = @"C:\Program Files (x86)\IDM Computer Solutions\UltraCompare\UC.exe";
 			System.Diagnostics.ProcessStartInfo psi =
 				new System.Diagnostics.ProcessStartInfo(progname, string.Format(@" -t ""{0}"" ""{1}""", compareFile, baseFile));
-			System.Diagnostics.Process prc = System.Diagnostics.Process.Start(psi);
-		}
+            _ = System.Diagnostics.Process.Start(psi);
+        }
 
-		private ProcessLocationQueue myQueue= new ProcessLocationQueue();
+		private readonly ProcessLocationQueue myQueue= new ProcessLocationQueue();
 		private Timer queueTimer = null;
 		/// <summary>
 		/// Move a Process to a specific screen location - This is done with a timer so 
@@ -567,9 +616,11 @@ namespace Baseline
 		{
 			if (queueTimer == null)
 			{
-				queueTimer = new Timer();
-				queueTimer.Enabled = false;
-				queueTimer.Tick += queueTimer_Tick;
+                queueTimer = new Timer
+                {
+                    Enabled = false
+                };
+                queueTimer.Tick += queueTimer_Tick;
 				queueTimer.Interval = 1000;
 			}
 			myQueue.Add(proc, x, y);
@@ -594,41 +645,55 @@ 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;
-			FileInfo fi1 = new FileInfo(ff.File1);
-			FileInfo fi2 = new FileInfo(ff.File2);
+            string PDFfileName;
+            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
 			if (exePath == null)
 			{
-				System.Diagnostics.Process p = System.Diagnostics.Process.Start(fi1.DirectoryName + "\\" + proc + ".pdf");
-				while (exePath == null)
+				try
 				{
-					try
-					{
-
-						exePath = p.MainModule.FileName;
-					}
-					catch (Exception ex)
-					{
-						Application.DoEvents();
-						Console.WriteLine("{0} - {1}", ex.GetType().Name, ex.Message);
-					}
+					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;
 				}
-				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))
+            {
+                UseShellExecute = false
+            };
+            _ = System.Diagnostics.Process.Start(psi1);
+        }
 		/// <summary>
 		/// Perform Debug Meta file comparison for all of the folders within the automated testing folders 
 		/// </summary>
@@ -708,12 +773,12 @@ namespace Baseline
 		}
 		private void lbProcedures_SelectedIndexChanged(object sender, EventArgs e)
 		{
-			//Initialize Results List Box
-			lbResults1.Items.Clear();
-			Procedure myProc = lbProcedures.SelectedItem as Procedure;
-			//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);
+            //Initialize Results List Box
+            if (!(lbProcedures.SelectedItem is Procedure myProc)) 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)
@@ -758,28 +823,13 @@ namespace Baseline
 		};
 	public class Settings
 	{
-		private BindingList<string> _IgnoreLines;
-		public BindingList<string> IgnoreLines
-		{
-			get { return _IgnoreLines; }
-			set { _IgnoreLines = value; }
-		}
-	}
+        public BindingList<string> IgnoreLines { get; set; }
+    }
 	public partial class FindFile
 	{
-		private string _File1;
-		public string File1
-		{
-			get { return _File1; }
-			set { _File1 = value; }
-		}
-		private string _File2;
-		public string File2
-		{
-			get { return _File2; }
-			set { _File2 = value; }
-		}
-		public FindFile(string file1, string file2)
+        public string File1 { get; set; }
+        public string File2 { get; set; }
+        public FindFile(string file1, string file2)
 		{
 			File1 = file1;
 			File2 = file2;
@@ -787,19 +837,16 @@ namespace Baseline
 	}
 	public partial class FindFiles : List<FindFile>
 	{
-		private string _FileName;
-		public string FileName
-		{
-			get { return _FileName; }
-		}
-		/// <summary>
-		/// Build list of DocVersion Folders with differences
-		/// </summary>
-		/// <param name="path1">Base path</param>
-		/// <param name="path2">Compare path</param>
-		/// <param name="fileName">filename</param>
-		/// <param name="myIgnore">Ignore list</param>
-		public FindFiles(string path1, string path2, string fileName,IgnoreLines myIgnore)
+		private readonly string _FileName;
+        public string FileName => _FileName;
+        /// <summary>
+        /// Build list of DocVersion Folders with differences
+        /// </summary>
+        /// <param name="path1">Base path</param>
+        /// <param name="path2">Compare path</param>
+        /// <param name="fileName">filename</param>
+        /// <param name="myIgnore">Ignore list</param>
+        public FindFiles(string path1, string path2, string fileName,IgnoreLines myIgnore)
 		{
 			DirectoryInfo di1 = new DirectoryInfo(path1);
 			DirectoryInfo di2 = new DirectoryInfo(path2);
@@ -1025,34 +1072,16 @@ namespace Baseline
 	// Text - the line of text
 	public partial class Procedure
 	{
-		private string _Number;
-		public string Number
+        public string Number { get; set; }
+        public string Title { get; set; }
+        public Pages MyPages { get; set; } = new Pages();
+        public Procedure(string number, string title)
 		{
-			get { return _Number; }
-			set { _Number = value; }
+			Number = number;
+			Title = title;
 		}
-		private string _Title;
-		public string Title
-		{
-			get { return _Title; }
-			set { _Title = value; }
-		}
-		private Pages _MyPages = new Pages();
-		public Pages MyPages
-		{
-			get { return _MyPages; }
-			set { _MyPages = value; }
-		}
-		public Procedure(string number, string title)
-		{
-			_Number = number;
-			_Title = title;
-		}
-		public override string ToString()
-		{
-			return string.Format("{0} - {1}", Number, Title);
-		}
-	}
+        public override string ToString() => string.Format("{0} - {1}", Number, Title);
+    }
 	public partial class Procedures : List<Procedure>
 	{
 		// Sample data for a Procedure Number line
@@ -1083,77 +1112,34 @@ namespace Baseline
 	}
 	public partial class Page
 	{
-		private int _Number;
-		public int Number
-		{
-			get { return _Number; }
-			set { _Number = value; }
-		}
-		private Lines _MyLines = new Lines();
+        public int Number { get; set; }
 
-		public Lines MyLines
-		{
-			get { return _MyLines; }
-			set { _MyLines = value; }
-		}
-		public Page(int number)
-		{
-			_Number = number;
-		}
-		public override string ToString()
-		{
-			return string.Format("Page {0}", Number);
-		}
-	}
+        public Lines MyLines { get; set; } = new Lines();
+        public Page(int number) => Number = number;
+        public override string ToString() => string.Format("Page {0}", Number);
+    }
 	public partial class Pages : List<Page>
 	{
-		public void Add(int number)
-		{
-			Add(new Page(number));
-		}
-	}
+        public void Add(int number) => Add(new Page(number));
+    }
 	public partial class Line
 	{
-		private Procedure _MyProc;
-		public Procedure MyProc
+        public Procedure MyProc { get; set; }
+        public Page MyPage { get; set; }
+        public string Text { get; set; }
+        public Line(string text) => Text = text;
+        public Line(string text, Procedure myProc, Page myPage)
 		{
-			get { return _MyProc; }
-			set { _MyProc = value; }
+			Text = text;
+			MyProc = myProc;
+			MyPage = myPage;
 		}
-		private Page _MyPage;
-		public Page MyPage
-		{
-			get { return _MyPage; }
-			set { _MyPage = value; }
-		}
-		private string _Text;
-		public string Text
-		{
-			get { return _Text; }
-			set { _Text = value; }
-		}
-		public Line(string text)
-		{
-			_Text = text;
-		}
-		public Line(string text, Procedure myProc, Page myPage)
-		{
-			_Text = text;
-			_MyProc = myProc;
-			_MyPage = myPage;
-		}
-		public override string ToString()
-		{
-			return Text;
-		}
-	}
+        public override string ToString() => Text;
+    }
 	public partial class Lines : List<Line>
 	{
-		public void Add(string text)
-		{
-			Add(new Line(text));
-		}
-	}
+        public void Add(string text) => Add(new Line(text));
+    }
 	[Serializable]
 	public partial class IgnoreLine
 	{
@@ -1191,21 +1177,12 @@ namespace Baseline
 		public IgnoreLines()
 		{
 		}
-		public void Add(string text, Relation searchType, bool active)
-		{
-			Add(new IgnoreLine(text, searchType, active));
-		}
-		// Convert IgnoreLines to string (XML)
-		public override string ToString()
-		{
-			return GenericSerializer<IgnoreLines>.StringSerialize(this);
-		}
-		// Convert string to IgnoreLines
-		public static IgnoreLines Get(string xml)
-		{
-			return GenericSerializer<IgnoreLines>.StringDeserialize(xml);
-		}
-	}
+        public void Add(string text, Relation searchType, bool active) => Add(new IgnoreLine(text, searchType, active));
+        // Convert IgnoreLines to string (XML)
+        public override string ToString() => GenericSerializer<IgnoreLines>.StringSerialize(this);
+        // Convert string to IgnoreLines
+        public static IgnoreLines Get(string xml) => GenericSerializer<IgnoreLines>.StringDeserialize(xml);
+    }
 	/// <summary>
 	/// This is a simple serializer that takes a class and converts it to and from string (XML)
 	/// </summary>
@@ -1233,7 +1210,7 @@ namespace Baseline
 			string ss = s.Replace("encoding=\"utf-16\"", "");
 			XmlSerializer xs = new XmlSerializer(typeof(T));
 			UTF8Encoding enc = new UTF8Encoding();
-			Byte[] arrBytData = enc.GetBytes(ss);
+            byte[] arrBytData = enc.GetBytes(ss);
 			using (MemoryStream ms = new MemoryStream(arrBytData))
 			{
 				t = (T)xs.Deserialize(ms);
@@ -1247,12 +1224,9 @@ namespace Baseline
 	public class NonXsiTextWriter : XmlTextWriter
 	{
 		public NonXsiTextWriter(TextWriter w) : base(w) { }
-		public NonXsiTextWriter(Stream w, Encoding encoding)
-			: base(w, encoding)
-		{
-			this.Formatting = Formatting.Indented;
-		}
-		public NonXsiTextWriter(string filename, Encoding encoding) : base(filename, encoding) { }
+        public NonXsiTextWriter(Stream w, Encoding encoding)
+            : base(w, encoding) => Formatting = Formatting.Indented;
+        public NonXsiTextWriter(string filename, Encoding encoding) : base(filename, encoding) { }
 		bool _skip = false;
 		public override void WriteStartAttribute(string prefix, string localName, string ns)
 		{
@@ -1294,32 +1268,16 @@ namespace Baseline
 		public const short SWP_NOZORDER = 0X4;
 		public const int SWP_SHOWWINDOW = 0x0040;
 
-		private System.Diagnostics.Process _Process;
-
-		public System.Diagnostics.Process Process
-		{
-			get { return _Process; }
-			set { _Process = value; }
-		}
-		private int _X;
-		public int X
-		{
-			get { return _X; }
-			set { _X = value; }
-		}
-		private int _Y;
-		public int Y
-		{
-			get { return _Y; }
-			set { _Y = value; }
-		}
-		public ProcessLocation(System.Diagnostics.Process process, int x, int y)
+        public System.Diagnostics.Process Process { get; set; }
+        public int X { get; set; }
+        public int Y { get; set; }
+        public ProcessLocation(System.Diagnostics.Process process, int x, int y)
 		{
 			Process = process;
 			X = x;
 			Y = y;
 		}
-		private static Boolean FoxitSettingInfo = true;
+		private static bool FoxitSettingInfo = true;
 
 		/// <summary>
 		/// MoveIt() moves the window containing the PDF viewer to the right so the two pdf viewer windows will not overlap.
@@ -1340,11 +1298,8 @@ namespace Baseline
 	}
 	public class ProcessLocationQueue: Queue<ProcessLocation>
 	{
-		public void Add(System.Diagnostics.Process process, int x, int y)
-		{
-			Enqueue(new ProcessLocation(process,x,y));
-		}
-		public void ProcessNext()
+        public void Add(System.Diagnostics.Process process, int x, int y) => Enqueue(new ProcessLocation(process, x, y));
+        public void ProcessNext()
 		{
 			ProcessLocation pl = Dequeue();
 			pl.MoveIt();

PROMS/Baseline/frmSettings.cs

@@ -1,11 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace Baseline
@@ -19,17 +12,7 @@ namespace Baseline
 			set {
 				_MyIgnore = value; 
 				dgv.DataSource=null;
-				//dgvcSearchType.ValueType = typeof(Relation);
-				//dgvcSearchType.ValueMember = "Value";
-				//dgvcSearchType.DisplayMember = "Display";
-				//dgvcSearchType.DataSource = new Relation[] { Relation.Contains, Relation.StartsWith, Relation.EndsWith, Relation.Regex }
-				//.Select(x => new { Display = x.ToString(), Value = x })
-				//.ToList();
 				dgv.DataSource=value;
-				//dgvcSearchType.DataSource =
-				//new List<Relation>((Relation[]) Enum.GetValues(typeof(Relation)))
-				//.Select(x => new { Display=x.ToString(), Value=(int)x })
-				//.ToList();;
 			}
 		}
 		public frmSettings(IgnoreLines myIgnore)
@@ -46,19 +29,16 @@ namespace Baseline
 			col.ValueType = typeof(Relation);
 		}
 
-		private void dgv_DataError(object sender, DataGridViewDataErrorEventArgs e)
+        private void dgv_DataError(object sender, DataGridViewDataErrorEventArgs e) => Console.WriteLine("Here");
+        private void btnOK_Click(object sender, EventArgs e)
 		{
-			Console.WriteLine("Here");
-		}
-		private void btnOK_Click(object sender, EventArgs e)
-		{
-			this.DialogResult = System.Windows.Forms.DialogResult.OK;
-			this.Close();
+			DialogResult = System.Windows.Forms.DialogResult.OK;
+			Close();
 		}
 		private void btnCancel_Click(object sender, EventArgs e)
 		{
-			this.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.Close();
+			DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			Close();
 		}
 	}
 }

PROMS/DropDownPanel/Controls/DropDownPanel.cs

@@ -1,6 +1,5 @@
 using System;
 using System.ComponentModel;
-using System.Diagnostics;
 using System.Drawing;
 using System.Windows.Forms;
 
@@ -15,7 +14,7 @@ namespace AT.STO.UI.Win
 	{
 	#region Private Variable Declarations
 		private IDropDownAware			_dropDownControl	= null;
-		private DropDownWindowHelper	_dropDownHelper		= null;
+		private readonly DropDownWindowHelper	_dropDownHelper		= null;
 		private Form					_owner				= null;
 	#endregion
 	#region Constructor / Destructor
@@ -47,7 +46,7 @@ namespace AT.STO.UI.Win
 		/// <param name="e"></param>
 		protected override void OnHandleCreated(EventArgs e)
 		{	
-			_owner = this.FindForm();
+			_owner = FindForm();
 			_dropDownHelper.ReleaseHandle();
 			
 			if (_owner != null)
@@ -66,8 +65,8 @@ namespace AT.STO.UI.Win
 		{
 			base.OnResize(e);
 			combo.Location = new Point(0, 0);
-			combo.Width = this.ClientRectangle.Width;
-			this.Height = combo.Height;
+			combo.Width = ClientRectangle.Width;
+			Height = combo.Height;
 		}
 	#endregion
 	#region Event Handler
@@ -96,7 +95,7 @@ namespace AT.STO.UI.Win
 			else
 			{
 				_dropDownHelper.CloseDropDown();
-				this.Focus();
+				Focus();
 			}
 		}
 		
@@ -115,7 +114,7 @@ namespace AT.STO.UI.Win
 
 		private void DropDownHelper_DropDownCancel(object sender, DropDownCancelEventArgs e)
 		{
-			if (this.Bounds.Contains(Parent.PointToClient(e.CursorLocation)))
+			if (Bounds.Contains(Parent.PointToClient(e.CursorLocation)))
 			{
 				e.Cancel = true;
 			}
@@ -137,31 +136,22 @@ namespace AT.STO.UI.Win
 			{
 				SetValue<long>(e.Value as ILookupItem<long>);
 			}
-			
-			if (this.FinishEditing != null)
-			{
-				this.FinishEditing(this, e);
-			}
-			
-			_dropDownControl.FinishEditing -= new DropDownValueChangedEventHandler(DropDown_FinishEditing);
+
+            FinishEditing?.Invoke(this, e);
+
+            _dropDownControl.FinishEditing -= new DropDownValueChangedEventHandler(DropDown_FinishEditing);
 			_dropDownControl.ValueChanged -= new DropDownValueChangedEventHandler(DropDown_ValueChanged);
 			_dropDownHelper.CloseDropDown();
 		}
-		
-		private void DropDown_ValueChanged(object sender, DropDownValueChangedEventArgs e)
-		{
-			if (this.ValueChanged != null)
-			{
-				this.ValueChanged(this, e);
-			}
-		}
-	#endregion
-	#region Public Properties
-		/// <summary>
-		/// Get or set the control (has to implement IDropDownAware) that is to 
-		/// be displayed as the dropdown portion of the combobox. 
-		/// </summary>
-		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+
+        private void DropDown_ValueChanged(object sender, DropDownValueChangedEventArgs e) => ValueChanged?.Invoke(this, e);
+        #endregion
+        #region Public Properties
+        /// <summary>
+        /// Get or set the control (has to implement IDropDownAware) that is to 
+        /// be displayed as the dropdown portion of the combobox. 
+        /// </summary>
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
 		public IDropDownAware DropDownControl
 		{
 			get { return _dropDownControl; }
@@ -169,24 +159,21 @@ namespace AT.STO.UI.Win
 			{ 
 				_dropDownControl = value; 
 				
-				this.Controls.Add(_dropDownControl as Control);
+				Controls.Add(_dropDownControl as Control);
 			}
 		}
-	#endregion
-	#region Public Methods
-		public override string ToString()
-		{
-			return this.Name;
-		}
-	#endregion
-	#region Private Methods
-		/// <summary>
-		/// Calculate an acceptable position of the DropDownForm even in a 
-		/// multi screen environment.
-		/// </summary>
-		/// <param name="DropDown"></param>
-		/// <returns></returns>
-		private Point GetDropDownPosition(DropDownForm DropDown)
+        #endregion
+        #region Public Methods
+        public override string ToString() => Name;
+        #endregion
+        #region Private Methods
+        /// <summary>
+        /// Calculate an acceptable position of the DropDownForm even in a 
+        /// multi screen environment.
+        /// </summary>
+        /// <param name="DropDown"></param>
+        /// <returns></returns>
+        private Point GetDropDownPosition(DropDownForm DropDown)
 		{
 			Point		lt		= Parent.PointToScreen(new Point(Left, Top));
 			Point		rb		= Parent.PointToScreen(new Point(Right, Bottom));

PROMS/DropDownPanel/Events/Events.cs

@@ -35,10 +35,9 @@ namespace AT.STO.UI.Win
 	/// </summary>
 	public class DropDownCancelEventArgs : EventArgs
 	{
-	#region Private Variable Declarations
-		private bool	_cancel				= false;
-		private Point	_cursorLocation;
-		private Form	_dropDown			= null;
+        #region Private Variable Declarations
+        private Point	_cursorLocation;
+		private readonly Form	_dropDown			= null;
 	#endregion
 	#region Constructor / Destructor
 		/// <summary>
@@ -51,36 +50,26 @@ namespace AT.STO.UI.Win
 		{
 			_dropDown		= DropDown;
 			_cursorLocation = CursorLocation;
-			_cancel			= false;
-		}
-	#endregion
-	#region Public Properties	
-		/// <summary>
-		/// 
-		/// </summary>
-		public bool Cancel
-		{
-			get { return _cancel; }
-			set { _cancel = value; }
+			Cancel			= false;
 		}
+        #endregion
+        #region Public Properties	
+        /// <summary>
+        /// 
+        /// </summary>
+        public bool Cancel { get; set; } = false;
 
-		/// <summary>
-		/// 
-		/// </summary>
-		public Point CursorLocation
-		{
-			get { return _cursorLocation; }
-		}
+        /// <summary>
+        /// 
+        /// </summary>
+        public Point CursorLocation => _cursorLocation;
 
-		/// <summary>
-		/// 
-		/// </summary>
-		public Form DropDown
-		{
-			get { return _dropDown; }
-		}
-	#endregion
-	}
+        /// <summary>
+        /// 
+        /// </summary>
+        public Form DropDown => _dropDown;
+        #endregion
+    }
 
 	/// <summary>
 	/// Contains event information for a <see cref="DropDownClosed"/> event.
@@ -91,64 +80,50 @@ namespace AT.STO.UI.Win
 	public class DropDownClosedEventArgs : EventArgs
 	{
 	#region Private Variable Declarations
-		private Form _dropDown = null;
-	#endregion
-	#region Constructor / Destructor
-		/// <summary>
-		/// Constructs a new instance of this class for the specified
-		/// popup form.
-		/// </summary>
-		/// <param name="DropDown">DropDown Form which is being closed.</param>
-		public DropDownClosedEventArgs(Form DropDown)
-		{
-			_dropDown = DropDown;
-		}
-	#endregion
-	#region Public Properties
-		/// <summary>
-		/// Gets the dropdown form which is being closed.
-		/// </summary>
-		public Form DropDown
-		{
-			get { return _dropDown; }
-		}
-	#endregion
-	}
+		private readonly Form _dropDown = null;
+        #endregion
+        #region Constructor / Destructor
+        /// <summary>
+        /// Constructs a new instance of this class for the specified
+        /// popup form.
+        /// </summary>
+        /// <param name="DropDown">DropDown Form which is being closed.</param>
+        public DropDownClosedEventArgs(Form DropDown) => _dropDown = DropDown;
+        #endregion
+        #region Public Properties
+        /// <summary>
+        /// Gets the dropdown form which is being closed.
+        /// </summary>
+        public Form DropDown => _dropDown;
+        #endregion
+    }
 	
 	/// <summary>
 	/// Contains event information for DropDownValueChangedEventHandler.
 	/// </summary>
 	public class DropDownValueChangedEventArgs : EventArgs
 	{
-	#region Private Variable Declarations
-		private object _value = null;
-	#endregion
-	#region Constructor / Destructor
-		/// <summary>
-		/// Default Constructor
-		/// </summary>
-		public DropDownValueChangedEventArgs()
+        #region Private Variable Declarations
+        #endregion
+        #region Constructor / Destructor
+        /// <summary>
+        /// Default Constructor
+        /// </summary>
+        public DropDownValueChangedEventArgs()
 		{
 		}
-		
-		/// <summary>
-		/// Initialization with the control's value.
-		/// </summary>
-		/// <param name="Value"></param>
-		public DropDownValueChangedEventArgs(object Value)
-		{
-			_value = Value;
-		}
-	#endregion
-	#region Public Properties
-		/// <summary>
-		/// Gets or sets the control's value.
-		/// </summary>
-		public object Value
-		{
-			get { return _value; }
-			set { _value = value; }
-		}
-	#endregion
-	}
+
+        /// <summary>
+        /// Initialization with the control's value.
+        /// </summary>
+        /// <param name="Value"></param>
+        public DropDownValueChangedEventArgs(object Value) => this.Value = Value;
+        #endregion
+        #region Public Properties
+        /// <summary>
+        /// Gets or sets the control's value.
+        /// </summary>
+        public object Value { get; set; } = null;
+        #endregion
+    }
 }

PROMS/DropDownPanel/Forms/DropDownForm.cs

@@ -13,22 +13,19 @@ namespace AT.STO.UI.Win
 	internal partial class DropDownForm : Form, IDropDownAware
 	{
 	#region Private Variable Declaration
-		private IDropDownAware _control = null;
-	#endregion
-	#region Constructor / Destructor
-		/// <summary>
-		/// Default Constructor
-		/// </summary>
-		public DropDownForm()
-		{
-			InitializeComponent();
-		}
+		private readonly IDropDownAware _control = null;
+        #endregion
+        #region Constructor / Destructor
+        /// <summary>
+        /// Default Constructor
+        /// </summary>
+        public DropDownForm() => InitializeComponent();
 
-		/// <summary>
-		/// Constructor to initialize the for with the control to display.
-		/// </summary>
-		/// <param name="Ctrl">The control to display.</param>
-		public DropDownForm(IDropDownAware Ctrl) : this()
+        /// <summary>
+        /// Constructor to initialize the for with the control to display.
+        /// </summary>
+        /// <param name="Ctrl">The control to display.</param>
+        public DropDownForm(IDropDownAware Ctrl) : this()
 		{	
 			if (Ctrl != null)
 			{
@@ -41,7 +38,7 @@ namespace AT.STO.UI.Win
 	#region Form Events
 		protected override void OnClosing(CancelEventArgs e)
 		{
-			this.Controls.Remove(_control as Control);
+			Controls.Remove(_control as Control);
 			base.OnClosing(e);
 		}
 
@@ -58,29 +55,20 @@ namespace AT.STO.UI.Win
 	#region Event Handler
 	    private void Ctrl_FinishEditing(object sender, DropDownValueChangedEventArgs e)
 	    {
-			if (this.FinishEditing != null)
-			{
-				this.FinishEditing(this, e);
-			}
+            FinishEditing?.Invoke(this, e);
 
-			_control.FinishEditing -= new DropDownValueChangedEventHandler(Ctrl_FinishEditing);
+            _control.FinishEditing -= new DropDownValueChangedEventHandler(Ctrl_FinishEditing);
 			_control.ValueChanged -= new DropDownValueChangedEventHandler(Ctrl_ValueChanged);
 	    }
-	    
-	    private void Ctrl_ValueChanged(object sender, DropDownValueChangedEventArgs e)
-	    {
-			if (this.ValueChanged != null)
-			{
-				this.ValueChanged(this, e);
-			}
-	    }
-	#endregion
-	#region IDropDownAware Implementation
-		/// <summary>
-		/// Fired either on OK, Cancel or a click outside the control to indicate
-		/// that the user has finished editing.
-		/// </summary>
-		public event DropDownValueChangedEventHandler FinishEditing;
+
+        private void Ctrl_ValueChanged(object sender, DropDownValueChangedEventArgs e) => ValueChanged?.Invoke(this, e);
+        #endregion
+        #region IDropDownAware Implementation
+        /// <summary>
+        /// Fired either on OK, Cancel or a click outside the control to indicate
+        /// that the user has finished editing.
+        /// </summary>
+        public event DropDownValueChangedEventHandler FinishEditing;
 		
 		/// <summary>
 		/// Fired on any change of the controls's value during the editing process. 
@@ -100,15 +88,15 @@ namespace AT.STO.UI.Win
 		private void InitializeControl(Control Ctrl)
 		{
 			Size	size	= Ctrl.Size;
-			Size	inner	= this.ClientRectangle.Size;
-			Size	outer	= this.Size;
+			Size	inner	= ClientRectangle.Size;
+			Size	outer	= Size;
 			int		gap		= outer.Width - inner.Width;
 			
 			size.Width += gap;
 			size.Height += gap;
 			
-			this.Size = size;
-			this.Controls.Add(Ctrl);
+			Size = size;
+			Controls.Add(Ctrl);
 			Ctrl.Location = new Point(0, 0);
 			Ctrl.Visible = true;
 			Ctrl.Invalidate();

PROMS/DropDownPanel/Helper/DropDownMessageFilter.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Drawing;
 using System.Windows.Forms;
 
@@ -21,59 +20,48 @@ namespace AT.STO.UI.Win
 		private const int WM_NCLBUTTONDOWN	= 0x0A1;
 		private const int WM_NCRBUTTONDOWN	= 0x0A4;
 		private const int WM_NCMBUTTONDOWN	= 0x0A7;
-	#endregion
-	#region Private Variable Declarations
-		private Form					_dropDown	= null;
-		private DropDownWindowHelper	_owner		= null;
+        #endregion
+        #region Private Variable Declarations
+        private readonly DropDownWindowHelper	_owner		= null;
 	#endregion
 	#region Event Declarations
 		public event DropDownCancelEventHandler DropDownCancel;
-	#endregion
-	#region Constructor / Destructor
-		/// <summary>
-		/// Constructs a new instance of this class and sets the owning
-		/// object.
-		/// </summary>
-		/// <param name="Owner">The <see cref="DropDownWindowHelper"/> object
-		/// which owns this class.</param>
-		public DropDownMessageFilter(DropDownWindowHelper Owner)
-		{
-			_owner = Owner;
-		}
-	#endregion
-	#region Public Properties
-		/// <summary>
-		/// Gets/sets the dropdown form which is being displayed.
-		/// </summary>
-		public Form DropDown
-		{
-			get { return _dropDown; }
-			set { _dropDown = value; }
-		}
-	#endregion
-	#region Private Methods
-		private void OnMouseDown()
+        #endregion
+        #region Constructor / Destructor
+        /// <summary>
+        /// Constructs a new instance of this class and sets the owning
+        /// object.
+        /// </summary>
+        /// <param name="Owner">The <see cref="DropDownWindowHelper"/> object
+        /// which owns this class.</param>
+        public DropDownMessageFilter(DropDownWindowHelper Owner) => _owner = Owner;
+        #endregion
+        #region Public Properties
+        /// <summary>
+        /// Gets/sets the dropdown form which is being displayed.
+        /// </summary>
+        public Form DropDown { get; set; } = null;
+        #endregion
+        #region Private Methods
+        private void OnMouseDown()
 		{
 			Point cursorPos = Cursor.Position;											// Get the cursor location
 
-			if (!_dropDown.Bounds.Contains(cursorPos))									// Check if it is within the popup form
+			if (!DropDown.Bounds.Contains(cursorPos))									// Check if it is within the popup form
 			{
-				OnDropDownCancel(new DropDownCancelEventArgs(_dropDown, cursorPos));	// If not, then call to see if it should be closed
+				OnDropDownCancel(new DropDownCancelEventArgs(DropDown, cursorPos));	// If not, then call to see if it should be closed
 			}
 		}
 	#endregion
 	#region DropDownCancelEvent Implementation
 		protected virtual void OnDropDownCancel(DropDownCancelEventArgs e)
 		{
-			if (this.DropDownCancel != null)
-			{
-				this.DropDownCancel(this, e);
-			}
+            DropDownCancel?.Invoke(this, e);
 
-			if (!e.Cancel)
+            if (!e.Cancel)
 			{
 				_owner.CloseDropDown();
-				_dropDown = null;					// Clear reference for GC
+				DropDown = null;					// Clear reference for GC
 			}
 		}
 	#endregion
@@ -90,7 +78,7 @@ namespace AT.STO.UI.Win
 		/// This implementation always returns <c>false</c>.</returns>
 		public bool PreFilterMessage(ref Message m)
 		{
-			if (_dropDown != null)
+			if (DropDown != null)
 			{
 				switch (m.Msg)
 				{

PROMS/DropDownPanel/Helper/DropDownWindowHelper.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Drawing;
-using System.Runtime.InteropServices;
 using System.Windows.Forms;
 
 namespace AT.STO.UI.Win
@@ -22,7 +21,7 @@ namespace AT.STO.UI.Win
 		
 		private Form					_dropDown			= null;
 		private bool					_dropDownShowing	= false;
-		private DropDownMessageFilter	_filter				= null;
+		private readonly DropDownMessageFilter	_filter				= null;
 		private Form					_owner				= null;
 		private bool					_skipClose			= false;
 	#endregion
@@ -42,31 +41,25 @@ namespace AT.STO.UI.Win
 			_filter.DropDownCancel -= new DropDownCancelEventHandler(Popup_Cancel);
 			_filter.DropDownCancel += new DropDownCancelEventHandler(Popup_Cancel);
 		}
-	#endregion
-	#region Event Handler
-		private void Popup_Cancel(object sender, DropDownCancelEventArgs e)
-		{
-			OnDropDownCancel(e);
-		}
+        #endregion
+        #region Event Handler
+        private void Popup_Cancel(object sender, DropDownCancelEventArgs e) => OnDropDownCancel(e);
 
-		/// <summary>
-		/// Responds to the <see cref="System.Windows.Forms.Form.Closed"/>
-		/// event from the popup form.
-		/// </summary>
-		/// <param name="sender">Popup form that has been closed.</param>
-		/// <param name="e">Not used.</param>
-		private void Popup_Closed(object sender, EventArgs e)
-		{
-			CloseDropDown();
-		}
-	
-		/// <summary>
-		/// Subclasses the owning form's existing Window Procedure to enables the 
-		/// title bar to remain active when a popup is show, and to detect if
-		/// the user clicks onto another application whilst the popup is visible.
-		/// </summary>
-		/// <param name="m">Window Procedure Message</param>
-		protected override void WndProc(ref Message m)
+        /// <summary>
+        /// Responds to the <see cref="System.Windows.Forms.Form.Closed"/>
+        /// event from the popup form.
+        /// </summary>
+        /// <param name="sender">Popup form that has been closed.</param>
+        /// <param name="e">Not used.</param>
+        private void Popup_Closed(object sender, EventArgs e) => CloseDropDown();
+
+        /// <summary>
+        /// Subclasses the owning form's existing Window Procedure to enables the 
+        /// title bar to remain active when a popup is show, and to detect if
+        /// the user clicks onto another application whilst the popup is visible.
+        /// </summary>
+        /// <param name="m">Window Procedure Message</param>
+        protected override void WndProc(ref Message m)
 		{
 			base.WndProc(ref m);
 
@@ -76,7 +69,7 @@ namespace AT.STO.UI.Win
 				{
 					if (((int)m.WParam) == 0)																// Check if the title bar will made inactive:
 					{	// Note it's no good to try and consume this message; if you try to do that you'll end up with windows
-						UIApiCalls.SendMessage(this.Handle, UIApiCalls.WM_NCACTIVATE, 1, IntPtr.Zero);		// If so reactivate it.
+						UIApiCalls.SendMessage(Handle, UIApiCalls.WM_NCACTIVATE, 1, IntPtr.Zero);		// If so reactivate it.
 					}
 				}
 				else if (m.Msg == UIApiCalls.WM_ACTIVATEAPP)
@@ -84,7 +77,7 @@ namespace AT.STO.UI.Win
 					if ((int)m.WParam == 0)																	// Check if the application is being deactivated.
 					{
 						CloseDropDown();																		// It is so cancel the popup:
-						UIApiCalls.PostMessage(this.Handle, UIApiCalls.WM_NCACTIVATE, 0, IntPtr.Zero);		// And put the title bar into the inactive state:
+						UIApiCalls.PostMessage(Handle, UIApiCalls.WM_NCACTIVATE, 0, IntPtr.Zero);		// And put the title bar into the inactive state:
 					}
 				}
 			}
@@ -168,22 +161,19 @@ namespace AT.STO.UI.Win
 				_owner = null;				
 			}
 		}
-	#endregion
-	#region Public Properties
-		/// <summary>
-		/// Indicator weither the DropDown is showing.
-		/// </summary>
-		public bool DropDownShowing
+        #endregion
+        #region Public Properties
+        /// <summary>
+        /// Indicator weither the DropDown is showing.
+        /// </summary>
+        public bool DropDownShowing => _dropDownShowing;
+        #endregion
+        #region Event Implementation
+        protected virtual void OnDropDownCancel(DropDownCancelEventArgs e)
 		{
-			get { return _dropDownShowing; }
-		}
-	#endregion
-	#region Event Implementation
-		protected virtual void OnDropDownCancel(DropDownCancelEventArgs e)
-		{
-			if (this.DropDownCancel != null)
+			if (DropDownCancel != null)
 			{
-				this.DropDownCancel(this, e);
+				DropDownCancel(this, e);
 
 				if (!e.Cancel)
 				{
@@ -191,14 +181,8 @@ namespace AT.STO.UI.Win
 				}
 			}
 		}
-		
-		protected virtual void OnPDropDownClosed(DropDownClosedEventArgs e)
-		{
-		    if (this.DropDownClosed != null)
-		    {
-		        this.DropDownClosed(this, e);
-		    }
-		}
-	#endregion
-	}
+
+        protected virtual void OnPDropDownClosed(DropDownClosedEventArgs e) => DropDownClosed?.Invoke(this, e);
+        #endregion
+    }
 }

PROMS/DropDownPanel/Interfaces/IDropDownAware.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace AT.STO.UI.Win
 {
 	/// <summary>

PROMS/DropDownPanel/Interfaces/ILookupItem.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace AT.STO.UI.Win
 {
 	public interface ILookupItem<T> where T: struct

PROMS/FlexableMessageBox/FlexibleMessageBox.cs

@@ -1,8 +1,6 @@
 using System;
 using System.Diagnostics;
 using System.Drawing;
-using System.Globalization;
-//using System.Linq;
 using System.Windows.Forms;
 
 
@@ -121,10 +119,7 @@ namespace JR.Utils.GUI.Forms
         /// </summary>
         /// <param name="text">The text.</param>
         /// <returns>The dialog result.</returns>
-        public static DialogResult Show(string text)
-        {
-            return FlexibleMessageBoxForm.Show(null, text, string.Empty, MessageBoxButtons.OK, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
-        }
+        public static DialogResult Show(string text) => FlexibleMessageBoxForm.Show(null, text, string.Empty, MessageBoxButtons.OK, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
 
         /// <summary>
         /// Shows the specified message box.
@@ -132,10 +127,7 @@ namespace JR.Utils.GUI.Forms
         /// <param name="owner">The owner.</param>
         /// <param name="text">The text.</param>
         /// <returns>The dialog result.</returns>
-        public static DialogResult Show(IWin32Window owner, string text)
-        {
-            return FlexibleMessageBoxForm.Show(owner, text, string.Empty, MessageBoxButtons.OK, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
-        }
+        public static DialogResult Show(IWin32Window owner, string text) => FlexibleMessageBoxForm.Show(owner, text, string.Empty, MessageBoxButtons.OK, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
 
         /// <summary>
         /// Shows the specified message box.
@@ -143,10 +135,7 @@ namespace JR.Utils.GUI.Forms
         /// <param name="text">The text.</param>
         /// <param name="caption">The caption.</param>
         /// <returns>The dialog result.</returns>
-        public static DialogResult Show(string text, string caption)
-        {
-            return FlexibleMessageBoxForm.Show(null, text, caption, MessageBoxButtons.OK, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
-        }
+        public static DialogResult Show(string text, string caption) => FlexibleMessageBoxForm.Show(null, text, caption, MessageBoxButtons.OK, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
 
         /// <summary>
         /// Shows the specified message box.
@@ -155,10 +144,7 @@ namespace JR.Utils.GUI.Forms
         /// <param name="text">The text.</param>
         /// <param name="caption">The caption.</param>
         /// <returns>The dialog result.</returns>
-        public static DialogResult Show(IWin32Window owner, string text, string caption)
-        {
-            return FlexibleMessageBoxForm.Show(owner, text, caption, MessageBoxButtons.OK, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
-        }
+        public static DialogResult Show(IWin32Window owner, string text, string caption) => FlexibleMessageBoxForm.Show(owner, text, caption, MessageBoxButtons.OK, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
 
         /// <summary>
         /// Shows the specified message box.
@@ -167,10 +153,7 @@ namespace JR.Utils.GUI.Forms
         /// <param name="caption">The caption.</param>
         /// <param name="buttons">The buttons.</param>
         /// <returns>The dialog result.</returns>
-        public static DialogResult Show(string text, string caption, MessageBoxButtons buttons)
-        {
-            return FlexibleMessageBoxForm.Show(null, text, caption, buttons, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
-        }
+        public static DialogResult Show(string text, string caption, MessageBoxButtons buttons) => FlexibleMessageBoxForm.Show(null, text, caption, buttons, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
 
         /// <summary>
         /// Shows the specified message box.
@@ -180,10 +163,7 @@ namespace JR.Utils.GUI.Forms
         /// <param name="caption">The caption.</param>
         /// <param name="buttons">The buttons.</param>
         /// <returns>The dialog result.</returns>
-        public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons)
-        {
-            return FlexibleMessageBoxForm.Show(owner, text, caption, buttons, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
-        }
+        public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons) => FlexibleMessageBoxForm.Show(owner, text, caption, buttons, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
 
         /// <summary>
         /// Shows the specified message box.
@@ -193,10 +173,7 @@ namespace JR.Utils.GUI.Forms
         /// <param name="buttons">The buttons.</param>
         /// <param name="icon">The icon.</param>
         /// <returns></returns>
-        public static DialogResult Show(string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon)
-        {
-            return FlexibleMessageBoxForm.Show(null, text, caption, buttons, icon, MessageBoxDefaultButton.Button1);
-        }
+        public static DialogResult Show(string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon) => FlexibleMessageBoxForm.Show(null, text, caption, buttons, icon, MessageBoxDefaultButton.Button1);
 
         /// <summary>
         /// Shows the specified message box.
@@ -207,10 +184,7 @@ namespace JR.Utils.GUI.Forms
         /// <param name="buttons">The buttons.</param>
         /// <param name="icon">The icon.</param>
         /// <returns>The dialog result.</returns>
-        public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon)
-        {
-            return FlexibleMessageBoxForm.Show(owner, text, caption, buttons, icon, MessageBoxDefaultButton.Button1);
-        }
+        public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon) => FlexibleMessageBoxForm.Show(owner, text, caption, buttons, icon, MessageBoxDefaultButton.Button1);
 
         /// <summary>
         /// Shows the specified message box.
@@ -221,10 +195,7 @@ namespace JR.Utils.GUI.Forms
         /// <param name="icon">The icon.</param>
         /// <param name="defaultButton">The default button.</param>
         /// <returns>The dialog result.</returns>
-        public static DialogResult Show(string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton)
-        {
-            return FlexibleMessageBoxForm.Show(null, text, caption, buttons, icon, defaultButton);
-        }
+        public static DialogResult Show(string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton) => FlexibleMessageBoxForm.Show(null, text, caption, buttons, icon, defaultButton);
 
         /// <summary>
         /// Shows the specified message box.
@@ -236,10 +207,7 @@ namespace JR.Utils.GUI.Forms
         /// <param name="icon">The icon.</param>
         /// <param name="defaultButton">The default button.</param>
         /// <returns>The dialog result.</returns>
-        public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton)
-        {
-            return FlexibleMessageBoxForm.Show(owner, text, caption, buttons, icon, defaultButton);
-        }
+        public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton) => FlexibleMessageBoxForm.Show(owner, text, caption, buttons, icon, defaultButton);
 
         /// <summary>
         /// Shows the specified message box.
@@ -251,10 +219,8 @@ namespace JR.Utils.GUI.Forms
         /// <param name="icon">The icon.</param>
         /// <param name="defaultButton">The default button.</param>
         /// <returns>The dialog result.</returns>
-        public static DialogResult ShowCustom(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon)
-        {
-            return FlexibleMessageBoxForm.ShowCustom(null, text, caption, buttons, icon);
-        }
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "Keeping owner for legacy reasons")]
+        public static DialogResult ShowCustom(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon) => FlexibleMessageBoxForm.ShowCustom(null, text, caption, buttons, icon);
 
         #endregion
 
@@ -341,7 +307,7 @@ namespace JR.Utils.GUI.Forms
                 this.richTextBoxMessage.TabIndex = 0;
                 this.richTextBoxMessage.TabStop = false;
                 this.richTextBoxMessage.Text = "<Message>";
-                this.richTextBoxMessage.LinkClicked += new System.Windows.Forms.LinkClickedEventHandler(this.richTextBoxMessage_LinkClicked);
+                this.richTextBoxMessage.LinkClicked += new System.Windows.Forms.LinkClickedEventHandler(this.RichTextBoxMessage_LinkClicked);
                 // 
                 // panel1
                 // 
@@ -431,8 +397,8 @@ namespace JR.Utils.GUI.Forms
             #region Private constants
 
             //These separators are used for the "copy to clipboard" standard operation, triggered by Ctrl + C (behavior and clipboard format is like in a standard MessageBox)
-            private static readonly String STANDARD_MESSAGEBOX_SEPARATOR_LINES = "---------------------------\n";
-            private static readonly String STANDARD_MESSAGEBOX_SEPARATOR_SPACES = "   ";
+            private static readonly string STANDARD_MESSAGEBOX_SEPARATOR_LINES = "---------------------------\n";
+            private static readonly string STANDARD_MESSAGEBOX_SEPARATOR_SPACES = "   ";
 
             //These are the possible buttons (in a standard MessageBox)
             private enum ButtonID { OK = 0, CANCEL, YES, NO, ABORT, RETRY, IGNORE, OVERWRITE, RENAME };
@@ -440,10 +406,10 @@ namespace JR.Utils.GUI.Forms
             //These are the buttons texts for different languages. 
             //If you want to add a new language, add it here and in the GetButtonText-Function
             private enum TwoLetterISOLanguageID { en, de, es, it };
-            private static readonly String[] BUTTON_TEXTS_ENGLISH_EN = { "OK", "Cancel", "&Yes", "&No", "&Abort", "&Retry", "&Ignore", "&Overwrite", "&Rename" }; //Note: This is also the fallback language
-            private static readonly String[] BUTTON_TEXTS_GERMAN_DE = { "OK", "Abbrechen", "&Ja", "&Nein", "&Abbrechen", "&Wiederholen", "&Ignorieren", "&Overwrite", "&Rename" };
-            private static readonly String[] BUTTON_TEXTS_SPANISH_ES = { "Aceptar", "Cancelar", "&Sí", "&No", "&Abortar", "&Reintentar", "&Ignorar", "&Overwrite", "&Rename" };
-            private static readonly String[] BUTTON_TEXTS_ITALIAN_IT = { "OK", "Annulla", "&Sì", "&No", "&Interrompi", "&Riprova", "&Ignora", "&Overwrite", "&Rename" };
+            private static readonly string[] BUTTON_TEXTS_ENGLISH_EN = { "OK", "Cancel", "&Yes", "&No", "&Abort", "&Retry", "&Ignore", "&Overwrite", "&Rename" }; //Note: This is also the fallback language
+            private static readonly string[] BUTTON_TEXTS_GERMAN_DE = { "OK", "Abbrechen", "&Ja", "&Nein", "&Abbrechen", "&Wiederholen", "&Ignorieren", "&Overwrite", "&Rename" };
+            private static readonly string[] BUTTON_TEXTS_SPANISH_ES = { "Aceptar", "Cancelar", "&Sí", "&No", "&Abortar", "&Reintentar", "&Ignorar", "&Overwrite", "&Rename" };
+            private static readonly string[] BUTTON_TEXTS_ITALIAN_IT = { "OK", "Annulla", "&Sì", "&No", "&Interrompi", "&Riprova", "&Ignora", "&Overwrite", "&Rename" };
 
             #endregion
 
@@ -451,7 +417,7 @@ namespace JR.Utils.GUI.Forms
 
             private MessageBoxDefaultButton defaultButton;
             private int visibleButtonsCount;
-            private TwoLetterISOLanguageID languageID = TwoLetterISOLanguageID.en;
+            private readonly TwoLetterISOLanguageID languageID = TwoLetterISOLanguageID.en;
 
             #endregion
 
@@ -758,9 +724,9 @@ namespace JR.Utils.GUI.Forms
                 /// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
                 private void FlexibleMessageBoxForm_Shown(object sender, EventArgs e)
             {
-                int buttonIndexToFocus = 1;
                 Button buttonToFocus;
 
+                int buttonIndexToFocus;
                 //Set the default button...
                 switch (this.defaultButton)
                 {
@@ -799,7 +765,7 @@ namespace JR.Utils.GUI.Forms
             /// </summary>
             /// <param name="sender">The source of the event.</param>
             /// <param name="e">The <see cref="System.Windows.Forms.LinkClickedEventArgs"/> instance containing the event data.</param>
-            private void richTextBoxMessage_LinkClicked(object sender, LinkClickedEventArgs e)
+            private void RichTextBoxMessage_LinkClicked(object sender, LinkClickedEventArgs e)
             {
                 try
                 {
@@ -877,12 +843,14 @@ namespace JR.Utils.GUI.Forms
             public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton)
             {
                 //Create a new instance of the FlexibleMessageBox form
-                var flexibleMessageBoxForm = new FlexibleMessageBoxForm();
-                flexibleMessageBoxForm.ShowInTaskbar = false;
+                var flexibleMessageBoxForm = new FlexibleMessageBoxForm
+                {
+                    ShowInTaskbar = false,
 
-                //Bind the caption and the message text
-                flexibleMessageBoxForm.CaptionText = caption;
-                flexibleMessageBoxForm.MessageText = text;
+                    //Bind the caption and the message text
+                    CaptionText = caption,
+                    MessageText = text
+                };
                 flexibleMessageBoxForm.FlexibleMessageBoxFormBindingSource.DataSource = flexibleMessageBoxForm;
 
                 //Set the buttons visibilities and texts. Also set a default button.
@@ -914,15 +882,18 @@ namespace JR.Utils.GUI.Forms
             /// <param name="icon">The icon.</param>
             /// <param name="defaultButton">The default button.</param>
             /// <returns>The dialog result.</returns>
+            [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "Keeping buttons for legacy reasons")]
             public static DialogResult ShowCustom(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon)
             {
                 //Create a new instance of the FlexibleMessageBox form
-                var flexibleMessageBoxForm = new FlexibleMessageBoxForm();
-                flexibleMessageBoxForm.ShowInTaskbar = false;
+                var flexibleMessageBoxForm = new FlexibleMessageBoxForm
+                {
+                    ShowInTaskbar = false,
 
-                //Bind the caption and the message text
-                flexibleMessageBoxForm.CaptionText = caption;
-                flexibleMessageBoxForm.MessageText = text;
+                    //Bind the caption and the message text
+                    CaptionText = caption,
+                    MessageText = text
+                };
                 flexibleMessageBoxForm.FlexibleMessageBoxFormBindingSource.DataSource = flexibleMessageBoxForm;
 
                 //Set the buttons visibilities and texts. Also set a default button.

PROMS/Formats/Formats.csproj

@@ -66,6 +66,7 @@
     <Compile Include="frmFormatCopy.Designer.cs">
       <DependentUpon>frmFormatCopy.cs</DependentUpon>
     </Compile>
+    <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <EmbeddedResource Include="frmFormatCopy.resx">
@@ -179,6 +180,7 @@
     <Content Include="fmtall\CPL_00all.xml" />
     <Content Include="fmtall\CPL_01all.xml" />
     <Content Include="fmtall\CPL_02all.xml" />
+    <Content Include="fmtall\CPL_04all.xml" />
     <Content Include="fmtall\CPL_03all.xml" />
     <Content Include="fmtall\CPSAMGDataall.xml" />
     <Content Include="fmtall\CPSAMGDEVall.xml" />

PROMS/Formats/GlobalSuppressions.cs

@@ -0,0 +1,8 @@
+// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Not modifying Naming Styles")]

PROMS/Formats/Program.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Windows.Forms;
 
 namespace Formats

PROMS/Formats/frmFormatCopy.cs

@@ -1,9 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.IO;
 using System.Windows.Forms;
 
@@ -28,7 +23,7 @@ namespace Formats
 				txbxPROMSFormatsPath.Text = savedFormatPath;
 			else
 			{
-				string curFolder = Environment.CurrentDirectory; // C:\development/PROMS/Formats/bin/debug
+				string curFolder = Environment.CurrentDirectory; // .../PROMS/Formats/bin/debug
 				int idx = curFolder.ToUpper().IndexOf(@"\PROMS\");
 				txbxPROMSFormatsPath.Text = curFolder.Substring(0, idx);
 			}
@@ -40,9 +35,8 @@ namespace Formats
 			DirectoryInfo di = new DirectoryInfo(path);
 			if (di.Exists == false) //return;
 			{
-				DialogResult dlgrslt = DialogResult.No;
-				dlgrslt = MessageBox.Show(string.Format("{0} does not exist. Create it?", path), "Create Folder?", MessageBoxButtons.YesNo);
-				if (dlgrslt == DialogResult.Yes)
+                DialogResult dlgrslt = MessageBox.Show(string.Format("{0} does not exist. Create it?", path), "Create Folder?", MessageBoxButtons.YesNo);
+                if (dlgrslt == DialogResult.Yes)
 				{
 					di.Create();
 					di.CreateSubdirectory("fmtall");
@@ -86,10 +80,11 @@ namespace Formats
 
 		private void btnBrowse_Click(object sender, EventArgs e)
 		{
-			FolderBrowserDialog fbd = new FolderBrowserDialog();
-
-			fbd.SelectedPath = txbxPROMSFormatsPath.Text;
-			if (fbd.ShowDialog() == DialogResult.OK)
+            FolderBrowserDialog fbd = new FolderBrowserDialog
+            {
+                SelectedPath = txbxPROMSFormatsPath.Text
+            };
+            if (fbd.ShowDialog() == DialogResult.OK)
 			{
 				if (Directory.Exists(fbd.SelectedPath)) txbxPROMSFormatsPath.Text = fbd.SelectedPath + @"\";
 			}
@@ -116,9 +111,9 @@ namespace Formats
 			if (!txbxPROMSFormatsPath.Text.EndsWith(@"\")) txbxPROMSFormatsPath.Text += @"\";
 
 			// There should be a "fmtall" and "genmacall" folder in the delelopment project folder
-			// ex: C:\development\PROMS\Formats\fmtall and C:\development\PROMS\Formats\genmacall
-			string destFmtallPath = txbxPROMSFormatsPath.Text + @"fmtall\";
-			string destGenmacallPath = txbxPROMSFormatsPath.Text + @"genmacall\";
+			// ex: ...\PROMS\Formats\fmtall and ...\PROMS\Formats\genmacall
+			string destFmtallPath = $@"{txbxPROMSFormatsPath.Text}fmtall\";
+			string destGenmacallPath = $@"{txbxPROMSFormatsPath.Text}genmacall\";
 			string srcFmtallPath = @"..\..\"; // up to levels from startup path
 
 			// clear the destination fmtall and genmacall folders
@@ -156,14 +151,10 @@ namespace Formats
 			}
 			Properties.Settings.Default.FormatPath = txbxPROMSFormatsPath.Text.Substring(0,txbxPROMSFormatsPath.Text.Length-1); // save the copy format path minus the ending backslash
 			Properties.Settings.Default.Save();
-			//if(MessageBox.Show("Do you want to end the Format Copier?","Formats Copied.", MessageBoxButtons.YesNo, MessageBoxIcon.Question)== DialogResult.Yes)
-				Application.Exit();
-		}
-
-		private void buttonX2_Click(object sender, EventArgs e)
-		{
 			Application.Exit();
 		}
 
-	}
+        private void buttonX2_Click(object sender, EventArgs e) => Application.Exit();
+
+    }
 }

PROMS/LBWordLibrary/GlobalSuppressions.cs

@@ -0,0 +1,8 @@
+// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Not modifying Naming Styles")]

PROMS/LBWordLibrary/LBWordLibrary.csproj

@@ -79,6 +79,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="LBComObject.cs" />
     <Compile Include="LBObjectExtension.cs" />
     <Compile Include="OutlookLBComObject.cs" />

PROMS/LBWordLibrary/OutlookLBComObject.cs

@@ -1,64 +1,45 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Reflection;
 
 namespace LBOutlookLibrary
 {
 	public abstract partial class LBComObject
 	{
-		private Object _Item;
-		internal Object Item
+		private object _Item;
+		internal object Item
 		{
 			get { return _Item; }
 			set
 			{
 				_Item = value;
-				if (value != null) _MyType = _Item.GetType();
+				if (value != null) MyType = _Item.GetType();
 			}
 		}
-		private Type _MyType;
-		public Type MyType
-		{
-			get { return _MyType; }
-			set { _MyType = value; }
-		}
-		protected LBComObject() { }
+
+        public Type MyType { get; set; }
+        protected LBComObject() { }
 		protected LBComObject(string ProgID)
 		{
 			Type objClassType;
 			objClassType = Type.GetTypeFromProgID(ProgID);
 			Item = Activator.CreateInstance(objClassType);
 		}
-		protected LBComObject(Object item)
-		{
-			Item = item;
-		}
-		private Object DoInvokeMember(string name, Object[] parameters, BindingFlags bf, Binder b)
+        protected LBComObject(object item) => Item = item;
+        private object DoInvokeMember(string name, object[] parameters, BindingFlags bf, Binder b)
 		{
 			try
 			{
-				return _MyType.InvokeMember(name, bf, b, _Item, parameters);
+				return MyType.InvokeMember(name, bf, b, _Item, parameters);
 			}
 			catch (Exception ex)
 			{
-				throw new Exception(string.Format("LBComObject.DoInvokeMember {0}.{1}", _MyType.Name, name), ex);
+				throw new Exception(string.Format("LBComObject.DoInvokeMember {0}.{1}", MyType.Name, name), ex);
 			}
-			return null;
 		}
-		protected void SetProperty(string propertyName, params Object[] parameters)
-		{
-			DoInvokeMember(propertyName, parameters, BindingFlags.SetProperty, null);
-		}
-		protected Object GetProperty(string propertyName)
-		{
-			return DoInvokeMember(propertyName, null, BindingFlags.GetProperty, null);
-		}
-		protected Object GetProperty(string propertyName, params Object[] parameters)
-		{
-			return DoInvokeMember(propertyName, parameters, BindingFlags.GetProperty, null);
-		}
-		protected Object InvokeMethod(string methodName, params Object[] parameters)
+        protected void SetProperty(string propertyName, params object[] parameters) => DoInvokeMember(propertyName, parameters, BindingFlags.SetProperty, null);
+        protected object GetProperty(string propertyName) => DoInvokeMember(propertyName, null, BindingFlags.GetProperty, null);
+        protected object GetProperty(string propertyName, params object[] parameters) => DoInvokeMember(propertyName, parameters, BindingFlags.GetProperty, null);
+        protected object InvokeMethod(string methodName, params object[] parameters)
 		{
 			if (parameters != null)
 				FixParameters(parameters);
@@ -71,45 +52,15 @@ namespace LBOutlookLibrary
 				if (parameters[i] is LBComObject)
 					parameters[i] = (parameters[i] as LBComObject).Item;
 		}
-		protected Object InvokeMethod(string methodName)
-		{
-			return InvokeMethod(methodName, null);
-		}
-	}
-	public class LBComObjectList<TList, TItem> : LBComObject
-		where TList : LBComObjectList<TList, TItem>
-		where TItem : LBComObject, new()
-	{
-		//public new(Object item):base(item){}
-		public TItem Add()
-		{
-			TItem tmp = new TItem();
-			tmp.Item = InvokeMethod("Add");
-			return tmp;
-		}
-		//public TItem this[int item]
-		//{
-		//	get
-		//	{
-		//		TItem tmp = new TItem();
-		//		tmp.Item = GetProperty("Item", item);
-		//		return tmp;
-		//	}
-		//}
-	}
+        protected object InvokeMethod(string methodName) => InvokeMethod(methodName, null);
+    }
 	public partial class LBApplicationClass : LBComObject
 	{
 		public LBApplicationClass() : base("Outlook.Application") { }
-		public LBApplicationClass(Object item) : base(item) { }
-		public System.Object CreateItem(LBOlItemType ItemType)
-		{
-			return InvokeMethod("CreateItem", ItemType);
-		}
-		public void Quit()
-		{
-			InvokeMethod("Quit");
-		}
-	}
+		public LBApplicationClass(object item) : base(item) { }
+        public object CreateItem(LBOlItemType ItemType) => InvokeMethod("CreateItem", ItemType);
+        public void Quit() => InvokeMethod("Quit");
+    }
 	public enum LBOlItemType
 	{
 		olMailItem = 0,
@@ -124,13 +75,13 @@ namespace LBOutlookLibrary
 	public partial class LBMailItem : LBComObject
 	{
 		public LBMailItem() { }
-		public LBMailItem(Object item) : base(item) { }
+		public LBMailItem(object item) : base(item) { }
 	}
 	public partial class LBMailItemClass : LBComObject
 	{
 		public LBMailItemClass() { }
-		public LBMailItemClass(Object item) : base(item) { }
-		public String Body
+		public LBMailItemClass(object item) : base(item) { }
+		public string Body
 		{
 			get { return (GetProperty("Body").ToString()); }
 			set { SetProperty("Body", value); }
@@ -140,29 +91,20 @@ namespace LBOutlookLibrary
 			get { return (LBOlBodyFormat)GetProperty("BodyFormat"); }
 			set { SetProperty("BodyFormat", value); }
 		}
-		public LBAttachments Attachments
-		{
-			get { return new LBAttachments(GetProperty("Attachments")); }
-		}
-		public String Subject
+        public LBAttachments Attachments => new LBAttachments(GetProperty("Attachments"));
+        public string Subject
 		{
 			get { return (GetProperty("Subject").ToString()); }
 			set { SetProperty("Subject", value); }
 		}
-		public LBRecipients Recipients
-		{
-			get { return new LBRecipients(GetProperty("Recipients")); }
-		}
-		public String To
+        public LBRecipients Recipients => new LBRecipients(GetProperty("Recipients"));
+        public string To
 		{
 			get { return (GetProperty("To").ToString()); }
 			set { SetProperty("To", value); }
 		}
-		public void Send()
-		{
-			InvokeMethod("Send");
-		}
-	}
+        public void Send() => InvokeMethod("Send");
+    }
 	public enum LBOlBodyFormat
 	{
 		olFormatUnspecified = 0,
@@ -173,79 +115,40 @@ namespace LBOutlookLibrary
 	public partial class LBAttachments : LBComObject
 	{
 		public LBAttachments() { }
-		public LBAttachments(Object item) : base(item) { }
-		public int Count
-		{
-			get { return (GetProperty("Count") as int? ?? 0); }
-		}
-		public LBAttachment Item
-		{
-			get { return new LBAttachment(GetProperty("Item")); }
-		}
-		public LBAttachment Add(object Source)
-		{
-			return new LBAttachment(InvokeMethod("Add", Source, Missing.Value, Missing.Value, Missing.Value));
-		}
-		public LBAttachment Add(object Source, object Type, object Position, object DisplayName)
+		public LBAttachments(object item) : base(item) { }
+        public int Count => (GetProperty("Count") as int? ?? 0);
+        public new LBAttachment Item => new LBAttachment(GetProperty("Item"));
+        public LBAttachment Add(object Source) => new LBAttachment(InvokeMethod("Add", Source, Missing.Value, Missing.Value, Missing.Value));
+        public LBAttachment Add(object Source, object Type, object Position, object DisplayName)
 		{
 			return new LBAttachment(InvokeMethod("Add", Source, Type, Position, DisplayName));
 		}
-		public void Remove(int Index)
-		{
-			InvokeMethod("Remove", Index);
-		}
-	}
+        public void Remove(int Index) => InvokeMethod("Remove", Index);
+    }
 	public partial class LBRecipients : LBComObject
 	{
 		public LBRecipients() { }
-		public LBRecipients(Object item) : base(item) { }
-		public int Count
-		{
-			get { return (GetProperty("Count") as int? ?? 0); }
-		}
-		public LBRecipient Item
-		{
-			get { return new LBRecipient(GetProperty("Item")); }
-		}
-		public LBRecipient Add(string Name)
-		{
-			return new LBRecipient(InvokeMethod("Add", Name));
-		}
-		public void Remove(int Index)
-		{
-			InvokeMethod("Remove", Index);
-		}
-		public Boolean ResolveAll()
-		{
-			return InvokeMethod("ResolveAll") as Boolean? ?? false;
-		}
-	}
+		public LBRecipients(object item) : base(item) { }
+        public int Count => (GetProperty("Count") as int? ?? 0);
+        public new LBRecipient Item => new LBRecipient(GetProperty("Item"));
+        public LBRecipient Add(string Name) => new LBRecipient(InvokeMethod("Add", Name));
+        public void Remove(int Index) => InvokeMethod("Remove", Index);
+        public bool ResolveAll() => InvokeMethod("ResolveAll") as bool? ?? false;
+    }
 	public partial class LBAttachment : LBComObject
 	{
 		public LBAttachment() { }
-		public LBAttachment(Object item) : base(item) { }
-		public LBOlAttachmentType Type
-		{
-			get { return (LBOlAttachmentType)GetProperty("Type"); }
-		}
-	}
+		public LBAttachment(object item) : base(item) { }
+        public LBOlAttachmentType Type => (LBOlAttachmentType)GetProperty("Type");
+    }
 	public partial class LBRecipient : LBComObject
 	{
 		public LBRecipient() { }
-		public LBRecipient(Object item) : base(item) { }
-		public String Address
-		{
-			get { return (GetProperty("Address").ToString()); }
-		}
-		public String Name
-		{
-			get { return (GetProperty("Name").ToString()); }
-		}
-		public Boolean Resolve()
-		{
-			return InvokeMethod("Resolve") as Boolean? ?? false;
-		}
-	}
+		public LBRecipient(object item) : base(item) { }
+        public string Address => (GetProperty("Address").ToString());
+        public string Name => (GetProperty("Name").ToString());
+        public bool Resolve() => InvokeMethod("Resolve") as bool? ?? false;
+    }
 	public enum LBOlAttachmentType
 	{
 		olByValue = 1,

PROMS/LBWordLibrary/OutlookLBComObjectExt.cs

@@ -1,21 +1,13 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace LBOutlookLibrary
 {
 	public partial class LBApplicationClass
 	{
-		public LBMailItemClass CreateMailItem()
-		{
-			return new LBMailItemClass(CreateItem(LBOlItemType.olMailItem));
-		}
-	}
+        public LBMailItemClass CreateMailItem() => new LBMailItemClass(CreateItem(LBOlItemType.olMailItem));
+    }
 	public partial class LBMailItemClass
 	{
-		public void AddAttachment(string filename)
-		{
-			Attachments.Add(filename, LBOlAttachmentType.olByValue, Type.Missing, Type.Missing);
-		}
-	}
+        public void AddAttachment(string filename) => Attachments.Add(filename, LBOlAttachmentType.olByValue, Type.Missing, Type.Missing);
+    }
 }

PROMS/LBWordLibrary/RegHive.cs

@@ -49,19 +49,13 @@ namespace Read64bitRegistryFrom32bitApp
 				ref uint lpType,
 				System.Text.StringBuilder lpData,
 				ref uint lpcbData);
-		#endregion
-		#endregion
+        #endregion
+        #endregion
 
-		#region Functions
-		static public string GetRegKey64Value(UIntPtr inHive, String inKeyName, String inPropertyName)
-		{
-			return GetRegKey64Value(inHive, inKeyName, RegSAM.WOW64_64Key, inPropertyName);
-		}
-		static public string GetRegKey32Value(UIntPtr inHive, String inKeyName, String inPropertyName)
-		{
-			return GetRegKey64Value(inHive, inKeyName, RegSAM.WOW64_32Key, inPropertyName);
-		}
-		static public string GetRegKey64Value(UIntPtr inHive, String inKeyName, RegSAM in32or64key, String inPropertyName)
+        #region Functions
+        static public string GetRegKey64Value(UIntPtr inHive, string inKeyName, string inPropertyName) => GetRegKey64Value(inHive, inKeyName, RegSAM.WOW64_64Key, inPropertyName);
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "inHive kept to match dll signature")]
+        static public string GetRegKey64Value(UIntPtr inHive, string inKeyName, RegSAM in32or64key, string inPropertyName)
 		{
 			int hkey = 0;
 			try
@@ -80,15 +74,10 @@ namespace Read64bitRegistryFrom32bitApp
 				if (0 != hkey) RegCloseKey(hkey);
 			}
 		}
-		static public bool CheckRegKey64Valid(UIntPtr inHive, String inKeyName)
-		{
-			return CheckRegKey64Valid(inHive, inKeyName, RegSAM.WOW64_64Key);
-		}
-		static public bool GetRegKey32Valid(UIntPtr inHive, String inKeyName)
-		{
-			return CheckRegKey64Valid(inHive, inKeyName, RegSAM.WOW64_32Key);
-		}
-		static public bool CheckRegKey64Valid(UIntPtr inHive, String inKeyName, RegSAM in32or64key)
+        static public bool CheckRegKey64Valid(UIntPtr inHive, string inKeyName) => CheckRegKey64Valid(inHive, inKeyName, RegSAM.WOW64_64Key);
+        static public bool GetRegKey32Valid(UIntPtr inHive, string inKeyName) => CheckRegKey64Valid(inHive, inKeyName, RegSAM.WOW64_32Key);
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "inHive kept to match dll signature")]
+        static public bool CheckRegKey64Valid(UIntPtr inHive, string inKeyName, RegSAM in32or64key)
 		{
 			int hkey = 0;
 			try
@@ -103,8 +92,5 @@ namespace Read64bitRegistryFrom32bitApp
 			}
 		}
 		#endregion
-
-		#region Enums
-		#endregion
 	}
 }

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

@@ -418,7 +418,7 @@ namespace ROEditor
 			//           NOTE: not doing the "Using System.Threading;" statement at beginning of file because it conflicts with the declaration of the "Timer" variable
 			System.Threading.Thread.CurrentThread.CurrentCulture = new System.Globalization.CultureInfo("en-US");
 
-			// The data path the was passed in.
+			// The data path the was passed in.	
 			DbConnectPath = PassedInPath;
 
 			// Setup the context menu
@@ -2844,7 +2844,8 @@ namespace ROEditor
 			}
 			else
 			{
-				newt=null;
+				mnutitle = Regex.Replace(mnutitle, @"\\u([0-9]{1,4})\?", m => Convert.ToChar(int.Parse(m.Groups[1].Value)).ToString()); // RO Editor add symbols C2022
+				newt =null;
 				success = myrodb.RODB_WriteRO((VlnXmlElement)roTreeView.SelectedNode.Tag);
 				if (success==true && mnutitle != "") roTreeView.SelectedNode.Text = mnutitle; //B2021-077 make sure mnutitle has text or it will clear the node's title in the tree
 			}

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

@@ -116,12 +116,12 @@ namespace ROEditor
 		public uint thisoff;
 		public string title;
 
-		public FstTmpSTRC(ushort type, uint offset, string tl)
+        public FstTmpSTRC(ushort type, uint offset, string tl)
 		{
 			thistype = type;
 			thisoff = offset;
 			title = tl;
-		}
+        }
 
 		void WriteString(BinaryWriter bw, string str)
 		{
@@ -150,7 +150,7 @@ namespace ROEditor
 			bw.Write(thisoff);
 			bw.Write(thistype);
 			WriteString(bw,title);
-		}
+        }
 	}
 
 // The Sorted Array was not sorting via the ASCII value of each character in a given string.
@@ -565,8 +565,8 @@ namespace ROEditor
 			string RecIdStr = elem.GetAttribute("RecID");
 			curRecID = System.Convert.ToUInt32(RecIdStr,16);
 
-			// Get the current node's parent id
-			string ParIdStr = elem.GetAttribute("ParentID");
+            // Get the current node's parent id
+            string ParIdStr = elem.GetAttribute("ParentID");
 			elemParentID = Convert.ToUInt32(ParIdStr,16);
 
 			string HasKids = elem.GetAttribute("HasChild");
@@ -771,8 +771,8 @@ namespace ROEditor
 		private ushort SaveROToFST(XmlNode RONode,ArrayList InUseList,string RtnValTmplate, string AccPageIDTplate)
 		{
 			ushort RtnVal;
-			uint startFST = (uint)fhFST.BaseStream.Position;
-			uint RORecID;
+            uint startFST = (uint)fhFST.BaseStream.Position;
+            uint RORecID;
 			uint ParID;
 			byte nullbyte=0;
 
@@ -844,8 +844,12 @@ namespace ROEditor
 				AccPageID = " ";
 			WriteString(AccPageID);
 
-			// Save the ID and offset entry for the current ID
-			IdsAndOffsets.Add(RORecID,startFST);
+            //C2026-008 Re-Architect RO.FST to include RO Modification date/time
+            string moddt = ROdatabase.RODB_GetModDateTime(elem.GetAttribute("RecID"), elem.GetAttribute("Table"));
+            if (!string.IsNullOrEmpty(moddt)) WriteString(moddt);
+
+            // Save the ID and offset entry for the current ID
+            IdsAndOffsets.Add(RORecID, startFST);
 
 			// Save the RecID and Accessory Page id
 			IdsAndAccPgIds[AccPageID] = RORecID;

PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs

@@ -322,9 +322,9 @@ namespace RODBInterface
 			get { return _PCChildList; } 
 			set { _PCChildList = value; } 
 		}
-		#endregion
-		#region abstracts   // need these for each method that must be defined for each database type
-		public abstract string RODB_GetNextGroupTable();
+        #endregion
+        #region abstracts   // need these for each method that must be defined for each database type
+        public abstract string RODB_GetNextGroupTable();
 		public abstract string RODB_GetNextRecId(string table);
 		public abstract bool RODB_GetRootGroups(VlnXmlElement root);
 		public abstract bool RODB_DeleteGroup(XmlNode group, string tbname, string toprecid);
@@ -355,9 +355,10 @@ namespace RODBInterface
 		public abstract string RODB_GetDBServerForAbout();
 		public abstract string RODB_HasBeenConverted();
 		public abstract bool RODB_WriteSqlConnectToAccess(string newConectStr);
-		#endregion
+		public abstract string RODB_GetModDateTime(string Recid, string table);
+        #endregion
 
-		public RODB()
+        public RODB()
 		{
 
 		}
@@ -2142,7 +2143,20 @@ namespace RODBInterface
 					wraccid = accid;
 				string dt = string.Format("{0:yyyyMMddHHmmss}", System.DateTime.Now);
 				string xmlstr = GenerateXmlString(ro, false);
-				string strUpdate = "UPDATE " + ro.GetAttribute("Table") + " SET Info = '" + xmlstr + "'";
+				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() + "'";
 				if (movedRO)
 				{
 					VlnXmlElement parent = (VlnXmlElement)ro.ParentNode;
@@ -2186,6 +2200,20 @@ namespace RODBInterface
 			}
 			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"))
 			{
@@ -2209,13 +2237,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 + "','" + xmlstr + "');";
+					strInsert = strInsert + "','" + wraccid + "','" + dt + "','" + xmlstrTmp.ToString() + "');";
 				}
 				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 + "','" + xmlstr + "');";
+					strInsert = strInsert + "','" + dt + "','" + xmlstrTmp.ToString() + "');";
 				}
 
 			}
@@ -2223,7 +2251,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 + "','" + xmlstr + "');";
+				strInsert = strInsert + "','" + wraccid + "','" + dt + "','" + xmlstrTmp.ToString() + "');";
 			}
 
 			try
@@ -2355,9 +2383,9 @@ namespace RODBInterface
 				RecID = DBE.GetString(0);
 				MyRecID = RecID;
 				Info = DBE.GetString(1);
-				// it's defined in the local table if the first character is "<" which starts
-				// the schema definition string.
-				if ("<" == Info.Substring(0, 1))
+                // it's defined in the local table if the first character is "<" which starts
+                // the schema definition string.
+                if ("<" == Info.Substring(0, 1))
 				{
 					name = ParseEleName(Info);
 					if (name != null)
@@ -2398,7 +2426,7 @@ namespace RODBInterface
 			return retlist;
 		}
 
-		public override string RODB_GetSchemaPiece(string Recid, string table)
+        public override string RODB_GetSchemaPiece(string Recid, string table)
 		{
 			string strGetSchemaPiece;
 			string Info;
@@ -2631,7 +2659,21 @@ 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();
@@ -3041,7 +3083,28 @@ namespace RODBInterface
 			return GrpCnt;
 		}
 
-	}
+        //C2026-008 Re-Architect RO.FST to include RO Modification date/time
+        //Get the Modification Date / Time for the RO
+        public override string RODB_GetModDateTime(string Recid, string table)
+        {
+            using (System.Data.OleDb.OleDbConnection connection = new System.Data.OleDb.OleDbConnection(strDatabaseConnectionCommand))
+            {
+				connection.Open();
+                using (System.Data.OleDb.OleDbCommand command = connection.CreateCommand())
+                {
+					//Unfortunately Access wont let you paramaterize the table name
+                    command.CommandText = $"SELECT ModDateTime FROM {Regex.Replace(table, "[^a-zA-Z0-9]", "")} WHERE RecID = @Value";
+                    command.Parameters.Add(new System.Data.OleDb.OleDbParameter
+                    {
+                        OleDbType = System.Data.OleDb.OleDbType.VarChar,
+                        ParameterName = "@Value",
+                        Value = Recid
+                    });
+                    return command.ExecuteScalar().ToString();
+                }
+            }
+        }
+    }
 }
 
 

PROMS/ReferencedObjects/LibSource/RODBInterface/SqlRODB.cs

@@ -1803,9 +1803,9 @@ namespace RODBInterface
 							RecID = reader.GetString(0);
 							MyRecID = RecID;
 							Info = reader.GetString(1);
-							// it's defined in the local table if the first character is "<" which starts
-							// the schema definition string.
-							if ("<" == Info.Substring(0, 1))
+                            // it's defined in the local table if the first character is "<" which starts
+                            // the schema definition string.
+                            if ("<" == Info.Substring(0, 1))
 							{
 								name = ParseEleName(Info);
 								if (name != null)
@@ -1859,9 +1859,9 @@ namespace RODBInterface
 								RecID = reader.GetString(0);
 								MyRecID = RecID;
 								Info = reader.GetString(1);
-								// it's defined in the local table if the first character is "<" which starts
-								// the schema definition string.
-								if ("<" == Info.Substring(0, 1))
+                                // it's defined in the local table if the first character is "<" which starts
+                                // the schema definition string.
+                                if ("<" == Info.Substring(0, 1))
 								{
 									name = ParseEleName(Info);
 									if (name != null)
@@ -2653,8 +2653,36 @@ namespace RODBInterface
 			}
 			return GrpCnt;
 		}
-		#endregion
-		public static bool TestConnect(string constring)
+
+        //C2026-008 Re-Architect RO.FST to include RO Modification date/time
+        //Get the Modification Date / Time for the RO
+        public override string RODB_GetModDateTime(string Recid, string table)
+        {
+            using (SqlConnection connection = new SqlConnection(strDatabaseConnectionCommand))
+            {
+				connection.Open();
+                using (SqlCommand command = connection.CreateCommand())
+                {
+                    command.CommandText = $"SELECT ModDateTime FROM ROALL WHERE RecID = @Value AND ROTable = @table";
+                    command.Parameters.Add(new SqlParameter
+                    {
+                        SqlDbType = SqlDbType.VarChar,
+                        ParameterName = "@Value",
+                        Value = Recid
+                    });
+                    command.Parameters.Add(new SqlParameter
+                    {
+                        SqlDbType = SqlDbType.VarChar,
+                        ParameterName = "@table",
+                        Value = table
+                    });
+
+                    return command.ExecuteScalar().ToString();
+                }
+            }
+        }
+        #endregion
+        public static bool TestConnect(string constring)
 		{
 			bool success = false;
 			using (SqlConnection connection = new SqlConnection(constring))

PROMS/ReferencedObjects/LibSource/RODBInterface/VlnXml.cs

@@ -96,6 +96,7 @@ 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
@@ -517,7 +518,8 @@ namespace RODBInterface
 								strtmp.Append(" ");
 								cnt++;
 							}
-							if ((cnt + text.Length) > frmt2) // longer than the field length?
+							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?								
 								strtmp.Append(text.Substring(0,frmt2-cnt));
 							else
 								strtmp.Append(text);

PROMS/ReferencedObjects/LibSource/VlnStatus/StatusBarFrm.cs

@@ -19,11 +19,6 @@
  *********************************************************************************************/
 
 using System;
-using System.Drawing;
-using System.Collections;
-using System.ComponentModel;
-using System.Windows.Forms;
-//using ROProfiler; //don't forget to add VlnProfiler to the reference list
 
 namespace VlnStatus
 {
@@ -35,11 +30,6 @@ namespace VlnStatus
 		private System.Windows.Forms.ProgressBar progressBar1;
 		private System.Windows.Forms.Label lblBar;
 		private System.Windows.Forms.Label StatMsg;
-//		private string strLblLast="";
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.Container components = null;
 
 		public StatusBarFrm()
 		{
@@ -61,21 +51,6 @@ namespace VlnStatus
 			Text = StatusBoxTitle;
 		}
 
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		protected override void Dispose( bool disposing )
-		{
-			if( disposing )
-			{
-				if(components != null)
-				{
-					components.Dispose();
-				}
-			}
-			base.Dispose( disposing );
-		}
-
 		#region Windows Form Designer generated code
 		/// <summary>
 		/// Required method for Designer support - do not modify
@@ -190,14 +165,6 @@ namespace VlnStatus
 		{
 			lblBar.Text = (Math.Round((decimal)(progressBar1.Value * 100) / progressBar1.Maximum)).ToString();
 			lblBar.Text += "% Complete";
-//			if( lblBar.Text != strLblLast)
-//			{
-//				Profiler.Start("UpdateLabel");
-				lblBar.Refresh();
-//				lblBar.Update();
-//				Profiler.End("UpdateLabel");
-//			}
-//			strLblLast = lblBar.Text;
 		}
 
 		public string StatusMessage
@@ -209,10 +176,7 @@ namespace VlnStatus
 			set
 			{
 				StatMsg.Text = value;
-//				Profiler.Start("StatusMessage");
 				StatMsg.Refresh();
-//				StatMsg.Update();
-//				Profiler.End("StatusMessage");
 			}
 		}
 

PROMS/ReferencedObjects/LibSource/VlnStatus/StatusMessageFrm.cs

@@ -17,12 +17,6 @@
  * Added overbounds check
  *********************************************************************************************/
 
-using System;
-using System.Drawing;
-using System.Collections;
-using System.ComponentModel;
-using System.Windows.Forms;
-
 namespace VlnStatus
 {
 	/// <summary>
@@ -31,10 +25,6 @@ namespace VlnStatus
 	public class StatusMessageFrm : System.Windows.Forms.Form
 	{
 		private System.Windows.Forms.Label lblStatMsg;
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.Container components = null;
 
 		public StatusMessageFrm()
 		{
@@ -54,21 +44,6 @@ namespace VlnStatus
 			Text = StatTitle;
 		}
 
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		protected override void Dispose( bool disposing )
-		{
-			if( disposing )
-			{
-				if(components != null)
-				{
-					components.Dispose();
-				}
-			}
-			base.Dispose( disposing );
-		}
-
 		#region Windows Form Designer generated code
 		/// <summary>
 		/// Required method for Designer support - do not modify

PROMS/ReferencedObjects/LibSource/VlnStatus/VlnStatusBar.cs

@@ -33,7 +33,7 @@ namespace VlnStatus
 	/// </summary>
 	public class VlnStatusBar
 	{
-		StatusBarFrm StatBar;
+        readonly StatusBarFrm StatBar;
 		private int Cnt;
 
 		// Create a status window with the default title of "Status"
@@ -53,8 +53,6 @@ namespace VlnStatus
 		// Increament the the status bar by the passed in value.
 		public void PerformStep(int val)
 		{
-//			StatBar.Value = val;
-//			Cnt = val;
 			BarValue = val;
 			StatBar.PerformStep();
 		}
@@ -62,7 +60,6 @@ namespace VlnStatus
 		// Increament the the status bar by one
 		public void PerformStep()
 		{
-//			StatBar.Value = StatBar.Value + 1;
 			Cnt++;
 			BarValue = Cnt;
 			StatBar.PerformStep();

PROMS/ReferencedObjects/LibSource/VlnStatus/VlnStatusMessage.cs

@@ -13,8 +13,6 @@
  * Added overbounds check
  *********************************************************************************************/
 
-using System;
-
 namespace VlnStatus
 {
 	/// <summary>
@@ -28,7 +26,7 @@ namespace VlnStatus
 	/// </summary>
 	public class VlnStatusMessage
 	{
-		StatusMessageFrm StatusMessageBox;
+        readonly StatusMessageFrm StatusMessageBox;
 
 		// Create a status window with the default title of "Status"
 		public VlnStatusMessage()

PROMS/RoAccessToSql/GlobalSuppressions.cs

@@ -0,0 +1,8 @@
+// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Not modifying Naming Styles")]

PROMS/RoAccessToSql/Program.cs

@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace RoAccessToSql

PROMS/RoAccessToSql/RoAccessToSql.cs

@@ -1,16 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Data;
 using System.IO;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 using System.Data.SqlClient;
 using System.Data.OleDb;
-using Volian.Base.Library;
 
 [assembly: log4net.Config.XmlConfigurator(Watch = true)]
 
@@ -33,25 +27,11 @@ namespace RoAccessToSql
 	public partial class RoAccessToSql : Form
 	{
 		private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
-		private string _MSAccessPath = null;
-		public string MSAccessPath
-		{
-			get { return _MSAccessPath; }
-			set { _MSAccessPath = value; }
-		}
-		private string _SqlServerName = null;
-		public string SqlServerName
-		{
-			get { return _SqlServerName; }
-			set { _SqlServerName = value; }
-		}
-		private string _SqlDatabaseName = null;
-		public string SqlDatabaseName
-		{
-			get { return _SqlDatabaseName; }
-			set { _SqlDatabaseName = value; }
-		}
-		bool _Initializing = false;
+
+        public string MSAccessPath { get; set; } = null;
+        public string SqlServerName { get; set; } = null;
+        public string SqlDatabaseName { get; set; } = null;
+        readonly bool _Initializing = false;
 
 		public RoAccessToSql(string[] args)
 		{
@@ -66,7 +46,7 @@ namespace RoAccessToSql
 				}
 				else if (parm.StartsWith("/sqldb="))
 				{
-					SqlDatabaseName = parm.Substring(7) + "_RO";
+					SqlDatabaseName = $"{parm.Substring(7)}_RO";
 				}
 				else if (parm.StartsWith("/server="))
 				{
@@ -92,7 +72,7 @@ namespace RoAccessToSql
 			if (UserInRoEditor()) this.Close();
 			tbSqlDbName.Text = SqlDatabaseName;
 			_TmpFileForConnectStr = Path.GetTempPath();
-			_TmpFileForConnectStr = _TmpFileForConnectStr + @"\PromsConnect.txt";
+			_TmpFileForConnectStr += @"\PromsConnect.txt";
 			File.Delete(_TmpFileForConnectStr);
 			_Initializing = false;
 		}
@@ -100,10 +80,10 @@ namespace RoAccessToSql
 		private bool UserInRoEditor()
 		{
 			FileInfo fiown = null;
-			FileStream fsown = null;
-			// The following code was taken from the roeditor. It uses the 'RoEditor.own' file to assure that
-			// no one is in the roeditor. This file is located in the microsoft access database directory.
-			try
+            FileStream fsown;
+            // The following code was taken from the roeditor. It uses the 'RoEditor.own' file to assure that
+            // no one is in the roeditor. This file is located in the microsoft access database directory.
+            try
 			{
 				string filename = MSAccessPath + @"\RoEditor.own";
 				fiown = new FileInfo(filename);
@@ -119,7 +99,7 @@ namespace RoAccessToSql
 					fsown = fiown.Open(FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
 					TextReader tr1 = new StreamReader(fsown);
 					string who1 = tr1.ReadToEnd();
-					MessageBox.Show(ex.Message + "\r\n\r\n" + who1, "RO Editor In Use", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+					MessageBox.Show($"{ex.Message}\r\n\r\n{who1}", "RO Editor In Use", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
 				}
 				fsown = fiown.Open(FileMode.OpenOrCreate, FileAccess.Read, FileShare.ReadWrite);
 				TextReader tr = new StreamReader(fsown);
@@ -142,8 +122,8 @@ namespace RoAccessToSql
 				tw.WriteLine("Current User:  {0}, Date and Time Started:  {1}", Environment.UserName.ToUpper(), DateTime.Now.ToString("MM/dd/yyyy @ hh:mm"));
 				tw.Flush();
 			}
-			catch (IOException ex)
-			{
+			catch (IOException)
+            {
 				fsown = fiown.Open(FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
 				TextReader tr = new StreamReader(fsown);
 				string who = tr.ReadToEnd();
@@ -154,25 +134,20 @@ namespace RoAccessToSql
 			}
 			return false;
 		}
-		static string _ErrorLogFileName;
-		public static string ErrorLogFileName
-		{
-			get { return _ErrorLogFileName; }
-			set { _ErrorLogFileName = value; }
-		}
-		// make error log file name (uses same logic as proms error log)
-		static bool ChangeLogFileName(string AppenderName, string NewFilename)
+
+        public static string ErrorLogFileName { get; set; }
+        // make error log file name (uses same logic as proms error log)
+        static bool ChangeLogFileName(string AppenderName, string NewFilename)
 		{
 			log4net.Repository.ILoggerRepository RootRep;
 			RootRep = log4net.LogManager.GetRepository();
 			foreach (log4net.Appender.IAppender iApp in RootRep.GetAppenders())
 			{
 				if (iApp.Name.CompareTo(AppenderName) == 0
-				&& iApp is log4net.Appender.FileAppender)
-				{
-					log4net.Appender.FileAppender fApp = (log4net.Appender.FileAppender)iApp;
+				&& iApp is log4net.Appender.FileAppender fApp)
+                {
 					string folderPath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);
-					fApp.File = folderPath + @"\VEPROMS\" + (Volian.Base.Library.VlnSettings.GetCommand("prefix", "") + "_").TrimStart("_".ToCharArray()) + NewFilename;
+					fApp.File = $@"{folderPath}\VEPROMS\{($"{Volian.Base.Library.VlnSettings.GetCommand("prefix", "")}_").TrimStart("_".ToCharArray())}{NewFilename}";
 					ErrorLogFileName = fApp.File;
 					fApp.ActivateOptions();
 					return true;
@@ -189,7 +164,7 @@ namespace RoAccessToSql
 				if (Directory.Exists(fbd.SelectedPath))
 					tbAccessPath.Text = fbd.SelectedPath;
 				else
-					MessageBox.Show("Path doesn't exist " + tbAccessPath.Text);
+					MessageBox.Show($"Path doesn't exist {tbAccessPath.Text}");
 			}
 		}
 		// Convert the data
@@ -212,7 +187,7 @@ namespace RoAccessToSql
 		{
 			DateTime dtSunday = DateTime.Now.AddDays(-((int)DateTime.Now.DayOfWeek));
 
-			ChangeLogFileName("LogFileAppender", SqlDatabaseName + " " + dtSunday.ToString("yyyyMMdd") + " ErrorLog.txt");
+			ChangeLogFileName("LogFileAppender", $"{SqlDatabaseName} {dtSunday:yyyyMMdd} ErrorLog.txt");
 			_MyLog.InfoFormat("\r\nSession Beginning\r\n<===={0}[SQL:{1:yyMM.ddHH}]====== User: {2}/{3} Started {4} ===============>{5}"
 				, Application.ProductVersion, RevDate, DateTime.Now, Environment.UserDomainName, Environment.UserName, DateTime.Now.ToString("dddd MMMM d, yyyy h:mm:ss tt"), "");
 		}
@@ -229,7 +204,7 @@ namespace RoAccessToSql
 					if (sqlConnection.State == ConnectionState.Open)
 					{
 						// now try to open access db:
-						string strDatabaseConnectionCommand = "Provider=Microsoft.ACE.OLEDB.12.0;Password=\"\";User ID=Admin;Data Source=" + MSAccessPath + "\\ROMaster.mdb;Mode=Share Deny None;Extended Properties=\"\";Jet OLEDB:System database=\"\";Jet OLEDB:Registry Path=\"\";Jet OLEDB:Database Password=\"\";Jet OLEDB:Engine Type=5;Jet OLEDB:Database Locking Mode=1;Jet OLEDB:Global Partial Bulk Ops=2;Jet OLEDB:Global Bulk Transactions=1;Jet OLEDB:New Database Password=\"\";Jet OLEDB:Create System Database=False;Jet OLEDB:Encrypt Database=False;Jet OLEDB:Don't Copy Locale on Compact=False;Jet OLEDB:Compact Without Replica Repair=False;Jet OLEDB:SFP=False";
+						string strDatabaseConnectionCommand = $"Provider=Microsoft.ACE.OLEDB.12.0;Password=\"\";User ID=Admin;Data Source={MSAccessPath}\\ROMaster.mdb;Mode=Share Deny None;Extended Properties=\"\";Jet OLEDB:System database=\"\";Jet OLEDB:Registry Path=\"\";Jet OLEDB:Database Password=\"\";Jet OLEDB:Engine Type=5;Jet OLEDB:Database Locking Mode=1;Jet OLEDB:Global Partial Bulk Ops=2;Jet OLEDB:Global Bulk Transactions=1;Jet OLEDB:New Database Password=\"\";Jet OLEDB:Create System Database=False;Jet OLEDB:Encrypt Database=False;Jet OLEDB:Don't Copy Locale on Compact=False;Jet OLEDB:Compact Without Replica Repair=False;Jet OLEDB:SFP=False";
 						using (OleDbConnection accessConnection = new OleDbConnection(strDatabaseConnectionCommand))
 						{
 							try
@@ -251,13 +226,13 @@ namespace RoAccessToSql
 					}
 					else
 					{
-						_MyLog.Error("SQL Connection is not open. Check connection string: " + tbSqlDbName.Text);
-						MessageBox.Show("Check connection string: " + tbSqlDbName.Text, "SQL Connection is not open.");
+						_MyLog.Error($"SQL Connection is not open. Check connection string: {tbSqlDbName.Text}");
+						MessageBox.Show($"Check connection string: {tbSqlDbName.Text}", "SQL Connection is not open.");
 					}
 				}
 				catch (SqlException ex) 
 				{
-					_MyLog.Error("SQL Connection is not open. Check connection string: " + tbSqlDbName.Text);
+					_MyLog.Error($"SQL Connection is not open. Check connection string: {tbSqlDbName.Text}");
 					MessageBox.Show(ex.Message, "Unknown error when migrating RO data from MS Access to SQL");
 				}
 			}
@@ -274,11 +249,10 @@ namespace RoAccessToSql
 			lastTimeDbs = ProgressBarUpdate(pBarDbs, null, 0, 1, 0, 0, lastTimeDbs, false);
 			lastTimeRos = ProgressBarUpdate(pBarROs, null, 0, maxCntRo, 0, 0, lastTimeRos, false);
 			lastTimeDbs = ProgressBarUpdate(pBarDbs, "ROMaster Table", 0, 5, 0, 1, lastTimeDbs, false);
-			OleDbDataReader reader = null;
-			OleDbCommand command = new OleDbCommand("select * from ROMaster", accessConnection);
-			reader = command.ExecuteReader();
-			// Do access's romaster table first so that the list of other tables to process is found.  While doing this, migrate this table's data.
-			int cntRo = 0;
+            OleDbCommand command = new OleDbCommand("select * from ROMaster", accessConnection);
+            OleDbDataReader reader = command.ExecuteReader();
+            // Do access's romaster table first so that the list of other tables to process is found.  While doing this, migrate this table's data.
+            int cntRo = 0;
 			int cntDb = 0;
 			int maxCntDb = 0;
 			while (reader.Read())				// reading from Access Database
@@ -303,13 +277,12 @@ namespace RoAccessToSql
 					maxCntDb++;
 				}
 			}
-			lastTimeRos = ProgressBarUpdate(pBarROs, "ROMaster", 0, maxCntRo, maxCntRo, 1, lastTimeRos, true);
+			ProgressBarUpdate(pBarROs, "ROMaster", 0, maxCntRo, maxCntRo, 1, lastTimeRos, true);
 			lastTimeDbs = ProgressBarUpdate(pBarDbs, null, 0, maxCntDb, 0, 0, lastTimeDbs, false);
 			reader.Close();
-			reader = null;
-			
-			// now migrate all the tables that were found
-			foreach (string tableName in allTables)
+
+            // now migrate all the tables that were found
+            foreach (string tableName in allTables)
 			{
 				lastTimeRos = DateTime.Now;
 				cntRo = 0;
@@ -318,7 +291,7 @@ namespace RoAccessToSql
 				lastTimeRos = ProgressBarUpdate(pBarROs, null, 0, maxCntRo, 0, 0, lastTimeRos, true);
 				lastTimeDbs = ProgressBarUpdate(pBarDbs, allTablesText[cntDb], 0, maxCntDb, cntDb, 1, lastTimeDbs, false);
 				command = null;
-				command = new OleDbCommand("select * from " + tableName, accessConnection);
+				command = new OleDbCommand($"select * from {tableName}", accessConnection);
 				reader = command.ExecuteReader();
 				while (reader.Read())			// read all of the records from the current access table
 				{
@@ -338,7 +311,7 @@ namespace RoAccessToSql
 				reader = null;
 				lastTimeRos = ProgressBarUpdate(pBarROs, tableName, 0, maxCntRo, maxCntRo, 1, lastTimeRos, false);
 			}
-			lastTimeDbs = ProgressBarUpdate(pBarDbs, allTablesText[maxCntDb - 1], 0, maxCntDb, maxCntDb, 1, lastTimeDbs, false);
+			ProgressBarUpdate(pBarDbs, allTablesText[maxCntDb - 1], 0, maxCntDb, maxCntDb, 1, lastTimeDbs, false);
 			pBarDbs.Text = "Referenced Object Tables Migration Completed";
 			pBarROs.Text = "Referenced Objects Migration Completed";
 			btnConvert.Enabled = false;
@@ -357,7 +330,7 @@ namespace RoAccessToSql
 				string dt = string.Format("{0:yyyyMMddHHmmss}", System.DateTime.Now);
 				string strInsert = "INSERT INTO ROMaster (RecID, RecType, ModDateTime, Info) ";
 				// note that '8' for rectype flags database converted:
-				strInsert = strInsert + " VALUES ('09999999', 8, '" + dt + "', '" + _SqlConnectStr + "');";
+				strInsert = $"{strInsert} VALUES ('09999999', 8, '{dt}', '{_SqlConnectStr}');";
 				OleDbCommand command = new OleDbCommand(strInsert, accessConnection);
 				reader = command.ExecuteReader();
 				if (reader.Read()) return;
@@ -367,7 +340,7 @@ namespace RoAccessToSql
 				MessageBox.Show(e.Message, "Error on insert to flag migration completed");
 			}
 		}
-		private string _TmpFileForConnectStr = null;
+		private readonly string _TmpFileForConnectStr = null;
 		private void WriteSqlPathToTempFile()
 		{
 			System.IO.File.WriteAllText(_TmpFileForConnectStr, _SqlConnectStr);
@@ -375,13 +348,12 @@ namespace RoAccessToSql
 		// the following is used to update the progress bars, it finds how many records are in a table.
 		private int GetRecordCountForTable(string tableName, OleDbConnection accessConnection)
 		{
-			OleDbDataReader reader = null;
-			int retcnt = 100;
+            int retcnt = 100;
 			try
 			{
-				OleDbCommand command = new OleDbCommand("SELECT COUNT (RecID) as cnt FROM " + tableName, accessConnection);
-				reader = command.ExecuteReader();
-				if (reader.Read())
+				OleDbCommand command = new OleDbCommand($"SELECT COUNT (RecID) as cnt FROM {tableName}", accessConnection);
+                OleDbDataReader reader = command.ExecuteReader();
+                if (reader.Read())
 				{
 					retcnt = reader.GetInt32(0);
 				}
@@ -393,7 +365,8 @@ namespace RoAccessToSql
 			}
 			return retcnt;
 		}
-		DateTime ProgressBarUpdate(DevComponents.DotNetBar.Controls.ProgressBarX pbi, string msg, int min, int max, int progress, int flag, DateTime lastUpdateDisplay, bool doTimeCheck)
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "Keeping min for Debugging")]
+        DateTime ProgressBarUpdate(DevComponents.DotNetBar.Controls.ProgressBarX pbi, string msg, int min, int max, int progress, int flag, DateTime lastUpdateDisplay, bool doTimeCheck)
 		{
 			if (flag == 0)		// setup
 				pbi.Maximum = max;
@@ -412,11 +385,13 @@ namespace RoAccessToSql
 		{
 			try
 			{
-				SqlCommand command = new SqlCommand();
-				command.Connection = sqlConnection;
-				command.CommandType = CommandType.StoredProcedure;
-				command.CommandText = "insertAllRectypes";
-				command.Parameters.AddWithValue("@RecType", RecType);
+                SqlCommand command = new SqlCommand
+                {
+                    Connection = sqlConnection,
+                    CommandType = CommandType.StoredProcedure,
+                    CommandText = "insertAllRectypes"
+                };
+                command.Parameters.AddWithValue("@RecType", RecType);
 				if (AccPageID == null || AccPageID == "")
 					command.Parameters.AddWithValue("@AccPageID", string.Empty);
 				else
@@ -428,9 +403,8 @@ namespace RoAccessToSql
 				command.Parameters.AddWithValue("@ModDateTime", ModDateTime);
 				using (SqlDataReader reader = command.ExecuteReader())
 				{
-					bool success = true;
-				}
-				command = null;
+                }
+                command = null;
 			}
 			catch (Exception ex)
 			{
@@ -438,32 +412,15 @@ namespace RoAccessToSql
 				_MyLog.Error(msg, ex);
 			}
 		}
-		private void btnExit_Click(object sender, EventArgs e)
-		{
-			this.Close();
-		}
-		// the user selected the button to test the sql connection string
-		private void btnTestConnect_Click(object sender, EventArgs e)
-		{
-			TestConnection(true);
-		}
-		// the RevDate & RevDescription are found in a stored procedure, vesp_GetSQLCodeRevision, in the sql database.  These get updated each
-		// time a revision is made to the sql database using ROFixes.sql script.
-		private static DateTime _RevDate = DateTime.MinValue;
-		public static DateTime RevDate
-		{
-			get { return _RevDate; }
-			set { _RevDate = value; }
-		}
-		private static string _RevDescription = "Unknown";
-		public static string RevDescription
-		{
-			get { return _RevDescription; }
-			set { _RevDescription = value; }
-		}
-		// This is called to test the sql connection, either from the button when pressed by user, or from the convert button, before
-		// the conversion is done. See below for what is checked
-		private bool TestConnection(bool notifyUser)
+        private void btnExit_Click(object sender, EventArgs e) => this.Close();
+        // the user selected the button to test the sql connection string
+        private void btnTestConnect_Click(object sender, EventArgs e) => TestConnection(true);
+
+        public static DateTime RevDate { get; set; } = DateTime.MinValue;
+        public static string RevDescription { get; set; } = "Unknown";
+        // This is called to test the sql connection, either from the button when pressed by user, or from the convert button, before
+        // the conversion is done. See below for what is checked
+        private bool TestConnection(bool notifyUser)
 		{
 			// The following conditions must be true in order to migrate the ro data to sql. Only the first condition can be
 			//  tested in this executable since the roall database is interfaced to by the roeditor & the program that migrates the data.
@@ -485,12 +442,14 @@ namespace RoAccessToSql
 						connection.Open();
 						if (connection.State == ConnectionState.Open)
 						{
-							// now see if there is an roall table
-							SqlCommand command = new SqlCommand();
-							command.Connection = connection;
-							command.CommandType = CommandType.Text;
-							command.CommandText = "(SELECT count(*) FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[ROALL]') AND type in (N'U'))";
-							using (SqlDataReader reader = command.ExecuteReader())
+                            // now see if there is an roall table
+                            SqlCommand command = new SqlCommand
+                            {
+                                Connection = connection,
+                                CommandType = CommandType.Text,
+                                CommandText = "(SELECT count(*) FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[ROALL]') AND type in (N'U'))"
+                            };
+                            using (SqlDataReader reader = command.ExecuteReader())
 							{
 								if (reader.Read())
 								{
@@ -509,11 +468,13 @@ namespace RoAccessToSql
 							{
 								// now see if there are stored procedures:
 								command = null;   // reset command
-								command = new SqlCommand();
-								command.Connection = connection;
-								command.CommandType = CommandType.Text;
-								command.CommandText = "(SELECT count(*) FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[deleteByROTable]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)";
-								using (SqlDataReader reader = command.ExecuteReader())
+                                command = new SqlCommand
+                                {
+                                    Connection = connection,
+                                    CommandType = CommandType.Text,
+                                    CommandText = "(SELECT count(*) FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[deleteByROTable]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)"
+                                };
+                                using (SqlDataReader reader = command.ExecuteReader())
 								{
 									if (reader.Read())
 									{
@@ -533,11 +494,13 @@ namespace RoAccessToSql
 							{
 								// now test that the roall table is empty:
 								command = null;   // reset command
-								command = new SqlCommand();
-								command.Connection = connection;
-								command.CommandType = CommandType.Text;
-								command.CommandText = "SELECT count(*) FROM roall";
-								using (SqlDataReader reader = command.ExecuteReader())
+                                command = new SqlCommand
+                                {
+                                    Connection = connection,
+                                    CommandType = CommandType.Text,
+                                    CommandText = "SELECT count(*) FROM roall"
+                                };
+                                using (SqlDataReader reader = command.ExecuteReader())
 								{
 									if (reader.Read())
 									{
@@ -557,16 +520,18 @@ namespace RoAccessToSql
 							{
 								// now test that the database version is ok
 								command = null;   // reset command
-								command = new SqlCommand();
-								command.Connection = connection;
-								command.CommandType = CommandType.StoredProcedure;
-								command.CommandText = "vesp_GetSQLCodeRevision";
-								using (SqlDataReader reader = command.ExecuteReader())
+                                command = new SqlCommand
+                                {
+                                    Connection = connection,
+                                    CommandType = CommandType.StoredProcedure,
+                                    CommandText = "vesp_GetSQLCodeRevision"
+                                };
+                                using (SqlDataReader reader = command.ExecuteReader())
 								{
 									if (reader.Read())
 									{
-										_RevDate = reader.GetDateTime(0);
-										_RevDescription = reader.GetString(1);
+										RevDate = reader.GetDateTime(0);
+										RevDescription = reader.GetString(1);
 										dbsuc = true;
 									}
 									else
@@ -582,13 +547,13 @@ namespace RoAccessToSql
 					}
 					catch (SqlException ex)
 					{
-						if (notifyUser) MessageBox.Show("Connection failed: " + ex, "Connection Failed");
+						if (notifyUser) MessageBox.Show($"Connection failed: {ex}", "Connection Failed");
 					}
 				}
 			}
 			catch (Exception ex)
 			{
-				if (notifyUser) MessageBox.Show("Connection failed: " + ex, "Connection Failed");
+				if (notifyUser) MessageBox.Show($"Connection failed: {ex}", "Connection Failed");
 			}
 
 			if (notifyUser && success) MessageBox.Show("You have been successfully connected to the database!", "Connection Succeeded");

PROMS/RoAccessToSql/RoAccessToSql.csproj

@@ -66,6 +66,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="RoAccessToSql.cs">
       <SubType>Form</SubType>
     </Compile>

PROMS/SQL/ClientSpecific/BNPP_CoverPageConsolidation.sql

@@ -0,0 +1,147 @@
+ /*****************************************************************************
+   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

@@ -0,0 +1,263 @@
+ 
+-- =============================================
+-- 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/SQL/PROMStoCM.sql

@@ -1817,7 +1817,7 @@ ALTER trigger [dbo].[tr_Contents_Delete] on [dbo].[Contents] instead of delete a
 		select ii.ContentID,ii.Number,ii.Text,ii.Type,ii.FormatID,ii.Config,ii.DTS,ii.UserID,ii.DeleteStatus,ii.ActionDTS
 		from tblContents ii inner join deleted dd on dd.ContentID = ii.ContentID
 		where ii.DeleteStatus > 0
-		update ga set ga.contentauditid = (select max(auditid) from contentaudits where contentid = ga.contentid and deletestatus = ga.deletestatus)
+		update ga set ga.contentauditid = (select ISNULL(max(auditid),0) from contentaudits where contentid = ga.contentid and deletestatus = ga.deletestatus)
 		from gridaudits ga join deleted dd on ga.contentid = dd.contentid where ga.contentauditid = 0
 	end
 go

PROMS/TablePicker/TablePicker.cs

@@ -1,7 +1,4 @@
-using System;
 using System.Drawing;
-using System.Collections;
-using System.ComponentModel;
 using System.Windows.Forms;
 
 namespace Accentra.Controls
@@ -11,11 +8,6 @@ namespace Accentra.Controls
 	/// </summary>
 	public class TablePicker : System.Windows.Forms.Form
 	{
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.Container components = null;
-
 		public TablePicker()
 		{
 			// Activates double buffering
@@ -29,21 +21,6 @@ namespace Accentra.Controls
 			InitializeComponent();
 		}
 
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		protected override void Dispose( bool disposing )
-		{
-			if( disposing )
-			{
-				if(components != null)
-				{
-					components.Dispose();
-				}
-			}
-			base.Dispose( disposing );
-		}
-
 		#region Windows Form Designer generated code
 		/// <summary>
 		/// Required method for Designer support - do not modify
@@ -75,82 +52,41 @@ namespace Accentra.Controls
 		}
 		#endregion
 
-		private Pen BeigePen = new Pen(Color.Beige, 1);
-		private Brush BeigeBrush = System.Drawing.Brushes.Beige;
-		private Brush GrayBrush = System.Drawing.Brushes.Gray;
-		private Brush BlackBrush = System.Drawing.Brushes.Black;
-		private Brush WhiteBrush = System.Drawing.Brushes.White;
+		private readonly Brush BlackBrush = System.Drawing.Brushes.Black;
+		private readonly Brush WhiteBrush = System.Drawing.Brushes.White;
 
-		private Brush Jbrush = System.Drawing.Brushes.LightBlue; 
-		//private Brush Jbrush = System.Drawing.Brushes.LightSteelBlue; 
-		//private Brush Jbrush = System.Drawing.Brushes.SteelBlue; 
-		//private Brush Jbrush = System.Drawing.Brushes.PowderBlue;
+		private readonly Brush Jbrush = System.Drawing.Brushes.LightBlue; 
 
-		private Pen BorderPen = new Pen(SystemColors.ControlDark);
-		private Pen BluePen = new Pen(Color.SlateGray, 1);
+		private readonly Pen BorderPen = new Pen(SystemColors.ControlDark);
+		private readonly Pen BluePen = new Pen(Color.SlateGray, 1);
 
 		private string DispText = "Esc to Cancel";	// Display text
-		private int DispHeight = 40;//20;		// Display ("Table 1x1", "Cancel")
-		private Font DispFont = new Font("Tahoma", 8.25F);
-		private int SquareX = 20;			// Width of squares 
-		private int SquareY = 20;			// Height of squares
+		private readonly int DispHeight = 40;		// Display ("Table 1x1", "Cancel")
+		private readonly Font DispFont = new Font("Tahoma", 8.25F);
+		private readonly int SquareX = 20;			// Width of squares 
+		private readonly int SquareY = 20;			// Height of squares
 		private int SquareQX = 3;			// Number of visible squares (X)
 		private int SquareQY = 3;			// Number of visible squares (Y)
 		private int SelQX = 1;				// Number of selected squares (x)
 		private int SelQY = 1;				// Number of selected squares (y)
 
-		private bool bHiding = false;
-		private bool bCancel = true;	// Determines whether to Cancel
+        public int MaxRows { get; set; } = -1;
 
-		// Added my Volian 4/27/11
-		private int _MaxRows = -1;
+        public int MaxCols { get; set; } = -1;
 
-		public int MaxRows
-		{
-			get { return _MaxRows; }
-			set { _MaxRows = value; }
-		}
-		private int _MaxCols = -1;
+        /// <summary>
+        /// Returns the number of columns, or the horizontal / X count,
+        /// of the selection.
+        /// </summary>
+        public int SelectedColumns => SelQX;
 
-		public int MaxCols
-		{
-			get { return _MaxCols; }
-			set { _MaxCols = value; }
-		}
+        /// <summary>
+        /// Returns the number of rows, or the vertical / Y count, 
+        /// of the selection.
+        /// </summary>
+        public int SelectedRows => SelQY;
 
-		/// <summary>
-		/// Similar to <code><see cref="DialogResult"/> 
-		/// == <see cref="DialogResult.Cancel"/></code>,
-		/// but is used as a state value before the form
-		/// is hidden and cancellation is finalized.
-		/// </summary>
-		public bool Cancel {
-			get {
-				return bCancel;
-			}
-		}
-
-		/// <summary>
-		/// Returns the number of columns, or the horizontal / X count,
-		/// of the selection.
-		/// </summary>
-		public int SelectedColumns {
-			get {
-				return SelQX;
-			}
-		}
-
-		/// <summary>
-		/// Returns the number of rows, or the vertical / Y count, 
-		/// of the selection.
-		/// </summary>
-		public int SelectedRows {
-			get {
-				return SelQY;
-			}
-		}
-
-		private void TablePicker_Paint(object sender, System.Windows.Forms.PaintEventArgs e) {
+        private void TablePicker_Paint(object sender, System.Windows.Forms.PaintEventArgs e) {
 			Graphics g = e.Graphics;
 
 			// First, increment the number of visible squares if the 
@@ -162,8 +98,8 @@ namespace Accentra.Controls
 			if (SquareQX < 7) SquareQX = 7;
 			if (SquareQY < 5) SquareQY = 5;
 
-			if (_MaxRows > 0 && SquareQY > _MaxRows) SquareQY = _MaxRows;
-			if (_MaxCols > 0 && SquareQX > _MaxCols) SquareQX = _MaxCols;
+			if (MaxRows > 0 && SquareQY > MaxRows) SquareQY = MaxRows;
+			if (MaxCols > 0 && SquareQX > MaxCols) SquareQX = MaxCols;
 
 			// Second, expand the dimensions of this form according to the 
 			// number of visible squares.
@@ -177,14 +113,7 @@ namespace Accentra.Controls
 			// the text is left-justified, only the Y (vertical) position
 			// is calculated.
 			int dispY = ((SquareY - 1) * SquareQY) + SquareQY + 4;
-			//if (this.Cancel) {
-			//    DispText = "Esc Key to Cancel";
-			//} else {
-			//    DispText = SelQX.ToString() + " by " + SelQY.ToString() + " Table";
-			//}
-			//DispText = SelQX.ToString() + " by " + SelQY.ToString() + " Table\nEsc Key to Cancel";
-			//DispText = SelQY.ToString() + " Row"+((SelQY>1)?"s by ":" by ") + SelQX.ToString() + " Column"+((SelQX>1)?"s\nEsc Key to Cancel":"\nEsc Key to Cancel");
-			DispText = SelQY.ToString() + " Row" + ((SelQY > 1) ? "s" : "") + "  " + SelQX.ToString() + " Column" + ((SelQX > 1) ? "s" : "")+ "\nEsc to Cancel";
+			DispText = $"{SelQY} Row{((SelQY > 1) ? "s" : "")}  {SelQX} Column{((SelQX > 1) ? "s" : "")}\nEsc to Cancel";
 			g.DrawString(DispText, DispFont, BlackBrush, 3, dispY + 2); 
 
 			// Draw each of the squares and fill with the default color.
@@ -198,7 +127,6 @@ namespace Accentra.Controls
 			// Go back and paint the squares with selection colors.
 			for (int x=0; x<SelQX; x++) {
 				for (int y=0; y<SelQY; y++) {
-					//g.FillRectangle(BeigeBrush, (x*SquareX) + 3, (y*SquareY) + 3, SquareX - 2, SquareY - 2);
 					g.FillRectangle(Jbrush, (x * SquareX) + 3, (y * SquareY) + 3, SquareX - 2, SquareY - 2);
 					g.DrawRectangle(BluePen, (x * SquareX) + 3, (y * SquareY) + 3, SquareX - 2, SquareY - 2);
 				}
@@ -210,11 +138,6 @@ namespace Accentra.Controls
 		/// </summary>
 		private void TablePicker_Deactivate(object sender, System.EventArgs e) {
 
-			// bCancel = true 
-			// and DialogResult = DialogResult.Cancel 
-			// were previously already set in MouseLeave.
-
-			//this.Hide();
 		}
 
 		/// <summary>
@@ -242,42 +165,24 @@ namespace Accentra.Controls
 		/// escaped (canceling) state.
 		/// </summary>
 		private void TablePicker_MouseLeave(object sender, System.EventArgs e) {
-			//if (!bHiding) bCancel = true;
-			//this.DialogResult = DialogResult.Cancel;
-			//this.Invalidate();
 			if (this.DialogResult == DialogResult.None)
 				this.DialogResult = DialogResult.Cancel;
 		}
 
-		/// <summary>
-		/// Cancels the prior cancellation caused by MouseLeave.
-		/// </summary>
-		private void TablePicker_MouseEnter(object sender, System.EventArgs e) {
-			//bHiding = false;
-			//bCancel = false;
-			//this.DialogResult = DialogResult.OK;
-			this.Invalidate();
-		}
+        /// <summary>
+        /// Cancels the prior cancellation caused by MouseLeave.
+        /// </summary>
+        private void TablePicker_MouseEnter(object sender, System.EventArgs e) => this.Invalidate();
 
-		/// <summary>
-		/// Detects that the user made a selection by clicking.
-		/// </summary>
-		private void TablePicker_Click(object sender, System.EventArgs e) {
-			//bHiding = true; // Not the same as Visible == false
-			//                // because bHiding suggests that the control
-			//                // is still "active" (not canceled).
-			//this.Hide();
-			this.DialogResult = DialogResult.OK;
-		}
+        /// <summary>
+        /// Detects that the user made a selection by clicking.
+        /// </summary>
+        private void TablePicker_Click(object sender, System.EventArgs e) => this.DialogResult = DialogResult.OK;
 
-		private void TablePicker_KeyPress(object sender, KeyPressEventArgs e)
+        private void TablePicker_KeyPress(object sender, KeyPressEventArgs e)
 		{
 			if (e.KeyChar == (char)Keys.Escape)
 			{
-				//bHiding = true; // Not the same as Visible == false
-				//// because bHiding suggests that the control
-				//// is still "active" (not canceled).
-				//this.Hide();
 				this.DialogResult = DialogResult.Cancel;
 			}
 		}

PROMS/VEPROMS User Interface/DlgPrintProcedure.cs

@@ -1395,7 +1395,7 @@ namespace VEPROMS
 			DoCreatePDF();		// create indivitual pdfs
 			if (_MergedPdfPath != null && _MergedPdfPath != PDFPath) PDFPath = _MergedPfd.Folder = _MergedPdfPath;
 			// C2021-063 pass in whether to generate Alarm Point List text when a merge is done
-			if (!_MergedPfd.DoTheMerge(PromsPrinter.MergedLandscapePages,cbxAlmPtTxt.Checked)) return;		// merge them together.
+			if (!_MergedPfd.DoTheMerge(cbxAlmPtTxt.Checked)) return;		// merge them together.
 			// if the property to show the file after printing is set (on the version dialog), display it.  Otherwise do a dialog to let user know it's done
 			if (_DocVersionConfig.Print_MergedPdfsViewAfter)
 			{

PROMS/VEPROMS User Interface/PROMSFixes.Sql

@@ -5227,7 +5227,7 @@ CREATE PROCEDURE [dbo].[getRevisionByItemIDandRevisionNumberAndUnitID]
 WITH EXECUTE AS OWNER
 AS
 declare @RevisionID int
-set @RevisionID = (select revisionid from revisions rr cross apply rr.config.nodes('//Applicability') t1(r1) where itemid = @itemid and revisionnumber = @RevisionNumber and r1.value('@Index','int') = @UnitID)
+set @RevisionID = (select top 1 revisionid from revisions rr cross apply rr.config.nodes('//Applicability') t1(r1) where itemid = @itemid and revisionnumber = @RevisionNumber and r1.value('@Index','int') = @UnitID order by revisionid desc)
 	SELECT
 		[RevisionID],
 		[ItemID],
@@ -5547,6 +5547,12 @@ ELSE PRINT 'Function: ve_GetItemDerivedApplicability Error on Creation'
 GO
 
 -------
+
+-- =============================================
+-- Author:		Matthew Schill
+-- Modify date: 07/14/2026
+-- Description:	Reworked ve_GetParentItem for Performance improvement
+-- =============================================
 /****** Object:  UserDefinedFunction [dbo].[vefn_GetParentItem]    Script Date: 03/28/2012 17:58:48 ******/
 IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[ve_GetParentItem]') AND OBJECTPROPERTY(id,N'IsScalarFunction') = 1)
     DROP FUNCTION [ve_GetParentItem];
@@ -5555,35 +5561,46 @@ GO
    Volian Enterprises - Proprietary Information - DO NOT COPY OR DISTRIBUTE
        Copyright 2012 - Volian Enterprises, Inc. All rights reserved.
 *****************************************************************************/
-CREATE FUNCTION [dbo].[ve_GetParentItem] (@ItemID int) RETURNS int
+CREATE OR ALTER FUNCTION [dbo].[ve_GetParentItem] (@ItemID int) RETURNS int
 WITH EXECUTE AS OWNER
 AS
 BEGIN
 DECLARE @ParentID int;
-WITH Itemz([ItemID],[IsFound]) as
+WITH Itemz([ItemID]) as
 (
-select ii.itemid,0 from items ii where ii.itemid = @ItemID
+select ii.itemid from items ii WITH (NOLOCK) where ii.itemid = @ItemID
 union all
-select ii.previousid,0 from items ii
+select ii.previousid from items ii WITH (NOLOCK)
 join itemz zz on ii.itemid = zz.itemid
 where ii.previousid is not null
-and zz.isfound = 0
-union all
-select ii.itemid,1
-from parts pp
-join itemz zz on pp.itemid = zz.itemid
-join items ii on ii.contentid = pp.contentid
 )
-select top 1 @ParentID = itemid from itemz
-where isfound = 1 OPTION (MAXRECURSION 10000)
+select top 1 @ParentID = ii.itemid 
+from itemz
+inner join parts pp WITH (NOLOCK) on pp.itemid = itemz.itemid
+inner join items ii WITH (NOLOCK) on ii.contentid = pp.contentid
+OPTION (MAXRECURSION 10000)
+
 RETURN @ParentID
 END
+
 GO
 
 IF (@@Error = 0) PRINT 'ScalerFunction [vefn_GetParentItem] Succeeded'
 ELSE PRINT 'ScalerFunction [vefn_GetParentItem] Error on Creation'
 go
 
+IF EXISTS (SELECT * FROM dbo.sysIndexes WHERE name like 'IX_PartsItemID')
+	DROP INDEX [IX_PartsItemID] ON [dbo].[tblParts];
+GO
+
+CREATE NONCLUSTERED INDEX IX_PartsItemID
+ON [dbo].[tblParts] ([ItemID] ASC)
+INCLUDE([ContentID],[DeleteStatus],[FromType]) WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+GO
+
+PRINT 'Added IX_PartsItemID Index.  Speeds up Getting Parent Items'
+GO
+
 /****** Object:  UserDefinedFunction [dbo].[vefn_CanTransitionBeCreated]    Script Date: 10/14/2012 02:03:30 ******/
 IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[vefn_CanTransitionBeCreated]') AND OBJECTPROPERTY(id,N'IsScalarFunction') = 1)
 	DROP FUNCTION [vefn_CanTransitionBeCreated];
@@ -13540,35 +13557,7 @@ GO
 IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[deleteAllDocVersionPdfs]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
     DROP PROCEDURE [deleteAllDocVersionPdfs];
 GO
-	
-/*****************************************************************************
-   Volian Enterprises - Proprietary Information - DO NOT COPY OR DISTRIBUTE
-       Copyright 2017 - Volian Enterprises, Inc. All rights reserved.
-*****************************************************************************/
-CREATE PROCEDURE [dbo].[deleteAllDocVersionPdfs]
 
-(
-	@VersionID int
-)
-WITH EXECUTE AS OWNER
-AS
-BEGIN TRY -- Try Block
-	BEGIN TRANSACTION
-	DELETE [Pdfs]
-		WHERE [DocID] IN(select EE.DocID from vefn_GetVersionItems(cast(@VersionID as varchar(20))) VI
-		Join Entries EE ON EE.ContentID= VI.ContentID)
-	IF( @@TRANCOUNT > 0 ) COMMIT
-END TRY
-BEGIN CATCH -- Catch Block
-	IF( @@TRANCOUNT = 1 ) ROLLBACK -- Only rollback if top level
- 	ELSE IF( @@TRANCOUNT > 1 ) COMMIT -- Otherwise commit.  Top level will rollback
-	EXEC vlnErrorHandler
-END CATCH
-GO
--- Display the status of Proc creation
-IF (@@Error = 0) PRINT 'Procedure Creation: deleteAllDocVersionPdfs Succeeded'
-ELSE PRINT 'Procedure Creation: deleteAllDocVersionPdfs Error on Creation'
-GO
 /****** Object:  StoredProcedure [addFiguresByROFstIDandImageIDs] ******/
 IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[addFiguresByROFstIDandImageIDs]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
     DROP PROCEDURE [addFiguresByROFstIDandImageIDs];
@@ -17169,6 +17158,7 @@ GO
 			[roid] [varchar](50) NOT NULL,
 			[appid] [varchar](max) NULL,
 			[value] [varchar](max) NULL,
+            [moddatetime] [datetime] NULL,
 		 CONSTRAINT [PK_RofstChild] PRIMARY KEY CLUSTERED 
 		(
 			[RofstChildID] ASC
@@ -17303,6 +17293,23 @@ GO
 	End -- Rofst Tables
 	Go
 
+	-- =============================================
+	-- Author:		Matthew Schill
+	-- Create date: 03/30/2026
+	-- Description:	Store RO Modification date/time
+	-- =============================================
+
+	--- Add Column to store RO  Modification date/time if it does not already exist
+	IF NOT EXISTS(SELECT *
+			  FROM   INFORMATION_SCHEMA.COLUMNS
+			  WHERE  TABLE_NAME = 'RofstChild'
+					 AND COLUMN_NAME = 'moddatetime') 
+	ALTER TABLE RofstChild ADD moddatetime datetime NULL;
+	go
+	-- Display the status
+	IF (@@Error = 0) PRINT 'Altered table [RofstChild] Succeeded for moddatetime'
+	ELSE PRINT 'Altered table [RofstChild] Error on Alter for moddatetime'
+	go
 
 	/*
 	----------------------------------------------------------------------------------
@@ -19705,6 +19712,7 @@ GO
 		@roid VarChar(50),
 		@appid VarChar(Max) = null,
 		@value VarChar(Max) = null,
+		@ModDateTime DateTime = null,
 		@missingDefaultValue VarChar(Max) = null
 	)
 	With Execute as Owner
@@ -19722,8 +19730,8 @@ GO
 			Set @missingDefaultValue = '[TBD]';
 
 		-- Create Rofst Child/Group Record --> [Roid = (12) Digits]
-		Insert Into RofstChild (RofstID, ID, ParentID, dbiID, [type], title, roid, appid, [value])
-		Values (@RofstID, @ID, @ParentID, @dbiID, @type, @title, @roid, @appid, REPLACE(REPLACE(@value, '&123;', '{'), '&125;', '}'));
+		Insert Into RofstChild (RofstID, ID, ParentID, dbiID, [type], title, roid, appid, moddatetime, [value])
+		Values (@RofstID, @ID, @ParentID, @dbiID, @type, @title, @roid, @appid, @ModDateTime, REPLACE(REPLACE(@value, '&123;', '{'), '&125;', '}'));
 
 
 		-- Check for appid, if exists, then insert the default value for each return type if multi-value
@@ -24329,8 +24337,10 @@ 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
@@ -24355,7 +24365,9 @@ 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
@@ -24732,6 +24744,296 @@ GO
 ==========================================================================================================
 */
 
+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
+
+
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[vefn_ROFST_changes]') AND OBJECTPROPERTY(id,N'IsTableFunction') = 1)
+    DROP FUNCTION [vefn_ROFST_changes];
+GO
+
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+	
+/*
+==========================================================================================================
+ Author:		Matthew Schill
+ Create Date:	03/31/2026
+ Description:	Function for ROs that updated in latest RO FST Load
+==========================================================================================================
+*/
+CREATE FUNCTION [dbo].[vefn_ROFST_changes](@OrigFSTID int, @NewFSTid int, @VersionID int)
+RETURNS @ROIDs TABLE
+(
+[roid] varchar(50)
+)
+WITH EXECUTE AS OWNER
+AS
+BEGIN
+
+    insert into @ROIDs
+	  SELECT DISTINCT ISNULL(RofstChild.roid,previous.roid)
+	    FROM 
+			(SELECT * FROM RofstChild where RofstChild.RofstID = @NewFSTid) RofstChild
+			FULL OUTER JOIN 
+			(SELECT * FROM RofstChild previous where previous.RofstID = @OrigFSTID) previous
+			ON previous.dbiID = RofstChild.dbiID AND previous.ID = RofstChild.ID 
+	    where	
+	    ISNULL(previous.RofstID,'') != ISNULL(RofstChild.RofstID,'')
+		AND
+	    (
+		 (RofstChild.RofstID = @NewFSTid OR RofstChild.RofstID IS NULL)
+		  AND
+		 (previous.RofstID = @OrigFSTID OR previous.RofstID IS NULL)
+		)
+		AND
+		(previous.moddatetime IS NULL 
+        OR RofstChild.moddatetime IS NULL 
+		OR RofstChild.moddatetime != previous.moddatetime
+		OR RofstChild.title != previous.title
+		OR RofstChild.value != previous.value
+		)
+
+	RETURN
+END
+go
+
+IF (@@Error = 0) PRINT 'TableFunction [vefn_ROFST_changes] Succeeded'
+ELSE PRINT 'TableFunction [vefn_ROFST_changes] Error on Creation'
+go
+
+/****** Object:  StoredProcedure [deleteDocVersionPdfsWithNewROs] ******/
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[deleteDocVersionPdfsWithNewROs]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
+    DROP PROCEDURE [deleteDocVersionPdfsWithNewROs];
+GO
+	
+/*
+==========================================================================================================
+ Author:		Matthew Schill
+ Create Date:	03/31/2026
+ Description:	Delete all PDFs with ROs that will need re-resolved
+==========================================================================================================
+*/
+CREATE PROCEDURE [dbo].[deleteDocVersionPdfsWithNewROs]
+
+(
+	@VersionID int,
+    @OrigFSTid int,
+    @NewFSTid int
+)
+WITH EXECUTE AS OWNER
+AS
+ BEGIN
+	DELETE [Pdfs]
+		WHERE [DocID] IN 
+            (
+               select EE.DocID from vefn_GetVersionItems(cast(@VersionID as varchar(20))) VI
+		       Join Entries EE ON EE.ContentID= VI.ContentID
+			   Join DRoUsages ON DRoUsages.DocID = EE.DocID
+               Join dbo.vefn_ROFST_changes(@OrigFSTID, @NewFSTid, @VersionID) ROFST_changes on LEFT(DRoUsages.ROID,12) = ROFST_changes.roid
+            )
+
+	RETURN
+ END
+
+GO
+
+-- Display the status of Proc creation
+IF (@@Error = 0) PRINT 'Procedure Creation: deleteDocVersionPdfsWithNewROs Succeeded'
+ELSE PRINT 'Procedure Creation: deleteDocVersionPdfsWithNewROs Error on Creation'
+GO
+
+
+/****** Object:  StoredProcedure [getItemsWithNewROs] ******/
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[getItemsWithNewROs]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
+    DROP PROCEDURE [getItemsWithNewROs];
+GO
+
+/*
+==========================================================================================================
+ Author:		Matthew Schill
+ Create Date:	03/31/2026
+ Description:	Get Items with New ROs that will need resolved
+==========================================================================================================
+*/
+CREATE PROCEDURE [dbo].[getItemsWithNewROs]
+
+(
+	@VersionID int,
+    @OrigFSTid int,
+    @NewFSTid int
+)
+WITH EXECUTE AS OWNER
+AS
+ BEGIN
+	select DISTINCT tblItems.ItemID FROM
+	dbo.vefn_ROFST_changes(@OrigFSTID, @NewFSTid, @VersionID) ROFST_changes
+	INNER JOIN RoUsages ON LEFT(RoUsages.ROID,12) = ROFST_changes.roid
+	INNER JOIN tblItems ON RoUsages.ContentID = tblItems.ContentID
+	OUTER APPLY (Select VersionID =  dbo.vefn_GetVersionIDByItemID(tblItems.ItemID)) ver
+	INNER JOIN DocVersions DV ON DV.VersionID = ver.VersionID
+	INNER JOIN Associations ON Associations.VersionID = DV.VersionID
+	where ver.VersionID = @VersionID
+
+	RETURN
+ END
+
+GO
+
+-- Display the status of Proc creation
+IF (@@Error = 0) PRINT 'Procedure Creation: getItemsWithNewROs Succeeded'
+ELSE PRINT 'Procedure Creation: getItemsWithNewROs Error on Creation'
+GO
+
+/****** Object: StoredProcedure [dbo].[getRevisionByItemIDandRevisionNumber] ******/
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[getRevisionByItemIDandRevisionNumber]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
+DROP PROCEDURE [dbo].[getRevisionByItemIDandRevisionNumber];
+GO
+
+/*****************************************************************************
+   Volian Enterprises - Proprietary Information - DO NOT COPY OR DISTRIBUTE
+       Copyright 2012 - Volian Enterprises, Inc. All rights reserved.
+*****************************************************************************/
+CREATE PROCEDURE [dbo].[getRevisionByItemIDandRevisionNumber]
+
+(
+	@ItemID int,
+	@RevisionNumber nvarchar(50)
+)
+WITH EXECUTE AS OWNER
+AS
+declare @RevisionID int
+set @RevisionID = (select top 1 revisionid from revisions where itemid = @itemid and revisionnumber = @RevisionNumber order by revisionid desc)
+	SELECT
+		[RevisionID],
+		[ItemID],
+		[TypeID],
+		[RevisionNumber],
+		[RevisionDate],
+		[Notes],
+		[Config],
+		[DTS],
+		[UserID],
+		[LastChanged],
+		(SELECT COUNT(*) FROM [Checks] WHERE [Checks].[RevisionID]=[Revisions].[RevisionID]) [CheckCount],
+		(SELECT COUNT(*) FROM [Versions] WHERE [Versions].[RevisionID]=[Revisions].[RevisionID]) [VersionCount]
+	FROM [Revisions]
+	WHERE [RevisionID]=@RevisionID
+
+	SELECT
+		[Checks].[CheckID],
+		[Checks].[RevisionID],
+		[Checks].[StageID],
+		[Checks].[ConsistencyChecks],
+		[Checks].[DTS],
+		[Checks].[UserID],
+		[Checks].[LastChanged],
+		[Stages].[Name] [Stage_Name],
+		[Stages].[Description] [Stage_Description],
+		[Stages].[IsApproved] [Stage_IsApproved],
+		[Stages].[DTS] [Stage_DTS],
+		[Stages].[UserID] [Stage_UserID]
+	FROM [Checks]
+		JOIN [Stages]  ON
+			[Stages].[StageID]=[Checks].[StageID]
+	WHERE
+		[Checks].[RevisionID]=@RevisionID
+
+
+	SELECT
+		[Versions].[VersionID],
+		[Versions].[RevisionID],
+		[Versions].[StageID],
+		[Versions].[DTS],
+		[Versions].[UserID],
+		[Versions].[LastChanged],
+		[Versions].[PDF],
+		[Versions].[SummaryPDF],
+		[Stages].[Name] [Stage_Name],
+		[Stages].[Description] [Stage_Description],
+		[Stages].[IsApproved] [Stage_IsApproved],
+		[Stages].[DTS] [Stage_DTS],
+		[Stages].[UserID] [Stage_UserID]
+	FROM [Versions]
+		JOIN [Stages]  ON
+			[Stages].[StageID]=[Versions].[StageID]
+	WHERE
+		[Versions].[RevisionID]=@RevisionID
+
+	RETURN
+
+-- Display the status of Proc creation
+IF (@@Error = 0) PRINT 'Procedure Creation: getRevisionByItemIDandRevisionNumber Succeeded'
+ELSE PRINT 'Procedure Creation: getRevisionByItemIDandRevisionNumber Error on Creation'
+GO
+
+/*
+==========================================================================================================
+ Author:		Matthew Schill
+ Create Date:	06/29/2026
+ Description:	Added an ISNULL check when setting GridAudits.contentauditid.
+    Was Causing Deletion of some Grids to fail.
+==========================================================================================================
+*/
+/****** Object:  Trigger [tr_Contents_Delete] ******/
+ALTER trigger [dbo].[tr_Contents_Delete] on [dbo].[Contents] instead of delete as 
+	begin
+		update ii set DeleteStatus = (select max(DeleteID) from DeleteLog where SPID = @@spid), ActionDTS = getdate(),
+		UserID = (select top 1 UserID from DeleteLog where SPID = @@spid order by deleteid desc)
+		from tblContents ii inner join deleted dd on dd.ContentID = ii.ContentID
+		insert into ContentAudits(ContentID,Number,Text,Type,FormatID,Config,DTS,UserID,DeleteStatus,ActionDTS)
+		select ii.ContentID,ii.Number,ii.Text,ii.Type,ii.FormatID,ii.Config,ii.DTS,ii.UserID,ii.DeleteStatus,ii.ActionDTS
+		from tblContents ii inner join deleted dd on dd.ContentID = ii.ContentID
+		where ii.DeleteStatus > 0
+		update ga set ga.contentauditid = (select ISNULL(max(auditid),0) from contentaudits where contentid = ga.contentid and deletestatus = ga.deletestatus)
+		from gridaudits ga join deleted dd on ga.contentid = dd.contentid where ga.contentauditid = 0
+	end
+go
+
+-- Display the status of Trigger alter
+IF (@@Error = 0) PRINT 'Trigger Alteration: tr_Contents_Delete Succeeded'
+ELSE PRINT 'Trigger Alteration: tr_Contents_Delete Error on Creation'
+GO
 
 /*
   ---------------------------------------------------------------------------
@@ -24766,8 +25068,8 @@ BEGIN TRY -- Try Block
 	DECLARE @RevDate varchar(255)
 	DECLARE @RevDescription varchar(255)
 
-	set @RevDate = '02/18/2026 7:00 AM'
-	set @RevDescription = 'Added Audit Ability for ChangeBars'
+	set @RevDate = '07/16/2026 8:30 AM'
+	set @RevDescription = 'Reworked ve_GetParentItem for Performance improvement'
 
 	Select  cast(@RevDate as datetime) RevDate, @RevDescription  RevDescription
 	PRINT 'SQL Code Revision ' + @RevDate + ' - ' + @RevDescription

PROMS/VEPROMS User Interface/dlgExportImport.cs

@@ -947,14 +947,16 @@ 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
 					}
-					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();
+					// 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);
 					return true;
 				}
 			}

PROMS/VEPROMS User Interface/dlgSetChangeBarStartDate.cs

@@ -68,8 +68,26 @@ namespace VEPROMS
 			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);
+            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;
+            }
         }
 
 
@@ -108,7 +126,10 @@ namespace VEPROMS
 				sb.Append($"     The Procedure Viewer Change Bar Date will be set to ({maxDTS}).");
                 foreach (DataRow r in dt.Rows)
                 {
-                    sb.Append($"\r\n     The Change Bar Date for Unit ({r["UnitName"]}) will be set to ({Convert.ToDateTime(r["DTS"]):MM/dd/yyyy HH:mm:ss}).");
+                    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).");
@@ -121,12 +142,14 @@ namespace VEPROMS
                     //Change the ChangeBarDate for each unit
                     foreach (DataRow r in dt.Rows)
 					{
-                        MyProcConfig.SelectedSlave = Convert.ToInt32(r["UnitID"]);
-                        MyProcConfig.Print_ChangeBarDate = Convert.ToDateTime(r["DTS"]).ToString("MM / dd / yyyy HH: mm: ss");
-
-                        //CSM - C2026-010 - Add Audit Record for Change Bar Audit History
-                        ChangeBarAuditHistory.AddAudit(MyProcInfo.ItemID, $"Reset ChangeBars performed by ({VlnSettings.UserID}) on ({DateTime.Now}). ChangeBars reset to show since last approval ({Convert.ToDateTime(r["DTS"]):MM/dd/yyyy HH:mm:ss}) for (Unit {r["UnitName"]})", DateTime.Now, VlnSettings.UserID, MyProcConfig.SelectedSlave);
+                        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;

PROMS/VEPROMS User Interface/frmBatchRefresh.Designer.cs

@@ -113,6 +113,8 @@
             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();
@@ -902,6 +904,8 @@
             // 
             // 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);
@@ -930,11 +934,11 @@
             // 
             // 
             this.swRefreshTblsForSrch.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.swRefreshTblsForSrch.Location = new System.Drawing.Point(10, 153);
+            this.swRefreshTblsForSrch.Location = new System.Drawing.Point(10, 178);
             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("Refresh Word Attachments", "", resources.GetString("swRefreshTblsForSrch.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(300, 200)));
+            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.swRefreshTblsForSrch.SwitchClickTogglesValue = true;
             this.swRefreshTblsForSrch.TabIndex = 32;
             this.swRefreshTblsForSrch.Value = true;
@@ -949,10 +953,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, 153);
+            this.lblRefreshTblForSrch.Location = new System.Drawing.Point(107, 178);
             this.lblRefreshTblForSrch.Name = "lblRefreshTblForSrch";
             this.lblRefreshTblForSrch.Size = new System.Drawing.Size(186, 22);
-            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.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.lblRefreshTblForSrch.TabIndex = 31;
             this.lblRefreshTblForSrch.Text = "Refresh Tables For Search";
             // 
@@ -961,7 +965,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, 264);
+            this.warningBox4.Location = new System.Drawing.Point(12, 287);
             this.warningBox4.Margin = new System.Windows.Forms.Padding(4);
             this.warningBox4.Name = "warningBox4";
             this.warningBox4.OptionsButtonVisible = false;
@@ -974,7 +978,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, 302);
+            this.warningBox2.Location = new System.Drawing.Point(12, 325);
             this.warningBox2.Margin = new System.Windows.Forms.Padding(4);
             this.warningBox2.Name = "warningBox2";
             this.warningBox2.OptionsButtonVisible = false;
@@ -1128,7 +1132,7 @@
             // line2
             // 
             this.line2.BackColor = System.Drawing.Color.Transparent;
-            this.line2.Location = new System.Drawing.Point(4, 237);
+            this.line2.Location = new System.Drawing.Point(4, 260);
             this.line2.Name = "line2";
             this.line2.Size = new System.Drawing.Size(281, 12);
             this.line2.TabIndex = 20;
@@ -1140,7 +1144,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, 198);
+            this.btnRunRepair.Location = new System.Drawing.Point(5, 221);
             this.btnRunRepair.Name = "btnRunRepair";
             this.btnRunRepair.Size = new System.Drawing.Size(280, 23);
             this.btnRunRepair.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -1303,6 +1307,38 @@
             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);
@@ -1430,6 +1466,8 @@
         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,6 +62,8 @@ 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
@@ -648,11 +650,111 @@ namespace VEPROMS
 			this.Cursor = Cursors.Default;
 		}
 
-		// 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()
+		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()
 		{
 			this.Cursor = Cursors.WaitCursor;
 			DateTime pStart = DateTime.Now;
@@ -934,8 +1036,11 @@ namespace VEPROMS
 			ROFstInfo roFstInfo = dq.DocVersionAssociations[0].MyROFst;
 			string rofstPath = roFstInfo.MyRODb.FolderPath + @"\ro.fst";
 
-			//if (!pathExists(rofstPath))
-			if (!File.Exists(rofstPath))
+            //must get id before ROFST gets updated so know what to refresh later
+            int origfstid = roFstInfo.ROFstID;
+
+            //if (!pathExists(rofstPath))
+            if (!File.Exists(rofstPath))
 			{
 				ProgressBar.ColorTable = eProgressBarItemColor.Error;
 				FinalProgressBarMessage = "No existing RO.FST";
@@ -961,9 +1066,29 @@ namespace VEPROMS
 					ROFstInfo.UpdateRoFst(roFstInfo.MyRODb, dv, roFstInfo, DoProgressBarRefresh);
 					roFstInfo = dq.DocVersionAssociations[0].MyROFst;
 				}
-				roFstInfo.ROTableUpdate += new ROFstInfoROTableUpdateEvent(roFstInfo_ROTableUpdate);
-				ROFst newrofst = ROFstInfo.RefreshROFst(dv, roFstInfo, DoProgressBarRefresh, txtProcess);
-				roFstInfo.ROTableUpdate -= new ROFstInfoROTableUpdateEvent(roFstInfo_ROTableUpdate);
+                else if (!dv.ROfstLastCompleted && origfstid == roFstInfo.ROFstID)
+                {
+                    //Handle issue where load failed without completing update
+                    //previous RO FST did not load, get last loaded ID
+					//if none, use -1 which will check all ROs in the Working Draft
+                    string cfg = dv.DocVersionAssociations[0].Config;
+                    AssociationConfig ac = new AssociationConfig((cfg == null || cfg.Length == 0) ? "<Config />" : cfg);
+                    if (dv.DocVersionAssociations[0]?.MyROFst != null)
+                    {
+                        if (!int.TryParse(ac.ROUpdate_PrevROFSTID, out origfstid))
+                        {
+                            origfstid = -1;
+                        }
+                    }
+                    else
+                    {
+                        origfstid = -1;
+                    }
+                }
+
+                roFstInfo.ROTableUpdate += new ROFstInfoROTableUpdateEvent(roFstInfo_ROTableUpdate);
+                ROFstInfo.RefreshROFstAtItemLevel(DocVersionInfo.Get(dv.VersionID), DoProgressBarRefresh, txtProcess, roFstInfo, origfstid, roFstInfo.ROFstID);
+                roFstInfo.ROTableUpdate -= new ROFstInfoROTableUpdateEvent(roFstInfo_ROTableUpdate);
 			}
 
 			Cursor = Cursors.Default;
@@ -1214,10 +1339,10 @@ namespace VEPROMS
 			{
 				if (ProgressBar == null) return;
 
-				ProgressBar.Value = 100;
-				ProgressBar.Maximum = 100;
-				ProgressBar.Text = value;
-				txtProcess.AppendText(value);
+                ProgressBar.Text = value;
+                ProgressBar.Maximum = 100;
+                ProgressBar.Value = 100;
+                txtProcess.AppendText(value);
 				txtProcess.AppendText(Environment.NewLine);
 				txtProcess.AppendText(Environment.NewLine);
 
@@ -1305,7 +1430,8 @@ 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 siRefreshTblsSrchTxt = new DevComponents.DotNetBar.StepItem("siRefreshTblsSrchTxt", "Refresh Tables For Search");
+        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");
 		// this will update/rebuild the progress bar in the bottom panel of Admin Tools
 		private void setupProgessSteps1()
 		{
@@ -1323,7 +1449,9 @@ namespace VEPROMS
 						progressSteps1.Items.Add(siStandardHyphens);
 					if (swRefreshWordAttmts.Value)
 						progressSteps1.Items.Add(siRefreshAttmts);
-					if (swRefreshTblsForSrch.Value)
+					if (swRegenWordAttmts.Value)
+                        progressSteps1.Items.Add(siRegenAttmts);
+                    if (swRefreshTblsForSrch.Value)
 						progressSteps1.Items.Add(siRefreshTblsSrchTxt);
 					splitContainer3.Panel2Collapsed = false;
 					progressSteps1.Visible = true;
@@ -1487,7 +1615,13 @@ namespace VEPROMS
 				DeletePDFs();  // refresh word attachments
 				StepProgress(prgStpIdx, 100);
 			}
-			if (swRefreshTblsForSrch.Value)
+            if (swRegenWordAttmts.Value)
+            {
+                StepProgress(++prgStpIdx, 50);
+                RegenPDFs();  // generate missing pdfs
+                StepProgress(prgStpIdx, 100);
+            }
+            if (swRefreshTblsForSrch.Value)
 			{
 				StepProgress(++prgStpIdx, 50);
 				RefreshTablesForSearch();

PROMS/VEPROMS User Interface/frmBatchRefresh.resx

@@ -117,108 +117,30 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <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="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">
+  <metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <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.
+  </metadata>
+  <data name="swRegenWordAttmts.SuperTooltip" xml:space="preserve">
+    <value>When Word attachments are modified and saved, PROMS will create a PDF of the attachment contents and save it in the database.  When this is done, all of the RO references are resolved as well as pagination of the attachment.  This speeds up the overall printing of the procedure in that PROMS simply inserts the attachment contents. Certain actions like loading a new RO.FST require that these PDFs be regenerated which is normally done at print time.
 
+This function will generate (and save) any missing saved attachment PDFs stored in the database (not the PDFs of the entire procedure that you had previous printed).  This will cause printing to be faster when you print after this as the PDFs will be pre-genrated in those cases (and thus not require regeneration unless changes were made to the Word Sections or ROs after running this).
 </value>
   </data>
-  <data name="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.
+  <data name="labelX1.SuperTooltip" xml:space="preserve">
+    <value>When Word attachments are modified and saved, PROMS will create a PDF of the attachment contents and save it in the database.  When this is done, all of the RO references are resolved as well as pagination of the attachment.  This speeds up the overall printing of the procedure in that PROMS simply inserts the attachment contents. Certain actions like loading a new RO.FST require that these PDFs be regenerated which is normally done at print time.
 
+This function will generate (and save) any missing saved attachment PDFs stored in the database (not the PDFs of the entire procedure that you had previous printed).  This will cause printing to be faster when you print after this as the PDFs will be pre-genrated in those cases (and thus not require regeneration unless changes were made to the Word Sections or ROs after running this).
 </value>
-  </data>
-  <data name="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>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>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>
   </data>
   <data name="lblRefreshTblForSrch.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 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>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>
   </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
@@ -261,7 +183,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 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.
+    <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.
 
 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>
@@ -280,9 +202,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 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.
+    <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.
 
-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">
@@ -302,6 +224,53 @@ 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.
@@ -388,8 +357,46 @@ If more than one procedure is selected, it is recommended that this be performed
         ud8AKwnMnBpmYFAAAAAASUVORK5CYII=
 </value>
   </data>
-  <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>
+  <data name="swDeleteFolder.SuperTooltip" xml:space="preserve">
+    <value>This allows the user to remove folders and sub folders as well as their contents.
+
+Be sure a current backup of the database exists prior performing this function.
+
+It is recommended that this be done during off hours.
+
+</value>
   </data>
+  <data name="labelX13.SuperTooltip" xml:space="preserve">
+    <value>This allows the user to remove folders and sub folders as well as their contents.
+
+Be sure a current backup of the database exists prior performing this function.
+
+It is recommended that this be done during off hours.
+
+</value>
+  </data>
+  <data name="swDeleteAnnotations.SuperTooltip" xml:space="preserve">
+    <value>This function will allow the user to remove annotations from the selected working drafts.
+
+Be sure a current backup of the database exists prior to running this function.
+
+If more than one working draft is selected, it is recommended that this be performed during off hours.</value>
+  </data>
+  <data name="labelX14.SuperTooltip" xml:space="preserve">
+    <value>This function will allow the user to remove annotations from the selected working drafts.
+
+Be sure a current backup of the database exists prior to running this function.
+
+If more than one working draft is selected, it is recommended that this be performed during off hours.</value>
+  </data>
+  <data name="btnDeleteItems.SuperTooltip" xml:space="preserve">
+    <value>This will allow for the deletion of groups of annotations and allow for deleting entire folders within PROMS.  Use the tree nodes to select which items to delete.
+
+Click on the on/off switches to turn on/off each tool.
+
+Note that only one of these tools can be run at a time.</value>
+  </data>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>25</value>
+  </metadata>
 </root>

PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs

@@ -83,7 +83,6 @@ 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();
@@ -541,8 +540,7 @@ namespace VEPROMS
 			this.btnEditItem,
 			this.lblUser,
 			this.lblLastChange,
-			this.btnStepRTF,
-			this.btnFixMSWord});
+			this.btnStepRTF});
 			this.bottomBar.Location = new System.Drawing.Point(5, 573);
 			this.bottomBar.Name = "bottomBar";
 			this.bottomBar.Size = new System.Drawing.Size(1185, 25);
@@ -728,14 +726,6 @@ 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;
@@ -1775,7 +1765,6 @@ 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;
@@ -245,13 +245,17 @@ namespace VEPROMS
 			displayBookMarks.SetupBookMarks(); // setup bookmarks in the child window
 
 			tc.MyCopyStep = myParent.tc.MyCopyStep; // copy the copystep info to the child window
+            
+			//B2026 - 048 View Only Mode freezes PROMS if last tab closed
+            tc.EnableDisableStepProperties -= EnableDisableStepProperties;
+            tc.EnableDisableStepProperties += new StepTabRibbonEvent(EnableDisableStepProperties);
 
-			(tv.Nodes[0] as VETreeNode).InChildWindow = true; // tells us this folder's tree nodes are in the child window
+            (tv.Nodes[0] as VETreeNode).InChildWindow = true; // tells us this folder's tree nodes are in the child window
 		}
 
 		public void OpenItem(ItemInfo myItemInfo)
 		{
-			tc.OpenItem(myItemInfo);
+            tc.OpenItem(myItemInfo);
 		}
 
 		public void RefreshItem(ItemInfo myItemInfo)
@@ -352,9 +356,10 @@ namespace VEPROMS
 
 			displayRO.TabControl = tc; // B2019-043 this was being passed in as a parameter for DisplayRO which caused issues with the Visual Studio designer
 			bottomProgBar.ValueChanged += new EventHandler(bottomProgBar_ValueChanged);
+			tc.EnableDisableStepProperties += new StepTabRibbonEvent(EnableDisableStepProperties);
 
-			// When creating an XY Plot, a System.Drawing.Graphics is needed and it requires a form.  Use the main form.
-			if (VlnSettings.DebugMode)
+            // When creating an XY Plot, a System.Drawing.Graphics is needed and it requires a form.  Use the main form.
+            if (VlnSettings.DebugMode)
 			{
 				MSWordToPDF.DebugStatus = 1;
 				MSWordToPDF.OverrideColor = Color.Red;
@@ -964,7 +969,18 @@ namespace VEPROMS
 			{
 				pnl.ApplDisplayMode = displayApplicability.ViewMode;
 				displayHistory.ApplDisplayMode = pnl.ApplDisplayMode;
+
+                //C2026-021 Expand Functionality of Viewing Mode
+                if (pnl.ApplDisplayMode > 0 && pnl.VwMode != E_ViewMode.View)
+                {
+                    pnl.VwMode = E_ViewMode.View;
+                    EnableDisableStepProperties(sender, new StepTabRibbonEventArgs(tc.SelectedDisplayTabItem.MyItemInfo, 0, pnl.VwMode));
+                    MessageBox.Show("Changing to View Only Mode. Applicability Viewing Mode must be Master to return to Edit Mode. View Mode can be toggled off via the Ribbon->View tab.", "Changing to View Mode", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                }
+
+                pnl.MyStepTabPanel.MyStepTabRibbon.RefreshProcedure();
 			}
+
 		}
 
 		void tv_ViewPDF(object sender, vlnTreeViewPdfArgs args)
@@ -985,7 +1001,7 @@ namespace VEPROMS
 				fs.Close();
 				System.Diagnostics.Process.Start(fileName);
 			}
-			catch (Exception ex)
+			catch (Exception)
 			{
 				StringBuilder sb = new StringBuilder();
 
@@ -1578,13 +1594,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 +1608,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
+                    if (!_WeAreExitingPROMS) displayRO.LoadTree(true);
 				}
 			}
 
@@ -1751,7 +1767,7 @@ namespace VEPROMS
 			}
 			else if (args.TypesSelected == "Complete RO Report")
 			{
-				Volian.Print.Library.PDFReport myReport = new Volian.Print.Library.PDFReport(args.ReportTitle, args.RODataFile, Volian.Base.Library.VlnSettings.TemporaryFolder + @"\CompleteROReport.pdf", args.RofstLookup, args.CompleteROReport, args.ConvertCaretToDelta, args.IncludeEmptyROFields, args.PaperSize);
+				Volian.Print.Library.PDFReport myReport = new Volian.Print.Library.PDFReport(args.ReportTitle, args.RODataFile, Volian.Base.Library.VlnSettings.TemporaryFolder + @"\CompleteROReport.pdf", args.RofstLookup, args.ConvertCaretToDelta, args.IncludeEmptyROFields, args.PaperSize);
 				myReport.Build();
 			}
 			else if (args.TypesSelected == "RO Summary Report")
@@ -2132,7 +2148,7 @@ namespace VEPROMS
 						//C2019-036 View Only mode work with Checked Out Procedures
 						// View Only Mode is no longer checked out, so no longer has an OwnerID
 						// This will keep those tabs from auto-closing based on the timer
-						if (!myList.Contains(dti.OwnerID) && dti.MyStepTabPanel.MyStepPanel.VwMode != E_ViewMode.View)
+						if (!myList.Contains(dti.OwnerID) && dti?.MyStepTabPanel?.MyStepPanel?.VwMode != E_ViewMode.View)
 						{
 							MyCloseTabList.PushDTI(dti);
 						}
@@ -2395,9 +2411,10 @@ namespace VEPROMS
 			tv.MySessionInfo = MySessionInfo;
 			tv.MyUserInfo = MyUserInfo;
 			StepTabRibbon.MySessionInfo = MySessionInfo;
+            displayRO.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);
@@ -3561,6 +3578,7 @@ namespace VEPROMS
 			{
 				if (parameter.StartsWith("/P="))
 				{
+					BaseLnSettings.blBaseLine = true;
 					MSWordToPDF.Automatic = true;
 					PromsPrinter.BaselineTesting = true;// Set Baseline Testing property for PROMsPrinter
 					string[] dvstrs = parameter.Substring(3).Split(",".ToCharArray());
@@ -3606,7 +3624,7 @@ namespace VEPROMS
 						}
 						ranAuto = true;
 					}
-
+					BaseLnSettings.blBaseLine = false;
 					if (ranAuto)
 					{
 						this.Close();
@@ -4482,7 +4500,6 @@ namespace VEPROMS
 			{
 				infoPanel.Expanded = true;
 				infoTabs.SelectedTab = infotabTags;
-				displayTags.HighlightChangeStep();
 			}
 			else if (args.PanelTabName == "Change Image Size")
 			{
@@ -4552,8 +4569,17 @@ namespace VEPROMS
 
 			SetCaption(tv.SelectedNode as VETreeNode);
 			displayApplicability.MyDisplayTabItem = tc.SelectedDisplayTabItem;
-			
-			if (tc.SelectedDisplayTabItem.MyItemInfo.MyDocVersion.DocVersionAssociationCount > 0)
+
+            //C2026-008 Re-Architect RO.FST to include RO Modification date/time
+            // DisplayTab was changed
+            // need to clear the RTB selected
+            // without resetting the DVI or FST
+            // (those will be set manually / individually)
+            // this will prevent DVI and FST from changing to null then back again
+            // which will trigger reloads            
+            displayRO.ClearRTB();
+
+            if (tc.SelectedDisplayTabItem.MyItemInfo.MyDocVersion.DocVersionAssociationCount > 0)
 			{
 				displayRO.MyROFST = tc.SelectedDisplayTabItem.MyItemInfo.MyDocVersion.DocVersionAssociations[0].MyROFst;
 			}
@@ -4562,9 +4588,24 @@ namespace VEPROMS
 				displayRO.MyROFST = null;
 			}
 
-			// B2022-026 RO Memory reduction coding (Jakes Merge)
-			// B2022-123: RO Tab Treeview not showing correct RO values when switching between procedures. (Added True for the forceLoad parameter)
-			displayRO.LoadTree(true);
+            //C2026-008 Re-Architect RO.FST to include RO Modification date/time
+			// set the DocVersionInfo so that the FST and docversion are in sync
+            SelectedDVI = tc.SelectedDisplayTabItem.MyItemInfo.MyDocVersion;
+            if (displayRO.MyDvi != SelectedDVI)
+            {
+                displayRO.MyDvi = SelectedDVI;
+            }
+			Application.DoEvents();
+
+            // B2022-026 RO Memory reduction coding (Jakes Merge)
+            // B2022-123: RO Tab Treeview not showing correct RO values when switching between procedures. (Added True for the forceLoad parameter)
+            //C2026-008 Re-Architect RO.FST to include RO Modification date/time
+            // if ROFST got updated,
+			// set the Selected FST so it is in sync
+            if (!_WeAreExitingPROMS && displayRO.LoadTree(true))
+			{
+				SelectedROFst = displayRO.MyROFST;
+            }
 
 			lblUser.Text = tc.SelectedDisplayTabItem.MyUserRole;
 
@@ -4579,7 +4620,7 @@ namespace VEPROMS
 					//           also change the text on the buttons to read either Find or Find/Replace
 					//           also toggle the Replace tab on the dialog based on the user's accessibility to the procedure
 					bool isReviewer = !MyUserInfo.IsAllowedToEdit(tc.SelectedDisplayTabItem.MyItemInfo.MyDocVersion);
-					pnl.MyStepTabPanel.MyStepTabRibbon.SetButtonAndMenuEnabling(true);
+					pnl.MyStepTabPanel.MyStepTabRibbon.SetButtonAndMenuEnabling();
 					this.dlgFindReplace.ToggleReplaceTab(isReviewer ? E_ViewMode.View : E_ViewMode.Edit);
 					pnl.MyStepTabPanel.MyStepTabRibbon.ToggleFindReplaceToolTip(isReviewer);
 				}
@@ -4628,8 +4669,6 @@ 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);
 
@@ -4767,9 +4806,15 @@ namespace VEPROMS
 					// B2022-026 RO Memory reduction coding (Jakes Merge)
 					displayRO.ProgressBar = bottomProgBar;
 					displayRO.MyRTB = args.MyEditItem.MyStepRTB;
-					displayRO.LoadTree(); 
+                    //C2026-008 Re-Architect RO.FST to include RO Modification date/time
+                    // if ROFST got updated,
+                    // set the Selected FST so it is in sync
+                    if (!_WeAreExitingPROMS && displayRO.LoadTree())
+                    {
+                        SelectedROFst = displayRO.MyROFST;
+                    }
 
-					displayBookMarks.MyEditItem = args.MyEditItem;
+                    displayBookMarks.MyEditItem = args.MyEditItem;
 					displayHistory.MyEditItem = args.MyEditItem;
 
 					lblEditView.Text = args.MyEditItem.MyStepPanel.VwMode == E_ViewMode.Edit ? "Edit" : "View";
@@ -4797,7 +4842,7 @@ namespace VEPROMS
 
 					// B2022-026 RO Memory reduction coding (Jakes Merge)
 					displayRO.SetFindDocROButton(false);
-					displayRO.LoadTree();
+					if (!_WeAreExitingPROMS) displayRO.LoadTree();
 
                     //C2019-036 View Only mode work with Checked Out Procedures
                     //In View Only Mode - Step Properties should be disabled
@@ -4838,15 +4883,31 @@ namespace VEPROMS
 		//In View Only Mode - Step Properties should be disabled
 		public void EnableDisableStepProperties(object sender, StepTabRibbonEventArgs args)
 		{
-            if (args.ViewMode == E_ViewMode.View && (infoTabs.Enabled || infoTabs.SelectedTab != infotabTags))
+            //C2026 - 021 Expand Functionality of Viewing Mode
+            //B2026 - 048 View Only Mode freezes PROMS if last tab closed
+            if (args.ViewMode == E_ViewMode.View && (infotabControlPanelTags.Enabled || (infoTabs.SelectedTab != infotabTags && infoTabs.SelectedTab != infotabApplicability)))
             {
-				infoTabs.Enabled = true;
-				infoTabs.SelectedTab = infotabTags;
-                infoTabs.Enabled = false;
+				if (infoTabs.SelectedTab != infotabApplicability)
+                {
+                    infoTabs.SelectedTab = infotabTags;
+                }
+
+                infotabControlPanelTags.Enabled = false;
+                infotabControlPanelRO.Enabled = false;
+                infotabControlPanelTransitions.Enabled = false;
+                tabControlPanel1.Enabled = false;
+				displayApplicability.SetEnableDisableItemSelection(false);
+                tcpFoldoutMaint.Enabled = false;
+
             }
-			else if (args.ViewMode != E_ViewMode.View && !infoTabs.Enabled)
+			else if (args.ViewMode != E_ViewMode.View && !infotabControlPanelTags.Enabled)
 			{
-                infoTabs.Enabled = true;
+                infotabControlPanelTags.Enabled = true;
+                infotabControlPanelRO.Enabled = true;
+                infotabControlPanelTransitions.Enabled = true;
+                tabControlPanel1.Enabled = true;
+                displayApplicability.SetEnableDisableItemSelection(true);
+                tcpFoldoutMaint.Enabled = true;
             }
         }
 
@@ -4930,9 +4991,15 @@ namespace VEPROMS
 			displayRO.MyRTB = SelectedStepTabPanel.MyStepPanel.SelectedEditItem.MyStepRTB;
 			displayRO.CurROLink = args.MyLinkText.MyRoUsageInfo;
 
-			// B2022-026 RO Memory reduction coding (Jakes Merge)
-			displayRO.LoadTree();
-		}
+            // B2022-026 RO Memory reduction coding (Jakes Merge)
+            //C2026-008 Re-Architect RO.FST to include RO Modification date/time
+            // if ROFST got updated,
+            // set the Selected FST so it is in sync
+            if (displayRO.LoadTree())
+            {
+                SelectedROFst = displayRO.MyROFST;
+            }
+        }
 
 		#endregion
 
@@ -5199,8 +5266,8 @@ namespace VEPROMS
 			{
 				if (SelectedDVI != null)
 					displayReports.Mydocversion = SelectedDVI;
-				displayReports.advTreeProcSetsFillIn(reportFocus);
-				displayReports.advTreeROFillIn(reportFocus);
+				displayReports.advTreeProcSetsFillIn();
+				displayReports.advTreeROFillIn();
 				displayReports.SelectReferencedObjectTab(); // to enable RO selection
 			}
 		}
@@ -5241,19 +5308,6 @@ 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

@@ -899,10 +899,10 @@ namespace VEPROMS
 			set
 			{
 				if (ProgressBar == null) return;
-				ProgressBar.Maximum = 100;
-				ProgressBar.Value = 100;
-				ProgressBar.Text = value;
-				Application.DoEvents();
+                ProgressBar.Text = value;
+                ProgressBar.Maximum = 100;
+                ProgressBar.Value = 100;
+                Application.DoEvents();
 			}
 		}
 
@@ -1527,8 +1527,11 @@ namespace VEPROMS
 
 				Cursor = Cursors.WaitCursor;
 
-				// RO changes placed in file in the Documents\VEPROMS folder
-				swROUpdate = new System.IO.StreamWriter(ROFstInfo.ROUpdateResultsPath(_DocVersionConfig.MyDocVersion.MyDocVersionInfo));
+                //must get id before ROFST gets updated so know what to refresh later
+                int origfstid = SelectedROFst.ROFstID;
+
+                // RO changes placed in file in the Documents\VEPROMS folder
+                swROUpdate = new System.IO.StreamWriter(ROFstInfo.ROUpdateResultsPath(_DocVersionConfig.MyDocVersion.MyDocVersionInfo));
 				DocVersion dv = _DocVersionConfig.MyDocVersion;
 				// B2022-026 RO Memory Reduction code - first load the new ro.fst so that we can assign the ROTableUpdate event to the correct roFstInfo
 				if (dv.ROfstLoadingFigures || dv.NewerRoFst)    // B2017-125 see if loading figures was completed
@@ -1536,13 +1539,32 @@ namespace VEPROMS
 					ROFstInfo.UpdateRoFst(SelectedROFst.MyRODb, dv, SelectedROFst, DoProgressBarRefresh);
 					SelectedROFst = null; // set to null to force getting the updated ROfst
 				}
+                else if (!dv.ROfstLastCompleted && origfstid == SelectedROFst.ROFstID)
+                {
+                    //Handle issue where load failed without completing update
+                    //previous RO FST did not load, get last loaded ID
+                    //if none, use -1 which will check all ROs in the Working Draft
+                    string cfg = dv.DocVersionAssociations[0].Config;
+                    AssociationConfig ac = new AssociationConfig((cfg == null || cfg.Length == 0) ? "<Config />" : cfg);
+                    if (dv.DocVersionAssociations[0]?.MyROFst != null)
+                    {
+                        if (!int.TryParse(ac.ROUpdate_PrevROFSTID, out origfstid))
+                        {
+                            origfstid = -1;
+                        }
+                    }
+                    else
+                    {
+                        origfstid = -1;
+                    }
+                }
 
-				ContentInfo.StaticContentInfoChange += ContentInfo_StaticContentInfoChange; // write changes to a text file
+                ContentInfo.StaticContentInfoChange += ContentInfo_StaticContentInfoChange; // write changes to a text file
 				SelectedROFst.ROTableUpdate += new ROFstInfoROTableUpdateEvent(roFstInfo_ROTableUpdate);
 
-				ROFst newrofst = ROFstInfo.RefreshROFst(_DocVersionConfig.MyDocVersion, SelectedROFst, DoProgressBarRefresh, null);
+				ROFstInfo.RefreshROFstAtItemLevel(DocVersionInfo.Get(dv.VersionID), DoProgressBarRefresh, null, SelectedROFst, origfstid, SelectedROFst.ROFstID);
 
-				ContentInfo.StaticContentInfoChange -= ContentInfo_StaticContentInfoChange;
+                ContentInfo.StaticContentInfoChange -= ContentInfo_StaticContentInfoChange;
 				SelectedROFst.ROTableUpdate -= new ROFstInfoROTableUpdateEvent(roFstInfo_ROTableUpdate);
 
 				swROUpdate.Close();

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

@@ -124,9 +124,26 @@ namespace VEPROMS.CSLA.Library
 				_Xp["ROUpdate", "LoadingFigures"] = value; // save selected value
 			}
 		}
-		#endregion // ROUpdate
-		#region ToString
-		public override string ToString()
+
+        [Category("RO Update")]
+        [DisplayName("Previous ROFSTID")]
+        [RefreshProperties(RefreshProperties.All)]
+        [Description("Previous ROFSTID")]
+        public string ROUpdate_PrevROFSTID
+        {
+            get
+            {
+                string s = _Xp["ROUpdate", "PrevROFSTID"];// get the saved value
+                return s;
+            }
+            set
+            {
+                _Xp["ROUpdate", "PrevROFSTID"] = value; // save selected value
+            }
+        }
+        #endregion // ROUpdate
+        #region ToString
+        public override string ToString()
 		{
 			string s = _Xp.ToString();
 			if (s == "<Config/>" || s == "<Config></config>") return string.Empty;

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

@@ -8,7 +8,6 @@ using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
-using static System.Net.Mime.MediaTypeNames;
 
 
 namespace VEPROMS.CSLA.Library
@@ -61,7 +60,8 @@ namespace VEPROMS.CSLA.Library
 		#region Structs / Internal Classes
 
 		[Serializable]
-		public struct roHdr
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Keep Older Pre-existing naming conventions")]
+        public struct roHdr
 		{
 			public int hSize;
 			public int hYear;
@@ -78,7 +78,8 @@ namespace VEPROMS.CSLA.Library
 		};
 
 		[Serializable]
-		public struct rodbi
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Keep Older Pre-existing naming conventions")]
+        public struct rodbi
 		{
 			public int dbiID;
 			public int dbiType;
@@ -91,17 +92,20 @@ namespace VEPROMS.CSLA.Library
 		};
 
 		[Serializable]
-		public struct rogrp
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Keep Older Pre-existing naming conventions")]
+        public struct rogrp
 		{
 			public string value;
 			public string appid;
 			public int ID;
 			public int ParentID;
-			public rochild[] children;
+			public DateTime? ModDateTime;  //C2026-008 Re-Architect RO.FST to include RO Modification date/time
+            public rochild[] children;
 		};
 
 		[Serializable]
-		public struct rochild
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Keep Older Pre-existing naming conventions")]
+        public struct rochild
 		{
 			public int ID;
 			public int ParentID;
@@ -110,7 +114,8 @@ namespace VEPROMS.CSLA.Library
 			public string roid;         // roid unique identifier
 			public string appid;        // accessory page id - user specified unique id
 			public string value;        // return value, can be multiple values
-			public rochild[] children;
+            public DateTime? ModDateTime;  //C2026-008 Re-Architect RO.FST to include RO Modification date/time
+            public rochild[] children;
 		};
 
 		public class RoExtension
@@ -131,7 +136,7 @@ namespace VEPROMS.CSLA.Library
 		private List<string> _baseAccPageKeys;
 
 		// RofstLookup/Conversion Variables
-		private int _rofstID;
+		private readonly int _rofstID;
 		private DocVersionInfo _myDocVersionInfo;
 		private int _selectedSlave;
 		private string _otherChild = string.Empty;
@@ -147,7 +152,7 @@ namespace VEPROMS.CSLA.Library
 		// B2022-107: Display Progress Bar Messages/Statuses when a new ROFST binary file is loaded into the database
 		private frmRofstLoadStatus _frmRofstLoadStatus = null;
 		private Dictionary<int, int> _dicRoCounts = null;
-		private bool _showLoadingStatus = true;
+		private readonly bool _showLoadingStatus = true;
 
 		private int _curRoCnt = 0;
 		private int _dbRoCnt = 0;
@@ -412,7 +417,6 @@ namespace VEPROMS.CSLA.Library
 
 			ROFSTLookup.rochild rc = RofstDataGetChildByAccPageID(_rofstID, accPageBase);
 
-			//if (rc.ID >=0 && rc.roid.Length < 16 && Regex.IsMatch(accPageKey, @".*\.[A-Z]") && rc.children != null && rc.children.Count() > 0)
 			if (rc.ID >= 0 && rc.roid.Length < 16 && !string.IsNullOrEmpty(accPageExt) && rc.children != null && rc.children.Count() > 0)
 			{
 				// Check if AccPageID/Key has a return value specific extension.  Try to find the RoChild record with the specific return value type, 
@@ -505,8 +509,6 @@ namespace VEPROMS.CSLA.Library
 			// B2023-037: Handle <=, >=, +-, -> and <- symbols. Convert to unicode for output, i.e. print and edit/view (when editing
 			//   step, will show as 2 characters, not unicode, unless ro inserted when code replaced link text with unicode.
 
-			//(_MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue ||
-			//			_MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue))
 			bool arrows1 = myiteminfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue;
 			bool arrows2 = myiteminfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue;
 
@@ -679,22 +681,25 @@ namespace VEPROMS.CSLA.Library
 
 			if (minutes > 0) duration = string.Format("{0} min(s) ", minutes.ToString("n0"));
 			if (secs < 0) secs = 0.00;
-			duration = duration + string.Format("{0,10:#####0.00} sec(s)", secs).Trim();
+			duration += string.Format("{0,10:#####0.00} sec(s)", secs).Trim();
 
 			return duration;
 
-			//return string.Format("{0,10:#####0.00}", TimeSpan.FromTicks(DateTime.Now.Ticks - dtStart.Ticks).TotalSeconds);
 		}
 
-		#endregion
+        //C2026-008 Re-Architect RO.FST to include RO Modification date/time
+		//return new ROFstID if there is a newer ID that matches the same ROFSTDB
+        public int GetNewerFSTID() => RofstGetLatestID(RofstID);
 
-		#endregion
+        #endregion
 
-		#region Private Methods
+        #endregion
 
-		#region (Database Calls)
+        #region Private Methods
 
-		private bool RofstDataExists(int rofstID)
+        #region (Database Calls)
+
+        private bool RofstDataExists(int rofstID)
 		{
 			int headerStatusID = RofstDataGetHeaderLoadStatus(rofstID);
 
@@ -888,7 +893,7 @@ namespace VEPROMS.CSLA.Library
 			}
 		}
 
-		private void RofstChildInsert(int rofstID, int id, int parentID, int dbiID, int type, string title, string roid, string appid, string value)
+		private void RofstChildInsert(int rofstID, int id, int parentID, int dbiID, int type, string title, string roid, string appid, string value, DateTime? dt = null)
 		{
 			try
 			{
@@ -917,7 +922,10 @@ namespace VEPROMS.CSLA.Library
 						if (!string.IsNullOrEmpty(this.RoMissingDefaultValue))
 							cmd.Parameters.Add(new SqlParameter("@missingDefaultValue", SqlDbType.VarChar)).Value = this.RoMissingDefaultValue;
 
-						cmd.ExecuteNonQuery();
+                        if (dt != null)
+                            cmd.Parameters.Add(new SqlParameter("@ModDateTime", SqlDbType.DateTime)).Value = dt;
+
+                        cmd.ExecuteNonQuery();
 					}
 				}
 			}
@@ -1299,11 +1307,37 @@ namespace VEPROMS.CSLA.Library
 			}
 		}
 
-		#endregion
+        //C2026-008 Re-Architect RO.FST to include RO Modification date/time
+        //return new ROFstID if there is a newer ID that matches the same ROFSTDB
+        private int RofstGetLatestID(int rofstID)
+        {
+            try
+            {
+                using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+                {
+                    using (SqlCommand cmd = cn.CreateCommand())
+                    {
+                        cmd.CommandTimeout = 0;
+                        cmd.CommandType = CommandType.Text;
+                        cmd.CommandText = "SELECT ISNULL((SELECT TOP 1 ROFsts.ROFstID FROM ROFsts INNER JOIN ROFsts curFST ON curFST.RODbID = ROFsts.RODbID WHERE curFST.ROFstID = @FSTid order by ROFsts.DTS desc),-1)";
 
-		#region (Core/Base logic for RO Values & UnitInfo RO Values) 
+                        cmd.Parameters.Add(new SqlParameter("@FSTid", SqlDbType.Int)).Value = rofstID;
 
-		private ROFSTLookup.rochild RofstDataGetChildByRoid(int rofstID, string roid, bool loadChildren = false, bool loadAllChildren = false)
+						return (int) cmd.ExecuteScalar();
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                throw new DbCslaException("RofstData.RofstGetLatestID", ex);
+            }
+        }
+
+        #endregion
+
+        #region (Core/Base logic for RO Values & UnitInfo RO Values) 
+
+        private ROFSTLookup.rochild RofstDataGetChildByRoid(int rofstID, string roid, bool loadChildren = false, bool loadAllChildren = false)
 		{
 			try
 			{
@@ -1440,21 +1474,22 @@ namespace VEPROMS.CSLA.Library
 
 		private ROFSTLookup.roHdr ConvertFst2Objects(byte[] ab)
 		{
-			ROFSTLookup.roHdr roh = new ROFSTLookup.roHdr();
+            ROFSTLookup.roHdr roh = new ROFSTLookup.roHdr
+            {
+                hSize = BitConverter.ToInt32(ab, 0),
+                hYear = BitConverter.ToInt16(ab, 4),
+                hMonth = ab[6],
+                hDay = ab[7],
+                hcYear = BitConverter.ToInt16(ab, 8),
+                hcMonth = ab[10],
+                hcDay = ab[11],
+                hcHour = ab[12],
+                hcMin = ab[13],
+                hcSec = ab[14],
+                hcHund = ab[15]
+            };
 
-			roh.hSize = BitConverter.ToInt32(ab, 0);
-			roh.hYear = BitConverter.ToInt16(ab, 4);
-			roh.hMonth = ab[6];
-			roh.hDay = ab[7];
-			roh.hcYear = BitConverter.ToInt16(ab, 8);
-			roh.hcMonth = ab[10];
-			roh.hcDay = ab[11];
-			roh.hcHour = ab[12];
-			roh.hcMin = ab[13];
-			roh.hcSec = ab[14];
-			roh.hcHund = ab[15];
-
-			int hdrOffset = BitConverter.ToInt32(ab, 16);
+            int hdrOffset = BitConverter.ToInt32(ab, 16);
 			int dbs = BitConverter.ToInt16(ab, hdrOffset + 4);
 
 			roh.myDbs = new ROFSTLookup.rodbi[dbs];
@@ -1490,12 +1525,13 @@ namespace VEPROMS.CSLA.Library
 
 		private ROFSTLookup.rogrp LoadGroup(byte[] ab, int offset, int tableID)
 		{
-			ROFSTLookup.rogrp myGrp = new ROFSTLookup.rogrp();
+            ROFSTLookup.rogrp myGrp = new ROFSTLookup.rogrp
+            {
+                ID = BitConverter.ToInt32(ab, offset),
+                ParentID = BitConverter.ToInt32(ab, offset + 4)
+            };
 
-			myGrp.ID = BitConverter.ToInt32(ab, offset);
-			myGrp.ParentID = BitConverter.ToInt32(ab, offset + 4);
-
-			int numChildren = BitConverter.ToInt16(ab, offset + 8);
+            int numChildren = BitConverter.ToInt16(ab, offset + 8);
 
 			if (numChildren > 0)
 			{
@@ -1512,10 +1548,10 @@ namespace VEPROMS.CSLA.Library
 
 					int slen = StringLength(ab, myOffset + 6);
 					tmp.title = Encoding.Default.GetString(ab, myOffset + 6, slen);
-
+                    
 					myOffset += (7 + slen);
 
-					ROFSTLookup.rogrp tmpg = LoadGroup(ab, childOffset, tableID);
+                    ROFSTLookup.rogrp tmpg = LoadGroup(ab, childOffset, tableID);
 
 					tmp.ID = tmpg.ID;
 					tmp.ParentID = tmpg.ParentID;
@@ -1523,8 +1559,12 @@ namespace VEPROMS.CSLA.Library
 					tmp.appid = tmpg.appid;
 					tmp.roid = tableID.ToString("X4") + tmp.ID.ToString("X8");
 					tmp.children = tmpg.children;
+                    if (tmpg.ModDateTime != null)
+                    {
+                        tmp.ModDateTime = tmpg.ModDateTime;
+                    }
 
-					int j;
+                    int j;
 
 					for (j = i - 1; j >= 0 && tmp.ID < myGrp.children[j].ID; j--)
 					{
@@ -1542,7 +1582,13 @@ namespace VEPROMS.CSLA.Library
 				int slen2 = StringLength(ab, offset + 13 + slen);
 				myGrp.appid = Encoding.Default.GetString(ab, offset + 13 + slen, slen2);
 
-				_dbRoCnt++;
+                //C2026-008 Re-Architect RO.FST to include RO Modification date/time
+                if (myGrp.value != "" && DateTime.TryParseExact(Encoding.Default.GetString(ab, offset + 14 + slen + slen2, 14), "yyyyMMddHHmmss", null, System.Globalization.DateTimeStyles.None, out DateTime dt))
+                {
+                    myGrp.ModDateTime = dt;
+                }
+
+                _dbRoCnt++;
 			}
 
 			return myGrp;
@@ -1615,7 +1661,7 @@ namespace VEPROMS.CSLA.Library
 					}
 
 					// Update Progress Bar Accordingly
-					if (_totalRoCnt > 0) _pctComplete = _pctComplete + ((Convert.ToDouble(_dbRoCnt) / Convert.ToDouble(_totalRoCnt)) * 80.0);
+					if (_totalRoCnt > 0) _pctComplete += ((Convert.ToDouble(_dbRoCnt) / Convert.ToDouble(_totalRoCnt)) * 80.0);
 
 					OnProgressChanged(displayText, Convert.ToInt32(_pctComplete), 100);
 				}
@@ -1655,7 +1701,7 @@ namespace VEPROMS.CSLA.Library
 		private void LoadChild(int rofstID, int dbiID, ROFSTLookup.rochild child)
 		{
 			//Insert Rofst Child
-			RofstChildInsert(rofstID, child.ID, child.ParentID, dbiID, child.type, child.title, child.roid, child.appid, child.value);
+			RofstChildInsert(rofstID, child.ID, child.ParentID, dbiID, child.type, child.title, child.roid, child.appid, child.value, child.ModDateTime);
 
 			//Increment RO Count if RoChild has a return value
 			if (!string.IsNullOrEmpty(child.value)) _curRoCnt++;
@@ -1675,15 +1721,13 @@ namespace VEPROMS.CSLA.Library
 		protected virtual void OnProgressChanged(string title, string displayText, int curVal = 0, int maxVal = 100)
 		{
 			// If frmRofstLoadStatus is not null then call Update Progress Method
-			if (_frmRofstLoadStatus != null)
-				_frmRofstLoadStatus.UpdateProgress(title, displayText, curVal, maxVal);
+			_frmRofstLoadStatus?.UpdateProgress(title, displayText, curVal, maxVal);
 		}
 
 		protected virtual void OnProgressChanged(string displayText, int curVal = 0, int maxVal = 100)
 		{
 			// If frmRofstLoadStatus is not null then call Update Progress Method
-			if (_frmRofstLoadStatus != null)
-				_frmRofstLoadStatus.UpdateProgress(_frmRofstLoadStatus.Title, displayText, curVal, maxVal);
+			_frmRofstLoadStatus?.UpdateProgress(_frmRofstLoadStatus.Title, displayText, curVal, maxVal);
 		}
 
 		#endregion
@@ -1694,21 +1738,22 @@ namespace VEPROMS.CSLA.Library
 
 		private ROFSTLookup.roHdr ConvertToRoHdrObject(SafeDataReader dr, bool loadChildren)
 		{
-			ROFSTLookup.roHdr rh = new ROFSTLookup.roHdr();
+            ROFSTLookup.roHdr rh = new ROFSTLookup.roHdr
+            {
+                hSize = (int)dr.GetValue("hSize"),
+                hYear = (int)dr.GetValue("hYear"),
+                hMonth = (byte)dr.GetValue("hMonth"),
+                hDay = (byte)dr.GetValue("hDay"),
+                hcYear = (int)dr.GetValue("hcYear"),
+                hcMonth = (byte)dr.GetValue("hcMonth"),
+                hcDay = (byte)dr.GetValue("hcDay"),
+                hcHour = (byte)dr.GetValue("hcHour"),
+                hcMin = (byte)dr.GetValue("hcMin"),
+                hcSec = (byte)dr.GetValue("hcSec"),
+                hcHund = (byte)dr.GetValue("hcHund")
+            };
 
-			rh.hSize = (int)dr.GetValue("hSize");
-			rh.hYear = (int)dr.GetValue("hYear");
-			rh.hMonth = (byte)dr.GetValue("hMonth");
-			rh.hDay = (byte)dr.GetValue("hDay");
-			rh.hcYear = (int)dr.GetValue("hcYear");
-			rh.hcMonth = (byte)dr.GetValue("hcMonth");
-			rh.hcDay = (byte)dr.GetValue("hcDay");
-			rh.hcHour = (byte)dr.GetValue("hcHour");
-			rh.hcMin = (byte)dr.GetValue("hcMin");
-			rh.hcSec = (byte)dr.GetValue("hcSec");
-			rh.hcHund = (byte)dr.GetValue("hcHund");
-
-			if (loadChildren)
+            if (loadChildren)
 			{
 				rh.myDbs = RofstDataGetDatabases(_rofstID);
 			}
@@ -1718,17 +1763,18 @@ namespace VEPROMS.CSLA.Library
 
 		private ROFSTLookup.rodbi ConvertToRodbiObject(SafeDataReader dr, bool loadChildren, bool loadAllChildren)
 		{
-			ROFSTLookup.rodbi rd = new ROFSTLookup.rodbi();
+            ROFSTLookup.rodbi rd = new ROFSTLookup.rodbi
+            {
+                dbiID = (int)dr.GetValue("dbiID"),
+                dbiType = (int)dr.GetValue("dbiType"),
+                dbiAW = (int)dr.GetValue("dbiAW"),
+                dbiAP = (string)dr.GetValue("dbiAP"),
+                dbiTitle = (string)dr.GetValue("dbiTitle"),
+                ID = (int)dr.GetValue("ID"),
+                ParentID = (int)dr.GetValue("ParentID")
+            };
 
-			rd.dbiID = (int)dr.GetValue("dbiID");
-			rd.dbiType = (int)dr.GetValue("dbiType");
-			rd.dbiAW = (int)dr.GetValue("dbiAW");
-			rd.dbiAP = (string)dr.GetValue("dbiAP");
-			rd.dbiTitle = (string)dr.GetValue("dbiTitle");
-			rd.ID = (int)dr.GetValue("ID");
-			rd.ParentID = (int)dr.GetValue("ParentID");
-
-			if (loadChildren || loadAllChildren)
+            if (loadChildren || loadAllChildren)
 			{
 				rd.children = RofstDataGetChildrenByID(_rofstID, rd.dbiID, rd.ID, false, loadAllChildren);
 			}
@@ -1738,15 +1784,16 @@ namespace VEPROMS.CSLA.Library
 
 		private ROFSTLookup.rochild ConvertToRochildObject(SafeDataReader dr, bool loadChildren, bool loadAllChildren)
 		{
-			ROFSTLookup.rochild rc = new ROFSTLookup.rochild();
+            ROFSTLookup.rochild rc = new ROFSTLookup.rochild
+            {
+                ID = (int)dr.GetValue("ID"),
+                ParentID = (int)dr.GetValue("ParentID"),
+                type = (int)dr.GetValue("type"),
+                title = (string)dr.GetValue("title"),
+                roid = (string)dr.GetValue("roid")
+            };
 
-			rc.ID = (int)dr.GetValue("ID");
-			rc.ParentID = (int)dr.GetValue("ParentID");
-			rc.type = (int)dr.GetValue("type");
-			rc.title = (string)dr.GetValue("title");
-			rc.roid = (string)dr.GetValue("roid");
-
-			if (!string.IsNullOrEmpty((string)dr.GetValue("appid")))
+            if (!string.IsNullOrEmpty((string)dr.GetValue("appid")))
 			{
 				rc.appid = (string)dr.GetValue("AccPageID");
 
@@ -1766,13 +1813,14 @@ namespace VEPROMS.CSLA.Library
 
 		private ROFSTLookup.RoExtension ConvertToRoExtensionObject(SafeDataReader dr)
 		{
-			ROFSTLookup.RoExtension re = new ROFSTLookup.RoExtension();
+            ROFSTLookup.RoExtension re = new ROFSTLookup.RoExtension
+            {
+                Offset = (int)dr.GetValue("Offset"),
+                RoidExt = (string)dr.GetValue("RoidExt"),
+                AccPageExt = (string)dr.GetValue("AccPageExt")
+            };
 
-			re.Offset = (int)dr.GetValue("Offset");
-			re.RoidExt = (string)dr.GetValue("RoidExt");
-			re.AccPageExt = (string)dr.GetValue("AccPageExt");
-
-			return re;
+            return re;
 		}
 
 		#endregion
@@ -1830,7 +1878,6 @@ namespace VEPROMS.CSLA.Library
 					// Instead of returning the RoChildBase object with a single RoReturnVal object attached, just return the single Ro ReturnValue object.
 					var roRetVal = child.children.First();
 
-					//child.title = roRetVal.title;
 					child.appid = roRetVal.appid;
 					child.roid = roRetVal.roid;
 					child.value = roRetVal.value;
@@ -2084,44 +2131,71 @@ namespace VEPROMS.CSLA.Library
 			return ProcessRO(match, multiRtnVal);
 		}
 
-		private string ProcessMacros(string str)
-		{
-			// Takes the RO text value and sees if a macro has been used.  
-			// If so it will perform the macro operation on the substring in the text value
-			// Note** Right now the only macro is @HSP(), where every space between the "(" and ")" will be replaced with a hard space
+        // Takes the RO text value and sees if a macro has been used.  
+        // If so it will perform the macro operation on the substring in the text value
+        // Note** Right now the only macro is @HSP(), where every space between the "(" and ")" will be replaced with a hard space
+        private static string ProcessMacros(string str)
+        {
 
-			if (string.IsNullOrEmpty(str))
-				return str;
+            if (string.IsNullOrEmpty(str) || str.ToUpper().IndexOf("@HSP(") < 0)
+                return str;
 
-			string rtnstr = str;
-			int indx;
 
-			while ((indx = rtnstr.ToUpper().IndexOf("@HSP(")) > -1)
-			{
-				string resstr = rtnstr.Substring(0, indx);
-				int endHsp = rtnstr.IndexOf(")", indx);
+            string processingstr = str;  //holds current string being processed
+            int indx;                    //current position of @HSP( in string
+            int endpos = 0;              //end of last parens
 
-				//B2026 - 002 handle if parens inside a HSP
-				int startpos = indx + 5;
-				while (rtnstr.Substring(startpos, endHsp - startpos).Contains("("))
-				{
-					startpos = rtnstr.IndexOf("(", startpos + 1, endHsp - startpos) + 1;
-					endHsp = rtnstr.IndexOf(")", endHsp + 1);
-				}
+            StringBuilder sb = new StringBuilder();
+            Stack<char> endparens = new Stack<char>();
 
-				string tmpstr = rtnstr.Substring(indx + 5, endHsp - indx - 5);
+            while ((indx = processingstr.ToUpper().IndexOf("@HSP(")) > -1)
+            {
+                sb.Append(processingstr.Substring(0, indx));   // initial string before @HSP(
 
-				// B2017-012 Don't convert space to hard spaces for XY Plots.
-				if (!tmpstr.Contains("<<G")) tmpstr = tmpstr.Replace(" ", @"\u160?");
+                for (int i = indx + 5; i < processingstr.Length; i++)
+                {
+                    char ch = processingstr[i];
 
-				resstr = resstr + tmpstr;
-				rtnstr = resstr + rtnstr.Substring(endHsp + 1);
-			}
+                    if (ch == '(')
+                    {
+						//if opening paren inside HSP add it to the stack to look for a closing parens
+                        endparens.Push(ch);
+                    }
+                    else if (ch == ')' && endparens.Count > 0)
+                    {
+						//if cloing parens and it matches an opening parens inside of HSP, remove a level
+                        _ = endparens.Pop();
+                    }
+                    else if (ch == ')' && endparens.Count == 0)
+                    {
+						//if closing parens and at same level as HSP, break out since found correct closing parens
+                        endpos = i;
+                        break;
+                    }
+                    else if (i == processingstr.Length - 1)
+                    {
+						//if hit the end of the string and no matching closing parens found, take to the end of the string
+                        endpos = processingstr.Length;
+                    }
+                }
 
-			return rtnstr;
-		}
+				//Add the text inside the @HSP(...)
+                string tmpstr = processingstr.Substring(indx + 5, endpos - indx - 5);
+                // B2017-012 Don't convert space to hard spaces for XY Plots.
+                if (!tmpstr.Contains("<<G")) tmpstr = tmpstr.Replace(" ", @"\u160?");
+                sb.Append(tmpstr);
 
-		private int StringLength(byte[] ab, int offset)
+                //Set the processing string to after the ending parens found in case multiple @HSP
+                processingstr = endpos + 1 >= processingstr.Length ? "" : processingstr.Substring(endpos + 1);
+            }
+
+            //add text after last end parens
+            sb.Append(processingstr);
+
+            return sb.ToString();
+        }
+
+        private int StringLength(byte[] ab, int offset)
 		{
 			int i = 0;
 			while (ab[i + offset] != 0) i++;
@@ -2230,7 +2304,7 @@ namespace VEPROMS.CSLA.Library
 			{
 				rc.roid = FormatRoidKey(roid).Substring(0, 12);
 
-				DocVersionConfig dvc = (_myDocVersionInfo != null) ? _myDocVersionInfo.DocVersionConfig : null;
+				DocVersionConfig dvc = _myDocVersionInfo?.DocVersionConfig;
 				if (dvc != null) dvc.SelectedSlave = this.SelectedSlave;
 
 				switch (rc.roid)
@@ -2238,49 +2312,49 @@ namespace VEPROMS.CSLA.Library
 					case "FFFF00000001":
 						rc.title = "Number";
 						rc.appid = "U-NUMBER";
-						rc.value = (dvc != null) ? dvc.Unit_Number : null;
+						rc.value = dvc?.Unit_Number;
 						break;
 
 					case "FFFF00000002":
 						rc.title = "Other Number";
 						rc.appid = "U-OTHERNUMBER";
-						rc.value = (dvc != null) ? dvc.Other_Unit_Number : null;
+						rc.value = dvc?.Other_Unit_Number;
 						break;
 
 					case "FFFF00000003":
 						rc.title = "Text";
 						rc.appid = "U-TEXT";
-						rc.value = (dvc != null) ? dvc.Unit_Text : null;
+						rc.value = dvc?.Unit_Text;
 						break;
 
 					case "FFFF00000004":
 						rc.title = "Other Text";
 						rc.appid = "U-OTHERTEXT";
-						rc.value = (dvc != null) ? dvc.Other_Unit_Text : null;
+						rc.value = dvc?.Other_Unit_Text;
 						break;
 
 					case "FFFF00000005":
 						rc.title = "ID";
 						rc.appid = "U-ID";
-						rc.value = (dvc != null) ? dvc.Unit_ID : null;
+						rc.value = dvc?.Unit_ID;
 						break;
 
 					case "FFFF00000006":
 						rc.title = "Other ID";
 						rc.appid = "U-OTHERID";
-						rc.value = (dvc != null) ? dvc.Other_Unit_ID : null;
+						rc.value = dvc?.Other_Unit_ID;
 						break;
 
 					case "FFFF00000007":
 						rc.title = "Name";
 						rc.appid = "U-NAME";
-						rc.value = (dvc != null) ? dvc.Unit_Name : null;
+						rc.value = dvc?.Unit_Name;
 						break;
 
 					case "FFFF00000008":
 						rc.title = "Other Name";
 						rc.appid = "U-OTHERNAME";
-						rc.value = (dvc != null) ? dvc.Other_Unit_Name : null;
+						rc.value = dvc?.Other_Unit_Name;
 						break;
 				}
 

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

@@ -88,9 +88,9 @@ namespace VEPROMS.CSLA.Library
 		}
 		public override string ToString()
 		{
-			string itemTitle = Regex.Replace(this.Path, "^..+?\\u0007", "");
+            string itemTitle = Regex.Replace(this.Path, "^..+?\\u0007", "");
 			itemTitle = itemTitle.Replace("\x11", itemTitle[0] == '\x11' ? "" : " - ").Replace("\\u8209?", "-").Replace(@"\u9586?",@"\");
-			return string.Format("{4} item {0} by {1} on {2} @ {3}", this.ActionWhat, this.UserID, this.ActionWhen == DateTime.MinValue ? this.DTS.ToShortDateString() : this.ActionWhen.ToShortDateString(), this.ActionWhen == DateTime.MinValue ? this.DTS.ToShortTimeString() : this.ActionWhen.ToShortTimeString(), itemTitle);
+			return string.Format("{4} item {0} by {1} on {2} @ {3}", this.ActionWhat, this.UserID, this.ActionWhen == DateTime.MinValue ? this.DTS.ToShortDateString() : this.ActionWhen.ToShortDateString(), this.ActionWhen == DateTime.MinValue ? this.DTS.ToString("HH:mm:ss") : this.ActionWhen.ToString("HH:mm:ss"), itemTitle);
 			//return string.Format("{0} by {1} on {2}", this.DeleteStatus == 0 ? "Changed" : "Deleted", this.UserID, this.DTS.ToString("MM/dd/yyyy @ HH:mm:ss"));
 			//return string.Format("{0} - {1} {2}", this.UserID, this.DTS, this.DeleteStatus == 0 ? "" : "Deleted");
 		}
@@ -102,7 +102,7 @@ namespace VEPROMS.CSLA.Library
 				who = string.Format(" by {0}", this.UserID);
 			if (this.DTS != DateTime.Parse("1/1/1980"))
 				when = string.Format(" on {0}", this.DTS.ToString("MM/dd/yyyy @ HH:mm:ss"));
-			return string.Format("{0}{1}{2}", this.ActionWhat, who, when);
+            return string.Format("{0}{1}{2}", this.ActionWhat, who, when);
 		}
 	}
 
@@ -177,7 +177,7 @@ namespace VEPROMS.CSLA.Library
 
 		public override string ToString()
       {
-				return string.Format("{0}{1} deleted by {2} on {3} @ {4}", this.Level == 0 ? "Previous " : this.Level == 1 ? "Next " : "", this.ItemType, this.UserID, this.DTS.ToShortDateString(), this.DTS.ToShortTimeString());
+				return string.Format("{0}{1} deleted by {2} on {3}", this.Level == 0 ? "Previous " : this.Level == 1 ? "Next " : "", this.ItemType, this.UserID, this.DTS.ToString("MM/dd/yyyy @ HH:mm:ss"));
 //				return string.Format("Deleted by {0} on {1} @ {2}", this.UserID, this.DTS.ToShortDateString(), this.DTS.ToShortTimeString());
 //				return string.Format("(ItemID: {4}, DeleteID: {5}, {0} by {1} on {2} Level: {3}", this.DeleteStatus == 0 ? "Changed" : "Deleted", this.UserID, this.DTS.ToString("MM/dd/yyyy @ HH:mm:ss"), Level.ToString(), this.ItemID.ToString(), this.DeleteStatus.ToString());
 //            return string.Format("Level: {3}, {0} - {1} {2}", this.UserID, this.DTS, this.DeleteStatus == 0 ? "" : "Deleted", this.Level.ToString());

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

@@ -1003,40 +1003,34 @@ namespace VEPROMS.CSLA.Library
 			if (pdfTmp == null) return false;
 
 			FileInfo pdfFile = new FileInfo(pdfTmp);
-			FileStream fs = pdfFile.Open(FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
-			Byte[] buf = new byte[pdfFile.Length];
-			fs.Read(buf, 0, buf.Length);
-			fs.Close();
+            Byte[] buf = new byte[pdfFile.Length];
 
-			// 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())
+			using (FileStream fs = pdfFile.Open(FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
 			{
-				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();
+				fs.Read(buf, 0, buf.Length);
+				fs.Close();
 			}
 
+            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;
@@ -1264,7 +1258,7 @@ namespace VEPROMS.CSLA.Library
 
 				int lastStart = sel == null ? 0 : sel.Start;
 
-				while (sel != null)
+                while (sel != null)
 				{
 					if (!string.IsNullOrEmpty(sel.Text))
 					{
@@ -1444,7 +1438,7 @@ namespace VEPROMS.CSLA.Library
 
 					lastStart = sel.Start;
 
-					sel = FindRO();
+                    sel = FindRO();
 
 					if (sel != null && !string.IsNullOrEmpty(sel.Text) && sel.Start == lastStart)
 					{
@@ -1482,12 +1476,22 @@ namespace VEPROMS.CSLA.Library
 				}
 				catch { }
 
-				if (CloseWordWhenDone)
+                try
+                {
+                    if (CloseWordWhenDone)
+					{
+						CloseAppAfterWait();
+					}
+                }
+                catch (Exception ex)
 				{
-					CloseAppAfterWait();
-				}
+                    System.Windows.Forms.Application.DoEvents();
+                    _MyLog.Error("Failed to close Microsoft Word. Collecting reclaimable memory.", ex);
+                    GC.Collect();
+                    _MyLog.Warn("Finished collecting reclaimable memory.");
+                }
 
-				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
@@ -2120,22 +2124,22 @@ namespace VEPROMS.CSLA.Library
 			bool executeResult = false;
 			LBSelection sel = null;
 
-			while (!executeResult)
+            while (!executeResult)
 			{
 				sel = MyApp.Selection;
 				LBFind find = sel.Find;
 				find.ClearFormatting();
 
-				// Search string format - this is MSWord wildcard format
-				// If you do a search in MSWord, make sure wildcard box is checked and then press the
-				// Special button to see the definitions of the various wildcards
-				// [<] - Less-Than Character
-				// [!<> -]@ - 1 or more characters not including Less-Than, Greater-Than,  Dash or Space
-				// - Dash
-				// [!<>]@ - 1 or more characters not including Less-Than, Greater-Than.
-				//		a space be included as part of the accessory page id (Callaway, EOP Addendum 37)
-				// [>] - Greater-Than Character
-				find.Text = "[<][!<> -]@-[!<>]@[>]";
+                // Search string format - this is MSWord wildcard format
+                // If you do a search in MSWord, make sure wildcard box is checked and then press the
+                // Special button to see the definitions of the various wildcards
+                // [<] - Less-Than Character
+                // [!<> -]@ - 1 or more characters not including Less-Than, Greater-Than,  Dash or Space
+                // - Dash            
+                // [!<>]@ - 1 or more characters not including Less-Than, Greater-Than.
+                //		a space be included as part of the accessory page id (Callaway, EOP Addendum 37)
+                // [>] - Greater-Than Character
+                find.Text = "[<][!<> -]@-[!<>]@[>]";
 				find.Wrap = LBWdFindWrap.wdFindContinue;
 				find.MatchCase = false;
 				find.MatchWholeWord = false;
@@ -2155,14 +2159,18 @@ namespace VEPROMS.CSLA.Library
 				{
 					tryagain = false;
 					executeResult = find.Execute();
-					// B2022-053 if the found text does not begin with a "<" and end with a ">", then
-					//           move past that text and try the Word Find function again.
-					// B2022-088: [JPR] Find Doc Ro button not working in Word Sections
-					// B2022-098: [JPR] ROs not being resolved in Word Sections
+                    // B2022-053 if the found text does not begin with a "<" and end with a ">", then
+                    //           move past that text and try the Word Find function again.
+                    // B2022-088: [JPR] Find Doc Ro button not working in Word Sections
+                    // B2022-098: [JPR] ROs not being resolved in Word Sections
+                    // B2026-070: When there is a  less-then sign (<) followed by a numeric value in a Word attachment (inside of a table), PROMS thinks the user put in an RO token will generate an RO not found error in the following table row who's text contains <U-Name>.
 					if (executeResult && !string.IsNullOrEmpty(sel.Text) && !sel.Text.StartsWith("<") && !sel.Text.EndsWith(">"))
-					{
-						sel.MoveStart(LBWdUnits.wdCharacter, sel.Text.Length - 1);
-						tryagain = true;
+                    {
+                        int location = sel.Start + sel.Text.Length - 1; //do not do this inline - this needs captured before WholeStory
+
+                        sel.WholeStory();
+                        sel.MoveStart(LBWdUnits.wdCharacter, location);
+                        tryagain = true;
 					}
 				} while (tryagain);
 
@@ -2187,7 +2195,7 @@ namespace VEPROMS.CSLA.Library
 					sel.MoveStart(LBWdUnits.wdCharacter, 1);
 					executeResult = false;
 				}
-			}
+            }
 
 			if (executeResult) return sel;
 

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

@@ -1093,8 +1093,17 @@ namespace VEPROMS.CSLA.Library
 				}
 			}
 		}
-		// B2022-026 RO Memory Reduction code - pass in ROFstInfo
-		internal static void MyRefreshReferenceObjects(ItemInfo itemInfo, IVEDrillDownReadOnly itemParent, SectionInfo sectionInfo, DocVersionInfo docVersionInfo, ROFstInfo origROFst)
+
+        //C2026-008 Re-Architect RO.FST to include RO Modification date/time
+		//Refresh at item level
+        public static void RefreshReferenceObjects(ItemInfo tmp, ROFstInfo origROFst)
+        {
+            if (tmp.MyDocVersion.DocVersionConfig.SelectedSlave <= 0)
+                MyRefreshReferenceObjects(tmp, null, tmp.GetSectionInfo(), tmp.MyDocVersion, origROFst);
+        }
+
+        // B2022-026 RO Memory Reduction code - pass in ROFstInfo
+        internal static void MyRefreshReferenceObjects(ItemInfo itemInfo, IVEDrillDownReadOnly itemParent, SectionInfo sectionInfo, DocVersionInfo docVersionInfo, ROFstInfo origROFst)
 		{
 			if (itemInfo.MyContent.ContentPartCount > 0)
 			{
@@ -1219,31 +1228,47 @@ namespace VEPROMS.CSLA.Library
 			return true;
 		}
 
-		#region Debug Code
+        //C2026-008 Re-Architect RO.FST to include RO Modification date/time
+        public static List<ItemInfo> GetItemInfoWithChangedROs(int docversionid, int origfstid, int newfstid) 
+		{
+            List<ItemInfo> lst = new List<ItemInfo>();
 
-		//private static void ShowDifference(string oldText, string newText)
-		//{
-		//	string nt = newText.Replace(@"\u8209?", "-").Replace(@"\u160?", " ").Replace("\xA0", " ");
-		//	string ot = oldText.Replace(@"\u8209?", "-").Replace(@"\u160?", " ").Replace("\xA0", " ");
-		//	ShowText("OldText", ot);
-		//	ShowText("NewText", nt);
-		//}
-		//private static void ShowText(string title, string newText)
-		//{
-		//	StringBuilder sb = new StringBuilder();
-		//	foreach (char c in newText)
-		//	{
-		//		if(c<' ' || c> '\x7F')
-		//			sb.Append(string.Format("\\x{0:X2}",((int) c)));
-		//		else
-		//			sb.Append(c);
-		//	}
-		//	Console.WriteLine("{0}='{1}'",title,sb.ToString());
-		//}
+            foreach (DataRow r in Data_GetItemsWithChangedROs(docversionid, origfstid, newfstid).Rows)
+            {
+                using (ItemInfo itm = Get((int)r["ItemID"]))
+				{
+                    lst.Add(itm);
+				}
+			}
 
-		#endregion // debug
+			return lst;
+        }
 
-		internal static void SetParentSectionAndDocVersionPageNum(ItemInfo itemInfo, IVEDrillDownReadOnly itemParent, SectionInfo sectionInfo, ProcedureInfo procInfo, DocVersionInfo docVersionInfo, TransitionLookup tranLookup)
+        #region Debug Code
+
+        //private static void ShowDifference(string oldText, string newText)
+        //{
+        //	string nt = newText.Replace(@"\u8209?", "-").Replace(@"\u160?", " ").Replace("\xA0", " ");
+        //	string ot = oldText.Replace(@"\u8209?", "-").Replace(@"\u160?", " ").Replace("\xA0", " ");
+        //	ShowText("OldText", ot);
+        //	ShowText("NewText", nt);
+        //}
+        //private static void ShowText(string title, string newText)
+        //{
+        //	StringBuilder sb = new StringBuilder();
+        //	foreach (char c in newText)
+        //	{
+        //		if(c<' ' || c> '\x7F')
+        //			sb.Append(string.Format("\\x{0:X2}",((int) c)));
+        //		else
+        //			sb.Append(c);
+        //	}
+        //	Console.WriteLine("{0}='{1}'",title,sb.ToString());
+        //}
+
+        #endregion // debug
+
+        internal static void SetParentSectionAndDocVersionPageNum(ItemInfo itemInfo, IVEDrillDownReadOnly itemParent, SectionInfo sectionInfo, ProcedureInfo procInfo, DocVersionInfo docVersionInfo, TransitionLookup tranLookup)
 		{
 			if (itemInfo.MyContent.ContentPartCount > 0)
 			{
@@ -1890,10 +1915,44 @@ namespace VEPROMS.CSLA.Library
 					foreach (ItemInfo itemInfo in partInfo.MyItems)
 						itemInfo.SpinThroughChildren();
 		}
-		#endregion
-		#region LoadAtOnce
-		// Method to Get Item and children
-		public static ItemInfo GetItemAndChildren(int? itemID, int? parentID)
+
+        //C2026-008 Re-Architect RO.FST to include RO Modification date/time
+        private static DataTable Data_GetItemsWithChangedROs(int docversionid, int origfstid, int newfstid)
+        {
+            try
+            {
+                using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+                {
+                    using (SqlCommand cm = cn.CreateCommand())
+                    {
+                        cm.CommandType = CommandType.StoredProcedure;
+                        cm.CommandText = "getItemsWithNewROs";
+                        cm.Parameters.AddWithValue("@VersionID", docversionid);
+                        cm.Parameters.AddWithValue("@OrigFSTid", origfstid);
+                        cm.Parameters.AddWithValue("@NewFSTid", newfstid);
+                        cm.CommandTimeout = Database.DefaultTimeout;
+
+                        using (SqlDataAdapter da = new SqlDataAdapter(cm))
+                        {
+                            DataTable dt = new DataTable();
+                            da.Fill(dt);
+                            return dt;
+                        }
+                    }
+
+                }
+            }
+            catch (Exception ex)
+            {
+                Database.LogException("ItemInfoList.Data_GetItemsWithChangedROs", ex);
+                throw new DbCslaException("ItemInfoList.Data_GetItemsWithChangedROs", ex);
+            }
+        }
+
+        #endregion
+        #region LoadAtOnce
+        // Method to Get Item and children
+        public static ItemInfo GetItemAndChildren(int? itemID, int? parentID)
 		{
 			try
 			{
@@ -4054,7 +4113,10 @@ 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)
+				// B2026-060 & B2026-061 removed the check of SelectedSlave (aka the selected child) from the IF statement,
+				// This was causing some step to print with change bars when there should not have been - because of the use of
+				// the Show Change Bars After date.  The logic we need is built into the get of ChangeBarDate and Print_ViewableStartingChangeBarDate.
+				if (viewableStartingDateTime != null && viewableStartingDateTime > MyProcedure.ChangeBarDate) 
 					return (MyContent.DTS > viewableStartingDateTime);
 				return (MyContent.DTS > MyProcedure.ChangeBarDate);
 			}
@@ -6215,8 +6277,13 @@ 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()))
@@ -8059,6 +8126,10 @@ namespace VEPROMS.CSLA.Library
 			}
 			set { _ChangeBarDate = value; }
 		}
+
+        //C2026-021 Expand Functionality of Viewing Mode
+        public void ResetChangeBar() => _ChangeBarDate = null;
+
 		public Dictionary<int, ItemInfo> MyLookup = null;
 		public override void SetupTags()
 		{

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

@@ -61,57 +61,47 @@ namespace VEPROMS.CSLA.Library
 				throw new DbCslaException("Pdf.DataPortal_Delete", ex);
 			}
 		}
-		// used to remove word section PDFs to force ROs to be updated when printed or saved
-		public static void DeleteAllDocVersion(int versionID)
-		{
-			if (!CanDeleteObject())
-				throw new System.Security.SecurityException("User not authorized to remove a Pdf");
-			try
-			{
-				DataPortal.Delete(new VersionIDCriteria(versionID));
-			}
-			catch (Exception ex)
-			{
-				throw new DbCslaException("Error on Pdf.DeleteAllDocVersion", ex);
-			}
-		}
-		[Serializable()]
-		protected class VersionIDCriteria
-		{
-			private int _VersionID;
-			public int VersionID
-			{ get { return _VersionID; } }
-			public VersionIDCriteria(int versionID)
-			{
-				_VersionID = versionID;
-			}
-		}
-		[Transactional(TransactionalTypes.TransactionScope)]
-		private void DataPortal_Delete(VersionIDCriteria criteria)
-		{
-			if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] Pdf.DataPortal_Delete", GetHashCode());
-			try
-			{
-				using (SqlConnection cn = Database.VEPROMS_SqlConnection)
-				{
-					using (SqlCommand cm = cn.CreateCommand())
-					{
-						cm.CommandType = CommandType.StoredProcedure;
-						cm.CommandTimeout = Database.SQLTimeout;
-						cm.CommandText = "deleteAllDocVersionPdfs";
-						cm.Parameters.AddWithValue("@VersionID", criteria.VersionID);
-						cm.ExecuteNonQuery();
-					}
-				}
-			}
-			catch (Exception ex)
-			{
-				if (_MyLog.IsErrorEnabled) _MyLog.Error("Pdf.DataPortal_Delete", ex);
-				_ErrorMessage = ex.Message;
-				throw new DbCslaException("Pdf.DataPortal_Delete", ex);
-			}
-		}
 
+        //C2026-008 Re-Architect RO.FST to include RO Modification date/time
+        // used to remove word section PDFs to force ROs to be updated when printed or saved
+        public static void DeleteDocVersionPDFsWithNewROs(int versionID, int origfstid, int newfstid)
+        {
+            if (!CanDeleteObject())
+                throw new System.Security.SecurityException("User not authorized to remove a Pdf");
+            try
+            {
+                DeleteWithNewROs(versionID, origfstid, newfstid);
+            }
+            catch (Exception ex)
+            {
+                throw new DbCslaException("Error on Pdf.DeleteAllDocVersion", ex);
+            }
+        }
+
+        static private void DeleteWithNewROs(int docversionID, int origfstid, int newfstid)
+        {
+            try
+            {
+                using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+                {
+                    using (SqlCommand cm = cn.CreateCommand())
+                    {
+                        cm.CommandType = CommandType.StoredProcedure;
+                        cm.CommandTimeout = Database.SQLTimeout;
+                        cm.CommandText = "deleteDocVersionPdfsWithNewROs";
+                        cm.Parameters.AddWithValue("@VersionID", docversionID);
+                        cm.Parameters.AddWithValue("@OrigFSTid", origfstid);
+                        cm.Parameters.AddWithValue("@NewFSTid", newfstid);
+                        cm.ExecuteNonQuery();
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                if (_MyLog.IsErrorEnabled) _MyLog.Error("Pdf.DeleteWithNewROs", ex);
+                throw new DbCslaException("Pdf.DeleteWithNewROs", ex);
+            }
+        }
 	}
 	public partial class PdfInfo
 	{

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

@@ -225,41 +225,64 @@ namespace VEPROMS.CSLA.Library
 			}
 		}
 
-		// B2022-026 RO Memory Reduction code - pass in the ROFstInfo
-		public static int RefreshROFst(DocVersionInfo dvi, ROFstInfoProgressBarRefresh myProgressBarRefresh, System.Windows.Forms.TextBox tbStatus, ROFstInfo origROFst)
-		{
-			int fixedROs = 0;
+        //C2026-008 Re-Architect RO.FST to include RO Modification date/time
+        // Refresh at item level
+        public static int RefreshROFstAtItemLevel(DocVersionInfo dvi, ROFstInfoProgressBarRefresh myProgressBarRefresh, System.Windows.Forms.TextBox tbStatus, ROFstInfo localROFst, int origfstid, int newfstid)
+        {
+            int fixedROs = 0;
 
-			if (dvi.DocVersionConfig.SelectedSlave <= 0)
-			{
-				myProgressBarRefresh(1, 100, "Update MS Word ROs");
+            if (dvi.DocVersionConfig.SelectedSlave <= 0)
+            {
+                // remove word section PDFs to force update of RO values when printed
+                myProgressBarRefresh(1, 100, "Updating MS Word ROs In Progress");
+                Pdf.DeleteDocVersionPDFsWithNewROs(dvi.VersionID, origfstid, newfstid);
 
-				Pdf.DeleteAllDocVersion(dvi.VersionID); // remove word section PDFs to force update of RO values when printed
-				int i = 0;
+                //Loop Through ROs in this docversion that are different than the previous fst
+                myProgressBarRefresh(50, 100, "Updating ROs In PROMS Steps In Progress");
+                int i = 0;
+				List<ItemInfo> list = ItemInfo.GetItemInfoWithChangedROs(dvi.VersionID, origfstid, newfstid);
+                foreach (ItemInfo itm in list)
+                {
+                    DateTime start = DateTime.Now;
 
-				foreach (ProcedureInfo proc in dvi.Procedures)
-				{
-					DateTime start = DateTime.Now;
+                    ItemInfo.ResetROCounters();
+                    myProgressBarRefresh(++i, list.Count, string.Format("{0} ({1}/{2} ROs {3})", itm.MyProcedure.DisplayNumber, i, list.Count, fixedROs));
+                    ItemInfo.RefreshReferenceObjects(itm, localROFst);
+                    fixedROs += ItemInfo.ROFixCount;
 
-					ProcedureInfo.ResetROCounters();
-					myProgressBarRefresh(++i, dvi.Procedures.Count, string.Format("{0} ({1}/{2} ROs {3})", proc.DisplayNumber, i, dvi.Procedures.Count, fixedROs));
-					ProcedureInfo.RefreshReferenceObjects(proc, origROFst);
-					fixedROs += ProcedureInfo.ROFixCount;
+                    TimeSpan ts = DateTime.Now - start;
 
-					TimeSpan ts = DateTime.Now - start;
+                    if (tbStatus != null)
+                        tbStatus.AppendText(string.Format("Procedure:  {1}{0}, Checked {2} Referenced Objects{0}, Fixed {3} Referenced Objects{0}, Elapsed Seconds:{4}{0}{0}", Environment.NewLine, itm.MyProcedure.DisplayNumber, ItemInfo.ROCheckCount, ItemInfo.ROFixCount, ts.TotalSeconds));
+                }
 
-					if (tbStatus != null)
-						tbStatus.AppendText(string.Format("Procedure:  {1}{0}, Checked {2} Referenced Objects{0}, Fixed {3} Referenced Objects{0}, Elapsed Seconds:{4}{0}{0}", Environment.NewLine, proc.DisplayNumber, ProcedureInfo.ROCheckCount, ProcedureInfo.ROFixCount, ts.TotalSeconds));
-				}
-			}
+				//Update the DocVersion Associations to link to the new RO FST id and current date/time
+                using (DocVersion dv = DocVersion.Get(dvi.VersionID))
+                {
+                    if (dvi.DocVersionAssociations[0].MyROFst.ROFstID != newfstid)
+                    {
+                        dv.DocVersionAssociations[0].MyROFst = localROFst.GetJustROFst();
+                    }
+					// B2026-066 moved this out of if statement above
+					// - was not resetting the datetime and thus not disabling the Update RO Values button and menu item
+                    SetAssociationLastCompleted(dv, DateTime.Now.ToString());
+                }
+            }
 
-			return fixedROs;
-		}
+            // pop up a message window telling the user the RO Update has completed and how many ROs were updated		
+            // If we are updating RO from the Admin Tools (from the V button) and we are updating more than on procedure set, then just append the "RO Update Complete" text		
+            // To the MessageList.  Once completed will all procedure sets, Admin Tools will display one message box with all the results in it.		
+            if (MessageList == null)
+                FlexibleMessageBox.Show(fixedROs == 0 ? "No ROs Required Updating" : string.Format("{0} ROs Updated for {1}", fixedROs, dvi.MyFolder.Name), "RO Update Complete");
+            else
+                MessageList.AppendLine((fixedROs == 0 ? "No ROs Required Updating for " : string.Format("{0} ROs Updated for ", fixedROs)) + dvi.MyFolder.Name);
 
+            return fixedROs;
+        }
 
-		//C2022-028 for Admin tool to check for bad RO links
-		//B2022-144 we now loop through checked procedures list from Admin Tools and call this method for each procedure we want to process
-		public static int CheckROLinksInThisProcedure(ProcedureInfo proc,  System.Windows.Forms.TextBox tbStatus)
+        //C2022-028 for Admin tool to check for bad RO links
+        //B2022-144 we now loop through checked procedures list from Admin Tools and call this method for each procedure we want to process
+        public static int CheckROLinksInThisProcedure(ProcedureInfo proc,  System.Windows.Forms.TextBox tbStatus)
 		{
 			int FoundBadROLinks = 0;
 			DocVersionInfo dvi = DocVersionInfo.Get(proc.MyDocVersion.VersionID);
@@ -291,34 +314,6 @@ namespace VEPROMS.CSLA.Library
 			return Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + @"\VEPROMS\ROUpdateReport_" + ValidFileName.FixFileName(dvi.MyFolder.Name.Replace(" ", "_") + "_" + DateTime.Now.ToString("MM-dd-yyyy_HH-mm-ss") + ".txt");
 		}
 
-		// B2022-026 RO Memory Reduction code - moved the call to UpdateROFst() to before we call RefreshROFst
-		// so that we used the correct ROFstInfo which as the needed event methods set when updated RO Table types
-		public static ROFst RefreshROFst(DocVersion docver, ROFstInfo origROFst, ROFstInfoProgressBarRefresh myProgressBarRefresh, System.Windows.Forms.TextBox tbStatus)
-		{
-			ROFst rofst = null;
-
-			rofst = docver.DocVersionAssociations[0].MyROFst;
-
-			DocVersionInfo dvi = DocVersionInfo.Get(docver.VersionID);
-
-			SetAssociationLastCompleted(docver, string.Empty);
-			int fixedROs = RefreshROFst(dvi, myProgressBarRefresh, tbStatus, origROFst);
-			SetAssociationLastCompleted(docver, DateTime.Now.ToString());  // RO Update completed successfully and un-interrupted, save the date/time to the Doc Version Association config
-
-			myProgressBarRefresh(100, 100, "RO Update Complete"); // update the progress bar
-			System.Windows.Forms.Application.DoEvents();
-
-			// pop up a message window telling the user the RO Update has completed and how many ROs were updated
-			// If we are updating RO from the Admin Tools (from the V button) and we are updating more than on procedure set, then just append the "RO Update Complete" text
-			// To the MessageList.  Once completed will all procedure sets, Admin Tools will display one message box with all the results in it.
-			if (MessageList == null)
-				FlexibleMessageBox.Show(fixedROs == 0 ? "No ROs Required Updating" : string.Format("{0} ROs Updated for {1}", fixedROs, dvi.MyFolder.Name), "RO Update Complete");
-			else
-				MessageList.AppendLine((fixedROs == 0 ? "No ROs Required Updating for " : string.Format("{0} ROs Updated for ", fixedROs)) + dvi.MyFolder.Name);
-
-			return rofst;
-		}
-
 		/// <summary>
 		/// Updates an ro.fst into a sql database.  
 		/// </summary>
@@ -333,9 +328,13 @@ namespace VEPROMS.CSLA.Library
 		//           all of the calls aways set the flags to not update the RO values
 		public static ROFst UpdateRoFst(RODbInfo rdi, DocVersion docver, ROFstInfo origROFst, ROFstInfoProgressBarRefresh myProgressBarRefresh)
 		{
-			if (myProgressBarRefresh != null) myProgressBarRefresh(0, 100, "Starting Update");
+            ROWorkingDraftAsk.ClearWorkingDrafts();
 
-			DirectoryInfo di = new DirectoryInfo(rdi.FolderPath);
+            if (myProgressBarRefresh != null) myProgressBarRefresh(0, 100, "Starting Update");
+
+			int origFSTid = origROFst.ROFstID;
+
+            DirectoryInfo di = new DirectoryInfo(rdi.FolderPath);
 			string rofstfilepath = rdi.FolderPath + @"\ro.fst";
 			FileStream fsIn = new FileStream(rofstfilepath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
 			FileInfo rofstFI = new FileInfo(rofstfilepath);
@@ -361,8 +360,9 @@ namespace VEPROMS.CSLA.Library
 
 				docver.DocVersionAssociations[0].MyROFst = rofst;
 				SetAssociationLastCompleted(docver, string.Empty);
+                SetPrevFSTID(docver, origFSTid);   // //C2026-008 Re-Architect RO.FST to include RO Modification date/time
 
-				return rofst;
+                return rofst;
 			}
 
 			// Read in the rofst & make the rofst record.
@@ -384,7 +384,10 @@ namespace VEPROMS.CSLA.Library
 				// Keep a list of ROIDs for Images that have changed.
 				List<string> MyChangedFigureROIDs = UpdateROFigures(rdi, myProgressBarRefresh, rofst, rodb, myLookup, docver);
 
-				return rofst;
+                //C2026-008 Re-Architect RO.FST to include RO Modification date/time
+                SetPrevFSTID(docver, origFSTid);
+
+                return rofst;
 			}
 		}
 
@@ -484,8 +487,22 @@ namespace VEPROMS.CSLA.Library
 			docver.Save();
 		}
 
-		// Place the status of loading the RO Figures when updating RO Values
-		private static void SetAssociationROFiguresLoading(DocVersion docver, string value)
+        //C2026-008 Re-Architect RO.FST to include RO Modification date/time
+        // Place the previous ROFSTID in the config in case network error or computer crashes while updating RO Values
+        private static void SetPrevFSTID(DocVersion docver, int value)
+        {
+            if (docver.DocVersionAssociations[0]?.MyROFst != null && value != -1)
+            {
+                string cfg = docver.DocVersionAssociations[0].Config;
+				AssociationConfig ac = new AssociationConfig((cfg == null || cfg.Length == 0) ? "<Config />" : cfg);
+                ac.ROUpdate_PrevROFSTID = value.ToString();
+				docver.DocVersionAssociations[0].Config = ac.ToString();
+				docver.Save();
+            }
+        }
+
+        // Place the status of loading the RO Figures when updating RO Values
+        private static void SetAssociationROFiguresLoading(DocVersion docver, string value)
 		{
 			string cfg = docver.DocVersionAssociations[0].Config;
 
@@ -670,188 +687,7 @@ namespace VEPROMS.CSLA.Library
 			return sb.ToString();
 		}
 
-		private static void UpdateROValuesText(ROFstInfo origROFstInfo, ROFst newROFst, DocVersionInfo dvi, ROFstInfoProgressBarRefresh myProgressBarRefresh, List<string> MyChangedFigureROIDs)
-		{
-			if (myProgressBarRefresh != null) myProgressBarRefresh(0, 100, "Update Ro Values");
-
-			string versionList = dvi.VersionID.ToString();
-
-			ROFSTLookup origLookup = new ROFSTLookup(origROFstInfo.ROFstID, dvi);
-			ROFSTLookup newLookup = new ROFSTLookup(newROFst.ROFstID, dvi);
-
-			List<string> delList = new List<string>();
-			List<string> chgList = newLookup.GetValueDifferences(origROFstInfo.ROFstID, ref delList);
-
-			// Any figures which have been changed will be included in the list of values that have changed.
-			if (MyChangedFigureROIDs != null)
-			{
-				foreach (string roid in MyChangedFigureROIDs)
-				{
-					if (!chgList.Contains(roid)) chgList.Add(roid);
-				}
-			}
-
-			string RoidList = GetRoidList(newROFst.RODbID, chgList);
-
-			if (myProgressBarRefresh != null) myProgressBarRefresh(0, chgList.Count, "Getting List of ROs Used");
-			List<string> activeRoids = BuildActiveROIDsForRoUsages12(RoidList, versionList);
-
-			if (myProgressBarRefresh != null) myProgressBarRefresh(0, chgList.Count, "Updating RO Values");
-			int iCount = 0;
-
-			if (activeRoids.Count > 0)
-			{
-				foreach (string chg in chgList)
-				{
-					if (myProgressBarRefresh != null) myProgressBarRefresh(++iCount, chgList.Count, "Updating RO Values");
-					if (activeRoids.Contains(chg.Substring(0, 12)))
-					{
-						ROFSTLookup.rochild roch = newLookup.GetRoChild(chg);
-						string desc = string.Format("Change in RO Values: Old value = {0}, New value = {1}", origLookup.GetRoChild(chg).value, roch.value);
-
-						// roid's are stored in database as 16 characters long in the RoUsages table.  They may be stored as 12 characters in the ro.fst.
-						// string padroid = chg.Length <= 12 ? chg + "0000" : chg;
-						// B2022-088: Find Doc Ro button not working in Word Sections
-						string padroid = ROFSTLookup.FormatRoidKey(chg, true);
-
-						using (RoUsageInfoList affected = RoUsageInfoList.GetAffected(origROFstInfo.MyRODb.RODbID, padroid, desc, "Changed", versionList))
-						{
-							foreach (RoUsageInfo roUsg in affected)
-							{
-								using (Content content = Content.Get(roUsg.MyContent.ContentID))
-								{
-									foreach (ItemInfo ii in roUsg.MyContent.ContentItems)
-									{
-										string val = newLookup.GetTranslatedRoValue(padroid, ii.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, ii.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false, ii);
-										content.FixContentText(roUsg, val, roch.type, origROFstInfo, true);
-
-										if (content.IsDirty)
-										{
-											// Update UserID and DTS when RO Value is updated.
-											content.UserID = Volian.Base.Library.VlnSettings.UserID;
-											content.DTS = DateTime.Now;
-											content.Save();
-
-											if (content.MyGrid != null)
-											{
-												GridInfo.Refresh(content.MyGrid);
-											}
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-
-			if (myProgressBarRefresh != null) myProgressBarRefresh(0, chgList.Count, "Getting List of ROs Used");
-			List<string> activeDRoids = BuildActiveROIDsForDRoUsages12(RoidList, versionList);
-			iCount = 0;
-
-			if (activeDRoids.Count > 0)
-			{
-				foreach (string chg in chgList)
-				{
-					// B2022-088: Find Doc Ro button not working in Word Sections
-					// string padroid = chg.Length <= 12 ? chg + "0000" : chg;
-					string padroid = ROFSTLookup.FormatRoidKey(chg, true);
-
-					if (myProgressBarRefresh != null) myProgressBarRefresh(++iCount, chgList.Count, "Updating RO Values");
-
-					if (activeDRoids.Contains(chg.Substring(0, 12)))
-					{
-						ROFSTLookup.rochild roch = newLookup.GetRoChild(chg);
-
-						string desc = string.Format("Change in RO Values: Old value = {0}, New value = {1}", origLookup.GetRoChild(chg).value, roch.value);
-
-						// roid's are stored in database as 16 characters long in the rousages table.  They may be stored as 12 characters in the ro.fst.
-						using (DROUsageInfoList affected = DROUsageInfoList.GetAffected(origROFstInfo.MyRODb.RODbID, padroid, desc, "Changed", versionList))
-						{
-							foreach (DROUsageInfo droUsg in affected)
-							{
-								Pdf.DeleteAll(droUsg.DocID);
-							}
-						}
-					}
-				}
-			}
-
-			iCount = 0;
-			string RoidDelList = GetRoidList(newROFst.RODbID, delList);
-			if (myProgressBarRefresh != null) myProgressBarRefresh(0, chgList.Count, "Getting List of ROs Used");
-			activeRoids = BuildActiveROIDsForRoUsages12(RoidDelList, versionList);
-
-			if (activeRoids.Count > 0)
-			{
-				foreach (string del in delList)
-				{
-					// B2022-088: Find Doc Ro button not working in Word Sections
-					//string padroiddel = del.Length <= 12 ? del + "0000" : del;
-					string padroiddel = ROFSTLookup.FormatRoidKey(del, true);
-
-					if (myProgressBarRefresh != null) myProgressBarRefresh(++iCount, chgList.Count, "Removing Old RO Values");
-					string desc = string.Format("Deleted RO: Value = {0}", origLookup.GetRoChild(del).value);
-
-					if (activeRoids.Contains(del.Substring(0, 12).ToUpper()))
-					{
-						using (RoUsageInfoList affected = RoUsageInfoList.GetAffected(origROFstInfo.MyRODb.RODbID, padroiddel, desc, "Deleted", versionList))
-						{
-							foreach (RoUsageInfo roUsg in affected)
-							{
-								using (Content content = Content.Get(roUsg.MyContent.ContentID))
-								{
-									content.FixContentText(roUsg, "?", 0, origROFstInfo);
-									if (content.IsDirty)
-									{
-										// Update UserID and DTS when RO Value is updated.
-										content.UserID = Volian.Base.Library.VlnSettings.UserID;
-										content.DTS = DateTime.Now;
-										content.Save();
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-
-			if (myProgressBarRefresh != null) myProgressBarRefresh(0, chgList.Count, "Getting List of ROs Used");
-			activeDRoids = BuildActiveROIDsForDRoUsages12(RoidDelList, versionList);
-			iCount = 0;
-
-			if (activeDRoids.Count > 0)
-			{
-				foreach (string del in delList)
-				{
-					
-					// B2022-088: Find Doc Ro button not working in Word Sections
-					string padroiddel = ROFSTLookup.FormatRoidKey(del, true);
-					if (myProgressBarRefresh != null) myProgressBarRefresh(++iCount, chgList.Count, "Removing Old RO Values");
-
-					string desc = string.Format("Deleted RO: Value = {0}", origLookup.GetRoChild(del).value);
-
-					// If there's an issue then maybe try getting the RoChild with the Padded roid instead
-					//string desc = string.Format("Deleted RO: Value = {0}", origLookup.GetRoChild(padroiddel).value);
-
-					if (activeDRoids.Contains(del.Substring(0, 12).ToUpper()))
-					{
-						using (DROUsageInfoList Daffected = DROUsageInfoList.GetAffected(origROFstInfo.MyRODb.RODbID, padroiddel, desc, "Deleted", versionList))
-						{
-							foreach (DROUsageInfo droUsg in Daffected)
-							{
-								if (myProgressBarRefresh != null) myProgressBarRefresh(++iCount, chgList.Count, "Removing Old RO Values");
-								Pdf.DeleteAll(droUsg.DocID);
-							}
-						}
-					}
-				}
-			}
-
-			if (myProgressBarRefresh != null) myProgressBarRefresh(100, 100, "RO Values Updated");
-		}
-
-		private static DateTime ShowDuration(DateTime dtLast, string message)
+        private static DateTime ShowDuration(DateTime dtLast, string message)
 		{
 			DateTime dtNext = DateTime.Now;
 			Console.WriteLine("{0,10:#####0.00},'{1}'", TimeSpan.FromTicks(dtNext.Ticks - dtLast.Ticks).TotalSeconds, message);
@@ -1099,10 +935,10 @@ namespace VEPROMS.CSLA.Library
 			}
 		}
 
-		#endregion
-	}
+        #endregion
+    }
 
-	public class ROFstInfoROTableUpdateEventArgs
+    public class ROFstInfoROTableUpdateEventArgs
 	{
 		private string _ROText;
 		public string ROText
@@ -1252,5 +1088,5 @@ namespace VEPROMS.CSLA.Library
 			this.RaiseListChangedEvents = true;
 		}
 
-	}
+    }
 }

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

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

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

@@ -86,7 +86,38 @@ 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/Session/ROWorkingDraftAsk.cs

@@ -0,0 +1,18 @@
+
+using System.Collections.Generic;
+
+namespace VEPROMS.CSLA.Library
+{
+    public static class ROWorkingDraftAsk
+    {
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0044:Add readonly modifier", Justification = "Keeping Collections Not ReadOnly")]
+        private static List<int> WorkingDrafts = new List<int>();
+
+        public static void AddWorkingDrafts(int wd) => WorkingDrafts.Add(wd);
+
+        public static void ClearWorkingDrafts() => WorkingDrafts.Clear();
+
+        public static bool ContainsWorkingDraft(int wd) => WorkingDrafts.Contains(wd);
+
+    }
+}

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

@@ -396,6 +396,7 @@
     <Compile Include="Minimal\UserReports.cs" />
     <Compile Include="Minimal\UserSettings.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Session\ROWorkingDraftAsk.cs" />
     <Compile Include="VEObjects\VEDrillDown.cs" />
     <Compile Include="VEObjects\VETreeNode.cs" />
   </ItemGroup>

PROMS/VG/IVGOutput.cs

@@ -1,10 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Drawing;
 using iTextSharp.text.pdf;
-using iTextSharp.text.factories;
-using Microsoft.Win32;
 using Volian.Base.Library;
 
 namespace VG
@@ -25,141 +20,25 @@ namespace VG
 	}
 	public partial class VGOut_Graphics: IVGOutput
 	{
-		private int _DebugStatus = 0;
-		public int DebugStatus
-		{
-			get { return _DebugStatus; }
-			set { _DebugStatus = value; }
-		}
-		private Graphics _VGOutput;
-		//public Graphics VGOutput
-		//{ get { return _VGOutput; } }
-		public VGOut_Graphics(Graphics vgOutput)
-		{ _VGOutput = vgOutput; }
-		public float Scale
-		{ get { return 1; } }
-		//{ get { return _VGOutput.Transform.Elements[0]; } }
-		public void DrawLine(Pen pn, float startx, float starty, float endx, float endy)
-		{ _VGOutput.DrawLine(pn, startx, starty, endx, endy);	}
-		public void DrawRectangle(Pen pn, RectangleF rectf)
+        public int DebugStatus { get; set; } = 0;
+        private readonly Graphics _VGOutput;
+        public VGOut_Graphics(Graphics vgOutput) => _VGOutput = vgOutput;
+        public float Scale => 1;
+        public void DrawLine(Pen pn, float startx, float starty, float endx, float endy) => _VGOutput.DrawLine(pn, startx, starty, endx, endy);
+        public void DrawRectangle(Pen pn, RectangleF rectf)
 		{
 			_VGOutput.CompositingMode = System.Drawing.Drawing2D.CompositingMode.SourceCopy;
 			_VGOutput.FillRectangle(DebugStatus == 1 ? Brushes.Transparent : Brushes.White, rectf.X, rectf.Y, rectf.Width, rectf.Height);
 			_VGOutput.CompositingMode = System.Drawing.Drawing2D.CompositingMode.SourceOver;
 			_VGOutput.DrawRectangle(pn, rectf.X, rectf.Y, rectf.Width, rectf.Height); 
 		}
-		public void DrawEllipse(Pen pn, float cx, float cy, float dx, float dy)
-		{ _VGOutput.DrawEllipse(pn, cx, cy, dx, dy); }
-		public void DrawImage(Bitmap bm, RectangleF rectf)
-		{ _VGOutput.DrawImage(bm, rectf); }
-		public void DrawString(string text, Font myFont, Brush brush, RectangleF rectf)
-		{ _VGOutput.DrawString(text, myFont, brush, rectf, StringFormat.GenericTypographic); }
-		public void DrawArc(Pen pn, RectangleF rectf, float startAngle, float sweepAngle)
-		{ _VGOutput.DrawArc(pn, rectf, startAngle, sweepAngle); }
-		public SizeF MeasureString(string text, Font myFont)
-		{ return _VGOutput.MeasureString(text, myFont, new PointF(0, 0), StringFormat.GenericTypographic); }
-		public void Save(string fileName)
+        public void DrawEllipse(Pen pn, float cx, float cy, float dx, float dy) => _VGOutput.DrawEllipse(pn, cx, cy, dx, dy);
+        public void DrawImage(Bitmap bm, RectangleF rectf) => _VGOutput.DrawImage(bm, rectf);
+        public void DrawString(string text, Font myFont, Brush brush, RectangleF rectf) => _VGOutput.DrawString(text, myFont, brush, rectf, StringFormat.GenericTypographic);
+        public void DrawArc(Pen pn, RectangleF rectf, float startAngle, float sweepAngle) => _VGOutput.DrawArc(pn, rectf, startAngle, sweepAngle);
+        public SizeF MeasureString(string text, Font myFont) => _VGOutput.MeasureString(text, myFont, new PointF(0, 0), StringFormat.GenericTypographic);
+        public void Save(string fileName)
 		{ ;/* Don't do anything*/ }
-		public float FontSizeAdjust
-		{ get { return .71f * 96f / _VGOutput.DpiX; } } // Changed to adjust for Screen DPI Setting
-	}
-	public partial class VGOut_ITextSharp : IVGOutput
-	{
-		private int _DebugStatus = 0;
-		public int DebugStatus
-		{
-			get { return _DebugStatus; }
-			set { _DebugStatus = value; }
-		}
-		private PdfContentByte _VGOutput;
-		//public Graphics VGOutput
-		//{ get { return _VGOutput; } }
-		public VGOut_ITextSharp(PdfContentByte vgOutput)
-		{ _VGOutput = vgOutput; }
-		public float Scale
-		{ get { return 1; } }
-		public void DrawLine(Pen pn, float startx, float starty, float endx, float endy)
-		{
-			_VGOutput.SaveState();
-			SetStrokeData(pn);
-			_VGOutput.MoveTo(startx, ScaleY(starty));
-			_VGOutput.LineTo(endx, ScaleY(endy));
-			_VGOutput.Stroke();
-			_VGOutput.RestoreState();
-		}
-		private void SetStrokeData(Pen pn)
-		{
-			_VGOutput.SetLineWidth(pn.Width);
-			_VGOutput.SetColorStroke(new iTextSharp.text.Color(pn.Color.R, pn.Color.G, pn.Color.B, pn.Color.A));
-		}
-		public void DrawRectangle(Pen pn, RectangleF rectf)
-		{
-			_VGOutput.SaveState();
-			SetStrokeData(pn);
-			_VGOutput.Rectangle(rectf.X, ScaleY(rectf.Y), rectf.Width, -rectf.Height);
-			_VGOutput.Stroke();
-			_VGOutput.RestoreState();
-		}
-		public void DrawEllipse(Pen pn, float cx, float cy, float dx, float dy)
-		{
-			_VGOutput.SaveState();
-			SetStrokeData(pn);
-			_VGOutput.Ellipse(cx, ScaleY(cy), dx, -dy);
-			_VGOutput.Stroke();
-			_VGOutput.RestoreState();
-		}
-		public void DrawImage(Bitmap bm, RectangleF rectf)
-		{
-			_VGOutput.SaveState();
-			// TODO: Determine how I can create an iTextSharp.text.Image
-			//_VGOutput.AddImage(new iTextSharp.text.Image(
-			_VGOutput.RestoreState();
-		}
-		public void DrawString(string text, Font myFont, Brush brush, RectangleF rectf)
-		{
-			_VGOutput.SaveState();
-			_VGOutput.BeginText();
-			iTextSharp.text.Font itFont = GetFont(myFont.Name);
-			iTextSharp.text.pdf.BaseFont baseFont = itFont.BaseFont;
-	//    _VGOutput.DrawString(text, myFont, brush, rectf, StringFormat.GenericTypographic); 
-			_VGOutput.MoveText(rectf.X, ScaleY(rectf.Y) - myFont.SizeInPoints);
-			_VGOutput.SetFontAndSize(baseFont, myFont.SizeInPoints);
-			_VGOutput.SetTextRenderingMode(PdfContentByte.TEXT_RENDER_MODE_FILL);
-			_VGOutput.ShowTextKerned(text);
-			_VGOutput.EndText();
-			_VGOutput.RestoreState();
-		}
-		public void DrawArc(Pen pn, RectangleF rectf, float startAngle, float sweepAngle)
-		{
-			_VGOutput.SaveState();
-			SetStrokeData(pn);
-			_VGOutput.Arc(rectf.X, ScaleY(rectf.Y), rectf.X + rectf.Width, ScaleY(rectf.Y + rectf.Height), -startAngle, -sweepAngle);
-			_VGOutput.Stroke();
-			_VGOutput.RestoreState();
-		}
-		public SizeF MeasureString(string text, Font myFont)
-		{
-			iTextSharp.text.Font itFont = GetFont(myFont.Name);
-			iTextSharp.text.pdf.BaseFont baseFont = itFont.BaseFont;
-			return new SizeF(baseFont.GetWidthPoint(text,myFont.SizeInPoints)
-				, baseFont.GetAscentPoint(text, myFont.SizeInPoints) + baseFont.GetDescentPoint(text, myFont.SizeInPoints));
-		}
-		public void Save(string fileName)
-		{ ;/* Don't do anything*/ }
-		public float FontSizeAdjust
-		{ get { return 1; } } // Changed to adjust for Screen DPI Setting
-		public static iTextSharp.text.Font GetFont(string fontName)
-		{
-	/// <summary>
-	/// B2019-116 Volian.Base.Library This is a generic class for dealing with iTextSharp Fonts
-	/// Code moved and consolidated from Volian.Print.Library Volian PDF.Library and VG
-	/// </summary>
-			VlnItextFont.RegisterFont(fontName);
-			return iTextSharp.text.FontFactory.GetFont(fontName, BaseFont.IDENTITY_H, BaseFont.EMBEDDED);
-		}
-		private float ScaleY(float y)
-		{
-			return _VGOutput.PdfWriter.PageSize.Height - y;
-		}
-	}
+        public float FontSizeAdjust => .71f * 96f / _VGOutput.DpiX;  // Changed to adjust for Screen DPI Setting
+    }
 }

PROMS/VG/VG.cs

@@ -20,64 +20,34 @@ namespace VG
 	// Temporary page class to store portrait/landscape, Left Margin, Vertical offset, etc
 	public class Page
 	{
-		private bool _Portrait = true;
-		public bool Portrait
+        public bool Portrait { get; set; } = true;
+        public float LeftMargin { get; set; } = 0;
+        public float TopMargin { get; set; } = 0;
+        public float RightMargin { get; set; } = 0;
+        public float BottomMargin { get; set; } = 0;
+        public Page(bool portrait, float leftMargin, float topMargin, float rightMargin, float bottomMargin)
 		{
-			get { return _Portrait; }
-			set { _Portrait = value; }
-		}
-		private float _LeftMargin = 0;
-		public float LeftMargin
-		{
-			get { return _LeftMargin; }
-			set { _LeftMargin = value; }
-		}
-		private float _TopMargin = 0;
-		public float TopMargin
-		{
-			get { return _TopMargin; }
-			set { _TopMargin = value; }
-		}
-		private float _RightMargin = 0;
-		public float RightMargin
-		{
-			get { return _RightMargin; }
-			set { _RightMargin = value; }
-		}
-		private float _BottomMargin = 0;
-		public float BottomMargin
-		{
-			get { return _BottomMargin; }
-			set { _BottomMargin = value; }
-		}
-		public Page(bool portrait, float leftMargin, float topMargin, float rightMargin, float bottomMargin)
-		{
-			_Portrait = portrait;
-			_LeftMargin = leftMargin;
-			_TopMargin = topMargin;
-			_RightMargin = rightMargin;
-			_BottomMargin = bottomMargin;
+			Portrait = portrait;
+			LeftMargin = leftMargin;
+			TopMargin = topMargin;
+			RightMargin = rightMargin;
+			BottomMargin = bottomMargin;
 		}
 		public Page(bool portrait, float leftMargin, float topMargin)
 		{
-			_Portrait = portrait;
-			_LeftMargin = leftMargin;
-			_TopMargin = topMargin;
+			Portrait = portrait;
+			LeftMargin = leftMargin;
+			TopMargin = topMargin;
 		}
 	}
 	public class VG
 	{
-		private static Brush _BlackBrush = Brushes.Black;
-		public static Brush BlackBrush
-		{
-			get { return _BlackBrush; }
-			set { _BlackBrush = value; }
-		}
-		private static Color _BlackColor = Color.Black;
+        public static Brush BlackBrush { get; set; } = Brushes.Black;
+        private static Color _BlackColor = Color.Black;
 		public static Color BlackColor
 		{
 			get { return _BlackColor; }
-			set { _BlackColor = value; _BlackBrush = new SolidBrush(value); }
+			set { _BlackColor = value; BlackBrush = new SolidBrush(value); }
 		}
 		// Values of vector graphics items are stored as twips (1440 twips in an inch)
 		public int cx;
@@ -105,16 +75,12 @@ namespace VG
 			MoveAbsolute = ima;
 			pg = ipg;
 		}
-		public float ToPoints(float twip)
-		{
-			float r = ((float)twip) * 0.05f;
-			return r;
-		}
-		public void UpdatePageInfo(Page pa)
+        public float ToPoints(float twip) => (float)(((float)twip) * 0.05f);
+        public void UpdatePageInfo(Page pa)
 		{
 			pg.LeftMargin = pa.LeftMargin;
-			pg.Portrait = pa.Portrait; // RHM 20081003 - This had been pg.portrait=pg.portrait
-			pg.TopMargin = pa.TopMargin; // RHM 20081003 - This had been pg.VertOffset=pg.VertOffset
+			pg.Portrait = pa.Portrait; 
+			pg.TopMargin = pa.TopMargin; 
 		}
 		public string AddRTFBUI(string origStr, string bold, string underline, string italics)
 		{
@@ -145,7 +111,6 @@ namespace VG
 				int B1 = (int)(colorFraction * color.B);
 				int B2 = (int)((1 - colorFraction) * Color.White.B);
 				pn = new Pen(Color.FromArgb(R1 + R2, G1 + G2, B1 + B2), scaleWid);
-				//pn = new Pen(color, wid*wid);
 			}
 			else
 				pn = new Pen(color, scaleWid);
@@ -217,74 +182,14 @@ namespace VG
 			vgOutput.DrawRectangle(pn, rc);
 		}
 	}
-	public class VG_Image : VG
-	{
-		private int Scale;
-		private string FileName;
-		// Image is defined as starting point, scale factor (defaults to 1) & image file name
-		public VG_Image(int sx, int sy, int iscale, string fname)
-		{
-			cx = sx;
-			cy = sy;
-			Scale = 1;
-			FileName = fname;
-		}
-		public VG_Image(XmlElement svg, Page ipg)
-		{
-			cx = System.Convert.ToInt32(svg.GetAttribute("x"));
-			cy = System.Convert.ToInt32(svg.GetAttribute("y"));
-			Scale = 1;
-			if (svg.HasAttribute("scale")) Scale = System.Convert.ToInt32(svg.GetAttribute("scale"));
-			FileName = svg.GetAttribute("bname");
-			pg = ipg;
-		}
-		public void Draw(IVGOutput vgOutput)
-		{
-			Pen pn = new Pen(VG.BlackBrush, lnwid);
-			Bitmap bm = new Bitmap(FileName);
-			RectangleF rc = new RectangleF();
-			rc.Height = ToPoints((bm.Height * Scale) * 4.8f);
-			rc.Width = ToPoints((bm.Width * Scale) * 4.8f);
-			rc.X = ToPoints(pg.LeftMargin + cx);
-			rc.Y = ToPoints(pg.TopMargin + cy);
-			// TODO: grfx.DrawImage(bm, rc, ContentAlignment.MiddleCenter, ImageSizeModeEnum.Scale);
-		}
-	}
-	public class VG_Ellipse : VG
-	{
-		// Ellipse (circle) is defined by a bounding rectangle specified by a coordinate pair, a width, and a height
-		public VG_Ellipse(int sx, int sy, int ex, int ey, int w, Page ipg)
-		{
-			cx = sx;
-			cy = sy;
-			dx = ex;
-			dy = ey;
-			lnwid = w;
-			pg = ipg;
-		}
-		public VG_Ellipse(XmlElement svg, Page ipg)
-		{
-			cx = System.Convert.ToInt32(svg.GetAttribute("cx"));
-			cy = System.Convert.ToInt32(svg.GetAttribute("cy"));
-			dx = System.Convert.ToInt32(svg.GetAttribute("rx"));
-			dy = System.Convert.ToInt32(svg.GetAttribute("ry"));
-			lnwid = System.Convert.ToInt32(svg.GetAttribute("stroke-width"));
-			pg = ipg;
-		}
-		public void Draw(IVGOutput vgOutput)
-		{
-			Pen pn = new Pen(VG.BlackBrush, ToPoints(lnwid));
-			vgOutput.DrawEllipse(pn, ToPoints(pg.LeftMargin + cx), ToPoints(pg.TopMargin + cy), ToPoints(dx), ToPoints(dy));
-		}
-	}
 	public class VG_Text : VG
 	{
-		private string FontName;
-		private int FontSize;
-		private string Bold;
-		private string Underline;
-		private string Italics;
-		private string Text;
+		private readonly string FontName;
+		private readonly int FontSize;
+		private readonly string Bold;
+		private readonly string Underline;
+		private readonly string Italics;
+		private readonly string Text;
 		// Text is defined by a starting location, attributes & the string
 		public VG_Text(int sx, int sy, int fs, string txt, string fn, string ibold, string iunder, string iitalics, Page ipg)
 		{
@@ -297,48 +202,28 @@ namespace VG
 			Underline = iunder;
 			Italics = iitalics;
 			pg = ipg;
-			// TODO: The following were in the 16-bit code - we may need to use these, wait and see
-			//			strokeWidth = stroke;
-			//			strokeWidthBold = strokebold;
-			//			ULOffset = UnderlineOffset;
-			//			ULWidth = UnderlineWidth;
-		}
-		public VG_Text(XmlElement svg, Page ipg)
-		{
-			cx = System.Convert.ToInt32(svg.GetAttribute("x"));
-			cy = System.Convert.ToInt32(svg.GetAttribute("y"));
-			FontSize = System.Convert.ToInt32(svg.GetAttribute("font-size"));
-			Bold = svg.GetAttribute("font-weight");
-			Underline = svg.GetAttribute("text-decoration");
-			Italics = svg.GetAttribute("font-style");
-			FontName = svg.GetAttribute("font-family");
-			Text = svg.InnerText;
-			pg = ipg;
 		}
 		public void Draw(IVGOutput vgOutput)
 		{
 			// TODO: Font myfont = new Font(FontName, (FontSize*9)/10);
 			Font myfont = new Font(FontName, FontSize * vgOutput.FontSizeAdjust); // TODO: Trying 80%
-			RectangleF rc = new RectangleF();
-			// the returned value from c1 grfx code is already in points,
-			// so need to convert the size.
-			rc.Size = vgOutput.MeasureString(Text, myfont); // TODO: 500 or pagewidth, or what
-			//rc.Size = grfx.MeasureString(Text, myfont, 500); // TODO: 500 or pagewidth, or what
-			rc.X = ToPoints(pg.LeftMargin + cx);
-			rc.Y = ToPoints(pg.TopMargin + cy) - FontSize;
-			rc.Height *= 1.0000001F;  // Small factor to make text visible.
-			// add bold, underline & italics for entire object.
-			// TODO: string rtfout = AddRTFBUI(Text, Bold, Underline, Italics);
-			//using(Pen pn = new Pen(Color.DarkBlue, .1F))
-			//	grfx.DrawRectangle(pn, rc.X,rc.Y,rc.Width,rc.Height);
+            RectangleF rc = new RectangleF
+            {
+                // the returned value from c1 grfx code is already in points,
+                // so need to convert the size.
+                Size = vgOutput.MeasureString(Text, myfont), // TODO: 500 or pagewidth, or what
+                                                             //rc.Size = grfx.MeasureString(Text, myfont, 500); // TODO: 500 or pagewidth, or what
+                X = ToPoints(pg.LeftMargin + cx),
+                Y = ToPoints(pg.TopMargin + cy) - FontSize
+            };
+            rc.Height *= 1.0000001F;  // Small factor to make text visible.
 			vgOutput.DrawString(Text, myfont, VG.BlackBrush, rc);
-			//grfx.DrawString(Text, myfont, VG.BlackBrush, rc);
 		}
 	}
 	public class VG_Arc : VG
 	{
-		public Single sweepAngle;
-		public Single startAngle;
+		public float sweepAngle;
+		public float startAngle;
 		public float stX, stY;
 		public float rWid, rHgt;
 		// Arc is defined by a bounding rectangle specified by a coordinate pair, a width, and a height
@@ -365,9 +250,7 @@ namespace VG
 				rHgt = -hight;
 			}
 			startAngle = stAngle;
-			//			startAngle = 90;
 			sweepAngle = swpAngle;
-			//			sweepAngle = -45;
 			lnwid = w;
 			pg = ipg;
 		}
@@ -391,18 +274,6 @@ namespace VG
 			float starty = pg.Portrait ? (stY + pg.TopMargin) : (pg.LeftMargin - stX);
 			RectangleF rc = new RectangleF(ToPoints(startx), ToPoints(starty), ToPoints(rWid), ToPoints(rHgt));
 			//Console.WriteLine("{0},'{1}',{2},{3},{4},{5},{6},{7}", iColor, pn.Color, rc.X, rc.Y, rc.Width, rc.Height, startAngle, sweepAngle);
-			//if (iColor == 7 || iColor == 8) return;
-			//if (iColor == 6) return;
-			//if (iColor == 4 || iColor == 6)
-			//{
-			//  using (Pen lightPen = new Pen(myColors[iColor % myColors.Length], .01F))
-			//{
-			//  vgOutput.DrawEllipse(lightPen, rc.X, rc.Y, rc.Width, rc.Height);
-			//  float xc = rc.X + (rc.Width / 2);
-			//  float yc = rc.Y + (rc.Height / 2);
-			//  vgOutput.DrawEllipse(lightPen, xc - .5F, yc - .5F, 1F, 1F);
-			//}
-			//}
 			if (sweepAngle > 0)
 				vgOutput.DrawArc(pn, rc, startAngle, sweepAngle);
 			else

PROMS/Volian.Base.Library/BaseLnSettings.cs

@@ -0,0 +1,8 @@
+
+namespace Volian.Base.Library
+{
+	public static class BaseLnSettings
+	{
+		public static bool blBaseLine { get; set; } = false;
+	}
+}

PROMS/Volian.Base.Library/BigNum.cs

@@ -6,7 +6,6 @@ using System.Xml.Serialization;
 namespace Volian.Base.Library
 {
 	[Serializable()]
-	//[XmlRoot("BigNum")]
 	public class BigNum
 	{
 		#region fields
@@ -22,19 +21,10 @@ namespace Volian.Base.Library
 		public BigNum()
 		{
 		}
-		public BigNum(int value)
-		{
-			SetFlag(value);
-		}
-		public BigNum(string values)
-		{
-			SetFlags(values);
-		}
-		public BigNum(ICollection<int> values)
-		{
-			SetFlags(values);
-		}
-		public override string ToString()
+        public BigNum(int value) => SetFlag(value);
+        public BigNum(string values) => SetFlags(values);
+        public BigNum(ICollection<int> values) => SetFlags(values);
+        public override string ToString()
 		{
 			return FlagList;
 		}
@@ -58,10 +48,6 @@ namespace Volian.Base.Library
 		}
 		#endregion
 		#region methods
-		//public override string ToString()
-		//{
-		//  return GenericSerializer<BigNum>.StringSerialize(this);
-		//}
 		public bool Includes(BigNum other)
 		{
 			List<int> mine = GetFlags();
@@ -82,12 +68,6 @@ namespace Volian.Base.Library
 		public List<int> GetFlags()
 		{
 			List<int> myints = new List<int>();
-			//if (MyValue.Count == 0)//1 && MyValue.ContainsKey(0) && MyValue[0] == 0)
-			//{
-			//  myints.Add(-1);
-			//}
-			//else
-			//{
 				foreach (uint key in MyValue.Keys)
 				{
 					ulong y = MyValue[key];
@@ -97,18 +77,10 @@ namespace Volian.Base.Library
 							myints.Add((int)(i + (key * 64)));
 					}
 				}
-			//}
 			return myints;
 		}
 		public void SetFlag(int flag)
 		{
-			//if (flag == -1)
-			//{
-			//  MyValue = new SortedDictionary<uint, ulong>();
-			//  //MyValue.Add(0, 0);
-			//}
-			//else
-			//{
 				uint offset = (uint)(flag / 64);
 				ulong x = one << (flag % 64);
 				if (MyValue.ContainsKey(offset))
@@ -122,15 +94,10 @@ namespace Volian.Base.Library
 			foreach (int f in flags)
 				SetFlag(f);
 		}
-		public static BigNum MakeBigNum(string numbers)
-		{
-			if (numbers == "-1")
-				return null;
-			return new BigNum(numbers);
-		}
-		#endregion
-		#region properties
-		[XmlAttribute]
+        public static BigNum MakeBigNum(string numbers) => numbers == "-1" ? null : new BigNum(numbers);
+        #endregion
+        #region properties
+        [XmlAttribute]
 		public string FlagList
 		{
 			get

PROMS/Volian.Base.Library/ByteArrayCompare.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Volian.Base.Library
+namespace Volian.Base.Library
 {
 	public static class ByteArrayCompare
 	{

PROMS/Volian.Base.Library/DebugPrint.cs

@@ -1,17 +1,12 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.IO;
 
 namespace Volian.Base.Library
 {
 	public class DebugPrint:IDisposable
 	{
-		public void Dispose()
-		{
-			Close();
-		}
-		private StreamWriter _MyStreamWriter = null;
+        public void Dispose() => Close();
+        private StreamWriter _MyStreamWriter = null;
 		public StreamWriter MyStreamWriter
 		{
 			get { return _MyStreamWriter; }
@@ -25,11 +20,8 @@ namespace Volian.Base.Library
 				_MyStreamWriter = value;
 			}
 		}
-		public bool IsOpen
-		{
-			get { return MyStreamWriter != null; }
-		}
-		private string _FileName = null;
+        public bool IsOpen => MyStreamWriter != null;
+        private string _FileName = null;
 		public string FileName
 		{
 			get { return _FileName; }
@@ -40,22 +32,15 @@ namespace Volian.Base.Library
 				MyFileInfo = new FileInfo(value);
 			}
 		}
-		private FileInfo _MyFileInfo;
-		public FileInfo MyFileInfo
-		{
-			get { return _MyFileInfo; }
-			set { _MyFileInfo = value; }
-		}
-		public void Open(string fileName)
+
+        public FileInfo MyFileInfo { get; set; }
+        public void Open(string fileName)
 		{
 			FileName = fileName;
 			MyStreamWriter = MyFileInfo.CreateText();
 		}
-		public void Close()
-		{
-			MyStreamWriter = null;
-		}
-		public void Write(string format, params object[] args)
+        public void Close() => MyStreamWriter = null;
+        public void Write(string format, params object[] args)
 		{
 			if (IsOpen) MyStreamWriter.Write(format, args);
 		}
@@ -73,98 +58,62 @@ namespace Volian.Base.Library
 	}
 	public static class DebugPagination
 	{
-		private static int _TotalPages = 0;
-		public static int TotalPages
-		{
-			get { return _TotalPages; }
-			set { _TotalPages = value; }
-		}
-		private static DebugPrint _MyDebugPrint = new DebugPrint();
-		public static void Open(string fileName)
-		{ _MyDebugPrint.Open(fileName); }
-		public static void Close()
+        public static int TotalPages { get; set; } = 0;
+        private static readonly DebugPrint _MyDebugPrint = new DebugPrint();
+        public static void Open(string fileName) => _MyDebugPrint.Open(fileName);
+        public static void Close()
 		{
 			WriteLine("{0} Total Pages", TotalPages);
 			_MyDebugPrint.Close(); 
 		}
-		public static void Write(string format, params object[] args)
-		{ _MyDebugPrint.Write(format, args); }
-		public static void WriteLine(string format, params object[] args)
-		{ _MyDebugPrint.WriteLine(format, args); }
-		public static void Show()
-		{ _MyDebugPrint.Show(); }
-		public static bool IsOpen
-		{	get { return _MyDebugPrint.IsOpen; } }
-	}
+        public static void Write(string format, params object[] args) => _MyDebugPrint.Write(format, args);
+        public static void WriteLine(string format, params object[] args) => _MyDebugPrint.WriteLine(format, args);
+        public static void Show() => _MyDebugPrint.Show();
+        public static bool IsOpen => _MyDebugPrint.IsOpen;
+    }
 	public static class DebugText
 	{
-		private static DebugPrint _MyDebugPrint = new DebugPrint();
-		public static void Open(string fileName)
-		{ _MyDebugPrint.Open(fileName); }
-		public static void Close()
-		{ _MyDebugPrint.Close(); }
-		public static void Write(string format, params object[] args)
-		{ _MyDebugPrint.Write(format, args); }
-		public static void WriteLine(string format, params object[] args)
-		{ _MyDebugPrint.WriteLine(format, args); }
-		public static void Show()
-		{ _MyDebugPrint.Show(); }
-		public static bool IsOpen
-		{	get { return _MyDebugPrint.IsOpen; } }
-	}
+		private static readonly DebugPrint _MyDebugPrint = new DebugPrint();
+        public static void Open(string fileName) => _MyDebugPrint.Open(fileName);
+        public static void Close() => _MyDebugPrint.Close();
+        public static void Write(string format, params object[] args) => _MyDebugPrint.Write(format, args);
+        public static void WriteLine(string format, params object[] args) => _MyDebugPrint.WriteLine(format, args);
+        public static void Show() => _MyDebugPrint.Show();
+        public static bool IsOpen => _MyDebugPrint.IsOpen;
+    }
 	public static class DebugProfile
 	{
 		private static DebugPrint _MyDebugPrint = new DebugPrint();
-		public static void Open(string fileName)
-		{ _MyDebugPrint.Open(fileName); }
-		public static void Close()
+        public static void Open(string fileName) => _MyDebugPrint.Open(fileName);
+        public static void Close()
 		{ _MyDebugPrint.Close(); _MyDebugPrint = null; }
-		public static void Write(string format, params object[] args)
-		{ _MyDebugPrint.Write(format, args); }
-		public static void WriteLine(string format, params object[] args)
-		{ _MyDebugPrint.WriteLine(format, args); }
-		public static void Show()
-		{ _MyDebugPrint.Show(); }
-		public static bool IsOpen
-		{ get { return _MyDebugPrint.IsOpen; } }
-	}
+        public static void Write(string format, params object[] args) => _MyDebugPrint.Write(format, args);
+        public static void WriteLine(string format, params object[] args) => _MyDebugPrint.WriteLine(format, args);
+        public static void Show() => _MyDebugPrint.Show();
+        public static bool IsOpen => _MyDebugPrint.IsOpen;
+    }
 	public static class DebugDBTrack
 	{
 		private static DebugPrint _MyDebugPrint = new DebugPrint();
-		public static void Open(string fileName)
-		{ _MyDebugPrint.Open(fileName); }
-		public static void Close()
+        public static void Open(string fileName) => _MyDebugPrint.Open(fileName);
+        public static void Close()
 		{ _MyDebugPrint.Close(); _MyDebugPrint = null; }
-		public static void Write(string format, params object[] args)
-		{ _MyDebugPrint.Write(format, args); }
-		public static void WriteLine(string format, params object[] args)
-		{ _MyDebugPrint.WriteLine(format, args); }
-		public static void Show()
-		{ _MyDebugPrint.Show(); }
-		public static bool IsOpen
-		{ get { return _MyDebugPrint.IsOpen; } }
-	}
+        public static void Write(string format, params object[] args) => _MyDebugPrint.Write(format, args);
+        public static void WriteLine(string format, params object[] args) => _MyDebugPrint.WriteLine(format, args);
+        public static void Show() => _MyDebugPrint.Show();
+        public static bool IsOpen => _MyDebugPrint.IsOpen;
+    }
 	// C2018-004 create meta file for baseline compares
   public static class BaselineMetaFile
   {
-    private static DebugPrint _MyDebugPrint = new DebugPrint();
-    public static void Open(string fileName)
-    { _MyDebugPrint.Open(fileName); }
-    public static void Close()
-    { _MyDebugPrint.Close(); }
-    public static void Write(string format, params object[] args)
-    { _MyDebugPrint.Write(format, args); }
-    public static void WriteLine(string format, params object[] args)
-    { _MyDebugPrint.WriteLine(format, args); }
-    public static void Show()
-    { _MyDebugPrint.Show(); }
-    public static bool IsOpen
-    { get { return _MyDebugPrint.IsOpen; } }
-		private static bool _IncludeWordSecText = true;
-		public static bool IncludeWordSecText
-		{
-			get { return BaselineMetaFile._IncludeWordSecText; }
-			set { BaselineMetaFile._IncludeWordSecText = value; }
-		}
-  }
+    private static readonly DebugPrint _MyDebugPrint = new DebugPrint();
+        public static void Open(string fileName) => _MyDebugPrint.Open(fileName);
+        public static void Close() => _MyDebugPrint.Close();
+        public static void Write(string format, params object[] args) => _MyDebugPrint.Write(format, args);
+        public static void WriteLine(string format, params object[] args) => _MyDebugPrint.WriteLine(format, args);
+        public static void Show() => _MyDebugPrint.Show();
+        public static bool IsOpen => _MyDebugPrint.IsOpen;
+
+        public static bool IncludeWordSecText { get; set; } = true;
+    }
 }

PROMS/Volian.Base.Library/ExeInfo.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.IO;
 using System.Linq;
 
@@ -10,21 +8,17 @@ namespace Volian.Base.Library
 	{
 		#region Log4Net
 		private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
-		#endregion
-		public static string GetROEditorPath()
-		{
-			string roapp = PROMSExecutableFolderPath() + @"\ROEDITOR.EXE";
-			return roapp;
-		}
+        #endregion
+        public static string GetROEditorPath() => $@"{PROMSExecutableFolderPath()}\ROEDITOR.EXE";
 
-		// returns the path to the executable folder
-		public static string PROMSExecutableFolderPath()
+        // returns the path to the executable folder
+        public static string PROMSExecutableFolderPath()
 		{
 			string pathPROMSexe = System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().GetName().CodeBase);
 			if (pathPROMSexe[7] == ':') // either a local drive or a mapped network drive
 				pathPROMSexe = pathPROMSexe.Substring(6);
 			else
-				pathPROMSexe = @"\" + pathPROMSexe.Substring(5); // non-mapped network drive - need to add extra back slash in front
+				pathPROMSexe = $@"\{pathPROMSexe.Substring(5)}"; // non-mapped network drive - need to add extra back slash in front
 			return pathPROMSexe;
 		}
 
@@ -34,7 +28,7 @@ namespace Volian.Base.Library
 			try
 			{
 				// Build the path to the PROMSFixes.sql file located in the PROMS exe folder
-				string pathPROMSFixes = PROMSExecutableFolderPath() + @"\PROMSFixes.sql";
+				string pathPROMSFixes = $@"{PROMSExecutableFolderPath()}\PROMSFixes.sql";
 
 				// open the PROMSFixes.sql file and grab the line of text containing the PROMSFixes RevDate
 				// using Linq to open and read the PROMSFixes file

PROMS/Volian.Base.Library/FlagEnumEditor.cs

@@ -1,8 +1,5 @@
 using System;
-using System.Collections;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
 using System.Windows.Forms;
 using System.Drawing.Design;
 using System.Windows.Forms.Design;
@@ -13,7 +10,6 @@ namespace Volian.Base.Library
 
 	public class FlagCheckedListBox : CheckedListBox
 	{
-		private System.ComponentModel.Container components = null;
 
 		public FlagCheckedListBox()
 		{
@@ -21,16 +17,6 @@ namespace Volian.Base.Library
 			InitializeComponent();
 		}
 
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing)
-			{
-				if (components != null)
-					components.Dispose();
-			}
-			base.Dispose(disposing);
-		}
-
 		#region Component Designer generated code
 		private void InitializeComponent()
 		{
@@ -124,7 +110,7 @@ namespace Volian.Base.Library
 
 			// If the item has been unchecked, remove its bits from the sum
 			if (cs == CheckState.Unchecked)
-				sum = sum & (~composite.value);
+				sum &= (~composite.value);
 			// If the item has been checked, combine its bits with the sum
 			else
 				sum |= composite.value;
@@ -207,27 +193,15 @@ namespace Volian.Base.Library
 			caption = c;
 		}
 
-		public override string ToString()
-		{
-			return caption;
-		}
+        public override string ToString() => caption;
 
-		// Returns true if the value corresponds to a single bit being set
-		public bool IsFlag
-		{
-			get
-			{
-				return ((value & (value - 1)) == 0);
-			}
-		}
+        // Returns true if the value corresponds to a single bit being set
+        public bool IsFlag => (value & (value - 1)) == 0;
 
-		// Returns true if this value is a member of the composite bit value
-		public bool IsMemberFlag(FlagCheckedListBoxItem composite)
-		{
-			return (IsFlag && ((value & composite.value) == value));
-		}
+        // Returns true if this value is a member of the composite bit value
+        public bool IsMemberFlag(FlagCheckedListBoxItem composite) => IsFlag && ((value & composite.value) == value);
 
-		public uint value;
+        public uint value;
 		public string caption;
 	}
 
@@ -236,13 +210,15 @@ namespace Volian.Base.Library
 	public class FlagEnumUIEditor : UITypeEditor
 	{
 		// The checklistbox
-		private FlagCheckedListBox flagEnumCB;
+		private readonly FlagCheckedListBox flagEnumCB;
 
 		public FlagEnumUIEditor()
 		{
-			flagEnumCB = new FlagCheckedListBox();
-			flagEnumCB.BorderStyle = BorderStyle.None;
-		}
+            flagEnumCB = new FlagCheckedListBox
+            {
+                BorderStyle = BorderStyle.None
+            };
+        }
 
 		public override object EditValue(ITypeDescriptorContext context, IServiceProvider provider, object value)
 		{
@@ -266,12 +242,9 @@ namespace Volian.Base.Library
 			return null;
 		}
 
-		public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context)
-		{
-			return UITypeEditorEditStyle.DropDown;
-		}
+        public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context) => UITypeEditorEditStyle.DropDown;
 
 
-	}
+    }
 
 }