C2022-003-Change-Textboxes-to-RTF-3

good for testing

PROMS/AdjustBuildRevision/AdjustBuildRevision.csproj

@@ -5,7 +5,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -44,6 +44,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -53,13 +54,14 @@
     <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>x86</PlatformTarget>
+    <PlatformTarget>x64</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.3.yyMM.dHH") + "\")");
+								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.2.yyMM.dHH") + "\")");
+								outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.3.yyMM.dHH") + "\")");
 					//		if (outline != line)
 					//		{
 					//			Console.WriteLine("Before: '{0}'", line);

PROMS/Baseline/Baseline.csproj

@@ -22,7 +22,7 @@
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
@@ -30,15 +30,17 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x64</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/DropDownPanel/Controls/DropDownPanel.cs

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

PROMS/DropDownPanel/Forms/DropDownForm.cs

@@ -49,7 +49,9 @@ 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,6 +39,7 @@ 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>x86</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -40,13 +40,14 @@
     <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>x86</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>
@@ -56,7 +57,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>

PROMS/Formats/Formats.csproj

@@ -35,6 +35,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -44,6 +45,7 @@
     <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">
@@ -92,6 +94,10 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <Content Include="epall\EPFormatTST1.xml" />
+    <Content Include="epall\EPFormatTST2.xml" />
+    <Content Include="epall\EPFormatTST3.xml" />
+    <Content Include="epall\EPFormatTST4.xml" />
     <Content Include="fmtall\AEPall.xml">
       <SubType>Designer</SubType>
     </Content>
@@ -176,6 +182,8 @@
     <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" />
     <Content Include="fmtall\CWERall.xml" />
@@ -187,6 +195,7 @@
     <Content Include="fmtall\EFSGBCKall.xml" />
     <Content Include="fmtall\ELFDEVall.xml" />
     <Content Include="fmtall\ENall.xml" />
+    <Content Include="fmtall\EPTST2all.xml" />
     <Content Include="fmtall\ESFDEVall.xml" />
     <Content Include="fmtall\EXCLNall.xml" />
     <Content Include="fmtall\EXCLN_00all.xml" />

PROMS/LBWordLibrary/LBWordLibrary.csproj

@@ -34,7 +34,7 @@
     <DefineConstants>TRACE;DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -45,13 +45,14 @@
     <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>x86</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>
@@ -61,7 +62,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>x64</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>x86</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -85,6 +85,7 @@
     <DebugType>none</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -92,7 +93,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <BaseAddress>285212672</BaseAddress>
     <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -103,7 +104,7 @@
     <Optimize>true</Optimize>
     <DebugType>
     </DebugType>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>

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

@@ -77,6 +77,7 @@ using System.Xml.Schema;
 using System.Text;
 using ROFields;
 using RODBInterface;
+using System.Linq;
 
 namespace ROEditor
 {
@@ -280,6 +281,7 @@ 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
 			// 
@@ -288,6 +290,7 @@ 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
 			// 
@@ -296,6 +299,7 @@ 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
 			// 
@@ -304,6 +308,7 @@ 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
 			// 
@@ -586,5 +591,18 @@ 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,6 +77,7 @@ using System.Xml.Schema;
 using System.Text;
 using ROFields;
 using RODBInterface;
+using System.Linq;
 
 namespace ROEditor
 {
@@ -316,6 +317,22 @@ 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>
@@ -357,6 +374,7 @@ 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
 			// 
@@ -365,6 +383,7 @@ 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
 			// 
@@ -402,6 +421,7 @@ 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
 			// 
@@ -425,3 +445,4 @@ namespace ROEditor
 		#endregion
 	}
 }
+

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

@@ -72,6 +72,7 @@ using System.Xml;
 using System.Text;
 using RODBInterface;
 using ROFields;
+using System.Linq;
 
 namespace ROEditor
 {
@@ -277,6 +278,22 @@ 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
@@ -315,6 +332,7 @@ 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
 			// 
@@ -437,3 +455,4 @@ namespace ROEditor
 		#endregion
 	}
 }
+

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

@@ -52,6 +52,7 @@ using System.Xml;
 using System.Text;
 using ROFields;
 using RODBInterface;
+using System.Linq;
 
 namespace ROEditor
 {
@@ -155,6 +156,7 @@ 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
 			// 
@@ -421,5 +423,21 @@ 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,6 +106,7 @@ using ROFields;
 using RODBInterface;
 using VlnStatus;
 using System.Collections.Generic;
+using System.Linq;
 
 
 namespace ROEditor
@@ -1311,6 +1312,22 @@ 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>
@@ -1375,6 +1392,7 @@ 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
 			// 
@@ -1383,6 +1401,7 @@ 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
 			// 
@@ -1608,3 +1627,4 @@ namespace ROEditor
 		#endregion
 	}
 }
+

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

@@ -7,7 +7,7 @@
     <Optimize>true</Optimize>
     <DebugType>
     </DebugType>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -71,7 +71,7 @@
     <DebugType>full</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <OutputPath>bin\Release\</OutputPath>
@@ -96,6 +96,7 @@
     <DebugType>none</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -103,11 +104,15 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <BaseAddress>285212672</BaseAddress>
     <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>x64</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>
@@ -123,10 +128,6 @@
     <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">
@@ -167,6 +168,7 @@
     <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
-        CAAAAk1TRnQBSQFMAgEBAgEAASwBAAEsAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CAAAAk1TRnQBSQFMAgEBAgEAAUQBAAFEAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -175,7 +175,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAe
-        CwAAAk1TRnQBSQFMAgEBBgEAASwBAAEsAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CwAAAk1TRnQBSQFMAgEBBgEAAUQBAAFEAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

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

@@ -101,7 +101,6 @@ 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
 
@@ -885,3 +884,4 @@ namespace ROEditor
 
 	}
 }
+

PROMS/ReferencedObjects/LibSource/DBEncapsulation/DBEncapsulation.csproj

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

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

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

PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs

@@ -263,6 +263,7 @@ using System.Collections.Specialized;
 using Org.Mentalis.Files;
 using System.Data.SqlClient;
 using System.Collections.Generic;
+using System.Text.RegularExpressions;
 
 
 namespace RODBInterface
@@ -409,7 +410,7 @@ namespace RODBInterface
 			GetDbServerInfo(ropath);
 			if (!dbProviderType.Equals((int)DB_PROVIDER.SQL_SERVER))
 			{
-				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";
+				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";
 			}
 		}
 		#endregion
@@ -1909,6 +1910,8 @@ 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
@@ -2182,10 +2185,13 @@ namespace RODBInterface
 				parent.SetAttribute("ChildLoaded", "True");
 			}
 			string xmlstr = GenerateXmlString(ro, false);
+
 			string wraccid = null;
 			if (ro.HasAttribute("AccPageID"))
 			{
 				string accid = ro.GetAttribute("AccPageID");
+
+
 				int quote = accid.IndexOf("'");
 				if (quote >= 0)
 					wraccid = accid.Insert(quote, "'");
@@ -2251,7 +2257,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";  //  + rtype.ToString();
+				strGetFields = strGetFields + " where RecType = 2";  
 				DBE.Command(strGetFields);
 				DBE.Reader();
 

PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.csproj

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

@@ -735,23 +735,27 @@ namespace RODBInterface
 				else
 					parentValue = nd.InnerText;
 
-				//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)
+				if (parentName != "#whitespace")
 				{
-					//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
+					//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)
 					{
-						if (parentValue != cn.InnerText)
-							applicValues += string.Format(",UnitIdx={0} Value={1}", pcChildIdx, cn.InnerText);
+						//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);
+						}
 					}
 				}
 				applicValues += " /APL>";

PROMS/ReferencedObjects/LibSource/ROFST/ROFST.csproj

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

PROMS/ReferencedObjects/LibSource/ROField/ROFields.csproj

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

PROMS/ReferencedObjects/LibSource/Utils/Utils.csproj

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

PROMS/ReferencedObjects/LibSource/VlnProfiler/VlnProfiler.csproj

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

PROMS/ReferencedObjects/LibSource/VlnStatus/VlnStatus.csproj

@@ -62,6 +62,7 @@
     <DebugType>full</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <OutputPath>bin\Release\</OutputPath>
@@ -86,6 +87,7 @@
     <DebugType>none</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -93,7 +95,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <BaseAddress>285212672</BaseAddress>
     <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -104,7 +106,7 @@
     <Optimize>true</Optimize>
     <DebugType>
     </DebugType>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>x64</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 System.Windows.Forms.TextBox tbZoom;
+		private ctlXMLEditLib.roRichTextBox tbZoom; // RO Editor add symbols C2022 - 003
 		/// <summary>
 		/// Required designer variable.
 		/// </summary>
@@ -88,7 +88,7 @@ namespace ctlXMLEditLib
 		/// </summary>
 		private void InitializeComponent()
 		{
-			this.tbZoom = new System.Windows.Forms.TextBox();
+			this.tbZoom = new ctlXMLEditLib.roRichTextBox(); // RO Editor add symbols C2022 - 003
 			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.ScrollBars.Vertical;
+			this.tbZoom.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.Vertical; // RO Editor add symbols C2022 - 003
 			this.tbZoom.Size = new System.Drawing.Size(576, 392);
 			this.tbZoom.TabIndex = 0;
 			// 
@@ -149,3 +149,4 @@ namespace ctlXMLEditLib
 		
 	}
 }
+

PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEdit.cs

@@ -200,7 +200,11 @@ using System.Xml.Schema;
 using System.Text;
 using RODBInterface;
 using Org.Mentalis.Files;
-//using IniFileIO;
+using System.Windows;
+using System.Text.RegularExpressions;
+using System.Linq;
+using Volian.Base.Library;
+
 
 
 
@@ -221,6 +225,7 @@ namespace ctlXMLEditLib
 	///	  
 	///    
 	/// </summary>
+
 	public class ctlXMLEdit : System.Windows.Forms.UserControl
 	{
 		/// <summary>
@@ -237,12 +242,12 @@ namespace ctlXMLEditLib
 		private bool dosaveflag;
 		private VlnXmlElement editelem;
 		private XmlDocument editdoc;
-		private TextBox zoomtextbox;
+		private roRichTextBox 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 TextBox GraphicsFiletextbox;
-		private TextBox GraphicsWdtextbox;
-		private TextBox GraphicsHttextbox;
+		private roRichTextBox GraphicsFiletextbox;
+		private roRichTextBox GraphicsWdtextbox;
+		private roRichTextBox GraphicsHttextbox;
 		private System.Windows.Forms.Button btnFindFile;
 		private string GraphicsText;
 		private ToolTip zmtooltip;
@@ -265,6 +270,19 @@ 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
@@ -311,10 +329,19 @@ 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
@@ -359,11 +386,12 @@ 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(TextBox hwnd, string msg)
+		private void DoSet(roRichTextBox hwnd, string msg) // RO Editor add symbols C2022 - 003
 		{
 			if (hwnd == null) return;
 			if (hwnd.Tag != null)
@@ -378,7 +406,7 @@ namespace ctlXMLEditLib
 		private void SetRequiredFields(ArrayList reqfields)
 		{
 			Object o;
-			TextBox hwnd;
+			roRichTextBox hwnd;
 			string field, msg;
 			int indx;
 			foreach (string strfld in reqfields)
@@ -397,15 +425,15 @@ namespace ctlXMLEditLib
 					o = myHT[field+"a"];
 					if (o != null)   // set all combo types required, the checker
 					{
-						DoSet((TextBox)o,msg);
-						DoSet((TextBox)myHT[field+"b"],msg);
-						DoSet((TextBox)myHT[field+"c"],msg);
-						DoSet((TextBox)myHT[field+"d"],msg);
+						DoSet((roRichTextBox)o,msg);
+						DoSet((roRichTextBox)myHT[field+"b"],msg);
+						DoSet((roRichTextBox)myHT[field+"c"],msg);
+						DoSet((roRichTextBox)myHT[field+"d"],msg);
 					}
 				}
 				else if (o != null)
 				{
-					hwnd = (TextBox) o;
+					hwnd = (roRichTextBox) o;
 					if (hwnd.Tag != null)
 					{
 						TextBoxAttrTag tag = (TextBoxAttrTag) hwnd.Tag;
@@ -419,7 +447,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(TextBox tb, XmlNode node, string chldName)
+		private void GetDefaultParentValue(roRichTextBox 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
@@ -463,21 +491,23 @@ namespace ctlXMLEditLib
 		private void DisplayFieldContents(XmlNode node)
 		{
 			Object o;
-			TextBox hwnd;
+			roRichTextBox 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 = (TextBox) o;
+				hwnd = (roRichTextBox) o;
 				nd = node.SelectSingleNode(str);
 				// if not found with just the string, search the tree.
 				if (nd==null)nd = node.SelectSingleNode("*/"+str);
 				if (nd == null || nd.InnerText.Length==0) // B2024-004 use Parent value if Child text length is zero
 					GetDefaultParentValue(hwnd, node, str); // C2021-026 Parent/Child Field has no value so use parent's value
 				else
-				{	
-					hwnd.Text = nd.InnerText;   // set the field's text from XML
+				{
+
+					hwnd.Text = Regex.Replace(nd.InnerText, @"\\u([0-9]{1,4})\?", m => Convert.ToChar(int.Parse(m.Groups[1].Value)).ToString());   // set the field's text from XML
+					Size size = hwnd.Size;
 
 					// check if this window has a button name as part of its tag. If
 					// so it's a combo type & the radio button/visibility may need to
@@ -546,7 +576,7 @@ namespace ctlXMLEditLib
 			// height/width data of the image.
 			if (GraphicsFiletextbox != null && GraphicsFiletextbox.Text != "") UpdateHtWd();
 		}
-		public TextBox GetGraphicsFiletextbox()
+		public roRichTextBox GetGraphicsFiletextbox()
 		{
 			return GraphicsFiletextbox;
 		}
@@ -585,13 +615,13 @@ namespace ctlXMLEditLib
 		{
 			dosaveflag=false;
 			mysavexml=false;
-			TextBox hwnd;
+			roRichTextBox hwnd;
 			// first, clear out all of the text boxes.
 
 			foreach (string str in myHT.Keys)
 			{
 				object o = myHT[str];
-				hwnd = (TextBox) o;
+				hwnd = (roRichTextBox) o;
 				hwnd.Text = "";
 				TextBoxAttrTag tag = (TextBoxAttrTag) hwnd.Tag;
 				RadioButton radio;
@@ -623,7 +653,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, TextBox tb, string chldName)
+		private void RemovePCChildTextIfSameAsParent(XmlNode node, roRichTextBox tb, string chldName)
 		{
 			XmlNode parentNode = null;
 			// if this is a child node get the parent's value
@@ -660,18 +690,35 @@ 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) 
 			{				
-				TextBox hwnd;
+				roRichTextBox 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)
+				foreach (string str in myHT.Keys)  // RO Editor add symbols C2022 - 003
 				{
 					object o = myHT[str];
-					hwnd = (TextBox) o;
+					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();
+
 					imgdate = null;
 					// if this is a required field and there is no text, put out an error
 					// message and get out of here.
@@ -788,6 +835,7 @@ namespace ctlXMLEditLib
 			return (false);
 		}
 
+
 		#region Component Designer generated code
 		/// <summary>
 		/// Required method for Designer support - do not modify 
@@ -858,7 +906,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, TextBox mytextbox, RadioButton radio, 
+		private string DisplayXmlSchemaSimpleType(XmlSchemaSimpleType simpleType, roRichTextBox mytextbox, RadioButton radio, 
 			bool img, string imgname)
 		{
 			// set up for text box tag, which stores whether field is required and
@@ -888,12 +936,17 @@ 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);
+							
 						}
 					}
 				}
@@ -904,14 +957,17 @@ 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.AcceptsReturn = true;
+					mytextbox.AcceptsTab = true;
 					mytextbox.Height = (int) mytextbox.Font.GetHeight() * 4;
-					mytextbox.ScrollBars = ScrollBars.Vertical;
+					mytextbox.ScrollBars = RichTextBoxScrollBars.Vertical;
 					zmtooltip.SetToolTip(mytextbox, "Press Shift F2 To Zoom");
 				}
 
@@ -992,7 +1048,8 @@ namespace ctlXMLEditLib
 			radio.CheckedChanged += new System.EventHandler(this.radiocheckchg);
 			gbox.Controls.Add(radio);
 
-			TextBox tb = new TextBox();
+			roRichTextBox tb = new roRichTextBox();
+			Size size3 = tb.Size;
 			tb.Location = new Point(boxx+20, y+25);
 			if (!first) tb.Visible = false;
 			myHT.Add(element.Name,tb);
@@ -1001,7 +1058,7 @@ namespace ctlXMLEditLib
 			// the groupbox.
 			Controls.Add(tb);
 			tb.TextChanged += new System.EventHandler(this.textbox_change);
-			tb.GotFocus += new System.EventHandler(this.textbox_zoombtn);
+			tb.GotFocus += new System.EventHandler(this.currentTextBox);
 			tb.KeyDown += new KeyEventHandler(MyOnKeyDown);
 			gbox.Contains(tb);
 			// the following will set attributes on the text boxes such as maxlength, multiline, etc.
@@ -1144,8 +1201,9 @@ namespace ctlXMLEditLib
 			}
 			else
 			{
-				TextBox mytextbox;
-				mytextbox = new TextBox();
+				roRichTextBox mytextbox;
+				mytextbox = new roRichTextBox();
+				Size size3 = mytextbox.Size;
 				mytextbox.Location = new Point(screenx+indent, screeny);
 				string tFieldName = (pcChildIdx == 0) ? CvtUserFldToFld(element.Name) : CvtUserFldToFld(pcChildFldName);
 				mytextbox.Name = tFieldName;
@@ -1155,7 +1213,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.textbox_zoombtn);
+				mytextbox.GotFocus += new System.EventHandler(this.currentTextBox);
 				mytextbox.KeyDown += new KeyEventHandler(MyOnKeyDown);
 				if (pcChildIdx > 0)
 				{
@@ -1192,9 +1250,18 @@ 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.
@@ -1210,7 +1277,7 @@ namespace ctlXMLEditLib
 		//           When leaving the textbox
 		private void txtBox_Leave(object sender, EventArgs e)
 		{
-			TextBox tb = sender as TextBox;
+			roRichTextBox tb = sender as roRichTextBox;
 			string dfTxt = "";
 			try
 			{
@@ -1219,7 +1286,7 @@ namespace ctlXMLEditLib
 				{
 					object o = myHT[parentid];
 					if (o != null)
-						dfTxt = (o as TextBox).Text; // set to use the parent's value (default)				
+						dfTxt = (o as roRichTextBox).Text; // set to use the parent's value (default)				
 				}
 				else
                 {
@@ -1227,7 +1294,7 @@ namespace ctlXMLEditLib
 					string parName = pcGrpBox.Name.Substring(5);
 					object o = myHT[parName];
 					if (o != null)
-						dfTxt = (o as TextBox).Text; // set to use the parent's value (default)
+						dfTxt = (o as roRichTextBox).Text; // set to use the parent's value (default)
 				}
 			}
             catch 
@@ -1235,7 +1302,7 @@ namespace ctlXMLEditLib
 				string parName = pcGrpBox.Name.Substring(5);
 				object o = myHT[parName];
 				if (o != null)
-					dfTxt = (o as TextBox).Text; // set to use the parent's value (default)
+					dfTxt = (o as roRichTextBox).Text; // set to use the parent's value (default)
 			}
 
 			if (dosaveflag) mysavexml = true;
@@ -1251,7 +1318,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)
 		{
-			TextBox tb = sender as TextBox;
+			roRichTextBox tb = sender as roRichTextBox;
 			if (tb.ForeColor == SystemColors.GrayText) // currently no value set - using parent's value
 			{
 				tb.Text = "";
@@ -1264,7 +1331,7 @@ namespace ctlXMLEditLib
 		private void radiocheckchg(object sender, System.EventArgs e)
 		{
 			RadioButton btnsel = (RadioButton) sender;
-			TextBox assocbox;
+			roRichTextBox assocbox;
 			string btntext, str;
 
 			if(dosaveflag)mysavexml = true;
@@ -1277,7 +1344,7 @@ namespace ctlXMLEditLib
 			str = btnsel.Name.Replace(btntext,"");
 			object o = myHT[str];
 			if (o == null) return;
-			assocbox = (TextBox) o;
+			assocbox = (roRichTextBox) 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
@@ -1299,7 +1366,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 TextBox).Visible = vsblState; // show or hide the associated text box
+									(oo as roRichTextBox).Visible = vsblState; // show or hide the associated text box
 							}
 					}
 				}
@@ -1391,7 +1458,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(TextBox tb)
+		private void MyValidatingCode(roRichTextBox 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.
@@ -1420,20 +1487,33 @@ namespace ctlXMLEditLib
 		}
 
 		// save which box we're on, for zoom processing.
-		private void textbox_zoombtn(object sender, System.EventArgs e)
+		private void currentTextBox(object sender, System.EventArgs e)
 		{
-			TextBox textbox = (TextBox) sender;
+			roRichTextBox textbox = (roRichTextBox) 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((TextBox) sender);
+				MyValidatingCode((roRichTextBox) sender);
 			}
 
 			catch(Exception ex)
@@ -1459,11 +1539,18 @@ 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)
@@ -1507,7 +1594,7 @@ namespace ctlXMLEditLib
 		// file local & keep width/height of file proportional.
 		private void GraphicText_lostfocus(object sender, System.EventArgs e)
 		{
-			TextBox fnamebox = (TextBox) sender;
+			roRichTextBox fnamebox = (roRichTextBox) sender;
 			if (fnamebox.Text != "" && fnamebox.Modified == true)
 			{
 				FileInfo ifi = new FileInfo(fnamebox.Text);
@@ -1716,7 +1803,7 @@ namespace ctlXMLEditLib
 		// if changed height, calculate associated width
 		private void GraphicsHt_lostfocus(object sender, System.EventArgs e)
 		{
-			TextBox ht = (TextBox) sender;
+			roRichTextBox ht = (roRichTextBox) sender;
 			if (ht.Modified == true)
 			{
 				try
@@ -1733,7 +1820,7 @@ namespace ctlXMLEditLib
 		// if changed width, calculate associated height
 		private void GraphicsWd_lostfocus(object sender, System.EventArgs e)
 		{
-			TextBox wd = (TextBox) sender;
+			roRichTextBox wd = (roRichTextBox) sender;
 			if (wd.Modified == true)
 			{
 				try
@@ -1888,7 +1975,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;
@@ -1929,5 +2016,31 @@ 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,6 +62,7 @@
     <DebugType>full</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <OutputPath>bin\Release\</OutputPath>
@@ -86,6 +87,7 @@
     <DebugType>none</DebugType>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -93,7 +95,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <BaseAddress>285212672</BaseAddress>
     <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -104,7 +106,7 @@
     <Optimize>true</Optimize>
     <DebugType>
     </DebugType>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -124,6 +126,9 @@
     <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">
@@ -135,6 +140,12 @@
     <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

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

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

PROMS/RoAccessToSql/RoAccessToSql.cs

@@ -229,7 +229,7 @@ namespace RoAccessToSql
 					if (sqlConnection.State == ConnectionState.Open)
 					{
 						// now try to open access db:
-						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";
+						string strDatabaseConnectionCommand = "Provider=Microsoft.ACE.OLEDB.12.0;Password=\"\";User ID=Admin;Data Source=" + MSAccessPath + "\\ROMaster.mdb;Mode=Share Deny None;Extended Properties=\"\";Jet OLEDB:System database=\"\";Jet OLEDB:Registry Path=\"\";Jet OLEDB:Database Password=\"\";Jet OLEDB:Engine Type=5;Jet OLEDB:Database Locking Mode=1;Jet OLEDB:Global Partial Bulk Ops=2;Jet OLEDB:Global Bulk Transactions=1;Jet OLEDB:New Database Password=\"\";Jet OLEDB:Create System Database=False;Jet OLEDB:Encrypt Database=False;Jet OLEDB:Don't Copy Locale on Compact=False;Jet OLEDB:Compact Without Replica Repair=False;Jet OLEDB:SFP=False";
 						using (OleDbConnection accessConnection = new OleDbConnection(strDatabaseConnectionCommand))
 						{
 							try

PROMS/RoAccessToSql/RoAccessToSql.csproj

@@ -22,7 +22,7 @@
     </SccProvider>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
@@ -30,15 +30,17 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x64</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">
@@ -98,6 +100,17 @@
   <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/TablePicker/TablePicker.csproj

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

@@ -0,0 +1,203 @@
+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/DlgAnnotationsSelect.resx

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

PROMS/VEPROMS User Interface/DlgPrintProcedure.cs

@@ -66,6 +66,12 @@ 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
@@ -393,6 +399,7 @@ namespace VEPROMS
 		{
 			SetupForProcedure();
 			_MyTimer = new Timer();
+			_MyTimer.Tick -= new EventHandler(_MyTimer_Tick);
 			_MyTimer.Tick += new EventHandler(_MyTimer_Tick);
 			_MyTimer.Interval = 100;
 			_MyTimer.Enabled = true;
@@ -1092,7 +1099,9 @@ 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)
+				if (cbd.MyChangeBarText == PrintChangeBarText.UserDef && !string.IsNullOrEmpty(ppTxbxChangeBarUserMsgOne.Text))
+					cbd.MyChangeBarMessage = ppTxbxChangeBarUserMsgOne.Text + @"\n" + ppTxbxChangeBarUserMsgTwo.Text;
+				else if (cbd.MyChangeBarText == PrintChangeBarText.UserDef)
 					cbd.MyChangeBarMessage = _DocVersionConfig.Print_UserCBMess1 + @"\n" + _DocVersionConfig.Print_UserCBMess2;
 
 			}

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

@@ -250,6 +250,16 @@ 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,17 +410,5 @@ 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,11 +80,9 @@
     <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>
@@ -103,8 +101,5 @@
     <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>x86</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -61,13 +61,14 @@
     <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>x86</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -76,7 +77,7 @@
     <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -85,7 +86,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -94,7 +95,7 @@
     <OutputPath>bin\Demo\</OutputPath>
     <DefineConstants>TRACE;DEMO</DefineConstants>
     <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -111,10 +112,6 @@
       <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>
@@ -125,6 +122,10 @@
       <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">
@@ -133,6 +134,8 @@
     <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" />
@@ -152,6 +155,17 @@
       <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>
@@ -164,6 +178,9 @@
     <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>
@@ -212,6 +229,12 @@
     <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>
@@ -230,12 +253,6 @@
     <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>
@@ -254,6 +271,12 @@
     <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>
@@ -284,12 +307,6 @@
     <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>
@@ -337,6 +354,10 @@
       <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>
@@ -349,6 +370,9 @@
     <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>
@@ -356,12 +380,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>
@@ -377,9 +401,6 @@
     <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>
@@ -487,6 +508,7 @@
     <Content Include="PROMSRollback %28v2.0%29.Sql">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Resources\toolbox.png" />
     <Content Include="ROBuild.Sql">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -577,8 +599,6 @@
     <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

@@ -0,0 +1,229 @@
+
+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,6 +13,8 @@ using System.Text.RegularExpressions;
 using System.Globalization;
 using DevComponents.DotNetBar;
 using JR.Utils.GUI.Forms;
+using Volian.Controls.Library;
+using System.Linq;
 
 namespace VEPROMS
 {
@@ -65,11 +67,13 @@ 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)
@@ -101,6 +105,7 @@ 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); 
@@ -275,6 +280,7 @@ 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
@@ -295,6 +301,7 @@ 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
@@ -450,6 +457,7 @@ 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)
@@ -1303,7 +1311,7 @@ namespace VEPROMS
 				pi.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
 				if (si.IsApproved == 1)
 				{
-					dlgExportImport dlg = new dlgExportImport("Export", pi, MyFrmVEPROMS, (E_UCFImportOptions)0); // "true tell export to convert ROs and Transitions to text
+					dlgExportImport dlg = new dlgExportImport("Export", pi, MyFrmVEPROMS, (selectedSlave)); // "true tell export to convert ROs and Transitions to text
 					dlg.DocReplace = frm.DocReplace;  // this tells approval to prepare an export file with resolved transitions and ROs, word sections are saved with resolved ROs during approval PDF creation and saved in DocReplace
 					System.Xml.XmlDocument xd = new System.Xml.XmlDocument();
 					dlg.ExportItem(xd, pi, "procedure");
@@ -1315,6 +1323,26 @@ namespace VEPROMS
 
 					// Clear the change bar override for this procedure:
 					pi.ClearChangeBarOverrides();
+
+					//B2019-140 Change bars do not get refreshed when approval is run.
+					ProcedureInfo newproc = ItemInfo.ResetProcedure(pi.ItemID);
+
+					//// Refresh the StepPanel for the current Procedure
+					//// so change bars update
+					//// on any open StepPanel
+					DisplayTabItem dti = MyFrmVEPROMS.GetTabContainingProcedure(pi.ItemID);
+					if (dti != null)
+					{
+						if (!dti.MyStepTabPanel.MyStepPanel.ContainsFocus)
+							dti.MyStepTabPanel.MyStepPanel.Focus();
+
+						foreach (EditItem eitm in dti.MyStepTabPanel.MyStepPanel.Controls.OfType<EditItem>())
+							eitm.ChangeBar = eitm.MyItemInfo.HasChangeBar;
+					}
+
+					//since in a separate form, need to update the tree view
+					//so "Showing Change Bars" Content Menu Item is correct
+					MyFrmVEPROMS.RefreshProcedureNode(newproc);
 				}
 				else
 					UpdateProcedureConfig(pi, ap.RevNumber, ap.RevDate, myDTS, selectedSlave);

PROMS/VEPROMS User Interface/dlgExportImportEP.cs

@@ -0,0 +1,347 @@
+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,328 +28,416 @@ namespace VEPROMS
 		/// </summary>
 		private void InitializeComponent()
 		{
-			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.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.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);
-			// 
-			// 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.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.addUserToolStripMenuItem,
             this.editUserToolStripMenuItem,
-            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);
+            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);
 
 		}
 
@@ -357,20 +445,14 @@ namespace VEPROMS
 
 		private System.Windows.Forms.TabControl tcSecurity;
 		private System.Windows.Forms.TabPage tpDefault;
-		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.TabPage tpManageFolders;
 		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;
@@ -379,10 +461,23 @@ namespace VEPROMS
 		private System.Windows.Forms.ToolStripMenuItem createReviewerGroupToolStripMenuItem;
 		private System.Windows.Forms.Panel pnlGroups;
 		private System.Windows.Forms.Label label8;
-		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;
-	}
+        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;
+    }
 }

PROMS/VEPROMS User Interface/dlgManageSecurity.cs

@@ -7,84 +7,85 @@ 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);
-			SetupSecurity();
-			SetupGroups();
+
+			//Default to Users Tab
+			tcSecurity.SelectedIndex = 2;
 		}
-		private void 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)
 		{
-			pnlGroups.Controls.Clear();
-			foreach (GroupInfo gi in myGroupInfoList)
+			LoadRefreshGroupUsers();
+
+			switch (tcSecurity.SelectedIndex)
 			{
-				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;
-				}
+				//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;
 			}
 		}
-		private void rb_CheckedChanged(object sender, EventArgs e)
+		//Loads a refreshed list of Groups and Users
+		private void LoadRefreshGroupUsers()
 		{
-			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();
+			GroupInfoList.Reset();
+			myGroupInfoList = GroupInfoList.Get();
+			UserInfoList.Reset();
+			myUserInfoList = UserInfoList.Get();
 		}
-		private void SetupSecurity()
+		#endregion
+
+		#region Manage Folders
+		//Sets up Folders
+		private void SetupFolderOptions()
 		{
 			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)
@@ -105,172 +106,7 @@ namespace VEPROMS
 				}
 			}
 		}
-		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
-		}
+		//Handles Creating a New Group
 		private void createGroupMenuItem(object sender, EventArgs e)
 		{
 			try
@@ -279,7 +115,6 @@ namespace VEPROMS
 				TreeNode tn = tvFolders.SelectedNode;
 				FolderInfo fi = tn.Tag as FolderInfo;
 				AddNewGroup(tsddi.Text, fi);
-				SetupSecurity();
 			}
 			catch (Exception ex)
 			{
@@ -298,82 +133,124 @@ 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(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);
-						}
-					}
-				}
-			}
+
+            foreach (var ri in ril.Where(ri => ri.Name == txt))
+            {
+                string gin = string.Format("{0}s - {1}", ri.Name, fi.Name);
+                if (!myGroupInfoList.Any(gi => gi.GroupName == gin))
+                {
+                    Group group = Group.MakeGroup(gin, null, null);
+                    Assignment.MakeAssignment(group, Role.Get(ri.RID), Folder.Get(fi.FolderID), null);
+                }
+            }
+
+            LoadRefreshGroupUsers();
+
+			// C2026-004 - messagebox when create group
+			MessageBox.Show($"{txt} group successfully created.", "Create group", MessageBoxButtons.OK, MessageBoxIcon.Information);
 		}
 		private void tvFolders_NodeMouseClick(object sender, TreeNodeMouseClickEventArgs e)
 		{
 			tvFolders.SelectedNode = e.Node;
 		}
-		private void deleteGroupToolStripMenuItem_Click(object sender, EventArgs e)
+
+		#endregion
+
+		#region Manage Groups
+		//Sets up Group Options
+		private void SetupGroups()
 		{
-			if (lstGroups.SelectedIndex < 0)
+			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.YesNoCancel, MessageBoxIcon.Question) == DialogResult.Yes)
+				{
+					if (mi.MyGroup.GroupName == "Administrators" && mi.MyGroup.GroupMemberships.Count(mm => mm.EndDate == null || mm.EndDate == string.Empty) == 1)
+					{
+						MessageBox.Show("You must have at least 1 user assigned to the Administrators group", "One Administrator Required", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+						return;
+					}
+					Membership m = Membership.Get(mi.UGID);
+					m.EndDate = DateTime.Now.ToShortDateString();
+					m.Save();
+					updateMembershipLists();
+					lstMembers.SelectedIndex = -1;
+					lstNonMembers.SelectedItem = selectedUserID;
+				}
+			}
+		}
+
+		//Deletes the Currently Selected Group
+		private void deleteGroup_Click(object sender, EventArgs e)
+		{
+			if (cbGroupSelection.SelectedIndex < 0)
 			{
 				MessageBox.Show("You must select a group to delete", "No Group Selected", MessageBoxButtons.OK, MessageBoxIcon.Warning);
 				return;
 			}
-			GroupInfo gi = myGroupInfoList[lstGroups.SelectedIndex];
+			GroupInfo gi = myGroupInfoList[cbGroupSelection.SelectedIndex];
 			if(myFolder.FolderConfig.Security_Group == gi.GID)
 			{
 				MessageBox.Show("Cannot Delete Default Group", "Attempt to Delete Default", MessageBoxButtons.OK, MessageBoxIcon.Warning);
 				return;
 			}
 			bool deleteOK = true;
-			if(gi.GroupMembershipCount > 0)
-			{
-				foreach (MembershipInfo mi in gi.GroupMemberships)
-				{
-					if (mi.EndDate == null || mi.EndDate == string.Empty)
-					{
-						deleteOK = false;
-						break;
-					}
-				}
-			}
-			if (!deleteOK)
+            if (gi.GroupMembershipCount > 0 && gi.GroupMemberships.Any(mi => mi.EndDate == null || mi.EndDate == string.Empty))
+                deleteOK = false;
+            if (!deleteOK)
 			{
 				MessageBox.Show("There are still users who are members of this group.  You need to delete all members in order to delete this group.", "Group Has Members", MessageBoxButtons.OK, MessageBoxIcon.Warning);
 				return;
@@ -381,90 +258,64 @@ namespace VEPROMS
 			if (MessageBox.Show("Are you sure you want to delete this group?", "Confirm Deleting Group", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question) == DialogResult.Yes)
 			{
 				Group.Delete(gi.GID);
-				GroupInfoList.Reset();
-				myGroupInfoList = GroupInfoList.Get();
+				LoadRefreshGroupUsers();
 				SetupGroups();
-				SetupSecurity();
 			}
 		}
-		private void lstGroups_MouseUp(object sender, MouseEventArgs e)
+
+		#endregion
+
+		#region Manage Users
+
+		//Sets up UserOptions
+		private void SetupUserOptions()
 		{
-			lstGroups.SelectedIndex = -1;
-			if (e.Button == MouseButtons.Right)
-			{
-				int k = lstGroups.IndexFromPoint(e.Location);
-				if (k >= 0)
-				{
-					lstGroups.SelectedIndex = k;
-					if (lstUsers.SelectedIndex >= 0)
-					{
-						GroupInfo gi = myGroupInfoList[k];
-						if (gi.GroupMembershipCount > 0)
-						{
-							addMemberToolStripMenuItemGroup.Visible = true;
-							UserInfo ui = myUserInfoList[lstUsers.SelectedIndex];
-							foreach (MembershipInfo mi in gi.GroupMemberships)
-							{
-								if (mi.MyUser.UserID == ui.UserID && (mi.EndDate == null || mi.EndDate == string.Empty))
-								{
-									addMemberToolStripMenuItemGroup.Visible = false;
-									break;
-								}
-							}
-						}
-					}
-					else
-						addMemberToolStripMenuItemGroup.Visible = false;
-					cmGroups.Show(lstGroups, e.Location);
-				}
-			}
-			else if (e.Button == MouseButtons.Left)
-			{
-				int k = lstGroups.IndexFromPoint(e.Location);
-				if (k >= 0)
-				{
-					lstGroups.SelectedIndex = k;
-				}
-			}
+			lstUsers.Items.Clear();
+			foreach (UserInfo ui in myUserInfoList)
+				lstUsers.Items.Add(ui.UserID);
+			lstUsers.SelectedIndex = -1;
+			lstGroups.DataSource = null;
 		}
+
+		#region Manage Users - User Options
+
+		//Build Membership list based on selected user
+		private void lstUsers_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			myMembershipInfoList = new List<MembershipInfo>();
+			if (lstUsers.SelectedIndex > -1)
+			{
+				UserInfo ui = myUserInfoList[lstUsers.SelectedIndex];
+				if (ui.UserMembershipCount > 0)
+				{
+					myMembershipInfoList.AddRange(ui.UserMemberships.Where(mi => mi.EndDate == null || mi.EndDate == string.Empty));
+				}
+			}
+
+			lstGroups.DataSource = myMembershipInfoList;
+			lstGroups.ValueMember = "UGID";
+			lstGroups.DisplayMember = "MyGroupName";
+		}
+
+		//Select User and set up Mouse Click Menus based on
+		//where click in User Box
 		private void lstUsers_MouseUp(object sender, MouseEventArgs e)
 		{
-			lstUsers.SelectedIndex = -1;
 			if (e.Button == MouseButtons.Right)
 			{
 				int k = lstUsers.IndexFromPoint(e.Location);
 				if (k >= 0)
 				{
 					lstUsers.SelectedIndex = k;
-          //addUserToolStripMenuItem.Visible = false;
 					editUserToolStripMenuItem.Visible = deleteUserToolStripMenuItem.Visible = true;
-					if (lstGroups.SelectedIndex >= 0)
-					{
-						UserInfo ui = myUserInfoList[k];
-						if(ui.UserMembershipCount > 0)
-						{
-							addMemberToolStripMenuItemUser.Visible = true;
-							GroupInfo gi = myGroupInfoList[lstGroups.SelectedIndex];
-							foreach(MembershipInfo mi in ui.UserMemberships)
-							{
-								if (mi.MyGroup.GroupName == gi.GroupName && (mi.EndDate == null || mi.EndDate == string.Empty))
-								{
-									addMemberToolStripMenuItemUser.Visible = false;
-									break;
-								}
-							}
-						}
-					}
-					else
-						addMemberToolStripMenuItemUser.Visible = false;
-					cmUsers.Show(lstUsers, e.Location);
 				}
 				else
 				{
 					addUserToolStripMenuItem.Visible = true;
-					editUserToolStripMenuItem.Visible = deleteUserToolStripMenuItem.Visible = addMemberToolStripMenuItemUser.Visible = false;
-					cmUsers.Show(lstUsers, e.Location);
+					editUserToolStripMenuItem.Visible = deleteUserToolStripMenuItem.Visible = false;
 				}
+
+				cmUsers.Show(lstUsers, e.Location);
 			}
 			else if (e.Button == MouseButtons.Left)
 			{
@@ -475,34 +326,216 @@ namespace VEPROMS
 				}
 			}
 		}
-		private void lstMembers_MouseUp(object sender, MouseEventArgs e)
+
+		//Adds a new User
+		private void addUserToolStripMenuItem_Click(object sender, EventArgs e)
 		{
-			lstMembers.SelectedIndex = -1;
-			if (e.Button == MouseButtons.Right)
+			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)
 			{
-				int k = lstMembers.IndexFromPoint(e.Location);
-				if (k >= 0)
-				{
-					lstMembers.SelectedIndex = k;
-					addMemberToolStripMenuItemUser.Visible = false;
-					removeMemberToolStripMenuItem.Visible = true;
-					cmMembers.Show(lstMembers, e.Location);
-				}
-				else
-				{
-					addMemberToolStripMenuItemUser.Visible = true;
-					removeMemberToolStripMenuItem.Visible = false;
-					cmMembers.Show(lstMembers, e.Location);
-				}
+				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 if (e.Button == MouseButtons.Left)
+			else
 			{
-				int k = lstMembers.IndexFromPoint(e.Location);
-				if (k >= 0)
+				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)
 				{
-					lstMembers.SelectedIndex = k;
+					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.YesNoCancel, 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<64>t be bringing up a menu in the Group box unless a user is 1st selected in the Users box.
+			if (e.Button == MouseButtons.Right && lstUsers.SelectedIndex > -1)
+			{
+				int k = lstGroups.IndexFromPoint(e.Location);
+				if (k >= 0)
+				{
+					lstGroups.SelectedIndex = k;
+					cmMembers.Items.Add(this.removeMemberToolStripMenuItem);
+
+				}
+
+				var groupsCanAddTo = myGroupInfoList.Select(x => new { x.GroupName, x.GID }).Except(myMembershipInfoList.Select(x => new { x.MyGroup.GroupName, x.GID }));
+				foreach (var possiblegroup in groupsCanAddTo)
+				{
+					ToolStripMenuItemwithValue AddToMenuItem = new ToolStripMenuItemwithValue($"Add as Member to Group: {possiblegroup.GroupName}", possiblegroup.GID);
+					AddToMenuItem.Click += addMemberToolStripMenuItem_Click;
+					cmMembers.Items.Add(AddToMenuItem);
+				}
+
+				cmMembers.Show(lstGroups, e.Location);
+
+			}
+			else if (e.Button == MouseButtons.Left)
+			{
+				int k = lstGroups.IndexFromPoint(e.Location);
+				if (k >= 0)
+				{
+					lstGroups.SelectedIndex = k;
+				}
+			}
+		}
+
+		//Adds a User to a Group
+		private void addMemberToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			ToolStripMenuItemwithValue item = (ToolStripMenuItemwithValue)sender;
+			int userIndex = lstUsers.SelectedIndex;
+			UserInfo ui = myUserInfoList[userIndex];
+
+			Membership.MakeMembership(User.Get(ui.UID), Group.Get((int) item.Value), null, "");
+
+			//Update the Group list to reflect the added group
+			LoadRefreshGroupUsers();
+			lstUsers_SelectedIndexChanged(sender, e);
+		}
+
+		//Removes a User from a Group
+		private void removeMemberToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			MembershipInfo mi = (MembershipInfo)lstGroups.SelectedItem;
+			string msg = "Are you sure you want to remove this Group Member?";
+			if (MessageBox.Show(this, msg, "Confirm Group Member Removal", MessageBoxButtons.YesNoCancel, 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,21 +112,27 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="cmFolders.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <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">
     <value>341, 17</value>
   </metadata>
-  <metadata name="cmMembers.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="cmMembers.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <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">
+  <metadata name="cmUsers.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.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>