C2024-016-Write-Info-to-Results-Window-Delete-Annotations

ready for testing phase

PROMS/AdjustBuildRevision/AdjustBuildRevision.csproj

@@ -27,7 +27,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>

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.2.yyMM.dHH") + "\")");
+								outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.3.yyMM.dHH") + "\")");
 							else
-								outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.1.yyMM.dHH") + "\")");
+								outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.2.yyMM.dHH") + "\")");
 					//		if (outline != line)
 					//		{
 					//			Console.WriteLine("Before: '{0}'", line);

PROMS/AdjustBuildRevision/app.config

@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup></configuration>

PROMS/Baseline/App.config

@@ -6,7 +6,7 @@
         </sectionGroup>
     </configSections>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/>
     </startup>
     <userSettings>
         <Baseline.Properties.Settings>

PROMS/Baseline/Baseline.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Baseline</RootNamespace>
     <AssemblyName>Baseline</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SccProjectName>
     </SccProjectName>

PROMS/DropDownPanel/DropDownPanel.csproj

@@ -18,7 +18,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>

PROMS/FlexableMessageBox/FlexableMessageBox.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>FlexableMessageBox</RootNamespace>
     <AssemblyName>FlexableMessageBox</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
     <SccProjectName>

PROMS/FlexableMessageBox/FlexibleMessageBox.cs

@@ -241,6 +241,21 @@ namespace JR.Utils.GUI.Forms
             return FlexibleMessageBoxForm.Show(owner, text, caption, buttons, icon, defaultButton);
         }
 
+        /// <summary>
+        /// Shows the specified message box.
+        /// </summary>
+        /// <param name="owner">The owner.</param>
+        /// <param name="text">The text.</param>
+        /// <param name="caption">The caption.</param>
+        /// <param name="buttons">The buttons.</param>
+        /// <param name="icon">The icon.</param>
+        /// <param name="defaultButton">The default button.</param>
+        /// <returns>The dialog result.</returns>
+        public static DialogResult ShowCustom(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon)
+        {
+            return FlexibleMessageBoxForm.ShowCustom(null, text, caption, buttons, icon);
+        }
+
         #endregion
 
         #region Internal form class
@@ -420,15 +435,15 @@ namespace JR.Utils.GUI.Forms
             private static readonly String STANDARD_MESSAGEBOX_SEPARATOR_SPACES = "   ";
 
             //These are the possible buttons (in a standard MessageBox)
-            private enum ButtonID { OK = 0, CANCEL, YES, NO, ABORT, RETRY, IGNORE };
-            
+            private enum ButtonID { OK = 0, CANCEL, YES, NO, ABORT, RETRY, IGNORE, OVERWRITE, RENAME };
+
             //These are the buttons texts for different languages. 
             //If you want to add a new language, add it here and in the GetButtonText-Function
             private enum TwoLetterISOLanguageID { en, de, es, it };
-            private static readonly String[] BUTTON_TEXTS_ENGLISH_EN = { "OK", "Cancel", "&Yes", "&No", "&Abort", "&Retry", "&Ignore" }; //Note: This is also the fallback language
-            private static readonly String[] BUTTON_TEXTS_GERMAN_DE = { "OK", "Abbrechen", "&Ja", "&Nein", "&Abbrechen", "&Wiederholen", "&Ignorieren" };
-            private static readonly String[] BUTTON_TEXTS_SPANISH_ES = { "Aceptar", "Cancelar", "&Sí", "&No", "&Abortar", "&Reintentar", "&Ignorar" };
-            private static readonly String[] BUTTON_TEXTS_ITALIAN_IT = { "OK", "Annulla", "&Sì", "&No", "&Interrompi", "&Riprova", "&Ignora" };
+            private static readonly String[] BUTTON_TEXTS_ENGLISH_EN = { "OK", "Cancel", "&Yes", "&No", "&Abort", "&Retry", "&Ignore", "&Overwrite", "&Rename" }; //Note: This is also the fallback language
+            private static readonly String[] BUTTON_TEXTS_GERMAN_DE = { "OK", "Abbrechen", "&Ja", "&Nein", "&Abbrechen", "&Wiederholen", "&Ignorieren", "&Overwrite", "&Rename" };
+            private static readonly String[] BUTTON_TEXTS_SPANISH_ES = { "Aceptar", "Cancelar", "&Sí", "&No", "&Abortar", "&Reintentar", "&Ignorar", "&Overwrite", "&Rename" };
+            private static readonly String[] BUTTON_TEXTS_ITALIAN_IT = { "OK", "Annulla", "&Sì", "&No", "&Interrompi", "&Riprova", "&Ignora", "&Overwrite", "&Rename" };
 
             #endregion
 
@@ -693,6 +708,7 @@ namespace JR.Utils.GUI.Forms
 
                         flexibleMessageBoxForm.CancelButton = flexibleMessageBoxForm.button3;
                         break;
+             
 
                     case MessageBoxButtons.OK:
                     default:
@@ -709,16 +725,38 @@ namespace JR.Utils.GUI.Forms
                 flexibleMessageBoxForm.defaultButton = defaultButton;
             }
 
-            #endregion
+            private static void SetDialogButtonsCustom(FlexibleMessageBoxForm flexibleMessageBoxForm)
+            {
+                flexibleMessageBoxForm.visibleButtonsCount = 3;
 
-            #region Private event handlers
+                flexibleMessageBoxForm.button1.Visible = true;
+                flexibleMessageBoxForm.button1.Text = flexibleMessageBoxForm.GetButtonText(ButtonID.CANCEL);
+                flexibleMessageBoxForm.button1.DialogResult = DialogResult.Abort;
 
-            /// <summary>
-            /// Handles the Shown event of the FlexibleMessageBoxForm control.
-            /// </summary>
-            /// <param name="sender">The source of the event.</param>
-            /// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
-            private void FlexibleMessageBoxForm_Shown(object sender, EventArgs e)
+                flexibleMessageBoxForm.button2.Visible = true;
+                flexibleMessageBoxForm.button2.Text = flexibleMessageBoxForm.GetButtonText(ButtonID.OVERWRITE);
+                flexibleMessageBoxForm.button2.DialogResult = DialogResult.Retry;
+
+                flexibleMessageBoxForm.button3.Visible = true;
+                flexibleMessageBoxForm.button3.Text = flexibleMessageBoxForm.GetButtonText(ButtonID.RENAME);
+                flexibleMessageBoxForm.button3.DialogResult = DialogResult.Ignore;
+
+                flexibleMessageBoxForm.ControlBox = false;
+            }
+
+
+
+
+                #endregion
+
+                #region Private event handlers
+
+                /// <summary>
+                /// Handles the Shown event of the FlexibleMessageBoxForm control.
+                /// </summary>
+                /// <param name="sender">The source of the event.</param>
+                /// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
+                private void FlexibleMessageBoxForm_Shown(object sender, EventArgs e)
             {
                 int buttonIndexToFocus = 1;
                 Button buttonToFocus;
@@ -866,6 +904,46 @@ namespace JR.Utils.GUI.Forms
                 return flexibleMessageBoxForm.ShowDialog(owner);
             }
 
+            /// <summary>
+            /// Shows the specified message box.
+            /// </summary>
+            /// <param name="owner">The owner.</param>
+            /// <param name="text">The text.</param>
+            /// <param name="caption">The caption.</param>
+            /// <param name="buttons">The buttons.</param>
+            /// <param name="icon">The icon.</param>
+            /// <param name="defaultButton">The default button.</param>
+            /// <returns>The dialog result.</returns>
+            public static DialogResult ShowCustom(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon)
+            {
+                //Create a new instance of the FlexibleMessageBox form
+                var flexibleMessageBoxForm = new FlexibleMessageBoxForm();
+                flexibleMessageBoxForm.ShowInTaskbar = false;
+
+                //Bind the caption and the message text
+                flexibleMessageBoxForm.CaptionText = caption;
+                flexibleMessageBoxForm.MessageText = text;
+                flexibleMessageBoxForm.FlexibleMessageBoxFormBindingSource.DataSource = flexibleMessageBoxForm;
+
+                //Set the buttons visibilities and texts. Also set a default button.
+                SetDialogButtonsCustom(flexibleMessageBoxForm);
+
+                //Set the dialogs icon. When no icon is used: Correct placement and width of rich text box.
+                SetDialogIcon(flexibleMessageBoxForm, icon);
+
+                //Set the font for all controls
+                flexibleMessageBoxForm.Font = FONT;
+                flexibleMessageBoxForm.richTextBoxMessage.Font = FONT;
+
+                //Calculate the dialogs start size (Try to auto-size width to show longest text row). Also set the maximum dialog size. 
+                SetDialogSizes(flexibleMessageBoxForm, text, caption);
+
+				//Set the dialogs start position when given. Otherwise center the dialog on the current screen.
+				SetDialogStartPosition(flexibleMessageBoxForm, owner);
+				//Show the dialog
+				return flexibleMessageBoxForm.ShowDialog(owner);
+			}
+
             #endregion
         } //class FlexibleMessageBoxForm
 

PROMS/Formats/Formats.csproj

@@ -18,7 +18,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>
@@ -126,6 +126,7 @@
     <Content Include="fmtall\BVPSAOPall.xml" />
     <Content Include="fmtall\BVPSAtchall.xml" />
     <Content Include="fmtall\BVPSBCKall.xml" />
+    <Content Include="fmtall\BVPSAOPDEVall.xml" />
     <Content Include="fmtall\BVPSFlexDEVall.xml" />
     <Content Include="fmtall\BVPSDEVall.xml" />
     <Content Include="fmtall\BVPSNIBCKall.xml" />
@@ -406,6 +407,7 @@
     <Content Include="genmacall\BVPSAOP.svg" />
     <Content Include="genmacall\BVPSAtch.svg" />
     <Content Include="genmacall\BVPSbck.svg" />
+    <Content Include="genmacall\BVPSAOPdev.svg" />
     <Content Include="genmacall\BVPSFlexdev.svg" />
     <Content Include="genmacall\BVPSdev.svg" />
     <Content Include="genmacall\BVPSNIBCK.svg" />

PROMS/Formats/app.config

@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup></configuration>

PROMS/LBWordLibrary/LBWordLibrary.csproj

@@ -18,7 +18,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>

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

@@ -33,7 +33,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <OldToolsVersion>2.0</OldToolsVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>

PROMS/ReferencedObjects/Exe/RefObj/CmpRpt/app.config

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <configuration>
 	<startup>
-	<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup><runtime>
+	<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup><runtime>
 		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" appliesTo="v1.0.3705">
 		</assemblyBinding></runtime></configuration>

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

@@ -23,8 +23,8 @@ using System.Runtime.CompilerServices;
 //      Build YYMM (two digit year, two digit month)
 //      Revision DHH (day - no leading zero, two digit hour - military time
 //
-[assembly: AssemblyVersion("2.2.2306.2212")]
-[assembly: AssemblyFileVersion("2.2.2306.2212")]
+[assembly: AssemblyVersion("2.3.2404.1611")]
+[assembly: AssemblyFileVersion("2.3.2404.1611")]
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the 
@@ -89,6 +89,8 @@ using System.Runtime.CompilerServices;
 
 
 
+
+
 
 
 

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

@@ -44,7 +44,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <OldToolsVersion>2.0</OldToolsVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>

PROMS/ReferencedObjects/Exe/RefObj/ROEditor/app.config

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <configuration>
 	<startup>
-	<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup><runtime>
+	<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup><runtime>
 		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" appliesTo="v1.0.3705">
 		</assemblyBinding></runtime>
 	<appSettings>

PROMS/ReferencedObjects/LibSource/DBEncapsulation/DBEncapsulation.csproj

@@ -35,7 +35,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <OldToolsVersion>2.0</OldToolsVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>

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

@@ -18,7 +18,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>

PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.csproj

@@ -35,7 +35,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <OldToolsVersion>2.0</OldToolsVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>

PROMS/ReferencedObjects/LibSource/ROFST/ROFST.csproj

@@ -35,7 +35,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <OldToolsVersion>2.0</OldToolsVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>

PROMS/ReferencedObjects/LibSource/ROField/ROFields.csproj

@@ -35,7 +35,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <OldToolsVersion>2.0</OldToolsVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>

PROMS/ReferencedObjects/LibSource/Utils/Utils.csproj

@@ -51,7 +51,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

PROMS/ReferencedObjects/LibSource/VlnProfiler/VlnProfiler.csproj

@@ -46,7 +46,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <OldToolsVersion>2.0</OldToolsVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>

PROMS/ReferencedObjects/LibSource/VlnStatus/VlnStatus.csproj

@@ -35,7 +35,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <OldToolsVersion>2.0</OldToolsVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>

PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEditLib.csproj

@@ -35,7 +35,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <OldToolsVersion>2.0</OldToolsVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>

PROMS/RoAccessToSql/App.config

@@ -60,6 +60,6 @@
 			</logger>
 		</log4net>
 		<startup>
-			<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
+			<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/>
 		</startup>
 	</configuration>

PROMS/RoAccessToSql/RoAccessToSql.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>RoAccessToSql</RootNamespace>
     <AssemblyName>RoAccessToSql</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
     <SccProjectName>

PROMS/TablePicker/TablePicker.csproj

@@ -33,7 +33,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <OldToolsVersion>2.0</OldToolsVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>

PROMS/VEPROMS User Interface/App.config

@@ -1,73 +1,73 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <configSections>
-    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
+    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/>
     <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-      <section name="VEPROMS.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
-      <section name="UISampleNetBar1.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+      <section name="VEPROMS.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
+      <section name="UISampleNetBar1.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
     </sectionGroup>
   </configSections>
   <log4net>
     <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
-      <param name="File" value="${USERPROFILE}/My Documents/VEPROMS/ErrorLog.txt" />
+      <param name="File" value="${USERPROFILE}/My Documents/VEPROMS/ErrorLog.txt"/>
       <!--<param name="File" value="${APPDATA}/Volian/Proms2010/ErrorLog.txt" />-->
       <!--<param name="File" value="${LOCALAPPDATA}/Temp/VEPROMS/ErrorLog.txt" />-->
-      <param name="AppendToFile" value="true" />
+      <param name="AppendToFile" value="true"/>
       <layout type="log4net.Layout.PatternLayout">
         <!--<param name="Header" value="[Header]\r\n" />-->
         <!--<param name="Footer" value="[Footer]\r\n" />-->
-        <param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n" />
+        <param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n"/>
       </layout>
     </appender>
     <appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender">
       <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="--&gt; %date [%thread] %-5level %logger (%property{log4net:HostName}) [%ndc] - %message%newline" />
+        <conversionPattern value="--&gt; %date [%thread] %-5level %logger (%property{log4net:HostName}) [%ndc] - %message%newline"/>
       </layout>
     </appender>
     <appender name="EventLogAppender" type="log4net.Appender.EventLogAppender">
-      <threshold value="WARN" />
+      <threshold value="WARN"/>
       <mapping>
-        <level value="DEBUG" />
-        <eventLogEntryType value="Information" />
+        <level value="DEBUG"/>
+        <eventLogEntryType value="Information"/>
       </mapping>
       <mapping>
-        <level value="INFO" />
-        <eventLogEntryType value="Information" />
+        <level value="INFO"/>
+        <eventLogEntryType value="Information"/>
       </mapping>
       <mapping>
-        <level value="WARN" />
-        <eventLogEntryType value="Warning" />
+        <level value="WARN"/>
+        <eventLogEntryType value="Warning"/>
       </mapping>
       <mapping>
-        <level value="ERROR" />
-        <eventLogEntryType value="Error" />
+        <level value="ERROR"/>
+        <eventLogEntryType value="Error"/>
       </mapping>
       <mapping>
-        <level value="FATAL" />
-        <eventLogEntryType value="Error" />
+        <level value="FATAL"/>
+        <eventLogEntryType value="Error"/>
       </mapping>
       <layout type="log4net.Layout.PatternLayout">
-        <param name="ConversionPattern" value="---&gt; %d [%t] %-5p %c - %m%n" />
+        <param name="ConversionPattern" value="---&gt; %d [%t] %-5p %c - %m%n"/>
       </layout>
     </appender>
     <root>
-      <level value="ALL" />
-      <appender-ref ref="ConsoleAppender" />
-      <appender-ref ref="LogFileAppender" />
-      <appender-ref ref="EventLogAppender" />
+      <level value="ALL"/>
+      <appender-ref ref="ConsoleAppender"/>
+      <appender-ref ref="LogFileAppender"/>
+      <appender-ref ref="EventLogAppender"/>
     </root>
     <logger name="VEPROMS.CSLA.Library">
-      <level value="INFO" />
+      <level value="INFO"/>
     </logger>
     <logger name="Volian.Controls.Library">
-      <level value="INFO" />
+      <level value="INFO"/>
     </logger>
   </log4net>
   <appSettings>
-    <add key="OperatingMode" value="Production" />
+    <add key="OperatingMode" value="Production"/>
     <!--"Debug" "Production" "Demo"/-->
-    <add key="OriginalPageBreak" value="False" />
-    <add key="CslaAuthentication" value="Windows" />
+    <add key="OriginalPageBreak" value="False"/>
+    <add key="CslaAuthentication" value="Windows"/>
     <!--
     <add key="CslaDataPortalProxy" 
       value="Csla.DataPortalClient.RemotingProxy, Csla"/>
@@ -85,17 +85,17 @@
       value="EnterpriseServicesHost.EnterpriseServicesProxy,
       EnterpriseServicesHost"/>      
       -->
-    <add key="ClientSettingsProvider.ServiceUri" value="" />
+    <add key="ClientSettingsProvider.ServiceUri" value=""/>
   </appSettings>
   <connectionStrings>
-    <add name="VEPROMS" connectionString="Data Source=VOLIAN-SERVER;User Id=proms2010;password=proms2010;Initial Catalog=VEPROMS" providerName="System.Data.SqlClient" />
-    <add name="VEPROMS_LOCAL" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />
-    <add name="VEPROMS_RMARK_DEBUG" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />
-    <add name="VEPROMS_RMARK_DEMO" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />
+    <add name="VEPROMS" connectionString="Data Source=VOLIAN-SERVER;User Id=proms2010;password=proms2010;Initial Catalog=VEPROMS" providerName="System.Data.SqlClient"/>
+    <add name="VEPROMS_LOCAL" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient"/>
+    <add name="VEPROMS_RMARK_DEBUG" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient"/>
+    <add name="VEPROMS_RMARK_DEMO" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient"/>
     <!--<add name="VEPROMS_BODINE_DEBUG" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />
 	  <add name="VEPROMS_BODINE_DEMO" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />-->
-    <add name="VEPROMS_BODINE_DEBUG" connectionString="Data Source=JCB2-HP\VOLIAN08;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />
-    <add name="VEPROMS_BODINE_DEMO" connectionString="Data Source=JCB2-HP\VOLIAN08;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />
+    <add name="VEPROMS_BODINE_DEBUG" connectionString="Data Source=JCB2-HP\VOLIAN08;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient"/>
+    <add name="VEPROMS_BODINE_DEMO" connectionString="Data Source=JCB2-HP\VOLIAN08;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient"/>
     <!--<add name="VEPROMS_BODINE_DEBUG" connectionString="Data Source=JCB2-HP\VOLIAN12;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />
     <add name="VEPROMS_BODINE_DEMO" connectionString="Data Source=JCB2-HP\VOLIAN12;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />-->
   </connectionStrings>
@@ -135,10 +135,10 @@
         <value>True</value>
       </setting>
       <setting name="QATItems" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="DefaultDB" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="LastVersion" serializeAs="String">
         <value>0.0</value>
@@ -150,10 +150,10 @@
         <value>True</value>
       </setting>
       <setting name="SMTPServer" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="SMTPUser" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="UpdateSettings" serializeAs="String">
         <value>True</value>
@@ -181,18 +181,22 @@
     </UISampleNetBar1.Properties.Settings>
   </userSettings>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/>
   </startup>
+  <runtime>
+    <AppContextSwitchOverrides
+      value="Switch.System.Windows.Forms.DoNotLoadLatestRichEditControl=true" />
+  </runtime>
   <system.web>
     <membership defaultProvider="ClientAuthenticationMembershipProvider">
       <providers>
-        <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
+        <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri=""/>
       </providers>
     </membership>
     <roleManager defaultProvider="ClientRoleProvider" enabled="true">
       <providers>
-        <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
+        <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400"/>
       </providers>
     </roleManager>
   </system.web>
-</configuration>
+</configuration>

PROMS/VEPROMS User Interface/DlgPrintProcedure.cs

@@ -1320,6 +1320,10 @@ namespace VEPROMS
 			if (swtbtnPDFLinks.Value)
 				swtbtnPDFdtPrefixSuffix.Value = false;
 			BuildPDFFileName();
+			// C2024-013: When Create RO & Transition Hyperlinks in pdf is ON, disable the MergePdf
+			//	button.  The Create RO & Transition Hyperlinks option looks for individual file names
+			//	for procedures.
+			btnMergePDFs.Enabled = !swtbtnPDFLinks.Value; 
 		}
 
 		// C2019-004: Allow user to define duplex blank page text.  The text box for blank page text is always enabled for procedures with

PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs.bak

@@ -1,92 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("PROMS")]
-[assembly: AssemblyDescription("Create, Edit, and Maintain Procedures Sets.")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Volian Enterprises, Inc.")]
-[assembly: AssemblyProduct("PROMS")]
-[assembly: AssemblyCopyright("Copyright © 2012. All Rights Reserved.")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("2ffeb031-bf85-4153-baa2-2d4da2fd5556")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build YYMM (two digit year, two digit month)
-//      Revision DHH (day - no leading zero, two digit hour - military time
-//
-[assembly: AssemblyVersion("11.6.1205.316")]
-[assembly: AssemblyFileVersion("11.6.1205.316")]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

PROMS/VEPROMS User Interface/VEPROMS.gclicx

@@ -0,0 +1,2 @@
+da3d5d14-691f-4908-aa3c-fd3239734232;-8584908724854775808;VkVQUk9NUy5leGU=;ZGEzZDVkMTQtNjkxZi00OTA4LWFhM2MtZmQzMjM5NzM0MjMy,MjQyNzYxODZYWFhYWFhYWDAzNg,Sk9ITi1XSU4xMA,RmFsc2U,ODg0Mw,RmFsc2U,MA,MA,djIwMjQuMQ,,;PxeAWRi6mhDqvUMfJhk9Tniu/8ZnOLQv64hLh05xWM+MPyBs3yYfs3vEn5TLW779QNr1k8F6tV3gOAoLG+JSPZoG3NXmdTe6LJya05W+zWyb0H+jj2ReXN2dNR9fbZNDd3ClAeuzNpsM0pw62aYpOe2Tp6fx9gOFx1/0g8g4/8g
+da3d5d14-691f-4908-aa3c-fd3239734232;-8584865524854775808;VkVQUk9NUy5leGU=;ZGEzZDVkMTQtNjkxZi00OTA4LWFhM2MtZmQzMjM5NzM0MjMy,NjE5MDczODdYWFhYWFhYWDA1Mw,Q0hSSVM,RmFsc2U,ODg5NA,RmFsc2U,MA,MA,djIwMjQuMQ,,;luo/kWHt4XRAYR+3s8m8QoRagBcvXLv0mHvCYU2VCIeACFord4tdtTGmSUvmGhEmUiAd7YvaTlDlFrlni6CWaVlxa1mdbWuWsNVUkRnyJZ8kOAt1A+3SGfHecCsqotTW7apXjwW5qXLZ/fcgutioe7xaXgniFQysshTdUWt26T8

PROMS/VEPROMS User Interface/VEPROMS_UI.csproj

@@ -19,7 +19,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>
@@ -99,12 +99,10 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="C1.Win.C1FlexGrid.2, Version=2.0.20162.188, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-    <Reference Include="C1.Win.C1SpellChecker.2, Version=2.0.20162.188, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
+    <Reference Include="C1.Win.2, Version=2.0.20213.532, Culture=neutral, PublicKeyToken=944ae1ea0e47ca04" />
+    <Reference Include="C1.Win.C1Command.2, Version=2.0.20213.532, Culture=neutral, PublicKeyToken=e808566f358766d8" />
+    <Reference Include="C1.Win.C1FlexGrid.2, Version=2.0.20213.532, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL" />
+    <Reference Include="C1.Win.C1Input.2, Version=2.0.20213.532, Culture=neutral, PublicKeyToken=7e7ff60f0c214f9a, processorArchitecture=MSIL" />
     <Reference Include="Csla">
       <HintPath>..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll</HintPath>
     </Reference>
@@ -139,6 +137,7 @@
     <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
+    <Reference Include="UIAutomationProvider" />
     <Reference Include="VEPROMS.CSLA.Library, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\VEPROMS.CSLA.Library\bin\Debug\VEPROMS.CSLA.Library.dll</HintPath>
@@ -224,6 +223,18 @@
     <Compile Include="dlgUCFDetail.Designer.cs">
       <DependentUpon>dlgUCFDetail.cs</DependentUpon>
     </Compile>
+    <Compile Include="frmAnnotationResults.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frmAnnotationResults.Designer.cs">
+      <DependentUpon>frmAnnotationResults.cs</DependentUpon>
+    </Compile>
+    <Compile Include="frmAnnotationsCleanup.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frmAnnotationsCleanup.Designer.cs">
+      <DependentUpon>frmAnnotationsCleanup.cs</DependentUpon>
+    </Compile>
     <Compile Include="frmBatchRefresh.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -335,6 +346,12 @@
     <EmbeddedResource Include="dlgUCFDetail.resx">
       <DependentUpon>dlgUCFDetail.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="frmAnnotationResults.resx">
+      <DependentUpon>frmAnnotationResults.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frmAnnotationsCleanup.resx">
+      <DependentUpon>frmAnnotationsCleanup.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="frmPDFStatusForm.resx">
       <DependentUpon>frmPDFStatusForm.cs</DependentUpon>
       <SubType>Designer</SubType>
@@ -427,6 +444,7 @@
     <Compile Include="VlnWeb.Designer.cs">
       <DependentUpon>VlnWeb.cs</DependentUpon>
     </Compile>
+    <EmbeddedResource Include="VEPROMS.gclicx" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Resources\Separator.png" />

PROMS/VEPROMS User Interface/dlgExportImport.cs

@@ -99,6 +99,10 @@ namespace VEPROMS
 			MyProcedure = procedureInfo;
 			InitializeComponent();
 			this.Text = mode + " Dialog for " + procedureInfo.DisplayNumber;
+
+			//Preset path for single procedures.
+			PEIPath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + @"\VEPROMS\PEI_" + Database.VEPROMS_SqlConnection.Database;
+			txtExport.Text = string.Format(@"{0}\{1}.pxml", PEIPath, MyProcedure.DisplayNumber.Replace("/", "_").Replace("\\", "_"));
 		}
 		private void dlgExportImport_Load(object sender, EventArgs e)
 		{
@@ -172,6 +176,7 @@ namespace VEPROMS
 			}
 			else if (MyProcedure != null)
 			{
+				txtExport.Enabled = true;
 				txtExport.Text = string.Format(@"{0}\{1}.pxml", PEIPath, MyProcedure.DisplayNumber.Replace("/", "_").Replace("\\", "_"));
 			}
 		}
@@ -190,6 +195,8 @@ namespace VEPROMS
 		private bool successfullExport = true;
 		private void btnDoExport_Click(object sender, EventArgs e)
 		{
+		
+
 			btnExport.Enabled = false;
 			string msg = "Finished Exporting:\n\n";
 			if (_MyMode.ToUpper().Contains("FORMAT"))
@@ -220,6 +227,42 @@ namespace VEPROMS
 			}
 			else if (MyProcedure != null)
 			{
+				var fileLocation = txtExport.Text;
+				if (File.Exists(fileLocation))
+					{   // C2022-029 if an existing export of the same name is found, provide option to overwrite it
+					DialogResult ovewriteEx = FlexibleMessageBox.ShowCustom(null, "There is already another export file with the same name.  You can choose to either overwrite the existing file or have the existing file renamed with the original creation date appended.\r\n\r\nSelecting 'Cancel' will cancel the export.", "What would you like to do?", MessageBoxButtons.OKCancel, MessageBoxIcon.Question);// == DialogResult.Yes;
+
+					// Extract directory, filename, and extension
+					string directory = Path.GetDirectoryName(fileLocation);
+					string filename = Path.GetFileNameWithoutExtension(fileLocation);
+					string extension = Path.GetExtension(fileLocation);
+					fileLocation = $"{directory}\\{filename}{extension}";
+
+					if (ovewriteEx == DialogResult.Abort)
+					{
+						MessageBox.Show("Export has been cancelled", "You have chosen to cancel the export.", MessageBoxButtons.OK, MessageBoxIcon.Information); // C2020-042 changed mesage box title
+						btnCloseExport.Enabled = true;
+						return;
+					}
+					else if (ovewriteEx == DialogResult.Retry)
+					{
+						//Overwrite will occur, set msg.
+						msg = "The export file has been overwritten.  ";
+					}
+					else if (ovewriteEx == DialogResult.Ignore)
+					{
+						// Get the modified date of the existing file, create a datestamp for use in name, set newlocation to move to
+						DateTime modifiedDate = File.GetLastWriteTime(fileLocation);
+						string datestamp = modifiedDate.ToString("yyyyMMddHHmmss");
+						string newFileLocation = $"{directory}\\{filename}_{datestamp}{extension}";
+
+						//Move and set msg.
+						File.Move(fileLocation, newFileLocation);
+						msg = "The previous export has been renamed, the export file has been created.  ";
+					}
+
+				}
+
 				this.Cursor = Cursors.WaitCursor;
 				MyStart = DateTime.Now;
 				btnDoExport.Enabled = false;
@@ -230,7 +273,7 @@ namespace VEPROMS
 				XmlElement xe = xd.CreateElement("formats");
 				xd.DocumentElement.AppendChild(xe);
 				ExportFormats(FormatInfoList.GetFormatInfoListUsed(), xe, "formats", false);
-				xd.Save(txtExport.Text);
+				xd.Save(fileLocation);
 				TimeSpan elapsed = DateTime.Now.Subtract(MyStart);
 				lblExportStatus.Text = "Export Completed in " + elapsed.ToString();
 				this.Cursor = Cursors.Default;
@@ -706,7 +749,7 @@ namespace VEPROMS
 			}
 			catch (Exception ex)
 			{
-				FlexibleMessageBox.Show("The import failed, check the error log for more information.", "Import Failed", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+				FlexibleMessageBox.Show(null, "The import failed, check the error log for more information.", "Import Failed", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
 				_MyLog.Warn("Failure During Import", ex);
 			}
 			return false;

PROMS/VEPROMS User Interface/dlgExportImport.designer.cs

@@ -400,6 +400,7 @@ namespace VEPROMS
 			this.pnlImport.PerformLayout();
 			this.ResumeLayout(false);
 
+
 		}
 
 		#endregion

PROMS/VEPROMS User Interface/dlgSetChangeBarStartDate.Designer.cs

@@ -57,7 +57,7 @@
 			this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
 			this.btnCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
 			this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.btnCancel.Location = new System.Drawing.Point(165, 111);
+			this.btnCancel.Location = new System.Drawing.Point(179, 111);
 			this.btnCancel.Name = "btnCancel";
 			this.btnCancel.Size = new System.Drawing.Size(64, 23);
 			this.btnCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -88,7 +88,7 @@
 			this.dateTimeInput1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			this.dateTimeInput1.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown;
 			this.dateTimeInput1.ButtonDropDown.Visible = true;
-			this.dateTimeInput1.CustomFormat = "MM/dd/yyyy";
+			this.dateTimeInput1.CustomFormat = "MM/dd/yyyy HH:mm:ss";
 			this.dateTimeInput1.DateTimeSelectorVisibility = DevComponents.Editors.DateTimeAdv.eDateTimeSelectorVisibility.DateSelector;
 			this.dateTimeInput1.Format = DevComponents.Editors.eDateTimePickerFormat.Custom;
 			this.dateTimeInput1.IsPopupCalendarOpen = false;
@@ -122,7 +122,7 @@
 			this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			this.dateTimeInput1.MonthCalendar.TodayButtonVisible = true;
 			this.dateTimeInput1.Name = "dateTimeInput1";
-			this.dateTimeInput1.Size = new System.Drawing.Size(113, 20);
+			this.dateTimeInput1.Size = new System.Drawing.Size(146, 20);
 			this.dateTimeInput1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
 			this.superTooltip1.SetSuperTooltip(this.dateTimeInput1, new DevComponents.DotNetBar.SuperTooltipInfo("Change Bar Start Date", "", "Only the changes made after this date will have change bars.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(138, 67)));
 			this.dateTimeInput1.TabIndex = 4;
@@ -133,7 +133,7 @@
 			// 
 			this.btnNow.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
 			this.btnNow.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-			this.btnNow.Location = new System.Drawing.Point(149, 51);
+			this.btnNow.Location = new System.Drawing.Point(182, 51);
 			this.btnNow.Name = "btnNow";
 			this.btnNow.Size = new System.Drawing.Size(49, 23);
 			this.btnNow.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -146,7 +146,7 @@
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(241, 144);
+			this.ClientSize = new System.Drawing.Size(268, 144);
 			this.Controls.Add(this.btnNow);
 			this.Controls.Add(this.dateTimeInput1);
 			this.Controls.Add(this.label1);

PROMS/VEPROMS User Interface/dlgSetChangeBarStartDate.cs

@@ -32,13 +32,46 @@ namespace VEPROMS
 		{
 			string cbdt = MyProcConfig.Print_ChangeBarDate;
 			string[] tmp = cbdt.Split(' ');
-			cbdt = tmp[0] + " 00:00:00";
-			dateTimeInput1.Value = (cbdt == null || cbdt == "") ? DateTime.Now : DateTime.Parse(cbdt);
+
+			if (tmp[0] == null || tmp[0] == "")  // First time date set.
+			{
+				cbdt = DateTime.Now.ToString("MM/dd/yyyy") + " " + DateTime.Now.ToString("HH:mm:ss");
+				dateTimeInput1.Value = DateTime.Parse(cbdt);
+				return;
+			}
+			else
+			{
+				DateTime tmpdt = DateTime.Parse(cbdt);
+				if (tmpdt.Date == DateTime.Today) // Date has before been set.
+				{
+					TimeSpan start = TimeSpan.Parse("00:00:00");
+
+					var time = tmpdt.TimeOfDay;
+					if (start < time) // If time is greater than 12:00:00 AM
+					{
+						cbdt = DateTime.Now.ToString("MM/dd/yyyy") + " " + tmpdt.TimeOfDay.ToString();
+						dateTimeInput1.Value = DateTime.Parse(cbdt);
+						return;
+					}
+					else // if time is 12:00:00 AM
+					{
+						cbdt = DateTime.Now.ToString("MM/dd/yyyy") + " " + " 00:00:00";
+						dateTimeInput1.Value = DateTime.Parse(cbdt);
+						return;
+					}
+				}
+				else
+				{
+					cbdt = tmpdt.ToString();
+					dateTimeInput1.Value = DateTime.Parse(cbdt);
+					return;
+				}
+			}
 		}
 
 		private void btnOK_Click(object sender, EventArgs e)
 		{
-			MyProcConfig.Print_ChangeBarDate = dateTimeInput1.Value.ToString("MM/dd/yyyy 00:00:00");// ("MM/dd/yyyy HH:mm:ss");
+			MyProcConfig.Print_ChangeBarDate = dateTimeInput1.Value.ToString("MM/dd/yyyy HH:mm:ss");// ("MM/dd/yyyy HH:mm:ss");
 		}
 
 

PROMS/VEPROMS User Interface/dlgSetChangeBarStartDate.resx

@@ -112,12 +112,12 @@
     <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="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
 </root>

PROMS/VEPROMS User Interface/frmAnnotationResults.Designer.cs

@@ -0,0 +1,158 @@
+
+namespace VEPROMS
+{
+	partial class frmAnnotationResults
+	{
+		/// <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.lblAnnotationResults = new System.Windows.Forms.Label();
+			this.lblResultTotal = new System.Windows.Forms.Label();
+			this.lblTotal = new System.Windows.Forms.Label();
+			this.lblType = new System.Windows.Forms.Label();
+			this.lblTypeTxt = new System.Windows.Forms.Label();
+			this.lblPlace1 = new System.Windows.Forms.Label();
+			this.lblPlace1Txt = new System.Windows.Forms.Label();
+			this.lblPlace2 = new System.Windows.Forms.Label();
+			this.lblPlace2Txt = new System.Windows.Forms.Label();
+			this.SuspendLayout();
+			// 
+			// lblAnnotationResults
+			// 
+			this.lblAnnotationResults.AutoSize = true;
+			this.lblAnnotationResults.Location = new System.Drawing.Point(63, 9);
+			this.lblAnnotationResults.Name = "lblAnnotationResults";
+			this.lblAnnotationResults.Size = new System.Drawing.Size(138, 13);
+			this.lblAnnotationResults.TabIndex = 0;
+			this.lblAnnotationResults.Text = "Annotation Cleanup Results";
+			this.lblAnnotationResults.Click += new System.EventHandler(this.label1_Click);
+			// 
+			// lblResultTotal
+			// 
+			this.lblResultTotal.AutoSize = true;
+			this.lblResultTotal.Location = new System.Drawing.Point(159, 37);
+			this.lblResultTotal.Name = "lblResultTotal";
+			this.lblResultTotal.Size = new System.Drawing.Size(27, 13);
+			this.lblResultTotal.TabIndex = 1;
+			this.lblResultTotal.Text = "*****";
+			// 
+			// lblTotal
+			// 
+			this.lblTotal.AutoSize = true;
+			this.lblTotal.Location = new System.Drawing.Point(66, 37);
+			this.lblTotal.Name = "lblTotal";
+			this.lblTotal.Size = new System.Drawing.Size(69, 13);
+			this.lblTotal.TabIndex = 2;
+			this.lblTotal.Text = "Total remved";
+			// 
+			// lblType
+			// 
+			this.lblType.AutoSize = true;
+			this.lblType.Location = new System.Drawing.Point(66, 60);
+			this.lblType.Name = "lblType";
+			this.lblType.Size = new System.Drawing.Size(85, 13);
+			this.lblType.TabIndex = 3;
+			this.lblType.Text = "Annotation Type";
+			// 
+			// lblTypeTxt
+			// 
+			this.lblTypeTxt.AutoSize = true;
+			this.lblTypeTxt.Location = new System.Drawing.Point(159, 60);
+			this.lblTypeTxt.Name = "lblTypeTxt";
+			this.lblTypeTxt.Size = new System.Drawing.Size(27, 13);
+			this.lblTypeTxt.TabIndex = 4;
+			this.lblTypeTxt.Text = "*****";
+			// 
+			// lblPlace1
+			// 
+			this.lblPlace1.AutoSize = true;
+			this.lblPlace1.Location = new System.Drawing.Point(66, 87);
+			this.lblPlace1.Name = "lblPlace1";
+			this.lblPlace1.Size = new System.Drawing.Size(43, 13);
+			this.lblPlace1.TabIndex = 5;
+			this.lblPlace1.Text = "Place 1";
+			// 
+			// lblPlace1Txt
+			// 
+			this.lblPlace1Txt.AutoSize = true;
+			this.lblPlace1Txt.Location = new System.Drawing.Point(159, 87);
+			this.lblPlace1Txt.Name = "lblPlace1Txt";
+			this.lblPlace1Txt.Size = new System.Drawing.Size(27, 13);
+			this.lblPlace1Txt.TabIndex = 6;
+			this.lblPlace1Txt.Text = "*****";
+			// 
+			// lblPlace2
+			// 
+			this.lblPlace2.AutoSize = true;
+			this.lblPlace2.Location = new System.Drawing.Point(66, 115);
+			this.lblPlace2.Name = "lblPlace2";
+			this.lblPlace2.Size = new System.Drawing.Size(43, 13);
+			this.lblPlace2.TabIndex = 7;
+			this.lblPlace2.Text = "Place 2";
+			// 
+			// lblPlace2Txt
+			// 
+			this.lblPlace2Txt.AutoSize = true;
+			this.lblPlace2Txt.Location = new System.Drawing.Point(159, 115);
+			this.lblPlace2Txt.Name = "lblPlace2Txt";
+			this.lblPlace2Txt.Size = new System.Drawing.Size(27, 13);
+			this.lblPlace2Txt.TabIndex = 8;
+			this.lblPlace2Txt.Text = "*****";
+			// 
+			// frmAnnotationResults
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.ClientSize = new System.Drawing.Size(253, 157);
+			this.Controls.Add(this.lblPlace2Txt);
+			this.Controls.Add(this.lblPlace2);
+			this.Controls.Add(this.lblPlace1Txt);
+			this.Controls.Add(this.lblPlace1);
+			this.Controls.Add(this.lblTypeTxt);
+			this.Controls.Add(this.lblType);
+			this.Controls.Add(this.lblTotal);
+			this.Controls.Add(this.lblResultTotal);
+			this.Controls.Add(this.lblAnnotationResults);
+			this.Name = "frmAnnotationResults";
+			this.Text = "frmAnnotationResults";
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Label lblAnnotationResults;
+		private System.Windows.Forms.Label lblResultTotal;
+		private System.Windows.Forms.Label lblTotal;
+		private System.Windows.Forms.Label lblType;
+		private System.Windows.Forms.Label lblTypeTxt;
+		private System.Windows.Forms.Label lblPlace1;
+		private System.Windows.Forms.Label lblPlace1Txt;
+		private System.Windows.Forms.Label lblPlace2;
+		private System.Windows.Forms.Label lblPlace2Txt;
+	}
+}

PROMS/VEPROMS User Interface/frmAnnotationResults.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace VEPROMS
+{
+	public partial class frmAnnotationResults : Form
+	{
+		public frmAnnotationResults()
+		{
+			InitializeComponent();
+		}
+
+		private void label1_Click(object sender, EventArgs e)
+		{
+
+		}
+	}
+}

PROMS/VEPROMS User Interface/frmAnnotationResults.resx

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

PROMS/VEPROMS User Interface/frmAnnotationsCleanup.Designer.cs

@@ -0,0 +1,132 @@
+
+using VEPROMS.CSLA.Library;
+using Volian.Base.Library;
+namespace VEPROMS
+{
+	partial class frmAnnotationsCleanup
+	{
+		/// <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.components = new System.ComponentModel.Container();
+			this.lbAnnotationTypes = new System.Windows.Forms.ListBox();
+			this.itemAnnotationsBindingSource = new System.Windows.Forms.BindingSource(this.components);
+			this.lblAnnotationsList = new System.Windows.Forms.Label();
+			this.btnClean = new System.Windows.Forms.Button();
+			this.lblCountNumber = new System.Windows.Forms.Label();
+			this.lblCount = new System.Windows.Forms.Label();
+			this.btnClose = new System.Windows.Forms.Button();
+			((System.ComponentModel.ISupportInitialize)(this.itemAnnotationsBindingSource)).BeginInit();
+			this.SuspendLayout();
+			// 
+			// lbAnnotationTypes
+			// 
+			this.lbAnnotationTypes.DataSource = this.itemAnnotationsBindingSource;
+			this.lbAnnotationTypes.FormattingEnabled = true;
+			this.lbAnnotationTypes.Location = new System.Drawing.Point(25, 48);
+			this.lbAnnotationTypes.Name = "lbAnnotationTypes";
+			this.lbAnnotationTypes.Size = new System.Drawing.Size(295, 433);
+			this.lbAnnotationTypes.TabIndex = 0;
+			// 
+			// lblAnnotationsList
+			// 
+			this.lblAnnotationsList.AutoSize = true;
+			this.lblAnnotationsList.Location = new System.Drawing.Point(26, 21);
+			this.lblAnnotationsList.Name = "lblAnnotationsList";
+			this.lblAnnotationsList.Size = new System.Drawing.Size(175, 13);
+			this.lblAnnotationsList.TabIndex = 1;
+			this.lblAnnotationsList.Text = "Select an Annotation Type to Clean";
+			// 
+			// btnClean
+			// 
+			this.btnClean.Location = new System.Drawing.Point(365, 164);
+			this.btnClean.Name = "btnClean";
+			this.btnClean.Size = new System.Drawing.Size(131, 36);
+			this.btnClean.TabIndex = 2;
+			this.btnClean.Text = "Proceed?";
+			this.btnClean.UseVisualStyleBackColor = true;
+			this.btnClean.Click += new System.EventHandler(this.button1_Click);
+			// 
+			// lblCountNumber
+			// 
+			this.lblCountNumber.AutoSize = true;
+			this.lblCountNumber.Location = new System.Drawing.Point(395, 100);
+			this.lblCountNumber.Name = "lblCountNumber";
+			this.lblCountNumber.Size = new System.Drawing.Size(69, 13);
+			this.lblCountNumber.TabIndex = 3;
+			this.lblCountNumber.Text = "Delete Count";
+			this.lblCountNumber.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			// 
+			// lblCount
+			// 
+			this.lblCount.AutoSize = true;
+			this.lblCount.Location = new System.Drawing.Point(331, 70);
+			this.lblCount.Name = "lblCount";
+			this.lblCount.Size = new System.Drawing.Size(206, 13);
+			this.lblCount.TabIndex = 4;
+			this.lblCount.Text = "Number of Annotations that will be deleted";
+			// 
+			// btnClose
+			// 
+			this.btnClose.Location = new System.Drawing.Point(397, 457);
+			this.btnClose.Name = "btnClose";
+			this.btnClose.Size = new System.Drawing.Size(75, 23);
+			this.btnClose.TabIndex = 5;
+			this.btnClose.Text = "Close";
+			this.btnClose.UseVisualStyleBackColor = true;
+			this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
+			// 
+			// frmAnnotationsCleanup
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.ClientSize = new System.Drawing.Size(549, 535);
+			this.Controls.Add(this.btnClose);
+			this.Controls.Add(this.lblCount);
+			this.Controls.Add(this.lblCountNumber);
+			this.Controls.Add(this.btnClean);
+			this.Controls.Add(this.lblAnnotationsList);
+			this.Controls.Add(this.lbAnnotationTypes);
+			this.Name = "frmAnnotationsCleanup";
+			this.Text = "Clean Annotations";
+			((System.ComponentModel.ISupportInitialize)(this.itemAnnotationsBindingSource)).EndInit();
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.ListBox lbAnnotationTypes;
+		private System.Windows.Forms.Label lblAnnotationsList;
+		private System.Windows.Forms.BindingSource itemAnnotationsBindingSource;
+		private System.Windows.Forms.Button btnClean;
+		private System.Windows.Forms.Label lblCountNumber;
+		private System.Windows.Forms.Label lblCount;
+		private System.Windows.Forms.Button btnClose;
+	}
+}
+

PROMS/VEPROMS User Interface/frmAnnotationsCleanup.cs

@@ -0,0 +1,183 @@
+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;
+using Volian.Base.Library;
+//using Volian.Pipe.Library;
+using System.Xml;
+using System.Diagnostics;
+using JR.Utils.GUI.Forms;
+
+namespace VEPROMS
+{
+	public partial class frmAnnotationsCleanup : Form
+	{
+		Label mylab = new Label();
+		string procList = "";
+		string docvList = "";
+		int AnnotationTyp;
+		string AnnotationName = "";
+		string totalDeleteCnt = "";
+		List<ProcedureInfo> pil2 = new List<ProcedureInfo>();
+		List<DocVersionInfo> dvil2 = new List<DocVersionInfo>();
+		private frmBatchRefresh mainForm = null;
+		// frmAnnotationsCleanup constructor passes users procedure and docversion selections from frmBatchRefresh
+		public frmAnnotationsCleanup(Form callingForm, List<ProcedureInfo> pil, List<DocVersionInfo> dvil)
+
+		{		// Set up link back to parent form.
+			mainForm = callingForm as frmBatchRefresh;
+			InitializeComponent();
+
+			pil2 = pil;
+			dvil2 = dvil;
+
+				// Get list of annotation types for plant.
+			myAnnotationTypeInfoList = AnnotationTypeInfoList.Get();
+			lbAnnotationTypes.DataSource = myLocalAnnotationTypeInfoList = new LocalAnnotationTypeInfoList(myAnnotationTypeInfoList);
+
+			Dictionary<string, string> AnnotationsList = new Dictionary<string, string>();
+
+				// Add name and type ID to form.
+			foreach (LocalAnnotationTypeInfo lati in myLocalAnnotationTypeInfoList)
+			{
+				AnnotationsList.Add(lati.TypeID.ToString(), lati.Name);
+				//cbAnnotationTypes.Items.Add(new { Name = lati.Name, Value = lati.TypeID });
+			}
+
+			lbAnnotationTypes.DataSource = new BindingSource(AnnotationsList, null);
+			lbAnnotationTypes.DisplayMember = "Value";
+			lbAnnotationTypes.ValueMember = "Key";
+			lbAnnotationTypes.SelectedIndexChanged += lbAnnotationTypes_SelectedIndexChanged;
+
+		}
+			// create comma delimited string of procedures selected by user.
+		private string getAnnotationProcItems(List<ProcedureInfo> pil2)
+		{
+			procList = "";
+			foreach (var p in pil2)
+			{
+				if (p.IsProcedure)
+				{
+					if (procList == "")
+					{
+						procList = procList + p.ItemID.ToString();
+					}
+					else
+					{
+						procList = procList + "," + p.ItemID.ToString();
+					}
+				}
+			}
+			return procList;
+		}
+
+			// create comma delimited string of doc versions selected by user.
+		private string getAnnotationDocvItems(List<DocVersionInfo> dvil2)
+		{
+			docvList = "";
+			foreach (var d in dvil2)
+			{
+				if (d.IsDocVersion)
+				{
+					if (docvList == "")
+					{
+						docvList = docvList + d.VersionID.ToString();
+					}
+					else
+					{
+						docvList = docvList + "," + d.VersionID.ToString();
+					}
+				}
+			}
+			return docvList;
+		}
+
+		private AnnotationTypeInfoList myAnnotationTypeInfoList = null;
+		private LocalAnnotationTypeInfoList myLocalAnnotationTypeInfoList = null;
+
+		// Process used to cleanup annotations "(Proceed?" button)
+		private void button1_Click(object sender, EventArgs e)
+		{
+
+			TextBox frm2 = mainForm.GettxtProcess();
+			TextBox frm3 = mainForm.GettxtResults();
+			AnnotationTyp = System.Convert.ToInt32(((KeyValuePair<string, string>)lbAnnotationTypes.SelectedItem).Key);
+			AnnotationName = System.Convert.ToString(((KeyValuePair<string, string>)lbAnnotationTypes.SelectedItem).Value);
+			frm3.AppendText("Deleting Annotations: Annotation Type: " + '"' + AnnotationName + '"');
+			frm3.AppendText(Environment.NewLine + "P = Procedure, F = Folder" + Environment.NewLine);
+			int deletecountProc = 0;
+			int deletecountDocv = 0;
+			foreach (var p in pil2)
+			{
+				if (p.IsProcedure)
+				{
+					//AnnotationTyp = System.Convert.ToInt32(((KeyValuePair<string, string>)lbAnnotationTypes.SelectedItem).Key);
+					//AnnotationName = System.Convert.ToString(((KeyValuePair<string, string>)lbAnnotationTypes.SelectedItem).Value);
+					//deletecountProc = Annotation.getAnnotationProcCnt(AnnotationTyp, getAnnotationProcItems(p));
+					deletecountProc = Annotation.getAnnotationProcCnt(AnnotationTyp, p.ItemID.ToString());
+					frm2.AppendText(Environment.NewLine + p.DisplayNumber + ' ' + p.DisplayText);
+					//frm3.AppendText(Environment.NewLine + "P: " + p.DisplayNumber + '"' + p.DisplayText + '"' + " Type: " + '"' + AnnotationName + '"' + " count: " + deletecountProc);
+					frm3.AppendText(Environment.NewLine + "P: " + p.DisplayNumber + '"' + p.DisplayText + '"' +  " Delete count: " + deletecountProc);
+					Annotation.DeleteAnnotationProcByType(AnnotationTyp, p.ItemID.ToString());
+					lblCountNumber.Text = "0";
+				}
+
+			}
+			foreach (var d in dvil2)
+			{
+				if (d.IsDocVersion)
+				{
+					//AnnotationTyp = System.Convert.ToInt32(((KeyValuePair<string, string>)lbAnnotationTypes.SelectedItem).Key);
+					//AnnotationName = System.Convert.ToString(((KeyValuePair<string, string>)lbAnnotationTypes.SelectedItem).Value);
+					deletecountDocv = Annotation.getAnnotationCountDocv(AnnotationTyp, d.VersionID.ToString());
+					frm2.AppendText(Environment.NewLine + d.ActiveParent.ToString());
+					frm3.AppendText(Environment.NewLine + "F: " + '"' + d.ActiveParent.ToString() + '"' + " Delete count: " + deletecountDocv);
+					AnnotationTyp = System.Convert.ToInt32(((KeyValuePair<string, string>)lbAnnotationTypes.SelectedItem).Key);
+					Annotation.DeleteAnnotationDocvByType(AnnotationTyp, d.VersionID.ToString());
+
+					lblCountNumber.Text = "0";
+				}
+			}
+			frm3.AppendText(Environment.NewLine + Environment.NewLine + "Total Annotations Deleted: " + totalDeleteCnt + Environment.NewLine + Environment.NewLine);
+
+		}
+
+		// Retrieve number of annotations that will be deleted.
+		private void lbAnnotationTypes_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			btnClean.Enabled = false;
+			lblCountNumber.Text = "";
+			int deletecountProc = 0;
+			int deletecountDocv = 0;
+			if (pil2.Count > 0)
+			{
+				AnnotationTyp = System.Convert.ToInt32(((KeyValuePair<string, string>)lbAnnotationTypes.SelectedItem).Key);
+				deletecountProc = Annotation.getAnnotationProcCnt(AnnotationTyp, getAnnotationProcItems(pil2));
+			}
+
+			if (dvil2.Count > 0)
+			{
+				AnnotationTyp = System.Convert.ToInt32(((KeyValuePair<string, string>)lbAnnotationTypes.SelectedItem).Key);
+				deletecountDocv = Annotation.getAnnotationCountDocv(AnnotationTyp, getAnnotationDocvItems(dvil2));
+			}
+			lblCountNumber.Text = (deletecountProc + deletecountDocv).ToString();
+			totalDeleteCnt = (deletecountProc + deletecountDocv).ToString();
+			btnClean.Enabled = true;
+
+		}
+			// Close form.
+		private void btnClose_Click(object sender, EventArgs e)
+		{
+			this.Close();
+		}
+
+	}
+}
+
+

PROMS/VEPROMS User Interface/frmAnnotationsCleanup.resx

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

PROMS/VEPROMS User Interface/frmBatchRefresh.cs

@@ -22,12 +22,25 @@ namespace VEPROMS
 			set { _MySessionInfo = value; }
 		}
 		private bool IsAdministratorUser = false; //C2020-035 used to control what Set Amins can do
-		// C2017-030 - new Admin Tools user interface
-		// pass in session info to constructor
+												  // C2017-030 - new Admin Tools user interface
+												  // pass in session info to constructor
 		public frmBatchRefresh(SessionInfo sessionInfo)
 		{
 			InitializeComponent();
 			_MySessionInfo = sessionInfo;
+
+			// When opening Admin tools Check tab will be default.
+			this.sideNavItmCheck.Checked = true;
+
+			if (sideNavItmDelete.Checked)
+			{
+				AdminToolType = (E_AdminToolType)4;
+				if (swDeleteFolder.Value)
+					ResetDelTV(true);
+				else
+					ResetDelTV(false);
+			}
+
 			setupProgessSteps1(); // C2017-030 - new Admin Tools user interface
 			UserInfo ui = UserInfo.GetByUserID(MySessionInfo.UserID);
 			IsAdministratorUser = ui.IsAdministrator();
@@ -43,18 +56,32 @@ namespace VEPROMS
 				swStandardHypenChars.Enabled = false;
 			}
 		}
+		// Make txtProcess text box available to frmAnnotationsClean form.
+		internal TextBox GettxtProcess()
+		{
+			return txtProcess;
+		}
+
+		// Make txtResults text box available to frmAnnotationsClean form.
+		internal TextBox GettxtResults()
+		{
+			return txtResults;
+		}
+
 		// NOTE:  removed the Refresh ROs and Refresh Transitions and ROs options (now only Transitions can be refreshed)
 		// the Update ROs and Refresh ROs logic was merged together.  The Update ROs will functionally do both
 		// also annotations will be placed on step elements that have RO changes
 
 		// make all of the hyphen character consistant so they can all be found with the Search function
+
+
 		private void FixHyphens()
 		{
 			this.Cursor = Cursors.WaitCursor;
 			DateTime pStart = DateTime.Now;
 			txtProcess.AppendText("Standardizing Hyphens");
 			txtProcess.AppendText(Environment.NewLine);
-			txtProcess.AppendText(string.Format("Started: {0}",pStart.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(string.Format("Started: {0}", pStart.ToString("MM/dd/yyyy @ HH:mm")));
 			txtProcess.AppendText(Environment.NewLine);
 			Application.DoEvents();
 			int affectedRows = ESP_FixHyphens.Execute("vesp_FixHyphens") / 2;// Two results for each change
@@ -65,7 +92,7 @@ namespace VEPROMS
 			txtResults.AppendText(Environment.NewLine);
 			txtResults.AppendText(Environment.NewLine);
 			DateTime pEnd = DateTime.Now;
-			txtProcess.AppendText(string.Format("Completed: {0}",pEnd.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(string.Format("Completed: {0}", pEnd.ToString("MM/dd/yyyy @ HH:mm")));
 			txtProcess.AppendText(Environment.NewLine);
 			txtProcess.AppendText(Environment.NewLine);
 			Application.DoEvents();
@@ -125,6 +152,60 @@ namespace VEPROMS
 				myTV.SelectedNode.Expand();
 			this.Cursor = Cursors.Default;
 		}
+		private void ResetDelTV()
+		{
+			ResetDelTV(false);
+		}
+		private void ResetDelTV(bool noProcs)
+		{
+			btnFixLinks.Enabled = false;
+			this.Cursor = Cursors.WaitCursor;
+			myTVdel.Nodes.Clear();
+			myDocVersions.Clear();
+			FolderInfo fi = FolderInfo.GetTop();
+
+			if (fi.ChildFolderCount > 0)
+			{
+				if (noProcs)
+				{
+					LoadBottomLevelFolders(fi, myTVdel);
+				}
+				else
+				{
+					TreeNode tn = new TreeNode(fi.Name);
+					tn.Tag = fi;
+					tn.StateImageIndex = -1; // Hide the checkbox for the root node
+					LoadChildFolders(fi, tn, noProcs);
+					myTVdel.Nodes.Add(tn);
+				}
+			}
+
+			if (myTVdel.SelectedNode != null)
+				myTVdel.SelectedNode.Expand();
+			this.Cursor = Cursors.Default;
+
+			//btnFixLinks.Enabled = false;
+			//this.Cursor = Cursors.WaitCursor;
+			////myTreeNodePath = new List<string>();
+			//myTVdel.Nodes.Clear();
+			//myDocVersions.Clear();
+			//FolderInfo fi = FolderInfo.GetTop();
+			//TreeNode tn = myTVdel.Nodes.Add(fi.Name );
+			//tn.Tag = fi;
+			//if (fi.ChildFolderCount > 0)
+			//{
+			//	if (noProcs)
+			//	{
+			//		LoadBottomLevelFolders(fi, myTVdel);
+			//	}
+			//	else
+			//		LoadChildFolders(fi, tn, noProcs);
+			//}
+			//if (myTVdel.SelectedNode != null)
+			//	myTVdel.SelectedNode.Expand();
+			//this.Cursor = Cursors.Default;
+		}
+
 		// B2021-060 Higher level folders where being removed from the tree even if there was a child folder that containe a working draft set
 		private bool LoadChildFolders(FolderInfo fi, TreeNode tn, bool noProcs)
 		{
@@ -135,8 +216,8 @@ namespace VEPROMS
 				TreeNode tnc = tn.Nodes.Add(fic.Name);
 				tnc.Tag = fic;
 				if (fic.ChildFolderCount > 0)
-					if(LoadChildFolders(fic, tnc, noProcs))
-						loadedChildWorkingDraft=true;
+					if (LoadChildFolders(fic, tnc, noProcs))
+						loadedChildWorkingDraft = true;
 				// B2020-114 and C2020-035 only show folders the Set Admin can access
 				if (fic.FolderDocVersionCount > 0)
 				{
@@ -151,6 +232,34 @@ namespace VEPROMS
 				tn.Remove();
 			return loadedWorkingDraft;
 		}
+		/// <summary>
+		/// Load only bottom layer of folders into treenode.
+		/// </summary>
+		/// <param name="fi"></param>
+		/// <param name="tn"></param>
+		private void LoadBottomLevelFolders(FolderInfo fi, TreeView treeView)
+		{
+			foreach (FolderInfo fic in fi.SortedChildFolders)
+			{
+				if (fic.ChildFolderCount > 0)
+				{
+					// Recursively call for child folders
+					LoadBottomLevelFolders(fic, treeView);
+				}
+				else
+				{
+					if (fic.Name != "PROMS")
+					{
+
+
+
+						// If the folder is a bottom-level folder (no child folders), add it directly to the TreeView
+						TreeNode tnc = treeView.Nodes.Add(fic.Name);
+						tnc.Tag = fic;
+					}
+				}
+			}
+		}
 		private bool LoadDocVersions(FolderInfo fic, TreeNode tnc, bool noProcs)
 		{
 			bool rtnval = false;
@@ -201,7 +310,7 @@ namespace VEPROMS
 		private void UpdateROValues()
 		{
 			this.Cursor = Cursors.WaitCursor;
-			List<ProcedureInfo> pil = new List<ProcedureInfo>();	// C2023-002: list of checked out procedures, used in frmBatchRefreshCheckedOut dialog
+			List<ProcedureInfo> pil = new List<ProcedureInfo>();    // C2023-002: list of checked out procedures, used in frmBatchRefreshCheckedOut dialog
 			List<DocVersionInfo> dvil = new List<DocVersionInfo>();
 			foreach (TreeNode tn in myDocVersions.Keys)
 				if (tn.Checked)
@@ -251,7 +360,7 @@ namespace VEPROMS
 						Application.DoEvents();
 					}
 				}
-				
+
 				Application.DoEvents();
 				// when processing more than one procedure set, display only one completed message after all are processed
 				if (ROFstInfo.MessageList != null)
@@ -273,7 +382,7 @@ namespace VEPROMS
 					sb.AppendLine("Have you requested the users to close the procedures and do you want to continue the process?");
 					frmBatchRefreshCheckedOut frmCO = new frmBatchRefreshCheckedOut(1);
 					frmCO.MySessionInfo = MySessionInfo;
-					frmCO.CheckedOutProcedures = pil;	// C2023-002: set list of checked out procedures
+					frmCO.CheckedOutProcedures = pil;   // C2023-002: set list of checked out procedures
 					frmCO.Location = new Point(Screen.PrimaryScreen.WorkingArea.Width - frmCO.Width, Screen.PrimaryScreen.WorkingArea.Height - frmCO.Height);
 					// C2023-002:  Allow close of dialog that has list of procedures that are checked out
 					if (frmCO.ShowDialog(this) != DialogResult.Cancel)
@@ -412,7 +521,7 @@ namespace VEPROMS
 			DateTime pStart = DateTime.Now;
 			txtProcess.AppendText("Refresh Transitions");
 			txtProcess.AppendText(Environment.NewLine);
-			txtProcess.AppendText(string.Format("Started: {0}",pStart.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(string.Format("Started: {0}", pStart.ToString("MM/dd/yyyy @ HH:mm")));
 			txtProcess.AppendText(Environment.NewLine);
 			txtResults.AppendText("Refresh Transitions");
 			txtResults.AppendText(Environment.NewLine);
@@ -449,19 +558,19 @@ namespace VEPROMS
 						Application.DoEvents();
 					}
 				}
-				if (numTransFixed == 0 && numTransConverted ==0)
+				if (numTransFixed == 0 && numTransConverted == 0)
 				{
 					txtResults.AppendText("No Transitions Needed Updated.");
 					txtResults.AppendText(Environment.NewLine);
 				}
 				ContentInfo.StaticContentInfoChange -= new StaticContentInfoEvent(ContentInfo_StaticContentInfoChange);
 				DateTime pEnd = DateTime.Now;
-				txtProcess.AppendText(string.Format("Completed: {0}",pEnd.ToString("MM/dd/yyyy @ HH:mm")));
+				txtProcess.AppendText(string.Format("Completed: {0}", pEnd.ToString("MM/dd/yyyy @ HH:mm")));
 				txtProcess.AppendText(Environment.NewLine);
-				txtProcess.AppendText(string.Format("Transitions Checked: {0}",numTransProcessed));
+				txtProcess.AppendText(string.Format("Transitions Checked: {0}", numTransProcessed));
 				txtProcess.AppendText(Environment.NewLine);
 				// B2018-002 - Invalid Transitions - Display Transition Refresh Statistics
-				txtProcess.AppendText(string.Format("Transitions Correct As Is: {0}",numTransProcessed - (numTransConverted + numTransFixed)));
+				txtProcess.AppendText(string.Format("Transitions Correct As Is: {0}", numTransProcessed - (numTransConverted + numTransFixed)));
 				txtProcess.AppendText(Environment.NewLine);
 				txtProcess.AppendText(string.Format("Transitions Modified: {0}", numTransFixed));
 				txtProcess.AppendText(Environment.NewLine);
@@ -490,10 +599,10 @@ namespace VEPROMS
 			}
 			this.Cursor = Cursors.Default;
 			// B2018-002 - Invalid Transitions - Display Transition Refresh Statisitic
-			if (numTransFixed == 0 && numTransConverted ==0)
-				MessageBox.Show(string.Format("{0} Transitions Checked.\n\nNo Transitions Modified.",numTransProcessed), "Refresh Transitions Completed");
+			if (numTransFixed == 0 && numTransConverted == 0)
+				MessageBox.Show(string.Format("{0} Transitions Checked.\n\nNo Transitions Modified.", numTransProcessed), "Refresh Transitions Completed");
 			else
-				MessageBox.Show(string.Format("{0} Transitions Checked.\n\n {1} Correct as is.\n\n {2} Transitions modified.\n\n {3} Transitions converted to text.", numTransProcessed, numTransProcessed - (numTransFixed + numTransConverted),numTransFixed, numTransConverted), "Refresh Transitions Completed");
+				MessageBox.Show(string.Format("{0} Transitions Checked.\n\n {1} Correct as is.\n\n {2} Transitions modified.\n\n {3} Transitions converted to text.", numTransProcessed, numTransProcessed - (numTransFixed + numTransConverted), numTransFixed, numTransConverted), "Refresh Transitions Completed");
 		}
 
 		// C2017-030 - new Admin Tools user interface
@@ -506,7 +615,7 @@ namespace VEPROMS
 			DateTime pStart = DateTime.Now;
 			txtProcess.AppendText("Refreshing Word Attachments");
 			txtProcess.AppendText(Environment.NewLine);
-			txtProcess.AppendText(string.Format("Started: {0}",pStart.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(string.Format("Started: {0}", pStart.ToString("MM/dd/yyyy @ HH:mm")));
 			txtProcess.AppendText(Environment.NewLine);
 			Application.DoEvents();
 			int affectedRows = ESP_DeletePDFs.Execute("vesp_DeletePDFs");
@@ -516,7 +625,7 @@ namespace VEPROMS
 			txtResults.AppendText(Environment.NewLine);
 			txtResults.AppendText(Environment.NewLine);
 			DateTime pEnd = DateTime.Now;
-			txtProcess.AppendText(string.Format("Completed: {0}",pEnd.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(string.Format("Completed: {0}", pEnd.ToString("MM/dd/yyyy @ HH:mm")));
 			txtProcess.AppendText(Environment.NewLine);
 			txtProcess.AppendText(Environment.NewLine);
 			Application.DoEvents();
@@ -561,7 +670,7 @@ namespace VEPROMS
 		private int RefreshForSearch()
 		{
 			int cntfix = 0;
-			List<int> gids = GridInfoList.GetIds();		// get all grids in database
+			List<int> gids = GridInfoList.GetIds();     // get all grids in database
 			pbProcess.Minimum = 0;
 			pbProcess.Maximum = gids.Count;
 			pbProcess.Step = 1;
@@ -570,7 +679,7 @@ namespace VEPROMS
 				using (Content cc = Content.Get(cid))
 				{
 					StepConfig sc = new StepConfig(cc.Config);
-					if (!sc.Step_FixedTblForSrch)		// if not processed through this code already, get searchable text & save
+					if (!sc.Step_FixedTblForSrch)       // if not processed through this code already, get searchable text & save
 					{
 						try
 						{
@@ -588,7 +697,7 @@ namespace VEPROMS
 									cc.UserID = Volian.Base.Library.VlnSettings.UserID;
 									cc.DTS = DateTime.Now;
 									cc.Text = srchtxt;
-									
+
 								}
 								sc.Step_FixedTblForSrch = true;
 								cc.Config = sc.ToString();
@@ -615,7 +724,7 @@ namespace VEPROMS
 			DateTime pStart = DateTime.Now;
 			txtProcess.AppendText("Identifing Orphan Items");
 			txtProcess.AppendText(Environment.NewLine);
-			txtProcess.AppendText(string.Format("Started: {0}",pStart.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(string.Format("Started: {0}", pStart.ToString("MM/dd/yyyy @ HH:mm")));
 			txtProcess.AppendText(Environment.NewLine);
 			Application.DoEvents();
 			int rowCount = ESP_IdentifyDisconnectedItems.Execute("vesp_GetDisconnectedItemsCount");
@@ -636,7 +745,7 @@ namespace VEPROMS
 				txtResults.AppendText(Environment.NewLine);
 			}
 			DateTime pEnd = DateTime.Now;
-			txtProcess.AppendText(string.Format("Completed: {0}",pEnd.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(string.Format("Completed: {0}", pEnd.ToString("MM/dd/yyyy @ HH:mm")));
 			txtProcess.AppendText(Environment.NewLine);
 			txtProcess.AppendText(Environment.NewLine);
 			Application.DoEvents();
@@ -652,7 +761,7 @@ namespace VEPROMS
 			DateTime pStart = DateTime.Now;
 			txtProcess.AppendText("Purging Orphan Items");
 			txtProcess.AppendText(Environment.NewLine);
-			txtProcess.AppendText(string.Format("Started: {0}",pStart.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(string.Format("Started: {0}", pStart.ToString("MM/dd/yyyy @ HH:mm")));
 			txtProcess.AppendText(Environment.NewLine);
 			Application.DoEvents();
 			int rowCount = ESP_IdentifyDisconnectedItems.Execute("vesp_GetDisconnectedItemsCount");
@@ -689,7 +798,7 @@ namespace VEPROMS
 				txtResults.AppendText(Environment.NewLine);
 			}
 			DateTime pEnd = DateTime.Now;
-			txtProcess.AppendText(string.Format("Completed: {0}",pEnd.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(string.Format("Completed: {0}", pEnd.ToString("MM/dd/yyyy @ HH:mm")));
 			txtProcess.AppendText(Environment.NewLine);
 			txtProcess.AppendText(Environment.NewLine);
 			Application.DoEvents();
@@ -704,7 +813,7 @@ namespace VEPROMS
 			DateTime pStart = DateTime.Now;
 			txtProcess.AppendText("Identifing Unused RoFsts and Figures");
 			txtProcess.AppendText(Environment.NewLine);
-			txtProcess.AppendText(string.Format("Started: {0}",pStart.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(string.Format("Started: {0}", pStart.ToString("MM/dd/yyyy @ HH:mm")));
 			txtProcess.AppendText(Environment.NewLine);
 			Application.DoEvents();
 			int rowCountRoFst = ESP_GetUnusedRoFsts.Execute("vesp_GetUnusedRoFstsCount");
@@ -727,9 +836,9 @@ namespace VEPROMS
 			}
 
 			DateTime pEnd = DateTime.Now;
-			txtProcess.AppendText(string.Format("Completed: {0}",pEnd.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(string.Format("Completed: {0}", pEnd.ToString("MM/dd/yyyy @ HH:mm")));
 			txtProcess.AppendText(Environment.NewLine);
-			txtProcess.AppendText(string.Format("Started: {0}",pStart.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(string.Format("Started: {0}", pStart.ToString("MM/dd/yyyy @ HH:mm")));
 			txtProcess.AppendText(Environment.NewLine);
 			Application.DoEvents();
 			this.Cursor = Cursors.Default;
@@ -742,7 +851,7 @@ namespace VEPROMS
 			DateTime pStart = DateTime.Now;
 			txtProcess.AppendText("Purging Unused RoFSTs and Figures Items");
 			txtProcess.AppendText(Environment.NewLine);
-			txtProcess.AppendText(string.Format("Started: {0}",pStart.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(string.Format("Started: {0}", pStart.ToString("MM/dd/yyyy @ HH:mm")));
 			txtProcess.AppendText(Environment.NewLine);
 			Application.DoEvents();
 			int rowCountRoFst = ESP_GetUnusedRoFsts.Execute("vesp_GetUnusedRoFstsCount");
@@ -783,7 +892,7 @@ namespace VEPROMS
 				txtResults.AppendText(Environment.NewLine);
 			}
 			DateTime pEnd = DateTime.Now;
-			txtProcess.AppendText(string.Format("Completed: {0}",pEnd.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(string.Format("Completed: {0}", pEnd.ToString("MM/dd/yyyy @ HH:mm")));
 			txtProcess.AppendText(Environment.NewLine);
 			txtProcess.AppendText(Environment.NewLine);
 			Application.DoEvents();
@@ -798,7 +907,7 @@ namespace VEPROMS
 			DateTime pStart = DateTime.Now;
 			txtProcess.AppendText("Identifing Unused RO Associations");
 			txtProcess.AppendText(Environment.NewLine);
-			txtProcess.AppendText(string.Format("Started: {0}",pStart.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(string.Format("Started: {0}", pStart.ToString("MM/dd/yyyy @ HH:mm")));
 			txtProcess.AppendText(Environment.NewLine);
 			Application.DoEvents();
 			int rowCount = ESP_GetROAssoc.Execute("vesp_GetUnusedROAssociationsCount");
@@ -817,7 +926,7 @@ namespace VEPROMS
 				txtResults.AppendText(Environment.NewLine);
 			}
 			DateTime pEnd = DateTime.Now;
-			txtProcess.AppendText(string.Format("Completed: {0}",pEnd.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(string.Format("Completed: {0}", pEnd.ToString("MM/dd/yyyy @ HH:mm")));
 			txtProcess.AppendText(Environment.NewLine);
 			txtProcess.AppendText(Environment.NewLine);
 			Application.DoEvents();
@@ -832,7 +941,7 @@ namespace VEPROMS
 			DateTime pStart = DateTime.Now;
 			txtProcess.AppendText("Purging Unused Referenced Object Associations");
 			txtProcess.AppendText(Environment.NewLine);
-			txtProcess.AppendText(string.Format("Started: {0}",pStart.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(string.Format("Started: {0}", pStart.ToString("MM/dd/yyyy @ HH:mm")));
 			txtProcess.AppendText(Environment.NewLine);
 			Application.DoEvents();
 			int rowCount = ESP_GetROAssoc.Execute("vesp_GetUnusedROAssociationsCount");
@@ -866,7 +975,7 @@ namespace VEPROMS
 				txtResults.AppendText(Environment.NewLine);
 			}
 			DateTime pEnd = DateTime.Now;
-			txtProcess.AppendText(string.Format("Completed: {0}",pEnd.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(string.Format("Completed: {0}", pEnd.ToString("MM/dd/yyyy @ HH:mm")));
 			txtProcess.AppendText(Environment.NewLine);
 			txtProcess.AppendText(Environment.NewLine);
 			Application.DoEvents();
@@ -881,11 +990,11 @@ namespace VEPROMS
 			DateTime pStart = DateTime.Now;
 			txtProcess.AppendText("Identifing Hidden Item Locations");
 			txtProcess.AppendText(Environment.NewLine);
-			txtProcess.AppendText(string.Format("Started: {0}",pStart.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(string.Format("Started: {0}", pStart.ToString("MM/dd/yyyy @ HH:mm")));
 			txtProcess.AppendText(Environment.NewLine);
 			Application.DoEvents();
 			List<ItemInfo> myItems = ESP_IdentifyNonEditableItems.Execute("vesp_GetNonEditableItems");
-			txtProcess.AppendText(string.Format("Hidden Items Count:  {0}",myItems.Count));
+			txtProcess.AppendText(string.Format("Hidden Items Count:  {0}", myItems.Count));
 			txtProcess.AppendText(Environment.NewLine);
 			if (myItems.Count > 0)
 			{
@@ -906,7 +1015,7 @@ namespace VEPROMS
 				txtResults.AppendText(Environment.NewLine);
 			}
 			DateTime pEnd = DateTime.Now;
-			txtProcess.AppendText(string.Format("Completed: {0}",pEnd.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(string.Format("Completed: {0}", pEnd.ToString("MM/dd/yyyy @ HH:mm")));
 			txtProcess.AppendText(Environment.NewLine);
 			txtProcess.AppendText(Environment.NewLine);
 			Application.DoEvents();
@@ -921,16 +1030,16 @@ namespace VEPROMS
 			DateTime pStart = DateTime.Now;
 			txtProcess.AppendText("Show Users in PROMS");
 			txtProcess.AppendText(Environment.NewLine);
-			txtProcess.AppendText(string.Format("Started: {0}",pStart.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(string.Format("Started: {0}", pStart.ToString("MM/dd/yyyy @ HH:mm")));
 			txtProcess.AppendText(Environment.NewLine);
 			Application.DoEvents();
 			txtResults.Clear();
 			txtResults.AppendText(ESP_GetDatabaseSessions.Execute("vesp_GetDatabaseSessions"));
 			DateTime pEnd = DateTime.Now;
-			txtProcess.AppendText(string.Format("Completed: {0}",pEnd.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(string.Format("Completed: {0}", pEnd.ToString("MM/dd/yyyy @ HH:mm")));
 			Application.DoEvents();
 			this.Cursor = Cursors.Default;
-			MessageBox.Show( "Show Users Completed", "Show Users");
+			MessageBox.Show("Show Users Completed", "Show Users");
 		}
 
 		private void ProcessUpdateROValues(DocVersionInfo dq)
@@ -1068,7 +1177,7 @@ namespace VEPROMS
 		// show the changes made in the Results pannel, include the ItemId of the step element
 		void ContentInfo_StaticContentInfoChange(object sender, StaticContentInfoEventArgs args)
 		{
-			
+
 			if (args.Type == "TX")
 			{
 				myFixesCount++;
@@ -1085,7 +1194,7 @@ namespace VEPROMS
 			}
 			else // B2018-002 - Invalid Transitions - Display Transition Cconversion Statistics
 			{
-					myFixes.AppendLine(string.Format("Converted Transition to text for {0}({1})", (sender as ItemInfo).ShortPath, (sender as ItemInfo).ItemID));
+				myFixes.AppendLine(string.Format("Converted Transition to text for {0}({1})", (sender as ItemInfo).ShortPath, (sender as ItemInfo).ItemID));
 			}
 		}
 
@@ -1121,10 +1230,40 @@ namespace VEPROMS
 					CheckChildNodes(e.Node, e.Node.Checked);
 				}
 			}
+			if (swDeleteAnnotations.Value)
+			{
+				if (e.Node.Checked)
+				{
+					DiselectParentNodes(e.Node.Parent);
+					DiselectChildNodes(e.Node.Nodes);
+				}
+
+			}
 
 			btnFixLinks.Enabled = AtLeastOneNodeChecked(); // C2017-030 support for Refresh Transitions/Update RO Values
 		}
 
+		private void DiselectParentNodes(TreeNode parent)
+		{
+			while (parent != null)
+			{
+				if (parent.Checked)
+					parent.Checked = false;
+				parent = parent.Parent;
+			}
+		}
+
+		private void DiselectChildNodes(TreeNodeCollection childes)
+		{
+			foreach (TreeNode oneChild in childes)
+			{
+				if (oneChild.Checked)
+					oneChild.Checked = false;
+				DiselectChildNodes(oneChild.Nodes);
+			}
+		}
+
+
 		private void CheckChildNodes(TreeNode treeNode, bool ischecked)
 		{
 			foreach (TreeNode tn in treeNode.Nodes)
@@ -1143,9 +1282,9 @@ namespace VEPROMS
 		public ProgressBarItem ProgressBar
 		{
 			get { return _ProgressBar; }
-			set 
-			{ 
-				_ProgressBar = value; 
+			set
+			{
+				_ProgressBar = value;
 				_ProgressBar.TextVisible = true;
 			}
 		}
@@ -1246,6 +1385,25 @@ namespace VEPROMS
 			this.Close();
 		}
 
+		// new Admin Tools user interface for deletes
+		private void sideNavItmDelete_Click(object sender, EventArgs e)
+		{
+			AdminToolType = E_AdminToolType.Delete;
+			lblAdmToolProgressType.Text = "";
+			setupProgessSteps1();
+
+			if (swDeleteFolder.Value)
+				ResetDelTV(true);
+			else
+				ResetDelTV(false);
+		}
+
+		// new Admin Tools user interface for deletes
+		//private void sideNavItmDelete_Click_1(object sender, EventArgs e)
+		//{
+
+		//}
+
 		#region On/Off Swiches
 
 		// C2017-030 new Admin Tools user interface
@@ -1254,7 +1412,8 @@ namespace VEPROMS
 			Check = 0,
 			Repair = 1,
 			Links = 2,
-			Users = 3
+			Users = 3,
+			Delete = 4
 		};
 		private E_AdminToolType AdminToolType = 0;
 
@@ -1305,6 +1464,11 @@ namespace VEPROMS
 					splitContainer3.Panel2Collapsed = true;
 					progressSteps1.Visible = false;
 					break;
+
+				case E_AdminToolType.Delete:
+					splitContainer3.Panel2Collapsed = true;
+					progressSteps1.Visible = false;
+					break;
 			}
 		}
 
@@ -1500,5 +1664,140 @@ namespace VEPROMS
 			}
 
 		}
+
+
+		//C2024-005 Delete Annotations, Delete Folders
+		private void swDeleteAnnotations_ValueChanged(object sender, EventArgs e)
+		{
+			swDeleteFolder.Value = !swDeleteAnnotations.Value;
+			if (swDeleteFolder.Value)
+				ResetDelTV(true);
+			else
+				ResetDelTV(false);
+		}
+
+		private void swDeleteFolder_ValueChanged(object sender, EventArgs e)
+		{
+			swDeleteAnnotations.Value = !swDeleteFolder.Value;
+			if (swDeleteFolder.Value)
+				ResetDelTV(true);
+			else
+				ResetDelTV(false);
+		}
+
+		private void btnDeleteItems_Click(object sender, EventArgs e)
+		{
+			//clear
+			txtResults.Clear();
+			txtProcess.Clear();
+
+
+			if (swDeleteFolder.Value)
+			{
+				//TODO process deletions of folders
+				txtProcess.AppendText("Deleting Folders...");
+
+				//List<ProcedureInfo> pil = new List<ProcedureInfo>();
+				//foreach (TreeNode tn in myProcedures.Keys)
+				//	if (tn.Checked)
+				//		pil.Add(myProcedures[tn]);
+
+				////Load Selected Folders
+				Dictionary<int, string> folderData = new Dictionary<int, string>();
+
+				//List<FolderInfo> Flist = new List<FolderInfo>();
+				//foreach (TreeNode tn in myDocVersions.Keys)
+				//	if (tn.Checked)
+				//		Flist.Add();
+
+				//List<DocVersionInfo> dvil = new List<DocVersionInfo>();
+				//foreach (TreeNode tn in myDocVersions.Keys)
+				//	if (tn.Checked)
+				//		dvil.Add(myDocVersions[tn]);
+
+				//foreach (TreeNode tn in myTVdel.Nodes)
+				//{
+				//	if (tn.Checked)
+				//	{
+				//		var itemInfo = myProcedures[tn];
+				//		folderData.Add(itemInfo.ItemID, itemInfo.DisplayText);
+				//	}
+				//}
+
+				//ProcessDelete(dvil);
+			}
+			else
+			{
+					// Write progress status
+				txtProcess.AppendText("Deleting Annotations..." + Environment.NewLine);
+
+					// Create a list of procedures the user selected
+				List<ProcedureInfo> pil = new List<ProcedureInfo>();
+				foreach (TreeNode tn in myProcedures.Keys)
+					if (tn.Checked)
+						pil.Add(myProcedures[tn]);
+
+					// Create a list of doc versions the user selected
+				List<DocVersionInfo> dvil = new List<DocVersionInfo>();
+				foreach (TreeNode tn in myDocVersions.Keys)
+					if (tn.Checked)
+						dvil.Add(myDocVersions[tn]);
+
+				frmAnnotationsCleanup frmAnnoDel = new frmAnnotationsCleanup(this, pil, dvil);
+				
+				frmAnnoDel.ShowDialog();
+
+
+			}
+		}
+
+		private void ProcessDelete(List<DocVersionInfo> foldersToDelete)
+		{
+			DateTime pStart = DateTime.Now;
+			txtProcess.AppendText(Environment.NewLine);
+			txtProcess.AppendText(pStart.ToString("MM/dd/yyyy @ HH:mm"));
+			txtProcess.AppendText(Environment.NewLine);
+
+			foreach (var kvp in foldersToDelete)
+			{
+				int itemID = (int)kvp.ItemID;
+				string folderName = kvp.Name;
+
+				// Perform the deletion operation
+				// Assume DeleteFolderByID is a method that deletes the folder by its ItemID
+				bool deletionSuccessful = DeleteFolderByID(itemID);
+
+				// Update txtProcess with the progress
+				if (deletionSuccessful)
+				{
+					txtProcess.AppendText($"Successfully deleted folder: {folderName} (ID: {itemID})");
+				}
+				else
+				{
+					txtProcess.AppendText($"Failed to delete folder: {folderName} (ID: {itemID})");
+				}
+				txtProcess.AppendText(Environment.NewLine);
+			}
+		}
+		// Example deletion method
+		private bool DeleteFolderByID(int itemID)
+		{
+			// Implement your folder deletion logic here
+			// Return true if deletion was successful, false otherwise
+			return true; // Placeholder
+		}
+
+		public List<ProcedureInfo> RetrieveChkAnnotations()
+		{
+			List<ProcedureInfo> pil = new List<ProcedureInfo>();
+			foreach (TreeNode tn in myProcedures.Keys)
+				if (tn.Checked)
+					pil.Add(myProcedures[tn]);
+			return pil;
+		}
 	}
 }
+
+
+
+

PROMS/VEPROMS User Interface/frmBatchRefresh.resx

@@ -117,74 +117,43 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="warningBox3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAplJREFUOE+N
-        k11IU2Ecxv9zouK8CULrzo8SU3QKaSYmOJ2uFL8SK4igEIok6qKUwggySTShC41CRiiGdWNfYBcVWiGl
-        FqN0lh+UTaekzuWcuu2c9316nSdKLPEHz817/s/zPv9zOPQ/nlVQEGulF3ILPe+8SIHK8eYR5lusLwHy
-        Oy08RqpXjjfHVCMlsydbGbekg4/r4HmwRbLWUZzyeGNqD5NK1O5lw8L8NQHckgh5SAdXA3UqIxuzZKSj
-        8ssI8Il9wMQeYDoVfD4HrsdhsNdRgTL2b4yl5Ce1qL+xcQOWxpKxMzwAMVEayIv7IU8XwVnv8+XuEfJV
-        xtfjMlKZ/CYG3JYJ96wOPj6EoCBfMCkfnJdguSMG89eoVBlfS+tJCpCafa1stgBYzAZbzoFGo0ZIiD84
-        KwJ350P+UQxHtfr7vUPkp9j+4GqiM1K3FtyVB8h5wlSI4GB/RIQHgjtzwWaywMb1WHwYg7lKOq3YVrlz
-        jPw8RrWFOUoAJhpwcaNciNDQQMRGB4FNpIMNp4B93A2pXw/7ZbWlufCvFguNdNzzOta7J5S6fP4AdkVq
-        kKQVAQNJYO8TwHq0kD8kwdkWhZkLdMJrrsonlfu2yszmSsA9Bat1p0XdsTTcvxmJtpowyL1ar/m3PKYM
-        2MpVgzcySUWTdWRwd+wAXzoo3r5B7CnqDqVg+lW89yuoVARrR/SaANm0F46mUFjOUjYtN9BTaVQYJzPA
-        RlPB+hNF3XjvP3C9bDuqTm2D9DZuTcCKXN1psJ2ndhGgnpJGciENGyB9zoJk1kMezFonySw0oIf0KVOs
-        oIO7L3MlYITstVTsrKNHCzXU5aimnvmrZPp5hfrtlWS2X6LBuQoatJWTWQz3C5mEeoS6hNqt5yj7FysJ
-        zJwL4b/EAAAAAElFTkSuQmCC
-</value>
-  </data>
   <metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <data name="swCkObsoleteROData.SuperTooltip" xml:space="preserve">
-    <value>Referenced Objects databases are associated with a procedure set (such as Working Draft). 
+  <data name="swDeleteFolder.SuperTooltip" xml:space="preserve">
+    <value>This allows the user to check referenced objects links in procedure step data for multiple working drafts in a batch mode.
+
+Bad referenced bject links will be identified with an Bad RO Link annotation. Use the PROMS Search tool to list all of the steps that have this annotation.
+
+Be sure a current backup of the database exists prior performing this function.
+
+It is recommended that this be done during off hours.
 
-RO paths, ROFST versions, and the contents of RO figures are stored in the database when referenced. This tool will identify stored RO Paths, ROFST versions, and Figures that are no longer used.
 </value>
   </data>
-  <data name="swHiddenDataLocs.SuperTooltip" xml:space="preserve">
-    <value>Typically, a section in PROMS only has sub-sections or steps.  When and existing section is divided into sub-sections, the resulting main section might have both.
+  <data name="labelX13.SuperTooltip" xml:space="preserve">
+    <value>This allows the user to check referenced objects links in procedure step data for multiple working drafts in a batch mode.
 
-When this occurs, the step data in the main section can be marked as non-editable.  The user can no longer get to these steps and they can become forgotten as PROMS will ignore these non-editable steps when the procedure is printed.
+Bad referenced bject links will be identified with an Bad RO Link annotation. Use the PROMS Search tool to list all of the steps that have this annotation.
 
-This tool will identify if the database has non-editable steps and provide a listing of these steps. The use can then go to these main sections, make them editable via the property page, and delete or move these steps.
+Be sure a current backup of the database exists prior performing this function.
 
-This tool may take an extended period of time to execute.
+It is recommended that this be done during off hours.
 </value>
   </data>
-  <data name="labelX3.SuperTooltip" xml:space="preserve">
-    <value>Referenced Objects databases are associated with a procedure set (such as Working Draft). 
+  <data name="swDeleteAnnotations.SuperTooltip" xml:space="preserve">
+    <value>This function will refresh transitions in all procedures selected below, whether they were selected individually or as a group via a procedure set.
 
-RO paths, ROFST versions, and the contents of RO figures are stored in the database when referenced. This tool will identify stored RO Paths, ROFST versions, and Figures that are no longer used.
-</value>
+Be sure a current backup of the database exists prior to running this function.
+
+If more than one procedure is selected, it is recommended that this be performed during off hours.</value>
   </data>
-  <data name="labelX2.SuperTooltip" xml:space="preserve">
-    <value>Typically, a section in PROMS only has sub-sections or steps.  When and existing section is divided into sub-sections, the resulting main section might have both.
+  <data name="labelX14.SuperTooltip" xml:space="preserve">
+    <value>This function will refresh transitions in all procedures selected below, whether they were selected individually or as a group via a procedure set.
 
-When this occurs, the step data in the main section can be marked as non-editable.  The user can no longer get to these steps and they can become forgotten as PROMS will ignore these non-editable steps when the procedure is printed.
+Be sure a current backup of the database exists prior to running this function.
 
-This tool will identify if the database has non-editable steps and provide a listing of these steps. The use can then go to these main sections, make them editable via the property page, and delete or move these steps.
-
-This tool may take an extended period of time to execute.
-</value>
-  </data>
-  <data name="swCkOrphanDataRecs.SuperTooltip" xml:space="preserve">
-    <value>Everything in PROMS is inter-related.  A working draft knows what is its first procedure and a procedure knows what is its first step.  Likewise, a procedure knows what procedure is before it and after it.
-
-Should an item become orphaned (disconnected) from the rest of the data, it will no longer be accessible.  This tool detects any orphaned items in the database.
-
-This tool may take an extended period of time to execute.
-</value>
-  </data>
-  <data name="labelX1.SuperTooltip" xml:space="preserve">
-    <value>Everything in PROMS is inter-related.  A working draft knows what is its first procedure and a procedure knows what is its first step.  Likewise, a procedure knows what procedure is before it and after it.
-
-Should an item become orphaned (disconnected) from the rest of the data, it will no longer be accessible.  This tool detects any orphaned items in the database.
-
-This tool may take an extended period of time to execute.
-</value>
+If more than one procedure is selected, it is recommended that this be performed during off hours.</value>
   </data>
   <data name="swCheckROLinks.SuperTooltip" xml:space="preserve">
     <value>This allows the user to check referenced objects links in procedure step data for multiple working drafts in a batch mode.
@@ -207,6 +176,7 @@ Be sure a current backup of the database exists prior performing this function.
 It is recommended that this be done during off hours.
 </value>
   </data>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="warningBox5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAplJREFUOE+N
@@ -269,6 +239,71 @@ If more than one procedure is selected, it is recommended that this be performed
         RlPB+hNF3XjvP3C9bDuqTm2D9DZuTcCKXN1psJ2ndhGgnpJGciENGyB9zoJk1kMezFonySw0oIf0KVOs
         oIO7L3MlYITstVTsrKNHCzXU5aimnvmrZPp5hfrtlWS2X6LBuQoatJWTWQz3C5mEeoS6hNqt5yj7FysJ
         zJwL4b/EAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="warningBox3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAplJREFUOE+N
+        k11IU2Ecxv9zouK8CULrzo8SU3QKaSYmOJ2uFL8SK4igEIok6qKUwggySTShC41CRiiGdWNfYBcVWiGl
+        FqN0lh+UTaekzuWcuu2c9316nSdKLPEHz817/s/zPv9zOPQ/nlVQEGulF3ILPe+8SIHK8eYR5lusLwHy
+        Oy08RqpXjjfHVCMlsydbGbekg4/r4HmwRbLWUZzyeGNqD5NK1O5lw8L8NQHckgh5SAdXA3UqIxuzZKSj
+        8ssI8Il9wMQeYDoVfD4HrsdhsNdRgTL2b4yl5Ce1qL+xcQOWxpKxMzwAMVEayIv7IU8XwVnv8+XuEfJV
+        xtfjMlKZ/CYG3JYJ96wOPj6EoCBfMCkfnJdguSMG89eoVBlfS+tJCpCafa1stgBYzAZbzoFGo0ZIiD84
+        KwJ350P+UQxHtfr7vUPkp9j+4GqiM1K3FtyVB8h5wlSI4GB/RIQHgjtzwWaywMb1WHwYg7lKOq3YVrlz
+        jPw8RrWFOUoAJhpwcaNciNDQQMRGB4FNpIMNp4B93A2pXw/7ZbWlufCvFguNdNzzOta7J5S6fP4AdkVq
+        kKQVAQNJYO8TwHq0kD8kwdkWhZkLdMJrrsonlfu2yszmSsA9Bat1p0XdsTTcvxmJtpowyL1ar/m3PKYM
+        2MpVgzcySUWTdWRwd+wAXzoo3r5B7CnqDqVg+lW89yuoVARrR/SaANm0F46mUFjOUjYtN9BTaVQYJzPA
+        RlPB+hNF3XjvP3C9bDuqTm2D9DZuTcCKXN1psJ2ndhGgnpJGciENGyB9zoJk1kMezFonySw0oIf0KVOs
+        oIO7L3MlYITstVTsrKNHCzXU5aimnvmrZPp5hfrtlWS2X6LBuQoatJWTWQz3C5mEeoS6hNqt5yj7FysJ
+        zJwL4b/EAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="swCkObsoleteROData.SuperTooltip" xml:space="preserve">
+    <value>Referenced Objects databases are associated with a procedure set (such as Working Draft). 
+
+RO paths, ROFST versions, and the contents of RO figures are stored in the database when referenced. This tool will identify stored RO Paths, ROFST versions, and Figures that are no longer used.
+</value>
+  </data>
+  <data name="swHiddenDataLocs.SuperTooltip" xml:space="preserve">
+    <value>Typically, a section in PROMS only has sub-sections or steps.  When and existing section is divided into sub-sections, the resulting main section might have both.
+
+When this occurs, the step data in the main section can be marked as non-editable.  The user can no longer get to these steps and they can become forgotten as PROMS will ignore these non-editable steps when the procedure is printed.
+
+This tool will identify if the database has non-editable steps and provide a listing of these steps. The use can then go to these main sections, make them editable via the property page, and delete or move these steps.
+
+This tool may take an extended period of time to execute.
+</value>
+  </data>
+  <data name="labelX3.SuperTooltip" xml:space="preserve">
+    <value>Referenced Objects databases are associated with a procedure set (such as Working Draft). 
+
+RO paths, ROFST versions, and the contents of RO figures are stored in the database when referenced. This tool will identify stored RO Paths, ROFST versions, and Figures that are no longer used.
+</value>
+  </data>
+  <data name="labelX2.SuperTooltip" xml:space="preserve">
+    <value>Typically, a section in PROMS only has sub-sections or steps.  When and existing section is divided into sub-sections, the resulting main section might have both.
+
+When this occurs, the step data in the main section can be marked as non-editable.  The user can no longer get to these steps and they can become forgotten as PROMS will ignore these non-editable steps when the procedure is printed.
+
+This tool will identify if the database has non-editable steps and provide a listing of these steps. The use can then go to these main sections, make them editable via the property page, and delete or move these steps.
+
+This tool may take an extended period of time to execute.
+</value>
+  </data>
+  <data name="swCkOrphanDataRecs.SuperTooltip" xml:space="preserve">
+    <value>Everything in PROMS is inter-related.  A working draft knows what is its first procedure and a procedure knows what is its first step.  Likewise, a procedure knows what procedure is before it and after it.
+
+Should an item become orphaned (disconnected) from the rest of the data, it will no longer be accessible.  This tool detects any orphaned items in the database.
+
+This tool may take an extended period of time to execute.
+</value>
+  </data>
+  <data name="labelX1.SuperTooltip" xml:space="preserve">
+    <value>Everything in PROMS is inter-related.  A working draft knows what is its first procedure and a procedure knows what is its first step.  Likewise, a procedure knows what procedure is before it and after it.
+
+Should an item become orphaned (disconnected) from the rest of the data, it will no longer be accessible.  This tool detects any orphaned items in the database.
+
+This tool may take an extended period of time to execute.
 </value>
   </data>
   <data name="swRefreshTblsForSrch.SuperTooltip" xml:space="preserve">
@@ -368,6 +403,6 @@ Should an item become orphaned (disconnected) from the rest of the data, it will
 </value>
   </data>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>38</value>
+    <value>46</value>
   </metadata>
-</root>
+</root>

PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs

@@ -45,7 +45,6 @@ namespace VEPROMS
 			this.itemContainer3 = new DevComponents.DotNetBar.ItemContainer();
 			this.btnNew = new DevComponents.DotNetBar.ButtonItem();
 			this.btnOpen = new DevComponents.DotNetBar.ButtonItem();
-			this.btnPrint = new DevComponents.DotNetBar.ButtonItem();
 			this.btnPrepare = new DevComponents.DotNetBar.ButtonItem();
 			this.btnAdmin = new DevComponents.DotNetBar.ButtonItem();
 			this.btnUpdateFormats = new DevComponents.DotNetBar.ButtonItem();
@@ -68,6 +67,7 @@ namespace VEPROMS
 			this.cbScrunch = new System.Windows.Forms.CheckBox();
 			this.btnNext = new System.Windows.Forms.Button();
 			this.cmbFont = new System.Windows.Forms.ComboBox();
+			this.lblDummy = new System.Windows.Forms.Label();
 			this.labelItem10 = new DevComponents.DotNetBar.LabelItem();
 			this.bottomProgBar = new DevComponents.DotNetBar.ProgressBarItem();
 			this.labelItem9 = new DevComponents.DotNetBar.LabelItem();
@@ -214,7 +214,7 @@ namespace VEPROMS
 			this.btnSendErrorLog,
 			this.btnShowErrFld,
 			this.btnShowPrtFld,
-			this.btnHelpAbout}); ;
+			this.btnHelpAbout});
 			this.btnHelp.Text = "Help";
 			// 
 			// btnHelpManual
@@ -338,7 +338,6 @@ namespace VEPROMS
 			this.itemContainer3.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
             this.btnNew,
             this.btnOpen,
-            this.btnPrint,
             this.btnPrepare,
             this.btnAdmin});
 			// 
@@ -364,16 +363,7 @@ namespace VEPROMS
 			this.btnOpen.SubItemsExpandWidth = 24;
 			this.btnOpen.Text = "&Open...";
 			this.btnOpen.Click += new System.EventHandler(this.btnOpen_Click);
-			// 
-			// btnPrint
-			// 
-			this.btnPrint.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
-			this.btnPrint.Enabled = false;
-			this.btnPrint.Image = ((System.Drawing.Image)(resources.GetObject("btnPrint.Image")));
-			this.btnPrint.Name = "btnPrint";
-			this.btnPrint.SubItemsExpandWidth = 24;
-			this.btnPrint.Text = "Create &PDF";
-			this.btnPrint.Click += new System.EventHandler(this.btnPrint_Click);
+
 			// 
 			// btnPrepare
 			// 
@@ -514,6 +504,7 @@ namespace VEPROMS
 			this.bottomBar.Controls.Add(this.cbScrunch);
 			this.bottomBar.Controls.Add(this.btnNext);
 			this.bottomBar.Controls.Add(this.cmbFont);
+			this.bottomBar.Controls.Add(this.lblDummy);
 			this.bottomBar.Dock = System.Windows.Forms.DockStyle.Bottom;
 			this.bottomBar.Font = new System.Drawing.Font("Segoe UI", 9F);
 			this.bottomBar.IsMaximized = false;
@@ -601,6 +592,15 @@ namespace VEPROMS
 			this.cmbFont.TabIndex = 0;
 			this.cmbFont.SelectedIndexChanged += new System.EventHandler(this.cmbFont_SelectedIndexChanged);
 			// 
+			// lblDummy
+			// 
+			this.lblDummy.Dock = System.Windows.Forms.DockStyle.Right;
+			this.lblDummy.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
+			this.lblDummy.Location = new System.Drawing.Point(1013, 0);
+			this.lblDummy.Name = "lblDummy";
+			this.lblDummy.Size = new System.Drawing.Size(10, 25);
+			this.lblDummy.Visible = false;
+			// 
 			// labelItem10
 			// 
 			this.labelItem10.BorderSide = DevComponents.DotNetBar.eBorderSide.Left;
@@ -1635,7 +1635,6 @@ namespace VEPROMS
 		private DevComponents.DotNetBar.ButtonItem btnNew;
 		private DevComponents.DotNetBar.ButtonItem btnOpen;
 		private DevComponents.DotNetBar.ButtonItem btnPrepare;
-		private DevComponents.DotNetBar.ButtonItem btnPrint;
 		private DevComponents.DotNetBar.ItemContainer icRecentDocs;
 		private DevComponents.DotNetBar.LabelItem labelItem8;
 		private DevComponents.DotNetBar.ItemContainer itemContainer5;
@@ -1732,6 +1731,7 @@ namespace VEPROMS
 		private DevComponents.DotNetBar.ButtonItem btnShortCuts;
 		private DevComponents.DotNetBar.LabelItem lblItemID;
 		private System.Windows.Forms.ComboBox cmbFont;
+		private System.Windows.Forms.Label lblDummy;
 		private DevComponents.DotNetBar.LabelItem lblResolution;
 		private DevComponents.DotNetBar.LabelItem lblUser;
 		private DevComponents.DotNetBar.LabelItem lblLastChange;
@@ -1763,3 +1763,4 @@ namespace VEPROMS
 	}
 }
 
+

PROMS/VEPROMS User Interface/frmVEPROMS.cs

@@ -2098,7 +2098,6 @@ namespace VEPROMS
 			btnAdministrativeTools.Click += new EventHandler(btnAdministrativeTools_Click);
 			btnAdmin.SubItems.Add(btnAdministrativeTools);
 
-			this.superTooltip1.SetSuperTooltip(btnPrint, new SuperTooltipInfo("Create PDF", null, null, null, null, eTooltipColor.Gray));
 			this.superTooltip1.SetSuperTooltip(btnExit, new SuperTooltipInfo("Exit", null, null, null, null, eTooltipColor.Gray));
 			this.superTooltip1.SetSuperTooltip(btnOptions, new SuperTooltipInfo("Options", null, null, null, null, eTooltipColor.Gray));
 			this.superTooltip1.SetSuperTooltip(btnManageSecurity, new SuperTooltipInfo("Manage Security", null, null, null, null, eTooltipColor.Gray));
@@ -3126,22 +3125,44 @@ namespace VEPROMS
 							if (dvi != null)
 							{
 								DlgPrintProcedure prnDlg = new DlgPrintProcedure(dvi, true);
-								if (dvi.MultiUnitCount == 0) prnDlg.SelectedSlave = -1;
+								if (dvi.MultiUnitCount == 0)
+								{
+									prnDlg.SelectedSlave = -1;
+								}
+								else if (dvi.MultiUnitCount > 0)
+								{
+									string[] arguments = Environment.GetCommandLineArgs();
+									for (int i = 0; i < arguments.Length; i++)
+									{
+										if (arguments[i].Contains("/C="))
+										{
+											Console.WriteLine("In arguments loop");
+											//int num;
+											string[] childarg = arguments[i].Split('=');
+											if (int.TryParse(childarg[1], out int num))
+											{
+												prnDlg.SelectedSlave = num;
+											}
+										}
+									}
+
+								}
 								prnDlg.AllowDateTimePrefixSuffix = false; //C2018-033 don't append any selected date/time pdf file prefix or suffix (defined in working draft properties)
 								prnDlg.ShowDialog(this); // RHM 20120925 - Center dialog over PROMS window
 														 //prnDlg.FormClosed += new FormClosedEventHandler(prnDlg_FormClosed);
 														 //while (!_RunNext) Application.DoEvents();
-							}
-						}
 
+							}
+							
+						}
 						ranAuto = true;
 					}
-				}
-			}
 
-			if (ranAuto)
-			{
-				this.Close();
+					if (ranAuto)
+					{
+						this.Close();
+					}
+				}
 			}
 		}
 
@@ -3202,6 +3223,14 @@ namespace VEPROMS
 				txtSearch.Visible = false;
 				lblLastChange.Visible = false;
 				btnStepRTF.Visible = false;
+				lblDummy.Visible = false;
+			}
+			else
+			{
+				// C2024-007: On Proms main form, allow for control of whether the FontMenu
+				//	combo box is displayed.  Only done when running in debugmode
+				cmbFont.Visible = Volian.Base.Library.VlnSettings.GetCommandFlag("FontMenu");
+				lblDummy.Visible = !Volian.Base.Library.VlnSettings.GetCommandFlag("FontMenu");
 			}
 		}
 
@@ -4084,10 +4113,6 @@ namespace VEPROMS
 
 			lblUser.Text = tc.SelectedDisplayTabItem.MyUserRole;
 
-			if (tc.SelectedDisplayTabItem.MyItemInfo.MyDocVersion.MultiUnitCount > 1)
-				btnPrint.Visible = false;
-			else
-				btnPrint.Visible = true;
 
 			// Reset the ribbon buttons B2016-148 (ex. a copystep done in a different procedure tab my require the paste step options to be active
 			if (tc.SelectedDisplayTabItem != null && tc.SelectedDisplayTabItem.MyStepTabPanel != null) // MyStepTabPanel will be null if the active tab is a Word Attachment
@@ -4342,7 +4367,6 @@ namespace VEPROMS
 				ctrlAnnotationDetails.UpdateAnnotationGrid(_CurrentItem); // set the CurrentItem (send Message) when the MSWord section is opened.
 			}
 
-			btnPrint.Enabled = (_CurrentItem != null);
 		}
 
 		void _LastStepRTB_EditModeChanged(object sender, EventArgs args)
@@ -4834,12 +4858,7 @@ namespace VEPROMS
 			StepRTB.MyFontFamily = cmbFont.SelectedValue as FontFamily;
 		}
 
-		private void btnPrint_Click(object sender, EventArgs e)
-		{
-			DlgPrintProcedure prnDlg = new DlgPrintProcedure(this._CurrentItem.MyProcedure);
-			prnDlg.MySessionInfo = MySessionInfo;
-			prnDlg.ShowDialog(this); // RHM 20120925 - Center dialog over PROMS window
-		}
+
 
 		private void lblResolution_Click(object sender, EventArgs e)
 		{

PROMS/VEPROMS User Interface/frmVersionsProperties.Designer.cs

@@ -30,8 +30,8 @@ namespace VEPROMS
     {
 			this.components = new System.ComponentModel.Container();
 			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmVersionsProperties));
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
 			this.ppBtnCancel = new System.Windows.Forms.Button();
 			this.ppBtnOK = new System.Windows.Forms.Button();
 			this.ppBtnDefaultChgBar = new DevComponents.DotNetBar.ButtonX();
@@ -95,17 +95,14 @@ namespace VEPROMS
 			this.ppLblDefSettingsInfo = new System.Windows.Forms.Label();
 			this.dlgROFolder = new System.Windows.Forms.FolderBrowserDialog();
 			this.tcVersions = new DevComponents.DotNetBar.TabControl();
-			this.tcpGeneral = new DevComponents.DotNetBar.TabControlPanel();
-			this.tiGeneral = new DevComponents.DotNetBar.TabItem(this.components);
-			this.tcpRefereceObjects = new DevComponents.DotNetBar.TabControlPanel();
-			this.ppBtnRoToSql = new System.Windows.Forms.Button();
-			this.tbRoDb = new System.Windows.Forms.TextBox();
-			this.ppBtnRoDbBrowse = new System.Windows.Forms.Button();
-			this.btnRoDbProperties = new DevComponents.DotNetBar.ButtonX();
-			this.cmbRoDb = new System.Windows.Forms.ComboBox();
-			this.ppGpbxUpROvals = new DevComponents.DotNetBar.Controls.GroupPanel();
-			this.tiRefObjs = new DevComponents.DotNetBar.TabItem(this.components);
 			this.tabControlPanel2 = new DevComponents.DotNetBar.TabControlPanel();
+			this.gpxMOSLandLocation = new DevComponents.DotNetBar.Controls.GroupPanel();
+			this.ppCmbxMOSLandcornerLoc = new DevComponents.DotNetBar.Controls.ComboBoxEx();
+			this.tbxMOSLandyloc = new DevComponents.DotNetBar.Controls.TextBoxX();
+			this.tbxMOSLandxloc = new DevComponents.DotNetBar.Controls.TextBoxX();
+			this.lblMOSLandcorner = new System.Windows.Forms.Label();
+			this.lblMOSLandyloc = new System.Windows.Forms.Label();
+			this.lblMOSLandxloc = new System.Windows.Forms.Label();
 			this.ppChbxMOSview = new DevComponents.DotNetBar.Controls.CheckBoxX();
 			this.gpxMOSLocation = new DevComponents.DotNetBar.Controls.GroupPanel();
 			this.ppCmbxMOScornerLoc = new DevComponents.DotNetBar.Controls.ComboBoxEx();
@@ -124,6 +121,16 @@ namespace VEPROMS
 			this.ppCmbxMOSformat = new DevComponents.DotNetBar.Controls.ComboBoxEx();
 			this.lblMOSformat = new System.Windows.Forms.Label();
 			this.tiMergedOutputSettings = new DevComponents.DotNetBar.TabItem(this.components);
+			this.tcpGeneral = new DevComponents.DotNetBar.TabControlPanel();
+			this.tiGeneral = new DevComponents.DotNetBar.TabItem(this.components);
+			this.tcpRefereceObjects = new DevComponents.DotNetBar.TabControlPanel();
+			this.ppBtnRoToSql = new System.Windows.Forms.Button();
+			this.tbRoDb = new System.Windows.Forms.TextBox();
+			this.ppBtnRoDbBrowse = new System.Windows.Forms.Button();
+			this.btnRoDbProperties = new DevComponents.DotNetBar.ButtonX();
+			this.cmbRoDb = new System.Windows.Forms.ComboBox();
+			this.ppGpbxUpROvals = new DevComponents.DotNetBar.Controls.GroupPanel();
+			this.tiRefObjs = new DevComponents.DotNetBar.TabItem(this.components);
 			this.tabControlPanel1 = new DevComponents.DotNetBar.TabControlPanel();
 			this.ppChbxEnhancedAllowMods = new System.Windows.Forms.CheckBox();
 			this.btnUnlinkDocVersion = new System.Windows.Forms.Button();
@@ -210,25 +217,19 @@ namespace VEPROMS
 			this.ROPrefixBindingSource = new System.Windows.Forms.BindingSource(this.components);
 			this.PDFLocationBrowserDialog = new System.Windows.Forms.FolderBrowserDialog();
 			this.formatInfoListBindingSource = new System.Windows.Forms.BindingSource(this.components);
-			this.gpxMOSLandLocation = new DevComponents.DotNetBar.Controls.GroupPanel();
-			this.ppCmbxMOSLandcornerLoc = new DevComponents.DotNetBar.Controls.ComboBoxEx();
-			this.tbxMOSLandyloc = new DevComponents.DotNetBar.Controls.TextBoxX();
-			this.tbxMOSLandxloc = new DevComponents.DotNetBar.Controls.TextBoxX();
-			this.lblMOSLandcorner = new System.Windows.Forms.Label();
-			this.lblMOSLandyloc = new System.Windows.Forms.Label();
-			this.lblMOSLandxloc = new System.Windows.Forms.Label();
 			((System.ComponentModel.ISupportInitialize)(this.docVersionConfigBindingSource)).BeginInit();
 			((System.ComponentModel.ISupportInitialize)(this.imageCodecInfoBindingSource)).BeginInit();
 			this.ppGpbxUserSpecCB.SuspendLayout();
 			this.ppGpbxUserSpecTxt.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.tcVersions)).BeginInit();
 			this.tcVersions.SuspendLayout();
+			this.tabControlPanel2.SuspendLayout();
+			this.gpxMOSLandLocation.SuspendLayout();
+			this.gpxMOSLocation.SuspendLayout();
+			this.gpxMOSfont.SuspendLayout();
 			this.tcpGeneral.SuspendLayout();
 			this.tcpRefereceObjects.SuspendLayout();
 			this.ppGpbxUpROvals.SuspendLayout();
-			this.tabControlPanel2.SuspendLayout();
-			this.gpxMOSLocation.SuspendLayout();
-			this.gpxMOSfont.SuspendLayout();
 			this.tabControlPanel1.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.bsMiniEnhanced)).BeginInit();
 			((System.ComponentModel.ISupportInitialize)(this.bsEnhanced)).BeginInit();
@@ -247,14 +248,13 @@ namespace VEPROMS
 			this.panVerBtns.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.ROPrefixBindingSource)).BeginInit();
 			((System.ComponentModel.ISupportInitialize)(this.formatInfoListBindingSource)).BeginInit();
-			this.gpxMOSLandLocation.SuspendLayout();
 			this.SuspendLayout();
 			// 
 			// ppBtnCancel
 			// 
 			this.ppBtnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
 			this.ppBtnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.ppBtnCancel.Location = new System.Drawing.Point(742, 342);
+			this.ppBtnCancel.Location = new System.Drawing.Point(742, 338);
 			this.ppBtnCancel.Margin = new System.Windows.Forms.Padding(2);
 			this.ppBtnCancel.Name = "ppBtnCancel";
 			this.ppBtnCancel.Size = new System.Drawing.Size(56, 21);
@@ -266,7 +266,7 @@ namespace VEPROMS
 			// ppBtnOK
 			// 
 			this.ppBtnOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.ppBtnOK.Location = new System.Drawing.Point(669, 342);
+			this.ppBtnOK.Location = new System.Drawing.Point(669, 338);
 			this.ppBtnOK.Margin = new System.Windows.Forms.Padding(2);
 			this.ppBtnOK.Name = "ppBtnOK";
 			this.ppBtnOK.Size = new System.Drawing.Size(56, 21);
@@ -1102,9 +1102,9 @@ namespace VEPROMS
 			this.tcVersions.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
 			this.tcVersions.BackColor = System.Drawing.Color.Transparent;
 			this.tcVersions.CanReorderTabs = true;
-			this.tcVersions.Controls.Add(this.tabControlPanel2);
-			this.tcVersions.Controls.Add(this.tcpGeneral);
 			this.tcVersions.Controls.Add(this.tcpRefereceObjects);
+			this.tcVersions.Controls.Add(this.tcpGeneral);
+			this.tcVersions.Controls.Add(this.tabControlPanel2);
 			this.tcVersions.Controls.Add(this.tabControlPanel1);
 			this.tcVersions.Controls.Add(this.tcpApplicability);
 			this.tcVersions.Controls.Add(this.tabControlPanel5);
@@ -1130,173 +1130,6 @@ namespace VEPROMS
 			this.tcVersions.TabsVisible = false;
 			this.tcVersions.Text = "tabControl1";
 			// 
-			// tcpGeneral
-			// 
-			this.tcpGeneral.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
-			this.tcpGeneral.Controls.Add(this.ppCmbxProcSetType);
-			this.tcpGeneral.Controls.Add(this.ppRTxtName);
-			this.tcpGeneral.Controls.Add(this.label9);
-			this.tcpGeneral.Controls.Add(this.ppRTxtProcSetRev);
-			this.tcpGeneral.Controls.Add(this.lblProcSetRev);
-			this.tcpGeneral.Controls.Add(this.label4);
-			this.tcpGeneral.Controls.Add(this.label3);
-			this.tcpGeneral.Controls.Add(this.ppRTxtTitle);
-			this.tcpGeneral.Controls.Add(this.ppTxtBxUserID);
-			this.tcpGeneral.Controls.Add(this.ppDTPicker);
-			this.tcpGeneral.Controls.Add(this.label2);
-			this.tcpGeneral.Controls.Add(this.label1);
-			this.tcpGeneral.DisabledBackColor = System.Drawing.Color.Empty;
-			this.tcpGeneral.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.tcpGeneral.Location = new System.Drawing.Point(0, 22);
-			this.tcpGeneral.Margin = new System.Windows.Forms.Padding(2);
-			this.tcpGeneral.Name = "tcpGeneral";
-			this.tcpGeneral.Padding = new System.Windows.Forms.Padding(2);
-			this.tcpGeneral.Size = new System.Drawing.Size(625, 311);
-			this.tcpGeneral.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254)))));
-			this.tcpGeneral.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227)))));
-			this.tcpGeneral.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
-			this.tcpGeneral.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199)))));
-			this.tcpGeneral.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) 
-            | DevComponents.DotNetBar.eBorderSide.Bottom)));
-			this.tcpGeneral.Style.GradientAngle = 90;
-			this.tcpGeneral.TabIndex = 1;
-			this.tcpGeneral.TabItem = this.tiGeneral;
-			// 
-			// tiGeneral
-			// 
-			this.tiGeneral.AttachedControl = this.tcpGeneral;
-			this.tiGeneral.Name = "tiGeneral";
-			this.tiGeneral.Text = "General";
-			// 
-			// tcpRefereceObjects
-			// 
-			this.tcpRefereceObjects.Controls.Add(this.ppBtnRoToSql);
-			this.tcpRefereceObjects.Controls.Add(this.tbRoDb);
-			this.tcpRefereceObjects.Controls.Add(this.ppBtnRoDbBrowse);
-			this.tcpRefereceObjects.Controls.Add(this.btnRoDbProperties);
-			this.tcpRefereceObjects.Controls.Add(this.cmbRoDb);
-			this.tcpRefereceObjects.Controls.Add(this.ppGpbxUpROvals);
-			this.tcpRefereceObjects.Controls.Add(this.label6);
-			this.tcpRefereceObjects.DisabledBackColor = System.Drawing.Color.Empty;
-			this.tcpRefereceObjects.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.tcpRefereceObjects.Location = new System.Drawing.Point(0, 22);
-			this.tcpRefereceObjects.Margin = new System.Windows.Forms.Padding(2);
-			this.tcpRefereceObjects.Name = "tcpRefereceObjects";
-			this.tcpRefereceObjects.Padding = new System.Windows.Forms.Padding(2);
-			this.tcpRefereceObjects.Size = new System.Drawing.Size(625, 311);
-			this.tcpRefereceObjects.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254)))));
-			this.tcpRefereceObjects.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227)))));
-			this.tcpRefereceObjects.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
-			this.tcpRefereceObjects.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199)))));
-			this.tcpRefereceObjects.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) 
-            | DevComponents.DotNetBar.eBorderSide.Bottom)));
-			this.tcpRefereceObjects.Style.GradientAngle = 90;
-			this.tcpRefereceObjects.TabIndex = 2;
-			this.tcpRefereceObjects.TabItem = this.tiRefObjs;
-			this.tcpRefereceObjects.Enter += new System.EventHandler(this.tabpage_Enter);
-			// 
-			// ppBtnRoToSql
-			// 
-			this.ppBtnRoToSql.Location = new System.Drawing.Point(337, 146);
-			this.ppBtnRoToSql.Name = "ppBtnRoToSql";
-			this.ppBtnRoToSql.Size = new System.Drawing.Size(163, 46);
-			this.ppBtnRoToSql.TabIndex = 48;
-			this.ppBtnRoToSql.Text = "Migrate Data to Sql";
-			this.ppBtnRoToSql.UseVisualStyleBackColor = true;
-			this.ppBtnRoToSql.Visible = false;
-			this.ppBtnRoToSql.Click += new System.EventHandler(this.ppBtnRoToSql_Click);
-			// 
-			// tbRoDb
-			// 
-			this.tbRoDb.Enabled = false;
-			this.tbRoDb.Location = new System.Drawing.Point(80, 13);
-			this.tbRoDb.Margin = new System.Windows.Forms.Padding(2);
-			this.tbRoDb.Name = "tbRoDb";
-			this.tbRoDb.Size = new System.Drawing.Size(318, 20);
-			this.tbRoDb.TabIndex = 20;
-			// 
-			// ppBtnRoDbBrowse
-			// 
-			this.ppBtnRoDbBrowse.Location = new System.Drawing.Point(406, 34);
-			this.ppBtnRoDbBrowse.Margin = new System.Windows.Forms.Padding(2);
-			this.ppBtnRoDbBrowse.Name = "ppBtnRoDbBrowse";
-			this.ppBtnRoDbBrowse.Size = new System.Drawing.Size(51, 20);
-			this.ppBtnRoDbBrowse.TabIndex = 22;
-			this.ppBtnRoDbBrowse.Text = "Browse...";
-			this.ppBtnRoDbBrowse.UseVisualStyleBackColor = true;
-			this.ppBtnRoDbBrowse.Click += new System.EventHandler(this.ppBtnRoDbBrowse_Click);
-			// 
-			// btnRoDbProperties
-			// 
-			this.btnRoDbProperties.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
-			this.btnRoDbProperties.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-			this.btnRoDbProperties.Image = ((System.Drawing.Image)(resources.GetObject("btnRoDbProperties.Image")));
-			this.btnRoDbProperties.Location = new System.Drawing.Point(406, 10);
-			this.btnRoDbProperties.Margin = new System.Windows.Forms.Padding(2);
-			this.btnRoDbProperties.Name = "btnRoDbProperties";
-			this.btnRoDbProperties.Size = new System.Drawing.Size(33, 23);
-			this.btnRoDbProperties.TabIndex = 21;
-			this.btnRoDbProperties.Click += new System.EventHandler(this.btnRoDbProperties_Click);
-			// 
-			// cmbRoDb
-			// 
-			this.cmbRoDb.FormattingEnabled = true;
-			this.cmbRoDb.Location = new System.Drawing.Point(80, 13);
-			this.cmbRoDb.Margin = new System.Windows.Forms.Padding(2);
-			this.cmbRoDb.Name = "cmbRoDb";
-			this.cmbRoDb.Size = new System.Drawing.Size(318, 21);
-			this.cmbRoDb.TabIndex = 47;
-			this.cmbRoDb.SelectedIndexChanged += new System.EventHandler(this.cmbRoDb_SelectedIndexChanged);
-			// 
-			// ppGpbxUpROvals
-			// 
-			this.ppGpbxUpROvals.BackColor = System.Drawing.Color.Transparent;
-			this.ppGpbxUpROvals.CanvasColor = System.Drawing.SystemColors.Control;
-			this.ppGpbxUpROvals.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
-			this.ppGpbxUpROvals.Controls.Add(this.ppBtnResetRoVals);
-			this.ppGpbxUpROvals.Controls.Add(this.ppBtnUpRoVals);
-			this.ppGpbxUpROvals.DisabledBackColor = System.Drawing.Color.Empty;
-			this.ppGpbxUpROvals.Location = new System.Drawing.Point(34, 69);
-			this.ppGpbxUpROvals.Margin = new System.Windows.Forms.Padding(2);
-			this.ppGpbxUpROvals.Name = "ppGpbxUpROvals";
-			this.ppGpbxUpROvals.Size = new System.Drawing.Size(112, 162);
-			// 
-			// 
-			// 
-			this.ppGpbxUpROvals.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
-			this.ppGpbxUpROvals.Style.BackColorGradientAngle = 90;
-			this.ppGpbxUpROvals.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
-			this.ppGpbxUpROvals.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.ppGpbxUpROvals.Style.BorderBottomWidth = 1;
-			this.ppGpbxUpROvals.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
-			this.ppGpbxUpROvals.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.ppGpbxUpROvals.Style.BorderLeftWidth = 1;
-			this.ppGpbxUpROvals.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.ppGpbxUpROvals.Style.BorderRightWidth = 1;
-			this.ppGpbxUpROvals.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.ppGpbxUpROvals.Style.BorderTopWidth = 1;
-			this.ppGpbxUpROvals.Style.CornerDiameter = 4;
-			this.ppGpbxUpROvals.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
-			this.ppGpbxUpROvals.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
-			this.ppGpbxUpROvals.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
-			this.ppGpbxUpROvals.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
-			// 
-			// 
-			// 
-			this.ppGpbxUpROvals.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			// 
-			// 
-			// 
-			this.ppGpbxUpROvals.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.ppGpbxUpROvals.TabIndex = 46;
-			this.ppGpbxUpROvals.Text = "RO Values";
-			// 
-			// tiRefObjs
-			// 
-			this.tiRefObjs.AttachedControl = this.tcpRefereceObjects;
-			this.tiRefObjs.Name = "tiRefObjs";
-			this.tiRefObjs.Text = "Referenced Objects";
-			// 
 			// tabControlPanel2
 			// 
 			this.tabControlPanel2.Controls.Add(this.gpxMOSLandLocation);
@@ -1324,6 +1157,128 @@ namespace VEPROMS
 			this.tabControlPanel2.TabIndex = 30;
 			this.tabControlPanel2.TabItem = this.tiMergedOutputSettings;
 			// 
+			// gpxMOSLandLocation
+			// 
+			this.gpxMOSLandLocation.BackColor = System.Drawing.Color.Transparent;
+			this.gpxMOSLandLocation.CanvasColor = System.Drawing.SystemColors.Control;
+			this.gpxMOSLandLocation.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
+			this.gpxMOSLandLocation.Controls.Add(this.ppCmbxMOSLandcornerLoc);
+			this.gpxMOSLandLocation.Controls.Add(this.tbxMOSLandyloc);
+			this.gpxMOSLandLocation.Controls.Add(this.tbxMOSLandxloc);
+			this.gpxMOSLandLocation.Controls.Add(this.lblMOSLandcorner);
+			this.gpxMOSLandLocation.Controls.Add(this.lblMOSLandyloc);
+			this.gpxMOSLandLocation.Controls.Add(this.lblMOSLandxloc);
+			this.gpxMOSLandLocation.DisabledBackColor = System.Drawing.Color.Empty;
+			this.gpxMOSLandLocation.Location = new System.Drawing.Point(284, 164);
+			this.gpxMOSLandLocation.Margin = new System.Windows.Forms.Padding(2);
+			this.gpxMOSLandLocation.Name = "gpxMOSLandLocation";
+			this.gpxMOSLandLocation.Size = new System.Drawing.Size(209, 98);
+			// 
+			// 
+			// 
+			this.gpxMOSLandLocation.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
+			this.gpxMOSLandLocation.Style.BackColorGradientAngle = 90;
+			this.gpxMOSLandLocation.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
+			this.gpxMOSLandLocation.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
+			this.gpxMOSLandLocation.Style.BorderBottomWidth = 1;
+			this.gpxMOSLandLocation.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+			this.gpxMOSLandLocation.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
+			this.gpxMOSLandLocation.Style.BorderLeftWidth = 1;
+			this.gpxMOSLandLocation.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
+			this.gpxMOSLandLocation.Style.BorderRightWidth = 1;
+			this.gpxMOSLandLocation.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
+			this.gpxMOSLandLocation.Style.BorderTopWidth = 1;
+			this.gpxMOSLandLocation.Style.CornerDiameter = 4;
+			this.gpxMOSLandLocation.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
+			this.gpxMOSLandLocation.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
+			this.gpxMOSLandLocation.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+			this.gpxMOSLandLocation.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
+			// 
+			// 
+			// 
+			this.gpxMOSLandLocation.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			// 
+			// 
+			// 
+			this.gpxMOSLandLocation.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.gpxMOSLandLocation.TabIndex = 7;
+			this.gpxMOSLandLocation.Text = "Landscape Location";
+			// 
+			// ppCmbxMOSLandcornerLoc
+			// 
+			this.ppCmbxMOSLandcornerLoc.DisplayMember = "Text";
+			this.ppCmbxMOSLandcornerLoc.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
+			this.ppCmbxMOSLandcornerLoc.FormattingEnabled = true;
+			this.ppCmbxMOSLandcornerLoc.ItemHeight = 16;
+			this.ppCmbxMOSLandcornerLoc.Location = new System.Drawing.Point(59, 53);
+			this.ppCmbxMOSLandcornerLoc.Margin = new System.Windows.Forms.Padding(2);
+			this.ppCmbxMOSLandcornerLoc.Name = "ppCmbxMOSLandcornerLoc";
+			this.ppCmbxMOSLandcornerLoc.Size = new System.Drawing.Size(144, 22);
+			this.ppCmbxMOSLandcornerLoc.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+			this.ppCmbxMOSLandcornerLoc.TabIndex = 9;
+			this.ppCmbxMOSLandcornerLoc.WatermarkText = "corner location";
+			// 
+			// tbxMOSLandyloc
+			// 
+			// 
+			// 
+			// 
+			this.tbxMOSLandyloc.Border.Class = "TextBoxBorder";
+			this.tbxMOSLandyloc.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.tbxMOSLandyloc.Location = new System.Drawing.Point(62, 30);
+			this.tbxMOSLandyloc.Margin = new System.Windows.Forms.Padding(2);
+			this.tbxMOSLandyloc.Name = "tbxMOSLandyloc";
+			this.tbxMOSLandyloc.PreventEnterBeep = true;
+			this.tbxMOSLandyloc.Size = new System.Drawing.Size(75, 20);
+			this.tbxMOSLandyloc.TabIndex = 8;
+			// 
+			// tbxMOSLandxloc
+			// 
+			// 
+			// 
+			// 
+			this.tbxMOSLandxloc.Border.Class = "TextBoxBorder";
+			this.tbxMOSLandxloc.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.tbxMOSLandxloc.Location = new System.Drawing.Point(62, 10);
+			this.tbxMOSLandxloc.Margin = new System.Windows.Forms.Padding(2);
+			this.tbxMOSLandxloc.Name = "tbxMOSLandxloc";
+			this.tbxMOSLandxloc.PreventEnterBeep = true;
+			this.tbxMOSLandxloc.Size = new System.Drawing.Size(75, 20);
+			this.tbxMOSLandxloc.TabIndex = 7;
+			// 
+			// lblMOSLandcorner
+			// 
+			this.lblMOSLandcorner.AutoSize = true;
+			this.lblMOSLandcorner.BackColor = System.Drawing.Color.Transparent;
+			this.lblMOSLandcorner.Location = new System.Drawing.Point(14, 54);
+			this.lblMOSLandcorner.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+			this.lblMOSLandcorner.Name = "lblMOSLandcorner";
+			this.lblMOSLandcorner.Size = new System.Drawing.Size(41, 13);
+			this.lblMOSLandcorner.TabIndex = 6;
+			this.lblMOSLandcorner.Text = "Corner:";
+			// 
+			// lblMOSLandyloc
+			// 
+			this.lblMOSLandyloc.AutoSize = true;
+			this.lblMOSLandyloc.BackColor = System.Drawing.Color.Transparent;
+			this.lblMOSLandyloc.Location = new System.Drawing.Point(14, 32);
+			this.lblMOSLandyloc.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+			this.lblMOSLandyloc.Name = "lblMOSLandyloc";
+			this.lblMOSLandyloc.Size = new System.Drawing.Size(34, 13);
+			this.lblMOSLandyloc.TabIndex = 5;
+			this.lblMOSLandyloc.Text = "Y (in):";
+			// 
+			// lblMOSLandxloc
+			// 
+			this.lblMOSLandxloc.AutoSize = true;
+			this.lblMOSLandxloc.BackColor = System.Drawing.Color.Transparent;
+			this.lblMOSLandxloc.Location = new System.Drawing.Point(14, 10);
+			this.lblMOSLandxloc.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+			this.lblMOSLandxloc.Name = "lblMOSLandxloc";
+			this.lblMOSLandxloc.Size = new System.Drawing.Size(34, 13);
+			this.lblMOSLandxloc.TabIndex = 4;
+			this.lblMOSLandxloc.Text = "X (in):";
+			// 
 			// ppChbxMOSview
 			// 
 			this.ppChbxMOSview.BackColor = System.Drawing.Color.Transparent;
@@ -1613,6 +1568,174 @@ namespace VEPROMS
 			this.tiMergedOutputSettings.Name = "tiMergedOutputSettings";
 			this.tiMergedOutputSettings.Text = "Merged Output Settings";
 			// 
+			// tcpGeneral
+			// 
+			this.tcpGeneral.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
+			this.tcpGeneral.Controls.Add(this.ppCmbxProcSetType);
+			this.tcpGeneral.Controls.Add(this.ppRTxtName);
+			this.tcpGeneral.Controls.Add(this.label9);
+			this.tcpGeneral.Controls.Add(this.ppRTxtProcSetRev);
+			this.tcpGeneral.Controls.Add(this.lblProcSetRev);
+			this.tcpGeneral.Controls.Add(this.label4);
+			this.tcpGeneral.Controls.Add(this.label3);
+			this.tcpGeneral.Controls.Add(this.ppRTxtTitle);
+			this.tcpGeneral.Controls.Add(this.ppTxtBxUserID);
+			this.tcpGeneral.Controls.Add(this.ppDTPicker);
+			this.tcpGeneral.Controls.Add(this.label2);
+			this.tcpGeneral.Controls.Add(this.label1);
+			this.tcpGeneral.DisabledBackColor = System.Drawing.Color.Empty;
+			this.tcpGeneral.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.tcpGeneral.Location = new System.Drawing.Point(0, 22);
+			this.tcpGeneral.Margin = new System.Windows.Forms.Padding(2);
+			this.tcpGeneral.Name = "tcpGeneral";
+			this.tcpGeneral.Padding = new System.Windows.Forms.Padding(2);
+			this.tcpGeneral.Size = new System.Drawing.Size(625, 311);
+			this.tcpGeneral.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254)))));
+			this.tcpGeneral.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227)))));
+			this.tcpGeneral.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+			this.tcpGeneral.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199)))));
+			this.tcpGeneral.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) 
+            | DevComponents.DotNetBar.eBorderSide.Bottom)));
+			this.tcpGeneral.Style.GradientAngle = 90;
+			this.tcpGeneral.TabIndex = 1;
+			this.tcpGeneral.TabItem = this.tiGeneral;
+			// 
+			// tiGeneral
+			// 
+			this.tiGeneral.AttachedControl = this.tcpGeneral;
+			this.tiGeneral.Name = "tiGeneral";
+			this.tiGeneral.Text = "General";
+			// 
+			// tcpRefereceObjects
+			// 
+			this.tcpRefereceObjects.Controls.Add(this.ppBtnRoToSql);
+			this.tcpRefereceObjects.Controls.Add(this.tbRoDb);
+			this.tcpRefereceObjects.Controls.Add(this.ppBtnRoDbBrowse);
+			this.tcpRefereceObjects.Controls.Add(this.btnRoDbProperties);
+			this.tcpRefereceObjects.Controls.Add(this.cmbRoDb);
+			this.tcpRefereceObjects.Controls.Add(this.ppGpbxUpROvals);
+			this.tcpRefereceObjects.Controls.Add(this.label6);
+			this.tcpRefereceObjects.DisabledBackColor = System.Drawing.Color.Empty;
+			this.tcpRefereceObjects.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.tcpRefereceObjects.Location = new System.Drawing.Point(0, 22);
+			this.tcpRefereceObjects.Margin = new System.Windows.Forms.Padding(2);
+			this.tcpRefereceObjects.Name = "tcpRefereceObjects";
+			this.tcpRefereceObjects.Padding = new System.Windows.Forms.Padding(2);
+			this.tcpRefereceObjects.Size = new System.Drawing.Size(625, 311);
+			this.tcpRefereceObjects.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254)))));
+			this.tcpRefereceObjects.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227)))));
+			this.tcpRefereceObjects.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+			this.tcpRefereceObjects.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199)))));
+			this.tcpRefereceObjects.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) 
+            | DevComponents.DotNetBar.eBorderSide.Bottom)));
+			this.tcpRefereceObjects.Style.GradientAngle = 90;
+			this.tcpRefereceObjects.TabIndex = 2;
+			this.tcpRefereceObjects.TabItem = this.tiRefObjs;
+			this.tcpRefereceObjects.Enter += new System.EventHandler(this.tabpage_Enter);
+			// 
+			// ppBtnRoToSql
+			// 
+			this.ppBtnRoToSql.Location = new System.Drawing.Point(337, 146);
+			this.ppBtnRoToSql.Name = "ppBtnRoToSql";
+			this.ppBtnRoToSql.Size = new System.Drawing.Size(163, 46);
+			this.ppBtnRoToSql.TabIndex = 48;
+			this.ppBtnRoToSql.Text = "Migrate Data to Sql";
+			this.ppBtnRoToSql.UseVisualStyleBackColor = true;
+			this.ppBtnRoToSql.Visible = false;
+			this.ppBtnRoToSql.Click += new System.EventHandler(this.ppBtnRoToSql_Click);
+			// 
+			// tbRoDb
+			// 
+			this.tbRoDb.Enabled = false;
+			this.tbRoDb.Location = new System.Drawing.Point(80, 13);
+			this.tbRoDb.Margin = new System.Windows.Forms.Padding(2);
+			this.tbRoDb.Name = "tbRoDb";
+			this.tbRoDb.Size = new System.Drawing.Size(318, 20);
+			this.tbRoDb.TabIndex = 20;
+			this.tbRoDb.TextChanged += new System.EventHandler(this.tbRoDb_TextChanged);
+			// 
+			// ppBtnRoDbBrowse
+			// 
+			this.ppBtnRoDbBrowse.Location = new System.Drawing.Point(406, 34);
+			this.ppBtnRoDbBrowse.Margin = new System.Windows.Forms.Padding(2);
+			this.ppBtnRoDbBrowse.Name = "ppBtnRoDbBrowse";
+			this.ppBtnRoDbBrowse.Size = new System.Drawing.Size(51, 20);
+			this.ppBtnRoDbBrowse.TabIndex = 22;
+			this.ppBtnRoDbBrowse.Text = "Browse...";
+			this.ppBtnRoDbBrowse.UseVisualStyleBackColor = true;
+			this.ppBtnRoDbBrowse.Click += new System.EventHandler(this.ppBtnRoDbBrowse_Click);
+			// 
+			// btnRoDbProperties
+			// 
+			this.btnRoDbProperties.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+			this.btnRoDbProperties.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+			this.btnRoDbProperties.Image = ((System.Drawing.Image)(resources.GetObject("btnRoDbProperties.Image")));
+			this.btnRoDbProperties.Location = new System.Drawing.Point(406, 10);
+			this.btnRoDbProperties.Margin = new System.Windows.Forms.Padding(2);
+			this.btnRoDbProperties.Name = "btnRoDbProperties";
+			this.btnRoDbProperties.Size = new System.Drawing.Size(33, 23);
+			this.btnRoDbProperties.TabIndex = 21;
+			this.btnRoDbProperties.Click += new System.EventHandler(this.btnRoDbProperties_Click);
+			// 
+			// cmbRoDb
+			// 
+			this.cmbRoDb.FormattingEnabled = true;
+			this.cmbRoDb.Location = new System.Drawing.Point(80, 13);
+			this.cmbRoDb.Margin = new System.Windows.Forms.Padding(2);
+			this.cmbRoDb.Name = "cmbRoDb";
+			this.cmbRoDb.Size = new System.Drawing.Size(318, 21);
+			this.cmbRoDb.TabIndex = 47;
+			this.cmbRoDb.SelectedIndexChanged += new System.EventHandler(this.cmbRoDb_SelectedIndexChanged);
+			// 
+			// ppGpbxUpROvals
+			// 
+			this.ppGpbxUpROvals.BackColor = System.Drawing.Color.Transparent;
+			this.ppGpbxUpROvals.CanvasColor = System.Drawing.SystemColors.Control;
+			this.ppGpbxUpROvals.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
+			this.ppGpbxUpROvals.Controls.Add(this.ppBtnResetRoVals);
+			this.ppGpbxUpROvals.Controls.Add(this.ppBtnUpRoVals);
+			this.ppGpbxUpROvals.DisabledBackColor = System.Drawing.Color.Empty;
+			this.ppGpbxUpROvals.Location = new System.Drawing.Point(34, 69);
+			this.ppGpbxUpROvals.Margin = new System.Windows.Forms.Padding(2);
+			this.ppGpbxUpROvals.Name = "ppGpbxUpROvals";
+			this.ppGpbxUpROvals.Size = new System.Drawing.Size(112, 162);
+			// 
+			// 
+			// 
+			this.ppGpbxUpROvals.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
+			this.ppGpbxUpROvals.Style.BackColorGradientAngle = 90;
+			this.ppGpbxUpROvals.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
+			this.ppGpbxUpROvals.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
+			this.ppGpbxUpROvals.Style.BorderBottomWidth = 1;
+			this.ppGpbxUpROvals.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+			this.ppGpbxUpROvals.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
+			this.ppGpbxUpROvals.Style.BorderLeftWidth = 1;
+			this.ppGpbxUpROvals.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
+			this.ppGpbxUpROvals.Style.BorderRightWidth = 1;
+			this.ppGpbxUpROvals.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
+			this.ppGpbxUpROvals.Style.BorderTopWidth = 1;
+			this.ppGpbxUpROvals.Style.CornerDiameter = 4;
+			this.ppGpbxUpROvals.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
+			this.ppGpbxUpROvals.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
+			this.ppGpbxUpROvals.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+			this.ppGpbxUpROvals.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
+			// 
+			// 
+			// 
+			this.ppGpbxUpROvals.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			// 
+			// 
+			// 
+			this.ppGpbxUpROvals.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.ppGpbxUpROvals.TabIndex = 46;
+			this.ppGpbxUpROvals.Text = "RO Values";
+			// 
+			// tiRefObjs
+			// 
+			this.tiRefObjs.AttachedControl = this.tcpRefereceObjects;
+			this.tiRefObjs.Name = "tiRefObjs";
+			this.tiRefObjs.Text = "Referenced Objects";
+			// 
 			// tabControlPanel1
 			// 
 			this.tabControlPanel1.Controls.Add(this.ppChbxEnhancedAllowMods);
@@ -2172,14 +2295,14 @@ namespace VEPROMS
             this.documentEntryCountDataGridViewTextBoxColumn,
             this.libTitleDataGridViewTextBoxColumn});
 			this.ppGrdLibDocList.DataSource = this.documentInfoListBindingSource;
-			dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-			dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;
-			dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText;
-			dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-			dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.ControlText;
-			dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-			this.ppGrdLibDocList.DefaultCellStyle = dataGridViewCellStyle2;
+			dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+			dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window;
+			dataGridViewCellStyle4.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText;
+			dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+			dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.ControlText;
+			dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+			this.ppGrdLibDocList.DefaultCellStyle = dataGridViewCellStyle4;
 			this.ppGrdLibDocList.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.ppGrdLibDocList.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229)))));
 			this.ppGrdLibDocList.HighlightSelectedColumnHeaders = false;
@@ -2196,8 +2319,8 @@ namespace VEPROMS
 			// documentEntryCountDataGridViewTextBoxColumn
 			// 
 			this.documentEntryCountDataGridViewTextBoxColumn.DataPropertyName = "DocumentEntryCount";
-			dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-			this.documentEntryCountDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle1;
+			dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+			this.documentEntryCountDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle3;
 			this.documentEntryCountDataGridViewTextBoxColumn.HeaderText = "Number of Usages";
 			this.documentEntryCountDataGridViewTextBoxColumn.Name = "documentEntryCountDataGridViewTextBoxColumn";
 			this.documentEntryCountDataGridViewTextBoxColumn.ReadOnly = true;
@@ -2664,132 +2787,14 @@ namespace VEPROMS
 			this.btnGeneral.Text = "General";
 			this.btnGeneral.Click += new System.EventHandler(this.btnGeneral_Click);
 			// 
+			// ROPrefixBindingSource
+			// 
+			this.ROPrefixBindingSource.CurrentChanged += new System.EventHandler(this.ROPrefixBindingSource_CurrentChanged);
+			// 
 			// formatInfoListBindingSource
 			// 
 			this.formatInfoListBindingSource.DataSource = typeof(VEPROMS.CSLA.Library.FormatInfo);
 			// 
-			// gpxMOSLandLocation
-			// 
-			this.gpxMOSLandLocation.BackColor = System.Drawing.Color.Transparent;
-			this.gpxMOSLandLocation.CanvasColor = System.Drawing.SystemColors.Control;
-			this.gpxMOSLandLocation.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
-			this.gpxMOSLandLocation.Controls.Add(this.ppCmbxMOSLandcornerLoc);
-			this.gpxMOSLandLocation.Controls.Add(this.tbxMOSLandyloc);
-			this.gpxMOSLandLocation.Controls.Add(this.tbxMOSLandxloc);
-			this.gpxMOSLandLocation.Controls.Add(this.lblMOSLandcorner);
-			this.gpxMOSLandLocation.Controls.Add(this.lblMOSLandyloc);
-			this.gpxMOSLandLocation.Controls.Add(this.lblMOSLandxloc);
-			this.gpxMOSLandLocation.DisabledBackColor = System.Drawing.Color.Empty;
-			this.gpxMOSLandLocation.Location = new System.Drawing.Point(284, 164);
-			this.gpxMOSLandLocation.Margin = new System.Windows.Forms.Padding(2);
-			this.gpxMOSLandLocation.Name = "gpxMOSLandLocation";
-			this.gpxMOSLandLocation.Size = new System.Drawing.Size(209, 98);
-			// 
-			// 
-			// 
-			this.gpxMOSLandLocation.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
-			this.gpxMOSLandLocation.Style.BackColorGradientAngle = 90;
-			this.gpxMOSLandLocation.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
-			this.gpxMOSLandLocation.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.gpxMOSLandLocation.Style.BorderBottomWidth = 1;
-			this.gpxMOSLandLocation.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
-			this.gpxMOSLandLocation.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.gpxMOSLandLocation.Style.BorderLeftWidth = 1;
-			this.gpxMOSLandLocation.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.gpxMOSLandLocation.Style.BorderRightWidth = 1;
-			this.gpxMOSLandLocation.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.gpxMOSLandLocation.Style.BorderTopWidth = 1;
-			this.gpxMOSLandLocation.Style.CornerDiameter = 4;
-			this.gpxMOSLandLocation.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
-			this.gpxMOSLandLocation.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
-			this.gpxMOSLandLocation.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
-			this.gpxMOSLandLocation.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
-			// 
-			// 
-			// 
-			this.gpxMOSLandLocation.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			// 
-			// 
-			// 
-			this.gpxMOSLandLocation.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.gpxMOSLandLocation.TabIndex = 7;
-			this.gpxMOSLandLocation.Text = "Landscape Location";
-			// 
-			// ppCmbxMOSLandcornerLoc
-			// 
-			this.ppCmbxMOSLandcornerLoc.DisplayMember = "Text";
-			this.ppCmbxMOSLandcornerLoc.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
-			this.ppCmbxMOSLandcornerLoc.FormattingEnabled = true;
-			this.ppCmbxMOSLandcornerLoc.ItemHeight = 16;
-			this.ppCmbxMOSLandcornerLoc.Location = new System.Drawing.Point(59, 53);
-			this.ppCmbxMOSLandcornerLoc.Margin = new System.Windows.Forms.Padding(2);
-			this.ppCmbxMOSLandcornerLoc.Name = "ppCmbxMOSLandcornerLoc";
-			this.ppCmbxMOSLandcornerLoc.Size = new System.Drawing.Size(144, 22);
-			this.ppCmbxMOSLandcornerLoc.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-			this.ppCmbxMOSLandcornerLoc.TabIndex = 9;
-			this.ppCmbxMOSLandcornerLoc.WatermarkText = "corner location";
-			// 
-			// tbxMOSLandyloc
-			// 
-			// 
-			// 
-			// 
-			this.tbxMOSLandyloc.Border.Class = "TextBoxBorder";
-			this.tbxMOSLandyloc.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.tbxMOSLandyloc.Location = new System.Drawing.Point(62, 30);
-			this.tbxMOSLandyloc.Margin = new System.Windows.Forms.Padding(2);
-			this.tbxMOSLandyloc.Name = "tbxMOSLandyloc";
-			this.tbxMOSLandyloc.PreventEnterBeep = true;
-			this.tbxMOSLandyloc.Size = new System.Drawing.Size(75, 20);
-			this.tbxMOSLandyloc.TabIndex = 8;
-			// 
-			// tbxMOSLandxloc
-			// 
-			// 
-			// 
-			// 
-			this.tbxMOSLandxloc.Border.Class = "TextBoxBorder";
-			this.tbxMOSLandxloc.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.tbxMOSLandxloc.Location = new System.Drawing.Point(62, 10);
-			this.tbxMOSLandxloc.Margin = new System.Windows.Forms.Padding(2);
-			this.tbxMOSLandxloc.Name = "tbxMOSLandxloc";
-			this.tbxMOSLandxloc.PreventEnterBeep = true;
-			this.tbxMOSLandxloc.Size = new System.Drawing.Size(75, 20);
-			this.tbxMOSLandxloc.TabIndex = 7;
-			// 
-			// lblMOSLandcorner
-			// 
-			this.lblMOSLandcorner.AutoSize = true;
-			this.lblMOSLandcorner.BackColor = System.Drawing.Color.Transparent;
-			this.lblMOSLandcorner.Location = new System.Drawing.Point(14, 54);
-			this.lblMOSLandcorner.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-			this.lblMOSLandcorner.Name = "lblMOSLandcorner";
-			this.lblMOSLandcorner.Size = new System.Drawing.Size(41, 13);
-			this.lblMOSLandcorner.TabIndex = 6;
-			this.lblMOSLandcorner.Text = "Corner:";
-			// 
-			// lblMOSLandyloc
-			// 
-			this.lblMOSLandyloc.AutoSize = true;
-			this.lblMOSLandyloc.BackColor = System.Drawing.Color.Transparent;
-			this.lblMOSLandyloc.Location = new System.Drawing.Point(14, 32);
-			this.lblMOSLandyloc.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-			this.lblMOSLandyloc.Name = "lblMOSLandyloc";
-			this.lblMOSLandyloc.Size = new System.Drawing.Size(34, 13);
-			this.lblMOSLandyloc.TabIndex = 5;
-			this.lblMOSLandyloc.Text = "Y (in):";
-			// 
-			// lblMOSLandxloc
-			// 
-			this.lblMOSLandxloc.AutoSize = true;
-			this.lblMOSLandxloc.BackColor = System.Drawing.Color.Transparent;
-			this.lblMOSLandxloc.Location = new System.Drawing.Point(14, 10);
-			this.lblMOSLandxloc.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-			this.lblMOSLandxloc.Name = "lblMOSLandxloc";
-			this.lblMOSLandxloc.Size = new System.Drawing.Size(34, 13);
-			this.lblMOSLandxloc.TabIndex = 4;
-			this.lblMOSLandxloc.Text = "X (in):";
-			// 
 			// frmVersionsProperties
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -2797,7 +2802,7 @@ namespace VEPROMS
 			this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
 			this.CancelButton = this.ppBtnCancel;
 			this.CaptionFont = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.ClientSize = new System.Drawing.Size(806, 365);
+			this.ClientSize = new System.Drawing.Size(802, 361);
 			this.ControlBox = false;
 			this.Controls.Add(this.panVerBtns);
 			this.Controls.Add(this.tcVersions);
@@ -2824,17 +2829,19 @@ namespace VEPROMS
 			this.ppGpbxUserSpecTxt.PerformLayout();
 			((System.ComponentModel.ISupportInitialize)(this.tcVersions)).EndInit();
 			this.tcVersions.ResumeLayout(false);
+			this.tabControlPanel2.ResumeLayout(false);
+			this.tabControlPanel2.PerformLayout();
+			this.gpxMOSLandLocation.ResumeLayout(false);
+			this.gpxMOSLandLocation.PerformLayout();
+			this.gpxMOSLocation.ResumeLayout(false);
+			this.gpxMOSLocation.PerformLayout();
+			this.gpxMOSfont.ResumeLayout(false);
+			this.gpxMOSfont.PerformLayout();
 			this.tcpGeneral.ResumeLayout(false);
 			this.tcpGeneral.PerformLayout();
 			this.tcpRefereceObjects.ResumeLayout(false);
 			this.tcpRefereceObjects.PerformLayout();
 			this.ppGpbxUpROvals.ResumeLayout(false);
-			this.tabControlPanel2.ResumeLayout(false);
-			this.tabControlPanel2.PerformLayout();
-			this.gpxMOSLocation.ResumeLayout(false);
-			this.gpxMOSLocation.PerformLayout();
-			this.gpxMOSfont.ResumeLayout(false);
-			this.gpxMOSfont.PerformLayout();
 			this.tabControlPanel1.ResumeLayout(false);
 			this.tabControlPanel1.PerformLayout();
 			((System.ComponentModel.ISupportInitialize)(this.bsMiniEnhanced)).EndInit();
@@ -2859,8 +2866,6 @@ namespace VEPROMS
 			this.panVerBtns.ResumeLayout(false);
 			((System.ComponentModel.ISupportInitialize)(this.ROPrefixBindingSource)).EndInit();
 			((System.ComponentModel.ISupportInitialize)(this.formatInfoListBindingSource)).EndInit();
-			this.gpxMOSLandLocation.ResumeLayout(false);
-			this.gpxMOSLandLocation.PerformLayout();
 			this.ResumeLayout(false);
 			this.PerformLayout();
 

PROMS/VEPROMS User Interface/frmVersionsProperties.cs

@@ -29,6 +29,7 @@ namespace VEPROMS
 		private List<MiniConfig> _DeletedApples;
 		private List<EnhancedMiniConfig> _Enhanced;
 		private DocVersionConfig _DocVersionConfig;
+		private string _OrgPDFPath; // B2024-030 used to save last PDF path
 		
 		// Default values
 		private string _DefaultFormatName = null;
@@ -97,6 +98,7 @@ namespace VEPROMS
 
 			_Initializing = true;
 			InitializeComponent();
+			_OrgPDFPath = _DocVersionConfig.Print_PDFLocation; // B2024-030 save last PDF path
 			btnGeneral.PerformClick(); // always start with General tab or button
 			_Initializing = false;
 
@@ -323,8 +325,6 @@ namespace VEPROMS
 				tiApplicability.Visible = false;
 			}
 
-			ppTxtBxPDFLoc.TextChanged += new EventHandler(ppTxtBxPDFLoc_TextChanged);
-
 			//end add new applicability stuff
 			lblProcSetRev.Visible = ppRTxtProcSetRev.Visible = _DocVersionConfig.MyDocVersion.MyDocVersionInfo.ActiveFormat.MyStepSectionPrintData.UseXtraRevNumber;
 
@@ -538,11 +538,32 @@ namespace VEPROMS
 			}
 		}
 
-		// The following code was added to fix Bug B2013-117
-		private void ppTxtBxPDFLoc_TextChanged(object sender, EventArgs e)
+		//B2024-030 Check the PDF Location path and prompt to create the folders if needed
+		private void CheckPDFLocationPath()
 		{
-			if (_Initializing == false)
-				_DocVersionConfig.Print_PDFLocation = ppTxtBxPDFLoc.Text;
+			string pdfloc = ppTxtBxPDFLoc.Text;
+			if (pdfloc == string.Empty) return;
+			if (!Directory.Exists(ppTxtBxPDFLoc.Text))
+			{
+				string msg = string.Format(" The Folder: '{0}' does not exist. \n\nCreate it?", ppTxtBxPDFLoc.Text);
+				DialogResult dr = MessageBox.Show(msg, "PDF Location Folder Not Found", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
+				if (dr == DialogResult.Yes)
+				{
+					try
+					{
+						Directory.CreateDirectory(ppTxtBxPDFLoc.Text);
+					}
+					catch (Exception ex)
+					{
+						MessageBox.Show(ex.Message, "Error trying to create folder", MessageBoxButtons.OK, MessageBoxIcon.Error);
+						_DocVersionConfig.Print_PDFLocation = _OrgPDFPath; // reset to the path we started with
+					}
+				}
+				else
+				{
+					_DocVersionConfig.Print_PDFLocation = _OrgPDFPath; // reset to the path we started with
+				}
+			}
 		}
 
 		private string AddSlaveNode(MiniConfig mc)
@@ -588,6 +609,9 @@ namespace VEPROMS
 
 		private void btnVersionsPropOK_Click(object sender, EventArgs e)
 		{
+			//B2024-030 Check the PDF Location path and prompt to create the folders if needed
+			CheckPDFLocationPath();
+
 			docVersionConfigBindingSource.EndEdit(); // need to end the edit session first or any format selection chanage will not stick  B2015-157
 
 			// if there is a change to the format, clean up any overridden formats that point to the selected item before saving the format change:
@@ -773,7 +797,6 @@ namespace VEPROMS
 
 			// B2019-132 update the association count for this working draft
 			_DocVersionConfig.MyDocVersion.MyDocVersionInfo.RefreshDocVersionAssociations();
-
 			this.Close();
 		}
 
@@ -1928,6 +1951,16 @@ namespace VEPROMS
 		#endregion
 
 		#endregion
+
+		private void tbRoDb_TextChanged(object sender, EventArgs e)
+		{
+
+		}
+
+		private void ROPrefixBindingSource_CurrentChanged(object sender, EventArgs e)
+		{
+
+		}
 	}
 
 

PROMS/VEPROMS User Interface/frmVersionsProperties.resx

@@ -123,6 +123,12 @@
   <metadata name="docVersionConfigBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>415, 17</value>
   </metadata>
+  <metadata name="docVersionConfigBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>415, 17</value>
+  </metadata>
+  <metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>643, 17</value>
+  </metadata>
   <data name="ppCmbxFormat.SuperTooltip" xml:space="preserve">
     <value>Allows you to specify the default format to use for all procedures in this set.
 
@@ -210,9 +216,21 @@ Check "Show Default Settings" to display the "default" duplexing setting (below
   <metadata name="bsEnhanced.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>817, 17</value>
   </metadata>
+  <metadata name="bsMiniEnhanced.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 65</value>
+  </metadata>
+  <metadata name="bsEnhanced.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>817, 17</value>
+  </metadata>
   <metadata name="bsMiniApple.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>118, 17</value>
   </metadata>
+  <metadata name="bsMiniApple.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>118, 17</value>
+  </metadata>
+  <metadata name="bsApples.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <metadata name="bsApples.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>

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

@@ -285,16 +285,22 @@ namespace VEPROMS.CSLA.Library
 		#region ROTextConvertMethods
 		// B2023-037: Handle <=, >=, +-, -> and <- symbols. Convert to unicode for output, i.e. print and edit/view (when editing
 		//   step, will show as 2 characters, not unicode, unless ro inserted when code replaced link text with unicode.
-		public static string ROConvertSymbols(string retval)
+		public static string ROConvertSymbols(string retval, bool arr1, bool arr2)
 		{
-			retval = retval.Replace("\\u8209?>", @"\u8594?"); // Right Arrow
-			retval = retval.Replace("<\\u8209?", @"\u8592?"); // Left Arrow
-			retval = retval.Replace("->", @"\u8594?"); // Right Arrow
-			retval = retval.Replace("<-", @"\u8592?"); // Left Arrow
-			retval = retval.Replace("<=", @"\u8804?"); // Less than or Equal
-			retval = retval.Replace(">=", @"\u8805?"); // Greater than or Equal
-			retval = retval.Replace("+\\u8209?", @"\'b1"); // plus minus
-			retval = retval.Replace("+-", @"\'b1"); // plus minus
+			if (arr1)
+			{ 
+				retval = retval.Replace("\\u8209?>", @"\u8594?"); // Right Arrow
+				retval = retval.Replace("<\\u8209?", @"\u8592?"); // Left Arrow
+				retval = retval.Replace("->", @"\u8594?"); // Right Arrow
+				retval = retval.Replace("<-", @"\u8592?"); // Left Arrow
+			}
+			if (arr2)
+			{
+				retval = retval.Replace("<=", @"\u8804?"); // Less than or Equal
+				retval = retval.Replace(">=", @"\u8805?"); // Greater than or Equal
+				retval = retval.Replace("+\\u8209?", @"\'b1"); // plus minus
+				retval = retval.Replace("+-", @"\'b1"); // plus minus
+			}
 			return retval;
 		}
 		#endregion
@@ -484,7 +490,7 @@ namespace VEPROMS.CSLA.Library
 			return rc;
 		}
 
-		public string GetTranslatedRoValue(string roid, bool DoCaret, bool DoDOSSuperSubScript, bool convertRoSymbols)
+		public string GetTranslatedRoValue(string roid, bool DoCaret, bool DoDOSSuperSubScript, bool convertRoSymbols, ItemInfo myiteminfo)
 		{
 			roid = FormatRoidKey(roid, true);
 
@@ -496,7 +502,13 @@ namespace VEPROMS.CSLA.Library
 			retval = ReplaceUnicode(retval, DoCaret);
 			// B2023-037: Handle <=, >=, +-, -> and <- symbols. Convert to unicode for output, i.e. print and edit/view (when editing
 			//   step, will show as 2 characters, not unicode, unless ro inserted when code replaced link text with unicode.
-			if (convertRoSymbols) retval = ROFSTLookup.ROConvertSymbols(retval);
+
+			//(_MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue ||
+			//			_MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue))
+			bool arrows1 = myiteminfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue;
+			bool arrows2 = myiteminfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue;
+
+			if (convertRoSymbols) retval = ROFSTLookup.ROConvertSymbols(retval, arrows1, arrows2);
 
 			retval = ConvertFortranFormatToScienctificNotation(retval);
 

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

@@ -225,6 +225,86 @@ namespace VEPROMS.CSLA.Library
 				throw new DbCslaException("Error on Annotation.Delete", ex);
 			}
 		}
+
+		public static void DeleteAnnotationProcByType(int typID, string procList)
+		{
+			if (!CanDeleteObject())
+				throw new System.Security.SecurityException("User not authorized to remove a Annotation");
+			try
+			{
+				DataPortal.Delete(new DeleteAnnotationProcByTypeCriteria(typID, procList));
+				AnnotationInfo.StaticOnInfoChanged();
+			}
+			catch (Exception ex)
+			{
+				System.Data.SqlClient.SqlException exSQL = SqlException(ex);
+				if (exSQL != null && exSQL.Message.Contains("###Cannot Delete Item###"))
+					throw exSQL;
+				Console.WriteLine("AnnotationExt: Stacktrace = {0}", ex.StackTrace);
+				throw new DbCslaException("Error on Annotation.Delete", ex);
+			}
+		}
+
+		public static void DeleteAnnotationDocvByType(int typID, string versionID)
+		{
+			if (!CanDeleteObject())
+				throw new System.Security.SecurityException("User not authorized to remove a Annotation");
+			try
+			{
+				DataPortal.Delete(new DeleteAnnotationDocvByTypeCriteria(typID, versionID));
+				AnnotationInfo.StaticOnInfoChanged();
+			}
+			catch (Exception ex)
+			{
+				System.Data.SqlClient.SqlException exSQL = SqlException(ex);
+				if (exSQL != null && exSQL.Message.Contains("###Cannot Delete Item###"))
+					throw exSQL;
+				Console.WriteLine("AnnotationExt: Stacktrace = {0}", ex.StackTrace);
+				throw new DbCslaException("Error on Annotation.Delete", ex);
+			}
+		}
+
+		public static int getAnnotationProcCnt(int typID, string procList)
+		{
+			if (!CanGetObject())
+				throw new System.Security.SecurityException("User not authorized to remove a Annotation");
+			try
+			{
+				Annotation ProcCnt  = DataPortal.Fetch<Annotation>(new getAnnotationCountProcCriteria(typID, procList));
+				AnnotationInfo.StaticOnInfoChanged();
+				return Annotation.ProcCnt;
+				//return Int32.Parse(ProcCnt);
+			}
+			catch (Exception ex)
+			{
+				System.Data.SqlClient.SqlException exSQL = SqlException(ex);
+				if (exSQL != null && exSQL.Message.Contains("###Cannot retrieve Item###"))
+					throw exSQL;
+				Console.WriteLine("AnnotationExt: Stacktrace = {0}", ex.StackTrace);
+				throw new DbCslaException("Error on getAnnotationCountProcCriteria", ex);
+			}
+		}
+
+		public static int getAnnotationCountDocv(int typID, string procList)
+		{
+			if (!CanGetObject())
+				throw new System.Security.SecurityException("User not authorized to remove a Annotation");
+			try
+			{
+				Annotation DocvCnt = DataPortal.Fetch<Annotation>(new getAnnotationCountDocvCriteria(typID, procList));
+				AnnotationInfo.StaticOnInfoChanged();
+				return Annotation.DocvCnt;
+			}
+			catch (Exception ex)
+			{
+				System.Data.SqlClient.SqlException exSQL = SqlException(ex);
+				if (exSQL != null && exSQL.Message.Contains("###Cannot retrieve Item###"))
+					throw exSQL;
+				Console.WriteLine("AnnotationExt: Stacktrace = {0}", ex.StackTrace);
+				throw new DbCslaException("Error on getAnnotationCountDocvCriteria", ex);
+			}
+		}
+
 		private static System.Data.SqlClient.SqlException SqlException(Exception ex)
 		{
 			Type sqlExType = typeof(System.Data.SqlClient.SqlException);
@@ -280,12 +360,209 @@ namespace VEPROMS.CSLA.Library
 				throw new DbCslaException("Item.DataPortal_Delete", ex);
 			}
 		}
+
+		[Serializable()]
+		protected class DeleteAnnotationProcByTypeCriteria
+		{
+			private int _typeID;
+			public int TypeID
+			{ get { return _typeID; } }
+
+			private string _procList;
+			public string ProcList
+			{ get { return _procList; } }
+			public DeleteAnnotationProcByTypeCriteria(int typeID, string procList)
+			{
+				_typeID = typeID;
+				_procList = procList;
+			}
+		}
+		[Transactional(TransactionalTypes.TransactionScope)]
+		private void DataPortal_Delete(DeleteAnnotationProcByTypeCriteria criteria)
+		{
+			if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] Item.DataPortal_Delete", GetHashCode());
+			try
+			{
+				using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+				{
+					using (SqlCommand cm = cn.CreateCommand())
+					{
+						cm.CommandType = CommandType.StoredProcedure;
+						cm.CommandTimeout = Database.SQLTimeout;
+						cm.CommandText = "deleteAnnotationsProcByType";
+						cm.Parameters.AddWithValue("@typeid", criteria.TypeID);
+						cm.Parameters.AddWithValue("@procList", criteria.ProcList);
+						cm.ExecuteNonQuery();
+					}
+				}
+			}
+			catch (Exception ex)
+			{
+				if (_MyLog.IsErrorEnabled) _MyLog.Error("Item.DataPortal_Delete", ex);
+				_ErrorMessage = ex.Message;
+				throw new DbCslaException("Item.DataPortal_Delete Annotations by group", ex);
+			}
+		}
+
+		[Serializable()]
+		protected class DeleteAnnotationDocvByTypeCriteria
+		{
+			private int _typeID;
+			public int TypeID
+			{ get { return _typeID; } }
+
+			private string _versionID;
+			public string VersionID
+			{ get { return _versionID; } }
+			public DeleteAnnotationDocvByTypeCriteria(int typeID, string versionID)
+			{
+				_typeID = typeID;
+				_versionID = versionID;
+			}
+		}
+		[Transactional(TransactionalTypes.TransactionScope)]
+		private void DataPortal_Delete(DeleteAnnotationDocvByTypeCriteria criteria)
+		{
+			if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] Delete Annotations by Type Docv", GetHashCode());
+			try
+			{
+				using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+				{
+					using (SqlCommand cm = cn.CreateCommand())
+					{
+						cm.CommandType = CommandType.StoredProcedure;
+						cm.CommandTimeout = Database.SQLTimeout;
+						cm.CommandText = "deleteAnnotationsDocvByType";
+						cm.Parameters.AddWithValue("@typeid", criteria.TypeID);
+						cm.Parameters.AddWithValue("@docvList", criteria.VersionID);
+						cm.ExecuteNonQuery();
+					}
+				}
+			}
+			catch (Exception ex)
+			{
+				if (_MyLog.IsErrorEnabled) _MyLog.Error("Item.DataPortal_Delete", ex);
+				_ErrorMessage = ex.Message;
+				throw new DbCslaException("Item.DataPortal_Delete Annotations by type Docv", ex);
+			}
+		}
+
+		private static int _procCnt;
+		public static int ProcCnt
+		{
+			get { return _procCnt; }
+			set { _procCnt = value; }
+		}
+
+		[Serializable()]
+		protected class getAnnotationCountProcCriteria
+		{
+			private int _procCnt;
+			public int ProcCnt
+			{ get { return _procCnt; }
+			  set { _procCnt = value; }
+			}
+			private int _typeID;
+			public int TypeID
+			{ get { return _typeID; } }
+			private string _procList;
+			public string ProcList
+			{ get { return _procList; } }
+			public getAnnotationCountProcCriteria(int typeID, string procList, int procCnt = 0)
+			{
+				_typeID = typeID;
+				_procList = procList;
+				_procCnt = procCnt;
+			}
+		}
+
+		[Transactional(TransactionalTypes.TransactionScope)]
+		private getAnnotationCountProcCriteria DataPortal_Fetch(getAnnotationCountProcCriteria criteria)
+		{
+			if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] Item.DataPortal_Fetch", GetHashCode());
+			try
+			{
+				//int ProcCnt;
+				using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+				{
+					using (SqlCommand cm = cn.CreateCommand())
+					{
+						cm.CommandType = CommandType.StoredProcedure;
+						cm.CommandTimeout = Database.SQLTimeout;
+						cm.CommandText = "getAnnotationProcCount";						
+						cm.Parameters.AddWithValue("@procList", criteria.ProcList);
+						cm.Parameters.AddWithValue("@typeid", criteria.TypeID);
+						Annotation.ProcCnt = (int)cm.ExecuteScalar();
+
+					}
+				}
+				return criteria; //_procCnt.ToString();
+			}
+			catch (Exception ex)
+			{
+				if (_MyLog.IsErrorEnabled) _MyLog.Error("Annotation.GetAnnotationProcCnt", ex);
+				_ErrorMessage = ex.Message;
+				throw new DbCslaException("Annotation.GetAnnotationProcCnt by group", ex);
+			}
+		}
+
+		private static int _docvCnt;
+		public static int DocvCnt
+		{ get { return _docvCnt; } 
+		set { _docvCnt = value; }
+		}
+
+		[Serializable()]
+		protected class getAnnotationCountDocvCriteria
+		{
+			private int _docvCnt;
+			public int DocvCnt
+			{ get { return _docvCnt; }
+			  set { _docvCnt = value; }
+			}
+			private int _TypeID;
+			public int TypeID
+			{ get { return _TypeID; } }
+			private string _docvList;
+			public string DocvList
+			{ get { return _docvList; } }
+			public getAnnotationCountDocvCriteria(int typeID, string docvList, int docvCnt = 0)
+			{
+				_TypeID = typeID;
+				_docvList = docvList;
+				_docvCnt = docvCnt;
+			}
+		}
+
+		[Transactional(TransactionalTypes.TransactionScope)]
+		private getAnnotationCountDocvCriteria DataPortal_Fetch(getAnnotationCountDocvCriteria criteria)
+		{
+			if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] Annotation.DataPortal_Fetch", GetHashCode());
+			try
+			{
+				//int ProcCnt;
+				using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+				{
+					using (SqlCommand cm = cn.CreateCommand())
+					{
+						cm.CommandType = CommandType.StoredProcedure;
+						cm.CommandTimeout = Database.SQLTimeout;
+						cm.CommandText = "getAnnotationDocvCount";
+						cm.Parameters.AddWithValue("@typeid", criteria.TypeID);
+						cm.Parameters.AddWithValue("@DocvList", criteria.DocvList);
+						Annotation.DocvCnt = (int)cm.ExecuteScalar();
+					}
+					return criteria;
+				}
+			}
+			catch (Exception ex)
+			{
+				if (_MyLog.IsErrorEnabled) _MyLog.Error("Item.DataPortal_Delete", ex);
+				_ErrorMessage = ex.Message;
+				throw new DbCslaException("Item.DataPortal_Delete Annotations by group", ex);
+			}
+		}
 	}
-	//public partial class AnnotationTypeAnnotations
-	//{
-	//   public static int GetAnnotationID()
-	//   {
-	//      return AnnotationTypeAnnotat
-	//   }
-	//}
 }
+
+

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

@@ -1616,7 +1616,7 @@ namespace VEPROMS.CSLA.Library
 						foreach (ContentRoUsage ro in cont.ContentRoUsages)
 						{
 							RoUsageInfo rou = RoUsageInfo.Get(ro.ROUsageID);
-							string myvalue = mylookup.GetTranslatedRoValue(rou.ROID, tmp.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, tmp.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false);
+							string myvalue = mylookup.GetTranslatedRoValue(rou.ROID, tmp.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, tmp.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false, tmp);
 							
 							ROFSTLookup.rochild rocc = mylookup.GetRoChild(rou.ROID);
 							
@@ -1844,7 +1844,7 @@ namespace VEPROMS.CSLA.Library
 						ROFSTLookup mylookup = myRoFst.GetROFSTLookup(tmp.ContentItems[0].MyProcedure.MyDocVersion);
 						foreach (RoUsageInfo rou in tmp.ContentRoUsages)
 						{
-							string myvalue = mylookup.GetTranslatedRoValue(rou.ROID, tmp.ContentItems[0].ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, tmp.ContentItems[0].ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false);
+							string myvalue = mylookup.GetTranslatedRoValue(rou.ROID, tmp.ContentItems[0].ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, tmp.ContentItems[0].ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false, tmp.ContentItems[0]);
 							ROFSTLookup.rochild rocc = mylookup.GetRoChild(rou.ROID);
 							int mytype = rocc.type;
 							ctmp.FixContentText(rou, myvalue, mytype, myRoFst);

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

@@ -468,10 +468,12 @@ namespace VEPROMS.CSLA.Library
 			return text;
 		}
 		// B2022-035: resolve unit specific designators - moved code to here so that other objects can use it
+		// B2024-025 added <ID> to the replace list
 		public static string ResolveUnitSpecific(DocVersionInfo mydocversion, string text)
 		{
 			if (mydocversion == null) return text;
 			text = Regex.Replace(text, @"\<U\>", mydocversion.DocVersionConfig.Unit_Number, RegexOptions.IgnoreCase);
+			text = Regex.Replace(text, @"\<ID\>", mydocversion.DocVersionConfig.Unit_ID, RegexOptions.IgnoreCase);
 			text = Regex.Replace(text, @"\<(U(-|\\u8209\?)ID)\>", mydocversion.DocVersionConfig.Unit_ID, RegexOptions.IgnoreCase);
 			text = Regex.Replace(text, @"\<(U(-|\\u8209\?)NAME)\>", mydocversion.DocVersionConfig.Unit_Name, RegexOptions.IgnoreCase);
 			text = Regex.Replace(text, @"\<(U(-|\\u8209\?)TEXT)\>", mydocversion.DocVersionConfig.Unit_Text, RegexOptions.IgnoreCase);
@@ -694,10 +696,12 @@ namespace VEPROMS.CSLA.Library
 					// B2017-147: backquotes should be translated to degrees for edit/print:
 					newvalue = newvalue.Replace("`", @"\'b0");
 					// B2023-037: Handle <=, >=, +-, -> and <- symbols. If the format has flags to convert these RO symbols, it
+					bool arrows1 = _MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue;
+					bool arrows2 = _MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue;
 					//	is done here so that output (print & edit/view) has symbol, not 2 characters.
-					if (_MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue ||
-						_MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue)
-						newvalue = ROFSTLookup.ROConvertSymbols(newvalue);
+					if (!_MyItemInfo.IsTable && (_MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue ||
+						_MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue))
+						newvalue = ROFSTLookup.ROConvertSymbols(newvalue, arrows1, arrows2);
 
 					if (gg != newvalue)
 						text = text.Substring(0, myIndex) + newvalue + text.Substring(myIndex + myLength);

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

@@ -908,7 +908,7 @@ namespace VEPROMS.CSLA.Library
 					{
 						string oldText = this.MyContent.Text;
 
-						string roval = lookup.GetTranslatedRoValue(rousage.ROID, this.ActiveSection.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, this.ActiveSection.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false);
+						string roval = lookup.GetTranslatedRoValue(rousage.ROID, this.ActiveSection.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, this.ActiveSection.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false, this);
 						ROFSTLookup.rochild roch = lookup.GetRoChild(rousage.ROID);
 						
 						this.MyContent.FixContentText(rousage, roval, roch.type, rofstinfo, this);
@@ -964,7 +964,7 @@ namespace VEPROMS.CSLA.Library
 						ROCheckCount++;
 						string oldText = itemInfo.MyContent.Text;
 
-						string roval = lookup.GetTranslatedRoValue(rousage.ROID, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false);
+						string roval = lookup.GetTranslatedRoValue(rousage.ROID, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false, sectionInfo);
 						ROFSTLookup.rochild roch = lookup.GetRoChild(rousage.ROID);
 
 						itemInfo.MyContent.FixContentText(rousage, roval, roch.type, origROFst, itemInfo);
@@ -1184,7 +1184,10 @@ namespace VEPROMS.CSLA.Library
 						if (sectionInfo != null)
 						{
 							// B2023-037: loading print text, resolve the RO symbols 
-							string roval = lookup.GetTranslatedRoValue(rousage.ROID, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues,sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue|| sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue);
+
+							bool GTLT = !itemInfo.IsTable && sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue;
+							bool GLTArrows = !itemInfo.IsTable &&  sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue;
+							string roval = lookup.GetTranslatedRoValue(rousage.ROID, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta,    sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, GTLT || GLTArrows, itemInfo);
 							ROFSTLookup.rochild roch = lookup.GetRoChild(rousage.ROID);
 							itemInfo.MyContent.FixContentText(rousage, roval, roch.type, rofstinfo, itemInfo);
 						}
@@ -2931,8 +2934,22 @@ namespace VEPROMS.CSLA.Library
 			{
 				string str = MyContent.Text;
 				// B2022-035: resolve unit specific designators 
-				if (str.ToUpper().Contains(@"<U")) str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(this.MyDocVersion, str);
-				return ConvertToDisplayText(str, false);
+				// B2024-025 - process all of the applicability token (<U-xxx>, <U>, <ID>)
+				str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(this.MyDocVersion, str);
+				return ConvertToDisplayText(str, false, " "); // B2024-013 added " " to replace hard returns with a space instead of semi-colon
+			}
+		}
+		// B2024-013 added for Vogtle Units 3 & 4, used with {TOPSECTIONTITLE} pagelist item
+		//           this will format the text and keep the hard return command
+		public string FormattedDisplayTextKeepHardReturn
+		{
+			get
+			{
+				string str = MyContent.Text;
+				// B2022-035: resolve unit specific designators 
+				// B2024-025 - process all of the applicability token (<U-xxx>, <U>, <ID>)
+				str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(this.MyDocVersion, str);
+				return ConvertToDisplayText(str, false, ""); // pass in empty string for hard retun char will keep hard return
 			}
 		}
 		// Used in Comanche Peak EOP and Flex formats for step designators. Will allow a hard return to be used that that caution type.
@@ -2945,7 +2962,8 @@ namespace VEPROMS.CSLA.Library
 				string str = MyContent.Text;
 				if (MyDocVersion != null)
 				{
-					str = Regex.Replace(str, @"\<[uU]\>", MyDocVersion.DocVersionConfig.Unit_Number);
+					// B2024-025 - process all of the applicability token (<U-xxx>, <U>, <ID>)
+					str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(MyDocVersion, str);
 				}
 				else
 				{
@@ -2964,16 +2982,13 @@ namespace VEPROMS.CSLA.Library
 				if (MyDocVersion != null)
 				{
 					// B2022-035: resolve unit specific designators 
-					if (str.ToUpper().Contains("<U")) str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(MyDocVersion, str);
+					// B2024-025 - process all of the applicability token (<U-xxx>, <U>, <ID>)
+					str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(MyDocVersion, str);
 				}
 				else
 				{
 					_MyLog.WarnFormat("Disconnected Data - ItemID = {0}", ItemID);
 				}
-				//if (str.Contains("<u>"))
-				//  str = str.Replace("<u>", MyDocVersion.DocVersionConfig.Unit_Number);
-				//if (str.Contains("<U>"))
-				//  str = str.Replace("<U>", MyDocVersion.DocVersionConfig.Unit_Number);
 				return ConvertToDisplayText(str);
 			}
 		}
@@ -3032,7 +3047,8 @@ namespace VEPROMS.CSLA.Library
 				string str = MyContent.Text;
 				if (MyDocVersion != null)
 				{
-					str = Regex.Replace(str, @"\<[uU]\>", MyDocVersion.DocVersionConfig.Unit_Number);
+					// B2024-025 - process all of the applicability token (<U-xxx>, <U>, <ID>)
+					str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(MyDocVersion, str);
 				}
 				else
 				{
@@ -3065,8 +3081,8 @@ namespace VEPROMS.CSLA.Library
 					}
 					else
 						str = MyContent.Number;
-					str = Regex.Replace(str, @"\<U-ID\>", MyDocVersion.DocVersionConfig.Unit_ID, RegexOptions.IgnoreCase);
-					str = Regex.Replace(str, @"\<ID\>", MyDocVersion.DocVersionConfig.Unit_ID, RegexOptions.IgnoreCase);
+					// B2024-025 - process all of the applicability token (<U-xxx>, <U>, <ID>)
+					str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(MyDocVersion, str);
 				}
 				else
 				{
@@ -3079,7 +3095,9 @@ namespace VEPROMS.CSLA.Library
 				//  str = str.Replace(@"<S\u8209?ID>", MyDocVersion.DocVersionConfig.Unit_ID);
 				str = ConvertToDisplayText(str);
 				if (MyDocVersion != null) // B2020-086 check for null doc version - happens if item we are trying to open is no longer there (disconnected)
-					str = Regex.Replace(str, @"\<[uU]\>", MyDocVersion.DocVersionConfig.Unit_Number); // B2017-019 - process "<u>" in section number
+					// B2017-019 - process "<u>" in section number
+					// B2024-025 - process all of the applicability token (<U-xxx>, <U>, <ID>)
+					str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(MyDocVersion, str);
 				return str;
 			}
 			//get { return ConvertToDisplayText(MyContent.Number); }
@@ -3109,7 +3127,12 @@ namespace VEPROMS.CSLA.Library
 			return ConvertToDisplayText(txt, true);
 		}
 
-		public static string ConvertToDisplayText(string txt, bool stripRTF)
+		// B2024-013  This allos us to control "what with" or "whether to" replace hard returns
+		//            Semi-colons where printing on auto table of contents for section titles with hard returns
+		//            added HardReturnChar string to parameter. The default is to use the semi-colon, for auto table of contents 
+		//            we replace it with a space, for Vogtle Unit 3 & 4 we retain the hard return when printing the section
+
+		public static string ConvertToDisplayText(string txt, bool stripRTF, string HardReturnChar = ";")
 		{
 			string retval = txt;
 
@@ -3120,9 +3143,12 @@ namespace VEPROMS.CSLA.Library
 				retval = ReplaceSpecialCharacters(retval);
 				retval = retval.Replace("\u2011", "-");
 				retval = retval.Replace("\u2572", @"\"); // replace backslash symbol with a backslash
-				retval = Regex.Replace(retval, @"\\line ?", ";"); // better handing of hard returns - replace with semi-colon for use on tree view
-				retval = retval.Replace("\r\n", ";");
-				retval = retval.Replace("\n", ";"); //added for consistency checking with approved version
+				if (HardReturnChar != "") // B2024-013 if a null string don't replace the hard return
+				{
+					retval = Regex.Replace(retval, @"\\line ?", HardReturnChar); // better handing of hard returns - replace with semi-colon for use on tree view
+					retval = retval.Replace("\r\n", HardReturnChar);
+					retval = retval.Replace("\n", HardReturnChar); //added for consistency checking with approved version
+				}
 			}
 
 			return retval;
@@ -4420,7 +4446,7 @@ namespace VEPROMS.CSLA.Library
 				// F2018-025 Westinghouse when a high level step is used as a section number/title, 
 				//           adjust the step/substep numbering where the first level substep uses the high level step tabbing format
 				//           and the following sub-substeps tabbing format are "shifted" accordingly (ex should look like ASS-101 Attachment 1 section 4 tabbing)
-					if (!IsHigh && MyHLS != null && MyHLS.FormatStepData.AppendDotZero)
+				if (!IsHigh && MyHLS != null && MyHLS.FormatStepData.AppendDotZero)
 				{
 					if (localPrintLevel > 1)
 					{
@@ -4428,7 +4454,14 @@ namespace VEPROMS.CSLA.Library
 						itmp = (localPrintLevel + PrintBias + OffsetTab) % seqtabs.MaxIndex;
 					}
 				}
-					if (!tbformat.Contains(@"{!C"))
+				// F2024-037 reset the seq sub-step numbering if the parent is an un-numbered high level step
+				// F2024-049 changed to specify the level via the format file (Generic EOP and Vogtle 3&4)
+				else if (sd.StepSectionLayoutData.ResetSeqNumberingAfterUnnumberedHLS != null && IsSequential && MyParent != null && MyParent.IsHigh && MyParent.MyTab.Text.Length == 0)
+				{
+					localPrintLevel = (int)sd.StepSectionLayoutData.ResetSeqNumberingAfterUnnumberedHLS;
+					itmp = (localPrintLevel + PrintBias + OffsetTab) % seqtabs.MaxIndex;
+				}
+				if (!tbformat.Contains(@"{!C"))
 							tbformat = seqtabs[itmp].PrintTabFormat;  // seqtab in 16bit, i.e. '. or )' etc.
 					else
 							tbformat = tbformat.Replace("{seq}", seqtabs[itmp].PrintTabFormat);
@@ -4536,6 +4569,7 @@ namespace VEPROMS.CSLA.Library
 			}
 			bool isAlpha = tbformat.ToUpper().Contains("ALPHA");
 			int ordinal = Ordinal;
+			bool trimSeqValue = FormatStepData.TabData.TrimSeqTabValue; // F2024-043 remove space around SEQ tab value
 			bool useLinked = false;		// if this is enhanced, and the LinkedTab isn't numeric, flag to use 'LinkedTab' for the tab.
 			if (ActiveSection != null && ActiveSection.IsEnhancedSection) // C2018-003 fixed use of getting the active section
 			{
@@ -4567,6 +4601,7 @@ namespace VEPROMS.CSLA.Library
 				tbformat = tbformat.Replace("{numeric}", LinkedTab.Trim(" .".ToCharArray()).PadLeft(2));
 			}
 			string alpha = useLinked?LinkedTab.Trim():AlphabeticalNumbering(ordinal);
+			if (trimSeqValue) alpha = alpha.Trim(); // F2024-043 trim white around SEQ tab value (for sub-steps)
 			// B2017-211 Roman High Level steps should be followed by Uppercase alpha substeps - This is being limited to Calvert SAMG Format
 			if (_ActiveFormat.Name =="BGESAM1" &&MyParent != null && MyParent.IsHigh && MyParent.IsStep && MyParent.FormatStepData.TabData.IdentEdit.Contains("ROMAN"))
 				tbformat = tbformat.Replace("{alpha}", alpha);
@@ -4609,7 +4644,8 @@ namespace VEPROMS.CSLA.Library
 				tbformat = tbformat.Replace("{numeric}", stpTab);
 			}
 			else
-				tbformat = tbformat.Replace("{numeric}", trimTabStart ? ordinal.ToString() : FormatStepData.AtLeastTwoDigits ? ordinal.ToString().PadLeft(2, '0') : ordinal.ToString().PadLeft(2));
+				// F2024-043  added trimSeqValue to trim white around SEQ tab value (for sub-steps)
+				tbformat = tbformat.Replace("{numeric}", (trimTabStart || trimSeqValue) ? ordinal.ToString() : FormatStepData.AtLeastTwoDigits ? ordinal.ToString().PadLeft(2, '0') : ordinal.ToString().PadLeft(2));
 			if (tbformate != null)
 			{
 				if (useLinked)