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

Reviewed-on: #570

PROMS/AdjustBuildRevision/AdjustBuildRevision.csproj

@@ -5,7 +5,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -44,7 +44,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -54,14 +53,13 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>

PROMS/AdjustBuildRevision/Program.cs

@@ -32,9 +32,9 @@ namespace AdjustBuildRevision
 						{
 							// Allow for setting build revision on either proms or the roeditor:
 							if (Directory.GetCurrentDirectory().ToUpper().Contains("REFOBJ"))
-								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") + "\")");
+							else
+								outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.2.yyMM.dHH") + "\")");
 					//		if (outline != line)
 					//		{
 					//			Console.WriteLine("Before: '{0}'", line);

PROMS/Baseline/Baseline.csproj

@@ -22,7 +22,7 @@
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
@@ -30,17 +30,15 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />

PROMS/Baseline/frmBaseline.cs

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

PROMS/DropDownPanel/Controls/DropDownPanel.cs

@@ -28,9 +28,7 @@ namespace AT.STO.UI.Win
 
 			_dropDownHelper = new DropDownWindowHelper();
 
-			_dropDownHelper.DropDownClosed -= new DropDownClosedEventHandler(DropDownHelper_DropDownClosed);
 			_dropDownHelper.DropDownClosed += new DropDownClosedEventHandler(DropDownHelper_DropDownClosed);
-			_dropDownHelper.DropDownCancel -= new DropDownCancelEventHandler(DropDownHelper_DropDownCancel);
 			_dropDownHelper.DropDownCancel += new DropDownCancelEventHandler(DropDownHelper_DropDownCancel);
 			
 			combo.DisplayMember = "Text";
@@ -84,9 +82,7 @@ namespace AT.STO.UI.Win
 				DropDownForm dropDown = new DropDownForm(_dropDownControl);
 				
 				
-				dropDown.FinishEditing -= new DropDownValueChangedEventHandler(DropDown_FinishEditing);
 				dropDown.FinishEditing += new DropDownValueChangedEventHandler(DropDown_FinishEditing);
-				dropDown.ValueChanged -= new DropDownValueChangedEventHandler(DropDown_ValueChanged);
 				dropDown.ValueChanged += new DropDownValueChangedEventHandler(DropDown_ValueChanged);
 				
 				combo.DroppedDown = false;

PROMS/DropDownPanel/DropDownPanel.csproj

@@ -34,7 +34,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -45,14 +45,13 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Demo|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\Demo\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -61,7 +60,7 @@
     <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -70,7 +69,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -79,7 +78,7 @@
     <OutputPath>bin\Demo\</OutputPath>
     <DefineConstants>TRACE;DEMO</DefineConstants>
     <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>

PROMS/DropDownPanel/Forms/DropDownForm.cs

@@ -49,9 +49,7 @@ namespace AT.STO.UI.Win
 		{
 			base.OnShown(e);
 			
-			_control.FinishEditing -= new DropDownValueChangedEventHandler(Ctrl_FinishEditing);
 			_control.FinishEditing += new DropDownValueChangedEventHandler(Ctrl_FinishEditing);
-			_control.ValueChanged -= new DropDownValueChangedEventHandler(Ctrl_ValueChanged);
 			_control.ValueChanged += new DropDownValueChangedEventHandler(Ctrl_ValueChanged);
 		}
 	#endregion

PROMS/DropDownPanel/Helper/DropDownWindowHelper.cs

@@ -39,7 +39,6 @@ namespace AT.STO.UI.Win
 		public DropDownWindowHelper()
 		{
 			_filter = new DropDownMessageFilter(this);
-			_filter.DropDownCancel -= new DropDownCancelEventHandler(Popup_Cancel);
 			_filter.DropDownCancel += new DropDownCancelEventHandler(Popup_Cancel);
 		}
 	#endregion

PROMS/FlexableMessageBox/FlexableMessageBox.csproj

@@ -29,7 +29,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -40,14 +40,13 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>
@@ -57,7 +56,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>

PROMS/Formats/Formats.csproj

@@ -35,7 +35,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -45,7 +44,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL">
@@ -182,7 +180,6 @@
     <Content Include="fmtall\CPL_03all.xml" />
     <Content Include="fmtall\CPSAMGDataall.xml" />
     <Content Include="fmtall\CPSAMGDEVall.xml" />
-    <Content Include="fmtall\EPTSTBCK1all.xml" />
     <Content Include="fmtall\EPTST1all.xml" />
     <Content Include="fmtall\CWEall.xml" />
     <Content Include="fmtall\CWEDEVall.xml" />

PROMS/LBWordLibrary/LBObjectExtension.cs

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

PROMS/LBWordLibrary/LBWordLibrary.csproj

@@ -34,7 +34,7 @@
     <DefineConstants>TRACE;DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -45,14 +45,13 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>TRACE;DEBUG</DefineConstants>
     <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>
@@ -62,7 +61,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>

PROMS/ReferencedObjects/Exe/RefObj/CmpRpt/CmpRpt.csproj

@@ -59,7 +59,7 @@
     <WarningLevel>4</WarningLevel>
     <DebugType>full</DebugType>
     <ErrorReport>prompt</ErrorReport>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -85,7 +85,6 @@
     <DebugType>none</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -93,7 +92,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <BaseAddress>285212672</BaseAddress>
     <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -104,7 +103,7 @@
     <Optimize>true</Optimize>
     <DebugType>
     </DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>

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

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

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

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

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

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

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

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

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

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

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

@@ -7,7 +7,7 @@
     <Optimize>true</Optimize>
     <DebugType>
     </DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -71,7 +71,7 @@
     <DebugType>full</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <OutputPath>bin\Release\</OutputPath>
@@ -96,7 +96,6 @@
     <DebugType>none</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -104,15 +103,11 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <BaseAddress>285212672</BaseAddress>
     <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\3rdPartyLibraries\DotNetBar\DotNetBar4.6Build\DevComponents.DotNetBar2.dll</HintPath>
-    </Reference>
     <Reference Include="System">
       <Name>System</Name>
     </Reference>
@@ -128,6 +123,10 @@
     <Reference Include="System.Xml">
       <Name>System.XML</Name>
     </Reference>
+    <Reference Include="Volian.Base.Library, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\Volian.Base.Library\bin\Debug\Volian.Base.Library.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AboutROEditor.cs">
@@ -168,7 +167,6 @@
     <Compile Include="RO_FST.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Content Include="Symbols.xml" />
     <EmbeddedResource Include="AboutROEditor.resx">
       <SubType>Designer</SubType>
       <DependentUpon>AboutROEditor.cs</DependentUpon>

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

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

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

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

PROMS/ReferencedObjects/LibSource/DBEncapsulation/DBEncapsulation.csproj

@@ -62,7 +62,6 @@
     <DebugType>full</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <OutputPath>bin\Release\</OutputPath>
@@ -87,7 +86,6 @@
     <DebugType>none</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -95,7 +93,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <BaseAddress>285212672</BaseAddress>
     <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -106,7 +104,7 @@
     <Optimize>true</Optimize>
     <DebugType>
     </DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>

PROMS/ReferencedObjects/LibSource/Org.Mentalis.Files/Org.Mentalis.Files.csproj

@@ -35,7 +35,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -45,14 +44,13 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -61,7 +59,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>

PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs

@@ -263,7 +263,6 @@ using System.Collections.Specialized;
 using Org.Mentalis.Files;
 using System.Data.SqlClient;
 using System.Collections.Generic;
-using System.Text.RegularExpressions;
 
 
 namespace RODBInterface
@@ -410,7 +409,7 @@ namespace RODBInterface
 			GetDbServerInfo(ropath);
 			if (!dbProviderType.Equals((int)DB_PROVIDER.SQL_SERVER))
 			{
-				strDatabaseConnectionCommand = "Provider=Microsoft.ACE.OLEDB.12.0;Password=\"\";User ID=Admin;Data Source=" + DataConnectionPath + "\\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";
+				strDatabaseConnectionCommand = "Provider=Microsoft.Jet.OLEDB.4.0;Password=\"\";User ID=Admin;Data Source=" + DataConnectionPath + "\\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";
 			}
 		}
 		#endregion
@@ -1910,8 +1909,6 @@ namespace RODBInterface
 				string Info = DBE.GetString(3);
 				//B2022-043 &pos; was missing the ;
 				Info = Info.Replace("'", "\'");		// B2021-071: crash when getting/saving field names
-				Info = Regex.Replace(Info, @"\\u([0-9]{1,4})\?", m => Convert.ToChar(int.Parse(m.Groups[1].Value)).ToString());  // RO Editor add symbols C2022 - 003
-
 				node.SetAttribute("HasChild", "True");
 
 				// Store data in the VlnXmlElement as a subgroup
@@ -2142,20 +2139,7 @@ namespace RODBInterface
 					wraccid = accid;
 				string dt = string.Format("{0:yyyyMMddHHmmss}", System.DateTime.Now);
 				string xmlstr = GenerateXmlString(ro, false);
-				StringBuilder xmlstrTmp = new StringBuilder(); // B2026-025 prep the info field data so it will be saved correctly.
-				char[] chrAry = xmlstr.ToCharArray();
-				foreach (int chr in chrAry)
-				{
-					if (chr > 166)
-					{
-						xmlstrTmp.Append($"\\u{(int)chr}?");
-					}
-					else
-					{
-						xmlstrTmp.Append((char)chr);
-					}
-				}
-				string strUpdate = "UPDATE " + ro.GetAttribute("Table") + " SET Info = '" + xmlstrTmp.ToString() + "'";
+				string strUpdate = "UPDATE " + ro.GetAttribute("Table") + " SET Info = '" + xmlstr + "'";
 				if (movedRO)
 				{
 					VlnXmlElement parent = (VlnXmlElement)ro.ParentNode;
@@ -2198,27 +2182,10 @@ namespace RODBInterface
 				parent.SetAttribute("ChildLoaded", "True");
 			}
 			string xmlstr = GenerateXmlString(ro, false);
-
-			StringBuilder xmlstrTmp = new StringBuilder(); // B2026-025 prep the info field data so it will be saved correctly.
-			char[] chrAry = xmlstr.ToCharArray();
-			foreach (int chr in chrAry)
-			{
-				if (chr > 166)
-				{
-					xmlstrTmp.Append($"\\u{(int)chr}?");
-				}
-				else
-				{
-					xmlstrTmp.Append((char)chr);
-				}
-			}
-
 			string wraccid = null;
 			if (ro.HasAttribute("AccPageID"))
 			{
 				string accid = ro.GetAttribute("AccPageID");
-
-
 				int quote = accid.IndexOf("'");
 				if (quote >= 0)
 					wraccid = accid.Insert(quote, "'");
@@ -2236,13 +2203,13 @@ namespace RODBInterface
 					//    strInsert = "INSERT INTO " + parent.GetAttribute("Table") + "( RecID, RecType, ParentID, AccPageID, ModDateTime, Info ) ";
 					strInsert = "INSERT INTO " + parent.GetAttribute("Table") + "( RecID, RecType, ParentID, ModDateTime, AccPageID, Info ) ";
 					strInsert = strInsert + " VALUES ('" + ro.GetAttribute("RecID") + "'," + (uint)RecordType.Group + ",'" + ro.GetAttribute("ParentID");
-					strInsert = strInsert + "','" + wraccid + "','" + dt + "','" + xmlstrTmp.ToString() + "');";
+					strInsert = strInsert + "','" + wraccid + "','" + dt + "','" + xmlstr + "');";
 				}
 				else
 				{
 					strInsert = "INSERT INTO " + parent.GetAttribute("Table") + "( RecID, RecType, ParentID, ModDateTime, Info ) ";
 					strInsert = strInsert + " VALUES ('" + ro.GetAttribute("RecID") + "'," + (uint)RecordType.Group + ",'" + ro.GetAttribute("ParentID");
-					strInsert = strInsert + "','" + dt + "','" + xmlstrTmp.ToString() + "');";
+					strInsert = strInsert + "','" + dt + "','" + xmlstr + "');";
 				}
 
 			}
@@ -2250,7 +2217,7 @@ namespace RODBInterface
 			{
 				strInsert = "INSERT INTO " + parent.GetAttribute("Table") + "( RecID, RecType, ParentID, AccPageId, ModDateTime, Info ) ";
 				strInsert = strInsert + " VALUES ('" + ro.GetAttribute("RecID") + "'," + (uint)RecordType.RRO + ",'" + ro.GetAttribute("ParentID");
-				strInsert = strInsert + "','" + wraccid + "','" + dt + "','" + xmlstrTmp.ToString() + "');";
+				strInsert = strInsert + "','" + wraccid + "','" + dt + "','" + xmlstr + "');";
 			}
 
 			try
@@ -2284,7 +2251,7 @@ namespace RODBInterface
 				// select all of the field definition records in this table.
 				//			strGetFields = "SELECT RecID, Info from " + elem.GetAttribute("Table");
 				strGetFields = "SELECT RecID, Info from " + TableName;
-				strGetFields = strGetFields + " where RecType = 2";  
+				strGetFields = strGetFields + " where RecType = 2";  //  + rtype.ToString();
 				DBE.Command(strGetFields);
 				DBE.Reader();
 
@@ -2658,21 +2625,7 @@ namespace RODBInterface
 										}
 									}
 									StatMsgWindow.StatusMessage = echild.GetAttribute("MenuTitle");
-									StringBuilder tinfo2Tmp = new StringBuilder(); // B2026-025 prep the info field data so it will be saved correctly.
 									str = "UPDATE " + echild.GetAttribute("Table") + " SET Info = '" + tinfo2 + "'";
-									char[] chrAry = tinfo2.ToCharArray();
-									foreach (int chr in chrAry)
-									{
-										if (chr > 166)
-										{
-											tinfo2Tmp.Append($"\\u{(int)chr}?");
-										}
-										else
-										{
-											tinfo2Tmp.Append((char)chr);
-										}
-									}
-									str = "UPDATE " + echild.GetAttribute("Table") + " SET Info = '" + tinfo2Tmp.ToString() + "'";
 									str = str + ", ModDateTime = '" + dt + "' WHERE RecID = '" + echild.GetAttribute("RecID") + "';";
 									DBE.Command(str);
 									DBE.Reader();

PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.csproj

@@ -62,7 +62,6 @@
     <DebugType>full</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <OutputPath>bin\Release\</OutputPath>
@@ -87,7 +86,6 @@
     <DebugType>none</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -95,7 +93,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <BaseAddress>285212672</BaseAddress>
     <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -106,7 +104,7 @@
     <Optimize>true</Optimize>
     <DebugType>
     </DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -173,17 +171,6 @@
       <Name>VlnStatus</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <COMReference Include="Microsoft.Office.Interop.Access.Dao">
-      <Guid>{4AC9E1DA-5BAD-4AC7-86E3-24F4CDCECA28}</Guid>
-      <VersionMajor>12</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>primary</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </COMReference>
-  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>

PROMS/ReferencedObjects/LibSource/RODBInterface/VlnXml.cs

@@ -96,7 +96,6 @@ using System.IO;
 using System.Windows.Forms;
 using ROFields;
 using VlnStatus;
-using System.Text.RegularExpressions;
 //using VlnProfiler; //don't forget to add VlnProfiler to the reference list
 
 namespace RODBInterface
@@ -518,8 +517,7 @@ namespace RODBInterface
 								strtmp.Append(" ");
 								cnt++;
 							}
-							text = Regex.Replace(text, @"\\u([0-9]{1,4})\?", m => int.TryParse(m?.Groups[1]?.Value, out int result) ? Convert.ToChar(result).ToString() : ""); //B2026-025 Unicode removed from RO menu titles in treeview.
-							if ((cnt + text.Length) > frmt2) // longer than the field length?								
+							if ((cnt + text.Length) > frmt2) // longer than the field length?
 								strtmp.Append(text.Substring(0,frmt2-cnt));
 							else
 								strtmp.Append(text);
@@ -737,27 +735,23 @@ namespace RODBInterface
 				else
 					parentValue = nd.InnerText;
 
-				if (parentName != "#whitespace")
+				//applicValues = "";
+				applicValues = string.Format("<APL DefaultVal={0}", parentValue);
+				int pcChildIdx = 0;
+				//C2022-001 only save the child ro value in the RO.FST if it is different than the parent (default) value
+				foreach (string c in pcChildern)
 				{
-					//applicValues = "";
-					applicValues = string.Format("<APL DefaultVal={0}", parentValue);
-					int pcChildIdx = 0;
-					//C2022-001 only save the child ro value in the RO.FST if it is different than the parent (default) value
-
-					foreach (string c in pcChildern)
+					//string csufx = CvtUserFldToFld(c);
+					pcChildIdx++;
+					string csufx = string.Format("_PCCHILD{0}", pcChildIdx);
+					//applicValues += ",";
+					XmlNode cn = elmnode.SelectSingleNode(parentName + csufx);
+					if (cn == null || cn.InnerText.Length == 0) // B2024-004 use Parent value if Child text length is zero
+						applicValues += string.Format(",UnitIdx={0} Value={1}", pcChildIdx, parentValue); // use parent value as default
+					else
 					{
-						//string csufx = CvtUserFldToFld(c);
-						pcChildIdx++;
-						string csufx = string.Format("_PCCHILD{0}", pcChildIdx);
-						//applicValues += ",";
-						XmlNode cn = elmnode.SelectSingleNode(parentName + csufx);
-						if (cn == null || cn.InnerText.Length == 0) // B2024-004 use Parent value if Child text length is zero
-							applicValues += string.Format(",UnitIdx={0} Value={1}", pcChildIdx, parentValue); // use parent value as default
-						else
-						{
-							if (parentValue != cn.InnerText)
-								applicValues += string.Format(",UnitIdx={0} Value={1}", pcChildIdx, cn.InnerText);
-						}
+						if (parentValue != cn.InnerText)
+							applicValues += string.Format(",UnitIdx={0} Value={1}", pcChildIdx, cn.InnerText);
 					}
 				}
 				applicValues += " /APL>";

PROMS/ReferencedObjects/LibSource/ROFST/ROFST.csproj

@@ -62,7 +62,6 @@
     <DebugType>full</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <OutputPath>bin\Release\</OutputPath>
@@ -87,7 +86,6 @@
     <DebugType>none</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -95,7 +93,7 @@
     <DefineConstants>DEBUG;TRACE;Upgrade2005;</DefineConstants>
     <BaseAddress>285212672</BaseAddress>
     <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -106,7 +104,7 @@
     <Optimize>true</Optimize>
     <DebugType>
     </DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>

PROMS/ReferencedObjects/LibSource/ROField/ROFields.csproj

@@ -62,7 +62,6 @@
     <DebugType>full</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <OutputPath>bin\Release\</OutputPath>
@@ -87,7 +86,6 @@
     <DebugType>none</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -95,7 +93,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <BaseAddress>285212672</BaseAddress>
     <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -106,7 +104,7 @@
     <Optimize>true</Optimize>
     <DebugType>
     </DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>

PROMS/ReferencedObjects/LibSource/Utils/Utils.csproj

@@ -77,7 +77,6 @@
     <DebugType>full</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <OutputPath>bin\Release\</OutputPath>
@@ -102,7 +101,6 @@
     <DebugType>none</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -110,7 +108,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <BaseAddress>285212672</BaseAddress>
     <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -121,7 +119,7 @@
     <Optimize>true</Optimize>
     <DebugType>
     </DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>

PROMS/ReferencedObjects/LibSource/VlnProfiler/VlnProfiler.csproj

@@ -7,7 +7,7 @@
     <Optimize>true</Optimize>
     <DebugType>
     </DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -73,7 +73,6 @@
     <DebugType>full</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <OutputPath>bin\Release\</OutputPath>
@@ -98,7 +97,6 @@
     <DebugType>none</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -106,7 +104,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <BaseAddress>285212672</BaseAddress>
     <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>

PROMS/ReferencedObjects/LibSource/VlnStatus/VlnStatus.csproj

@@ -62,7 +62,6 @@
     <DebugType>full</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <OutputPath>bin\Release\</OutputPath>
@@ -87,7 +86,6 @@
     <DebugType>none</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -95,7 +93,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <BaseAddress>285212672</BaseAddress>
     <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -106,7 +104,7 @@
     <Optimize>true</Optimize>
     <DebugType>
     </DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>

PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ZoomDialog.cs

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

PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEdit.cs

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

PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEditLib.csproj

@@ -62,7 +62,6 @@
     <DebugType>full</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <OutputPath>bin\Release\</OutputPath>
@@ -87,7 +86,6 @@
     <DebugType>none</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -95,7 +93,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <BaseAddress>285212672</BaseAddress>
     <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -106,7 +104,7 @@
     <Optimize>true</Optimize>
     <DebugType>
     </DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -126,9 +124,6 @@
     <Reference Include="System.Xml">
       <Name>System.XML</Name>
     </Reference>
-    <Reference Include="Volian.Base.Library">
-      <HintPath>..\..\..\Volian.Base.Library\bin\Debug\Volian.Base.Library.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs">
@@ -140,12 +135,6 @@
     <Compile Include="ImageDialog.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="roRichTextBox.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="roRichTextBox.Designer.cs">
-      <DependentUpon>roRichTextBox.cs</DependentUpon>
-    </Compile>
     <Compile Include="ZoomDialog.cs">
       <SubType>Form</SubType>
     </Compile>

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

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

PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/roRichTextBox.cs

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

PROMS/RoAccessToSql/RoAccessToSql.cs

@@ -229,7 +229,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.Jet.OLEDB.4.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

PROMS/RoAccessToSql/RoAccessToSql.csproj

@@ -22,7 +22,7 @@
     </SccProvider>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
@@ -30,17 +30,15 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL">
@@ -100,17 +98,6 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <COMReference Include="Microsoft.Office.Interop.Access.Dao">
-      <Guid>{4AC9E1DA-5BAD-4AC7-86E3-24F4CDCECA28}</Guid>
-      <VersionMajor>12</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>primary</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </COMReference>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

PROMS/SQL/ClientSpecific/BNPP_CoverPageConsolidation.sql

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

PROMS/SQL/ClientSpecific/BNPP_CoverPageConsolidation_Test.sql

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

PROMS/TablePicker/TablePicker.csproj

@@ -60,7 +60,6 @@
     <DebugType>full</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <OutputPath>bin\Release\</OutputPath>
@@ -85,7 +84,6 @@
     <DebugType>none</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_PreRegistered|AnyCPU' ">
     <OutputPath>bin\Release\</OutputPath>
@@ -110,7 +108,6 @@
     <DebugType>none</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
@@ -119,7 +116,7 @@
     <BaseAddress>285212672</BaseAddress>
     <FileAlignment>4096</FileAlignment>
     <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>
@@ -130,7 +127,7 @@
     <BaseAddress>285212672</BaseAddress>
     <Optimize>true</Optimize>
     <FileAlignment>4096</FileAlignment>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>
@@ -141,7 +138,7 @@
     <BaseAddress>285212672</BaseAddress>
     <Optimize>true</Optimize>
     <FileAlignment>4096</FileAlignment>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>

PROMS/VEPROMS User Interface/App.config

@@ -199,4 +199,4 @@
       </providers>
     </roleManager>
   </system.web>
-</configuration>
+</configuration>

PROMS/VEPROMS User Interface/DlgAnnotationsSelect.cs

@@ -1,203 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using VEPROMS.CSLA.Library;
-
-namespace VEPROMS
-{
-    // C2025-027 Annotation Type Filtering
-    public partial class dlgAnnotationsSelect : Form
-    {
-        public dlgAnnotationsSelect()
-        {
-            InitializeComponent();
-        }
-
-        public dlgAnnotationsSelect(string userid)
-        {
-            InitializeComponent();
-            UserID = userid;
-        }
-
-        private int _MyItemID;
-        public int MyItemID
-        {
-            get { return _MyItemID; }
-            set { _MyItemID = value; }
-        }
-
-        private string _UserID;
-        public string UserID
-        {
-            get { return _UserID; }
-            set { _UserID = value; }
-        }
-
-        private void btnSelect_Click(object sender, EventArgs e)
-        {
-            MoveSelectedItems(lstUnselected, lstSelected);
-        }
-
-        // Move selected items to lstUnselected.
-        private void btnDeselect_Click(object sender, EventArgs e)
-        {
-            MoveSelectedItems(lstSelected, lstUnselected);
-        }
-
-        // Move selected items from one ListBox to another.
-        private void MoveSelectedItems(ListBox lstFrom, ListBox lstTo)
-        {
-            while (lstFrom.SelectedItems.Count > 0)
-            {
-                lstSelected.DisplayMember = "NameStr";
-                lstSelected.ValueMember = "TypeID";
-
-                AnnotataionItem item = (AnnotataionItem)lstFrom.SelectedItems[0];
-                lstTo.Items.Add(new AnnotataionItem(item.NameStr, item.TypeID));
-                lstFrom.Items.Remove(item);
-            }
-            SetButtonsEditable();
-            btnUpdate.Enabled = true;
-        }
-
-        // Move all items to lstSelected.
-        private void btnSelectAll_Click(object sender, EventArgs e)
-        {
-            MoveAllItems(lstUnselected, lstSelected);
-            btnUpdate.Enabled = true;
-        }
-
-        // Move all items to lstUnselected.
-        private void btnDeselectAll_Click(object sender, EventArgs e)
-        {
-            MoveAllItems(lstSelected, lstUnselected);
-            btnUpdate.Enabled = true;
-        }
-
-        // Move all items from one ListBox to another.
-        private void MoveAllItems(ListBox lstFrom, ListBox lstTo)
-        {
-            lstTo.Items.AddRange(lstFrom.Items);
-            lstFrom.Items.Clear();
-            SetButtonsEditable();
-            btnUpdate.Enabled = true;
-        }
-
-        // Enable and disable buttons.
-        private void lst_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            SetButtonsEditable();
-        }
-        // Save selected list to DB.
-        private void btnUpdate_Click(object sender, EventArgs e)
-        {
-            saveChanges();
-        }
-        public class AnnotataionItem
-        {
-            private string _NameStr;
-            private int _TypeID;
-
-            public AnnotataionItem(string NameStr, int TypeID)
-            {
-                this._NameStr = NameStr;
-                this._TypeID = TypeID;
-            }
-            public string NameStr
-            {
-                get
-                {
-                    return _NameStr;
-                }
-            }
-            public int TypeID
-            {
-                get
-                {
-                    return _TypeID;
-                }
-            }
-        }
-
-        // Enable and disable buttons.
-        private void SetButtonsEditable()
-        {
-            btnSelect.Enabled = (lstUnselected.SelectedItems.Count > 0);
-            btnSelectAll.Enabled = (lstUnselected.Items.Count > 0);
-            btnDeselect.Enabled = (lstSelected.SelectedItems.Count > 0);
-            btnDeselectAll.Enabled = (lstSelected.Items.Count > 0);
-        }
-
-        private void DlgAnnotationsSelect_Load(object sender, EventArgs e)
-        {
-            lstUnselected.DisplayMember = "NameStr";
-            lstUnselected.ValueMember = "TypeID";
-            SetButtonsEditable();
-            DataTable AnnoType = AnnotationstypeSelections.GetAnnoTypes(UserID);
-            foreach (DataRow dr in AnnoType.Rows)
-            {
-                lstUnselected.Items.Add(new AnnotataionItem(dr["Name"].ToString(), (int)dr["TypeID"]));
-            }
-
-            lstSelected.DisplayMember = "NameStr";
-            lstSelected.ValueMember = "TypeID";
-            DataTable lstSelectedTbl = VEPROMS.CSLA.Library.AnnotationstypeSelections.Retrieve(UserID);
-
-            foreach (DataRow lstSelectedRow in lstSelectedTbl.Rows)
-            {
-                lstSelected.Items.Add(new AnnotataionItem(lstSelectedRow["Name"].ToString(), (int)lstSelectedRow["TypeID"]));
-            }
-            btnUpdate.Enabled = false;
-        }
-
-        private void btnCancel_Click_1(object sender, EventArgs e)
-        {
-            if (btnUpdate.Enabled == true)
-            {
-                string message = "Changes have not yet been saved.  Do you want to save the changes prior to closing?";
-                string title = "Save Annotation Selections";
-                MessageBoxButtons buttons = MessageBoxButtons.YesNo;
-                DialogResult result = MessageBox.Show(message, title, buttons);
-                if (result == DialogResult.Yes)
-                {
-                    saveChanges();
-                    this.Close();
-                }
-                else
-                {
-                    this.Close();
-                }
-            }
-            else
-            {
-                this.Close();
-            }
-        }
-
-        private DataTable coverToTable()
-        {
-            DataTable dt = new DataTable();
-            dt.Columns.Add("TypeID", typeof(Int32));
-
-
-            foreach (AnnotataionItem item in lstSelected.Items.OfType<AnnotataionItem>())
-            {
-                dt.Rows.Add(item.TypeID);
-            }
-            return dt;
-        }
-        private void saveChanges()
-        {
-            DataTable dt2 = coverToTable();
-            VEPROMS.CSLA.Library.AnnotationstypeSelections.Update(dt2, UserID);
-            btnUpdate.Enabled = false;
-        }
-    }
-}
-

PROMS/VEPROMS User Interface/DlgPrintProcedure.cs

@@ -66,12 +66,6 @@ namespace VEPROMS
 			set { _prtSectID = value; }
 		}
 
-		private bool _OverwritePDF;
-		public bool OverwritePDF
-		{
-			get { return cbxOverwritePDF2.Checked; }
-			set { cbxOverwritePDF2.Checked = value; }
-		}
 
 		// C2018-033 Used to turn off using the date/time PDF file prefix and suffix when doing batch file autmatic baseline print testing (frmVEPROMS.cs RunAutomatic())
 		//           This is needed so the the automatic baselines can compare results from different runs of PROMS
@@ -399,7 +393,6 @@ namespace VEPROMS
 		{
 			SetupForProcedure();
 			_MyTimer = new Timer();
-			_MyTimer.Tick -= new EventHandler(_MyTimer_Tick);
 			_MyTimer.Tick += new EventHandler(_MyTimer_Tick);
 			_MyTimer.Interval = 100;
 			_MyTimer.Enabled = true;
@@ -1099,9 +1092,7 @@ namespace VEPROMS
 					(int)changeBarData.FixedChangeColumn :
 					System.Convert.ToInt32(changeBarData.DefaultCBLoc.Split(" ,".ToCharArray())[System.Convert.ToInt32(cbd.MyChangeBarLoc)]);
 				//cbd.MyChangeBarColumn = (int)changeBarData.FixedChangeColumn;
-				if (cbd.MyChangeBarText == PrintChangeBarText.UserDef && !string.IsNullOrEmpty(ppTxbxChangeBarUserMsgOne.Text))
-					cbd.MyChangeBarMessage = ppTxbxChangeBarUserMsgOne.Text + @"\n" + ppTxbxChangeBarUserMsgTwo.Text;
-				else if (cbd.MyChangeBarText == PrintChangeBarText.UserDef)
+				if (cbd.MyChangeBarText == PrintChangeBarText.UserDef)
 					cbd.MyChangeBarMessage = _DocVersionConfig.Print_UserCBMess1 + @"\n" + _DocVersionConfig.Print_UserCBMess2;
 
 			}

PROMS/VEPROMS User Interface/Properties/Resources.Designer.cs

@@ -250,16 +250,6 @@ namespace VEPROMS.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap toolbox {
-            get {
-                object obj = ResourceManager.GetObject("toolbox", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>

PROMS/VEPROMS User Interface/Properties/Settings.Designer.cs

@@ -410,5 +410,17 @@ namespace VEPROMS.Properties {
                 this["VisioPath"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("0")]
+        public int UCFImportOpt {
+            get {
+                return ((int)(this["UCFImportOpt"]));
+            }
+            set {
+                this["UCFImportOpt"] = value;
+            }
+        }
     }
 }

PROMS/VEPROMS User Interface/Properties/Settings.settings

@@ -80,9 +80,11 @@
     <Setting Name="UpdateSettings" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
+
     <Setting Name="cbShwRplWrdsColor" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
+    
     <Setting Name="PasteNoReturns" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
@@ -101,5 +103,8 @@
     <Setting Name="VisioPath" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
+    <Setting Name="UCFImportOpt" Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">0</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

PROMS/VEPROMS User Interface/VEPROMS_UI.csproj

@@ -50,7 +50,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -61,14 +61,13 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Demo|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\Demo\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -77,7 +76,7 @@
     <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -86,7 +85,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -95,7 +94,7 @@
     <OutputPath>bin\Demo\</OutputPath>
     <DefineConstants>TRACE;DEMO</DefineConstants>
     <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -112,6 +111,10 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\3rdPartyLibraries\DotNetBar\DotNetBar4.6Build\DevComponents.DotNetBar2.dll</HintPath>
     </Reference>
+    <Reference Include="Ionic.Zip, Version=1.9.1.8, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\3rdPartyLibraries\Ionic\Ionic.Zip.dll</HintPath>
+    </Reference>
     <Reference Include="Itenso.Rtf.Interpreter">
       <HintPath>..\..\..\..\3rdPartyLibraries\RtfConverter\bin\Debug\Itenso.Rtf.Interpreter.dll</HintPath>
     </Reference>
@@ -122,10 +125,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\3rdPartyLibraries\Log4Net\log4net.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Microsoft.Office.Interop.Excel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.configuration" />
     <Reference Include="System.Data">
@@ -134,8 +133,6 @@
     <Reference Include="System.Deployment" />
     <Reference Include="System.Design" />
     <Reference Include="System.Drawing" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.IO.Compression.FileSystem" />
     <Reference Include="System.Runtime.Remoting" />
     <Reference Include="System.Web" />
     <Reference Include="System.Web.Extensions" />
@@ -155,17 +152,6 @@
       <DependentUpon>AboutVEPROMS.cs</DependentUpon>
     </Compile>
     <Compile Include="BookMarks.cs" />
-    <Compile Include="dlgAnnotationsSelect.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="dlgAnnotationsSelect.Designer.cs">
-      <DependentUpon>dlgAnnotationsSelect.cs</DependentUpon>
-    </Compile>
-    <Compile Include="dlgAnnotationsSelect.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>dlgAnnotationsSelect.resx</DependentUpon>
-    </Compile>
     <Compile Include="dlgApproveProcedure.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -178,9 +164,6 @@
     <Compile Include="dlgCheckedOutProcedure.designer.cs">
       <DependentUpon>dlgCheckedOutProcedure.cs</DependentUpon>
     </Compile>
-    <Compile Include="dlgExportImportEP.cs">
-      <SubType>Form</SubType>
-    </Compile>
     <Compile Include="dlgMSWordMessage.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -229,12 +212,6 @@
     <Compile Include="dlgPickROFolder.designer.cs">
       <DependentUpon>dlgPickROFolder.cs</DependentUpon>
     </Compile>
-    <Compile Include="dlgPrintAllApprovedProcedures.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="dlgPrintAllApprovedProcedures.Designer.cs">
-      <DependentUpon>dlgPrintAllApprovedProcedures.cs</DependentUpon>
-    </Compile>
     <Compile Include="DlgPrintProcedure.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -253,6 +230,12 @@
     <Compile Include="dlgTransitionReport.designer.cs">
       <DependentUpon>dlgTransitionReport.cs</DependentUpon>
     </Compile>
+    <Compile Include="dlgUCFDetail.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="dlgUCFDetail.Designer.cs">
+      <DependentUpon>dlgUCFDetail.cs</DependentUpon>
+    </Compile>
     <Compile Include="frmAnnotationsCleanup.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -271,12 +254,6 @@
     <Compile Include="frmBatchRefreshCheckedOut.designer.cs">
       <DependentUpon>frmBatchRefreshCheckedOut.cs</DependentUpon>
     </Compile>
-    <Compile Include="frmGenTools.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="frmGenTools.designer.cs">
-      <DependentUpon>frmGenTools.cs</DependentUpon>
-    </Compile>
     <Compile Include="frmManageUser.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -307,6 +284,12 @@
     <Compile Include="frmSI.Designer.cs">
       <DependentUpon>frmSI.cs</DependentUpon>
     </Compile>
+    <Compile Include="frmUCF.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frmUCF.designer.cs">
+      <DependentUpon>frmUCF.cs</DependentUpon>
+    </Compile>
     <Compile Include="frmVEPROMS.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -354,10 +337,6 @@
       <SubType>Designer</SubType>
       <DependentUpon>AboutVEPROMS.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="dlgAnnotationsSelect.resx">
-      <DependentUpon>dlgAnnotationsSelect.cs</DependentUpon>
-      <Generator>ResXFileCodeGenerator</Generator>
-    </EmbeddedResource>
     <EmbeddedResource Include="dlgMSWordMessage.resx">
       <DependentUpon>dlgMSWordMessage.cs</DependentUpon>
     </EmbeddedResource>
@@ -370,9 +349,6 @@
     <EmbeddedResource Include="dlgImpHowToHandleROs.resx">
       <DependentUpon>dlgImpHowToHandleROs.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="dlgPrintAllApprovedProcedures.resx">
-      <DependentUpon>dlgPrintAllApprovedProcedures.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="DlgPrintProcedure.resx">
       <DependentUpon>DlgPrintProcedure.cs</DependentUpon>
       <SubType>Designer</SubType>
@@ -380,12 +356,12 @@
     <EmbeddedResource Include="dlgSetChangeBarStartDate.resx">
       <DependentUpon>dlgSetChangeBarStartDate.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="dlgUCFDetail.resx">
+      <DependentUpon>dlgUCFDetail.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="frmAnnotationsCleanup.resx">
       <DependentUpon>frmAnnotationsCleanup.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="frmGenTools.resx">
-      <DependentUpon>frmGenTools.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="frmPDFStatusForm.resx">
       <DependentUpon>frmPDFStatusForm.cs</DependentUpon>
       <SubType>Designer</SubType>
@@ -401,6 +377,9 @@
     <EmbeddedResource Include="frmSI.resx">
       <DependentUpon>frmSI.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="frmUCF.resx">
+      <DependentUpon>frmUCF.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="frmVEPROMS.resx">
       <SubType>Designer</SubType>
       <DependentUpon>frmVEPROMS.cs</DependentUpon>
@@ -508,7 +487,6 @@
     <Content Include="PROMSRollback %28v2.0%29.Sql">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Resources\toolbox.png" />
     <Content Include="ROBuild.Sql">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -599,6 +577,8 @@
     <Content Include="Resources\Save.png" />
     <Content Include="Resources\SaveAllHS.png" />
     <Content Include="Resources\SaveAs.png" />
+    <Content Include="UCFDetails.xsl" />
+    <Content Include="UCFSummary.xsl" />
     <Content Include="VEicon.ico" />
     <Content Include="veproms.ico" />
     <Content Include="Vicon.ico" />

PROMS/VEPROMS User Interface/dlgAnnotationsSelect.Designer.cs

@@ -1,229 +0,0 @@
-
-namespace VEPROMS
-{
-	partial class dlgAnnotationsSelect
-	{
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-			{
-				components.Dispose();
-			}
-			base.Dispose(disposing);
-		}
-
-		#region Windows Form Designer generated code
-
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			this.lstUnselected = new System.Windows.Forms.ListBox();
-			this.lstSelected = new System.Windows.Forms.ListBox();
-			this.btnSelect = new System.Windows.Forms.Button();
-			this.btnSelectAll = new System.Windows.Forms.Button();
-			this.btnDeselectAll = new System.Windows.Forms.Button();
-			this.btnDeselect = new System.Windows.Forms.Button();
-			this.btnUpdate = new System.Windows.Forms.Button();
-			this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
-			this.btnCancel = new System.Windows.Forms.Button();
-			this.lblMessage = new System.Windows.Forms.Label();
-			this.lblAvailableTypes = new System.Windows.Forms.Label();
-			this.lblSelected = new System.Windows.Forms.Label();
-			this.tableLayoutPanel1.SuspendLayout();
-			this.SuspendLayout();
-			// 
-			// lstUnselected
-			// 
-			this.lstUnselected.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.lstUnselected.FormattingEnabled = true;
-			this.lstUnselected.IntegralHeight = false;
-			this.lstUnselected.ItemHeight = 16;
-			this.lstUnselected.Location = new System.Drawing.Point(3, 3);
-			this.lstUnselected.Name = "lstUnselected";
-			this.tableLayoutPanel1.SetRowSpan(this.lstUnselected, 4);
-			this.lstUnselected.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended;
-			this.lstUnselected.Size = new System.Drawing.Size(287, 347);
-			this.lstUnselected.TabIndex = 0;
-			this.lstUnselected.SelectedIndexChanged += new System.EventHandler(this.lst_SelectedIndexChanged);
-			// 
-			// lstSelected
-			// 
-			this.lstSelected.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.lstSelected.FormattingEnabled = true;
-			this.lstSelected.IntegralHeight = false;
-			this.lstSelected.ItemHeight = 16;
-			this.lstSelected.Location = new System.Drawing.Point(334, 3);
-			this.lstSelected.Name = "lstSelected";
-			this.tableLayoutPanel1.SetRowSpan(this.lstSelected, 4);
-			this.lstSelected.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended;
-			this.lstSelected.Size = new System.Drawing.Size(288, 347);
-			this.lstSelected.TabIndex = 1;
-			this.lstSelected.SelectedIndexChanged += new System.EventHandler(this.lst_SelectedIndexChanged);
-			// 
-			// btnSelect
-			// 
-			this.btnSelect.Anchor = System.Windows.Forms.AnchorStyles.None;
-			this.btnSelect.Location = new System.Drawing.Point(298, 32);
-			this.btnSelect.Name = "btnSelect";
-			this.btnSelect.Size = new System.Drawing.Size(28, 23);
-			this.btnSelect.TabIndex = 2;
-			this.btnSelect.Text = ">";
-			this.btnSelect.UseVisualStyleBackColor = true;
-			this.btnSelect.Click += new System.EventHandler(this.btnSelect_Click);
-			// 
-			// btnSelectAll
-			// 
-			this.btnSelectAll.Anchor = System.Windows.Forms.AnchorStyles.None;
-			this.btnSelectAll.Location = new System.Drawing.Point(296, 120);
-			this.btnSelectAll.Name = "btnSelectAll";
-			this.btnSelectAll.Size = new System.Drawing.Size(32, 23);
-			this.btnSelectAll.TabIndex = 3;
-			this.btnSelectAll.Text = ">>";
-			this.btnSelectAll.UseVisualStyleBackColor = true;
-			this.btnSelectAll.Click += new System.EventHandler(this.btnSelectAll_Click);
-			// 
-			// btnDeselectAll
-			// 
-			this.btnDeselectAll.Anchor = System.Windows.Forms.AnchorStyles.None;
-			this.btnDeselectAll.Location = new System.Drawing.Point(297, 207);
-			this.btnDeselectAll.Name = "btnDeselectAll";
-			this.btnDeselectAll.Size = new System.Drawing.Size(30, 26);
-			this.btnDeselectAll.TabIndex = 5;
-			this.btnDeselectAll.Text = "<<";
-			this.btnDeselectAll.UseVisualStyleBackColor = true;
-			this.btnDeselectAll.Click += new System.EventHandler(this.btnDeselectAll_Click);
-			// 
-			// btnDeselect
-			// 
-			this.btnDeselect.Anchor = System.Windows.Forms.AnchorStyles.None;
-			this.btnDeselect.Location = new System.Drawing.Point(298, 297);
-			this.btnDeselect.Name = "btnDeselect";
-			this.btnDeselect.Size = new System.Drawing.Size(28, 23);
-			this.btnDeselect.TabIndex = 4;
-			this.btnDeselect.Text = "<";
-			this.btnDeselect.UseVisualStyleBackColor = true;
-			this.btnDeselect.Click += new System.EventHandler(this.btnDeselect_Click);
-			// 
-			// btnUpdate
-			// 
-			this.btnUpdate.Anchor = System.Windows.Forms.AnchorStyles.None;
-			this.btnUpdate.Location = new System.Drawing.Point(536, 422);
-			this.btnUpdate.Name = "btnUpdate";
-			this.btnUpdate.Size = new System.Drawing.Size(100, 35);
-			this.btnUpdate.TabIndex = 8;
-			this.btnUpdate.Text = "Save";
-			this.btnUpdate.UseVisualStyleBackColor = true;
-			this.btnUpdate.Click += new System.EventHandler(this.btnUpdate_Click);
-			// 
-			// tableLayoutPanel1
-			// 
-			this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-			this.tableLayoutPanel1.ColumnCount = 3;
-			this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
-			this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 38F));
-			this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
-			this.tableLayoutPanel1.Controls.Add(this.lstUnselected, 0, 0);
-			this.tableLayoutPanel1.Controls.Add(this.lstSelected, 2, 0);
-			this.tableLayoutPanel1.Controls.Add(this.btnDeselect, 1, 3);
-			this.tableLayoutPanel1.Controls.Add(this.btnDeselectAll, 1, 2);
-			this.tableLayoutPanel1.Controls.Add(this.btnSelect, 1, 0);
-			this.tableLayoutPanel1.Controls.Add(this.btnSelectAll, 1, 1);
-			this.tableLayoutPanel1.Location = new System.Drawing.Point(12, 62);
-			this.tableLayoutPanel1.Name = "tableLayoutPanel1";
-			this.tableLayoutPanel1.RowCount = 4;
-			this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F));
-			this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F));
-			this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F));
-			this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F));
-			this.tableLayoutPanel1.Size = new System.Drawing.Size(625, 353);
-			this.tableLayoutPanel1.TabIndex = 6;
-			// 
-			// btnCancel
-			// 
-			this.btnCancel.Location = new System.Drawing.Point(411, 422);
-			this.btnCancel.Name = "btnCancel";
-			this.btnCancel.Size = new System.Drawing.Size(100, 35);
-			this.btnCancel.TabIndex = 9;
-			this.btnCancel.Text = "Close";
-			this.btnCancel.UseVisualStyleBackColor = true;
-			this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click_1);
-			// 
-			// lblMessage
-			// 
-			this.lblMessage.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.lblMessage.Location = new System.Drawing.Point(43, 12);
-			this.lblMessage.Name = "lblMessage";
-			this.lblMessage.Size = new System.Drawing.Size(317, 16);
-			this.lblMessage.TabIndex = 10;
-			this.lblMessage.Text = "Updates will appear when PROMS is restarted.";
-			// 
-			// lblAvailableTypes
-			// 
-			this.lblAvailableTypes.AutoSize = true;
-			this.lblAvailableTypes.Location = new System.Drawing.Point(12, 43);
-			this.lblAvailableTypes.Name = "lblAvailableTypes";
-			this.lblAvailableTypes.Size = new System.Drawing.Size(110, 16);
-			this.lblAvailableTypes.TabIndex = 11;
-			this.lblAvailableTypes.Text = "Types Available ";
-			// 
-			// lblSelected
-			// 
-			this.lblSelected.AutoSize = true;
-			this.lblSelected.Location = new System.Drawing.Point(343, 43);
-			this.lblSelected.Name = "lblSelected";
-			this.lblSelected.Size = new System.Drawing.Size(104, 16);
-			this.lblSelected.TabIndex = 12;
-			this.lblSelected.Text = "Types Selected";
-			// 
-			// dlgAnnotationsSelect
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(653, 466);
-			this.Controls.Add(this.lblSelected);
-			this.Controls.Add(this.lblAvailableTypes);
-			this.Controls.Add(this.btnCancel);
-			this.Controls.Add(this.tableLayoutPanel1);
-			this.Controls.Add(this.btnUpdate);
-			this.Controls.Add(this.lblMessage);
-			this.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-			this.Name = "dlgAnnotationsSelect";
-			this.Text = "Filter Annotation Types";
-			this.Load += new System.EventHandler(this.DlgAnnotationsSelect_Load);
-			this.tableLayoutPanel1.ResumeLayout(false);
-			this.ResumeLayout(false);
-			this.PerformLayout();
-
-		}
-
-		#endregion
-		private System.Windows.Forms.ListBox lstUnselected;
-		private System.Windows.Forms.ListBox lstSelected;
-		private System.Windows.Forms.Button btnSelect;
-		private System.Windows.Forms.Button btnSelectAll;
-		private System.Windows.Forms.Button btnDeselectAll;
-		private System.Windows.Forms.Button btnDeselect;
-		private System.Windows.Forms.Button btnUpdate;
-
-		private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
-		private System.Windows.Forms.Button btnCancel;
-		private System.Windows.Forms.Label lblMessage;
-		private System.Windows.Forms.Label lblAvailableTypes;
-		private System.Windows.Forms.Label lblSelected;
-	}
-}

PROMS/VEPROMS User Interface/dlgApproveProcedure.cs

@@ -13,8 +13,6 @@ using System.Text.RegularExpressions;
 using System.Globalization;
 using DevComponents.DotNetBar;
 using JR.Utils.GUI.Forms;
-using Volian.Controls.Library;
-using System.Linq;
 
 namespace VEPROMS
 {
@@ -67,13 +65,11 @@ namespace VEPROMS
 			MyFrmVEPROMS = myFrmVEPROMS;// Save frmVEPROMS for Import to shutoff SessionPing
 			_MyApproval = new ApprovalInfo(myFrmVEPROMS);// Save frmVEPROMS for Import to shutoff SessionPing
 			ApplicabilityIndex = myDocVersion.DocVersionConfig.SelectedSlave;
-			this.ConsistencyPrintRequest -= new DisplayConsistencyReportEvent(dlgApproveProcedure_ConsistencyPrintRequest);
 			this.ConsistencyPrintRequest += new DisplayConsistencyReportEvent(dlgApproveProcedure_ConsistencyPrintRequest);
 			_MyDocVersion = myDocVersion;
 			_MyDocVersion.ResetProcedures();    // B2021-035: Pasted, modified number and deleted procedures not refreshed so missing from list
 			InitializeComponent();
 			FlexGridAddEvents();
-			_MyApproval.StatusUpdated -= new ApprovalStatusChangeEvent(_MyApproval_StatusUpdated);
 			_MyApproval.StatusUpdated += new ApprovalStatusChangeEvent(_MyApproval_StatusUpdated);
 			SetupComboBoxes();
 			foreach (ProcedureInfo pi in myDocVersion.Procedures)
@@ -105,7 +101,6 @@ namespace VEPROMS
 			//fgProcs.SetupEditor += new C1.Win.C1FlexGrid.RowColEventHandler(fgProcs_SetupEditor);
 			//fgProcs.StartEdit += new C1.Win.C1FlexGrid.RowColEventHandler(fgProcs_StartEdit);
 			//fgProcs.ValidateEdit += new C1.Win.C1FlexGrid.ValidateEditEventHandler(fgProcs_ValidateEdit);
-			fgProcs.ComboCloseUp -= new C1.Win.C1FlexGrid.RowColEventHandler(fgProcs_ComboCloseUp);
 			fgProcs.ComboCloseUp += new C1.Win.C1FlexGrid.RowColEventHandler(fgProcs_ComboCloseUp);
 			//fgProcs.MouseDown += new MouseEventHandler(fgProcs_MouseDown);
 			//fgProcs.MouseUp += new MouseEventHandler(fgProcs_MouseUp); 
@@ -280,7 +275,6 @@ namespace VEPROMS
 		{
 			MyFrmVEPROMS = myFrmVEPROMS;// Save frmVEPROMS for Import to shutoff SessionPing
 			_MyApproval = new ApprovalInfo(myFrmVEPROMS);// Save frmVEPROMS for Import to shutoff SessionPing
-			this.ConsistencyPrintRequest -= new DisplayConsistencyReportEvent(dlgApproveProcedure_ConsistencyPrintRequest);
 			this.ConsistencyPrintRequest += new DisplayConsistencyReportEvent(dlgApproveProcedure_ConsistencyPrintRequest);
 			_MyDocVersion = myDocVersion;
 			_MyDocVersion.ResetProcedures();    // B2021-035: Pasted, modified number and deleted procedures not refreshed so missing from list
@@ -301,7 +295,6 @@ namespace VEPROMS
 		{
 			MyFrmVEPROMS = myFrmVEPROMS;// Save frmVEPROMS for Import to shutoff SessionPing
 			_MyApproval = new ApprovalInfo(myFrmVEPROMS);// Save frmVEPROMS for Import to shutoff SessionPing
-			this.ConsistencyPrintRequest -= new DisplayConsistencyReportEvent(dlgApproveProcedure_ConsistencyPrintRequest);
 			this.ConsistencyPrintRequest += new DisplayConsistencyReportEvent(dlgApproveProcedure_ConsistencyPrintRequest);
 			_MyDocVersion = myProcedure.MyDocVersion;
 			_MyDocVersion.ResetProcedures();    // B2021-035: Pasted, modified number and deleted procedures not refreshed so missing from list
@@ -457,7 +450,6 @@ namespace VEPROMS
 			int checkedCount = clbMore.CheckedItems.Count;
 			string oldLabel = lblMore.Text;
 			pbMore.Visible = true;
-			ItemInfoList.ConsistencyCheckUpdated -= new ItemInfoListCCEvent(ItemInfoList_ConsistencyCheckUpdated);
 			ItemInfoList.ConsistencyCheckUpdated += new ItemInfoListCCEvent(ItemInfoList_ConsistencyCheckUpdated);
 			List<ProcedureInfo> myProcs = new List<ProcedureInfo>();
 			// B2018-136 use the list of procedures that have checkboxes and are checked (right panel) instead of the list to be approved (left panel)
@@ -1135,7 +1127,6 @@ namespace VEPROMS
 			ViewPDF = ViewPDF && MyProcedures.Count == 1;
 			StringBuilder sb = new StringBuilder();
 			StageInfo nsi = StageInfo.GetJustStage(RevStage);
-			DateTime now = DateTime.Now; //using variable so dates are consistent
 			foreach (ApprovalProcedure ap in MyProcedures) //spin thru looking for updating current revision
 			{
 				// ric: current revision info record, not new one being created.
@@ -1208,7 +1199,7 @@ namespace VEPROMS
 						cfg.History_StartDate = myDTS;	// if there is a slave, date found from above code
 						cfg.Applicability_Index = ap.ProcInfo.MyDocVersion.DocVersionConfig.SelectedSlave;
 						//cfg.Save();
-						revision = Revision.MakeRevision(pi.ItemID, RevType, ap.RevNumber, ap.RevDate, RevNote, cfg.ToString(), now, Volian.Base.Library.VlnSettings.UserID);
+						revision = Revision.MakeRevision(pi.ItemID, RevType, ap.RevNumber, ap.RevDate, RevNote, cfg.ToString(), DateTime.Now, Volian.Base.Library.VlnSettings.UserID);
 						//					revision.MyConfig.History_StartDate = pi.DTS;
 						//					revision.MyConfig.Save();
 						//					revision = revision.Save();
@@ -1235,7 +1226,7 @@ namespace VEPROMS
 						RevisionConfig cfg = new RevisionConfig();
 						cfg.History_StartDate = pi.DTS;		// todo: this should probably be myDTS, found during fix of B2019-051.
 						//cfg.Save();
-						revision = Revision.MakeRevision(pi.ItemID, RevType, ap.RevNumber, ap.RevDate, RevNote, cfg.ToString(), now, Volian.Base.Library.VlnSettings.UserID);
+						revision = Revision.MakeRevision(pi.ItemID, RevType, ap.RevNumber, ap.RevDate, RevNote, cfg.ToString(), DateTime.Now, Volian.Base.Library.VlnSettings.UserID);
 						//					revision.MyConfig.History_StartDate = pi.DTS;
 						//					revision.MyConfig.Save();
 						//					revision = revision.Save();
@@ -1254,7 +1245,7 @@ namespace VEPROMS
 				byte[] summaryBuf = null;
 				//B2017-149 Allow the user to choose if they want the Summary of Changes report created during the approval process
 				if (doSumChg) summaryBuf = CreateSummary(ref pi, summaryPDF, myDTS);
-				DateTime currentDTS = now;
+				DateTime currentDTS = DateTime.Now;
 				Check check = Check.MakeCheck(revision, Stage.GetJustStage(RevStage), RevisionInfo.BuildRevisionChecks(pi), currentDTS, VlnSettings.UserID);
 				//make pdf with promsprinter and get byte stream
 				// Moved to end so that Item and Content are saved at the same time
@@ -1312,15 +1303,7 @@ namespace VEPROMS
 				pi.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
 				if (si.IsApproved == 1)
 				{
-
-                    //B2026-016 - Fix error pulling Reference Object info into Export
-                    if (pi.MyDocVersion.DocVersionAssociationCount == 0)
-                    {
-                        MessageBox.Show("Prior to Approval you must set the Referenced Object Database", "No RO Database set", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
-                        return false;
-                    }
-
-                    dlgExportImport dlg = new dlgExportImport("Export", pi, MyFrmVEPROMS, (selectedSlave)); // "true tell export to convert ROs and Transitions to text
+					dlgExportImport dlg = new dlgExportImport("Export", pi, MyFrmVEPROMS, (E_UCFImportOptions)0); // "true tell export to convert ROs and Transitions to text
 					dlg.DocReplace = frm.DocReplace;  // this tells approval to prepare an export file with resolved transitions and ROs, word sections are saved with resolved ROs during approval PDF creation and saved in DocReplace
 					System.Xml.XmlDocument xd = new System.Xml.XmlDocument();
 					dlg.ExportItem(xd, pi, "procedure");
@@ -1328,46 +1311,10 @@ namespace VEPROMS
 					version.ApprovedXML = xd.OuterXml;
 					version.Save();
 					dlg.Dispose();
-					UpdateProcedureConfig(pi, ap.RevNumber, ap.RevDate, now, selectedSlave);
+					UpdateProcedureConfig(pi, ap.RevNumber, ap.RevDate, DateTime.Now, selectedSlave);
 
-                    //CSM - C2026-010 - Add Audit Record for Change Bar Audit History
-                    ChangeBarAuditHistory.AddAudit(pi.ItemID, $"{(selectedSlave > 0 ? $"(Unit {pi.MyDocVersion.UnitNames[selectedSlave - 1]}) " : "")}Approved by ({VlnSettings.UserID}) on ({now})", now, VlnSettings.UserID, selectedSlave);
-
-                    // Clear the change bar override for this procedure:
-                    pi.ClearChangeBarOverrides();
-
-					//B2019-140 Change bars do not get refreshed when approval is run.
-					ProcedureInfo newproc;
-
-                    //// Refresh the StepPanel for the current Procedure
-                    //// so change bars update
-                    //// on any open StepPanel
-
-                    //B2026-019 Attempt to prevent an Access Error by utilizing a different Refresh if a Procedure is Open
-                    DisplayTabItem dti = MyFrmVEPROMS.GetTabContainingProcedure(pi.ItemID);
-					if (dti != null)
-					{
-						if (!dti.MyStepTabPanel.MyStepPanel.ContainsFocus)
-							dti.MyStepTabPanel.MyStepPanel.Focus();
-
-						foreach (EditItem eitm in dti.MyStepTabPanel.MyStepPanel.Controls.OfType<EditItem>())
-                        {
-                            eitm.ChangeBar = eitm.MyItemInfo.HasChangeBar;
-                        }
-
-                        dti.MyStepTabPanel.MyStepTabRibbon.RefreshProcedure();
-                        Application.DoEvents();
-                        newproc = ProcedureInfo.Get(pi.ItemID);
-
-                    }
-					else
-					{
-                        newproc = ItemInfo.ResetProcedure(pi.ItemID);
-                    }
-
-						//since in a separate form, need to update the tree view
-						//so "Showing Change Bars" Content Menu Item is correct
-						MyFrmVEPROMS.RefreshProcedureNode(newproc);
+					// Clear the change bar override for this procedure:
+					pi.ClearChangeBarOverrides();
 				}
 				else
 					UpdateProcedureConfig(pi, ap.RevNumber, ap.RevDate, myDTS, selectedSlave);
@@ -1478,15 +1425,11 @@ namespace VEPROMS
 		{
 			ProcedureConfig pc = procedureInfo.MyConfig as ProcedureConfig;
 			if (pc == null) return;
-
-            //C2026-015 set overall change bar date
-			pc.Print_ChangeBarDate = dts.ToString("MM/dd/yyyy HH:mm:ss");
-
-            pc.SelectedSlave = selectedSlave;
+			pc.SelectedSlave = selectedSlave;
 			pc.Print_Rev = revNumber;
 			//AppRevDate Change
 			pc.Print_RevDate = revDate.ToString("MM/dd/yyyy");
-			pc.Print_ChangeBarDate = dts.ToString("MM/dd/yyyy HH:mm:ss");  //this is needed to set the changebar date for an indeividual unit also
+			pc.Print_ChangeBarDate = dts.ToString("MM/dd/yyyy HH:mm:ss");
 			using (Item itm = Item.Get(procedureInfo.ItemID))
 			{
 				itm.MyContent.Config = pc.ToString();

PROMS/VEPROMS User Interface/dlgExportImportEP.cs

@@ -1,347 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Xml;
-using VEPROMS.CSLA.Library;
-
-namespace VEPROMS
-{
-    //C2025-024 Electronic Procedures - Phase 2 (PROMS XML output)
-    //class inherits from normal import/export form
-    //then adds additional functionality
-#pragma warning disable S101 // Types should be named in PascalCase
-    public partial class dlgExportImportEP : dlgExportImport
-#pragma warning restore S101 // Types should be named in PascalCase
-	{
-		private readonly AnnotationTypeInfo _AnnotationType;
-        private readonly string multiseparator = ",";
-
-		private static Regex _ROAccPageTokenPattern = new Regex("[<][^<>-]+-[^<>]+[>]");
-
-        public dlgExportImportEP(string mode, FolderInfo folderInfo, frmVEPROMS myFrmVEPROMS, int annotationTypeId, int unitIndex = 0) : base(mode, folderInfo, myFrmVEPROMS, ( unitIndex))
-        {
-            _AnnotationType = AnnotationTypeInfo.Get(annotationTypeId);
-            _ExportBothConvertedandNot = true;
-            DocReplace = new Dictionary<int, byte[]>();
-            FormClosed += OnClose;
-            Text = $"{mode} Electronic Procedure ({_AnnotationType.Name}) Dialog for {folderInfo.Name}";
-		}
-        public dlgExportImportEP(string mode, DocVersionInfo docVersionInfo, frmVEPROMS myFrmVEPROMS, int annotationTypeId, int unitIndex = 0) : base(mode, docVersionInfo, myFrmVEPROMS, (unitIndex))
-        {
-            _AnnotationType = AnnotationTypeInfo.Get(annotationTypeId);
-            _ExportBothConvertedandNot = true;
-            DocReplace = new Dictionary<int, byte[]>();
-            FormClosed += OnClose;
-            Text = $"{mode} Electronic Procedure ({_AnnotationType.Name}) Dialog for {docVersionInfo.Name} of {docVersionInfo.MyFolder.Name}";
-		}
-        public dlgExportImportEP(string mode, ProcedureInfo procedureInfo, frmVEPROMS myFrmVEPROMS, int annotationTypeId, int unitIndex = 0) : base(mode, procedureInfo, myFrmVEPROMS, (unitIndex))
-		{
-			_AnnotationType = AnnotationTypeInfo.Get(annotationTypeId);
-			_ExportBothConvertedandNot = true;
-			DocReplace = new Dictionary<int, byte[]>();
-			FormClosed += OnClose;
-			Text = $"{mode} Electronic Procedure ({_AnnotationType.Name}) Dialog for {procedureInfo.DisplayNumber}";
-		}
-
-		//Overridden function to handle export of EP data
-		protected override void ExportEPAnnotationInfo(XmlElement xe, ItemInfo ii)
-		{
-			if (_UnitIndex > 0)
-            {
-				ii.MyDocVersion.DocVersionConfig.SelectedSlave = _UnitIndex;
-				ii.MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave = _UnitIndex;
-            }
-
-            //switch to handle customizations for different formats
-            switch (ii.ActiveFormat.PlantFormat.EPFormatFiles.Find(x => x.AnnotationTypeID == _AnnotationType.TypeID)?.Name)
-			{
-				default:
-					ExportEPAnnotationInfo_Default(xe, ii);
-					break;
-			}
-
-			ii.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
-			ii.MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
-
-		}
-
-		//default export of EP Data
-		private void ExportEPAnnotationInfo_Default(XmlElement xe, ItemInfo ii)
-		{
-			//Add tab text to item
-			string steptab = Volian.Print.Library.PDFReport.BuildStepTab(ii);
-			xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "StepTab", steptab));
-
-			//Add db sequence to item
-			string dbsequence = dbSeq(ii);
-			xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "dbsequence", dbsequence));
-
-			//get first transition in item and add it as an xml element
-			if (ii.MyContent.ContentTransitionCount > 0)
-			{
-				TransitionInfo ct = ii.MyContent.ContentTransitions[0];
-				xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "TransitionToItemID", ct.ToID.ToString()));
-				xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "TransitionTodbsequence", dbSeq(ct.ToID)));
-			}
-
-			//export EP annotation details under an EPInfo node
-			if (ii.ItemAnnotations != null)
-			{
-				XmlElement xepinfo = xe.OwnerDocument.CreateElement("EPInfo");
-
-				EPFields myEPFields = ii.GetValidEPFields(_AnnotationType.TypeID);
-				ROFSTLookup lookup = ii.MyDocVersion.DocVersionAssociations[0].MyROFst.GetROFSTLookup(ii.MyDocVersion);
-				bool epexportblank = ii.EPexportblank(_AnnotationType.TypeID); //should blank xml elements export?
-
-				//grab the current RO db so will know location of RO files and default graphics ext.
-                using (RODbInfo myRODB = (RODbInfoList.Get()).FirstOrDefault(x => x.RODbID == ii.MyDocVersion.DocVersionAssociations[0].MyROFst.RODbID))
-                {
-					//For each annotation in the item that is of the current EP Annotation type
-					foreach (var EPAnnotation in ii.ItemAnnotations.Where(x => x.TypeID == _AnnotationType.TypeID))
-					{
-						var EPAnnotationConfig = new AnnotationConfig(EPAnnotation.Config);
-
-						XmlElement xepdetails = xe.OwnerDocument.CreateElement("Details");
-						//include the annotation ID for reference
-						xepdetails.Attributes.SetNamedItem(AddAttribute(xepdetails.OwnerDocument, "AnnotationID", EPAnnotation.AnnotationID.ToString()));
-
-						//loop through each EP Field - name the xml elements the EP.name
-						foreach (EPField EP in myEPFields)
-						{
-							string val = EPAnnotationConfig.GetValue("EP", EP.name);
-
-							if (epexportblank || !string.IsNullOrEmpty(val))
-							{
-
-								if (_UnitIndex != 0)
-								{
-									val = DisplayText.ResolveUnitSpecific(ii.MyDocVersion, val);
-								}
-
-								XmlElement xindivid = xe.OwnerDocument.CreateElement(EP.name);
-
-								//need to resolve ROs ROSingle, ROMulti, in text
-								//get values
-								switch (EP.type.ToLower())
-								{
-									case "text":
-
-										//for text, check if any embedded ROs
-										//if none, set the xml element to the text
-										//otherwise resolve the ROs
-										MatchCollection matches = _ROAccPageTokenPattern.Matches(val);
-										if (matches.Count == 0)
-										{
-											xindivid.InnerText = val;
-										}
-										else
-										{
-											//resolve ROs
-											//text ROs will replace the AccID key in the text
-											//for binary objects like images,
-											//we will keep the AccID in the text and output the binary as a separate child
-											//XML element with the same xml name as the AccID
-											foreach (Match m in matches)
-											{
-												ROFSTLookup.rochild roc = lookup.GetROChildByAccPageID(m.Groups[0].Value);
-
-												// Exclude replacing Images since are binary - for those, add a sub item
-												if (Enumerable.Range(8, 15).Contains(roc.type))
-												{
-													xindivid.InnerText = val;
-
-													XmlElement xroid = AddGraphic(xindivid, m.Groups[0].Value, roc, myRODB, roc.type != 8);
-
-													xindivid.AppendChild(xroid);
-												}
-												else if (!string.IsNullOrEmpty(roc.value))
-												{
-													bool convertCaretToDeltaSymbol = (ii.ActiveSection != null) && ii.ActiveSection.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta;
-
-													string rocvalue = roc.value.Replace("`", "\xB0");
-													rocvalue = rocvalue.Replace("\xF8", "\xB0");
-													rocvalue = rocvalue.Replace("\x7F", "\x394"); //delta
-													if (convertCaretToDeltaSymbol) rocvalue = rocvalue.Replace("^", "\x394"); // delta
-													val = val.Replace($"{m.Groups[0].Value}", rocvalue);
-													xindivid.InnerText = val;
-												}
-											}
-										}
-										break;
-									case "rosingle":
-										//Get the output columns from the EPFormatFile
-										//set the "Item" nodes value = to those resolved items
-										//separated by multiseparator
-										XmlElement xindivid_rosingle = xindivid.OwnerDocument.CreateElement("Item");
-										xindivid_rosingle.Attributes.SetNamedItem(AddAttribute(xindivid_rosingle.OwnerDocument, "ROID", val));
-
-										//add values specified in EP input list
-										List<string> ro_single_tmp = EP.getROValuesList(EPAnnotation, val);
-										xindivid_rosingle.InnerText = String.Join(multiseparator, ro_single_tmp.ToArray());
-
-										//if image, add location and binary of image
-										// - images are type 8
-										//   but if multiple return values could combine
-										//   for example an text (1) + image (8) would be 9
-										ROFSTLookup.rochild roc_single = lookup.GetRoChild(val);
-										if (Enumerable.Range(8, 15).Contains(roc_single.type))
-										{
-											XmlElement xroid = AddGraphic(xindivid, val, roc_single, myRODB, roc_single.type != 8);
-											xindivid_rosingle.AppendChild(xroid);
-										}
-
-										xindivid.AppendChild(xindivid_rosingle);
-										break;
-									case "romulti":
-										//Get the output columns from the EPFormatFile
-										//create an "Item" subnode for each selected RO
-										//set the nodes value = to those resolved items
-										//separated by multiseparator
-										foreach (string ival in val.Split(multiseparator.ToCharArray()))
-										{
-											XmlElement xindivid_romulti = xindivid.OwnerDocument.CreateElement("Item");
-											xindivid_romulti.Attributes.SetNamedItem(AddAttribute(xindivid_romulti.OwnerDocument, "ROID", ival));
-
-											//add values specified in EP input list
-											List<string> ro_multi_tmp = EP.getROValuesList(EPAnnotation, ival);
-											xindivid_romulti.InnerText = String.Join(multiseparator, ro_multi_tmp.ToArray());
-
-											//if image, add location and binary of image
-											// - images are type 8
-											//   but if multiple return values could combine
-											//   for example an text (1) + image (8) would be 9
-											ROFSTLookup.rochild roc_multi = lookup.GetRoChild(ival);
-											if (Enumerable.Range(8, 15).Contains(roc_multi.type))
-											{
-												XmlElement xroid = AddGraphic(xindivid, ival, roc_multi, myRODB, roc_multi.type != 8);
-												xindivid_romulti.AppendChild(xroid);
-											}
-
-											xindivid.AppendChild(xindivid_romulti);
-										}
-										break;
-									case "tableinput":
-										xindivid.InnerText = val;
-										break;
-									default:
-										xindivid.InnerText = val;
-										break;
-								}
-								xepdetails.AppendChild(xindivid);
-							}
-						}
-						xepinfo.AppendChild(xepdetails);
-					}
-
-				}
-
-				xe.AppendChild(xepinfo);
-			}
-
-		}
-
-		//return a db sequence string from an Item ID
-		private string dbSeq(int itemID)
-		{
-			using (ItemInfo ii = ItemInfo.Get(itemID))
-            {
-				return dbSeq(ii);
-			}
-		}
-
-        //return a db sequence string from an ItemInfo
-        private string dbSeq(ItemInfo ii) => $"{((FolderInfo)ii.MyDocVersion.ActiveParent).Name}:{ii.MyProcedure.DisplayNumber} {ii.MyProcedure.DisplayText}:{ii.DBSequence}";
-
-        //For Exporting an RO that is an image
-        //returns the Location and FileName of the RO Image
-        private string GetROImageFileLocation(ROFSTLookup.rochild roc, RODbInfo rodb, bool isMulti)
-		{
-			string rodbpath = rodb.FolderPath;
-
-			string rocval = roc.value;
-			if (rocval == null) rocval = Array.Find(roc.children, x => x.value.Contains('.')).value;
-
-			if (rocval == null) return "";
-			string imgname;
-			if (isMulti)
-			{
-				imgname = rocval.Substring(rocval.IndexOf(' ') + 1, rocval.IndexOf("\r\n") - rocval.IndexOf(' ') - 1);
-			}
-			else
-			{
-				imgname = rocval.Substring(0, rocval.IndexOf('\n'));
-			}
-			int thedot = imgname.LastIndexOf('.');
-			string fname = imgname;
-			if (thedot == -1 || (thedot != (imgname.Length - 4)))
-			{
-				RODbConfig roDbCfg = new RODbConfig(rodb.Config);
-				fname += string.Format(".{0}", roDbCfg.GetDefaultGraphicExtension());
-			}
-
-			string imgfile = Path.Combine(rodbpath, fname);
-			return imgfile;
-		}
-
-		//For Exporting an RO that is an image
-		//returns an xmlElement
-		// - that is a child to xindivid
-		// - that has a name of Name
-		// - that has a value of the binary representation of the image
-		// - that has an attribute designating the location of the image file
-		private XmlElement AddGraphic(XmlElement xindivid, string Name, ROFSTLookup.rochild roc, RODbInfo rodb, bool isMulti)
-		{
-            Name = Name.Replace("<", "").Replace(">", "");
-
-			XmlElement xroid = xindivid.OwnerDocument.CreateElement(Name);
-
-			string imgfile = GetROImageFileLocation(roc, rodb, isMulti);
-			if (string.IsNullOrEmpty(imgfile)) return xroid;
-			xroid.Attributes.SetNamedItem(AddAttribute(xroid.OwnerDocument, "Location", imgfile));
-
-			if (File.Exists(imgfile))
-			{
-				using (FileStream fsIn = new FileStream(imgfile, FileMode.Open, FileAccess.Read, FileShare.Read))
-				{
-					// Create an instance of StreamReader that can read characters from the FileStream.
-					using (BinaryReader r = new BinaryReader(fsIn))
-						xroid.InnerText = Encoding.Default.GetString(r.ReadBytes((int)fsIn.Length));
-				}
-			}
-
-			return xroid;
-		}
-
-		//overridden - used to set the RO location for RO Images that are not in annotations
-		protected override void SetROLocation(ref XmlElement xindivid, ROFSTLookup.rochild roc, RODbInfo rodb, bool isMulti)
-		{
-			string imgfile = GetROImageFileLocation(roc, rodb, isMulti);
-			if (!string.IsNullOrEmpty(imgfile)) xindivid.Attributes.SetNamedItem(AddAttribute(xindivid.OwnerDocument, "Location", imgfile));
-		}
-
-		//overridden - used to set specific enhanced doc info
-		protected override void SetEPEnhancedDocLinks(ref XmlElement xe, ItemInfo ii)
-		{
-			EnhancedDocuments eds = ii.GetMyEnhancedDocuments();
-
-			if (eds != null && eds.Count == 1)
-			{
-				xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "EnhancedDocType", eds[0].Type.ToString()));
-				xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "EnhancedDocToItemID", eds[0].ItemID.ToString()));
-				xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "EnhancedDocToDbSeq", dbSeq(eds[0].ItemID)));
-			}
-		}
-
-		//clear objects to release memory
-		private void OnClose(object sender, EventArgs e)
-		{
-			DocReplace.Clear();
-			DocReplace = null;
-		}
-
-
-	}
-}

PROMS/VEPROMS User Interface/dlgManageSecurity.Designer.cs

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

PROMS/VEPROMS User Interface/dlgManageSecurity.cs

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

PROMS/VEPROMS User Interface/dlgManageSecurity.resx

@@ -112,27 +112,21 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="cmFolders.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>234, 17</value>
-  </metadata>
-  <metadata name="tt.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="cmFolders.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>341, 17</value>
   </metadata>
-  <metadata name="cmMembers.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="cmMembers.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="cmUsers.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="cmUsers.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>243, 17</value>
+  </metadata>
+  <metadata name="cmGroups.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>136, 17</value>
   </metadata>
-  <metadata name="tt.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>341, 17</value>
-  </metadata>
-  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>58</value>
-  </metadata>
 </root>

PROMS/VEPROMS User Interface/dlgPrintAllApprovedProcedures.Designer.cs

@@ -1,136 +0,0 @@
-
-namespace VEPROMS
-{
-	partial class dlgPrintAllApprovedProcedures
-	{
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-			{
-				components.Dispose();
-			}
-			base.Dispose(disposing);
-		}
-
-		#region Windows Form Designer generated code
-
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(dlgPrintAllApprovedProcedures));
-			this.txbApprovedPDFsPath = new DevComponents.DotNetBar.Controls.TextBoxX();
-			this.labelX1 = new DevComponents.DotNetBar.LabelX();
-			this.ppBtnPDFLoc = new DevComponents.DotNetBar.ButtonX();
-			this.ApprovedPDFsFolderDlg = new System.Windows.Forms.FolderBrowserDialog();
-			this.btnPrntAllAprv = new DevComponents.DotNetBar.ButtonX();
-			this.btnCancel = new DevComponents.DotNetBar.ButtonX();
-			this.SuspendLayout();
-			// 
-			// txbApprovedPDFsPath
-			// 
-			// 
-			// 
-			// 
-			this.txbApprovedPDFsPath.Border.Class = "TextBoxBorder";
-			this.txbApprovedPDFsPath.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.txbApprovedPDFsPath.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.txbApprovedPDFsPath.Location = new System.Drawing.Point(11, 45);
-			this.txbApprovedPDFsPath.Name = "txbApprovedPDFsPath";
-			this.txbApprovedPDFsPath.PreventEnterBeep = true;
-			this.txbApprovedPDFsPath.Size = new System.Drawing.Size(611, 22);
-			this.txbApprovedPDFsPath.TabIndex = 0;
-			this.txbApprovedPDFsPath.WatermarkText = "Enter to Path of where to Place All Approved PDFs";
-			this.txbApprovedPDFsPath.TextChanged += new System.EventHandler(this.txbApprovedPDFsPath_TextChanged);
-			// 
-			// labelX1
-			// 
-			// 
-			// 
-			// 
-			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(12, 22);
-			this.labelX1.Name = "labelX1";
-			this.labelX1.Size = new System.Drawing.Size(360, 23);
-			this.labelX1.TabIndex = 1;
-			this.labelX1.Text = "Approved PDFs Location:";
-			// 
-			// ppBtnPDFLoc
-			// 
-			this.ppBtnPDFLoc.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
-			this.ppBtnPDFLoc.Image = ((System.Drawing.Image)(resources.GetObject("ppBtnPDFLoc.Image")));
-			this.ppBtnPDFLoc.Location = new System.Drawing.Point(627, 45);
-			this.ppBtnPDFLoc.Margin = new System.Windows.Forms.Padding(2);
-			this.ppBtnPDFLoc.Name = "ppBtnPDFLoc";
-			this.ppBtnPDFLoc.Size = new System.Drawing.Size(37, 22);
-			this.ppBtnPDFLoc.TabIndex = 32;
-			this.ppBtnPDFLoc.Click += new System.EventHandler(this.ppBtnPDFLoc_Click);
-			// 
-			// btnPrntAllAprv
-			// 
-			this.btnPrntAllAprv.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
-			this.btnPrntAllAprv.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-			this.btnPrntAllAprv.Enabled = false;
-			this.btnPrntAllAprv.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.btnPrntAllAprv.Location = new System.Drawing.Point(397, 120);
-			this.btnPrntAllAprv.Name = "btnPrntAllAprv";
-			this.btnPrntAllAprv.Size = new System.Drawing.Size(132, 26);
-			this.btnPrntAllAprv.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-			this.btnPrntAllAprv.TabIndex = 33;
-			this.btnPrntAllAprv.Text = "Print All Approved";
-			this.btnPrntAllAprv.Click += new System.EventHandler(this.btnPrntAllAprv_Click);
-			// 
-			// btnCancel
-			// 
-			this.btnCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
-			this.btnCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-			this.btnCancel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.btnCancel.Location = new System.Drawing.Point(564, 120);
-			this.btnCancel.Name = "btnCancel";
-			this.btnCancel.Size = new System.Drawing.Size(99, 26);
-			this.btnCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-			this.btnCancel.TabIndex = 34;
-			this.btnCancel.Text = "Close";
-			this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
-			// 
-			// dlgPrintAllApprovedProcedures
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(675, 161);
-			this.Controls.Add(this.btnCancel);
-			this.Controls.Add(this.btnPrntAllAprv);
-			this.Controls.Add(this.ppBtnPDFLoc);
-			this.Controls.Add(this.labelX1);
-			this.Controls.Add(this.txbApprovedPDFsPath);
-			this.Cursor = System.Windows.Forms.Cursors.Default;
-			this.DoubleBuffered = true;
-			this.Name = "dlgPrintAllApprovedProcedures";
-			this.ShowIcon = false;
-			this.Text = "Print All Approved Procedures";
-			this.ResumeLayout(false);
-
-		}
-
-		#endregion
-
-		private DevComponents.DotNetBar.Controls.TextBoxX txbApprovedPDFsPath;
-		private DevComponents.DotNetBar.LabelX labelX1;
-		private DevComponents.DotNetBar.ButtonX ppBtnPDFLoc;
-		private System.Windows.Forms.FolderBrowserDialog ApprovedPDFsFolderDlg;
-		private DevComponents.DotNetBar.ButtonX btnPrntAllAprv;
-		private DevComponents.DotNetBar.ButtonX btnCancel;
-	}
-}

PROMS/VEPROMS User Interface/dlgPrintAllApprovedProcedures.cs

@@ -1,202 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using System.IO;
-using VEPROMS.CSLA.Library;
-using JR.Utils.GUI.Forms;
-
-namespace VEPROMS
-{
-	public partial class dlgPrintAllApprovedProcedures : DevComponents.DotNetBar.Office2007Form
-	{
-		private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
-		private StringBuilder NotApproved;
-		private DocVersionInfo _DocVersionInfo = null;
-		private int unitId = 0;
-		public dlgPrintAllApprovedProcedures(DocVersionInfo dvi)
-		{
-			InitializeComponent();
-			_DocVersionInfo = dvi;
-			unitId = (_DocVersionInfo.DocVersionConfig.SelectedSlave < 0) ? 0 : _DocVersionInfo.DocVersionConfig.SelectedSlave; // set unitId to zero if not Parent/Child
-			NotApproved = new StringBuilder();
-			txbApprovedPDFsPath.Text = BuildInitialPDFPath(); // set to default approved PDF path
-		}
-		// create an approved PDFs path based on the user's Documents folder and the tree path to the working draft
-		private string BuildInitialPDFPath()
-		{
-			// start with the SearchDVPath which is the node path staring with the top of the PROMS Procedure tree (VEPROMS)
-			string rtnstr =  _DocVersionInfo.ActiveParent.SearchDVPath;
-
-			// remove top tree node (VEPROMS) and put a " - " between each tree node name
-			rtnstr = rtnstr.Substring(rtnstr.IndexOf("\a") + 1).Replace("\a", " - ");
-
-			// add the user's path to the My Documments folder to the start of the path
-			rtnstr = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + "\\" + rtnstr;
-
-			// check if we are printing Approved Child Procedures
-			// if SelectedSlave is > 0 then we are printing Approved Child Procedures and
-			// subtract one from the index (unitId) into the list of child names (UnitNames)
-			if (unitId > 0)
-				rtnstr += "\\" + _DocVersionInfo.UnitNames[unitId - 1]; // append Child name to path
-			return rtnstr;
-		}
-
-		private void ppBtnPDFLoc_Click(object sender, EventArgs e)
-		{
-			if (txbApprovedPDFsPath.Text.Length > 0)
-				ApprovedPDFsFolderDlg.SelectedPath = txbApprovedPDFsPath.Text;
-			DialogResult dr = ApprovedPDFsFolderDlg.ShowDialog();
-			if (dr == DialogResult.OK)
-			{
-				txbApprovedPDFsPath.Text = ApprovedPDFsFolderDlg.SelectedPath;
-			}
-		}
-
-		private bool FolderIsWritable(string dirPath)
-		{
-			try
-			{
-				using (FileStream fs = File.Create(Path.Combine(dirPath, Path.GetRandomFileName()), 1,	FileOptions.DeleteOnClose))
-				{ }
-				return true;
-			}
-			catch
-			{
-				return false;
-			}
-		}
-
-		private void btnPrntAllAprv_Click(object sender, EventArgs e)
-		{
-			try
-			{
-				// Create folder if needed, clear the folder 
-				if (!Directory.Exists(txbApprovedPDFsPath.Text))
-					Directory.CreateDirectory(txbApprovedPDFsPath.Text);
-
-				// check if the folder location is writable
-				if (!FolderIsWritable(txbApprovedPDFsPath.Text))
-				{
-					MessageBox.Show("Cannot Write to this folder.\n\nSelect a different location.", "Invalid Folder Access", MessageBoxButtons.OK, MessageBoxIcon.Error);
-					btnPrntAllAprv.Enabled = false;
-				}
-				else
-				{
-					int pdfCount = 0;
-					DeleteExistingPDFs(); // delete existing PDFs in the target folder
-										  // Get the Child index for Parent/Child procedure - if not Parent/Child this will be zero
-					foreach (ProcedureInfo myProc in _DocVersionInfo.Procedures)
-					{
-						RevisionInfoList ril = RevisionInfoList.GetByItemID(myProc.ItemID);
-						if (ril.Count == 0)
-						{
-							NotApproved.AppendLine(string.Format("No approved Version for {0}", (myProc.PDFNumber.Length > 0) ? myProc.PDFNumber : myProc.DisplayText));
-						}
-						else
-						{
-							bool foundApproved = false;
-							foreach (RevisionInfo revinfo in ril)
-							{
-								// if not Parent/Child, "unitId" and "Applicability_index" will be zero
-								if (unitId == revinfo.MyConfig.Applicability_Index)
-								{
-									if (revinfo.LatestVersion.MyStage.IsApproved > 0)
-									{
-										foundApproved = true;
-										ItemInfo ii = ItemInfo.Get(revinfo.ItemID);
-										ii.MyDocVersion.DocVersionConfig.SelectedSlave = unitId;
-										ProcedureInfo prcInfo = ProcedureInfo.Get(ii.ItemID);
-										SaveApprovedPDFToFolder(revinfo, prcInfo.PDFNumber);// save PDF to folder
-										pdfCount++;
-										break; // got the latest Approved - jump out of foreach revision info loop
-									}
-								}
-							}
-							if (!foundApproved) NotApproved.AppendLine(string.Format("No approved Version for {0}", myProc.PDFNumber));
-
-						}
-					}
-					// if no Approved PDFs were save, display general message and exit
-					if (pdfCount == 0)
-					{
-						string msg = "There are no Approved Procedure PDFs in this procedure set.\n\n Approved Procedures PDFs are created when a procedure is approved using the PROMS Approval function.";
-						FlexibleMessageBox.Show(msg, "Print PDFs Completed", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-					}
-					else // we saved some approved PDFs tell user how many were saved and list procedures that were not approved
-					{
-						string msg = string.Format("{0} PDFs were saved at\n\n{1}", pdfCount, txbApprovedPDFsPath.Text);
-						if (NotApproved.Length > 0)
-						{
-							msg += string.Format("\n\n--------------------------------------------\n\nPDFs for the Following were not Generated:\n\n{0}", NotApproved.ToString());
-						}
-						FlexibleMessageBox.Show(msg, "Print PDFs Completed", MessageBoxButtons.OK, MessageBoxIcon.Information);
-					}
-				}
-			}
-			catch (Exception ex)
-			{
-				_MyLog.Error("Print All Approved PDFs", ex);// save error in PROMS error log
-				MessageBox.Show(ex.Message, ex.GetType().FullName, MessageBoxButtons.OK, MessageBoxIcon.Error);
-			}
-			this.Close(); // close dialog
-		}
-		private void SaveApprovedPDFToFolder(RevisionInfo revInfo,string PDFName)
-		{
-			byte[] buffer = revInfo.LatestVersion.PDF;
-			string PDFFilePath = string.Format("{0}\\{1}.PDF", txbApprovedPDFsPath.Text, PDFName);
-			try
-			{
-				FileStream fs = new FileStream(PDFFilePath, FileMode.Create);
-				fs.Write(buffer, 0, buffer.Length);
-				fs.Close();
-			}
-			catch (Exception ex)
-			{
-				string str = string.Format("Could not create {0}", PDFFilePath);
-				NotApproved.AppendLine(str); // save to list of procedure that were not approved
-				_MyLog.Info(str, ex);// save error in PROMS error log
-			}
-
-		}
-		private void DeleteExistingPDFs()
-		{
-			DirectoryInfo di = new DirectoryInfo(txbApprovedPDFsPath.Text);
-			FileInfo[] fis;
-			//DirectoryInfo[] diAry = di.GetDirectories(txbApprovedPDFsPath.Text);
-			//DirectoryInfo di_fmtgen;
-			// remove all of the PDF fils
-			//di_fmtgen = diAry[0];
-			try
-			{
-				fis = di.GetFiles("*.pdf");
-				foreach (FileInfo fi in fis)
-				{
-					if (fi.IsReadOnly) fi.IsReadOnly = false;
-					fi.Delete();
-				}
-			}
-			catch (Exception ex)
-			{
-				string str = string.Format("Cannot delete files in {0}", txbApprovedPDFsPath.Text);
-				MessageBox.Show(str, "Error deleting files", MessageBoxButtons.OK, MessageBoxIcon.Error);
-				_MyLog.Info(str, ex); // save error in PROMS error log
-
-			}
-		}
-		private void txbApprovedPDFsPath_TextChanged(object sender, EventArgs e)
-		{
-			btnPrntAllAprv.Enabled = txbApprovedPDFsPath.Text.Length > 0;
-		}
-
-		private void btnCancel_Click(object sender, EventArgs e)
-		{
-			this.Close();
-		}
-	}
-}

PROMS/VEPROMS User Interface/dlgSetChangeBarStartDate.Designer.cs

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

PROMS/VEPROMS User Interface/dlgSetChangeBarStartDate.cs

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

PROMS/VEPROMS User Interface/dlgUCFDetail.Designer.cs

@@ -0,0 +1,61 @@
+namespace VEPROMS
+{
+	partial class dlgUCFDetail
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.wbBrDet = new System.Windows.Forms.WebBrowser();
+			this.SuspendLayout();
+			// 
+			// wbBrDet
+			// 
+			this.wbBrDet.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.wbBrDet.Location = new System.Drawing.Point(0, 0);
+			this.wbBrDet.MinimumSize = new System.Drawing.Size(20, 20);
+			this.wbBrDet.Name = "wbBrDet";
+			this.wbBrDet.Size = new System.Drawing.Size(897, 445);
+			this.wbBrDet.TabIndex = 0;
+			// 
+			// dlgUCFDetail
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.ClientSize = new System.Drawing.Size(897, 445);
+			this.Controls.Add(this.wbBrDet);
+			this.Name = "dlgUCFDetail";
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "User Control of Format Details";
+			this.Load += new System.EventHandler(this.dlgUCFDetail_Load);
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.WebBrowser wbBrDet;
+	}
+}

PROMS/VEPROMS User Interface/dlgUCFDetail.cs

@@ -0,0 +1,77 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using System.Xml;
+using System.IO;
+using System.Xml.Xsl;
+
+namespace VEPROMS
+{
+	public partial class dlgUCFDetail : Form
+	{
+		private string MyFormatConfig;
+		private string UCFName;
+		private string Description;
+		// This brings up the dialog for displaying the details of what is contained in this User Control of Format
+		// as defined by the formatConfig.  It uses XSL to display the xml. The XSL can be found in UCFDetails.xsl.
+		// The result is displayed in a web browser control on the dialog.
+		public dlgUCFDetail(string formatConfig, string name, string desc)
+		{
+			MyFormatConfig = formatConfig;
+			UCFName = name;
+			Description = desc;
+			InitializeComponent();
+		}
+		private void AddAttribute(XmlNode xn, string name, object value)
+		{
+			XmlAttribute xa = xn.OwnerDocument.CreateAttribute(name);
+			xa.Value = value.ToString();
+			xn.Attributes.Append(xa);
+		}
+		private void dlgUCFDetail_Load(object sender, EventArgs e)
+		{
+			try
+			{
+				//need to add the UCF name & description to this:
+				XmlDocument xd = new XmlDocument();
+				xd.LoadXml(MyFormatConfig);
+				XmlNodeList xnl = xd.GetElementsByTagName("FormatConfig");
+				if (xnl != null && xnl.Count > 0)
+				{
+					AddAttribute(xnl[0], "Name", UCFName);
+					AddAttribute(xnl[0], "Description", Description);
+				}
+
+				string sXSLSummary = System.IO.File.ReadAllText(Application.StartupPath + "\\" + "UCFDetails.xsl");
+				StringWriter sw = new StringWriter();
+				StringWriter xsw = new StringWriter();
+				using (XmlReader xrt = XmlReader.Create(new StringReader(sXSLSummary)))
+				{
+					XmlTextWriter tx = new XmlTextWriter(xsw);
+					xd.WriteTo(tx);
+					string tmp = sw.ToString();
+					tmp = xd.InnerXml;
+					using (XmlReader xri = XmlReader.Create(new StringReader(tmp)))
+					{
+						using (XmlWriter xwo = XmlWriter.Create(sw))
+						{
+							XslCompiledTransform xsl = new XslCompiledTransform();
+							xsl.Load(xrt);
+							xsl.Transform(xri, xwo); // Perform Transform
+						}
+						this.wbBrDet.DocumentText = sw.ToString();
+					}
+				}
+			}
+			catch (Exception ex)
+			{
+				MessageBox.Show("Problem occurred displaying the details.", "UCF Warning", MessageBoxButtons.OK);
+			}
+		}
+	}
+}

PROMS/VEPROMS User Interface/dlgUCFDetail.resx

@@ -112,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>

PROMS/VEPROMS User Interface/frmBatchRefresh.Designer.cs

@@ -30,7 +30,6 @@
 		{
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmBatchRefresh));
             this.myTV = new System.Windows.Forms.TreeView();
-            this.myTV_RO_DBs = new System.Windows.Forms.TreeView();
             this.splitContainer3 = new System.Windows.Forms.SplitContainer();
             this.panelEx3 = new DevComponents.DotNetBar.PanelEx();
             this.txtResults = new System.Windows.Forms.TextBox();
@@ -53,16 +52,13 @@
             this.expandableSplitter1 = new DevComponents.DotNetBar.ExpandableSplitter();
             this.panelEx1 = new DevComponents.DotNetBar.PanelEx();
             this.sideNav1 = new DevComponents.DotNetBar.Controls.SideNav();
-            this.sideNavPanel5 = new DevComponents.DotNetBar.Controls.SideNavPanel();
-            this.itemPanel1 = new DevComponents.DotNetBar.PanelEx();
-            this.btnPurgeChange = new DevComponents.DotNetBar.ButtonX();
-            this.dtePurge = new System.Windows.Forms.DateTimePicker();
-            this.warningBox3 = new DevComponents.DotNetBar.Controls.WarningBox();
-            this.warningBox6 = new DevComponents.DotNetBar.Controls.WarningBox();
-            this.itemPanel2 = new DevComponents.DotNetBar.PanelEx();
-            this.btnIndexMaint = new DevComponents.DotNetBar.ButtonX();
-            this.itemPanel3 = new DevComponents.DotNetBar.PanelEx();
-            this.btnROsNotUsed = new DevComponents.DotNetBar.ButtonX();
+            this.sideNavPanel4 = new DevComponents.DotNetBar.Controls.SideNavPanel();
+            this.swDeleteFolder = new DevComponents.DotNetBar.Controls.SwitchButton();
+            this.labelX13 = new DevComponents.DotNetBar.LabelX();
+            this.swDeleteAnnotations = new DevComponents.DotNetBar.Controls.SwitchButton();
+            this.labelX14 = new DevComponents.DotNetBar.LabelX();
+            this.myTVdel = new System.Windows.Forms.TreeView();
+            this.btnDeleteItems = new DevComponents.DotNetBar.ButtonX();
             this.sideNavPanel3 = new DevComponents.DotNetBar.Controls.SideNavPanel();
             this.swCheckROLinks = new DevComponents.DotNetBar.Controls.SwitchButton();
             this.labelX12 = new DevComponents.DotNetBar.LabelX();
@@ -74,13 +70,17 @@
             this.labelX6 = new DevComponents.DotNetBar.LabelX();
             this.warningBox1 = new DevComponents.DotNetBar.Controls.WarningBox();
             this.btnFixLinks = new DevComponents.DotNetBar.ButtonX();
-            this.sideNavPanel4 = new DevComponents.DotNetBar.Controls.SideNavPanel();
-            this.swDeleteFolder = new DevComponents.DotNetBar.Controls.SwitchButton();
-            this.labelX13 = new DevComponents.DotNetBar.LabelX();
-            this.swDeleteAnnotations = new DevComponents.DotNetBar.Controls.SwitchButton();
-            this.labelX14 = new DevComponents.DotNetBar.LabelX();
-            this.myTVdel = new System.Windows.Forms.TreeView();
-            this.btnDeleteItems = new DevComponents.DotNetBar.ButtonX();
+            this.sideNavPanel1 = new DevComponents.DotNetBar.Controls.SideNavPanel();
+            this.warningBox3 = new DevComponents.DotNetBar.Controls.WarningBox();
+            this.labelX7 = new DevComponents.DotNetBar.LabelX();
+            this.line1 = new DevComponents.DotNetBar.Controls.Line();
+            this.swCkObsoleteROData = new DevComponents.DotNetBar.Controls.SwitchButton();
+            this.swHiddenDataLocs = new DevComponents.DotNetBar.Controls.SwitchButton();
+            this.labelX3 = new DevComponents.DotNetBar.LabelX();
+            this.labelX2 = new DevComponents.DotNetBar.LabelX();
+            this.swCkOrphanDataRecs = new DevComponents.DotNetBar.Controls.SwitchButton();
+            this.labelX1 = new DevComponents.DotNetBar.LabelX();
+            this.btnRunCheck = new DevComponents.DotNetBar.ButtonX();
             this.sideNavPanel2 = new DevComponents.DotNetBar.Controls.SideNavPanel();
             this.swRefreshTblsForSrch = new DevComponents.DotNetBar.Controls.SwitchButton();
             this.lblRefreshTblForSrch = new DevComponents.DotNetBar.LabelX();
@@ -97,11 +97,14 @@
             this.labelX8 = new DevComponents.DotNetBar.LabelX();
             this.line2 = new DevComponents.DotNetBar.Controls.Line();
             this.btnRunRepair = new DevComponents.DotNetBar.ButtonX();
+            this.sideNavPanel5 = new DevComponents.DotNetBar.Controls.SideNavPanel();
+            this.btn_ShowUsers = new DevComponents.DotNetBar.ButtonX();
             this.sideNavItem1 = new DevComponents.DotNetBar.Controls.SideNavItem();
             this.separator1 = new DevComponents.DotNetBar.Separator();
+            this.sideNavItmCheck = new DevComponents.DotNetBar.Controls.SideNavItem();
             this.sideNavItmRepair = new DevComponents.DotNetBar.Controls.SideNavItem();
             this.sideNavItmLinks = new DevComponents.DotNetBar.Controls.SideNavItem();
-            this.sideNavItmMaint = new DevComponents.DotNetBar.Controls.SideNavItem();
+            this.sideNavItmUsers = new DevComponents.DotNetBar.Controls.SideNavItem();
             this.sideNavItmDelete = new DevComponents.DotNetBar.Controls.SideNavItem();
             this.sideNavItmExit = new DevComponents.DotNetBar.Controls.SideNavItem();
             this.panelEx4 = new DevComponents.DotNetBar.PanelEx();
@@ -113,8 +116,6 @@
             this.lblAdmToolProgressType = new DevComponents.DotNetBar.LabelX();
             this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem();
             this.superTooltip1 = new DevComponents.DotNetBar.SuperTooltip();
-            this.swRegenWordAttmts = new DevComponents.DotNetBar.Controls.SwitchButton();
-            this.labelX1 = new DevComponents.DotNetBar.LabelX();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).BeginInit();
             this.splitContainer3.Panel1.SuspendLayout();
             this.splitContainer3.Panel2.SuspendLayout();
@@ -126,13 +127,11 @@
             this.pnlLater.SuspendLayout();
             this.panelEx1.SuspendLayout();
             this.sideNav1.SuspendLayout();
-            this.sideNavPanel5.SuspendLayout();
-            this.itemPanel1.SuspendLayout();
-            this.itemPanel2.SuspendLayout();
-            this.itemPanel3.SuspendLayout();
-            this.sideNavPanel3.SuspendLayout();
             this.sideNavPanel4.SuspendLayout();
+            this.sideNavPanel3.SuspendLayout();
+            this.sideNavPanel1.SuspendLayout();
             this.sideNavPanel2.SuspendLayout();
+            this.sideNavPanel5.SuspendLayout();
             this.panelEx4.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -142,20 +141,10 @@
             this.myTV.Dock = System.Windows.Forms.DockStyle.Bottom;
             this.myTV.Location = new System.Drawing.Point(0, 230);
             this.myTV.Name = "myTV";
-            this.myTV.Size = new System.Drawing.Size(268, 310);
+            this.myTV.Size = new System.Drawing.Size(291, 310);
             this.myTV.TabIndex = 4;
             this.myTV.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.myTV_AfterCheck);
             // 
-            // myTV_RO_DBs
-            // 
-            this.myTV_RO_DBs.CheckBoxes = true;
-            this.myTV_RO_DBs.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.myTV_RO_DBs.Location = new System.Drawing.Point(0, 50);
-            this.myTV_RO_DBs.Name = "myTV_RO_DBs";
-            this.myTV_RO_DBs.Size = new System.Drawing.Size(267, 250);
-            this.myTV_RO_DBs.TabIndex = 4;
-            this.myTV_RO_DBs.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.TreeView_AfterCheck);
-            // 
             // splitContainer3
             // 
             this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -478,19 +467,21 @@
             // sideNav1
             // 
             this.sideNav1.BackColor = System.Drawing.SystemColors.Control;
-            this.sideNav1.Controls.Add(this.sideNavPanel5);
-            this.sideNav1.Controls.Add(this.sideNavPanel3);
             this.sideNav1.Controls.Add(this.sideNavPanel4);
+            this.sideNav1.Controls.Add(this.sideNavPanel3);
+            this.sideNav1.Controls.Add(this.sideNavPanel1);
             this.sideNav1.Controls.Add(this.sideNavPanel2);
+            this.sideNav1.Controls.Add(this.sideNavPanel5);
             this.sideNav1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.sideNav1.EnableClose = false;
             this.sideNav1.EnableMaximize = false;
             this.sideNav1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
             this.sideNavItem1,
             this.separator1,
+            this.sideNavItmCheck,
             this.sideNavItmRepair,
             this.sideNavItmLinks,
-            this.sideNavItmMaint,
+            this.sideNavItmUsers,
             this.sideNavItmDelete,
             this.sideNavItmExit});
             this.sideNav1.Location = new System.Drawing.Point(0, 0);
@@ -500,138 +491,108 @@
             this.sideNav1.TabIndex = 3;
             this.sideNav1.Text = "sideNav1";
             // 
-            // sideNavPanel5
+            // sideNavPanel4
             // 
-            this.sideNavPanel5.Controls.Add(this.itemPanel1);
-            this.sideNavPanel5.Controls.Add(this.itemPanel2);
-            this.sideNavPanel5.Controls.Add(this.itemPanel3);
-            this.sideNavPanel5.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.sideNavPanel5.Location = new System.Drawing.Point(112, 31);
-            this.sideNavPanel5.MinimumSize = new System.Drawing.Size(0, 493);
-            this.sideNavPanel5.Name = "sideNavPanel5";
-            this.sideNavPanel5.Size = new System.Drawing.Size(268, 493);
-            this.sideNavPanel5.TabIndex = 26;
+            this.sideNavPanel4.Controls.Add(this.swDeleteFolder);
+            this.sideNavPanel4.Controls.Add(this.labelX13);
+            this.sideNavPanel4.Controls.Add(this.swDeleteAnnotations);
+            this.sideNavPanel4.Controls.Add(this.labelX14);
+            this.sideNavPanel4.Controls.Add(this.myTVdel);
+            this.sideNavPanel4.Controls.Add(this.btnDeleteItems);
+            this.sideNavPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.sideNavPanel4.Location = new System.Drawing.Point(81, 31);
+            this.sideNavPanel4.MinimumSize = new System.Drawing.Size(0, 493);
+            this.sideNavPanel4.Name = "sideNavPanel4";
+            this.sideNavPanel4.Size = new System.Drawing.Size(299, 493);
+            this.sideNavPanel4.TabIndex = 27;
             // 
-            // itemPanel1
+            // swDeleteFolder
             // 
-            this.itemPanel1.Controls.Add(this.btnPurgeChange);
-            this.itemPanel1.Controls.Add(this.dtePurge);
-            this.itemPanel1.Controls.Add(this.warningBox3);
-            this.itemPanel1.Controls.Add(this.warningBox6);
-            this.itemPanel1.DisabledBackColor = System.Drawing.Color.Empty;
-            this.itemPanel1.Location = new System.Drawing.Point(0, -2);
-            this.itemPanel1.Name = "itemPanel1";
-            this.itemPanel1.Size = new System.Drawing.Size(267, 148);
-            this.itemPanel1.Style.Border = DevComponents.DotNetBar.eBorderType.DoubleLine;
-            this.itemPanel1.Style.BorderColor.Color = System.Drawing.Color.DarkGray;
-            this.itemPanel1.TabIndex = 0;
             // 
-            // btnPurgeChange
             // 
-            this.btnPurgeChange.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
-            this.btnPurgeChange.Checked = true;
-            this.btnPurgeChange.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-            this.btnPurgeChange.Location = new System.Drawing.Point(18, 32);
-            this.btnPurgeChange.Name = "btnPurgeChange";
-            this.btnPurgeChange.Size = new System.Drawing.Size(227, 23);
-            this.btnPurgeChange.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.btnPurgeChange.TabIndex = 1;
-            this.btnPurgeChange.Text = "Purge Change History";
-            this.btnPurgeChange.Tooltip = resources.GetString("btnPurgeChange.Tooltip");
-            this.btnPurgeChange.Click += new System.EventHandler(this.btnPurgeChange_Click);
             // 
-            // dtePurge
+            this.swDeleteFolder.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.swDeleteFolder.Location = new System.Drawing.Point(10, 43);
+            this.swDeleteFolder.Name = "swDeleteFolder";
+            this.swDeleteFolder.Size = new System.Drawing.Size(69, 22);
+            this.swDeleteFolder.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.superTooltip1.SetSuperTooltip(this.swDeleteFolder, new DevComponents.DotNetBar.SuperTooltipInfo("Delete Folders", "", resources.GetString("swDeleteFolder.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 140)));
+            this.swDeleteFolder.SwitchClickTogglesValue = true;
+            this.swDeleteFolder.TabIndex = 39;
+            this.swDeleteFolder.ValueChanged += new System.EventHandler(this.swDeleteFolder_ValueChanged);
             // 
-            this.dtePurge.Format = System.Windows.Forms.DateTimePickerFormat.Short;
-            this.dtePurge.Location = new System.Drawing.Point(92, 7);
-            this.dtePurge.Name = "dtePurge";
-            this.dtePurge.Size = new System.Drawing.Size(87, 20);
-            this.dtePurge.TabIndex = 0;
+            // labelX13
             // 
-            // warningBox3
+            this.labelX13.BackColor = System.Drawing.Color.Transparent;
             // 
-            this.warningBox3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(196)))), ((int)(((byte)(219)))), ((int)(((byte)(249)))));
-            this.warningBox3.CloseButtonVisible = false;
-            this.warningBox3.Image = ((System.Drawing.Image)(resources.GetObject("warningBox3.Image")));
-            this.warningBox3.Location = new System.Drawing.Point(1, 61);
-            this.warningBox3.Margin = new System.Windows.Forms.Padding(4);
-            this.warningBox3.Name = "warningBox3";
-            this.warningBox3.OptionsButtonVisible = false;
-            this.warningBox3.Size = new System.Drawing.Size(264, 32);
-            this.warningBox3.TabIndex = 32;
-            this.warningBox3.Text = "<b>NOTE</b> These tools can take a long time to run";
             // 
-            // warningBox6
             // 
-            this.warningBox6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(196)))), ((int)(((byte)(219)))), ((int)(((byte)(249)))));
-            this.warningBox6.CloseButtonVisible = false;
-            this.warningBox6.Image = ((System.Drawing.Image)(resources.GetObject("warningBox6.Image")));
-            this.warningBox6.Location = new System.Drawing.Point(1, 97);
-            this.warningBox6.Margin = new System.Windows.Forms.Padding(4);
-            this.warningBox6.Name = "warningBox6";
-            this.warningBox6.OptionsButtonVisible = false;
-            this.warningBox6.Size = new System.Drawing.Size(264, 43);
-            this.warningBox6.TabIndex = 31;
-            this.warningBox6.Text = " Be sure there is a current backup of the \r\n database prior to running these func" +
-    "tions";
+            this.labelX13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.labelX13.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.labelX13.Location = new System.Drawing.Point(85, 42);
+            this.labelX13.Name = "labelX13";
+            this.labelX13.Size = new System.Drawing.Size(168, 22);
+            this.superTooltip1.SetSuperTooltip(this.labelX13, new DevComponents.DotNetBar.SuperTooltipInfo("Delete Folders", "", resources.GetString("labelX13.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 140)));
+            this.labelX13.TabIndex = 38;
+            this.labelX13.Text = "Delete Folders";
             // 
-            // itemPanel2
+            // swDeleteAnnotations
             // 
-            this.itemPanel2.Controls.Add(this.btnIndexMaint);
-            this.itemPanel2.DisabledBackColor = System.Drawing.Color.Empty;
-            this.itemPanel2.Location = new System.Drawing.Point(0, 145);
-            this.itemPanel2.Name = "itemPanel2";
-            this.itemPanel2.Size = new System.Drawing.Size(267, 73);
-            this.itemPanel2.Style.BackgroundImagePosition = DevComponents.DotNetBar.eBackgroundImagePosition.Tile;
-            this.itemPanel2.Style.Border = DevComponents.DotNetBar.eBorderType.DoubleLine;
-            this.itemPanel2.Style.BorderColor.Color = System.Drawing.Color.DarkGray;
-            this.itemPanel2.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
-            this.itemPanel2.Style.GradientAngle = 90;
-            this.itemPanel2.TabIndex = 8;
             // 
-            // btnIndexMaint
             // 
-            this.btnIndexMaint.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
-            this.btnIndexMaint.Checked = true;
-            this.btnIndexMaint.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-            this.btnIndexMaint.Location = new System.Drawing.Point(19, 24);
-            this.btnIndexMaint.Name = "btnIndexMaint";
-            this.btnIndexMaint.Size = new System.Drawing.Size(227, 23);
-            this.btnIndexMaint.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.btnIndexMaint.TabIndex = 4;
-            this.btnIndexMaint.Text = "Perform Index Maintenance";
-            this.btnIndexMaint.Tooltip = resources.GetString("btnIndexMaint.Tooltip");
-            this.btnIndexMaint.Click += new System.EventHandler(this.btnIndexMaint_Click);
             // 
-            // itemPanel3
+            this.swDeleteAnnotations.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.swDeleteAnnotations.Location = new System.Drawing.Point(10, 15);
+            this.swDeleteAnnotations.Name = "swDeleteAnnotations";
+            this.swDeleteAnnotations.Size = new System.Drawing.Size(69, 22);
+            this.swDeleteAnnotations.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.superTooltip1.SetSuperTooltip(this.swDeleteAnnotations, new DevComponents.DotNetBar.SuperTooltipInfo("Delete Annotations", "", resources.GetString("swDeleteAnnotations.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 155)));
+            this.swDeleteAnnotations.SwitchClickTogglesValue = true;
+            this.swDeleteAnnotations.TabIndex = 37;
+            this.swDeleteAnnotations.Value = true;
+            this.swDeleteAnnotations.ValueObject = "Y";
+            this.swDeleteAnnotations.ValueChanged += new System.EventHandler(this.swDeleteAnnotations_ValueChanged);
             // 
-            this.itemPanel3.Controls.Add(this.btnROsNotUsed);
-            this.itemPanel3.Controls.Add(this.myTV_RO_DBs);
-            this.itemPanel3.DisabledBackColor = System.Drawing.Color.Empty;
-            this.itemPanel3.Location = new System.Drawing.Point(0, 218);
-            this.itemPanel3.Name = "itemPanel3";
-            this.itemPanel3.Size = new System.Drawing.Size(267, 300);
-            this.itemPanel3.Style.BackgroundImagePosition = DevComponents.DotNetBar.eBackgroundImagePosition.Tile;
-            this.itemPanel3.Style.Border = DevComponents.DotNetBar.eBorderType.DoubleLine;
-            this.itemPanel3.Style.BorderColor.Color = System.Drawing.Color.DarkGray;
-            this.itemPanel3.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
-            this.itemPanel3.Style.GradientAngle = 90;
-            this.itemPanel3.TabIndex = 12;
+            // labelX14
             // 
-            // btnROsNotUsed
+            this.labelX14.BackColor = System.Drawing.Color.Transparent;
             // 
-            this.btnROsNotUsed.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
-            this.btnROsNotUsed.Checked = true;
-            this.btnROsNotUsed.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-            this.btnROsNotUsed.Location = new System.Drawing.Point(19, 11);
-            this.btnROsNotUsed.Name = "btnROsNotUsed";
-            this.btnROsNotUsed.Size = new System.Drawing.Size(227, 26);
-            this.btnROsNotUsed.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.superTooltip1.SetSuperTooltip(this.btnROsNotUsed, new DevComponents.DotNetBar.SuperTooltipInfo("ROs Not Used Snapshot", "", "This will Generate an image detailing ROs that exist but are not currently utiliz" +
-            "ed in any steps in PROMS.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
-            this.btnROsNotUsed.TabIndex = 2;
-            this.btnROsNotUsed.Text = "Generate Snapshot of ROs Not Used";
-            this.btnROsNotUsed.Click += new System.EventHandler(this.btnROsNotUsed_Click);
+            // 
+            // 
+            this.labelX14.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.labelX14.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.labelX14.Location = new System.Drawing.Point(85, 14);
+            this.labelX14.Name = "labelX14";
+            this.labelX14.Size = new System.Drawing.Size(186, 22);
+            this.superTooltip1.SetSuperTooltip(this.labelX14, new DevComponents.DotNetBar.SuperTooltipInfo("Delete Annotations", "", resources.GetString("labelX14.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 155)));
+            this.labelX14.TabIndex = 36;
+            this.labelX14.Text = "Delete Annotations";
+            // 
+            // myTVdel
+            // 
+            this.myTVdel.CheckBoxes = true;
+            this.myTVdel.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.myTVdel.Location = new System.Drawing.Point(0, 126);
+            this.myTVdel.Name = "myTVdel";
+            this.myTVdel.Size = new System.Drawing.Size(299, 367);
+            this.myTVdel.TabIndex = 34;
+            this.myTVdel.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.myTV_AfterCheck);
+            // 
+            // btnDeleteItems
+            // 
+            this.btnDeleteItems.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            this.btnDeleteItems.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnDeleteItems.Checked = true;
+            this.btnDeleteItems.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.btnDeleteItems.Location = new System.Drawing.Point(39, 98);
+            this.btnDeleteItems.Name = "btnDeleteItems";
+            this.btnDeleteItems.Size = new System.Drawing.Size(220, 23);
+            this.btnDeleteItems.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.superTooltip1.SetSuperTooltip(this.btnDeleteItems, new DevComponents.DotNetBar.SuperTooltipInfo("Process Deletions", "", resources.GetString("btnDeleteItems.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 175)));
+            this.btnDeleteItems.TabIndex = 35;
+            this.btnDeleteItems.Text = "Process Deletions";
+            this.btnDeleteItems.Click += new System.EventHandler(this.btnDeleteItems_Click);
             // 
             // sideNavPanel3
             // 
@@ -647,10 +608,10 @@
             this.sideNavPanel3.Controls.Add(this.myTV);
             this.sideNavPanel3.Controls.Add(this.btnFixLinks);
             this.sideNavPanel3.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.sideNavPanel3.Location = new System.Drawing.Point(112, 31);
+            this.sideNavPanel3.Location = new System.Drawing.Point(89, 31);
             this.sideNavPanel3.MinimumSize = new System.Drawing.Size(0, 540);
             this.sideNavPanel3.Name = "sideNavPanel3";
-            this.sideNavPanel3.Size = new System.Drawing.Size(268, 540);
+            this.sideNavPanel3.Size = new System.Drawing.Size(291, 540);
             this.sideNavPanel3.TabIndex = 10;
             this.sideNavPanel3.Visible = false;
             // 
@@ -798,114 +759,175 @@
             this.btnFixLinks.Text = "Process Links";
             this.btnFixLinks.Click += new System.EventHandler(this.btnFixLinks_Click);
             // 
-            // sideNavPanel4
+            // sideNavPanel1
             // 
-            this.sideNavPanel4.Controls.Add(this.swDeleteFolder);
-            this.sideNavPanel4.Controls.Add(this.labelX13);
-            this.sideNavPanel4.Controls.Add(this.swDeleteAnnotations);
-            this.sideNavPanel4.Controls.Add(this.labelX14);
-            this.sideNavPanel4.Controls.Add(this.myTVdel);
-            this.sideNavPanel4.Controls.Add(this.btnDeleteItems);
-            this.sideNavPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.sideNavPanel4.Location = new System.Drawing.Point(112, 31);
-            this.sideNavPanel4.MinimumSize = new System.Drawing.Size(0, 493);
-            this.sideNavPanel4.Name = "sideNavPanel4";
-            this.sideNavPanel4.Size = new System.Drawing.Size(268, 493);
-            this.sideNavPanel4.TabIndex = 27;
-            this.sideNavPanel4.Visible = false;
+            this.sideNavPanel1.Controls.Add(this.warningBox3);
+            this.sideNavPanel1.Controls.Add(this.labelX7);
+            this.sideNavPanel1.Controls.Add(this.line1);
+            this.sideNavPanel1.Controls.Add(this.swCkObsoleteROData);
+            this.sideNavPanel1.Controls.Add(this.swHiddenDataLocs);
+            this.sideNavPanel1.Controls.Add(this.labelX3);
+            this.sideNavPanel1.Controls.Add(this.labelX2);
+            this.sideNavPanel1.Controls.Add(this.swCkOrphanDataRecs);
+            this.sideNavPanel1.Controls.Add(this.labelX1);
+            this.sideNavPanel1.Controls.Add(this.btnRunCheck);
+            this.sideNavPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.sideNavPanel1.Location = new System.Drawing.Point(89, 31);
+            this.sideNavPanel1.Name = "sideNavPanel1";
+            this.sideNavPanel1.Size = new System.Drawing.Size(291, 494);
+            this.sideNavPanel1.TabIndex = 2;
+            this.sideNavPanel1.Visible = false;
             // 
-            // swDeleteFolder
+            // warningBox3
+            // 
+            this.warningBox3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(196)))), ((int)(((byte)(219)))), ((int)(((byte)(249)))));
+            this.warningBox3.CloseButtonVisible = false;
+            this.warningBox3.Image = ((System.Drawing.Image)(resources.GetObject("warningBox3.Image")));
+            this.warningBox3.Location = new System.Drawing.Point(17, 207);
+            this.warningBox3.Margin = new System.Windows.Forms.Padding(4);
+            this.warningBox3.Name = "warningBox3";
+            this.warningBox3.OptionsButtonVisible = false;
+            this.warningBox3.Size = new System.Drawing.Size(264, 32);
+            this.warningBox3.TabIndex = 29;
+            this.warningBox3.Text = "<b>NOTE</b> These tools can take a long time to run";
+            // 
+            // labelX7
+            // 
+            this.labelX7.BackColor = System.Drawing.Color.Transparent;
+            // 
+            // 
+            // 
+            this.labelX7.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.labelX7.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.labelX7.Location = new System.Drawing.Point(5, 3);
+            this.labelX7.Name = "labelX7";
+            this.labelX7.Size = new System.Drawing.Size(251, 22);
+            this.labelX7.TabIndex = 19;
+            this.labelX7.Text = "Check for these Data Issues:";
+            // 
+            // line1
+            // 
+            this.line1.BackColor = System.Drawing.Color.Transparent;
+            this.line1.Location = new System.Drawing.Point(8, 179);
+            this.line1.Name = "line1";
+            this.line1.Size = new System.Drawing.Size(285, 12);
+            this.line1.TabIndex = 18;
+            this.line1.Text = "line1";
+            // 
+            // swCkObsoleteROData
             // 
             // 
             // 
             // 
-            this.swDeleteFolder.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.swDeleteFolder.Location = new System.Drawing.Point(10, 43);
-            this.swDeleteFolder.Name = "swDeleteFolder";
-            this.swDeleteFolder.Size = new System.Drawing.Size(69, 22);
-            this.swDeleteFolder.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.superTooltip1.SetSuperTooltip(this.swDeleteFolder, new DevComponents.DotNetBar.SuperTooltipInfo("Delete Folders", "", resources.GetString("swDeleteFolder.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 140)));
-            this.swDeleteFolder.SwitchClickTogglesValue = true;
-            this.swDeleteFolder.TabIndex = 39;
-            this.swDeleteFolder.ValueChanged += new System.EventHandler(this.swDeleteFolder_ValueChanged);
+            this.swCkObsoleteROData.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.swCkObsoleteROData.Location = new System.Drawing.Point(10, 99);
+            this.swCkObsoleteROData.Name = "swCkObsoleteROData";
+            this.swCkObsoleteROData.Size = new System.Drawing.Size(91, 22);
+            this.swCkObsoleteROData.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.superTooltip1.SetSuperTooltip(this.swCkObsoleteROData, new DevComponents.DotNetBar.SuperTooltipInfo("Obsolete RO Data", "", resources.GetString("swCkObsoleteROData.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 135)));
+            this.swCkObsoleteROData.SwitchClickTogglesValue = true;
+            this.swCkObsoleteROData.TabIndex = 14;
+            this.swCkObsoleteROData.Value = true;
+            this.swCkObsoleteROData.ValueObject = "Y";
+            this.swCkObsoleteROData.ValueChanged += new System.EventHandler(this.swCk_ValueChanged);
             // 
-            // labelX13
-            // 
-            this.labelX13.BackColor = System.Drawing.Color.Transparent;
-            // 
-            // 
-            // 
-            this.labelX13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.labelX13.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.labelX13.Location = new System.Drawing.Point(85, 42);
-            this.labelX13.Name = "labelX13";
-            this.labelX13.Size = new System.Drawing.Size(168, 22);
-            this.superTooltip1.SetSuperTooltip(this.labelX13, new DevComponents.DotNetBar.SuperTooltipInfo("Delete Folders", "", resources.GetString("labelX13.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 140)));
-            this.labelX13.TabIndex = 38;
-            this.labelX13.Text = "Delete Folders";
-            // 
-            // swDeleteAnnotations
+            // swHiddenDataLocs
             // 
             // 
             // 
             // 
-            this.swDeleteAnnotations.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.swDeleteAnnotations.Location = new System.Drawing.Point(10, 15);
-            this.swDeleteAnnotations.Name = "swDeleteAnnotations";
-            this.swDeleteAnnotations.Size = new System.Drawing.Size(69, 22);
-            this.swDeleteAnnotations.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.superTooltip1.SetSuperTooltip(this.swDeleteAnnotations, new DevComponents.DotNetBar.SuperTooltipInfo("Delete Annotations", "", resources.GetString("swDeleteAnnotations.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 155)));
-            this.swDeleteAnnotations.SwitchClickTogglesValue = true;
-            this.swDeleteAnnotations.TabIndex = 37;
-            this.swDeleteAnnotations.Value = true;
-            this.swDeleteAnnotations.ValueObject = "Y";
-            this.swDeleteAnnotations.ValueChanged += new System.EventHandler(this.swDeleteAnnotations_ValueChanged);
+            this.swHiddenDataLocs.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.swHiddenDataLocs.Location = new System.Drawing.Point(10, 71);
+            this.swHiddenDataLocs.Name = "swHiddenDataLocs";
+            this.swHiddenDataLocs.Size = new System.Drawing.Size(91, 22);
+            this.swHiddenDataLocs.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.superTooltip1.SetSuperTooltip(this.swHiddenDataLocs, new DevComponents.DotNetBar.SuperTooltipInfo("Hidden Data Locations", "", resources.GetString("swHiddenDataLocs.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+            this.swHiddenDataLocs.SwitchClickTogglesValue = true;
+            this.swHiddenDataLocs.TabIndex = 15;
+            this.swHiddenDataLocs.Value = true;
+            this.swHiddenDataLocs.ValueObject = "Y";
+            this.swHiddenDataLocs.ValueChanged += new System.EventHandler(this.swCk_ValueChanged);
             // 
-            // labelX14
+            // labelX3
             // 
-            this.labelX14.BackColor = System.Drawing.Color.Transparent;
+            this.labelX3.BackColor = System.Drawing.Color.Transparent;
             // 
             // 
             // 
-            this.labelX14.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.labelX14.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.labelX14.Location = new System.Drawing.Point(85, 14);
-            this.labelX14.Name = "labelX14";
-            this.labelX14.Size = new System.Drawing.Size(186, 22);
-            this.superTooltip1.SetSuperTooltip(this.labelX14, new DevComponents.DotNetBar.SuperTooltipInfo("Delete Annotations", "", resources.GetString("labelX14.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 155)));
-            this.labelX14.TabIndex = 36;
-            this.labelX14.Text = "Delete Annotations";
+            this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.labelX3.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.labelX3.Location = new System.Drawing.Point(107, 99);
+            this.labelX3.Name = "labelX3";
+            this.labelX3.Size = new System.Drawing.Size(154, 22);
+            this.superTooltip1.SetSuperTooltip(this.labelX3, new DevComponents.DotNetBar.SuperTooltipInfo("Obsolete RO Data", "", resources.GetString("labelX3.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 135)));
+            this.labelX3.TabIndex = 11;
+            this.labelX3.Text = "Obsolete RO Data";
             // 
-            // myTVdel
+            // labelX2
             // 
-            this.myTVdel.CheckBoxes = true;
-            this.myTVdel.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.myTVdel.Location = new System.Drawing.Point(0, 126);
-            this.myTVdel.Name = "myTVdel";
-            this.myTVdel.Size = new System.Drawing.Size(268, 367);
-            this.myTVdel.TabIndex = 34;
-            this.myTVdel.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.myTV_AfterCheck);
+            this.labelX2.BackColor = System.Drawing.Color.Transparent;
             // 
-            // btnDeleteItems
             // 
-            this.btnDeleteItems.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
-            this.btnDeleteItems.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnDeleteItems.Checked = true;
-            this.btnDeleteItems.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-            this.btnDeleteItems.Location = new System.Drawing.Point(39, 98);
-            this.btnDeleteItems.Name = "btnDeleteItems";
-            this.btnDeleteItems.Size = new System.Drawing.Size(189, 23);
-            this.btnDeleteItems.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.superTooltip1.SetSuperTooltip(this.btnDeleteItems, new DevComponents.DotNetBar.SuperTooltipInfo("Process Deletions", "", resources.GetString("btnDeleteItems.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 175)));
-            this.btnDeleteItems.TabIndex = 35;
-            this.btnDeleteItems.Text = "Process Deletions";
-            this.btnDeleteItems.Click += new System.EventHandler(this.btnDeleteItems_Click);
+            // 
+            this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.labelX2.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.labelX2.Location = new System.Drawing.Point(107, 71);
+            this.labelX2.Name = "labelX2";
+            this.labelX2.Size = new System.Drawing.Size(140, 22);
+            this.superTooltip1.SetSuperTooltip(this.labelX2, new DevComponents.DotNetBar.SuperTooltipInfo("Hidden Data Locations", "", resources.GetString("labelX2.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+            this.labelX2.TabIndex = 12;
+            this.labelX2.Text = "Hidden Data Locations";
+            // 
+            // swCkOrphanDataRecs
+            // 
+            // 
+            // 
+            // 
+            this.swCkOrphanDataRecs.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.swCkOrphanDataRecs.Location = new System.Drawing.Point(10, 43);
+            this.swCkOrphanDataRecs.Name = "swCkOrphanDataRecs";
+            this.swCkOrphanDataRecs.Size = new System.Drawing.Size(91, 22);
+            this.swCkOrphanDataRecs.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.superTooltip1.SetSuperTooltip(this.swCkOrphanDataRecs, new DevComponents.DotNetBar.SuperTooltipInfo("Orphan Data Records", "", resources.GetString("swCkOrphanDataRecs.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(275, 193)));
+            this.swCkOrphanDataRecs.SwitchClickTogglesValue = true;
+            this.swCkOrphanDataRecs.TabIndex = 9;
+            this.swCkOrphanDataRecs.Value = true;
+            this.swCkOrphanDataRecs.ValueObject = "Y";
+            this.swCkOrphanDataRecs.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, 43);
+            this.labelX1.Name = "labelX1";
+            this.labelX1.Size = new System.Drawing.Size(172, 22);
+            this.superTooltip1.SetSuperTooltip(this.labelX1, new DevComponents.DotNetBar.SuperTooltipInfo("Orphan Data Records", "", resources.GetString("labelX1.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(275, 190)));
+            this.labelX1.TabIndex = 8;
+            this.labelX1.Text = "Orphan Data Records";
+            // 
+            // btnRunCheck
+            // 
+            this.btnRunCheck.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            this.btnRunCheck.Checked = true;
+            this.btnRunCheck.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.btnRunCheck.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btnRunCheck.Location = new System.Drawing.Point(5, 150);
+            this.btnRunCheck.Name = "btnRunCheck";
+            this.btnRunCheck.Size = new System.Drawing.Size(286, 23);
+            this.btnRunCheck.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.superTooltip1.SetSuperTooltip(this.btnRunCheck, new DevComponents.DotNetBar.SuperTooltipInfo("Run Check", "", "This will run the database check tools selected.\r\n\r\nClick on the on/off switches " +
+            "to turn on/off each tool.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 100)));
+            this.btnRunCheck.TabIndex = 7;
+            this.btnRunCheck.Text = "Run Check";
+            this.btnRunCheck.Click += new System.EventHandler(this.btnRunCheck_Click);
             // 
             // 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);
@@ -922,9 +944,9 @@
             this.sideNavPanel2.Controls.Add(this.line2);
             this.sideNavPanel2.Controls.Add(this.btnRunRepair);
             this.sideNavPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.sideNavPanel2.Location = new System.Drawing.Point(112, 31);
+            this.sideNavPanel2.Location = new System.Drawing.Point(89, 31);
             this.sideNavPanel2.Name = "sideNavPanel2";
-            this.sideNavPanel2.Size = new System.Drawing.Size(268, 493);
+            this.sideNavPanel2.Size = new System.Drawing.Size(291, 494);
             this.sideNavPanel2.TabIndex = 6;
             this.sideNavPanel2.Visible = false;
             // 
@@ -934,11 +956,11 @@
             // 
             // 
             this.swRefreshTblsForSrch.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.swRefreshTblsForSrch.Location = new System.Drawing.Point(10, 178);
+            this.swRefreshTblsForSrch.Location = new System.Drawing.Point(10, 153);
             this.swRefreshTblsForSrch.Name = "swRefreshTblsForSrch";
             this.swRefreshTblsForSrch.Size = new System.Drawing.Size(91, 22);
             this.swRefreshTblsForSrch.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.superTooltip1.SetSuperTooltip(this.swRefreshTblsForSrch, new DevComponents.DotNetBar.SuperTooltipInfo("Refesh Tables For Search", "", resources.GetString("swRefreshTblsForSrch.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(300, 125)));
+            this.superTooltip1.SetSuperTooltip(this.swRefreshTblsForSrch, new DevComponents.DotNetBar.SuperTooltipInfo("Refresh Word Attachments", "", resources.GetString("swRefreshTblsForSrch.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(300, 200)));
             this.swRefreshTblsForSrch.SwitchClickTogglesValue = true;
             this.swRefreshTblsForSrch.TabIndex = 32;
             this.swRefreshTblsForSrch.Value = true;
@@ -953,10 +975,10 @@
             // 
             this.lblRefreshTblForSrch.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
             this.lblRefreshTblForSrch.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblRefreshTblForSrch.Location = new System.Drawing.Point(107, 178);
+            this.lblRefreshTblForSrch.Location = new System.Drawing.Point(107, 153);
             this.lblRefreshTblForSrch.Name = "lblRefreshTblForSrch";
             this.lblRefreshTblForSrch.Size = new System.Drawing.Size(186, 22);
-            this.superTooltip1.SetSuperTooltip(this.lblRefreshTblForSrch, new DevComponents.DotNetBar.SuperTooltipInfo("Refresh Tables For Search", "", resources.GetString("lblRefreshTblForSrch.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(300, 125)));
+            this.superTooltip1.SetSuperTooltip(this.lblRefreshTblForSrch, new DevComponents.DotNetBar.SuperTooltipInfo("Refresh Word Attachments", "", resources.GetString("lblRefreshTblForSrch.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(300, 200)));
             this.lblRefreshTblForSrch.TabIndex = 31;
             this.lblRefreshTblForSrch.Text = "Refresh Tables For Search";
             // 
@@ -965,7 +987,7 @@
             this.warningBox4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(196)))), ((int)(((byte)(219)))), ((int)(((byte)(249)))));
             this.warningBox4.CloseButtonVisible = false;
             this.warningBox4.Image = ((System.Drawing.Image)(resources.GetObject("warningBox4.Image")));
-            this.warningBox4.Location = new System.Drawing.Point(12, 287);
+            this.warningBox4.Location = new System.Drawing.Point(12, 264);
             this.warningBox4.Margin = new System.Windows.Forms.Padding(4);
             this.warningBox4.Name = "warningBox4";
             this.warningBox4.OptionsButtonVisible = false;
@@ -978,7 +1000,7 @@
             this.warningBox2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(196)))), ((int)(((byte)(219)))), ((int)(((byte)(249)))));
             this.warningBox2.CloseButtonVisible = false;
             this.warningBox2.Image = ((System.Drawing.Image)(resources.GetObject("warningBox2.Image")));
-            this.warningBox2.Location = new System.Drawing.Point(12, 325);
+            this.warningBox2.Location = new System.Drawing.Point(12, 302);
             this.warningBox2.Margin = new System.Windows.Forms.Padding(4);
             this.warningBox2.Name = "warningBox2";
             this.warningBox2.OptionsButtonVisible = false;
@@ -1132,7 +1154,7 @@
             // line2
             // 
             this.line2.BackColor = System.Drawing.Color.Transparent;
-            this.line2.Location = new System.Drawing.Point(4, 260);
+            this.line2.Location = new System.Drawing.Point(4, 237);
             this.line2.Name = "line2";
             this.line2.Size = new System.Drawing.Size(281, 12);
             this.line2.TabIndex = 20;
@@ -1144,7 +1166,7 @@
             this.btnRunRepair.Checked = true;
             this.btnRunRepair.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
             this.btnRunRepair.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btnRunRepair.Location = new System.Drawing.Point(5, 221);
+            this.btnRunRepair.Location = new System.Drawing.Point(5, 198);
             this.btnRunRepair.Name = "btnRunRepair";
             this.btnRunRepair.Size = new System.Drawing.Size(280, 23);
             this.btnRunRepair.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -1154,6 +1176,31 @@
             this.btnRunRepair.Text = "Run Repair";
             this.btnRunRepair.Click += new System.EventHandler(this.btnRunRepair_Click);
             // 
+            // sideNavPanel5
+            // 
+            this.sideNavPanel5.Controls.Add(this.btn_ShowUsers);
+            this.sideNavPanel5.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.sideNavPanel5.Location = new System.Drawing.Point(81, 31);
+            this.sideNavPanel5.Name = "sideNavPanel5";
+            this.sideNavPanel5.Size = new System.Drawing.Size(299, 494);
+            this.sideNavPanel5.TabIndex = 14;
+            this.sideNavPanel5.Visible = false;
+            // 
+            // btn_ShowUsers
+            // 
+            this.btn_ShowUsers.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            this.btn_ShowUsers.Checked = true;
+            this.btn_ShowUsers.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.btn_ShowUsers.Location = new System.Drawing.Point(57, 37);
+            this.btn_ShowUsers.Name = "btn_ShowUsers";
+            this.btn_ShowUsers.Size = new System.Drawing.Size(171, 23);
+            this.btn_ShowUsers.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.superTooltip1.SetSuperTooltip(this.btn_ShowUsers, new DevComponents.DotNetBar.SuperTooltipInfo("Show Users", "", "This will return all of the users currently with open sessions in the database an" +
+            "d the details of any items they have checked out.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 80)));
+            this.btn_ShowUsers.TabIndex = 0;
+            this.btn_ShowUsers.Text = "Show Users";
+            this.btn_ShowUsers.Click += new System.EventHandler(this.btn_ShowUsers_Click);
+            // 
             // sideNavItem1
             // 
             this.sideNavItem1.IsSystemMenu = true;
@@ -1171,6 +1218,14 @@
             this.separator1.Padding.Top = 2;
             this.separator1.SeparatorOrientation = DevComponents.DotNetBar.eDesignMarkerOrientation.Vertical;
             // 
+            // sideNavItmCheck
+            // 
+            this.sideNavItmCheck.Name = "sideNavItmCheck";
+            this.sideNavItmCheck.Panel = this.sideNavPanel1;
+            this.sideNavItmCheck.Symbol = "";
+            this.sideNavItmCheck.Text = "Check";
+            this.sideNavItmCheck.Click += new System.EventHandler(this.sideNavItmCheck_Click);
+            // 
             // sideNavItmRepair
             // 
             this.sideNavItmRepair.Name = "sideNavItmRepair";
@@ -1187,18 +1242,17 @@
             this.sideNavItmLinks.Text = "Links";
             this.sideNavItmLinks.Click += new System.EventHandler(this.sideNavItmLinks_Click);
             // 
-            // sideNavItmMaint
+            // sideNavItmUsers
             // 
-            this.sideNavItmMaint.Checked = true;
-            this.sideNavItmMaint.Name = "sideNavItmMaint";
-            this.sideNavItmMaint.Panel = this.sideNavPanel5;
-            this.sideNavItmMaint.Symbol = "58154";
-            this.sideNavItmMaint.SymbolSet = DevComponents.DotNetBar.eSymbolSet.Material;
-            this.sideNavItmMaint.Text = "Maintenance";
-            this.sideNavItmMaint.Click += new System.EventHandler(this.sideNavItmMaint_Click);
+            this.sideNavItmUsers.Name = "sideNavItmUsers";
+            this.sideNavItmUsers.Panel = this.sideNavPanel5;
+            this.sideNavItmUsers.Symbol = "";
+            this.sideNavItmUsers.Text = "Users";
+            this.sideNavItmUsers.Click += new System.EventHandler(this.sideNavItmUsers_Click);
             // 
             // sideNavItmDelete
             // 
+            this.sideNavItmDelete.Checked = true;
             this.sideNavItmDelete.Name = "sideNavItmDelete";
             this.sideNavItmDelete.Panel = this.sideNavPanel4;
             this.sideNavItmDelete.Symbol = "";
@@ -1307,38 +1361,6 @@
             this.superTooltip1.DefaultTooltipSettings = new DevComponents.DotNetBar.SuperTooltipInfo("", "", "", null, null, DevComponents.DotNetBar.eTooltipColor.Gray);
             this.superTooltip1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
             // 
-            // swRegenWordAttmts
-            // 
-            // 
-            // 
-            // 
-            this.swRegenWordAttmts.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.swRegenWordAttmts.Location = new System.Drawing.Point(10, 150);
-            this.swRegenWordAttmts.Name = "swRegenWordAttmts";
-            this.swRegenWordAttmts.Size = new System.Drawing.Size(91, 22);
-            this.swRegenWordAttmts.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.superTooltip1.SetSuperTooltip(this.swRegenWordAttmts, new DevComponents.DotNetBar.SuperTooltipInfo("Generate Word Attachments", "", resources.GetString("swRegenWordAttmts.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(300, 250)));
-            this.swRegenWordAttmts.SwitchClickTogglesValue = true;
-            this.swRegenWordAttmts.TabIndex = 34;
-            this.swRegenWordAttmts.Value = true;
-            this.swRegenWordAttmts.ValueObject = "Y";
-            this.swRegenWordAttmts.ValueChanged += new System.EventHandler(this.swCk_ValueChanged);
-            // 
-            // labelX1
-            // 
-            this.labelX1.BackColor = System.Drawing.Color.Transparent;
-            // 
-            // 
-            // 
-            this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.labelX1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.labelX1.Location = new System.Drawing.Point(107, 150);
-            this.labelX1.Name = "labelX1";
-            this.labelX1.Size = new System.Drawing.Size(186, 22);
-            this.superTooltip1.SetSuperTooltip(this.labelX1, new DevComponents.DotNetBar.SuperTooltipInfo("Generate Word Attachments", "", resources.GetString("labelX1.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(300, 250)));
-            this.labelX1.TabIndex = 33;
-            this.labelX1.Text = "Generate Missing Word Attachments";
-            // 
             // frmBatchRefresh
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -1368,13 +1390,11 @@
             this.panelEx1.ResumeLayout(false);
             this.sideNav1.ResumeLayout(false);
             this.sideNav1.PerformLayout();
-            this.sideNavPanel5.ResumeLayout(false);
-            this.itemPanel1.ResumeLayout(false);
-            this.itemPanel2.ResumeLayout(false);
-            this.itemPanel3.ResumeLayout(false);
-            this.sideNavPanel3.ResumeLayout(false);
             this.sideNavPanel4.ResumeLayout(false);
+            this.sideNavPanel3.ResumeLayout(false);
+            this.sideNavPanel1.ResumeLayout(false);
             this.sideNavPanel2.ResumeLayout(false);
+            this.sideNavPanel5.ResumeLayout(false);
             this.panelEx4.ResumeLayout(false);
             this.ResumeLayout(false);
 
@@ -1383,8 +1403,7 @@
 		#endregion
 
 		private System.Windows.Forms.TreeView myTV;
-        private System.Windows.Forms.TreeView myTV_RO_DBs;
-        private System.Windows.Forms.SplitContainer splitContainer3;
+		private System.Windows.Forms.SplitContainer splitContainer3;
 		private DevComponents.DotNetBar.PanelEx panelEx3;
 		private System.Windows.Forms.TextBox txtResults;
 		private System.Windows.Forms.Panel panel1;
@@ -1403,6 +1422,16 @@
 		private System.Windows.Forms.CheckBox chkLater;
 		private System.Windows.Forms.Label label4;
 		private DevComponents.DotNetBar.Controls.SideNav sideNav1;
+		private DevComponents.DotNetBar.Controls.SideNavPanel sideNavPanel1;
+		private DevComponents.DotNetBar.LabelX labelX7;
+		private DevComponents.DotNetBar.Controls.Line line1;
+		private DevComponents.DotNetBar.Controls.SwitchButton swCkObsoleteROData;
+		private DevComponents.DotNetBar.Controls.SwitchButton swHiddenDataLocs;
+		private DevComponents.DotNetBar.LabelX labelX3;
+		private DevComponents.DotNetBar.LabelX labelX2;
+		private DevComponents.DotNetBar.Controls.SwitchButton swCkOrphanDataRecs;
+		private DevComponents.DotNetBar.LabelX labelX1;
+		private DevComponents.DotNetBar.ButtonX btnRunCheck;
 		private DevComponents.DotNetBar.Controls.SideNavPanel sideNavPanel2;
 		private DevComponents.DotNetBar.Controls.SwitchButton swRmObsoleteROData;
 		private DevComponents.DotNetBar.Controls.SwitchButton swRefreshWordAttmts;
@@ -1415,14 +1444,17 @@
 		private DevComponents.DotNetBar.LabelX labelX8;
 		private DevComponents.DotNetBar.Controls.Line line2;
 		private DevComponents.DotNetBar.ButtonX btnRunRepair;
+		private DevComponents.DotNetBar.Controls.SideNavPanel sideNavPanel5;
+		private DevComponents.DotNetBar.ButtonX btn_ShowUsers;
 		private DevComponents.DotNetBar.Controls.SideNavPanel sideNavPanel3;
 		private DevComponents.DotNetBar.ButtonX btnFixLinks;
 		private DevComponents.DotNetBar.Controls.SideNavItem sideNavItem1;
 		private DevComponents.DotNetBar.Separator separator1;
+		private DevComponents.DotNetBar.Controls.SideNavItem sideNavItmCheck;
 		private DevComponents.DotNetBar.Controls.SideNavItem sideNavItmRepair;
 		private DevComponents.DotNetBar.Controls.SideNavItem sideNavItmLinks;
-        private DevComponents.DotNetBar.Controls.SideNavItem sideNavItmMaint;
-        private DevComponents.DotNetBar.Controls.SideNavItem sideNavItmExit;
+		private DevComponents.DotNetBar.Controls.SideNavItem sideNavItmUsers;
+		private DevComponents.DotNetBar.Controls.SideNavItem sideNavItmExit;
 		private DevComponents.DotNetBar.LabelX lblAdmToolProgressType;
 		private DevComponents.DotNetBar.ProgressSteps progressSteps1;
 		private DevComponents.DotNetBar.StepItem stepItem1;
@@ -1441,6 +1473,7 @@
 		private DevComponents.DotNetBar.LabelX labelX6;
 		private DevComponents.DotNetBar.Controls.WarningBox warningBox5;
 		private DevComponents.DotNetBar.Controls.Line line3;
+		private DevComponents.DotNetBar.Controls.WarningBox warningBox3;
 		private DevComponents.DotNetBar.Controls.WarningBox warningBox4;
 		private DevComponents.DotNetBar.Controls.WarningBox warningBox2;
 		private DevComponents.DotNetBar.Controls.SwitchButton swRefreshTblsForSrch;
@@ -1449,26 +1482,14 @@
 		private DevComponents.DotNetBar.LabelX labelX12;
 		private DevComponents.DotNetBar.ButtonItem buttonItem1;
 		private DevComponents.DotNetBar.Controls.SideNavPanel sideNavPanel4;
-        private DevComponents.DotNetBar.Controls.SideNavPanel sideNavPanel5;
-        private DevComponents.DotNetBar.Controls.SwitchButton swDeleteFolder;
+		private DevComponents.DotNetBar.Controls.SwitchButton swDeleteFolder;
 		private DevComponents.DotNetBar.LabelX labelX13;
 		private DevComponents.DotNetBar.Controls.SwitchButton swDeleteAnnotations;
 		private DevComponents.DotNetBar.LabelX labelX14;
 		private System.Windows.Forms.TreeView myTVdel;
 		private DevComponents.DotNetBar.ButtonX btnDeleteItems;
 		private DevComponents.DotNetBar.Controls.SideNavItem sideNavItmDelete;
-        private DevComponents.DotNetBar.PanelEx itemPanel1;
-        private DevComponents.DotNetBar.ButtonX btnPurgeChange;
-        private System.Windows.Forms.DateTimePicker dtePurge;
-        private DevComponents.DotNetBar.Controls.WarningBox warningBox3;
-        private DevComponents.DotNetBar.Controls.WarningBox warningBox6;
-        private DevComponents.DotNetBar.ButtonX btnIndexMaint;
-        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

@@ -9,7 +9,6 @@ using Volian.Controls.Library;
 using DevComponents.DotNetBar;
 using JR.Utils.GUI.Forms;
 using System.Linq;
-using System.Data;
 
 namespace VEPROMS
 {
@@ -35,8 +34,8 @@ namespace VEPROMS
 			_veProms = veProms;
 
 
-			// When opening Admin tools Repair tab will be default.
-			this.sideNavItmRepair.Checked = true;
+			// When opening Admin tools Check tab will be default.
+			this.sideNavItmCheck.Checked = true;
 
 			if (sideNavItmDelete.Checked)
 			{
@@ -62,16 +61,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
-				btnPurgeChange.Enabled = false;
 			}
-
-			//default to 10 years back
-			dtePurge.Value = DateTime.Now.AddYears(-10);
 		}
 		// Make txtProcess text box available to frmAnnotationsClean form.
 		internal TextBox GettxtProcess()
@@ -104,6 +95,7 @@ namespace VEPROMS
 			int affectedRows = ESP_FixHyphens.Execute("vesp_FixHyphens") / 2;// Two results for each change
 			txtProcess.AppendText(string.Format("Fixed {0} Hyphens", affectedRows));
 			txtProcess.AppendText(Environment.NewLine);
+			//txtProcess.AppendText(Environment.NewLine);
 			txtResults.AppendText(string.Format("{0} Hyphens were Fixed.", affectedRows));
 			txtResults.AppendText(Environment.NewLine);
 			txtResults.AppendText(Environment.NewLine);
@@ -151,31 +143,16 @@ namespace VEPROMS
 			return false;
 		}
 
-		//C2026-002 Enhancements to new admin Tool for ROs not used.
-		private void ResetmyTV_RO_DBs()
+		private List<string> myTreeNodePath;
+		private void ResetTV()
 		{
-			this.Cursor = Cursors.WaitCursor;
-			myTV_RO_DBs.Nodes.Clear();
-
-			TreeNode tn = myTV_RO_DBs.Nodes.Add("Select All");
-			tn.Tag = 0;
-			tn.Checked = true;
-
-			foreach (DataRow rw in GeneralReports.GetRODBs().Rows)
-			{
-				TreeNode tn_db = tn.Nodes.Add(rw["dbiTitle"].ToString());
-				tn_db.Tag = rw["dbiID"].ToString();
-				tn_db.Checked = true;
-			}
-			tn.Expand();
-
-			this.Cursor = Cursors.Default;
+			ResetTV(false);
 		}
-
-	private void ResetTV(bool noProcs)
+		private void ResetTV(bool noProcs)
 		{
 			btnFixLinks.Enabled = false;
 			this.Cursor = Cursors.WaitCursor;
+			//myTreeNodePath = new List<string>();
 			myTV.Nodes.Clear();
 			myDocVersions.Clear();
 			myFolders.Clear();
@@ -188,6 +165,10 @@ namespace VEPROMS
 				myTV.SelectedNode.Expand();
 			this.Cursor = Cursors.Default;
 		}
+		private void ResetDelTV()
+		{
+			ResetDelTV(false);
+		}
 		private void ResetDelTV(bool noProcs)
 		{
 			btnFixLinks.Enabled = false;
@@ -227,10 +208,13 @@ namespace VEPROMS
 				TreeNode tnc = tn.Nodes.Add(fic.Name);
 				tnc.Tag = fic;
 
-                if (fic.ChildFolderCount > 0 && LoadChildFolders(fic, tnc, noProcs))
-                    loadedChildWorkingDraft = true;
+				if (fic.ChildFolderCount > 0)
+				{
+					if (LoadChildFolders(fic, tnc, noProcs))
+						loadedChildWorkingDraft = true;
+				}
 
-                if (fic.FolderDocVersionCount > 0)
+				if (fic.FolderDocVersionCount > 0)
 				{
 					if (!LoadDocVersions(fic, tnc, noProcs))
 						tnc.Remove();
@@ -268,9 +252,12 @@ namespace VEPROMS
 				{
 					tnc.Tag = dvi;
 					myDocVersions.Add(tnc, dvi);
-                    if (!noProcs && dvi.Procedures.Count > 0)
-                        LoadProcedures(dvi, tnc);
-                    rtnval = true;
+					if (!noProcs)
+					{
+						if (dvi.Procedures.Count > 0)
+							LoadProcedures(dvi, tnc);
+					}
+					rtnval = true;
 				}
 				else
 				{
@@ -286,7 +273,7 @@ namespace VEPROMS
 		}
 		private void LoadProcedures(DocVersionInfo dvi, TreeNode tnc)
 		{
-			foreach (ProcedureInfo pi in dvi.Procedures.OfType<ProcedureInfo>())
+			foreach (ProcedureInfo pi in dvi.Procedures)
 			{
 				TreeNode tn = tnc.Nodes.Add(string.Format("{0} {1}", pi.DisplayNumber, pi.DisplayText));
 				myProcedures.Add(tn, pi);
@@ -340,7 +327,7 @@ namespace VEPROMS
 						// C2023-002:  Loop through the docversion's procedures to determine which cannot be open and add to
 						//	list.  The frmBatchRefreshCheckedOut dialog operates on procedures, not docversions.
 						string msgp = string.Empty;
-						foreach (ProcedureInfo pi in dq.Procedures.OfType<ProcedureInfo>())
+						foreach (ProcedureInfo pi in dq.Procedures)
 						{
 							if (!MySessionInfo.CanCheckOutItem(pi.ItemID, CheckOutType.Procedure, ref msgp)) pil.Add(pi);
 						}
@@ -533,6 +520,7 @@ namespace VEPROMS
 			foreach (TreeNode tn in myProcedures.Keys)
 				if (tn.Checked)
 					pil.Add(myProcedures[tn]);
+			//PopulateTransitionInfoLists(pil);
 			DateTime pStart = DateTime.Now;
 			txtProcess.AppendText("Refresh Transitions");
 			txtProcess.AppendText(Environment.NewLine);
@@ -650,111 +638,11 @@ namespace VEPROMS
 			this.Cursor = Cursors.Default;
 		}
 
-		private int RegenCounter = 0;
-		private int RegenTotal = 0;
-		private const int TicksToupdate = 300000; //5 minutes(300 seconds).
-
-        // C2026-007 - Generate Missing PDFs
-        // regenerates the saved attachment PDFs from the database
-        // so that this is not needed the next time the procedures are printed.  This also forces ROs to be refreshed in the attachments
-        private void RegenPDFs()
-        {
-            this.Cursor = Cursors.WaitCursor;
-            DateTime pStart = DateTime.Now;
-            txtProcess.AppendText("Generating missing Word Attachments");
-            txtProcess.AppendText(Environment.NewLine);
-            txtProcess.AppendText(string.Format("Started: {0}", pStart.ToString("MM/dd/yyyy @ HH:mm")));
-            txtProcess.AppendText(Environment.NewLine);
-            txtProcess.AppendText("Gathering data for Word Attachments that need generated.");
-            txtProcess.AppendText(Environment.NewLine);
-            Application.DoEvents();
-
-			//get data of missing Docs by Unit that will need regenerated
-			DataTable dt = Maintenance.GetMissingDocsByUnit();
-            RegenCounter = 0;
-            RegenTotal = dt.Rows.Count;
-            txtProcess.AppendText($"Word Attachments to be generated: {RegenTotal}");
-            txtProcess.AppendText(Environment.NewLine);
-            txtProcess.AppendText(Environment.NewLine);
-            txtProcess.AppendText($"Note that this will provide updates approximately every {TicksToupdate/60000} minutes. Some attachments may take longer than others due to size/number of pages/number of ROs. If PROMS is in the middle of generating a large attachment, it may delay the update message until generation of that attachment completes (in that case taking more than 5 minutes between updates).");
-            txtProcess.AppendText(Environment.NewLine);
-            txtProcess.AppendText(Environment.NewLine);
-            txtResults.AppendText($"{RegenTotal} Word Attachments to be generated.");
-            txtResults.AppendText(Environment.NewLine);
-            txtResults.AppendText(Environment.NewLine);
-
-			//generate as if not debug
-			int debugstatus = MSWordToPDF.DebugStatus;
-            MSWordToPDF.DebugStatus = 0;
-            MSWordToPDF.OverrideColor = Color.Transparent;
-
-			Timer timer1 = new Timer();
-            timer1.Tick += new EventHandler(UpdateRegenProgress);
-            timer1.Interval = TicksToupdate;
-            timer1.Start();
-
-            foreach (DataRow dr in dt.Rows)
-			{
-				//Do Generation
-				using (Section sect = Section.Get((int)dr["SectionID"]))
-				{
-					using (DocumentInfo docInfo = DocumentInfo.Get((int)dr["DocID"]))
-					{
-						if (!dr.IsNull("UnitID")) sect.MyItemInfo.MyDocVersion.DocVersionConfig.SelectedSlave = (int)dr["UnitID"];
-						MSWordToPDF.SetDocPdf(docInfo, sect.MyItemInfo);
-					}
-				}
-
-                //Increment - message every _ minutes
-                RegenCounter++;
-			}
-
-			//done with loop - stop timer and destroy it
-			timer1.Stop();
-			timer1.Dispose();
-
-            //Change DebugStatus Back to what it was
-            if (debugstatus == 1)
-            {
-                MSWordToPDF.DebugStatus = 1;
-                MSWordToPDF.OverrideColor = Color.Red;
-            }
-            else
-            {
-                MSWordToPDF.DebugStatus = 0;
-                MSWordToPDF.OverrideColor = Color.Transparent;
-            }
-
-            //end messaging
-            txtProcess.AppendText(Environment.NewLine);
-            txtProcess.AppendText($"Word Attachments Generated: {RegenTotal}");
-            txtProcess.AppendText(Environment.NewLine);
-            txtResults.AppendText(Environment.NewLine);
-            txtResults.AppendText($"{RegenTotal} Word Attachments generated.");
-            txtResults.AppendText(Environment.NewLine);
-            txtResults.AppendText(Environment.NewLine);
-            txtProcess.AppendText($"Completed: {DateTime.Now:G}");
-            txtProcess.AppendText(Environment.NewLine);
-            txtProcess.AppendText(Environment.NewLine);
-            Application.DoEvents();
-            this.Cursor = Cursors.Default;
-        }
-
-		//Outputs the Progress of Regenerating the PDFs every __ minutes
-        private void UpdateRegenProgress(Object myObject, EventArgs myEventArgs)
-        {
-            string progress_str = $"Generated {RegenCounter} of {RegenTotal} ({(decimal)RegenCounter / RegenTotal * 100M:F2}%): {DateTime.Now:G}";
-            txtProcess.AppendText(progress_str);
-            txtProcess.AppendText(Environment.NewLine);
-            txtResults.AppendText(progress_str);
-            txtResults.AppendText(Environment.NewLine);
-        }
-
-        // B2022-047 - refresh the Content/Text field for table, i.e. Grid, Data so that search will find text in the Grid
-        //	NOTE that an out of memeory error occurs when having to process alot of tables.  A config flag is used on the
-        //	grid record to flag that this operation has been run.  And a message is placed in the result window stating to
-        //	rerun until all tables/text fields are completed.
-        private void RefreshTablesForSearch()
+		// B2022-047 - refresh the Content/Text field for table, i.e. Grid, Data so that search will find text in the Grid
+		//	NOTE that an out of memeory error occurs when having to process alot of tables.  A config flag is used on the
+		//	grid record to flag that this operation has been run.  And a message is placed in the result window stating to
+		//	rerun until all tables/text fields are completed.
+		private void RefreshTablesForSearch()
 		{
 			this.Cursor = Cursors.WaitCursor;
 			DateTime pStart = DateTime.Now;
@@ -822,7 +710,7 @@ namespace VEPROMS
 								cc.Save();
 							}
 						}
-						catch
+						catch (Exception ex)
 						{
 							this.Cursor = Cursors.Default;
 							return -cntfix;
@@ -834,6 +722,42 @@ namespace VEPROMS
 			}
 			return cntfix;
 		}
+		// C2017-030 - new Admin Tools user interface
+		// tool renamed to Identify Orphan Items
+		private void IdentifyDisconnectedItems()
+		{
+			this.Cursor = Cursors.WaitCursor;
+			DateTime pStart = DateTime.Now;
+			txtProcess.AppendText("Identifing Orphan Items");
+			txtProcess.AppendText(Environment.NewLine);
+			txtProcess.AppendText(string.Format("Started: {0}", pStart.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(Environment.NewLine);
+			Application.DoEvents();
+			int rowCount = ESP_IdentifyDisconnectedItems.Execute("vesp_GetDisconnectedItemsCount");
+			txtProcess.AppendText(string.Format("Orphan Items Count:  {0}", rowCount));
+			txtProcess.AppendText(Environment.NewLine);
+			if (rowCount > 0)
+			{
+				txtResults.AppendText(string.Format("The database contains {0} Orphan items.", rowCount));
+				txtResults.AppendText(Environment.NewLine);
+				txtResults.AppendText("These can be removed via the Remove Orphan Data Records in the Repair tools");
+				txtResults.AppendText(Environment.NewLine);
+				txtResults.AppendText(Environment.NewLine);
+			}
+			else
+			{
+				txtResults.AppendText("No Orphan Records Found");// B2017-108 Always output results even if there isn't any 
+				txtResults.AppendText(Environment.NewLine);
+				txtResults.AppendText(Environment.NewLine);
+			}
+			DateTime pEnd = DateTime.Now;
+			txtProcess.AppendText(string.Format("Completed: {0}", pEnd.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(Environment.NewLine);
+			txtProcess.AppendText(Environment.NewLine);
+			Application.DoEvents();
+			this.Cursor = Cursors.Default;
+			//MessageBox.Show(string.Format("{0} Completed", "Orphan Items Check"), "Orphan Items");
+		}
 
 		// C2017-030 - new Admin Tools user interface
 		// tool renamed to Remove Orphan Items
@@ -853,6 +777,8 @@ namespace VEPROMS
 				int rowCount2 = ESP_IdentifyDisconnectedItems.Execute("vesp_GetDisconnectedItemsCount");
 				txtProcess.AppendText(string.Format("Orphan Items Purged: {0}", rowCount));
 				txtProcess.AppendText(Environment.NewLine);
+				//txtProcess.AppendText(Environment.NewLine);
+				//txtResults.Clear();
 				txtResults.AppendText(string.Format("The database contained {0} Orphan items.", rowCount));
 				txtResults.AppendText(Environment.NewLine);
 				txtResults.AppendText(Environment.NewLine);
@@ -869,10 +795,11 @@ namespace VEPROMS
 			}
 			else
 			{
+				//txtResults.Clear();
 				txtResults.AppendText(string.Format("The database contained {0} Orphan items.", rowCount));
 				txtResults.AppendText(Environment.NewLine);
 				txtResults.AppendText(Environment.NewLine);
-				txtResults.AppendText("No Orpan Items to Purge!");
+				txtResults.AppendText(string.Format("No Orpan Items to Purge!"));
 				txtResults.AppendText(Environment.NewLine);
 				txtResults.AppendText(Environment.NewLine);
 			}
@@ -884,6 +811,45 @@ namespace VEPROMS
 			this.Cursor = Cursors.Default;
 		}
 
+		// C2017-030 - new Admin Tools user interface
+		// is one of two tools run from Check Obsolete RO Data
+		private void IdentifyUnusedRoFstsAndFigures()
+		{
+			this.Cursor = Cursors.WaitCursor;
+			DateTime pStart = DateTime.Now;
+			txtProcess.AppendText("Identifing Unused RoFsts and Figures");
+			txtProcess.AppendText(Environment.NewLine);
+			txtProcess.AppendText(string.Format("Started: {0}", pStart.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(Environment.NewLine);
+			Application.DoEvents();
+			int rowCountRoFst = ESP_GetUnusedRoFsts.Execute("vesp_GetUnusedRoFstsCount");
+			int rowCountFigures = ESP_GetUnusedFigures.Execute("vesp_GetUnusedFiguresCount");
+			txtProcess.AppendText(string.Format("Unused RoFsts Count:  {0}, Unused Figures Count:  {1}", rowCountRoFst, rowCountFigures));
+			txtProcess.AppendText(Environment.NewLine);
+			if (rowCountRoFst > 0 || rowCountFigures > 0)
+			{
+				txtResults.AppendText(string.Format("The database contains {0} unused RoFsts.", rowCountRoFst));
+				txtResults.AppendText(Environment.NewLine);
+				txtResults.AppendText(string.Format("The database contains {0} unused Figures items.", rowCountFigures));
+				txtResults.AppendText(Environment.NewLine);
+				txtResults.AppendText(Environment.NewLine);
+			}
+			else
+			{
+				txtResults.AppendText("No Unused  RoFsts or Figures Found"); // B2017-108 Always output results even if there isn't any
+				txtResults.AppendText(Environment.NewLine);
+				txtResults.AppendText(Environment.NewLine);
+			}
+
+			DateTime pEnd = DateTime.Now;
+			txtProcess.AppendText(string.Format("Completed: {0}", pEnd.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(Environment.NewLine);
+			txtProcess.AppendText(string.Format("Started: {0}", pStart.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(Environment.NewLine);
+			Application.DoEvents();
+			this.Cursor = Cursors.Default;
+		}
+
 		// C2017-030 - new Admin Tools user interface is one of two tools run from Remove Obsolete RO Data
 		private void RemoveUnusedRoFstsAndFigures()
 		{
@@ -927,7 +893,41 @@ namespace VEPROMS
 			{
 				txtProcess.AppendText(string.Format("The database contained {0} unused RoFSTs or Figures.", rowCountRoFst + rowCountFigures));
 				txtProcess.AppendText(Environment.NewLine);
-				txtResults.AppendText("No Unused ROFSTs To Remove.");
+				txtResults.AppendText(string.Format("No Unused ROFSTs To Remove."));
+				txtResults.AppendText(Environment.NewLine);
+				txtResults.AppendText(Environment.NewLine);
+			}
+			DateTime pEnd = DateTime.Now;
+			txtProcess.AppendText(string.Format("Completed: {0}", pEnd.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(Environment.NewLine);
+			txtProcess.AppendText(Environment.NewLine);
+			Application.DoEvents();
+			this.Cursor = Cursors.Default;
+		}
+
+		// C2017-030 - new Admin Tools user interface
+		// is one of two tools run from Check Obsolete RO Data
+		private void IdentifyROAssociations()
+		{
+			this.Cursor = Cursors.WaitCursor;
+			DateTime pStart = DateTime.Now;
+			txtProcess.AppendText("Identifing Unused RO Associations");
+			txtProcess.AppendText(Environment.NewLine);
+			txtProcess.AppendText(string.Format("Started: {0}", pStart.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(Environment.NewLine);
+			Application.DoEvents();
+			int rowCount = ESP_GetROAssoc.Execute("vesp_GetUnusedROAssociationsCount");
+			txtProcess.AppendText(string.Format("Unused RO Associations Count:  {0}", rowCount));
+			txtProcess.AppendText(Environment.NewLine);
+			if (rowCount > 0)
+			{
+				txtResults.AppendText(string.Format("The database contains {0} unused RO Associations.", rowCount));
+				txtResults.AppendText(Environment.NewLine);
+				txtResults.AppendText(Environment.NewLine);
+			}
+			else
+			{
+				txtResults.AppendText("No unused RO Associations Found");// B2017-108 Always output results even if there isn't any
 				txtResults.AppendText(Environment.NewLine);
 				txtResults.AppendText(Environment.NewLine);
 			}
@@ -976,7 +976,7 @@ namespace VEPROMS
 				txtResults.AppendText(string.Format("The database contained {0} Unused RO Associations.", rowCount));
 				txtResults.AppendText(Environment.NewLine);
 				txtResults.AppendText(Environment.NewLine);
-				txtResults.AppendText("No Unused RO Associations to Purge.");
+				txtResults.AppendText(string.Format("No Unused RO Associations to Purge."));
 				txtResults.AppendText(Environment.NewLine);
 				txtResults.AppendText(Environment.NewLine);
 			}
@@ -988,6 +988,49 @@ namespace VEPROMS
 			this.Cursor = Cursors.Default;
 		}
 
+		// C2017-030 - new Admin Tools user interface
+		// tool was renamed to Hidden Data Locations (on Check list)
+		private void IdentifyNonEditableItems()
+		{
+			this.Cursor = Cursors.WaitCursor;
+			DateTime pStart = DateTime.Now;
+			txtProcess.AppendText("Identifing Hidden Item Locations");
+			txtProcess.AppendText(Environment.NewLine);
+			txtProcess.AppendText(string.Format("Started: {0}", pStart.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(Environment.NewLine);
+			Application.DoEvents();
+			List<ItemInfo> myItems = ESP_IdentifyNonEditableItems.Execute("vesp_GetNonEditableItems");
+			txtProcess.AppendText(string.Format("Hidden Items Count:  {0}", myItems.Count));
+			txtProcess.AppendText(Environment.NewLine);
+			if (myItems.Count > 0)
+			{
+				txtResults.AppendText("The following items are hidden (non-editable)...");
+				txtResults.AppendText(Environment.NewLine);
+				txtResults.AppendText(Environment.NewLine);
+				foreach (ItemInfo ii in myItems)
+				{
+					txtResults.AppendText(ii.Path);
+					txtResults.AppendText(Environment.NewLine);
+				}
+				txtResults.AppendText(Environment.NewLine);
+			}
+			else
+			{
+				txtResults.AppendText("No Hidden Data Found");// B2017-108 Always output results even if there isn't any
+				txtResults.AppendText(Environment.NewLine);
+				txtResults.AppendText(Environment.NewLine);
+			}
+			//C2025-011 RO Update Admin Tool Memory Enhancements 
+			//clear the list since no longer using it
+			myItems.Clear();
+			DateTime pEnd = DateTime.Now;
+			txtProcess.AppendText(string.Format("Completed: {0}", pEnd.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(Environment.NewLine);
+			txtProcess.AppendText(Environment.NewLine);
+			Application.DoEvents();
+			this.Cursor = Cursors.Default;
+		}
+
 		// C2017-030 - new Admin Tools user interface
 		// tool was renamed to Show Users
 		private void GetDatabaseSessions()
@@ -1052,6 +1095,7 @@ namespace VEPROMS
 				return;
 			}
 
+			//FileInfo fiRofst = new FileInfo(rofstPath);
 			Cursor = Cursors.WaitCursor;
 
 			using (DocVersion dv = DocVersion.Get(dq.VersionID))
@@ -1065,6 +1109,7 @@ namespace VEPROMS
 				}
 				roFstInfo.ROTableUpdate += new ROFstInfoROTableUpdateEvent(roFstInfo_ROTableUpdate);
 				ROFst newrofst = ROFstInfo.RefreshROFst(dv, roFstInfo, DoProgressBarRefresh, txtProcess);
+				//ROFst newrofst = ROFstInfo.RefreshROFst(dv, roFstInfo, DoProgressBarRefresh, null);
 				roFstInfo.ROTableUpdate -= new ROFstInfoROTableUpdateEvent(roFstInfo_ROTableUpdate);
 			}
 
@@ -1077,13 +1122,14 @@ namespace VEPROMS
 			txtResults.AppendText(Environment.NewLine);
 			txtResults.AppendText(Environment.NewLine);
 
+			return;
 		}
 
 		private void RefreshProcedureTransitions(ProcedureInfo pq)
 		{
 			DateTime start = DateTime.Now;
 			ProcedureInfo.ResetTranCounters();
-			ProcedureInfo.RefreshTransitions(pq);
+			ProcedureInfo.RefreshTransitions(pq);//, transitionsToDisconnected, transitionsToNonEditable);
 			TimeSpan ts = DateTime.Now - start;
 			// B2018-002 - Invalid Transitions - Display Transition Refresh Statistics
 			txtProcess.AppendText(string.Format("Procedure:  {1}{0}Checked {2} Transitions{0}Fixed {3} Transitions{0}Converted to Text {4} Transitions{0}Cant Fix (Annotation: Bad Transition Link) {5} Transitions{0}Elapsed Seconds:{6}{0}{0}", Environment.NewLine, pq.DisplayNumber, ProcedureInfo.TranCheckCount, ProcedureInfo.TranFixCount, ProcedureInfo.TranConvertCount, ProcedureInfo.TranCantFixCount, ts.TotalSeconds));
@@ -1099,6 +1145,41 @@ namespace VEPROMS
 			return VlnFlexGrid.ROTableUpdate(sender, args);
 		}
 
+		private void PopulateTransitionInfoLists(List<ProcedureInfo> pil)
+		{
+			Dictionary<int, int> dic = new Dictionary<int, int>();
+			StringBuilder sb = new StringBuilder();
+			foreach (ProcedureInfo pi in pil)
+				if (!dic.ContainsKey(pi.MyDocVersion.VersionID))
+				{
+					dic.Add(pi.MyDocVersion.VersionID, pi.MyDocVersion.VersionID);
+					sb.Append(sb.Length == 0 ? pi.MyDocVersion.VersionID.ToString() : "," + pi.MyDocVersion.VersionID.ToString());
+				}
+			txtProcess.AppendText("Preparing to process...");
+			txtProcess.AppendText(Environment.NewLine);
+			Application.DoEvents();
+			//transitionsToDisconnected = TransitionInfoList.GetTransitionsToDisconnected(sb.ToString());
+			//transitionsToNonEditable = TransitionInfoList.GetTransitionsToNonEditable(sb.ToString());
+		}
+
+		private void ProgressBarShowText()
+		{
+			pbProcess.Refresh();
+			int percent = (int)(((double)(pbProcess.Value - pbProcess.Minimum) /
+			(double)(pbProcess.Maximum - pbProcess.Minimum)) * 100);
+			using (Graphics gr = pbProcess.CreateGraphics())
+			{
+				gr.DrawString(percent.ToString() + "%",
+						SystemFonts.DefaultFont,
+						Brushes.Black,
+						new PointF(pbProcess.Width / 2 - (gr.MeasureString(percent.ToString() + "%",
+								SystemFonts.DefaultFont).Width / 2.0F),
+						pbProcess.Height / 2 - (gr.MeasureString(percent.ToString() + "%",
+								SystemFonts.DefaultFont).Height / 2.0F)));
+			}
+			Application.DoEvents();
+		}
+
 		StringBuilder myFixes;
 		int myFixesCount = 0;
 		int myConvertCount = 0;
@@ -1118,6 +1199,7 @@ namespace VEPROMS
 			{
 				txtResults.AppendText(string.Format("Fixed Referenced Object for {1}({4}){0}Old Text: {2}{0}New Text: {3}{0}{0}", Environment.NewLine, (sender as ItemInfo).ShortPath, args.OldValue, args.NewValue, (sender as ItemInfo).ItemID));
 				Application.DoEvents();
+				//myFixes.AppendLine(string.Format("Fixed Referenced Object for {1}{0}Old Text: {2}{0}New Text: {3}{0}", Environment.NewLine, (sender as ItemInfo).ShortPath, args.OldValue, args.NewValue));
 			}
 			else // B2018-002 - Invalid Transitions - Display Transition Cconversion Statistics
 			{
@@ -1148,70 +1230,7 @@ namespace VEPROMS
 			}
 		}
 
-		//C2021-058 Admin Tool Purge Change History
-		private void btnPurgeChange_Click(object sender, EventArgs e)
-		{
-
-			if (AreOtherUserSessionsInProgress() || !CheckProcessLater()) return;  // delay processing if set
-
-			//check any users have active sessions
-			//if they do, do not continue
-			if (!AreOtherUserSessionsInProgress())
-			{
-				DialogResult dr = MessageBox.Show("Are you sure you wish to Perform this action. This will remove all audit records before the specified date above, as well as the ability to restore deleted items from before the above date. It is recommended that you perform a database backup prior to performing this action.", "Purge Change History", MessageBoxButtons.OKCancel);
-				if (dr == DialogResult.OK)
-				{
-
-					//Purge Change History
-					string statmsg = $"Purging all Change History before {dtePurge.Value.Date.ToString("MM/dd/yyyy")}";
-					InitialProgressBarMessage = statmsg;
-					txtResults.AppendText(statmsg);
-					txtResults.AppendText(Environment.NewLine);
-					txtResults.AppendText(Environment.NewLine);
-					Maintenance.PurgeChangeHistory(dtePurge.Value);
-
-					//update status
-					statmsg = $"Finished Purging all Change History before {dtePurge.Value.Date.ToString("MM/dd/yyyy")}. Updating indexes to reflect cleaned data.";
-					DoProgressBarRefresh(50, 100, statmsg);
-					txtProcess.AppendText(statmsg);
-					txtProcess.AppendText(Environment.NewLine);
-					txtProcess.AppendText(Environment.NewLine);
-					txtResults.AppendText(statmsg);
-					txtResults.AppendText(Environment.NewLine);
-					txtResults.AppendText(Environment.NewLine);
-
-					//Perform Index Maintenance
-					Maintenance.IndexMaintenance();
-					statmsg = "Finished Purging Change History and Updating indexes to reflect cleaned data.";
-					FinalProgressBarMessage = statmsg;
-					txtResults.AppendText(statmsg);
-					txtResults.AppendText(Environment.NewLine);
-					txtResults.AppendText(Environment.NewLine);
-
-					MessageBox.Show("Purge Change History Completed", "Purge Change History");
-				}
-			}
-		}
-		
 		private void myTV_AfterCheck(object sender, TreeViewEventArgs e)
-		{
-			//B2025 - 013 Admin Tool Tree Behavior
-			//only want to perform this if
-			// not an unknown action
-			// aka is a mouse click
-			// if this is fire-ing because clicked a parent or a child of an item
-			// want this to only fire once - for the item clicked - not for parents/children
-			if (e.Action != TreeViewAction.Unknown)
-			{
-				TreeView_AfterCheck(sender, e);
-
-				btnFixLinks.Enabled = btnDeleteItems.Enabled = AtLeastOneNodeChecked(((TreeView)sender).Nodes); // C2017-030 support for Refresh Transitions/Update RO Values
-			}
-
-		}
-
-		//C2026-002 Enhancements to new admin Tool for ROs not used.
-		private void TreeView_AfterCheck(object sender, TreeViewEventArgs e)
 		{
 			//B2025 - 013 Admin Tool Tree Behavior
 			//only want to perform this if
@@ -1233,9 +1252,12 @@ namespace VEPROMS
 					DiselectParentNodes(e.Node.Parent);
 					DiselectChildNodes(e.Node.Nodes);
 				}
+
+				btnFixLinks.Enabled = btnDeleteItems.Enabled = AtLeastOneNodeChecked(((TreeView)sender).Nodes); // C2017-030 support for Refresh Transitions/Update RO Values
 			}
 
 		}
+
 		private void DiselectParentNodes(TreeNode parent)
 		{
 			while (parent != null)
@@ -1332,6 +1354,14 @@ namespace VEPROMS
 			pnlLater.Enabled = chkLater.Checked;
 		}
 
+		// C2017-030 new Admin Tools user interface
+		private void sideNavItmCheck_Click(object sender, EventArgs e)
+		{
+			AdminToolType = E_AdminToolType.Check;
+			lblAdmToolProgressType.Text = "Checking:";
+			setupProgessSteps1();
+		}
+
 		// C2017-030 new Admin Tools user interface
 		private void sideNavItmRepair_Click(object sender, EventArgs e)
 		{
@@ -1357,6 +1387,13 @@ namespace VEPROMS
 				ResetTV(false);
 		}
 
+		// C2017-030 new Admin Tools user interface
+		private void sideNavItmUsers_Click(object sender, EventArgs e)
+		{
+			AdminToolType = E_AdminToolType.Users;
+			setupProgessSteps1();
+		}
+
 		// C2017-030 new Admin Tools user interface
 		private void sideNavItmExit_Click(object sender, EventArgs e)
 		{
@@ -1376,39 +1413,31 @@ namespace VEPROMS
 				ResetDelTV(false);
 		}
 
-		//C2021-058 Admin Tool Purge Change History
-		//new Maintenance tab
-		private void sideNavItmMaint_Click(object sender, EventArgs e)
-		{
-			AdminToolType = E_AdminToolType.Maintenance;
-			setupProgessSteps1();
-			ResetmyTV_RO_DBs();   //C2026-002 Enhancements to new admin Tool for ROs not used.
+		// new Admin Tools user interface for deletes
+		//private void sideNavItmDelete_Click_1(object sender, EventArgs e)
+		//{
 
-			//notify Set Admin user that only Full Admins can run maintenance tools
-			if (!IsAdministratorUser) 
-			{
-				MessageBox.Show("Note: Only Full PROMS Administrator Users can run Purge Change History", "Maintenance Tools", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
-			}
-		}
+		//}
 
 		#region On/Off Swiches
 
 		// C2017-030 new Admin Tools user interface
 		private enum E_AdminToolType : int
 		{
+			Check = 0,
 			Repair = 1,
 			Links = 2,
-			Delete = 4,
-			Maintenance = 10
+			Users = 3,
+			Delete = 4
 		};
-		private E_AdminToolType AdminToolType = E_AdminToolType.Repair;
+		private E_AdminToolType AdminToolType = 0;
 
 		DevComponents.DotNetBar.StepItem siOrphDatRecs = new DevComponents.DotNetBar.StepItem("siOrphDatRecs", "Orphan Data Records");
+		DevComponents.DotNetBar.StepItem siHiddenDataLocs = new DevComponents.DotNetBar.StepItem("siHiddenDataLocs", "Hidden Data");
 		DevComponents.DotNetBar.StepItem siObsoleteROData = new DevComponents.DotNetBar.StepItem("siObsoleteROData", "Obsolete RO Data");
 		DevComponents.DotNetBar.StepItem siStandardHyphens = new DevComponents.DotNetBar.StepItem("siStandardHyphens", "Standardize Hyphens");
 		DevComponents.DotNetBar.StepItem siRefreshAttmts = new DevComponents.DotNetBar.StepItem("siRefreshAttmts", "Refresh Word Attachments");
-        DevComponents.DotNetBar.StepItem siRegenAttmts = new DevComponents.DotNetBar.StepItem("siRegenAttmts", "Regenerate Word Attachments");
-        DevComponents.DotNetBar.StepItem siRefreshTblsSrchTxt = new DevComponents.DotNetBar.StepItem("siRefreshTblsSrchTxt", "Refresh Tables For Search");
+		DevComponents.DotNetBar.StepItem siRefreshTblsSrchTxt = new DevComponents.DotNetBar.StepItem("siRefreshTblsSrchTxt", "Refresh Tables For Search");
 		// this will update/rebuild the progress bar in the bottom panel of Admin Tools
 		private void setupProgessSteps1()
 		{
@@ -1417,6 +1446,18 @@ namespace VEPROMS
 
 			switch (AdminToolType)
 			{
+				case E_AdminToolType.Check:
+					if (swCkOrphanDataRecs.Value)
+						progressSteps1.Items.Add(siOrphDatRecs);
+					if (swHiddenDataLocs.Value)
+						progressSteps1.Items.Add(siHiddenDataLocs);
+					if (swCkObsoleteROData.Value)
+						progressSteps1.Items.Add(siObsoleteROData);
+					splitContainer3.Panel2Collapsed = false;
+					progressSteps1.Visible = true;
+					progressSteps1.Refresh();
+					break;
+
 				case E_AdminToolType.Repair:
 					if (swRmOrphanDataRecs.Value)
 						progressSteps1.Items.Add(siOrphDatRecs);
@@ -1426,9 +1467,7 @@ namespace VEPROMS
 						progressSteps1.Items.Add(siStandardHyphens);
 					if (swRefreshWordAttmts.Value)
 						progressSteps1.Items.Add(siRefreshAttmts);
-					if (swRegenWordAttmts.Value)
-                        progressSteps1.Items.Add(siRegenAttmts);
-                    if (swRefreshTblsForSrch.Value)
+					if (swRefreshTblsForSrch.Value)
 						progressSteps1.Items.Add(siRefreshTblsSrchTxt);
 					splitContainer3.Panel2Collapsed = false;
 					progressSteps1.Visible = true;
@@ -1436,7 +1475,7 @@ namespace VEPROMS
 					break;
 
 				case E_AdminToolType.Links:
-				case E_AdminToolType.Maintenance:
+				case E_AdminToolType.Users:
 					splitContainer3.Panel2Collapsed = true;
 					progressSteps1.Visible = false;
 					break;
@@ -1493,6 +1532,7 @@ namespace VEPROMS
 		private void StepProgress(int prgStpIdx, int val)
 		{
 			((DevComponents.DotNetBar.StepItem)progressSteps1.Items[prgStpIdx]).Value = val;
+			return;
 		}
 
 		private void ClearStepProgress()
@@ -1555,6 +1595,42 @@ namespace VEPROMS
 				CheckROLinks(); // C2022-028 check for Bad RO Links
 		}
 
+		private void btnRunCheck_Click(object sender, EventArgs e)
+		{
+			if (!CheckProcessLater()) return;  // delay processing if set//B2017-221 Allow the batch dialog to close when waiting to process.
+
+			int prgStpIdx = -1;
+			txtResults.Clear();
+			txtProcess.Clear();
+
+			if (swCkOrphanDataRecs.Value)
+			{
+				StepProgress(++prgStpIdx, 50);
+				IdentifyDisconnectedItems(); // orphan items
+				StepProgress(prgStpIdx, 100);
+			}
+
+			if (swHiddenDataLocs.Value)
+			{
+				StepProgress(++prgStpIdx, 50);
+				IdentifyNonEditableItems(); // hidden items
+				StepProgress(prgStpIdx, 100);
+			}
+
+			if (swCkObsoleteROData.Value)
+			{
+				StepProgress(++prgStpIdx, 25);
+				IdentifyROAssociations();
+				StepProgress(prgStpIdx, 50);
+				IdentifyUnusedRoFstsAndFigures();
+				StepProgress(prgStpIdx, 100);
+			}
+
+			MessageBox.Show("Check Functions Completed", "Check");
+
+			ClearStepProgress();
+		}
+
 		private void btnRunRepair_Click(object sender, EventArgs e)
 		{
 			if (!CheckProcessLater()) return;  // delay processing if set//B2017-221 Allow the batch dialog to close when waiting to process.
@@ -1592,13 +1668,7 @@ namespace VEPROMS
 				DeletePDFs();  // refresh word attachments
 				StepProgress(prgStpIdx, 100);
 			}
-            if (swRegenWordAttmts.Value)
-            {
-                StepProgress(++prgStpIdx, 50);
-                RegenPDFs();  // generate missing pdfs
-                StepProgress(prgStpIdx, 100);
-            }
-            if (swRefreshTblsForSrch.Value)
+			if (swRefreshTblsForSrch.Value)
 			{
 				StepProgress(++prgStpIdx, 50);
 				RefreshTablesForSearch();
@@ -1685,12 +1755,12 @@ namespace VEPROMS
 				if (!MySessionInfo.CanCheckOutItem(dq.VersionID, CheckOutType.DocVersion, ref msg))
 				{
 					string msgp = string.Empty;
-					foreach (ProcedureInfo pi in dq.Procedures.OfType<ProcedureInfo>())
+					foreach (ProcedureInfo pi in dq.Procedures)
 					{
 						if (!MySessionInfo.CanCheckOutItem(pi.ItemID, CheckOutType.Procedure, ref msgp))
 						{
 							FolderInfo fi = (FolderInfo)dq.ActiveParent;
-							int itemID = fi.FolderID;
+							int itemID = (int)fi.FolderID;
 							string folderName = fi.Name;
 
 							if (swDeleteFolder.Value)
@@ -1783,7 +1853,7 @@ namespace VEPROMS
 			{
 				//Gather folder information			
 				FolderInfo fi = (FolderInfo)kvp.ActiveParent;
-				int itemID = fi.FolderID;
+				int itemID = (int)fi.FolderID;
 				string folderName = fi.Name;
 
 				// Perform the deletion operation
@@ -1807,8 +1877,8 @@ namespace VEPROMS
 			foreach (var kvp in emptyFoldersToDelete)
 			{
 				//Gather folder information			
-				FolderInfo fi = kvp;
-				int itemID = fi.FolderID;
+				FolderInfo fi = (FolderInfo)kvp;
+				int itemID = (int)fi.FolderID;
 				string folderName = fi.Name;
 
 				// Perform the deletion operation
@@ -1859,8 +1929,9 @@ namespace VEPROMS
 
 				return true;
 			}
-			catch
+			catch (Exception ex)
 			{
+				string err = ex.ToString();
 				return false;
 			}
 		}
@@ -1877,106 +1948,7 @@ namespace VEPROMS
 			//clears the stack to help with memory - should never need to undo text changes to this.
 			txtResults.ClearUndo();
 		}
-
-		//C2025-052 Admin Tool Index Maintenance
-		private void btnIndexMaint_Click(object sender, EventArgs e)
-        {
-			if (!CheckProcessLater()) return;  // delay processing if set
-
-			//check any users have active sessions
-			if (!AreOtherUserSessionsInProgress())
-            {
-				string statmsg = "Updating Indexes (this may take a few minutes to complete)...";
-				InitialProgressBarMessage = statmsg;
-				txtResults.AppendText(statmsg);
-				txtResults.AppendText(Environment.NewLine);
-
-				Maintenance.IndexMaintenance();
-
-				statmsg = "Finished Updating indexes.";
-				FinalProgressBarMessage = statmsg;
-				txtResults.AppendText(statmsg);
-				txtResults.AppendText(Environment.NewLine);
-
-				MessageBox.Show("Index Maintenance Completed", "Index Maintenance");
-			}
-		}
-
-		//C2021-058 Admin Tool Purge Change History/C2025-052 Admin Tool Index Maintenance
-		// If any other users have active sessions, stop and write
-		// out list of users
-		private bool AreOtherUserSessionsInProgress()
-        {
-			DataTable dt = Maintenance.GetOtherUserSessionsInProgress(MySessionInfo.UserID);
-			if (dt.Rows.Count == 0) return false;
-
-			txtProcess.AppendText("The following Users are currently in PROMS:");
-			txtProcess.AppendText(Environment.NewLine);
-			txtProcess.AppendText("Userid, Computer Name, last login");
-			txtProcess.AppendText(Environment.NewLine);
-
-			foreach (DataRow r in dt.Rows)
-			{
-				txtProcess.AppendText($"{r["UserID"]}, {r["MachineName"]}, {r["DTSDtart"]}");
-				txtProcess.AppendText(Environment.NewLine);
-			}
-
-			MessageBox.Show("Certain Maintenance functions cannot be run if other users are currently in PROMS. Please see the output Results text for a list of other users with active PROMS sessions.", "Active PROMS Sessions", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
-
-			return true;
-		}
-
-		//CSM - C2025-043 report RO's that are not used in any of the PROMS data.
-		private void btnROsNotUsed_Click(object sender, EventArgs e)
-		{
-			//Get the path to save the Image to
-			SaveFileDialog sfd = new SaveFileDialog();
-			sfd.DefaultExt = "bmp";
-			sfd.AddExtension = true;
-			sfd.Filter = "Image Files (*.bmp)|*.bmp";
-			sfd.FileName = string.Format("ROsNotUsed_{0}", DateTime.Now.ToString("yyyyMMdd_HHmm"));
-			sfd.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + @"\VEPROMS";
-			DialogResult dr = sfd.ShowDialog();
-
-			if (dr == DialogResult.OK)
-			{
-				//Initial messaging
-				string statmsg = "Generating Snapshot (this may take a few minutes to complete)...";
-				InitialProgressBarMessage = statmsg;
-				txtResults.AppendText(statmsg);
-				txtResults.AppendText(Environment.NewLine);
-
-				//C2026-002 Enhancements to new admin Tool for ROs not used.
-				//Get the selected nodes
-				DataTable dtIDs = new DataTable();
-				dtIDs.Columns.Add("ID");
-
-				foreach (TreeNode tn in myTV_RO_DBs.Nodes[0].Nodes)
-					if (tn.Checked)
-                    {
-                        DataRow dtrw = dtIDs.NewRow();
-                        dtrw["ID"] = int.Parse(tn.Tag.ToString());
-                        dtIDs.Rows.Add(dtrw);
-                    }
-
-                //Generate the data for ROs Not Used and save it to a TreeView
-                TreeView tv = TreeViewExtensions.GetROTree(GeneralReports.GetROsNotUsedInPROMS(dtIDs), true);
-				//Output the TreeView as an Image
-				if (tv.Nodes.Count != 0)
-					tv.SaveTreeViewAsImage(sfd.FileName);
-
-				//Give Messaging demonstrating finished and open file if requested
-				statmsg = "Finished Generating Snapshot of ROs Not Used.";
-				FinalProgressBarMessage = statmsg;
-				txtResults.AppendText(statmsg);
-				txtResults.AppendText(Environment.NewLine);
-				if (tv.Nodes.Count != 0 && MessageBox.Show($"{statmsg}\r\n\r\nDo you wish to open the snapshot now?", "ROs Not Used", MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation) == DialogResult.Yes)
-					System.Diagnostics.Process.Start(sfd.FileName);
-				else if (tv.Nodes.Count == 0)
-					MessageBox.Show("All ROs are currently in use.", "ROs Not Used", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
-			}
-		}
-	}
+    }
 }
 
 

PROMS/VEPROMS User Interface/frmBatchRefresh.resx

@@ -120,179 +120,67 @@
   <metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <data name="swRegenWordAttmts.SuperTooltip" xml:space="preserve">
-    <value>When Word attachments are modified and saved, PROMS will create a PDF of the attachment contents and save it in the database.  When this is done, all of the RO references are resolved as well as pagination of the attachment.  This speeds up the overall printing of the procedure in that PROMS simply inserts the attachment contents. Certain actions like loading a new RO.FST require that these PDFs be regenerated which is normally done at print time.
+  <data name="swDeleteFolder.SuperTooltip" xml:space="preserve">
+    <value>This allows the user to remove folders and sub folders as well as their contents.
 
-This function will generate (and save) any missing saved attachment PDFs stored in the database (not the PDFs of the entire procedure that you had previous printed).  This will cause printing to be faster when you print after this as the PDFs will be pre-genrated in those cases (and thus not require regeneration unless changes were made to the Word Sections or ROs after running this).
-</value>
-  </data>
-  <data name="labelX1.SuperTooltip" xml:space="preserve">
-    <value>When Word attachments are modified and saved, PROMS will create a PDF of the attachment contents and save it in the database.  When this is done, all of the RO references are resolved as well as pagination of the attachment.  This speeds up the overall printing of the procedure in that PROMS simply inserts the attachment contents. Certain actions like loading a new RO.FST require that these PDFs be regenerated which is normally done at print time.
+Be sure a current backup of the database exists prior performing this function.
 
-This function will generate (and save) any missing saved attachment PDFs stored in the database (not the PDFs of the entire procedure that you had previous printed).  This will cause printing to be faster when you print after this as the PDFs will be pre-genrated in those cases (and thus not require regeneration unless changes were made to the Word Sections or ROs after running this).
-</value>
-  </data>
-  <data name="swRefreshTblsForSrch.SuperTooltip" xml:space="preserve">
-    <value>To allow for a quicker search of the contents within a PROMS Step editor table, a text version of the table is stored separately.  If the PROMS Search function is not finding something in a table, this tool will refresh the content of that separately stored table text.  Another search should then be performed for the content that was not originally found.
-</value>
-  </data>
-  <data name="lblRefreshTblForSrch.SuperTooltip" xml:space="preserve">
-    <value>To allow for a quicker search of the contents within a PROMS Step editor table, a text version of the table is stored separately.  If the PROMS Search function is not finding something in a table, this tool will refresh the content of that separately stored table text.  Another search should then be performed for the content that was not originally found.
-</value>
-  </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
-        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="warningBox2.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="swRmObsoleteROData.SuperTooltip" xml:space="preserve">
-    <value>Referenced Objects databases are associated with a procedure set (such as Working Draft). 
+It is recommended that this be done during off hours.
 
-RO paths, ROFST versions, and the contents of RO figures are stored in the database when referenced. This tool will remove stored, RO Paths, ROFST versions and Figures that are no longer used.
-
-Be sure  a current backup exists prior to running this function!!</value>
-  </data>
-  <data name="swRefreshWordAttmts.SuperTooltip" xml:space="preserve">
-    <value>When Word attachments are modified and saved, PROMS will create a PDF of the attachment contents and save it in the database.  When this is done, all of the RO references are resolved as well as pagination of the attachment.  This speeds up the overall printing of the procedure in that PROMS simply inserts the attachment contents.
-
-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="swStandardHypenChars.SuperTooltip" xml:space="preserve">
-    <value>Sometimes a different form of Hyphens is entered when doing a Windows Clipboard Copy/Paste from a Word or PDF document.
+  <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.
 
-This will replace various forms of Hyphens with a consistent Hyphen so that search will find all Hyphens
 </value>
   </data>
-  <data name="labelX4.SuperTooltip" xml:space="preserve">
-    <value>Referenced Objects databases are associated with a procedure set (such as Working Draft). 
+  <data name="swDeleteAnnotations.SuperTooltip" xml:space="preserve">
+    <value>This function will allow the user to remove annotations from the selected working drafts.
 
-RO paths, ROFST versions, and the contents of RO figures are stored in the database when referenced. This tool will remove stored, RO Paths, ROFST versions and Figures that are no longer used.
+Be sure a current backup of the database exists prior to running this function.
 
-Be sure  a current backup exists prior to running this function!!</value>
+If more than one working draft is selected, it is recommended that this be performed during off hours.</value>
   </data>
-  <data name="labelX5.SuperTooltip" xml:space="preserve">
-    <value>When Word attachments are modified and saved, PROMS will create a PDF of the attachment contents and save it in the database.  When this is done, all of the RO references are resolved as well as pagination of the attachment.  This speeds up the overall printing of the procedure in that PROMS simply inserts the attachment contents.
+  <data name="labelX14.SuperTooltip" xml:space="preserve">
+    <value>This function will allow the user to remove annotations from the selected working drafts.
 
-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">
-    <value>Sometimes a different form of Hyphens is entered when doing a Windows Clipboard Copy/Paste from a Word or PDF document.
+Be sure a current backup of the database exists prior to running this function.
 
-This will replace various forms of Hyphens with a consistent Hyphen so that search will find all Hyphens
-</value>
+If more than one working draft is selected, it is recommended that this be performed during off hours.</value>
   </data>
-  <data name="swRmOrphanDataRecs.SuperTooltip" xml:space="preserve">
-    <value>Everything in PROMS is inter-related.  A working draft knows what is its first procedure and a procedure knows what is its first step.  Likewise, a procedure knows what procedure is before it and after it.
+  <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.
 
-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="labelX10.SuperTooltip" xml:space="preserve">
-    <value>Everything in PROMS is inter-related.  A working draft knows what is its first procedure and a procedure knows what is its first step.  Likewise, a procedure knows what procedure is before it and after it.
+Click on the on/off switches to turn on/off each tool.
 
-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>
+Note that only one of these tools can be run at a time.</value>
   </data>
   <data name="swCheckROLinks.SuperTooltip" xml:space="preserve">
-    <value>This allows the user to check referenced object links in procedure step data for multiple working drafts in a batch mode.
+    <value>This allows the user to check referenced objects links in procedure step data for multiple working drafts in a batch mode.
 
-Bad referenced object links will be identified with a Bad RO Link annotation. Use the PROMS Search tool to list all of the steps that have this annotation.
+Bad referenced bject links will be identified with an Bad RO Link annotation. Use the PROMS Search tool to list all of the steps that have this annotation.
 
-Be sure a current backup of the database exists prior to performing this function.
+Be sure a current backup of the database exists prior performing this function.
 
 It is recommended that this be done during off hours.
 
 </value>
   </data>
   <data name="labelX12.SuperTooltip" xml:space="preserve">
-    <value>This allows the user to check referenced object links in procedure step data for multiple working drafts in a batch mode.
+    <value>This allows the user to check referenced objects links in procedure step data for multiple working drafts in a batch mode.
 
-Bad referenced object links will be identified with a Bad RO Link annotation. Use the PROMS Search tool to list all of the steps that have this annotation.
+Bad referenced bject links will be identified with an Bad RO Link annotation. Use the PROMS Search tool to list all of the steps that have this annotation.
 
-Be sure a current backup of the database exists prior to performing this function.
+Be sure a current backup of the database exists prior performing this function.
 
 It is recommended that this be done during off hours.
 </value>
   </data>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="warningBox5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAp5JREFUOE+F
@@ -357,46 +245,168 @@ If more than one procedure is selected, it is recommended that this be performed
         ud8AKwnMnBpmYFAAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="swDeleteFolder.SuperTooltip" xml:space="preserve">
-    <value>This allows the user to remove folders and sub folders as well as their contents.
-
-Be sure a current backup of the database exists prior performing this function.
-
-It is recommended that this be done during off hours.
-
+  <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="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="swCkObsoleteROData.SuperTooltip" xml:space="preserve">
+    <value>Referenced Objects databases are associated with a procedure set (such as Working Draft). 
 
+RO paths, ROFST versions, and the contents of RO figures are stored in the database when referenced. This tool will identify stored RO Paths, ROFST versions, and Figures that are no longer used.
 </value>
   </data>
-  <data name="swDeleteAnnotations.SuperTooltip" xml:space="preserve">
-    <value>This function will allow the user to remove annotations from the selected working drafts.
+  <data name="swHiddenDataLocs.SuperTooltip" xml:space="preserve">
+    <value>Typically, a section in PROMS only has sub-sections or steps.  When and existing section is divided into sub-sections, the resulting main section might have both.
 
-Be sure a current backup of the database exists prior to running this function.
+When this occurs, the step data in the main section can be marked as non-editable.  The user can no longer get to these steps and they can become forgotten as PROMS will ignore these non-editable steps when the procedure is printed.
 
-If more than one working draft is selected, it is recommended that this be performed during off hours.</value>
+This tool will identify if the database has non-editable steps and provide a listing of these steps. The use can then go to these main sections, make them editable via the property page, and delete or move these steps.
+
+This tool may take an extended period of time to execute.
+</value>
   </data>
-  <data name="labelX14.SuperTooltip" xml:space="preserve">
-    <value>This function will allow the user to remove annotations from the selected working drafts.
+  <data name="labelX3.SuperTooltip" xml:space="preserve">
+    <value>Referenced Objects databases are associated with a procedure set (such as Working Draft). 
 
-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>
+RO paths, ROFST versions, and the contents of RO figures are stored in the database when referenced. This tool will identify stored RO Paths, ROFST versions, and Figures that are no longer used.
+</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.
+  <data name="labelX2.SuperTooltip" xml:space="preserve">
+    <value>Typically, a section in PROMS only has sub-sections or steps.  When and existing section is divided into sub-sections, the resulting main section might have both.
 
-Click on the on/off switches to turn on/off each tool.
+When this occurs, the step data in the main section can be marked as non-editable.  The user can no longer get to these steps and they can become forgotten as PROMS will ignore these non-editable steps when the procedure is printed.
 
-Note that only one of these tools can be run at a time.</value>
+This tool will identify if the database has non-editable steps and provide a listing of these steps. The use can then go to these main sections, make them editable via the property page, and delete or move these steps.
+
+This tool may take an extended period of time to execute.
+</value>
+  </data>
+  <data name="swCkOrphanDataRecs.SuperTooltip" xml:space="preserve">
+    <value>Everything in PROMS is inter-related.  A working draft knows what is its first procedure and a procedure knows what is its first step.  Likewise, a procedure knows what procedure is before it and after it.
+
+Should an item become orphaned (disconnected) from the rest of the data, it will no longer be accessible.  This tool detects any orphaned items in the database.
+
+This tool may take an extended period of time to execute.
+</value>
+  </data>
+  <data name="labelX1.SuperTooltip" xml:space="preserve">
+    <value>Everything in PROMS is inter-related.  A working draft knows what is its first procedure and a procedure knows what is its first step.  Likewise, a procedure knows what procedure is before it and after it.
+
+Should an item become orphaned (disconnected) from the rest of the data, it will no longer be accessible.  This tool detects any orphaned items in the database.
+
+This tool may take an extended period of time to execute.
+</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>
+  </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>
+  </data>
+  <data name="warningBox4.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="warningBox2.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="swRmObsoleteROData.SuperTooltip" xml:space="preserve">
+    <value>Referenced Objects databases are associated with a procedure set (such as Working Draft). 
+
+RO paths, ROFST versions, and the contents of RO figures are stored in the database when referenced. This tool will remove stored, RO Paths, ROFST versions and Figures that are no longer used.
+
+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.
+
+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="swStandardHypenChars.SuperTooltip" xml:space="preserve">
+    <value>Sometimes a different form of Hyphens is entered when doing a Windows Clipboard Copy/Paste from a Word or PDF document.
+
+This will replace various forms of Hyphens with a consistent Hyphen so that search will find all Hyphens
+</value>
+  </data>
+  <data name="labelX4.SuperTooltip" xml:space="preserve">
+    <value>Referenced Objects databases are associated with a procedure set (such as Working Draft). 
+
+RO paths, ROFST versions, and the contents of RO figures are stored in the database when referenced. This tool will remove stored, RO Paths, ROFST versions and Figures that are no longer used.
+
+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.
+
+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">
+    <value>Sometimes a different form of Hyphens is entered when doing a Windows Clipboard Copy/Paste from a Word or PDF document.
+
+This will replace various forms of Hyphens with a consistent Hyphen so that search will find all Hyphens
+</value>
+  </data>
+  <data name="swRmOrphanDataRecs.SuperTooltip" xml:space="preserve">
+    <value>Everything in PROMS is inter-related.  A working draft knows what is its first procedure and a procedure knows what is its first step.  Likewise, a procedure knows what procedure is before it and after it.
+
+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="labelX10.SuperTooltip" xml:space="preserve">
+    <value>Everything in PROMS is inter-related.  A working draft knows what is its first procedure and a procedure knows what is its first step.  Likewise, a procedure knows what procedure is before it and after it.
+
+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>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>25</value>
+    <value>46</value>
   </metadata>
 </root>