UI work and preliminary work on delete process for folders and UI for annotations

passed code review. 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

@@ -59,6 +59,13 @@ namespace VEPROMS
 			get { return _Automatic; }
 			set { _Automatic = value; }
 		}
+		private int _prtSectID = -1;
+		public int PrtSectID
+		{
+			get { return _prtSectID; }
+			set { _prtSectID = value; }
+		}
+
 
 		// C2018-033 Used to turn off using the date/time PDF file prefix and suffix when doing batch file autmatic baseline print testing (frmVEPROMS.cs RunAutomatic())
 		//           This is needed so the the automatic baselines can compare results from different runs of PROMS
@@ -768,7 +775,7 @@ namespace VEPROMS
 							// B2021-102 put in the using for better memory management
 							using (frmPDFStatusForm frmStatus = new frmPDFStatusForm(MyProcedure, RevNumAndDate, waterMarkText, cbxDebug.Checked, cbxOrPgBrk.Checked,
 								cbxOpenAfterCreate2.Checked, cbxOverwritePDF2.Checked, myPDFPath, cbd, txbPDFName.Text, new Point(Left, Bottom - 50),
-								swtbtnBlankPgsForDuplex.Value, _AllProcedures || Automatic, Prefix, SaveLinks, RemoveTrailingHardReturnsAndManualPageBreaks, swtbtnPROMSVersion.Value, true, tbBlankPage.Text, _MergedPfd, watermarkColor))//;//C2018-009 print PROMS version
+								swtbtnBlankPgsForDuplex.Value, _AllProcedures || Automatic, Prefix, SaveLinks, RemoveTrailingHardReturnsAndManualPageBreaks, swtbtnPROMSVersion.Value, true, tbBlankPage.Text, _MergedPfd, watermarkColor, PrtSectID))//;//C2018-009 print PROMS version
 							{
 								frmStatus.CloseWhenDone = true;
 								Application.DoEvents();
@@ -849,8 +856,9 @@ namespace VEPROMS
 						// B2016-249 Output Procedure to folder associated with Parent Child
 						using (frmPDFStatusForm frmStatus = new frmPDFStatusForm(MyProcedure, RevNumAndDate, waterMarkText, cbxDebug.Checked,
 							cbxOrPgBrk.Checked, cbxOpenAfterCreate2.Checked, cbxOverwritePDF2.Checked, GetMultiunitPDFPath(), cbd, txbPDFName.Text,
-							new Point(Left, Bottom - 50), swtbtnBlankPgsForDuplex.Value, _AllProcedures || Automatic, Prefix, SaveLinks, RemoveTrailingHardReturnsAndManualPageBreaks, swtbtnPROMSVersion.Value, true, tbBlankPage.Text, _MergedPfd, watermarkColor)) // ;//C2018-009 print PROMS version
+							new Point(Left, Bottom - 50), swtbtnBlankPgsForDuplex.Value, _AllProcedures || Automatic, Prefix, SaveLinks, RemoveTrailingHardReturnsAndManualPageBreaks, swtbtnPROMSVersion.Value, true, tbBlankPage.Text, _MergedPfd, watermarkColor, PrtSectID)) // ;//C2018-009 print PROMS version
 						{
+							frmStatus.PrtSectID = PrtSectID;
 							frmStatus.CloseWhenDone = true;
 							Application.DoEvents();
 							frmStatus.CancelStop = true;
@@ -1001,7 +1009,7 @@ namespace VEPROMS
 			// B2018-124 use text of watermark form drop down list instead of enum value
 			using (frmPDFStatusForm frmStatus = new frmPDFStatusForm(MyProcedure, RevNumAndDate, waterMarkText, cbxDebug.Checked, cbxOrPgBrk.Checked,
 				cbxOpenAfterCreate2.Checked, cbxOverwritePDF2.Checked, GetMultiunitPDFPath(), cbd, txbPDFName.Text, new Point(Left, Bottom - 50),
-				swtbtnBlankPgsForDuplex.Value, _AllProcedures || Automatic, Prefix, SaveLinks, RemoveTrailingHardReturnsAndManualPageBreaks, swtbtnPROMSVersion.Value, false, tbBlankPage.Text, _MergedPfd, watermarkColor))//; //C2018-009 print PROMS version
+				swtbtnBlankPgsForDuplex.Value, _AllProcedures || Automatic, Prefix, SaveLinks, RemoveTrailingHardReturnsAndManualPageBreaks, swtbtnPROMSVersion.Value, false, tbBlankPage.Text, _MergedPfd, watermarkColor, PrtSectID))//; //C2018-009 print PROMS version
 			{
 				frmStatus.MakePlaceKeeper = swtbtnGeneratePlacekeeper.Value;
 				frmStatus.MakeContinuousActionSummary = cbxGenerateConActSum.Checked;

PROMS/VEPROMS User Interface/PROMSFixes.Sql

@@ -22148,8 +22148,84 @@ AS
 		[Folders].[FormatID]=@FormatID
 
 	RETURN
+	GO
 
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[vesp_ListUnlinkedItems]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
+	DROP PROCEDURE [vesp_ListUnlinkedItems];
+GO
+	
+	/*****************************************************************************
+	   Volian Enterprises - Proprietary Information - DO NOT COPY OR DISTRIBUTE
+		   Copyright 2024 - Volian Enterprises, Inc. All rights reserved.
+	*****************************************************************************/
+	/*
+	==========================================================================================================
+	 Author:		Kathy Ruffing
+	 Create Date:	03/27/2024
+	 Description:	B2024-018: Gets list of procedures/sections/steps for possible enhanced linking
+	==========================================================================================================
+	 */
+Create Procedure[dbo].[vesp_ListUnlinkedItems]
+(
+	@ItemID int,
+	@EnhType int
+)
+WITH EXECUTE AS OWNER
+AS
+BEGIN 
+DECLARE @ParItemID int
+	DECLARE @EItemID int
+	set @EItemID = (select top 1 VIS.EItemID from vefn_AllSiblingItems(@ItemID)--Find All Siblings 
+	outer apply vefn_GetNewEnhancedData(ItemID,@EnhType) VIS -- That are Linked
+	where EitemID is not null)
 
+	if @EItemID is null
+	BEGIN
+		select @EItemID = epp.ItemID  
+			from (select * from Parts where ItemID in(select itemID from vefn_AllSiblingItems(@ItemID)))SPP -- FindParent
+			JOIN  ITEMS SII ON sPP.ContentID = sII.ContentID -- Get Parent Content ID
+			outer apply vefn_GetNewEnhancedData(SII.ItemID,@EnhType) VIS -- Get Enhanced ID for Parent
+			JOIN ITEMS EII ON VIS.EItemID = EII.ItemID -- Get Enhanced Parent Content ID 
+			JOIN PARTS EPP ON EPP.ContentID = EII.ContentID and SPP.FromType = epp.FromType -- Get first Child
+	END
+	if @EItemID is null	-- B2024-018: If not found at the current level, check at the parent level
+	BEGIN
+	
+		select @ParItemID = dbo.ve_getparentitem(@ItemID)
+		select @EItemID = epp.ItemID  
+			from (select * from Parts where ItemID in(select itemID from vefn_AllSiblingItems(@ParItemID)))SPP -- FindParent
+			JOIN  ITEMS SII ON sPP.ContentID = sII.ContentID -- Get Parent Content ID
+			outer apply vefn_GetNewEnhancedData(SII.ItemID,@EnhType) VIS -- Get Enhanced ID for Parent
+			JOIN ITEMS EII ON VIS.EItemID = EII.ItemID -- Get Enhanced Parent Content ID 
+			JOIN PARTS EPP ON EPP.ContentID = EII.ContentID --and SPP.FromType = epp.FromType (had to remove types may be proc/sect) 
+	
+	END
+	if @EItemID is null
+	BEGIN
+		select @EItemID = DV2.ItemID from (select *,cast(config as xml) xconfig from DocVersions 
+		where ItemID in(select itemID from vefn_AllSiblingItems(@ItemID))) SDV -- Source DocVersion
+		cross apply (select * from vefn_GetEnhancedDocVersions(SDV.VersionID) where @EnhType = Type) EDV -- Enhanced DocVersion
+		Join DocVersions DV2 ON DV2.VersionID = EDV.VersionID -- First Procedure
+	END
+	Select ItemID,PreviousID,II.ContentID,II.[DTS],II.[UserID],II.[LastChanged],
+		(SELECT COUNT(*) FROM [Annotations] WHERE [Annotations].[ItemID]=[II].[ItemID]) [AnnotationCount],
+		(SELECT COUNT(*) FROM [DocVersions] WHERE [DocVersions].[ItemID]=[II].[ItemID]) [DocVersionCount],
+		(SELECT COUNT(*) FROM [Items] [Children] WHERE [Children].[PreviousID]=[II].[ItemID]) [NextCount],
+		(SELECT COUNT(*) FROM [Parts] WHERE [Parts].[ItemID]=[II].[ItemID]) [PartCount],
+		(SELECT COUNT(*) FROM [Transitions] WHERE [Transitions].[RangeID]=[II].[ItemID]) [Transition_RangeIDCount],
+		(SELECT COUNT(*) FROM [Transitions] WHERE [Transitions].[ToID]=[II].[ItemID]) [Transition_ToIDCount]
+		from Items II 
+		Left Join Entries EE ON II.ContentID = EE.ContentID	
+		where ItemID In (select SIB.ItemID from vefn_AllSiblingItems(@EItemID) SIB 
+		outer apply vefn_GetNewEnhancedData(ItemID,0) VIE
+		Where VIE.EItemID is null)
+		and EE.ContentID is null
+END
+Go
+
+	IF (@@Error = 0) PRINT 'Procedure Creation: [vesp_ListUnlinkedItems] Succeeded'
+	ELSE PRINT 'Procedure Creation: [vesp_ListUnlinkedItems] Error on Creation'
+	GO
 -----------------------------------------------------------------------------
 /*
   ---------------------------------------------------------------------------
@@ -22184,8 +22260,8 @@ BEGIN TRY -- Try Block
 	DECLARE @RevDate varchar(255)
 	DECLARE @RevDescription varchar(255)
 
-	set @RevDate = '10/03/2023 11:00 AM'
-	set @RevDescription = 'C2023-017: Added logic to filter the format list when selecting a format to be applied to a section'
+	set @RevDate = '03/27/2024 11:00 AM'
+	set @RevDescription = 'B2024-018: Enhanced link issue with sub-sections in source but not in enhanced'
 
 	Select  cast(@RevDate as datetime) RevDate, @RevDescription  RevDescription
 	PRINT 'SQL Code Revision ' + @RevDate + ' - ' + @RevDescription

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,7 @@
     <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.C1FlexGrid.2, Version=2.0.20213.532, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL" />
     <Reference Include="Csla">
       <HintPath>..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll</HintPath>
     </Reference>
@@ -139,6 +134,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>
@@ -427,6 +423,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;
@@ -4173,7 +4216,19 @@ namespace VEPROMS
 							
 							if (glookFor != greplaceWith)
 							{
-								content.MyGrid.Data = content.MyGrid.Data.Replace(glookFor, greplaceWith);
+								// B2024-011: For unit RO in grid, old grid data had the ROID in the #Link:ReferencedObject ending in '0000'
+								//	so when compared with the newer format "0041" it was not found and not replaced with updated rousageid
+								bool hasNewROID = (content.MyGrid.Data.Contains(glookFor));
+								if (hasNewROID)
+									content.MyGrid.Data = content.MyGrid.Data.Replace(glookFor, greplaceWith);
+								else if (!hasNewROID && glookFor.Contains("0041") && glookFor.Contains("FFFF"))
+								{
+									string newGlookFor = glookFor;
+									newGlookFor = newGlookFor.Replace("0041", "0000");
+									if (content.MyGrid.Data.Contains(newGlookFor)) 
+										content.MyGrid.Data = content.MyGrid.Data.Replace(newGlookFor, greplaceWith);
+
+								}
 							}
 						}
 					}

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/frmBatchRefresh.Designer.cs

@@ -52,6 +52,24 @@
 			this.expandableSplitter1 = new DevComponents.DotNetBar.ExpandableSplitter();
 			this.panelEx1 = new DevComponents.DotNetBar.PanelEx();
 			this.sideNav1 = new DevComponents.DotNetBar.Controls.SideNav();
+			this.sideNavPanel4 = new DevComponents.DotNetBar.Controls.SideNavPanel();
+			this.swDeleteFolder = new DevComponents.DotNetBar.Controls.SwitchButton();
+			this.labelX13 = new DevComponents.DotNetBar.LabelX();
+			this.swDeleteAnnotations = new DevComponents.DotNetBar.Controls.SwitchButton();
+			this.labelX14 = new DevComponents.DotNetBar.LabelX();
+			this.myTVdel = new System.Windows.Forms.TreeView();
+			this.btnDeleteItems = new DevComponents.DotNetBar.ButtonX();
+			this.sideNavPanel3 = new DevComponents.DotNetBar.Controls.SideNavPanel();
+			this.swCheckROLinks = new DevComponents.DotNetBar.Controls.SwitchButton();
+			this.labelX12 = new DevComponents.DotNetBar.LabelX();
+			this.warningBox5 = new DevComponents.DotNetBar.Controls.WarningBox();
+			this.line3 = new DevComponents.DotNetBar.Controls.Line();
+			this.swUpdateROVals = new DevComponents.DotNetBar.Controls.SwitchButton();
+			this.swRefreshTrans = new DevComponents.DotNetBar.Controls.SwitchButton();
+			this.labelX11 = new DevComponents.DotNetBar.LabelX();
+			this.labelX6 = new DevComponents.DotNetBar.LabelX();
+			this.warningBox1 = new DevComponents.DotNetBar.Controls.WarningBox();
+			this.btnFixLinks = new DevComponents.DotNetBar.ButtonX();
 			this.sideNavPanel2 = new DevComponents.DotNetBar.Controls.SideNavPanel();
 			this.swRefreshTblsForSrch = new DevComponents.DotNetBar.Controls.SwitchButton();
 			this.lblRefreshTblForSrch = new DevComponents.DotNetBar.LabelX();
@@ -79,25 +97,14 @@
 			this.swCkOrphanDataRecs = new DevComponents.DotNetBar.Controls.SwitchButton();
 			this.labelX1 = new DevComponents.DotNetBar.LabelX();
 			this.btnRunCheck = new DevComponents.DotNetBar.ButtonX();
-			this.sideNavPanel3 = new DevComponents.DotNetBar.Controls.SideNavPanel();
-			this.swCheckROLinks = new DevComponents.DotNetBar.Controls.SwitchButton();
-			this.labelX12 = new DevComponents.DotNetBar.LabelX();
-			this.warningBox5 = new DevComponents.DotNetBar.Controls.WarningBox();
-			this.line3 = new DevComponents.DotNetBar.Controls.Line();
-			this.swUpdateROVals = new DevComponents.DotNetBar.Controls.SwitchButton();
-			this.swRefreshTrans = new DevComponents.DotNetBar.Controls.SwitchButton();
-			this.labelX11 = new DevComponents.DotNetBar.LabelX();
-			this.labelX6 = new DevComponents.DotNetBar.LabelX();
-			this.warningBox1 = new DevComponents.DotNetBar.Controls.WarningBox();
-			this.btnFixLinks = new DevComponents.DotNetBar.ButtonX();
-			this.sideNavPanel4 = new DevComponents.DotNetBar.Controls.SideNavPanel();
-			this.btn_ShowUsers = new DevComponents.DotNetBar.ButtonX();
 			this.sideNavItem1 = new DevComponents.DotNetBar.Controls.SideNavItem();
 			this.separator1 = new DevComponents.DotNetBar.Separator();
 			this.sideNavItmCheck = new DevComponents.DotNetBar.Controls.SideNavItem();
 			this.sideNavItmRepair = new DevComponents.DotNetBar.Controls.SideNavItem();
 			this.sideNavItmLinks = new DevComponents.DotNetBar.Controls.SideNavItem();
 			this.sideNavItmUsers = new DevComponents.DotNetBar.Controls.SideNavItem();
+			this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem();
+			this.sideNavItemDelete = new DevComponents.DotNetBar.Controls.SideNavItem();
 			this.sideNavItmExit = new DevComponents.DotNetBar.Controls.SideNavItem();
 			this.panelEx4 = new DevComponents.DotNetBar.PanelEx();
 			this.progressSteps1 = new DevComponents.DotNetBar.ProgressSteps();
@@ -118,10 +125,10 @@
 			this.pnlLater.SuspendLayout();
 			this.panelEx1.SuspendLayout();
 			this.sideNav1.SuspendLayout();
+			this.sideNavPanel4.SuspendLayout();
+			this.sideNavPanel3.SuspendLayout();
 			this.sideNavPanel2.SuspendLayout();
 			this.sideNavPanel1.SuspendLayout();
-			this.sideNavPanel3.SuspendLayout();
-			this.sideNavPanel4.SuspendLayout();
 			this.panelEx4.SuspendLayout();
 			this.SuspendLayout();
 			// 
@@ -133,7 +140,7 @@
 			this.myTV.CheckBoxes = true;
 			this.myTV.Location = new System.Drawing.Point(0, 230);
 			this.myTV.Name = "myTV";
-			this.myTV.Size = new System.Drawing.Size(300, 264);
+			this.myTV.Size = new System.Drawing.Size(170, 218);
 			this.myTV.TabIndex = 4;
 			this.myTV.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.myTV_AfterCheck);
 			// 
@@ -343,7 +350,7 @@
 			this.pnlLater.Controls.Add(this.dtpDate);
 			this.pnlLater.Dock = System.Windows.Forms.DockStyle.Top;
 			this.pnlLater.Enabled = false;
-			this.pnlLater.Location = new System.Drawing.Point(6, 23);
+			this.pnlLater.Location = new System.Drawing.Point(6, 27);
 			this.pnlLater.Name = "pnlLater";
 			this.pnlLater.Padding = new System.Windows.Forms.Padding(6);
 			this.pnlLater.Size = new System.Drawing.Size(279, 37);
@@ -384,7 +391,7 @@
 			this.chkLater.Dock = System.Windows.Forms.DockStyle.Top;
 			this.chkLater.Location = new System.Drawing.Point(6, 6);
 			this.chkLater.Name = "chkLater";
-			this.chkLater.Size = new System.Drawing.Size(279, 17);
+			this.chkLater.Size = new System.Drawing.Size(279, 21);
 			this.chkLater.TabIndex = 4;
 			this.chkLater.Text = "Process Later";
 			this.chkLater.UseVisualStyleBackColor = true;
@@ -457,10 +464,10 @@
 			// sideNav1
 			// 
 			this.sideNav1.BackColor = System.Drawing.SystemColors.Control;
-			this.sideNav1.Controls.Add(this.sideNavPanel1);
 			this.sideNav1.Controls.Add(this.sideNavPanel3);
-			this.sideNav1.Controls.Add(this.sideNavPanel2);
+			this.sideNav1.Controls.Add(this.sideNavPanel1);
 			this.sideNav1.Controls.Add(this.sideNavPanel4);
+			this.sideNav1.Controls.Add(this.sideNavPanel2);
 			this.sideNav1.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.sideNav1.EnableClose = false;
 			this.sideNav1.EnableMaximize = false;
@@ -471,6 +478,7 @@
             this.sideNavItmRepair,
             this.sideNavItmLinks,
             this.sideNavItmUsers,
+            this.sideNavItemDelete,
             this.sideNavItmExit});
 			this.sideNav1.Location = new System.Drawing.Point(0, 0);
 			this.sideNav1.Name = "sideNav1";
@@ -479,6 +487,297 @@
 			this.sideNav1.TabIndex = 3;
 			this.sideNav1.Text = "sideNav1";
 			// 
+			// sideNavPanel4
+			// 
+			this.sideNavPanel4.Controls.Add(this.swDeleteFolder);
+			this.sideNavPanel4.Controls.Add(this.labelX13);
+			this.sideNavPanel4.Controls.Add(this.swDeleteAnnotations);
+			this.sideNavPanel4.Controls.Add(this.labelX14);
+			this.sideNavPanel4.Controls.Add(this.myTVdel);
+			this.sideNavPanel4.Controls.Add(this.btnDeleteItems);
+			this.sideNavPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.sideNavPanel4.Location = new System.Drawing.Point(102, 39);
+			this.sideNavPanel4.Name = "sideNavPanel4";
+			this.sideNavPanel4.Size = new System.Drawing.Size(278, 486);
+			this.sideNavPanel4.TabIndex = 27;
+			this.sideNavPanel4.Visible = false;
+			// 
+			// swDeleteFolder
+			// 
+			// 
+			// 
+			// 
+			this.swDeleteFolder.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.swDeleteFolder.Location = new System.Drawing.Point(10, 43);
+			this.swDeleteFolder.Name = "swDeleteFolder";
+			this.swDeleteFolder.Size = new System.Drawing.Size(69, 22);
+			this.swDeleteFolder.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+			this.superTooltip1.SetSuperTooltip(this.swDeleteFolder, new DevComponents.DotNetBar.SuperTooltipInfo("Check RO Links", "", resources.GetString("swDeleteFolder.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 150)));
+			this.swDeleteFolder.SwitchClickTogglesValue = true;
+			this.swDeleteFolder.TabIndex = 39;
+			this.swDeleteFolder.ValueChanged += new System.EventHandler(this.swDeleteFolder_ValueChanged);
+			// 
+			// labelX13
+			// 
+			this.labelX13.BackColor = System.Drawing.Color.Transparent;
+			// 
+			// 
+			// 
+			this.labelX13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.labelX13.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.labelX13.Location = new System.Drawing.Point(85, 42);
+			this.labelX13.Name = "labelX13";
+			this.labelX13.Size = new System.Drawing.Size(168, 22);
+			this.superTooltip1.SetSuperTooltip(this.labelX13, new DevComponents.DotNetBar.SuperTooltipInfo("Check RO Links", "", resources.GetString("labelX13.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(350, 175)));
+			this.labelX13.TabIndex = 38;
+			this.labelX13.Text = "Delete Folders";
+			// 
+			// swDeleteAnnotations
+			// 
+			// 
+			// 
+			// 
+			this.swDeleteAnnotations.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.swDeleteAnnotations.Location = new System.Drawing.Point(10, 15);
+			this.swDeleteAnnotations.Name = "swDeleteAnnotations";
+			this.swDeleteAnnotations.Size = new System.Drawing.Size(69, 22);
+			this.swDeleteAnnotations.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+			this.superTooltip1.SetSuperTooltip(this.swDeleteAnnotations, new DevComponents.DotNetBar.SuperTooltipInfo("Refresh Transitions", "", resources.GetString("swDeleteAnnotations.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(265, 175)));
+			this.swDeleteAnnotations.SwitchClickTogglesValue = true;
+			this.swDeleteAnnotations.TabIndex = 37;
+			this.swDeleteAnnotations.Value = true;
+			this.swDeleteAnnotations.ValueObject = "Y";
+			this.swDeleteAnnotations.ValueChanged += new System.EventHandler(this.swDeleteAnnotations_ValueChanged);
+			// 
+			// labelX14
+			// 
+			this.labelX14.BackColor = System.Drawing.Color.Transparent;
+			// 
+			// 
+			// 
+			this.labelX14.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.labelX14.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.labelX14.Location = new System.Drawing.Point(85, 14);
+			this.labelX14.Name = "labelX14";
+			this.labelX14.Size = new System.Drawing.Size(186, 22);
+			this.superTooltip1.SetSuperTooltip(this.labelX14, new DevComponents.DotNetBar.SuperTooltipInfo("Refresh Transitions", "", resources.GetString("labelX14.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(256, 175)));
+			this.labelX14.TabIndex = 36;
+			this.labelX14.Text = "Delete Annotations";
+			// 
+			// myTVdel
+			// 
+			this.myTVdel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+			this.myTVdel.CheckBoxes = true;
+			this.myTVdel.Location = new System.Drawing.Point(14, 145);
+			this.myTVdel.Name = "myTVdel";
+			this.myTVdel.Size = new System.Drawing.Size(254, 323);
+			this.myTVdel.TabIndex = 34;
+			// 
+			// btnDeleteItems
+			// 
+			this.btnDeleteItems.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+			this.btnDeleteItems.Checked = true;
+			this.btnDeleteItems.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+			this.btnDeleteItems.Location = new System.Drawing.Point(3, 98);
+			this.btnDeleteItems.Name = "btnDeleteItems";
+			this.btnDeleteItems.Size = new System.Drawing.Size(280, 23);
+			this.btnDeleteItems.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+			this.superTooltip1.SetSuperTooltip(this.btnDeleteItems, new DevComponents.DotNetBar.SuperTooltipInfo("Process Links", "", "This will run the selected RO Links or Transitions Links tool.\r\n\r\nClick on the on" +
+            "/off switches to turn on/off each tool.\r\n\r\nNote that only one of these tools can" +
+            " be run at a time.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 130)));
+			this.btnDeleteItems.TabIndex = 35;
+			this.btnDeleteItems.Text = "Process Deletions";
+			this.btnDeleteItems.Click += new System.EventHandler(this.btnDeleteItems_Click);
+			// 
+			// sideNavPanel3
+			// 
+			this.sideNavPanel3.Controls.Add(this.swCheckROLinks);
+			this.sideNavPanel3.Controls.Add(this.labelX12);
+			this.sideNavPanel3.Controls.Add(this.warningBox5);
+			this.sideNavPanel3.Controls.Add(this.line3);
+			this.sideNavPanel3.Controls.Add(this.swUpdateROVals);
+			this.sideNavPanel3.Controls.Add(this.swRefreshTrans);
+			this.sideNavPanel3.Controls.Add(this.labelX11);
+			this.sideNavPanel3.Controls.Add(this.labelX6);
+			this.sideNavPanel3.Controls.Add(this.warningBox1);
+			this.sideNavPanel3.Controls.Add(this.myTV);
+			this.sideNavPanel3.Controls.Add(this.btnFixLinks);
+			this.sideNavPanel3.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.sideNavPanel3.Location = new System.Drawing.Point(102, 39);
+			this.sideNavPanel3.Name = "sideNavPanel3";
+			this.sideNavPanel3.Size = new System.Drawing.Size(278, 486);
+			this.sideNavPanel3.TabIndex = 10;
+			// 
+			// swCheckROLinks
+			// 
+			// 
+			// 
+			// 
+			this.swCheckROLinks.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.swCheckROLinks.Location = new System.Drawing.Point(10, 66);
+			this.swCheckROLinks.Name = "swCheckROLinks";
+			this.swCheckROLinks.Size = new System.Drawing.Size(91, 22);
+			this.swCheckROLinks.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+			this.superTooltip1.SetSuperTooltip(this.swCheckROLinks, new DevComponents.DotNetBar.SuperTooltipInfo("Check RO Links", "", resources.GetString("swCheckROLinks.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 150)));
+			this.swCheckROLinks.SwitchClickTogglesValue = true;
+			this.swCheckROLinks.TabIndex = 33;
+			this.swCheckROLinks.ValueChanged += new System.EventHandler(this.swCheckROLinks_ValueChanged);
+			// 
+			// labelX12
+			// 
+			this.labelX12.BackColor = System.Drawing.Color.Transparent;
+			// 
+			// 
+			// 
+			this.labelX12.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.labelX12.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.labelX12.Location = new System.Drawing.Point(107, 66);
+			this.labelX12.Name = "labelX12";
+			this.labelX12.Size = new System.Drawing.Size(186, 22);
+			this.superTooltip1.SetSuperTooltip(this.labelX12, new DevComponents.DotNetBar.SuperTooltipInfo("Check RO Links", "", resources.GetString("labelX12.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(350, 175)));
+			this.labelX12.TabIndex = 32;
+			this.labelX12.Text = "Check RO Links";
+			// 
+			// warningBox5
+			// 
+			this.warningBox5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(196)))), ((int)(((byte)(219)))), ((int)(((byte)(249)))));
+			this.warningBox5.CloseButtonVisible = false;
+			this.warningBox5.Image = ((System.Drawing.Image)(resources.GetObject("warningBox5.Image")));
+			this.warningBox5.Location = new System.Drawing.Point(17, 145);
+			this.warningBox5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.warningBox5.Name = "warningBox5";
+			this.warningBox5.OptionsButtonVisible = false;
+			this.warningBox5.Size = new System.Drawing.Size(262, 32);
+			this.warningBox5.TabIndex = 31;
+			this.warningBox5.Text = "<b>NOTE</b> These tools can take a long time to run";
+			// 
+			// line3
+			// 
+			this.line3.BackColor = System.Drawing.Color.Transparent;
+			this.line3.Location = new System.Drawing.Point(6, 127);
+			this.line3.Name = "line3";
+			this.line3.Size = new System.Drawing.Size(285, 12);
+			this.line3.TabIndex = 30;
+			this.line3.Text = "line3";
+			// 
+			// swUpdateROVals
+			// 
+			// 
+			// 
+			// 
+			this.swUpdateROVals.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.swUpdateROVals.Location = new System.Drawing.Point(10, 10);
+			this.swUpdateROVals.Name = "swUpdateROVals";
+			this.swUpdateROVals.Size = new System.Drawing.Size(91, 22);
+			this.swUpdateROVals.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+			this.superTooltip1.SetSuperTooltip(this.swUpdateROVals, new DevComponents.DotNetBar.SuperTooltipInfo("Update RO Values", "", resources.GetString("swUpdateROVals.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 150)));
+			this.swUpdateROVals.SwitchClickTogglesValue = true;
+			this.swUpdateROVals.TabIndex = 29;
+			this.swUpdateROVals.Value = true;
+			this.swUpdateROVals.ValueObject = "Y";
+			this.swUpdateROVals.ValueChanged += new System.EventHandler(this.swUpdateROVals_ValueChanged);
+			// 
+			// swRefreshTrans
+			// 
+			// 
+			// 
+			// 
+			this.swRefreshTrans.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.swRefreshTrans.Location = new System.Drawing.Point(10, 38);
+			this.swRefreshTrans.Name = "swRefreshTrans";
+			this.swRefreshTrans.Size = new System.Drawing.Size(91, 22);
+			this.swRefreshTrans.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+			this.superTooltip1.SetSuperTooltip(this.swRefreshTrans, new DevComponents.DotNetBar.SuperTooltipInfo("Refresh Transitions", "", resources.GetString("swRefreshTrans.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(265, 175)));
+			this.swRefreshTrans.SwitchClickTogglesValue = true;
+			this.swRefreshTrans.TabIndex = 29;
+			this.swRefreshTrans.ValueChanged += new System.EventHandler(this.swRefreshTrans_ValueChanged);
+			// 
+			// labelX11
+			// 
+			this.labelX11.BackColor = System.Drawing.Color.Transparent;
+			// 
+			// 
+			// 
+			this.labelX11.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.labelX11.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.labelX11.Location = new System.Drawing.Point(107, 10);
+			this.labelX11.Name = "labelX11";
+			this.labelX11.Size = new System.Drawing.Size(186, 22);
+			this.superTooltip1.SetSuperTooltip(this.labelX11, new DevComponents.DotNetBar.SuperTooltipInfo("Update RO Values", "", resources.GetString("labelX11.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 150)));
+			this.labelX11.TabIndex = 28;
+			this.labelX11.Text = "Update RO Values";
+			// 
+			// labelX6
+			// 
+			this.labelX6.BackColor = System.Drawing.Color.Transparent;
+			// 
+			// 
+			// 
+			this.labelX6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.labelX6.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.labelX6.Location = new System.Drawing.Point(107, 38);
+			this.labelX6.Name = "labelX6";
+			this.labelX6.Size = new System.Drawing.Size(186, 22);
+			this.superTooltip1.SetSuperTooltip(this.labelX6, new DevComponents.DotNetBar.SuperTooltipInfo("Refresh Transitions", "", resources.GetString("labelX6.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(256, 175)));
+			this.labelX6.TabIndex = 28;
+			this.labelX6.Text = "Refresh Transitions";
+			// 
+			// warningBox1
+			// 
+			this.warningBox1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(196)))), ((int)(((byte)(219)))), ((int)(((byte)(249)))));
+			this.warningBox1.CloseButtonVisible = false;
+			this.warningBox1.Image = ((System.Drawing.Image)(resources.GetObject("warningBox1.Image")));
+			this.warningBox1.Location = new System.Drawing.Point(17, 181);
+			this.warningBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.warningBox1.Name = "warningBox1";
+			this.warningBox1.OptionsButtonVisible = false;
+			this.warningBox1.Size = new System.Drawing.Size(262, 43);
+			this.warningBox1.TabIndex = 7;
+			this.warningBox1.Text = " Be sure there is a current backup of the \r\n database prior to running these func" +
+    "tions";
+			// 
+			// btnFixLinks
+			// 
+			this.btnFixLinks.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+			this.btnFixLinks.Checked = true;
+			this.btnFixLinks.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+			this.btnFixLinks.Location = new System.Drawing.Point(10, 98);
+			this.btnFixLinks.Name = "btnFixLinks";
+			this.btnFixLinks.Size = new System.Drawing.Size(280, 23);
+			this.btnFixLinks.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+			this.superTooltip1.SetSuperTooltip(this.btnFixLinks, new DevComponents.DotNetBar.SuperTooltipInfo("Process Links", "", "This will run the selected RO Links or Transitions Links tool.\r\n\r\nClick on the on" +
+            "/off switches to turn on/off each tool.\r\n\r\nNote that only one of these tools can" +
+            " be run at a time.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 130)));
+			this.btnFixLinks.TabIndex = 6;
+			this.btnFixLinks.Text = "Process Links";
+			this.btnFixLinks.Click += new System.EventHandler(this.btnFixLinks_Click);
+			// 
+			// sideNavPanel2
+			// 
+			this.sideNavPanel2.Controls.Add(this.swRefreshTblsForSrch);
+			this.sideNavPanel2.Controls.Add(this.lblRefreshTblForSrch);
+			this.sideNavPanel2.Controls.Add(this.warningBox4);
+			this.sideNavPanel2.Controls.Add(this.warningBox2);
+			this.sideNavPanel2.Controls.Add(this.swRmObsoleteROData);
+			this.sideNavPanel2.Controls.Add(this.swRefreshWordAttmts);
+			this.sideNavPanel2.Controls.Add(this.swStandardHypenChars);
+			this.sideNavPanel2.Controls.Add(this.labelX4);
+			this.sideNavPanel2.Controls.Add(this.labelX5);
+			this.sideNavPanel2.Controls.Add(this.labelX9);
+			this.sideNavPanel2.Controls.Add(this.swRmOrphanDataRecs);
+			this.sideNavPanel2.Controls.Add(this.labelX10);
+			this.sideNavPanel2.Controls.Add(this.labelX8);
+			this.sideNavPanel2.Controls.Add(this.line2);
+			this.sideNavPanel2.Controls.Add(this.btnRunRepair);
+			this.sideNavPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.sideNavPanel2.Location = new System.Drawing.Point(102, 39);
+			this.sideNavPanel2.Name = "sideNavPanel2";
+			this.sideNavPanel2.Size = new System.Drawing.Size(278, 486);
+			this.sideNavPanel2.TabIndex = 6;
+			this.sideNavPanel2.Visible = false;
+			// 
 			// swRefreshTblsForSrch
 			// 
 			// 
@@ -517,6 +816,7 @@
 			this.warningBox4.CloseButtonVisible = false;
 			this.warningBox4.Image = ((System.Drawing.Image)(resources.GetObject("warningBox4.Image")));
 			this.warningBox4.Location = new System.Drawing.Point(12, 264);
+			this.warningBox4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
 			this.warningBox4.Name = "warningBox4";
 			this.warningBox4.OptionsButtonVisible = false;
 			this.warningBox4.Size = new System.Drawing.Size(264, 32);
@@ -529,6 +829,7 @@
 			this.warningBox2.CloseButtonVisible = false;
 			this.warningBox2.Image = ((System.Drawing.Image)(resources.GetObject("warningBox2.Image")));
 			this.warningBox2.Location = new System.Drawing.Point(12, 302);
+			this.warningBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
 			this.warningBox2.Name = "warningBox2";
 			this.warningBox2.OptionsButtonVisible = false;
 			this.warningBox2.Size = new System.Drawing.Size(264, 43);
@@ -698,7 +999,7 @@
 			this.btnRunRepair.Size = new System.Drawing.Size(280, 23);
 			this.btnRunRepair.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
 			this.superTooltip1.SetSuperTooltip(this.btnRunRepair, new DevComponents.DotNetBar.SuperTooltipInfo("Run Repair", "", "This will run the database repair tools selected.\r\n\r\nClick on the on/off switches" +
-			" to turn on/off each tool.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 103)));
+            " to turn on/off each tool.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 103)));
 			this.btnRunRepair.TabIndex = 3;
 			this.btnRunRepair.Text = "Run Repair";
 			this.btnRunRepair.Click += new System.EventHandler(this.btnRunRepair_Click);
@@ -716,10 +1017,11 @@
 			this.sideNavPanel1.Controls.Add(this.labelX1);
 			this.sideNavPanel1.Controls.Add(this.btnRunCheck);
 			this.sideNavPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.sideNavPanel1.Location = new System.Drawing.Point(80, 31);
+			this.sideNavPanel1.Location = new System.Drawing.Point(102, 39);
 			this.sideNavPanel1.Name = "sideNavPanel1";
-			this.sideNavPanel1.Size = new System.Drawing.Size(300, 494);
+			this.sideNavPanel1.Size = new System.Drawing.Size(278, 486);
 			this.sideNavPanel1.TabIndex = 2;
+			this.sideNavPanel1.Visible = false;
 			// 
 			// warningBox3
 			// 
@@ -727,6 +1029,7 @@
 			this.warningBox3.CloseButtonVisible = false;
 			this.warningBox3.Image = ((System.Drawing.Image)(resources.GetObject("warningBox3.Image")));
 			this.warningBox3.Location = new System.Drawing.Point(17, 207);
+			this.warningBox3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
 			this.warningBox3.Name = "warningBox3";
 			this.warningBox3.OptionsButtonVisible = false;
 			this.warningBox3.Size = new System.Drawing.Size(264, 32);
@@ -868,248 +1171,6 @@
 			this.btnRunCheck.Text = "Run Check";
 			this.btnRunCheck.Click += new System.EventHandler(this.btnRunCheck_Click);
 			// 
-			// sideNavPanel3
-			// 
-			this.sideNavPanel3.Controls.Add(this.swCheckROLinks);
-			this.sideNavPanel3.Controls.Add(this.labelX12);
-			this.sideNavPanel3.Controls.Add(this.warningBox5);
-			this.sideNavPanel3.Controls.Add(this.line3);
-			this.sideNavPanel3.Controls.Add(this.swUpdateROVals);
-			this.sideNavPanel3.Controls.Add(this.swRefreshTrans);
-			this.sideNavPanel3.Controls.Add(this.labelX11);
-			this.sideNavPanel3.Controls.Add(this.labelX6);
-			this.sideNavPanel3.Controls.Add(this.warningBox1);
-			this.sideNavPanel3.Controls.Add(this.myTV);
-			this.sideNavPanel3.Controls.Add(this.btnFixLinks);
-			this.sideNavPanel3.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.sideNavPanel3.Location = new System.Drawing.Point(80, 31);
-			this.sideNavPanel3.Name = "sideNavPanel3";
-			this.sideNavPanel3.Size = new System.Drawing.Size(300, 494);
-			this.sideNavPanel3.TabIndex = 10;
-			this.sideNavPanel3.Visible = false;
-			// 
-			// swCheckROLinks
-			// 
-			// 
-			// 
-			// 
-			this.swCheckROLinks.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.swCheckROLinks.Location = new System.Drawing.Point(10, 66);
-			this.swCheckROLinks.Name = "swCheckROLinks";
-			this.swCheckROLinks.Size = new System.Drawing.Size(91, 22);
-			this.swCheckROLinks.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-			this.superTooltip1.SetSuperTooltip(this.swCheckROLinks, new DevComponents.DotNetBar.SuperTooltipInfo("Check RO Links", "", resources.GetString("swCheckROLinks.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 150)));
-			this.swCheckROLinks.SwitchClickTogglesValue = true;
-			this.swCheckROLinks.TabIndex = 33;
-			this.swCheckROLinks.ValueChanged += new System.EventHandler(this.swCheckROLinks_ValueChanged);
-			// 
-			// labelX12
-			// 
-			this.labelX12.BackColor = System.Drawing.Color.Transparent;
-			// 
-			// 
-			// 
-			this.labelX12.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.labelX12.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.labelX12.Location = new System.Drawing.Point(107, 66);
-			this.labelX12.Name = "labelX12";
-			this.labelX12.Size = new System.Drawing.Size(186, 22);
-			this.superTooltip1.SetSuperTooltip(this.labelX12, new DevComponents.DotNetBar.SuperTooltipInfo("Check RO Links", "", resources.GetString("labelX12.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(350, 175)));
-			this.labelX12.TabIndex = 32;
-			this.labelX12.Text = "Check RO Links";
-			// 
-			// warningBox5
-			// 
-			this.warningBox5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(196)))), ((int)(((byte)(219)))), ((int)(((byte)(249)))));
-			this.warningBox5.CloseButtonVisible = false;
-			this.warningBox5.Image = ((System.Drawing.Image)(resources.GetObject("warningBox5.Image")));
-			this.warningBox5.Location = new System.Drawing.Point(17, 145);
-			this.warningBox5.Name = "warningBox5";
-			this.warningBox5.OptionsButtonVisible = false;
-			this.warningBox5.Size = new System.Drawing.Size(262, 32);
-			this.warningBox5.TabIndex = 31;
-			this.warningBox5.Text = "<b>NOTE</b> These tools can take a long time to run";
-			// 
-			// line3
-			// 
-			this.line3.BackColor = System.Drawing.Color.Transparent;
-			this.line3.Location = new System.Drawing.Point(6, 127);
-			this.line3.Name = "line3";
-			this.line3.Size = new System.Drawing.Size(285, 12);
-			this.line3.TabIndex = 30;
-			this.line3.Text = "line3";
-			// 
-			// swUpdateROVals
-			// 
-			// 
-			// 
-			// 
-			this.swUpdateROVals.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.swUpdateROVals.Location = new System.Drawing.Point(10, 10);
-			this.swUpdateROVals.Name = "swUpdateROVals";
-			this.swUpdateROVals.Size = new System.Drawing.Size(91, 22);
-			this.swUpdateROVals.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-			this.superTooltip1.SetSuperTooltip(this.swUpdateROVals, new DevComponents.DotNetBar.SuperTooltipInfo("Update RO Values", "", resources.GetString("swUpdateROVals.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 150)));
-			this.swUpdateROVals.SwitchClickTogglesValue = true;
-			this.swUpdateROVals.TabIndex = 29;
-			this.swUpdateROVals.Value = true;
-			this.swUpdateROVals.ValueObject = "Y";
-			this.swUpdateROVals.ValueChanged += new System.EventHandler(this.swUpdateROVals_ValueChanged);
-			// 
-			// swRefreshTrans
-			// 
-			// 
-			// 
-			// 
-			this.swRefreshTrans.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.swRefreshTrans.Location = new System.Drawing.Point(10, 38);
-			this.swRefreshTrans.Name = "swRefreshTrans";
-			this.swRefreshTrans.Size = new System.Drawing.Size(91, 22);
-			this.swRefreshTrans.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-			this.superTooltip1.SetSuperTooltip(this.swRefreshTrans, new DevComponents.DotNetBar.SuperTooltipInfo("Refresh Transitions", "", resources.GetString("swRefreshTrans.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(265, 175)));
-			this.swRefreshTrans.SwitchClickTogglesValue = true;
-			this.swRefreshTrans.TabIndex = 29;
-			this.swRefreshTrans.ValueChanged += new System.EventHandler(this.swRefreshTrans_ValueChanged);
-			// 
-			// labelX11
-			// 
-			this.labelX11.BackColor = System.Drawing.Color.Transparent;
-			// 
-			// 
-			// 
-			this.labelX11.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.labelX11.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.labelX11.Location = new System.Drawing.Point(107, 10);
-			this.labelX11.Name = "labelX11";
-			this.labelX11.Size = new System.Drawing.Size(186, 22);
-			this.superTooltip1.SetSuperTooltip(this.labelX11, new DevComponents.DotNetBar.SuperTooltipInfo("Update RO Values", "", resources.GetString("labelX11.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 150)));
-			this.labelX11.TabIndex = 28;
-			this.labelX11.Text = "Update RO Values";
-			// 
-			// labelX6
-			// 
-			this.labelX6.BackColor = System.Drawing.Color.Transparent;
-			// 
-			// 
-			// 
-			this.labelX6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.labelX6.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.labelX6.Location = new System.Drawing.Point(107, 38);
-			this.labelX6.Name = "labelX6";
-			this.labelX6.Size = new System.Drawing.Size(186, 22);
-			this.superTooltip1.SetSuperTooltip(this.labelX6, new DevComponents.DotNetBar.SuperTooltipInfo("Refresh Transitions", "", resources.GetString("labelX6.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(256, 175)));
-			this.labelX6.TabIndex = 28;
-			this.labelX6.Text = "Refresh Transitions";
-			// 
-			// warningBox1
-			// 
-			this.warningBox1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(196)))), ((int)(((byte)(219)))), ((int)(((byte)(249)))));
-			this.warningBox1.CloseButtonVisible = false;
-			this.warningBox1.Image = ((System.Drawing.Image)(resources.GetObject("warningBox1.Image")));
-			this.warningBox1.Location = new System.Drawing.Point(17, 181);
-			this.warningBox1.Name = "warningBox1";
-			this.warningBox1.OptionsButtonVisible = false;
-			this.warningBox1.Size = new System.Drawing.Size(262, 43);
-			this.warningBox1.TabIndex = 7;
-			this.warningBox1.Text = " Be sure there is a current backup of the \r\n database prior to running these func" +
-    "tions";
-			// 
-			// btnFixLinks
-			// 
-			this.btnFixLinks.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
-			this.btnFixLinks.Checked = true;
-			this.btnFixLinks.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-			this.btnFixLinks.Location = new System.Drawing.Point(10, 98);
-			this.btnFixLinks.Name = "btnFixLinks";
-			this.btnFixLinks.Size = new System.Drawing.Size(280, 23);
-			this.btnFixLinks.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-			this.superTooltip1.SetSuperTooltip(this.btnFixLinks, new DevComponents.DotNetBar.SuperTooltipInfo("Process Links", "", "This will run the selected RO Links or Transitions Links tool.\r\n\r\nClick on the on" +
-            "/off switches to turn on/off each tool.\r\n\r\nNote that only one of these tools can" +
-            " be run at a time.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 130)));
-			this.btnFixLinks.TabIndex = 6;
-			this.btnFixLinks.Text = "Process Links";
-			this.btnFixLinks.Click += new System.EventHandler(this.btnFixLinks_Click);
-			// 
-			// sideNavPanel2
-			// 
-			this.sideNavPanel2.Controls.Add(this.swRefreshTblsForSrch);
-			this.sideNavPanel2.Controls.Add(this.lblRefreshTblForSrch);
-			this.sideNavPanel2.Controls.Add(this.warningBox4);
-			this.sideNavPanel2.Controls.Add(this.warningBox2);
-			this.sideNavPanel2.Controls.Add(this.swRmObsoleteROData);
-			this.sideNavPanel2.Controls.Add(this.swRefreshWordAttmts);
-			this.sideNavPanel2.Controls.Add(this.swStandardHypenChars);
-			this.sideNavPanel2.Controls.Add(this.labelX4);
-			this.sideNavPanel2.Controls.Add(this.labelX5);
-			this.sideNavPanel2.Controls.Add(this.labelX9);
-			this.sideNavPanel2.Controls.Add(this.swRmOrphanDataRecs);
-			this.sideNavPanel2.Controls.Add(this.labelX10);
-			this.sideNavPanel2.Controls.Add(this.labelX8);
-			this.sideNavPanel2.Controls.Add(this.line2);
-			this.sideNavPanel2.Controls.Add(this.btnRunRepair);
-			this.sideNavPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.sideNavPanel2.Location = new System.Drawing.Point(80, 31);
-			this.sideNavPanel2.Name = "sideNavPanel2";
-			this.sideNavPanel2.Size = new System.Drawing.Size(300, 494);
-			this.sideNavPanel2.TabIndex = 6;
-			this.sideNavPanel2.Visible = false;
-			// 
-			// swRefreshTblsForSrch
-			// 
-			// 
-			// 
-			// 
-			this.swRefreshTblsForSrch.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.swRefreshTblsForSrch.Location = new System.Drawing.Point(10, 153);
-			this.swRefreshTblsForSrch.Name = "swRefreshTblsForSrch";
-			this.swRefreshTblsForSrch.Size = new System.Drawing.Size(91, 22);
-			this.swRefreshTblsForSrch.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-			this.superTooltip1.SetSuperTooltip(this.swRefreshTblsForSrch, new DevComponents.DotNetBar.SuperTooltipInfo("Refresh Word Attachments", "", resources.GetString("swRefreshTblsForSrch.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(300, 200)));
-			this.swRefreshTblsForSrch.SwitchClickTogglesValue = true;
-			this.swRefreshTblsForSrch.TabIndex = 32;
-			this.swRefreshTblsForSrch.Value = true;
-			this.swRefreshTblsForSrch.ValueObject = "Y";
-			// 
-			// lblRefreshTblForSrch
-			// 
-			this.lblRefreshTblForSrch.BackColor = System.Drawing.Color.Transparent;
-			// 
-			// 
-			// 
-			this.lblRefreshTblForSrch.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.lblRefreshTblForSrch.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.lblRefreshTblForSrch.Location = new System.Drawing.Point(107, 153);
-			this.lblRefreshTblForSrch.Name = "lblRefreshTblForSrch";
-			this.lblRefreshTblForSrch.Size = new System.Drawing.Size(186, 22);
-			this.superTooltip1.SetSuperTooltip(this.lblRefreshTblForSrch, new DevComponents.DotNetBar.SuperTooltipInfo("Refresh Word Attachments", "", resources.GetString("lblRefreshTblForSrch.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(300, 200)));
-			this.lblRefreshTblForSrch.TabIndex = 31;
-			this.lblRefreshTblForSrch.Text = "Refresh Tables For Search";
-			// 
-			// sideNavPanel4
-			// 
-			this.sideNavPanel4.Controls.Add(this.btn_ShowUsers);
-			this.sideNavPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.sideNavPanel4.Location = new System.Drawing.Point(81, 31);
-			this.sideNavPanel4.Name = "sideNavPanel4";
-			this.sideNavPanel4.Size = new System.Drawing.Size(299, 494);
-			this.sideNavPanel4.TabIndex = 14;
-			this.sideNavPanel4.Visible = false;
-			// 
-			// btn_ShowUsers
-			// 
-			this.btn_ShowUsers.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
-			this.btn_ShowUsers.Checked = true;
-			this.btn_ShowUsers.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-			this.btn_ShowUsers.Location = new System.Drawing.Point(57, 37);
-			this.btn_ShowUsers.Name = "btn_ShowUsers";
-			this.btn_ShowUsers.Size = new System.Drawing.Size(171, 23);
-			this.btn_ShowUsers.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-			this.superTooltip1.SetSuperTooltip(this.btn_ShowUsers, new DevComponents.DotNetBar.SuperTooltipInfo("Show Users", "", "This will return all of the users currently with open sessions in the database an" +
-            "d the details of any items they have checked out.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 80)));
-			this.btn_ShowUsers.TabIndex = 0;
-			this.btn_ShowUsers.Text = "Show Users";
-			this.btn_ShowUsers.Click += new System.EventHandler(this.btn_ShowUsers_Click);
-			// 
 			// sideNavItem1
 			// 
 			this.sideNavItem1.IsSystemMenu = true;
@@ -1129,7 +1190,6 @@
 			// 
 			// sideNavItmCheck
 			// 
-			this.sideNavItmCheck.Checked = true;
 			this.sideNavItmCheck.Name = "sideNavItmCheck";
 			this.sideNavItmCheck.Panel = this.sideNavPanel1;
 			this.sideNavItmCheck.Symbol = "";
@@ -1146,6 +1206,7 @@
 			// 
 			// sideNavItmLinks
 			// 
+			this.sideNavItmLinks.Checked = true;
 			this.sideNavItmLinks.Name = "sideNavItmLinks";
 			this.sideNavItmLinks.Panel = this.sideNavPanel3;
 			this.sideNavItmLinks.Symbol = "";
@@ -1155,11 +1216,25 @@
 			// sideNavItmUsers
 			// 
 			this.sideNavItmUsers.Name = "sideNavItmUsers";
-			this.sideNavItmUsers.Panel = this.sideNavPanel4;
+			this.sideNavItmUsers.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            this.buttonItem1});
 			this.sideNavItmUsers.Symbol = "";
 			this.sideNavItmUsers.Text = "Users";
 			this.sideNavItmUsers.Click += new System.EventHandler(this.sideNavItmUsers_Click);
 			// 
+			// buttonItem1
+			// 
+			this.buttonItem1.Name = "buttonItem1";
+			this.buttonItem1.Text = "buttonItem1";
+			// 
+			// sideNavItemDelete
+			// 
+			this.sideNavItemDelete.Name = "sideNavItemDelete";
+			this.sideNavItemDelete.Panel = this.sideNavPanel4;
+			this.sideNavItemDelete.Symbol = "";
+			this.sideNavItemDelete.Text = "Delete";
+			this.sideNavItemDelete.Click += new System.EventHandler(this.sideNavItemDelete_Click_1);
+			// 
 			// sideNavItmExit
 			// 
 			this.sideNavItmExit.Name = "sideNavItmExit";
@@ -1286,11 +1361,10 @@
 			this.panelEx1.ResumeLayout(false);
 			this.sideNav1.ResumeLayout(false);
 			this.sideNav1.PerformLayout();
+			this.sideNavPanel4.ResumeLayout(false);
+			this.sideNavPanel3.ResumeLayout(false);
 			this.sideNavPanel2.ResumeLayout(false);
 			this.sideNavPanel1.ResumeLayout(false);
-			this.sideNavPanel3.ResumeLayout(false);
-			//this.sideNavPanel2.ResumeLayout(false);
-			this.sideNavPanel4.ResumeLayout(false);
 			this.panelEx4.ResumeLayout(false);
 			this.ResumeLayout(false);
 
@@ -1340,8 +1414,6 @@
 		private DevComponents.DotNetBar.LabelX labelX8;
 		private DevComponents.DotNetBar.Controls.Line line2;
 		private DevComponents.DotNetBar.ButtonX btnRunRepair;
-		private DevComponents.DotNetBar.Controls.SideNavPanel sideNavPanel4;
-		private DevComponents.DotNetBar.ButtonX btn_ShowUsers;
 		private DevComponents.DotNetBar.Controls.SideNavPanel sideNavPanel3;
 		private DevComponents.DotNetBar.ButtonX btnFixLinks;
 		private DevComponents.DotNetBar.Controls.SideNavItem sideNavItem1;
@@ -1376,5 +1448,14 @@
 		private DevComponents.DotNetBar.LabelX lblRefreshTblForSrch;
 		private DevComponents.DotNetBar.Controls.SwitchButton swCheckROLinks;
 		private DevComponents.DotNetBar.LabelX labelX12;
+		private DevComponents.DotNetBar.ButtonItem buttonItem1;
+		private DevComponents.DotNetBar.Controls.SideNavPanel sideNavPanel4;
+		private DevComponents.DotNetBar.Controls.SwitchButton swDeleteFolder;
+		private DevComponents.DotNetBar.LabelX labelX13;
+		private DevComponents.DotNetBar.Controls.SwitchButton swDeleteAnnotations;
+		private DevComponents.DotNetBar.LabelX labelX14;
+		private System.Windows.Forms.TreeView myTVdel;
+		private DevComponents.DotNetBar.ButtonX btnDeleteItems;
+		private DevComponents.DotNetBar.Controls.SideNavItem sideNavItemDelete;
 	}
 }

PROMS/VEPROMS User Interface/frmBatchRefresh.cs

@@ -125,6 +125,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)
 		{
@@ -151,6 +205,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;
@@ -1246,6 +1328,21 @@ namespace VEPROMS
 			this.Close();
 		}
 
+		// new Admin Tools user interface for deletes
+		private void sideNavItemDelete_Click(object sender, EventArgs e)
+		{
+
+		}
+
+		// new Admin Tools user interface for deletes
+		private void sideNavItemDelete_Click_1(object sender, EventArgs e)
+		{			
+			if (swDeleteFolder.Value)
+				ResetDelTV(true);
+			else
+				ResetDelTV(false);
+		}
+
 		#region On/Off Swiches
 
 		// C2017-030 new Admin Tools user interface
@@ -1500,5 +1597,107 @@ 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<DocVersionInfo> dvil = new List<DocVersionInfo>();
+				//foreach (TreeNode tn in myTVdel.Nodes)
+				//	if (tn.Checked)
+				//	{
+				//		tn.Tag = dvi;
+				//		myDocVersions.Add(tn, dvi);
+				//	}
+
+				////foreach (TreeNode tn in myTVdel.Nodes)
+				////{
+				////	if (tn.Checked)
+				////	{
+				////		var itemInfo = myProcedures[tn];
+				////		folderData.Add(itemInfo.ItemID, itemInfo.DisplayText);
+				////	}
+				////}
+
+				//ProcessDelete(dvil);
+			}
+			else
+			{
+				//TODO process deletions of annotations
+				txtProcess.AppendText("Deleting Annotations...");
+			}
+		}
+
+		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
+		}
 	}
 }

PROMS/VEPROMS User Interface/frmBatchRefresh.resx

@@ -117,75 +117,9 @@
   <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). 
-
-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="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 +141,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
@@ -270,6 +205,106 @@ If more than one procedure is selected, it is recommended that this be performed
         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="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.
+
+</value>
+  </data>
+  <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.
+
+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.
+</value>
+  </data>
+  <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.
+
+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="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.
+
+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="swRefreshTblsForSrch.SuperTooltip" xml:space="preserve">
     <value>When Word attachments are modified and saved, PROMS will create a PDF of the attachment contents and save it in the database.  When this is done, all the of the RO references are resolved as well as pagination of the attachment.  This speeds up the overall printing of the procedure in that PROMS simply inserts the attachment contents.
@@ -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>193</value>
   </metadata>
-</root>
+</root>

PROMS/VEPROMS User Interface/frmPDFStatusForm.cs

@@ -91,7 +91,13 @@ namespace VEPROMS
 			get { return _DidAll; }
 			set { _DidAll = value; }
 		}
-		public frmPDFStatusForm(ItemInfo myItem, string rev, string watermark, bool debugOutput, bool origPgBrk, bool openPDF, bool overWrite, string pdfPath, ChangeBarDefinition cbd, string pdfFile, Point newLocation, bool insertBlankPages, bool allOrAuto, string prefix, bool saveLinks, int removeTrailingHardReturnsAndManualPageBreaks, bool showPROMSVer, bool didAll, string blankPageText, MergedPdf mergedPdf, string watermarkColor)
+		private int _prtSectID = -1;
+		public int PrtSectID
+		{
+			get { return _prtSectID; }
+			set { _prtSectID = value; }
+		}
+		public frmPDFStatusForm(ItemInfo myItem, string rev, string watermark, bool debugOutput, bool origPgBrk, bool openPDF, bool overWrite, string pdfPath, ChangeBarDefinition cbd, string pdfFile, Point newLocation, bool insertBlankPages, bool allOrAuto, string prefix, bool saveLinks, int removeTrailingHardReturnsAndManualPageBreaks, bool showPROMSVer, bool didAll, string blankPageText, MergedPdf mergedPdf, string watermarkColor, int PrtSectID = -1)
 		{
 			// B2021-088 moved this if/else from CreatePDF() so that the Approval logic will have access to this logic
 			ProcedureInfo MyProcedure = myItem as ProcedureInfo;
@@ -116,6 +122,7 @@ namespace VEPROMS
 			Prefix = prefix;
 			OpenPDF = openPDF;
 			DidAll = didAll;
+			_prtSectID = PrtSectID;
 
 			InitializeComponent();
 
@@ -276,7 +283,7 @@ namespace VEPROMS
 					cachePartInfo = PartInfo.CacheList;
 				}
 
-				_PdfFile = MyPromsPrinter.Print(PDFPath, MakePlaceKeeper, MakeContinuousActionSummary, MakeTimeCriticalActionSummary);
+				_PdfFile = MyPromsPrinter.Print(PDFPath, MakePlaceKeeper, MakeContinuousActionSummary, MakeTimeCriticalActionSummary, PrtSectID);
 
 				ProfileTimer.Pop(profileDepth);