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

Merging C2024-004 from development into master after successful testing.

PROMS/FlexableMessageBox/FlexibleMessageBox.cs

@@ -241,21 +241,6 @@ 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
@@ -435,15 +420,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, OVERWRITE, RENAME };
+            private enum ButtonID { OK = 0, CANCEL, YES, NO, ABORT, RETRY, IGNORE };
-
+            
             //These are the buttons texts for different languages. 
             //If you want to add a new language, add it here and in the GetButtonText-Function
             private enum TwoLetterISOLanguageID { en, de, es, it };
-            private static readonly String[] BUTTON_TEXTS_ENGLISH_EN = { "OK", "Cancel", "&Yes", "&No", "&Abort", "&Retry", "&Ignore", "&Overwrite", "&Rename" }; //Note: This is also the fallback language
+            private static readonly String[] BUTTON_TEXTS_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", "&Overwrite", "&Rename" };
+            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", "&Overwrite", "&Rename" };
+            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", "&Overwrite", "&Rename" };
+            private static readonly String[] BUTTON_TEXTS_ITALIAN_IT = { "OK", "Annulla", "&Sì", "&No", "&Interrompi", "&Riprova", "&Ignora" };
 
             #endregion
 
@@ -708,7 +693,6 @@ namespace JR.Utils.GUI.Forms
 
                         flexibleMessageBoxForm.CancelButton = flexibleMessageBoxForm.button3;
                         break;
-             
 
                     case MessageBoxButtons.OK:
                     default:
@@ -725,38 +709,16 @@ namespace JR.Utils.GUI.Forms
                 flexibleMessageBoxForm.defaultButton = defaultButton;
             }
 
-            private static void SetDialogButtonsCustom(FlexibleMessageBoxForm flexibleMessageBoxForm)
+            #endregion
-            {
-                flexibleMessageBoxForm.visibleButtonsCount = 3;
 
-                flexibleMessageBoxForm.button1.Visible = true;
+            #region Private event handlers
-                flexibleMessageBoxForm.button1.Text = flexibleMessageBoxForm.GetButtonText(ButtonID.CANCEL);
-                flexibleMessageBoxForm.button1.DialogResult = DialogResult.Abort;
 
-                flexibleMessageBoxForm.button2.Visible = true;
+            /// <summary>
-                flexibleMessageBoxForm.button2.Text = flexibleMessageBoxForm.GetButtonText(ButtonID.OVERWRITE);
+            /// Handles the Shown event of the FlexibleMessageBoxForm control.
-                flexibleMessageBoxForm.button2.DialogResult = DialogResult.Retry;
+            /// </summary>
-
+            /// <param name="sender">The source of the event.</param>
-                flexibleMessageBoxForm.button3.Visible = true;
+            /// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
-                flexibleMessageBoxForm.button3.Text = flexibleMessageBoxForm.GetButtonText(ButtonID.RENAME);
+            private void FlexibleMessageBoxForm_Shown(object sender, EventArgs e)
-                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;
@@ -904,46 +866,6 @@ 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/VEPROMS User Interface/DlgPrintProcedure.cs

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

PROMS/VEPROMS User Interface/VEPROMS_UI.csproj

@@ -99,10 +99,7 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="C1.Win.2, Version=2.0.20213.532, Culture=neutral, PublicKeyToken=944ae1ea0e47ca04" />
-    <Reference Include="C1.Win.C1Command.2, Version=2.0.20213.532, Culture=neutral, PublicKeyToken=e808566f358766d8" />
     <Reference Include="C1.Win.C1FlexGrid.2, Version=2.0.20213.532, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL" />
-    <Reference Include="C1.Win.C1Input.2, Version=2.0.20213.532, Culture=neutral, PublicKeyToken=7e7ff60f0c214f9a, processorArchitecture=MSIL" />
     <Reference Include="Csla">
       <HintPath>..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll</HintPath>
     </Reference>
@@ -223,12 +220,6 @@
     <Compile Include="dlgUCFDetail.Designer.cs">
       <DependentUpon>dlgUCFDetail.cs</DependentUpon>
     </Compile>
-    <Compile Include="frmAnnotationsCleanup.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="frmAnnotationsCleanup.Designer.cs">
-      <DependentUpon>frmAnnotationsCleanup.cs</DependentUpon>
-    </Compile>
     <Compile Include="frmBatchRefresh.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -340,9 +331,6 @@
     <EmbeddedResource Include="dlgUCFDetail.resx">
       <DependentUpon>dlgUCFDetail.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="frmAnnotationsCleanup.resx">
-      <DependentUpon>frmAnnotationsCleanup.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="frmPDFStatusForm.resx">
       <DependentUpon>frmPDFStatusForm.cs</DependentUpon>
       <SubType>Designer</SubType>
@@ -626,4 +614,4 @@
   <PropertyGroup>
     <PreBuildEvent>cmd /c "$(ProjectDir)FixRev.bat"</PreBuildEvent>
   </PropertyGroup>
-</Project>
+</Project>

PROMS/VEPROMS User Interface/dlgExportImport.cs

@@ -99,10 +99,6 @@ 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)
 		{
@@ -176,7 +172,6 @@ namespace VEPROMS
 			}
 			else if (MyProcedure != null)
 			{
-				txtExport.Enabled = true;
 				txtExport.Text = string.Format(@"{0}\{1}.pxml", PEIPath, MyProcedure.DisplayNumber.Replace("/", "_").Replace("\\", "_"));
 			}
 		}
@@ -195,8 +190,6 @@ 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"))
@@ -227,42 +220,6 @@ 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;
@@ -273,7 +230,7 @@ namespace VEPROMS
 				XmlElement xe = xd.CreateElement("formats");
 				xd.DocumentElement.AppendChild(xe);
 				ExportFormats(FormatInfoList.GetFormatInfoListUsed(), xe, "formats", false);
-				xd.Save(fileLocation);
+				xd.Save(txtExport.Text);
 				TimeSpan elapsed = DateTime.Now.Subtract(MyStart);
 				lblExportStatus.Text = "Export Completed in " + elapsed.ToString();
 				this.Cursor = Cursors.Default;
@@ -749,7 +706,7 @@ namespace VEPROMS
 			}
 			catch (Exception ex)
 			{
-				FlexibleMessageBox.Show(null, "The import failed, check the error log for more information.", "Import Failed", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+				FlexibleMessageBox.Show("The import failed, check the error log for more information.", "Import Failed", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
 				_MyLog.Warn("Failure During Import", ex);
 			}
 			return false;

PROMS/VEPROMS User Interface/dlgExportImport.designer.cs

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

PROMS/VEPROMS User Interface/frmAnnotationsCleanup.Designer.cs

@@ -1,132 +0,0 @@
-
-using VEPROMS.CSLA.Library;
-using Volian.Base.Library;
-namespace VEPROMS
-{
-	partial class frmAnnotationsCleanup
-	{
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-			{
-				components.Dispose();
-			}
-			base.Dispose(disposing);
-		}
-
-		#region Windows Form Designer generated code
-
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			this.components = new System.ComponentModel.Container();
-			this.lbAnnotationTypes = new System.Windows.Forms.ListBox();
-			this.itemAnnotationsBindingSource = new System.Windows.Forms.BindingSource(this.components);
-			this.lblAnnotationsList = new System.Windows.Forms.Label();
-			this.btnClean = new System.Windows.Forms.Button();
-			this.lblCountNumber = new System.Windows.Forms.Label();
-			this.lblCount = new System.Windows.Forms.Label();
-			this.btnClose = new System.Windows.Forms.Button();
-			((System.ComponentModel.ISupportInitialize)(this.itemAnnotationsBindingSource)).BeginInit();
-			this.SuspendLayout();
-			// 
-			// lbAnnotationTypes
-			// 
-			this.lbAnnotationTypes.DataSource = this.itemAnnotationsBindingSource;
-			this.lbAnnotationTypes.FormattingEnabled = true;
-			this.lbAnnotationTypes.Location = new System.Drawing.Point(25, 48);
-			this.lbAnnotationTypes.Name = "lbAnnotationTypes";
-			this.lbAnnotationTypes.Size = new System.Drawing.Size(295, 433);
-			this.lbAnnotationTypes.TabIndex = 0;
-			// 
-			// lblAnnotationsList
-			// 
-			this.lblAnnotationsList.AutoSize = true;
-			this.lblAnnotationsList.Location = new System.Drawing.Point(26, 21);
-			this.lblAnnotationsList.Name = "lblAnnotationsList";
-			this.lblAnnotationsList.Size = new System.Drawing.Size(175, 13);
-			this.lblAnnotationsList.TabIndex = 1;
-			this.lblAnnotationsList.Text = "Select an Annotation Type to Clean";
-			// 
-			// btnClean
-			// 
-			this.btnClean.Location = new System.Drawing.Point(365, 164);
-			this.btnClean.Name = "btnClean";
-			this.btnClean.Size = new System.Drawing.Size(131, 36);
-			this.btnClean.TabIndex = 2;
-			this.btnClean.Text = "Proceed?";
-			this.btnClean.UseVisualStyleBackColor = true;
-			this.btnClean.Click += new System.EventHandler(this.button1_Click);
-			// 
-			// lblCountNumber
-			// 
-			this.lblCountNumber.AutoSize = true;
-			this.lblCountNumber.Location = new System.Drawing.Point(395, 100);
-			this.lblCountNumber.Name = "lblCountNumber";
-			this.lblCountNumber.Size = new System.Drawing.Size(69, 13);
-			this.lblCountNumber.TabIndex = 3;
-			this.lblCountNumber.Text = "Delete Count";
-			this.lblCountNumber.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-			// 
-			// lblCount
-			// 
-			this.lblCount.AutoSize = true;
-			this.lblCount.Location = new System.Drawing.Point(331, 70);
-			this.lblCount.Name = "lblCount";
-			this.lblCount.Size = new System.Drawing.Size(206, 13);
-			this.lblCount.TabIndex = 4;
-			this.lblCount.Text = "Number of Annotations that will be deleted";
-			// 
-			// btnClose
-			// 
-			this.btnClose.Location = new System.Drawing.Point(397, 457);
-			this.btnClose.Name = "btnClose";
-			this.btnClose.Size = new System.Drawing.Size(75, 23);
-			this.btnClose.TabIndex = 5;
-			this.btnClose.Text = "Close";
-			this.btnClose.UseVisualStyleBackColor = true;
-			this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
-			// 
-			// frmAnnotationsCleanup
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(549, 535);
-			this.Controls.Add(this.btnClose);
-			this.Controls.Add(this.lblCount);
-			this.Controls.Add(this.lblCountNumber);
-			this.Controls.Add(this.btnClean);
-			this.Controls.Add(this.lblAnnotationsList);
-			this.Controls.Add(this.lbAnnotationTypes);
-			this.Name = "frmAnnotationsCleanup";
-			this.Text = "Clean Annotations";
-			((System.ComponentModel.ISupportInitialize)(this.itemAnnotationsBindingSource)).EndInit();
-			this.ResumeLayout(false);
-			this.PerformLayout();
-
-		}
-
-		#endregion
-
-		private System.Windows.Forms.ListBox lbAnnotationTypes;
-		private System.Windows.Forms.Label lblAnnotationsList;
-		private System.Windows.Forms.BindingSource itemAnnotationsBindingSource;
-		private System.Windows.Forms.Button btnClean;
-		private System.Windows.Forms.Label lblCountNumber;
-		private System.Windows.Forms.Label lblCount;
-		private System.Windows.Forms.Button btnClose;
-	}
-}
-

PROMS/VEPROMS User Interface/frmAnnotationsCleanup.cs

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

PROMS/VEPROMS User Interface/frmAnnotationsCleanup.resx

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

PROMS/VEPROMS User Interface/frmBatchRefresh.cs

@@ -22,29 +22,12 @@ namespace VEPROMS
 			set { _MySessionInfo = value; }
 		}
 		private bool IsAdministratorUser = false; //C2020-035 used to control what Set Amins can do
-												  // C2017-030 - new Admin Tools user interface
+		// C2017-030 - new Admin Tools user interface
-												  // pass in session info to constructor
+		// pass in session info to constructor
-
+		public frmBatchRefresh(SessionInfo sessionInfo)
-		private frmVEPROMS _veProms;
-		
-		public frmBatchRefresh(SessionInfo sessionInfo, frmVEPROMS veProms)
 		{
 			InitializeComponent();
 			_MySessionInfo = sessionInfo;
-			_veProms = veProms;
-
-			if (sideNavItmDelete.Checked)
-			{
-				AdminToolType = (E_AdminToolType)4;
-				if (swDeleteFolder.Value)
-				{
-					ResetDelTV(true);
-					setupProgessSteps1();
-				}
-				else
-					ResetDelTV(false);
-			}
-
 			setupProgessSteps1(); // C2017-030 - new Admin Tools user interface
 			UserInfo ui = UserInfo.GetByUserID(MySessionInfo.UserID);
 			IsAdministratorUser = ui.IsAdministrator();
@@ -60,25 +43,18 @@ namespace VEPROMS
 				swStandardHypenChars.Enabled = false;
 			}
 		}
-		// Make txtProcess text box available to frmAnnotationsClean form.
-		internal TextBox GettxtProcess()
-		{
-			return txtProcess;
-		}
 		// NOTE:  removed the Refresh ROs and Refresh Transitions and ROs options (now only Transitions can be refreshed)
 		// the Update ROs and Refresh ROs logic was merged together.  The Update ROs will functionally do both
 		// also annotations will be placed on step elements that have RO changes
 
 		// make all of the hyphen character consistant so they can all be found with the Search function
-
-
 		private void FixHyphens()
 		{
 			this.Cursor = Cursors.WaitCursor;
 			DateTime pStart = DateTime.Now;
 			txtProcess.AppendText("Standardizing Hyphens");
 			txtProcess.AppendText(Environment.NewLine);
-			txtProcess.AppendText(string.Format("Started: {0}", pStart.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(string.Format("Started: {0}",pStart.ToString("MM/dd/yyyy @ HH:mm")));
 			txtProcess.AppendText(Environment.NewLine);
 			Application.DoEvents();
 			int affectedRows = ESP_FixHyphens.Execute("vesp_FixHyphens") / 2;// Two results for each change
@@ -89,7 +65,7 @@ namespace VEPROMS
 			txtResults.AppendText(Environment.NewLine);
 			txtResults.AppendText(Environment.NewLine);
 			DateTime pEnd = DateTime.Now;
-			txtProcess.AppendText(string.Format("Completed: {0}", pEnd.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(string.Format("Completed: {0}",pEnd.ToString("MM/dd/yyyy @ HH:mm")));
 			txtProcess.AppendText(Environment.NewLine);
 			txtProcess.AppendText(Environment.NewLine);
 			Application.DoEvents();
@@ -98,7 +74,6 @@ namespace VEPROMS
 
 		private Dictionary<TreeNode, ProcedureInfo> myProcedures = new Dictionary<TreeNode, ProcedureInfo>();
 		private Dictionary<TreeNode, DocVersionInfo> myDocVersions = new Dictionary<TreeNode, DocVersionInfo>();
-		private Dictionary<TreeNode, FolderInfo> myFolders = new Dictionary<TreeNode, FolderInfo>();
 		private void frmBatchRefresh_Load(object sender, EventArgs e)
 		{
 			IsClosing = false;//B2017-221 Allow the batch dialog to close when waiting to process.
@@ -141,8 +116,6 @@ namespace VEPROMS
 			//myTreeNodePath = new List<string>();
 			myTV.Nodes.Clear();
 			myDocVersions.Clear();
-			myFolders.Clear();
-
 			FolderInfo fi = FolderInfo.GetTop();
 			TreeNode tn = myTV.Nodes.Add(fi.Name);
 			tn.Tag = fi;
@@ -152,87 +125,30 @@ 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)
-			{
-				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();
-
-			//Expand if folders
-			if (noProcs)
-				myTVdel.ExpandAll();
-
-			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)
 		{
 			bool loadedWorkingDraft = false;
-			bool loadedChildWorkingDraft = false;
+			bool loadedChildWorkingDraft = false; // B2021-060 flag when child folder working draft is loaded
-
 			foreach (FolderInfo fic in fi.SortedChildFolders)
 			{
 				TreeNode tnc = tn.Nodes.Add(fic.Name);
 				tnc.Tag = fic;
-
 				if (fic.ChildFolderCount > 0)
-				{
+					if(LoadChildFolders(fic, tnc, noProcs))
-					if (LoadChildFolders(fic, tnc, noProcs))
+						loadedChildWorkingDraft=true;
-					{
+				// B2020-114 and C2020-035 only show folders the Set Admin can access
-						loadedChildWorkingDraft = true;
-					}
-				}
-
 				if (fic.FolderDocVersionCount > 0)
 				{
 					if (!LoadDocVersions(fic, tnc, noProcs))
-					{
 						tnc.Remove();
-					}
 					else
-					{
 						loadedWorkingDraft = true;
-					}
-				}
-				else
-				{
-					// Add the folder to the dictionary
-					if (!myFolders.ContainsKey(tnc))
-					{
-						myFolders.Add(tnc, fic);
-					}
 				}
 			}
-
+			if (loadedChildWorkingDraft) loadedWorkingDraft = true; // B2021-060 if child folder working draft loaded set loadedWorkingDraft
-			if (loadedChildWorkingDraft)
-			{
-				loadedWorkingDraft = true;
-			}
-
 			if (tn.Parent != null && !loadedWorkingDraft)
-			{
 				tn.Remove();
-			}
-
 			return loadedWorkingDraft;
 		}
 		private bool LoadDocVersions(FolderInfo fic, TreeNode tnc, bool noProcs)
@@ -285,7 +201,7 @@ namespace VEPROMS
 		private void UpdateROValues()
 		{
 			this.Cursor = Cursors.WaitCursor;
-			List<ProcedureInfo> pil = new List<ProcedureInfo>();    // C2023-002: list of checked out procedures, used in frmBatchRefreshCheckedOut dialog
+			List<ProcedureInfo> pil = new List<ProcedureInfo>();	// C2023-002: list of checked out procedures, used in frmBatchRefreshCheckedOut dialog
 			List<DocVersionInfo> dvil = new List<DocVersionInfo>();
 			foreach (TreeNode tn in myDocVersions.Keys)
 				if (tn.Checked)
@@ -335,7 +251,7 @@ namespace VEPROMS
 						Application.DoEvents();
 					}
 				}
-
+				
 				Application.DoEvents();
 				// when processing more than one procedure set, display only one completed message after all are processed
 				if (ROFstInfo.MessageList != null)
@@ -357,7 +273,7 @@ namespace VEPROMS
 					sb.AppendLine("Have you requested the users to close the procedures and do you want to continue the process?");
 					frmBatchRefreshCheckedOut frmCO = new frmBatchRefreshCheckedOut(1);
 					frmCO.MySessionInfo = MySessionInfo;
-					frmCO.CheckedOutProcedures = pil;   // C2023-002: set list of checked out procedures
+					frmCO.CheckedOutProcedures = pil;	// C2023-002: set list of checked out procedures
 					frmCO.Location = new Point(Screen.PrimaryScreen.WorkingArea.Width - frmCO.Width, Screen.PrimaryScreen.WorkingArea.Height - frmCO.Height);
 					// C2023-002:  Allow close of dialog that has list of procedures that are checked out
 					if (frmCO.ShowDialog(this) != DialogResult.Cancel)
@@ -496,7 +412,7 @@ namespace VEPROMS
 			DateTime pStart = DateTime.Now;
 			txtProcess.AppendText("Refresh Transitions");
 			txtProcess.AppendText(Environment.NewLine);
-			txtProcess.AppendText(string.Format("Started: {0}", pStart.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(string.Format("Started: {0}",pStart.ToString("MM/dd/yyyy @ HH:mm")));
 			txtProcess.AppendText(Environment.NewLine);
 			txtResults.AppendText("Refresh Transitions");
 			txtResults.AppendText(Environment.NewLine);
@@ -533,19 +449,19 @@ namespace VEPROMS
 						Application.DoEvents();
 					}
 				}
-				if (numTransFixed == 0 && numTransConverted == 0)
+				if (numTransFixed == 0 && numTransConverted ==0)
 				{
 					txtResults.AppendText("No Transitions Needed Updated.");
 					txtResults.AppendText(Environment.NewLine);
 				}
 				ContentInfo.StaticContentInfoChange -= new StaticContentInfoEvent(ContentInfo_StaticContentInfoChange);
 				DateTime pEnd = DateTime.Now;
-				txtProcess.AppendText(string.Format("Completed: {0}", pEnd.ToString("MM/dd/yyyy @ HH:mm")));
+				txtProcess.AppendText(string.Format("Completed: {0}",pEnd.ToString("MM/dd/yyyy @ HH:mm")));
 				txtProcess.AppendText(Environment.NewLine);
-				txtProcess.AppendText(string.Format("Transitions Checked: {0}", numTransProcessed));
+				txtProcess.AppendText(string.Format("Transitions Checked: {0}",numTransProcessed));
 				txtProcess.AppendText(Environment.NewLine);
 				// B2018-002 - Invalid Transitions - Display Transition Refresh Statistics
-				txtProcess.AppendText(string.Format("Transitions Correct As Is: {0}", numTransProcessed - (numTransConverted + numTransFixed)));
+				txtProcess.AppendText(string.Format("Transitions Correct As Is: {0}",numTransProcessed - (numTransConverted + numTransFixed)));
 				txtProcess.AppendText(Environment.NewLine);
 				txtProcess.AppendText(string.Format("Transitions Modified: {0}", numTransFixed));
 				txtProcess.AppendText(Environment.NewLine);
@@ -574,10 +490,10 @@ namespace VEPROMS
 			}
 			this.Cursor = Cursors.Default;
 			// B2018-002 - Invalid Transitions - Display Transition Refresh Statisitic
-			if (numTransFixed == 0 && numTransConverted == 0)
+			if (numTransFixed == 0 && numTransConverted ==0)
-				MessageBox.Show(string.Format("{0} Transitions Checked.\n\nNo Transitions Modified.", numTransProcessed), "Refresh Transitions Completed");
+				MessageBox.Show(string.Format("{0} Transitions Checked.\n\nNo Transitions Modified.",numTransProcessed), "Refresh Transitions Completed");
 			else
-				MessageBox.Show(string.Format("{0} Transitions Checked.\n\n {1} Correct as is.\n\n {2} Transitions modified.\n\n {3} Transitions converted to text.", numTransProcessed, numTransProcessed - (numTransFixed + numTransConverted), numTransFixed, numTransConverted), "Refresh Transitions Completed");
+				MessageBox.Show(string.Format("{0} Transitions Checked.\n\n {1} Correct as is.\n\n {2} Transitions modified.\n\n {3} Transitions converted to text.", numTransProcessed, numTransProcessed - (numTransFixed + numTransConverted),numTransFixed, numTransConverted), "Refresh Transitions Completed");
 		}
 
 		// C2017-030 - new Admin Tools user interface
@@ -590,7 +506,7 @@ namespace VEPROMS
 			DateTime pStart = DateTime.Now;
 			txtProcess.AppendText("Refreshing Word Attachments");
 			txtProcess.AppendText(Environment.NewLine);
-			txtProcess.AppendText(string.Format("Started: {0}", pStart.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(string.Format("Started: {0}",pStart.ToString("MM/dd/yyyy @ HH:mm")));
 			txtProcess.AppendText(Environment.NewLine);
 			Application.DoEvents();
 			int affectedRows = ESP_DeletePDFs.Execute("vesp_DeletePDFs");
@@ -600,7 +516,7 @@ namespace VEPROMS
 			txtResults.AppendText(Environment.NewLine);
 			txtResults.AppendText(Environment.NewLine);
 			DateTime pEnd = DateTime.Now;
-			txtProcess.AppendText(string.Format("Completed: {0}", pEnd.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(string.Format("Completed: {0}",pEnd.ToString("MM/dd/yyyy @ HH:mm")));
 			txtProcess.AppendText(Environment.NewLine);
 			txtProcess.AppendText(Environment.NewLine);
 			Application.DoEvents();
@@ -645,7 +561,7 @@ namespace VEPROMS
 		private int RefreshForSearch()
 		{
 			int cntfix = 0;
-			List<int> gids = GridInfoList.GetIds();     // get all grids in database
+			List<int> gids = GridInfoList.GetIds();		// get all grids in database
 			pbProcess.Minimum = 0;
 			pbProcess.Maximum = gids.Count;
 			pbProcess.Step = 1;
@@ -654,7 +570,7 @@ namespace VEPROMS
 				using (Content cc = Content.Get(cid))
 				{
 					StepConfig sc = new StepConfig(cc.Config);
-					if (!sc.Step_FixedTblForSrch)       // if not processed through this code already, get searchable text & save
+					if (!sc.Step_FixedTblForSrch)		// if not processed through this code already, get searchable text & save
 					{
 						try
 						{
@@ -672,7 +588,7 @@ namespace VEPROMS
 									cc.UserID = Volian.Base.Library.VlnSettings.UserID;
 									cc.DTS = DateTime.Now;
 									cc.Text = srchtxt;
-
+									
 								}
 								sc.Step_FixedTblForSrch = true;
 								cc.Config = sc.ToString();
@@ -699,7 +615,7 @@ namespace VEPROMS
 			DateTime pStart = DateTime.Now;
 			txtProcess.AppendText("Identifing Orphan Items");
 			txtProcess.AppendText(Environment.NewLine);
-			txtProcess.AppendText(string.Format("Started: {0}", pStart.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(string.Format("Started: {0}",pStart.ToString("MM/dd/yyyy @ HH:mm")));
 			txtProcess.AppendText(Environment.NewLine);
 			Application.DoEvents();
 			int rowCount = ESP_IdentifyDisconnectedItems.Execute("vesp_GetDisconnectedItemsCount");
@@ -720,7 +636,7 @@ namespace VEPROMS
 				txtResults.AppendText(Environment.NewLine);
 			}
 			DateTime pEnd = DateTime.Now;
-			txtProcess.AppendText(string.Format("Completed: {0}", pEnd.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(string.Format("Completed: {0}",pEnd.ToString("MM/dd/yyyy @ HH:mm")));
 			txtProcess.AppendText(Environment.NewLine);
 			txtProcess.AppendText(Environment.NewLine);
 			Application.DoEvents();
@@ -736,7 +652,7 @@ namespace VEPROMS
 			DateTime pStart = DateTime.Now;
 			txtProcess.AppendText("Purging Orphan Items");
 			txtProcess.AppendText(Environment.NewLine);
-			txtProcess.AppendText(string.Format("Started: {0}", pStart.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(string.Format("Started: {0}",pStart.ToString("MM/dd/yyyy @ HH:mm")));
 			txtProcess.AppendText(Environment.NewLine);
 			Application.DoEvents();
 			int rowCount = ESP_IdentifyDisconnectedItems.Execute("vesp_GetDisconnectedItemsCount");
@@ -773,7 +689,7 @@ namespace VEPROMS
 				txtResults.AppendText(Environment.NewLine);
 			}
 			DateTime pEnd = DateTime.Now;
-			txtProcess.AppendText(string.Format("Completed: {0}", pEnd.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(string.Format("Completed: {0}",pEnd.ToString("MM/dd/yyyy @ HH:mm")));
 			txtProcess.AppendText(Environment.NewLine);
 			txtProcess.AppendText(Environment.NewLine);
 			Application.DoEvents();
@@ -788,7 +704,7 @@ namespace VEPROMS
 			DateTime pStart = DateTime.Now;
 			txtProcess.AppendText("Identifing Unused RoFsts and Figures");
 			txtProcess.AppendText(Environment.NewLine);
-			txtProcess.AppendText(string.Format("Started: {0}", pStart.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(string.Format("Started: {0}",pStart.ToString("MM/dd/yyyy @ HH:mm")));
 			txtProcess.AppendText(Environment.NewLine);
 			Application.DoEvents();
 			int rowCountRoFst = ESP_GetUnusedRoFsts.Execute("vesp_GetUnusedRoFstsCount");
@@ -811,9 +727,9 @@ namespace VEPROMS
 			}
 
 			DateTime pEnd = DateTime.Now;
-			txtProcess.AppendText(string.Format("Completed: {0}", pEnd.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(string.Format("Completed: {0}",pEnd.ToString("MM/dd/yyyy @ HH:mm")));
 			txtProcess.AppendText(Environment.NewLine);
-			txtProcess.AppendText(string.Format("Started: {0}", pStart.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(string.Format("Started: {0}",pStart.ToString("MM/dd/yyyy @ HH:mm")));
 			txtProcess.AppendText(Environment.NewLine);
 			Application.DoEvents();
 			this.Cursor = Cursors.Default;
@@ -826,7 +742,7 @@ namespace VEPROMS
 			DateTime pStart = DateTime.Now;
 			txtProcess.AppendText("Purging Unused RoFSTs and Figures Items");
 			txtProcess.AppendText(Environment.NewLine);
-			txtProcess.AppendText(string.Format("Started: {0}", pStart.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(string.Format("Started: {0}",pStart.ToString("MM/dd/yyyy @ HH:mm")));
 			txtProcess.AppendText(Environment.NewLine);
 			Application.DoEvents();
 			int rowCountRoFst = ESP_GetUnusedRoFsts.Execute("vesp_GetUnusedRoFstsCount");
@@ -867,7 +783,7 @@ namespace VEPROMS
 				txtResults.AppendText(Environment.NewLine);
 			}
 			DateTime pEnd = DateTime.Now;
-			txtProcess.AppendText(string.Format("Completed: {0}", pEnd.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(string.Format("Completed: {0}",pEnd.ToString("MM/dd/yyyy @ HH:mm")));
 			txtProcess.AppendText(Environment.NewLine);
 			txtProcess.AppendText(Environment.NewLine);
 			Application.DoEvents();
@@ -882,7 +798,7 @@ namespace VEPROMS
 			DateTime pStart = DateTime.Now;
 			txtProcess.AppendText("Identifing Unused RO Associations");
 			txtProcess.AppendText(Environment.NewLine);
-			txtProcess.AppendText(string.Format("Started: {0}", pStart.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(string.Format("Started: {0}",pStart.ToString("MM/dd/yyyy @ HH:mm")));
 			txtProcess.AppendText(Environment.NewLine);
 			Application.DoEvents();
 			int rowCount = ESP_GetROAssoc.Execute("vesp_GetUnusedROAssociationsCount");
@@ -901,7 +817,7 @@ namespace VEPROMS
 				txtResults.AppendText(Environment.NewLine);
 			}
 			DateTime pEnd = DateTime.Now;
-			txtProcess.AppendText(string.Format("Completed: {0}", pEnd.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(string.Format("Completed: {0}",pEnd.ToString("MM/dd/yyyy @ HH:mm")));
 			txtProcess.AppendText(Environment.NewLine);
 			txtProcess.AppendText(Environment.NewLine);
 			Application.DoEvents();
@@ -916,7 +832,7 @@ namespace VEPROMS
 			DateTime pStart = DateTime.Now;
 			txtProcess.AppendText("Purging Unused Referenced Object Associations");
 			txtProcess.AppendText(Environment.NewLine);
-			txtProcess.AppendText(string.Format("Started: {0}", pStart.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(string.Format("Started: {0}",pStart.ToString("MM/dd/yyyy @ HH:mm")));
 			txtProcess.AppendText(Environment.NewLine);
 			Application.DoEvents();
 			int rowCount = ESP_GetROAssoc.Execute("vesp_GetUnusedROAssociationsCount");
@@ -950,7 +866,7 @@ namespace VEPROMS
 				txtResults.AppendText(Environment.NewLine);
 			}
 			DateTime pEnd = DateTime.Now;
-			txtProcess.AppendText(string.Format("Completed: {0}", pEnd.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(string.Format("Completed: {0}",pEnd.ToString("MM/dd/yyyy @ HH:mm")));
 			txtProcess.AppendText(Environment.NewLine);
 			txtProcess.AppendText(Environment.NewLine);
 			Application.DoEvents();
@@ -965,11 +881,11 @@ namespace VEPROMS
 			DateTime pStart = DateTime.Now;
 			txtProcess.AppendText("Identifing Hidden Item Locations");
 			txtProcess.AppendText(Environment.NewLine);
-			txtProcess.AppendText(string.Format("Started: {0}", pStart.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(string.Format("Started: {0}",pStart.ToString("MM/dd/yyyy @ HH:mm")));
 			txtProcess.AppendText(Environment.NewLine);
 			Application.DoEvents();
 			List<ItemInfo> myItems = ESP_IdentifyNonEditableItems.Execute("vesp_GetNonEditableItems");
-			txtProcess.AppendText(string.Format("Hidden Items Count:  {0}", myItems.Count));
+			txtProcess.AppendText(string.Format("Hidden Items Count:  {0}",myItems.Count));
 			txtProcess.AppendText(Environment.NewLine);
 			if (myItems.Count > 0)
 			{
@@ -990,7 +906,7 @@ namespace VEPROMS
 				txtResults.AppendText(Environment.NewLine);
 			}
 			DateTime pEnd = DateTime.Now;
-			txtProcess.AppendText(string.Format("Completed: {0}", pEnd.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(string.Format("Completed: {0}",pEnd.ToString("MM/dd/yyyy @ HH:mm")));
 			txtProcess.AppendText(Environment.NewLine);
 			txtProcess.AppendText(Environment.NewLine);
 			Application.DoEvents();
@@ -1005,16 +921,16 @@ namespace VEPROMS
 			DateTime pStart = DateTime.Now;
 			txtProcess.AppendText("Show Users in PROMS");
 			txtProcess.AppendText(Environment.NewLine);
-			txtProcess.AppendText(string.Format("Started: {0}", pStart.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(string.Format("Started: {0}",pStart.ToString("MM/dd/yyyy @ HH:mm")));
 			txtProcess.AppendText(Environment.NewLine);
 			Application.DoEvents();
 			txtResults.Clear();
 			txtResults.AppendText(ESP_GetDatabaseSessions.Execute("vesp_GetDatabaseSessions"));
 			DateTime pEnd = DateTime.Now;
-			txtProcess.AppendText(string.Format("Completed: {0}", pEnd.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(string.Format("Completed: {0}",pEnd.ToString("MM/dd/yyyy @ HH:mm")));
 			Application.DoEvents();
 			this.Cursor = Cursors.Default;
-			MessageBox.Show("Show Users Completed", "Show Users");
+			MessageBox.Show( "Show Users Completed", "Show Users");
 		}
 
 		private void ProcessUpdateROValues(DocVersionInfo dq)
@@ -1152,7 +1068,7 @@ namespace VEPROMS
 		// show the changes made in the Results pannel, include the ItemId of the step element
 		void ContentInfo_StaticContentInfoChange(object sender, StaticContentInfoEventArgs args)
 		{
-
+			
 			if (args.Type == "TX")
 			{
 				myFixesCount++;
@@ -1169,7 +1085,7 @@ namespace VEPROMS
 			}
 			else // B2018-002 - Invalid Transitions - Display Transition Cconversion Statistics
 			{
-				myFixes.AppendLine(string.Format("Converted Transition to text for {0}({1})", (sender as ItemInfo).ShortPath, (sender as ItemInfo).ItemID));
+					myFixes.AppendLine(string.Format("Converted Transition to text for {0}({1})", (sender as ItemInfo).ShortPath, (sender as ItemInfo).ItemID));
 			}
 		}
 
@@ -1205,35 +1121,10 @@ namespace VEPROMS
 					CheckChildNodes(e.Node, e.Node.Checked);
 				}
 			}
-			if (swDeleteAnnotations.Value)
-			{
-				if (e.Node.Checked)
-				{
-					DiselectParentNodes(e.Node.Parent);
-					DiselectChildNodes(e.Node.Nodes);
-				}
-			}
 
 			btnFixLinks.Enabled = AtLeastOneNodeChecked(); // C2017-030 support for Refresh Transitions/Update RO Values
 		}
-		private void DiselectParentNodes(TreeNode parent)
+
-		{
-			while (parent != null)
-			{
-				if (parent.Checked)
-					parent.Checked = false;
-				parent = parent.Parent;
-			}
-		}
-		private void DiselectChildNodes(TreeNodeCollection childes)
-		{
-			foreach (TreeNode oneChild in childes)
-			{
-				if (oneChild.Checked)
-					oneChild.Checked = false;
-				DiselectChildNodes(oneChild.Nodes);
-			}
-		}
 		private void CheckChildNodes(TreeNode treeNode, bool ischecked)
 		{
 			foreach (TreeNode tn in treeNode.Nodes)
@@ -1247,88 +1138,14 @@ namespace VEPROMS
 			}
 		}
 
-		//After check model to select and deselect nodes on the delete and annotation tree.
-		private void myTV_AfterCheck_DelAnn(object sender, TreeViewEventArgs e)
-		{
-			if (e.Action != TreeViewAction.Unknown)
-			{
-				if (e.Node.Nodes.Count > 0)
-				{
-					CheckChildNodes_DelAnn(e.Node, e.Node.Checked);
-				}
-			}
-
-			if (e.Node.Checked)
-			{
-				// Ensure child nodes follow the parent node's state
-				CheckChildNodes_DelAnn(e.Node, e.Node.Checked);
-			}
-			else
-			{
-				// Automatically deselect parent nodes if current node is unchecked
-				if (swDeleteFolder.Value) 
-					DiselectParentNodes_DelAnn(e.Node);
-			}
-
-			btnFixLinks.Enabled = AtLeastOneNodeChecked_DelAnn(); // Ensure button is enabled based on custom logic
-		}
-		private void DiselectParentNodes_DelAnn(TreeNode node)
-		{
-			TreeNode parent = node.Parent;
-			while (parent != null)
-			{
-				parent.Checked = false;
-				parent = parent.Parent;
-			}
-		}
-		private void DiselectChildNodes_DelAnn(TreeNodeCollection children)
-		{
-			foreach (TreeNode child in children)
-			{
-				child.Checked = false;
-				DiselectChildNodes_DelAnn(child.Nodes);
-			}
-		}
-		private void CheckChildNodes_DelAnn(TreeNode treeNode, bool isChecked)
-		{
-			foreach (TreeNode tn in treeNode.Nodes)
-			{
-				tn.Checked = isChecked;
-
-				if (tn.Nodes.Count > 0)
-					CheckChildNodes_DelAnn(tn, isChecked);
-			}
-		}
-		private bool AtLeastOneNodeChecked_DelAnn()
-		{
-			foreach (TreeNode node in myTV.Nodes)
-			{
-				if (node.Checked || AnyChildNodeChecked_DelAnn(node))
-					return true;
-			}
-			return false;
-		}				
-		private bool AnyChildNodeChecked_DelAnn(TreeNode node)
-		{
-			foreach (TreeNode childNode in node.Nodes)
-			{
-				if (childNode.Checked || AnyChildNodeChecked_DelAnn(childNode))
-					return true;
-			}
-			return false;
-		}
-
-
-
-
 		private ProgressBarItem _ProgressBar = null;
 
 		public ProgressBarItem ProgressBar
 		{
 			get { return _ProgressBar; }
-			set
+			set 
-			{
+			{ 
-				_ProgressBar = value;
+				_ProgressBar = value; 
 				_ProgressBar.TextVisible = true;
 			}
 		}
@@ -1429,24 +1246,6 @@ namespace VEPROMS
 			this.Close();
 		}
 
-		// new Admin Tools user interface for deletes
-		private void sideNavItmDelete_Click(object sender, EventArgs e)
-		{
-			AdminToolType = E_AdminToolType.Delete;			
-			setupProgessSteps1();
-
-			if (swDeleteFolder.Value)
-				ResetDelTV(true);
-			else
-				ResetDelTV(false);
-		}
-
-		// new Admin Tools user interface for deletes
-		//private void sideNavItmDelete_Click_1(object sender, EventArgs e)
-		//{
-
-		//}
-
 		#region On/Off Swiches
 
 		// C2017-030 new Admin Tools user interface
@@ -1455,8 +1254,7 @@ namespace VEPROMS
 			Check = 0,
 			Repair = 1,
 			Links = 2,
-			Users = 3,
+			Users = 3
-			Delete = 4
 		};
 		private E_AdminToolType AdminToolType = 0;
 
@@ -1507,23 +1305,6 @@ namespace VEPROMS
 					splitContainer3.Panel2Collapsed = true;
 					progressSteps1.Visible = false;
 					break;
-
-				case E_AdminToolType.Delete:
-					if (swDeleteFolder.Value)
-					{
-						splitContainer3.Panel2Collapsed = false;
-						progressSteps1.Items.Add(siOrphDatRecs);
-						lblAdmToolProgressType.Text = "Repairing: ";
-						progressSteps1.Visible = true;
-						progressSteps1.Refresh();
-					}
-					else
-					{
-						lblAdmToolProgressType.Text = "";
-						splitContainer3.Panel2Collapsed = true;
-						progressSteps1.Visible = false;
-					}
-					break;
 			}
 		}
 
@@ -1719,171 +1500,5 @@ namespace VEPROMS
 			}
 
 		}
-
-
-		//C2024-005 Delete Annotations, Delete Folders
-		private void swDeleteAnnotations_ValueChanged(object sender, EventArgs e)
-		{
-			setupProgessSteps1();
-			swDeleteFolder.Value = !swDeleteAnnotations.Value;
-			if (swDeleteFolder.Value)
-				ResetDelTV(true);		
-			else
-				ResetDelTV(false);
-		}
-
-		private void swDeleteFolder_ValueChanged(object sender, EventArgs e)
-		{
-			setupProgessSteps1();
-			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)
-			{
-				if (FlexibleMessageBox.Show(this, "You sure you want to remove the selected folders and their contents?", "Confirm Folder Deletion", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
-				{
-					txtProcess.AppendText("Deleting Folders...");
-
-						//Load Selected Folders with docversions
-					List<DocVersionInfo> dvil = new List<DocVersionInfo>();
-					foreach (TreeNode tn in myDocVersions.Keys)
-						if (tn.Checked)
-							dvil.Add(myDocVersions[tn]);
-
-					//Load Selected Folders with docversions
-					List<FolderInfo> ef = new List<FolderInfo>();
-					foreach (TreeNode tn in myFolders.Keys)
-						if (tn.Checked)
-							ef.Add(myFolders[tn]);
-
-					ProcessDelete(dvil, ef);
-				}
-			}
-			else
-			{
-					// Write progress status
-				txtProcess.AppendText("Deleting Annotations...");
-
-					// Create a list of procedures the user selected
-				List<ProcedureInfo> pil = new List<ProcedureInfo>();
-				foreach (TreeNode tn in myProcedures.Keys)
-					if (tn.Checked)
-						pil.Add(myProcedures[tn]);
-
-					// Create a list of doc versions the user selected
-				List<DocVersionInfo> dvil = new List<DocVersionInfo>();
-				foreach (TreeNode tn in myDocVersions.Keys)
-					if (tn.Checked)
-						dvil.Add(myDocVersions[tn]);
-
-				frmAnnotationsCleanup frmAnnoDel = new frmAnnotationsCleanup(this, pil, dvil);
-				
-				frmAnnoDel.ShowDialog();
-			}
-		}
-
-		private void ProcessDelete(List<DocVersionInfo> foldersToDelete, List<FolderInfo> emptyFoldersToDelete)
-		{
-			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)
-			{
-				//Gather folder information			
-				FolderInfo fi = (FolderInfo)kvp.ActiveParent;
-				int itemID = (int)fi.FolderID;
-				string folderName = fi.Name;
-
-				// Perform the deletion operation
-				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);
-			}
-
-
-			//Delete non working info folders.
-			foreach (var kvp in emptyFoldersToDelete)
-			{
-				//Gather folder information			
-				FolderInfo fi = (FolderInfo)kvp;
-				int itemID = (int)fi.FolderID;
-				string folderName = fi.Name;
-
-				// Perform the deletion operation
-				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);
-			}
-
-			//Run Repair
-			int prgStpIdx = -1;
-			StepProgress(++prgStpIdx, 50);
-			PurgeDisconnectedItems(); // Orphan Items
-			StepProgress(prgStpIdx, 100);
-
-			//rebuild
-			ResetDelTV(true);
-
-			MessageBox.Show("Folder Deletion Completed", "Delete Folders");
-			ClearStepProgress();
-		}
-		private bool DeleteFolderByID(int folderID)
-		{
-			try
-			{
-				//Delete
-				Folder.DeleteFolderAdmin(folderID);
-
-				//update treeview UI via veProms
-				_veProms.tv_FolderDelete(folderID);
-
-				return true;
-			}
-			catch 
-			{
-				return false;
-			}
-		}
-
-		public List<ProcedureInfo> RetrieveChkAnnotations()
-		{
-			List<ProcedureInfo> pil = new List<ProcedureInfo>();
-			foreach (TreeNode tn in myProcedures.Keys)
-				if (tn.Checked)
-					pil.Add(myProcedures[tn]);
-			return pil;
-		}
 	}
 }
-
-

PROMS/VEPROMS User Interface/frmBatchRefresh.resx

@@ -117,147 +117,27 @@
   <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="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 will allow for the deletion of groups of annotations and allow for deleting entire folders within PROMS.  Use the tree nodes to select which items to delete.
-
-Click on the on/off switches to turn on/off each tool.
-
-Note that only one of these tools can be run at a time.</value>
-  </data>
-  <data name="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.
-
-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="labelX12.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>
-  <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
-      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="swUpdateROVals.SuperTooltip" xml:space="preserve">
-    <value>This allows the user to update referenced objects values for multiple working drafts in a batch mode.
-
-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="swRefreshTrans.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="labelX11.SuperTooltip" xml:space="preserve">
-    <value>This allows the user to update referenced objects values for multiple working drafts in a batch mode.
-
-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="labelX6.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="warningBox1.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="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). 
 
@@ -304,6 +184,91 @@ This tool may take an extended period of time to execute.
 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.
+
+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="labelX12.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="warningBox5.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="swUpdateROVals.SuperTooltip" xml:space="preserve">
+    <value>This allows the user to update referenced objects values for multiple working drafts in a batch mode.
+
+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="swRefreshTrans.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="labelX11.SuperTooltip" xml:space="preserve">
+    <value>This allows the user to update referenced objects values for multiple working drafts in a batch mode.
+
+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="labelX6.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="warningBox1.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="swRefreshTblsForSrch.SuperTooltip" xml:space="preserve">
@@ -320,37 +285,37 @@ This function will remove all of the saved attachment PDFS stored in the databas
   </data>
   <data name="warningBox4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-      iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAplJREFUOE+N
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAplJREFUOE+N
-      k11IU2Ecxv9zouK8CULrzo8SU3QKaSYmOJ2uFL8SK4igEIok6qKUwggySTShC41CRiiGdWNfYBcVWiGl
+        k11IU2Ecxv9zouK8CULrzo8SU3QKaSYmOJ2uFL8SK4igEIok6qKUwggySTShC41CRiiGdWNfYBcVWiGl
-      FqN0lh+UTaekzuWcuu2c9316nSdKLPEHz817/s/zPv9zOPQ/nlVQEGulF3ILPe+8SIHK8eYR5lusLwHy
+        FqN0lh+UTaekzuWcuu2c9316nSdKLPEHz817/s/zPv9zOPQ/nlVQEGulF3ILPe+8SIHK8eYR5lusLwHy
-      Oy08RqpXjjfHVCMlsydbGbekg4/r4HmwRbLWUZzyeGNqD5NK1O5lw8L8NQHckgh5SAdXA3UqIxuzZKSj
+        Oy08RqpXjjfHVCMlsydbGbekg4/r4HmwRbLWUZzyeGNqD5NK1O5lw8L8NQHckgh5SAdXA3UqIxuzZKSj
-      8ssI8Il9wMQeYDoVfD4HrsdhsNdRgTL2b4yl5Ce1qL+xcQOWxpKxMzwAMVEayIv7IU8XwVnv8+XuEfJV
+        8ssI8Il9wMQeYDoVfD4HrsdhsNdRgTL2b4yl5Ce1qL+xcQOWxpKxMzwAMVEayIv7IU8XwVnv8+XuEfJV
-      xtfjMlKZ/CYG3JYJ96wOPj6EoCBfMCkfnJdguSMG89eoVBlfS+tJCpCafa1stgBYzAZbzoFGo0ZIiD84
+        xtfjMlKZ/CYG3JYJ96wOPj6EoCBfMCkfnJdguSMG89eoVBlfS+tJCpCafa1stgBYzAZbzoFGo0ZIiD84
-      KwJ350P+UQxHtfr7vUPkp9j+4GqiM1K3FtyVB8h5wlSI4GB/RIQHgjtzwWaywMb1WHwYg7lKOq3YVrlz
+        KwJ350P+UQxHtfr7vUPkp9j+4GqiM1K3FtyVB8h5wlSI4GB/RIQHgjtzwWaywMb1WHwYg7lKOq3YVrlz
-      jPw8RrWFOUoAJhpwcaNciNDQQMRGB4FNpIMNp4B93A2pXw/7ZbWlufCvFguNdNzzOta7J5S6fP4AdkVq
+        jPw8RrWFOUoAJhpwcaNciNDQQMRGB4FNpIMNp4B93A2pXw/7ZbWlufCvFguNdNzzOta7J5S6fP4AdkVq
-      kKQVAQNJYO8TwHq0kD8kwdkWhZkLdMJrrsonlfu2yszmSsA9Bat1p0XdsTTcvxmJtpowyL1ar/m3PKYM
+        kKQVAQNJYO8TwHq0kD8kwdkWhZkLdMJrrsonlfu2yszmSsA9Bat1p0XdsTTcvxmJtpowyL1ar/m3PKYM
-      2MpVgzcySUWTdWRwd+wAXzoo3r5B7CnqDqVg+lW89yuoVARrR/SaANm0F46mUFjOUjYtN9BTaVQYJzPA
+        2MpVgzcySUWTdWRwd+wAXzoo3r5B7CnqDqVg+lW89yuoVARrR/SaANm0F46mUFjOUjYtN9BTaVQYJzPA
-      RlPB+hNF3XjvP3C9bDuqTm2D9DZuTcCKXN1psJ2ndhGgnpJGciENGyB9zoJk1kMezFonySw0oIf0KVOs
+        RlPB+hNF3XjvP3C9bDuqTm2D9DZuTcCKXN1psJ2ndhGgnpJGciENGyB9zoJk1kMezFonySw0oIf0KVOs
-      oIO7L3MlYITstVTsrKNHCzXU5aimnvmrZPp5hfrtlWS2X6LBuQoatJWTWQz3C5mEeoS6hNqt5yj7FysJ
+        oIO7L3MlYITstVTsrKNHCzXU5aimnvmrZPp5hfrtlWS2X6LBuQoatJWTWQz3C5mEeoS6hNqt5yj7FysJ
-      zJwL4b/EAAAAAElFTkSuQmCC
+        zJwL4b/EAAAAAElFTkSuQmCC
-    </value>
+</value>
   </data>
   <data name="warningBox2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-      iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAplJREFUOE+N
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAplJREFUOE+N
-      k11IU2Ecxv9zouK8CULrzo8SU3QKaSYmOJ2uFL8SK4igEIok6qKUwggySTShC41CRiiGdWNfYBcVWiGl
+        k11IU2Ecxv9zouK8CULrzo8SU3QKaSYmOJ2uFL8SK4igEIok6qKUwggySTShC41CRiiGdWNfYBcVWiGl
-      FqN0lh+UTaekzuWcuu2c9316nSdKLPEHz817/s/zPv9zOPQ/nlVQEGulF3ILPe+8SIHK8eYR5lusLwHy
+        FqN0lh+UTaekzuWcuu2c9316nSdKLPEHz817/s/zPv9zOPQ/nlVQEGulF3ILPe+8SIHK8eYR5lusLwHy
-      Oy08RqpXjjfHVCMlsydbGbekg4/r4HmwRbLWUZzyeGNqD5NK1O5lw8L8NQHckgh5SAdXA3UqIxuzZKSj
+        Oy08RqpXjjfHVCMlsydbGbekg4/r4HmwRbLWUZzyeGNqD5NK1O5lw8L8NQHckgh5SAdXA3UqIxuzZKSj
-      8ssI8Il9wMQeYDoVfD4HrsdhsNdRgTL2b4yl5Ce1qL+xcQOWxpKxMzwAMVEayIv7IU8XwVnv8+XuEfJV
+        8ssI8Il9wMQeYDoVfD4HrsdhsNdRgTL2b4yl5Ce1qL+xcQOWxpKxMzwAMVEayIv7IU8XwVnv8+XuEfJV
-      xtfjMlKZ/CYG3JYJ96wOPj6EoCBfMCkfnJdguSMG89eoVBlfS+tJCpCafa1stgBYzAZbzoFGo0ZIiD84
+        xtfjMlKZ/CYG3JYJ96wOPj6EoCBfMCkfnJdguSMG89eoVBlfS+tJCpCafa1stgBYzAZbzoFGo0ZIiD84
-      KwJ350P+UQxHtfr7vUPkp9j+4GqiM1K3FtyVB8h5wlSI4GB/RIQHgjtzwWaywMb1WHwYg7lKOq3YVrlz
+        KwJ350P+UQxHtfr7vUPkp9j+4GqiM1K3FtyVB8h5wlSI4GB/RIQHgjtzwWaywMb1WHwYg7lKOq3YVrlz
-      jPw8RrWFOUoAJhpwcaNciNDQQMRGB4FNpIMNp4B93A2pXw/7ZbWlufCvFguNdNzzOta7J5S6fP4AdkVq
+        jPw8RrWFOUoAJhpwcaNciNDQQMRGB4FNpIMNp4B93A2pXw/7ZbWlufCvFguNdNzzOta7J5S6fP4AdkVq
-      kKQVAQNJYO8TwHq0kD8kwdkWhZkLdMJrrsonlfu2yszmSsA9Bat1p0XdsTTcvxmJtpowyL1ar/m3PKYM
+        kKQVAQNJYO8TwHq0kD8kwdkWhZkLdMJrrsonlfu2yszmSsA9Bat1p0XdsTTcvxmJtpowyL1ar/m3PKYM
-      2MpVgzcySUWTdWRwd+wAXzoo3r5B7CnqDqVg+lW89yuoVARrR/SaANm0F46mUFjOUjYtN9BTaVQYJzPA
+        2MpVgzcySUWTdWRwd+wAXzoo3r5B7CnqDqVg+lW89yuoVARrR/SaANm0F46mUFjOUjYtN9BTaVQYJzPA
-      RlPB+hNF3XjvP3C9bDuqTm2D9DZuTcCKXN1psJ2ndhGgnpJGciENGyB9zoJk1kMezFonySw0oIf0KVOs
+        RlPB+hNF3XjvP3C9bDuqTm2D9DZuTcCKXN1psJ2ndhGgnpJGciENGyB9zoJk1kMezFonySw0oIf0KVOs
-      oIO7L3MlYITstVTsrKNHCzXU5aimnvmrZPp5hfrtlWS2X6LBuQoatJWTWQz3C5mEeoS6hNqt5yj7FysJ
+        oIO7L3MlYITstVTsrKNHCzXU5aimnvmrZPp5hfrtlWS2X6LBuQoatJWTWQz3C5mEeoS6hNqt5yj7FysJ
-      zJwL4b/EAAAAAElFTkSuQmCC
+        zJwL4b/EAAAAAElFTkSuQmCC
-    </value>
+</value>
   </data>
   <data name="swRmObsoleteROData.SuperTooltip" xml:space="preserve">
     <value>Referenced Objects databases are associated with a procedure set (such as Working Draft). 
@@ -403,6 +368,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>46</value>
+    <value>38</value>
   </metadata>
-</root>
+</root>

PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs

@@ -214,7 +214,7 @@ namespace VEPROMS
 			this.btnSendErrorLog,
 			this.btnShowErrFld,
 			this.btnShowPrtFld,
-			this.btnHelpAbout});
+			this.btnHelpAbout}); ;
 			this.btnHelp.Text = "Help";
 			// 
 			// btnHelpManual
@@ -1763,4 +1763,3 @@ namespace VEPROMS
 	}
 }
 
-

PROMS/VEPROMS User Interface/frmVEPROMS.cs

@@ -216,8 +216,6 @@ namespace VEPROMS
 			set { _MyDocVersion = value; }
 		}
 
-		
-
 		// C2015-022 setup the child PROMS window
 		public frmVEPROMS(frmVEPROMS myParent, DocVersionInfo myDocVersion)
 		{
@@ -256,22 +254,6 @@ namespace VEPROMS
 			tc.RefreshItem(myItemInfo);
 		}
 
-		public void tv_FolderDelete(int folderId)
-		{
-			// Create an instance of the event args if needed
-			var args = new vlnTreeFolderDeleteEventArgs(folderId);
-
-			// Trigger the deletion using the event arguments
-			tv.RemoveFolder(args.FolderId);
-			
-		}
-		private bool Tv_DeleteFolder(object sender, vlnTreeFolderDeleteEventArgs args)
-		{
-			tv.RemoveFolder(args.FolderId);
-			return true;
-		}
-	
-
 		private E_UCFImportOptions _UCFImportOptionsFromSettings;
 
 		public frmVEPROMS()
@@ -493,7 +475,6 @@ namespace VEPROMS
 			tv.OpenItem += new vlnTreeViewItemInfoEvent(tv_OpenItem);
 			tv.TabDisplay += new StepPanelTabDisplayEvent(tc_PanelTabDisplay);
 			tv.DeleteItemInfo += new vlnTreeViewItemInfoDeleteEvent(tv_DeleteItemInfo);
-			tv.DeleteFolder += new vlnTreeViewItemInfoDeleteFolderEvent(Tv_DeleteFolder);
 			tv.InsertItemInfo += new vlnTreeViewItemInfoInsertEvent(tv_InsertItemInfo);
 			tv.NodeInsert += new vlnTreeViewEvent(tv_NodeInsert);
 			tv.PasteItemInfo += new vlnTreeViewItemInfoPasteEvent(tv_PasteItemInfo);
@@ -1622,11 +1603,6 @@ namespace VEPROMS
 			return rtval;
 		}
 
-		private bool tv_DeleteFolder(object sender, vlnTreeItemInfoEventArgs args)
-		{
-			return true;
-		}
-
 		private bool tv_PasteItemInfo(object sender, vlnTreeItemInfoPasteEventArgs args)
 		{
 			return tc.PasteRTBItem(args.MyItemInfo, args.CopyStartID, args.PasteType, (int)args.Type);
@@ -2765,7 +2741,7 @@ namespace VEPROMS
 
 		void btnAdministrativeTools_Click(object sender, EventArgs e)
 		{
-			frmBatchRefresh frm = new frmBatchRefresh(MySessionInfo, this);
+			frmBatchRefresh frm = new frmBatchRefresh(MySessionInfo);
 			frm.ProgressBar = bottomProgBar;
 			frm.ShowDialog(this);
 		}

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

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

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

@@ -1433,31 +1433,6 @@ namespace VEPROMS.CSLA.Library
 				throw new DbCslaException("Folder.Remove", ex);
 			}
 		}
-		[Transactional(TransactionalTypes.TransactionScope)]
-		public static void DeleteFolderAdmin(int folderID)
-		{
-			if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] Folder.Remove", 0);
-			try
-			{
-				using (SqlConnection cn = Database.VEPROMS_SqlConnection)
-				{
-					using (SqlCommand cm = cn.CreateCommand())
-					{
-						cm.CommandType = CommandType.StoredProcedure;
-						cm.CommandTimeout = Database.SQLTimeout;
-						cm.CommandText = "deleteFolderAdmin";
-						cm.Parameters.AddWithValue("@FolderID", folderID);
-						cm.ExecuteNonQuery();
-					}
-				}
-			}
-			catch (Exception ex)
-			{
-				if (_MyLog.IsErrorEnabled) _MyLog.Error("Folder.Remove", ex);
-				throw new DbCslaException("Folder.Remove", ex);
-			}
-		}
-
 		#endregion
 		#region Exists
 		public static bool Exists(int folderID)
@@ -1561,8 +1536,6 @@ namespace VEPROMS.CSLA.Library
 				// Needs to be overriden to add new validation rules
 			}
 		}
-
-		
 		#endregion
 	} // Class
 	#region Converter

PROMS/VEPROMS.CSLA.Library/VEObjects/VETreeNode.cs

@@ -167,9 +167,7 @@ namespace VEPROMS.CSLA.Library
 			tn.ResetNode("Dummy GetFolder");
 			return tn;
 		}
-
+//		public abstract void LoadChildren();
-		
-		//		public abstract void LoadChildren();
 		//private long _Start;
 		//private Dictionary<string, long> _Timings=new Dictionary<string,long>();
 		//private void tReset()

PROMS/Volian.Controls.Library/DisplaySearch.cs

@@ -346,11 +346,10 @@ namespace Volian.Controls.Library
 								ch = (ROFSTLookup.rochild)cmboTreeROs.SelectedNode.Tag;
 								chld = ch.children;
 								// build a list of ROs to search
-								// B2022-118: remove the ending comma otherwise query will fail
+								return _MyRODbID.ToString() + ":" + GetROsToSearch(chld);
-								string strRtnStr = _MyRODbID.ToString() + ":" + GetROsToSearch(chld);
+								//return _MyRODbID.ToString() + ":" + ch.roid + "0000," + GetROsToSearch(chld);
-								if (strRtnStr.EndsWith(","))
+								//if (strRtnStr.EndsWith(","))
-									strRtnStr = strRtnStr.Substring(0, strRtnStr.Length - 1);
+								//	strRtnStr = strRtnStr.Substring(0, strRtnStr.Length - 1);
-								return strRtnStr;
 							}
 						}
 					}
@@ -1940,13 +1939,6 @@ namespace Volian.Controls.Library
 		private string GetROsToSearch(ROFSTLookup.rochild[] chld)
 		{
 			string rtnstr = string.Empty;
-			// B2022-118: If the ro has child nodes in tree view but they aren't loaded, load them
-			if ((chld == null || chld.Length <= 0) && (cmboTreeROs.SelectedNode.Nodes != null || cmboTreeROs.SelectedNode.Nodes.Count >= 1))
-			{
-				ROFSTLookup.rochild ro = (ROFSTLookup.rochild)cmboTreeROs.SelectedNode.Tag;
-				MyROFSTLookup.LoadChildren(ref ro);
-				chld = ro.children;
-			}
 
 			// B2022-026 RO Memory Reduction code - check children length
 			if (chld == null || chld.Length <= 0) // get a single ROID
@@ -1964,17 +1956,7 @@ namespace Volian.Controls.Library
 					if (roc.children != null && roc.children.Length > 0)
 						rtnstr += GetROsToSearch(roc.children);
 					else
-					{
+						rtnstr += ROFSTLookup.FormatRoidKey(roc.roid, false);
-						// B2022-118: If the ro has child nodes in tree view but they aren't loaded, load them
-						ROFSTLookup.rochild rot = roc;
-						MyROFSTLookup.LoadChildren(ref rot);
-						chld = rot.children;
-
-						if (rot.children != null && rot.children.Length > 0)
-							rtnstr += GetROsToSearch(rot.children);
-						else
-							rtnstr += string.Format("{0},", ROFSTLookup.FormatRoidKey(roc.roid, false));
-					}
 				}
 			}
 

PROMS/Volian.Controls.Library/DisplayTabControl.cs

@@ -669,7 +669,7 @@ namespace Volian.Controls.Library
 			ItemInfo proc = myItemInfo.MyProcedure; // Find procedure Item
 			string key = "Item - " + proc.ItemID.ToString();
 
-			if (_MyDisplayTabItems.ContainsKey(key) && pasteType != ItemInfo.EAddpingPart.Replace) // If procedure page open use it unless replace
+			if (_MyDisplayTabItems.ContainsKey(key)) // If procedure page open use it
 			{
 				DisplayTabItem pg = _MyDisplayTabItems[key];
 				if (pg.MyStepTabPanel.MyStepPanel._LookupEditItems.ContainsKey(myItemInfo.ItemID) &&
@@ -708,11 +708,6 @@ namespace Volian.Controls.Library
 					return true;
 				}
 			}
-			else if (_MyDisplayTabItems.ContainsKey(key) && pasteType == ItemInfo.EAddpingPart.Replace)
-			{
-				CloseTabItem(_MyDisplayTabItems["Item - " + myItemInfo.ItemID.ToString()]); //Grab itemID and set to close open tab.
-				return false; //B2017-179 PasteReplace will return null if was aborted
-			}
 			return false;
 		}
 

PROMS/Volian.Controls.Library/EditItem.cs

@@ -1825,16 +1825,8 @@ namespace Volian.Controls.Library
 			EditItem newFocus = null;
 			EditItem nextEditItem = MyNextEditItem;
 			EditItem prevEditItem = MyPreviousEditItem;
-			EditItem parentEditItem = null; // ActiveParent;
+			if (MyStepPanel?.SelectedEditItem?.ActiveParent == null) return null; //Was causing an error when active parent was null and the replaced proc was opened in the editor.
-			try
+			EditItem parentEditItem = ActiveParent;
-			{
-				parentEditItem = ActiveParent ?? MyStepPanel?.SelectedEditItem?.ActiveParent;
-			}
-			catch (NullReferenceException)
-			{
-				// KL 7/11/2024 - Handle the case where ActiveParent throws a Null Reference Exception
-				parentEditItem = MyStepPanel?.SelectedEditItem?.ActiveParent; 
-			}
 
 			StepConfig savOrigPasteConfig = MyItemInfo.MyConfig as StepConfig;
 			int TopMostYBefore = TopMostEditItem.Top;

PROMS/Volian.Controls.Library/vlnTreeView.cs

@@ -22,11 +22,10 @@ namespace Volian.Controls.Library
 	public delegate void vlnTreeViewEvent(object sender, vlnTreeEventArgs args);
 	public delegate void vlnTreeViewTimeEvent(object sender, vlnTreeTimeEventArgs args);
 	public delegate void vlnTreeViewStatusEvent(object sender, vlnTreeStatusEventArgs args);
-	public delegate ItemInfo vlnTreeViewClipboardStatusEvent(object sender, vlnTreeEventArgs args);
+  public delegate ItemInfo vlnTreeViewClipboardStatusEvent(object sender, vlnTreeEventArgs args);
-	public delegate void vlnTreeViewItemInfoEvent(object sender, vlnTreeItemInfoEventArgs args);
+  public delegate void vlnTreeViewItemInfoEvent(object sender, vlnTreeItemInfoEventArgs args);
 	public delegate bool vlnTreeViewBoolEvent(object sender, vlnTreeEventArgs args);
 	public delegate bool vlnTreeViewItemInfoDeleteEvent(object sender, vlnTreeItemInfoEventArgs args);
-	public delegate bool vlnTreeViewItemInfoDeleteFolderEvent(object sender, vlnTreeFolderDeleteEventArgs args);
 	public delegate bool vlnTreeViewItemInfoInsertEvent(object sender, vlnTreeItemInfoInsertEventArgs args);
 	public delegate bool vlnTreeViewItemInfoPasteEvent(object sender, vlnTreeItemInfoPasteEventArgs args);
 	public delegate TreeNode vlnTreeViewTreeNodeEvent(object sender, vlnTreeEventArgs args);
@@ -221,15 +220,6 @@ namespace Volian.Controls.Library
 		}
 		#endregion
 	}
-	public class vlnTreeFolderDeleteEventArgs : EventArgs
-	{
-		public int FolderId { get; }
-
-		public vlnTreeFolderDeleteEventArgs(int folderId)
-		{
-			FolderId = folderId;
-		}
-	}
 	public enum E_InsertType {Before, After, Child};
 	public partial class vlnTreeItemInfoInsertEventArgs
 	{
@@ -437,12 +427,6 @@ namespace Volian.Controls.Library
 			if (DeleteItemInfo != null) return DeleteItemInfo(sender, args);
 			return false;
 		}
-		public event vlnTreeViewItemInfoDeleteFolderEvent DeleteFolder;
-		private bool OnDeleteFolder(object sender, vlnTreeFolderDeleteEventArgs args)
-		{
-			if (DeleteItemInfo != null) return DeleteFolder(sender, args);
-			return false;
-		}
 		public event vlnTreeViewItemInfoInsertEvent InsertItemInfo;
 		private bool OnInsertItemInfo(object sender, vlnTreeItemInfoInsertEventArgs args)
 		{
@@ -567,11 +551,11 @@ namespace Volian.Controls.Library
 		{
 			if (ProcedureCheckedOutTo != null) ProcedureCheckedOutTo(sender, args);
 		}
-		public event vlnTreeViewEvent ExportImportProcedureSets;
+    public event vlnTreeViewEvent ExportImportProcedureSets;
-		private void OnExportImportProcedureSets(object sender, vlnTreeEventArgs args)
+    private void OnExportImportProcedureSets(object sender, vlnTreeEventArgs args)
-		{
+    {
-			if (ExportImportProcedureSets != null) ExportImportProcedureSets(sender, args);
+      if (ExportImportProcedureSets != null) ExportImportProcedureSets(sender, args);
-		}
+    }
 		public event vlnTreeViewEvent PrintTransitionReport;
 		private void OnPrintTransitionReport(object sender, vlnTreeEventArgs args)
 		{
@@ -623,7 +607,7 @@ namespace Volian.Controls.Library
 		// This event was added to update the Step Properties/RO & Tools/Search RO & Reports
 		// when an update of ro.fst is done & the ro trees on those panels needs refreshed.
 		// (bug fix B2015-226)
-		public event StepPanelTabDisplayEvent TabDisplay;
+		public event StepPanelTabDisplayEvent TabDisplay;		
 		private void OnTabDisplay(object sender, StepPanelTabDisplayEventArgs args)
 		{
 			if (TabDisplay != null) TabDisplay(sender, args);
@@ -709,39 +693,39 @@ namespace Volian.Controls.Library
 						//_MyLog.WarnFormat("Context Menu 1b - {0}", GC.GetTotalMemory(true));
 						if (ui.IsAdministrator() || ui.IsSetAdministrator(fi))
 						{
-							if (fi.MyParent != null)        // don't allow insert before/after if at top node
+							if (fi.MyParent != null)		// don't allow insert before/after if at top node
 							{
 								if (!ui.IsAdministrator() && DoSpecificInfo) cm.MenuItems.Add("Procedure Set Specific Information", new EventHandler(mi_Click));
 								// B2020-111 only allow Set Administrator to add new folders inside folders they admininstrate
-								if (ui.IsAdministrator() || ui.IsSetAdministrator(fi.MyParent))
+								if (ui.IsAdministrator()||ui.IsSetAdministrator(fi.MyParent))
 								{
 									cm.MenuItems.Add("Insert Folder Before", new EventHandler(mi_Click));
 									cm.MenuItems.Add("Insert Folder After", new EventHandler(mi_Click));
 								}
 							}
 							// B2020-111 only allow Set Administrator to add new folders inside folders they admininstrate
-							if ((ui.IsAdministrator() || ui.IsSetAdministrator(fi.MyParent)) && fi.FolderDocVersionCount == 0)
+							if ((ui.IsAdministrator() || ui.IsSetAdministrator(fi.MyParent)) && fi.FolderDocVersionCount == 0) 
 								cm.MenuItems.Add("New Folder", new EventHandler(mi_Click));
-							if (fi.ChildFolderCount == 0 && !fi.HasWorkingDraft)
+							if (fi.ChildFolderCount == 0 && !fi.HasWorkingDraft) 
 								cm.MenuItems.Add("Create Working Draft", new EventHandler(mi_Click));
 						}
-						if (fi.HasWorkingDraft)
+						if (fi.HasWorkingDraft)  
 							cm.MenuItems.Add("Print Transition Report", new EventHandler(mi_Click));
 					}
-					else if (tn.VEObject as DocVersionInfo != null)     // DocVersions can only contain procs
+					else if (tn.VEObject as DocVersionInfo != null)		// DocVersions can only contain procs
 					{
 						isWrkDftNode = true;
 						//_MyLog.WarnFormat("Context Menu 1c - {0}", GC.GetTotalMemory(true));
 						DocVersionInfo dvi = tn.VEObject as DocVersionInfo;
 						if (ui.IsAdministrator() || ui.IsSetAdministrator(dvi))
-						{
+            {
-							cm.MenuItems.Add("Import Procedure", mi_Click);
+              cm.MenuItems.Add("Import Procedure", mi_Click);
-						}
+            }
-						if (ui.IsAdministrator() || ui.IsSetAdministrator(dvi) || ui.IsWriter(dvi))
+            if (ui.IsAdministrator() || ui.IsSetAdministrator(dvi) || ui.IsWriter(dvi))
 						{
 							OwnerInfoList.Reset();
 							oil = OwnerInfoList.GetByVersionID(dvi.VersionID);
-							if (dvi.ActiveFormat.PlantFormat.FormatData.SpecificInfo)
+							if (dvi.ActiveFormat.PlantFormat.FormatData.SpecificInfo) 
 								cm.MenuItems.Add("Procedure Set Specific Information", new EventHandler(mi_Click));
 							cm.MenuItems.Add("Refresh Checked Out Procedures", new EventHandler(mi_Click));
 							cm.MenuItems.Add("New Procedure", new EventHandler(mi_Click));
@@ -828,15 +812,15 @@ namespace Volian.Controls.Library
 							urv.Enabled = !dvi.ROfstLastCompleted || dvi.NewerRoFst;
 						}
 					}
-					else if (tn.VEObject as ProcedureInfo != null)      // Procs can only contain sections
+					else if (tn.VEObject as ProcedureInfo != null)		// Procs can only contain sections
 					{
 						isProcNode = true;
 						ProcedureInfo pri = tn.VEObject as ProcedureInfo;
 						oi = OwnerInfo.GetByItemID(pri.ItemID, CheckOutType.Procedure);
 						if (ui.IsAdministrator() || ui.IsSetAdministrator(pri.MyDocVersion))
-						{
+            {
-							cm.MenuItems.Add("Export Procedure", mi_Click);
+              cm.MenuItems.Add("Export Procedure", mi_Click);
-						}
+            }
 						if (ui.IsAdministrator() || ui.IsSetAdministrator(pri.MyDocVersion) || ui.IsWriter(pri.MyDocVersion))
 						{
 							if (oi != null && oi.SessionID != MySessionInfo.SessionID)
@@ -887,7 +871,7 @@ namespace Volian.Controls.Library
 								}
 								cm.MenuItems.Add(micas);
 								cm.MenuItems.Add(mitcas);
-								cm.MenuItems.Add(mip);
+								cm.MenuItems.Add(mip); 
 								cm.MenuItems.Add(miqp);
 								//cm.MenuItems.Add(mips);
 								AddShowChangeBarsAfterMenuItem(cm.MenuItems, pri);
@@ -1068,36 +1052,36 @@ namespace Volian.Controls.Library
 						ok = true;
 					else if (tn.VEObject is ItemInfo && (ui.IsAdministrator() || ui.IsSetAdministrator((tn.VEObject as ItemInfo).MyProcedure.MyDocVersion) || ui.IsWriter((tn.VEObject as ItemInfo).MyProcedure.MyDocVersion)))
 						ok = true;
-					if (ok)
+					if(ok)
 						Menu_Paste(tn, cm);
 					#endregion
 					//_MyLog.WarnFormat("Context Menu 5 - {0}", GC.GetTotalMemory(true));
 
 					#region Menu_Delete
 					if (ok)
-					{
-						// Add delete to the menu unless at the very 'top' node, on a grouping (partinfo)
-						// node (RNOs, Steps, Cautions, Notes) or Folder/DocVersion that contains any items.
-						PartInfo pi = tn.VEObject as PartInfo;
-						if (pi == null && tn.Parent != null)        // it's not a part and it's not the top....
 						{
-							fi = tn.VEObject as FolderInfo;
+							// Add delete to the menu unless at the very 'top' node, on a grouping (partinfo)
-							if (fi == null || tn.Nodes.Count == 0)  // it's not a folder or it has no children
+							// node (RNOs, Steps, Cautions, Notes) or Folder/DocVersion that contains any items.
+							PartInfo pi = tn.VEObject as PartInfo;
+							if (pi == null && tn.Parent != null)		// it's not a part and it's not the top....
 							{
-								DocVersionInfo di = tn.VEObject as DocVersionInfo;
+								fi = tn.VEObject as FolderInfo;
-								if (di == null || tn.Nodes.Count == 0)  // it's not a docversion or it has no children
+								if (fi == null || tn.Nodes.Count == 0)	// it's not a folder or it has no children
 								{
-									// if it's an enhanced step that was linked from a source, don't allow delete
+									DocVersionInfo di = tn.VEObject as DocVersionInfo;
-									bool canDoDel = true;
+									if (di == null || tn.Nodes.Count == 0)	// it's not a docversion or it has no children
-									ItemInfo iienh = tn.VEObject as ItemInfo;
+									{
-									if (iienh != null && iienh.IsProcedure && iienh.IsEnhancedProcedure) canDoDel = false;
+										// if it's an enhanced step that was linked from a source, don't allow delete
-									if (iienh != null && iienh.IsSection && iienh.IsEnhancedSection && !iienh.IsEnhancedSectionTitleOnly) canDoDel = false;
+										bool canDoDel = true;
-									if (iienh != null && iienh.IsEnhancedStep) canDoDel = false;
+										ItemInfo iienh = tn.VEObject as ItemInfo;
-									if (canDoDel) cm.MenuItems.Add("Delete", new EventHandler(mi_Click));
+										if (iienh != null && iienh.IsProcedure && iienh.IsEnhancedProcedure) canDoDel = false;
+										if (iienh != null && iienh.IsSection && iienh.IsEnhancedSection && !iienh.IsEnhancedSectionTitleOnly) canDoDel = false;
+										if (iienh != null && iienh.IsEnhancedStep) canDoDel = false;
+										if (canDoDel) cm.MenuItems.Add("Delete", new EventHandler(mi_Click));
+									}
 								}
 							}
 						}
-					}
 					#endregion
 					//_MyLog.WarnFormat("Context Menu 6 - {0}", GC.GetTotalMemory(true));
 					#region Menu_ExternalTransitions
@@ -1133,13 +1117,13 @@ namespace Volian.Controls.Library
 								}
 								doclink = string.Format("Unlink Source and {0} Procedure", doclink);
 								MenuItem mix = cm.MenuItems.Add(doclink, new EventHandler(miEnhanced_Click));
-								mix.Tag = -1;       // NOTE this is what flags what gets processed on menu click, i.e. -1
+								mix.Tag = -1;		// NOTE this is what flags what gets processed on menu click, i.e. -1
 							}
 							// if this is a source procedure that has enhanced, for example Background and/or deviation, ask which should be unlinked including all
 							else if (eds != null && eds.Count > 1)
 							{
 								MenuItem miu = new MenuItem("Unlink Enhanced Procedure(s) from Source");
-								miu.Tag = -2;       // this menu item doesn't get used.
+								miu.Tag = -2;		// this menu item doesn't get used.
 								int k = 0;
 								foreach (EnhancedDocument ed in eds)
 								{
@@ -1150,7 +1134,7 @@ namespace Volian.Controls.Library
 								}
 								// add all submenu item
 								MenuItem mp1 = miu.MenuItems.Add("All", new EventHandler(miEnhanced_Click));
-								mp1.Tag = 0;        // Tag of 0 flags All
+								mp1.Tag = 0;		// Tag of 0 flags All
 								cm.MenuItems.Add(miu);
 							}
 						}
@@ -1160,9 +1144,9 @@ namespace Volian.Controls.Library
 					// Add Properties to the menu unless at the very 'top' node or on a grouping (partinfo)
 					// node (RNOs, Steps, Cautions, Notes) or at the step level.
 					// B2020-105 Allow Set Administrators to rename folder's (sets of procedures) to which they have been given access.
-					if (tn.VEObject is FolderInfo) ok = (ui.IsAdministrator() || ui.IsSetAdministrator(tn.VEObject as FolderInfo));
+					if ( tn.VEObject is FolderInfo) ok = (ui.IsAdministrator() || ui.IsSetAdministrator(tn.VEObject as FolderInfo));
-					else ok = (tn.VEObject is DocVersionInfo) ? (ui.IsAdministrator() || ui.IsSetAdministrator(tn.VEObject as DocVersionInfo))
+					else ok = (tn.VEObject is DocVersionInfo) ?  (ui.IsAdministrator() || ui.IsSetAdministrator(tn.VEObject as DocVersionInfo)) 
-						: (ui.IsAdministrator() || (tn.VEObject is ItemInfo) && (ui.IsSetAdministrator((tn.VEObject as ItemInfo).MyProcedure.MyDocVersion)
+						: (ui.IsAdministrator() || (tn.VEObject is ItemInfo) && (ui.IsSetAdministrator((tn.VEObject as ItemInfo).MyProcedure.MyDocVersion) 
 						|| ui.IsWriter((tn.VEObject as ItemInfo).MyProcedure.MyDocVersion)));
 					PartInfo pia = tn.VEObject as PartInfo;
 					ItemInfo ii = tn.VEObject as ItemInfo;
@@ -1243,7 +1227,7 @@ namespace Volian.Controls.Library
 									itm.Text == "Procedure Set Specific Information" || itm.Text == "Approve All Procedures for" ||
 									itm.Text == "Approve Some Procedures" || itm.Text == "Approve Some Procedures for")
 									itm.Enabled = false;
-
+								
 							}
 						}
 					}
@@ -1272,9 +1256,9 @@ namespace Volian.Controls.Library
 							// F2022-024 added Time Critical Action Summary option
 							foreach (MenuItem itm in cm.MenuItems)
 							{
-								if (itm.Text == "Procedure Specific Information" || itm.Text == "New Section" || itm.Text == "Approve" || itm.Text == "Open" ||
+								if(itm.Text == "Procedure Specific Information" || itm.Text == "New Section" || itm.Text == "Approve" || itm.Text == "Open" || 
 									itm.Text == "Copy" || itm.Text == "Delete" || itm.Text == "Properties..." || itm.Text == "Replace Existing Procedure" ||
-									itm.Text.StartsWith("Showing Change Bars Starting") || itm.Text == "Create Continuous Action Summary" ||
+									itm.Text.StartsWith("Showing Change Bars Starting") || itm.Text == "Create Continuous Action Summary" || 
 									itm.Text == "Create Time Critical Action Summary" || itm.Text == "Export Procedure")
 									itm.Enabled = false;
 							}
@@ -1283,7 +1267,7 @@ namespace Volian.Controls.Library
 						{
 							foreach (MenuItem itm in cm.MenuItems)
 							{
-								if (!itm.Text.StartsWith("Document Checked Out"))
+								if(!itm.Text.StartsWith("Document Checked Out"))
 									itm.Enabled = false;
 							}
 						}
@@ -1300,7 +1284,7 @@ namespace Volian.Controls.Library
 		{
 			_currentPri = pri;
 			RevisionInfoList ril = RevisionInfoList.GetByItemID(pri.ItemID);
-			if (ril.Count == 0) return; // no versions to list
+			if (ril.Count == 0)	return; // no versions to list
 			MenuItem mi = menuItemCollection.Add("Versions");
 			int k = 0;
 			int lastApprovedRevisionID = 0;
@@ -1347,11 +1331,11 @@ namespace Volian.Controls.Library
 				ril = null;
 			}
 		}
-		public void AddNewNode(IVEDrillDownReadOnly o)
+    public void AddNewNode(IVEDrillDownReadOnly o)
-		{
+    {
-			VETreeNode tn = new VETreeNode(o);
+      VETreeNode tn = new VETreeNode(o);
-			SelectedNode.Nodes.Add(tn);
+      SelectedNode.Nodes.Add(tn);
-		}
+    }
 		private void AddApprovedRevisions(Menu.MenuItemCollection menuItemCollection, ProcedureInfo pri)
 		{
 			try
@@ -1360,7 +1344,7 @@ namespace Volian.Controls.Library
 				_currentPri = pri;
 				using (RevisionInfoList ril = RevisionInfoList.GetByItemID(pri.ItemID))
 				{
-					//_MyLog.WarnFormat("Context Menu 1 After GET - {0}", GC.GetTotalMemory(true));
+				//_MyLog.WarnFormat("Context Menu 1 After GET - {0}", GC.GetTotalMemory(true));
 					if (ril.Count == 0) return; // no versions to list
 					MenuItem mi = menuItemCollection.Add("Versions");
 					int lastApprovedRevisionID = 0;
@@ -1441,7 +1425,7 @@ namespace Volian.Controls.Library
 			RevisionConfig rc = ri.MyConfig as RevisionConfig;
 			// bug fix:  B2016-183 - add the child's name (ex Unit 1) to the export file name for Parent/Child procedures.
 			int applIdx = rc.Applicability_Index;
-			string str = (applIdx > 0) ? _currentPri.MyDocVersion.UnitNames[applIdx - 1] + "_" : ""; // if parent/child get the defined child name to inlcude the export filename
+			string str = (applIdx > 0)?_currentPri.MyDocVersion.UnitNames[applIdx-1] +"_":""; // if parent/child get the defined child name to inlcude the export filename
 			System.Xml.XmlDocument xd = new System.Xml.XmlDocument();
 			xd.LoadXml(ri.LatestVersion.ApprovedXML);
 			string PEIPath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + @"\VEPROMS\PEI_" + Database.VEPROMS_SqlConnection.Database;
@@ -1489,12 +1473,12 @@ namespace Volian.Controls.Library
 			{
 				MenuItem mip = mi.Parent as MenuItem;
 				//B2021-086 Added the check for the last revision stage is an Approved stage
-				if ((ri.RevisionID < int.Parse(mip.Parent.Tag.ToString())) && ri.LatestVersion.MyStage.IsApproved != 0)
+				if ((ri.RevisionID < int.Parse(mip.Parent.Tag.ToString())) && ri.LatestVersion.MyStage.IsApproved!=0)
 					superceded = true;
 			}
 			vlnTreeViewPdfArgs args = new vlnTreeViewPdfArgs(Volian.Base.Library.TmpFile.CreateFileName(ProcedureInfo.Get(ri.ItemID).PDFNumber), ri.LatestVersion.PDF, superceded ? "Superceded" : "");
 			OnViewPDF(sender, args);
-			//			System.Diagnostics.Process pp = System.Diagnostics.Process.Start(GetDocPdf(ri, superceded));
+//			System.Diagnostics.Process pp = System.Diagnostics.Process.Start(GetDocPdf(ri, superceded));
 		}
 		void MultiUnitApprovedRevision_Click(object sender, EventArgs e)
 		{
@@ -1607,7 +1591,7 @@ namespace Volian.Controls.Library
 				//      'from' is object copied
 				//      'to' is object where paste was selected from
 				#region Menu_Paste_ToDocVersion
-				if (tn.VEObject as DocVersionInfo != null)      // paste item must be a proc
+				if (tn.VEObject as DocVersionInfo != null)		// paste item must be a proc
 				{
 					if (iiClipboard.IsProcedure)
 					{
@@ -1617,7 +1601,7 @@ namespace Volian.Controls.Library
 						//   3) 'to' docversion is 'source' and 'from' procedure is within this docversion
 						//   4) 'to' docVersion is 'enhanced' and 'from' procedure is not
 						bool canPaste = false;
-
+						
 						DocVersionInfo dvi = tn.VEObject as DocVersionInfo;
 						DocVersionConfig dvc = dvi.DocVersionConfig;
 						bool docVersionIsEnhanced = dvc.MyEnhancedDocuments != null && dvc.MyEnhancedDocuments.Count > 0 && dvc.MyEnhancedDocuments[0].Type == 0;
@@ -1638,7 +1622,7 @@ namespace Volian.Controls.Library
 						if (iiClipboard.IsRtfRaw) canPaste = false;   // never paste an equation.
 						if (canPaste) cm.MenuItems.Add("Paste Procedure", new EventHandler(mi_Click));
 					}
-					#endregion
+				#endregion
 				}
 				else
 				{
@@ -1649,7 +1633,7 @@ namespace Volian.Controls.Library
 					{
 						SectionInfo si = (tn.VEObject as SectionInfo != null) ? tn.VEObject as SectionInfo : null;
 						#region Menu_Paste_ToFromProcedure
-						if (iiPasteHere.IsProcedure && iiClipboard.IsProcedure) // procedure can be pasted before/replace/after
+						if (iiPasteHere.IsProcedure && iiClipboard.IsProcedure)	// procedure can be pasted before/replace/after
 						{
 							//	Enhanced considerations, in order to paste a procedure around another procedure:  NOTE that an 'enhanced' procedure cannot be in paste buffer!
 							//		1) 'to' & 'from' both 'non', i.e. Neither can have enhanced config data (be source or enhanced)
@@ -1673,16 +1657,16 @@ namespace Volian.Controls.Library
 							bool prFromIsEnhanced = iiClipboard.IsEnhancedProcedure;
 							bool prFromIsSource = pcFromCfg.MyEnhancedDocuments != null && pcFromCfg.MyEnhancedDocuments.Count > 0 && pcFromCfg.MyEnhancedDocuments[0].Type != 0;
 							bool prCanPaste = false;
-							if (!prToIsEnhanced && !prToIsSource && !prFromIsEnhanced && !prFromIsSource) prCanPaste = true;    // 1)
+							if (!prToIsEnhanced && !prToIsSource && !prFromIsEnhanced && !prFromIsSource) prCanPaste = true;	// 1)
-																																// else if ((!prToIsEnhanced && !prToIsSource) && prFromIsSource) prCanPaste = false;							// 2) commented out because already set to false
+							// else if ((!prToIsEnhanced && !prToIsSource) && prFromIsSource) prCanPaste = false;							// 2) commented out because already set to false
-							else if (prToIsSource && !prFromIsEnhanced && !prFromIsSource)                                                                      // 3)
+							else if (prToIsSource && !prFromIsEnhanced && !prFromIsSource) 																		// 3)
 							{
 								prCanPaste = true;
 								okToReplace = false;
 							}
-							else if (prToIsSource && iiPasteHere.MyDocVersion.VersionID == iiClipboard.MyDocVersion.VersionID) prCanPaste = true;       // 4)
+							else if (prToIsSource && iiPasteHere.MyDocVersion.VersionID == iiClipboard.MyDocVersion.VersionID) prCanPaste = true;		// 4)
-																																						//else if (prToIsSource && iiPasteHere.MyDocVersion.VersionID != iiClipboard.MyDocVersion.VersionID) prCanPaste = false;	// 5) commented out because already set to false
+							//else if (prToIsSource && iiPasteHere.MyDocVersion.VersionID != iiClipboard.MyDocVersion.VersionID) prCanPaste = false;	// 5) commented out because already set to false
-																																						//else if (prToIsEnhanced && prFromIsSource) prCanPaste = false;   // 6)commented out because already set to false
+							//else if (prToIsEnhanced && prFromIsSource) prCanPaste = false;   // 6)commented out because already set to false
 							if (iiClipboard.IsRtfRaw) prCanPaste = okToReplace = prCanPaste = false;   // never paste an equation.
 							if (prCanPaste) cm.MenuItems.Add("Paste Procedure Before", new EventHandler(mi_Click));
 							if (okToReplace && prCanPaste) cm.MenuItems.Add("Replace Existing Procedure", new EventHandler(mi_Click));
@@ -1714,9 +1698,9 @@ namespace Volian.Controls.Library
 							bool scFromIsEnhanced = iiClipboard.IsEnhancedSection;
 							bool scFromIsSource = scFromCfg.MyEnhancedDocuments != null && scFromCfg.MyEnhancedDocuments.Count > 0 && scFromCfg.MyEnhancedDocuments[0].Type != 0;
 							bool scCanPaste = false;
-							if (!prToIsEnhanced && !prToIsSource && !scFromIsEnhanced && !scFromIsSource) scCanPaste = true;    // 1)
+							if (!prToIsEnhanced && !prToIsSource && !scFromIsEnhanced && !scFromIsSource) scCanPaste = true;	// 1)
 							else if (prToIsSource && !scFromIsEnhanced && !scFromIsSource) scCanPaste = true;
-							else if (prToIsSource && iiPasteHere.MyDocVersion.VersionID == iiClipboard.MyDocVersion.VersionID) scCanPaste = true;       // 3)
+							else if (prToIsSource && iiPasteHere.MyDocVersion.VersionID == iiClipboard.MyDocVersion.VersionID) scCanPaste = true;		// 3)
 							if (iiClipboard.IsRtfRaw) scCanPaste = false;   // never paste an equation.
 							if (scCanPaste) cm.MenuItems.Add("Paste Section", new EventHandler(mi_Click));
 						}
@@ -1740,13 +1724,13 @@ namespace Volian.Controls.Library
 							bool secFromIsEnhanced = iiClipboard.IsEnhancedSection;
 							bool secFromIsSource = secFromCfg.MyEnhancedDocuments != null && secFromCfg.MyEnhancedDocuments.Count > 0 && secFromCfg.MyEnhancedDocuments[0].Type != 0;
 							bool secCanPaste = false;
-							if (!secToIsEnhanced && !secToIsSource && !secFromIsEnhanced && !secFromIsSource) secCanPaste = true;   // 1)
+							if (!secToIsEnhanced && !secToIsSource && !secFromIsEnhanced && !secFromIsSource) secCanPaste = true;	// 1)
-							else if (secToIsSource && !secFromIsEnhanced && !secFromIsSource)                                                                       // 2)
+							else if (secToIsSource && !secFromIsEnhanced && !secFromIsSource) 																		// 2)
 							{
 								secCanPaste = true;
 								okToReplace = false;
 							}
-							else if (secToIsSource && iiPasteHere.MyDocVersion.VersionID == iiClipboard.MyDocVersion.VersionID) secCanPaste = true;     // 3)
+							else if (secToIsSource && iiPasteHere.MyDocVersion.VersionID == iiClipboard.MyDocVersion.VersionID) secCanPaste = true;		// 3)
 							if (iiClipboard.IsRtfRaw) secCanPaste = okToReplace = false;   // never paste an equation.
 							if (secCanPaste) cm.MenuItems.Add("Paste Section Before", new EventHandler(mi_Click));
 							if (okToReplace && secCanPaste) cm.MenuItems.Add("Replace Existing Section", new EventHandler(mi_Click));
@@ -1776,9 +1760,9 @@ namespace Volian.Controls.Library
 							bool stpFromIsEnhanced = iiClipboard.IsEnhancedStep;
 							bool stpFromIsSource = stpFromCfg.MyEnhancedDocuments != null && stpFromCfg.MyEnhancedDocuments.Count > 0 && stpFromCfg.MyEnhancedDocuments[0].Type != 0;
 							bool stpCanPaste = false;
-							if (!secToIsEnhanced && !secToIsSource && !stpFromIsEnhanced && !stpFromIsSource) stpCanPaste = true;   // 1)
+							if (!secToIsEnhanced && !secToIsSource && !stpFromIsEnhanced && !stpFromIsSource) stpCanPaste = true;	// 1)
 							else if (secToIsSource && !stpFromIsEnhanced && !stpFromIsSource) stpCanPaste = true;   // 2)
-							else if (secToIsSource && iiPasteHere.MyDocVersion.VersionID == iiClipboard.MyDocVersion.VersionID) stpCanPaste = true;     // 3)
+							else if (secToIsSource && iiPasteHere.MyDocVersion.VersionID == iiClipboard.MyDocVersion.VersionID) stpCanPaste = true;		// 3)
 							if (iiClipboard.IsRtfRaw) stpCanPaste = false;   // never paste an equation.
 							if (stpCanPaste) cm.MenuItems.Add("Paste Step", new EventHandler(mi_Click));
 						}
@@ -1802,8 +1786,8 @@ namespace Volian.Controls.Library
 							bool stpFromIsEnhanced = iiClipboard.IsEnhancedStep;
 							bool stpFromIsSource = stpFromCfg.MyEnhancedDocuments != null && stpFromCfg.MyEnhancedDocuments.Count > 0 && stpFromCfg.MyEnhancedDocuments[0].Type != 0;
 							bool stpCanPaste = false;
-							if (!stpToIsEnhanced && !stpToIsSource && !stpFromIsEnhanced && !stpFromIsSource) stpCanPaste = true;   // 1)
+							if (!stpToIsEnhanced && !stpToIsSource && !stpFromIsEnhanced && !stpFromIsSource) stpCanPaste = true;	// 1)
-							else if (stpToIsSource && !stpFromIsEnhanced && !stpFromIsSource)                                                                       // 2)
+							else if (stpToIsSource && !stpFromIsEnhanced && !stpFromIsSource) 																		// 2)
 							{
 								stpCanPaste = true;
 								okToReplace = false;
@@ -1811,7 +1795,7 @@ namespace Volian.Controls.Library
 							else if (stpToIsSource && iiPasteHere.MyDocVersion.VersionID == iiClipboard.MyDocVersion.VersionID) // 3
 							{
 								stpCanPaste = true;
-								if (stpFromIsSource) okToReplace = false;       // B2017-183: don't allow a replace to source steps
+								if (stpFromIsSource) okToReplace = false;		// B2017-183: don't allow a replace to source steps
 							}
 							if (iiClipboard.IsRtfRaw) stpCanPaste = false;   // never paste an equation.
 							if (stpCanPaste && AddToInsertMenu(iiPasteHere, 0)) cm.MenuItems.Add("Paste Step Before", new EventHandler(mi_Click));
@@ -1841,7 +1825,7 @@ namespace Volian.Controls.Library
 					OnPrintSection(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0, mi.Text, (int)mi.Tag));
 					break;
 				case "Print All Procedures for":
-					OnPrintAllProcedures(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0, mi.Text, (int)mi.Tag));
+					OnPrintAllProcedures(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0,mi.Text,(int)mi.Tag));
 					break;
 				case "Approve":
 					OnApproveProcedure(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0, mi.Text, (int)mi.Tag));
@@ -1853,10 +1837,10 @@ namespace Volian.Controls.Library
 					OnApproveSomeProcedures(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0, mi.Text, (int)mi.Tag));
 					break;
 				case "Create Continuous Action Summary":
-					OnCreateContinuousActionSummary(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0, mi.Text, (int)mi.Tag));
+					OnCreateContinuousActionSummary(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null,0,mi.Text,(int)mi.Tag));
 					break;
 				case "Create Time Critical Action Summary":
-					OnCreateTimeCriticalActionSummary(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0, mi.Text, (int)mi.Tag));
+					OnCreateTimeCriticalActionSummary(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null,0,mi.Text,(int)mi.Tag));
 					break;
 				default:
 					if (mip.Text.StartsWith("Showing Change Bars Starting"))
@@ -1894,7 +1878,7 @@ namespace Volian.Controls.Library
 				{
 					if (selprc.IsEnhancedProcedure)
 					{
-						selprc.DoUnlinkEnhanced(selprc, 0, !hasValidConnectingProc);        // if no valid linked: enhtype = 0 since this an enhanced doc is getting unlinked
+						selprc.DoUnlinkEnhanced(selprc, 0, !hasValidConnectingProc);		// if no valid linked: enhtype = 0 since this an enhanced doc is getting unlinked
 					}
 					else   // from source  
 					{
@@ -1902,7 +1886,7 @@ namespace Volian.Controls.Library
 						if (hasValidConnectingProc)
 						{
 							ItemInfo lprc = ItemInfo.Get(seleds[0].ItemID);
-							lprc.DoUnlinkEnhanced(lprc, 0, !hasValidConnectingProc);
+							lprc.DoUnlinkEnhanced(lprc, 0, !hasValidConnectingProc); 
 						}
 						else
 							selprc.DoUnlinkEnhanced(selprc, seleds[0].Type, !hasValidConnectingProc);
@@ -1922,7 +1906,7 @@ namespace Volian.Controls.Library
 						{
 							ItemInfo lprc = ItemInfo.Get(ed.ItemID);
 							bool hasValidConnectingProc = CheckForValidEnhLink(lprc);
-							// if there is a valid connection, unlink both.  Otherwise, just unlink this selected procedure.
+																					  // if there is a valid connection, unlink both.  Otherwise, just unlink this selected procedure.
 							if (hasValidConnectingProc)
 								lprc.DoUnlinkEnhanced(lprc, ed.Type, !hasValidConnectingProc);
 							else
@@ -1946,27 +1930,27 @@ namespace Volian.Controls.Library
 				OnNodeSI(this, new vlnTreeEventArgs(tn, null, 0));
 				return;
 			}
-			if (mi.Text.StartsWith("Collapse"))
+      if (mi.Text.StartsWith("Collapse"))
-			{
+      {
 				CollapseProcedures();
-				return;
+        return;
-			}
+      }
 			if (mi.Text == "Print Transition Report")
 			{
 				OnPrintTransitionReport(this, new vlnTreeEventArgs(SelectedNode as VETreeNode));
 				return;
 			}
-			if (mi.Text == "Export Procedure Set" || mi.Text == "Export Procedure")
+      if (mi.Text == "Export Procedure Set" || mi.Text == "Export Procedure")
-			{
+      {
-				OnExportImportProcedureSets(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0));
+        OnExportImportProcedureSets(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0));
-				return;
+        return;
-			}
+      }
-			if (mi.Text == "Import Procedure Set" || mi.Text == "Import Procedure")
+      if (mi.Text == "Import Procedure Set" || mi.Text == "Import Procedure")
-			{
+      {
-				OnExportImportProcedureSets(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 1));
+        OnExportImportProcedureSets(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 1));
-				return;
+        return;
-			}
+      }
-			if (mi.Text.StartsWith("Procedure Checked Out to") || mi.Text.StartsWith("Document Checked Out to"))
+      if (mi.Text.StartsWith("Procedure Checked Out to") || mi.Text.StartsWith("Document Checked Out to"))
 			{
 				OnProcedureCheckedOutTo(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0));
 				return;
@@ -1988,7 +1972,7 @@ namespace Volian.Controls.Library
 					break;
 				case "New Folder":
 					SelectedNode.Expand();
-					tv_NodeNew(MenuSelections.Folder);
+					tv_NodeNew(MenuSelections.Folder);					
 					break;
 				case "Create Working Draft":
 					SelectedNode.Expand();
@@ -2032,7 +2016,7 @@ namespace Volian.Controls.Library
 					tv_NodeCopy();
 					break;
 				// lots of paste options:
-				case "Paste Procedure":
+                case "Paste Procedure":
 				case "Paste Procedure Before":
 				case "Paste Procedure After":
 				case "Paste Section":
@@ -2057,7 +2041,7 @@ namespace Volian.Controls.Library
 						break;
 					}
 
-
+					
 				case "Delete":
 					if (tv_NodeDelete())
 					{
@@ -2123,14 +2107,14 @@ namespace Volian.Controls.Library
 					UpdateROValues(SelectedNode as VETreeNode);
 					break;
 				case "Create Continuous Action Summary":
-					OnCreateContinuousActionSummary(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0));
+					OnCreateContinuousActionSummary(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null,0));
 					break;
-				// F2022-024 Time Critical Action Summary
+					// F2022-024 Time Critical Action Summary
 				case "Create Time Critical Action Summary":
-					OnCreateTimeCriticalActionSummary(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0));
+					OnCreateTimeCriticalActionSummary(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null,0));
 					break;
-				// B2017-243 added the following two Cannot Paste items when dealing with enhanced documents
+					// B2017-243 added the following two Cannot Paste items when dealing with enhanced documents
-				// when then user selects these menu items a message box will appear giving more information as to why it cannot be pasted
+					// when then user selects these menu items a message box will appear giving more information as to why it cannot be pasted
 				case "CANNOT PASTE HERE.  Click for more information...":
 					FlexibleMessageBox.Show("You have copied a document that is linked to an Enhanced Document.\n\n" +
 				"It can only be pasted before or after another document, within the set, that is linked to an Enhanced Document.", "Cannot Paste Here");
@@ -2172,7 +2156,7 @@ namespace Volian.Controls.Library
 			foreach (VETreeNode tnc in tn.Nodes)
 				CollapseProcedures(tnc);
 			if (tn.VEObject as DocVersionInfo == null && tn.VEObject as FolderInfo == null)
-				tn.Collapse();
+			tn.Collapse();
 			_doingCollapseNode = true; // B2016-058 this will prevent a Drag Node error when collapsing an RNOs, Cautions, or Notes tree node
 		}
 		private void tv_RemoveChgIds()
@@ -2227,12 +2211,12 @@ namespace Volian.Controls.Library
 				FinalProgressBarMessage = "Cannot check-out Working Draft";
 				return;
 			}
-			Cursor = Cursors.WaitCursor;    // C2023-002: move wait cursor after check out error
+			Cursor = Cursors.WaitCursor;	// C2023-002: move wait cursor after check out error
 			int ownerid = MySessionInfo.CheckOutItem(MyDVI.VersionID, CheckOutType.DocVersion);
 			using (DocVersion dv = DocVersion.Get(MyDVI.VersionID))
 			{
 				swROUpdate = new System.IO.StreamWriter(ROFstInfo.ROUpdateResultsPath(MyDVI)); // RO changes placed in file in the Documents\VEPROMS folder
-																							   // B2022-026 RO Memory Reduction code - first load the new ro.fst so that we can assign the ROTableUpdate event to the correct roFstInfo
+				// B2022-026 RO Memory Reduction code - first load the new ro.fst so that we can assign the ROTableUpdate event to the correct roFstInfo
 				if (dv.ROfstLoadingFigures || dv.NewerRoFst)    // B2017-125 see if loading figures was completed
 				{
 					// only load the RO.fst
@@ -2260,7 +2244,7 @@ namespace Volian.Controls.Library
 				swROUpdate.Write(string.Format("Fixed Referenced Object for {1}({4}){0}Old Text: {2}{0}New Text: {3}{0}{0}", Environment.NewLine, (sender as ItemInfo).ShortPath, args.OldValue, args.NewValue, (sender as ItemInfo).ItemID));
 		}
 
-		private ProgressBarItem _ProgressBar = null;
+		private ProgressBarItem _ProgressBar=null;
 		public ProgressBarItem ProgressBar
 		{
 			get { return _ProgressBar; }
@@ -2373,7 +2357,7 @@ namespace Volian.Controls.Library
 				return;
 			}
 			// C2017-003: ro data in sql server, check for sql connection string
-			if (MyDVI.DocVersionAssociations[0].MyROFst.MyRODb.DBConnectionString != "cstring")
+			if (MyDVI.DocVersionAssociations[0].MyROFst.MyRODb.DBConnectionString != "cstring") 
 				roloc = roloc + " \"" + MyDVI.DocVersionAssociations[0].MyROFst.MyRODb.DBConnectionString + "\"";
 			// C2021-026 pass in Parent/Child information (list of the children)
 			// B2022-019 look at all DocVersions to find ParentChild information
@@ -2438,7 +2422,7 @@ namespace Volian.Controls.Library
 
 					// assume that item to paste is a procedure, otherwise the menuing would not have
 					// included the paste options
-					tn = (VETreeNode)tn.Nodes[tn.Nodes.Count - 1];
+					tn = (VETreeNode) tn.Nodes[tn.Nodes.Count - 1];
 					p = "After";
 				}
 				else  // this is an empty docversion:
@@ -2467,7 +2451,7 @@ namespace Volian.Controls.Library
 				PasteAsChild(tn, iiClipboard.ItemID);
 
 			//if (p.IndexOf("Replace") <= -1)
-			this.Cursor = Cursors.Default;
+				this.Cursor = Cursors.Default;
 		}
 
 		public void PasteAsDocVersionChild(VETreeNode tn, int copyStartID)
@@ -2484,7 +2468,7 @@ namespace Volian.Controls.Library
 			}
 			ItemInfo newProc = dvi.PasteChild(copyStartID);
 			VETreeNode tn1 = new VETreeNode(newProc);
-			SelectedNode.Nodes.Add(tn1);        // add tree node to end of list.
+			SelectedNode.Nodes.Add(tn1);		// add tree node to end of list.
 			SelectedNode = tn1;
 		}
 
@@ -2521,7 +2505,7 @@ namespace Volian.Controls.Library
 			}
 			if (pasteSectIntoEmptySect)
 			{
-				tn.ChildrenLoaded = false;      // force a reload of treenode
+				tn.ChildrenLoaded = false;		// force a reload of treenode
 				tn.LoadChildren(true);
 			}
 			SelectedNode = tn;
@@ -2536,7 +2520,7 @@ namespace Volian.Controls.Library
 			// the item to be pasted in the step editor and the tree.
 			ItemInfo newItemInfo = null;
 			// F2021-009 display a message if pasting step will results in more sub-step levels than are defined in the format
-			if (!ii.IsProcedure)
+			if (!ii.IsProcedure) 
 				ItemInfo.PasteStepIsWithinDefinedSubStepLevels(copyStartID, ii, false);
 			if (ii.IsProcedure || !OnPasteItemInfo(this, new vlnTreeItemInfoPasteEventArgs(ii, copyStartID, pasteOpt, ii.MyContent.Type)))
 			{
@@ -2559,8 +2543,8 @@ namespace Volian.Controls.Library
 		}
 		private void PasteReplace(VETreeNode tn, int copyStartID, TreeNode treeNodeReplace)
 		{
-			VETreeNode prevtn = (VETreeNode)tn.PrevNode;
+			VETreeNode prevtn = (VETreeNode) tn.PrevNode;
-			VETreeNode partn = (VETreeNode)tn.Parent;
+			VETreeNode partn = (VETreeNode) tn.Parent;
 			ItemInfo ii = tn.VEObject as ItemInfo;
 			// F2021-009 display a message if pasting step will results in more sub-step levels than are defined in the format
 			ItemInfo.PasteStepIsWithinDefinedSubStepLevels(copyStartID, ii, true);
@@ -2579,7 +2563,7 @@ namespace Volian.Controls.Library
 			// B2018-047: was crashing on the following line (before change it was casting the result to a VETreeNote when the partn.FirstNode was just a TreeNode)
 			SelectedNode = prevtn != null ? prevtn.NextNode : partn.FirstNode;
 
-
+	
 		}
 		public void PasteRepalceEmpty(VETreeNode tn, int copyStartID)
 		{
@@ -2598,7 +2582,7 @@ namespace Volian.Controls.Library
 			SelectedNode.Nodes.Add(tn1);        // add tree node to end of list.
 			SelectedNode = tn1;
 		}
-		private void tv_NodeCopy()
+			private void tv_NodeCopy()
 		{
 			if (SelectedNode == null) return;
 			VETreeNode tn = SelectedNode as VETreeNode;
@@ -2610,7 +2594,7 @@ namespace Volian.Controls.Library
 		private void SetupNodeProperties()
 		{
 			VETreeNode tn = SelectedNode as VETreeNode;
-			if (tn == null) return;
+			if (tn==null)return;
 
 			if ((tn.VEObject as FolderInfo) != null)
 				OpenProperties(tn.VEObject as FolderInfo);
@@ -2622,7 +2606,7 @@ namespace Volian.Controls.Library
 				if (dvi != null && dvi.DocVersionAssociations != null && dvi.DocVersionAssociations.Count > 0) rofstid = dvi.DocVersionAssociations[0].MyROFst.ROFstID;
 				OpenProperties(tn.VEObject as DocVersionInfo);
 				if (dvi != null && dvi.DocVersionAssociations != null && dvi.DocVersionAssociations.Count > 0 && rofstid != dvi.DocVersionAssociations[0].MyROFst.ROFstID)
-					OnTabDisplay(this, new StepPanelTabDisplayEventArgs("DisplayROUpdateROFST"));
+					OnTabDisplay(this,new StepPanelTabDisplayEventArgs("DisplayROUpdateROFST"));
 			}
 			else if ((tn.VEObject as ProcedureInfo) != null)
 				OpenProperties(tn.VEObject as ProcedureInfo);
@@ -2636,7 +2620,7 @@ namespace Volian.Controls.Library
 		{
 			using (Folder folder = folderInfo.Get())
 			{
-				OnNodeOpenProperty(this, new vlnTreePropertyEventArgs(string.Format("{0} Properties", folder.FolderConfig.Name), folder.FolderConfig));
+                OnNodeOpenProperty(this, new vlnTreePropertyEventArgs(string.Format("{0} Properties", folder.FolderConfig.Name), folder.FolderConfig));
 			}
 		}
 		private void OpenProperties(DocVersionInfo dvInfo)
@@ -2650,7 +2634,7 @@ namespace Volian.Controls.Library
 		{
 			using (Procedure proc = procInfo.Get())
 			{
-				OnNodeOpenProperty(this, new vlnTreePropertyEventArgs(string.Format("{0}  {1} Properties", proc.ProcedureConfig.Number, proc.ProcedureConfig.Title), proc.ProcedureConfig));
+                OnNodeOpenProperty(this, new vlnTreePropertyEventArgs(string.Format("{0}  {1} Properties", proc.ProcedureConfig.Number, proc.ProcedureConfig.Title), proc.ProcedureConfig));
 			}
 		}
 		private void OpenProperties(SectionInfo sectInfo)
@@ -2663,7 +2647,7 @@ namespace Volian.Controls.Library
 					title = string.Format("{0}  {1} Properties", sectInfo.SectionConfig.Number, sectInfo.SectionConfig.Title);
 				else
 					title = string.Format("{0} Properties", sectInfo.SectionConfig.Title);
-				OnNodeOpenProperty(this, new vlnTreePropertyEventArgs(title, sect.SectionConfig));
+                OnNodeOpenProperty(this, new vlnTreePropertyEventArgs(title, sect.SectionConfig));
 			}
 		}
 		private void OpenProperties(StepInfo stpinfo)
@@ -2717,7 +2701,7 @@ namespace Volian.Controls.Library
 				{
 					if (newtype == MenuSelections.DocVersion)
 					{
-						int dvid = -1;      // flag to allow user to cancel from dialog & then we remove it.
+						int dvid = -1;		// flag to allow user to cancel from dialog & then we remove it.
 						using (DocVersion docversion = DocVersion.MakeDocVersion(parentfolder, "Working Draft", "Title", null, null, null))
 						{
 							ShowBrokenRules(docversion.BrokenRulesCollection);
@@ -2726,7 +2710,7 @@ namespace Volian.Controls.Library
 							{
 								docversion.Save();
 								tn = new VETreeNode(_LastDocVersionInfo);
-								SelectedNode.Nodes.Add(tn);     // add tree node to end of list.
+								SelectedNode.Nodes.Add(tn);		// add tree node to end of list.
 								parentfolder.Reset_ChildFolders();
 								parentfolder.Reset_FolderDocVersions();
 							}
@@ -2737,7 +2721,7 @@ namespace Volian.Controls.Library
 					}
 					else if (newtype == MenuSelections.Folder)
 					{
-						int f1 = -1;        // flag to allow user to cancel from dialog & then we remove it.
+						int f1 = -1;		// flag to allow user to cancel from dialog & then we remove it.
 						string uniquename = _LastFolderInfo.UniqueChildName("New Folder");
 						using (Folder folder = Folder.MakeFolder(parentfolder, parentfolder.MyConnection, uniquename, string.Empty, "Short Name", null, string.Empty, DateTime.Now, VlnSettings.UserID))
 						{
@@ -2749,20 +2733,20 @@ namespace Volian.Controls.Library
 							{
 								folder.Save();
 								tn = new VETreeNode((IVEDrillDownReadOnly)_LastFolderInfo);
-								SelectedNode.Nodes.Add(tn); // add new tree node to end of childlist.
+								SelectedNode.Nodes.Add(tn);	// add new tree node to end of childlist.
 							}
 							else
 								f1 = folder.FolderID;
 						}
 						if (f1 != -1) Folder.Delete(f1);
 					}
-					else if (newtype == MenuSelections.FolderAfter || newtype == MenuSelections.FolderBefore)
+					else if (newtype == MenuSelections.FolderAfter||newtype == MenuSelections.FolderBefore)
 					{
 						int f2 = -1;
 						string uniquename = _LastFolderInfo.MyParent.UniqueChildName("New Folder");
 						int myindex = SelectedNode.Index + ((newtype == MenuSelections.FolderAfter) ? 1 : 0);
 						FolderInfo parfolderinfo = FolderInfo.Get(parentfolder.FolderID);
-						double? myorder = parfolderinfo.NewManualOrder(myindex);
+						double? myorder = parfolderinfo.NewManualOrder(myindex); 
 						using (Folder folder = Folder.MakeFolder(parentfolder.MyParent, parentfolder.MyConnection, uniquename, string.Empty, "Short Name", null, myorder, string.Empty, DateTime.Now, VlnSettings.UserID))
 						{
 							ShowBrokenRules(folder.BrokenRulesCollection);
@@ -2786,7 +2770,7 @@ namespace Volian.Controls.Library
 			else if (newtype == MenuSelections.Procedure)
 			{
 				int p1 = -1;
-				using (Procedure procedure = Procedure.MakeProcedure(_LastDocVersionInfo, _LastDocVersionInfo.Procedures.Count != 0 ? _LastDocVersionInfo.Procedures[_LastDocVersionInfo.Procedures.Count - 1] : null, null, "New Procedure", 0))
+				using (Procedure procedure = Procedure.MakeProcedure(_LastDocVersionInfo, _LastDocVersionInfo.Procedures.Count!=0?_LastDocVersionInfo.Procedures[_LastDocVersionInfo.Procedures.Count-1]:null, null, "New Procedure", 0))
 				{
 					ShowBrokenRules(procedure.BrokenRulesCollection);
 					SetLastValues(ProcedureInfo.Get(procedure.ItemID));
@@ -2795,8 +2779,8 @@ namespace Volian.Controls.Library
 					{
 						procedure.Save();
 						tn = new VETreeNode(_LastProcedureInfo);
-						SelectedNode.Nodes.Add(tn);     // add tree node to end of list.
+						SelectedNode.Nodes.Add(tn);		// add tree node to end of list.
-														// The following line will allow for a refresh of the procedure list on the Working Draft's treenodes docversion (B2016-034)
+						// The following line will allow for a refresh of the procedure list on the Working Draft's treenodes docversion (B2016-034)
 						if (((SelectedNode as VETreeNode).VEObject as DocVersionInfo) != null) ((SelectedNode as VETreeNode).VEObject as DocVersionInfo).ResetProcedures();
 						if (procedure.MyProcedureInfo.CreateEnhanced)
 						{
@@ -2838,21 +2822,21 @@ namespace Volian.Controls.Library
 					else
 						p2 = procedure.ItemID;
 				}
-				if (p2 != -1)
+				if (p2 != -1) 
 					DeleteItemInfoAndChildren(_LastProcedureInfo); // Delete Item and reset Previous and Next
 			}
 			#endregion
 			#region InsertSection
-			else if (newtype == MenuSelections.Section)     // Insert subsection at end of parents section list
+			else if (newtype == MenuSelections.Section)		// Insert subsection at end of parents section list
 			{
 				string message = string.Empty;
 				if (_LastProcedureInfo != null)
 					if (!MySessionInfo.CanCheckOutItem(_LastProcedureInfo.ItemID, CheckOutType.Procedure, ref message))
-					{
+				{
-						FlexibleMessageBox.Show(this, message, "Item Already Checked Out", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+					FlexibleMessageBox.Show(this, message, "Item Already Checked Out", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-						OnUnPauseRefresh(this, null);
+					OnUnPauseRefresh(this, null);
-						return;
+					return;
-					}
+				}
 				int s1 = -1;
 				if (!(_LastProcedureInfo == null) || !(_LastSectionInfo == null))
 				{
@@ -2882,7 +2866,7 @@ namespace Volian.Controls.Library
 									"If you would like to view or copy these hidden steps you will need to go\n" +
 									"into the properties of this section and check the Editable Data checkbox.\n" +
 									"You will then be able to view and copy those steps.  When finished, open\n" +
-									"the properties page again and uncheck the Editable Data checkbox.\n\n" +
+									"the properties page again and uncheck the Editable Data checkbox.\n\n"+
 									"Do you want to continue creating the subsection?";
 								if (FlexibleMessageBox.Show(this, msgstr, "Subsection Insert", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
 								{
@@ -2894,7 +2878,7 @@ namespace Volian.Controls.Library
 							if (!hasMetaSubs) doPseudo = true;
 						}
 					}
-					using (Section section = CreateNewSection())
+					using(Section section = CreateNewSection())
 					{
 						ShowBrokenRules(section.BrokenRulesCollection);
 						SectionInfo savLastSectionInfo = _LastSectionInfo;
@@ -2904,10 +2888,10 @@ namespace Volian.Controls.Library
 							if (!doPseudo)
 							{
 								tn = new VETreeNode(_LastSectionInfo);
-								SelectedNode.Nodes.Add(tn);     // add tree node to end of list.
+								SelectedNode.Nodes.Add(tn);		// add tree node to end of list.
-																// if the new section was flagged as either having an enhanced link for Title or Contents, create the 
+								// if the new section was flagged as either having an enhanced link for Title or Contents, create the 
-																// Enhanced section:
+								// Enhanced section:
-								Section sectiontmp = Section.Get(section.ItemID);       // need to do this because of 'caching' problem.
+								Section sectiontmp = Section.Get(section.ItemID);		// need to do this because of 'caching' problem.
 								if (sectiontmp.SectionConfig.LinkEnhanced == "T" || sectiontmp.SectionConfig.LinkEnhanced == "Y")
 									CreateEnhancedForSection(newtype, sectiontmp, savLastSectionInfo, sectiontmp.DisplayNumber, sectiontmp.MyContent.Text);
 								sectiontmp.Dispose();
@@ -2918,7 +2902,7 @@ namespace Volian.Controls.Library
 								// may have to add a 'steps' node if a step(s) already exist...
 								ItemInfo ii = (SelectedNode as VETreeNode).VEObject as ItemInfo;
 								int cpindx = 0;
-								if (SelectedNode.Nodes.Count > 0)
+								if (SelectedNode.Nodes.Count>0)
 								{
 									VETreeNode vtn = SelectedNode.Nodes[0] as VETreeNode;
 									// B2017-014: removed code that was adding a 2nd section part node. and also select node to
@@ -2928,13 +2912,13 @@ namespace Volian.Controls.Library
 								// B2017-014: removed code that was adding a 2nd section part node.
 							}
 						}
-						else        // Properties was canceled out of:
+						else		// Properties was canceled out of:
 							s1 = section.ItemID;
 					}
 					if (s1 != -1)
 					{
 						DeleteItemInfoAndChildren(_LastSectionInfo);// Delete Item and reset Previous and Next
-																	// B2020-087 refresh the tree node after canceling the creation of the subsection
+						// B2020-087 refresh the tree node after canceling the creation of the subsection
 						_LastTreeNode.ChildrenLoaded = false;
 						_LastTreeNode.RefreshNode();
 						_LastTreeNode.Collapse();
@@ -2962,14 +2946,14 @@ namespace Volian.Controls.Library
 					if (OnNodeOpenProperty(this, new vlnTreePropertyEventArgs("New Section", section.SectionConfig)) == DialogResult.OK)
 					{
 						int indx = tvindex + ((newtype == MenuSelections.SectionBefore) ? 0 : 1);
-						int itemido = (indx >= par.Nodes.Count) ? -1 : (((par.Nodes[indx] as VETreeNode).VEObject) as ItemInfo).ItemID;
+						int itemido = (indx >= par.Nodes.Count)?-1:(((par.Nodes[indx] as VETreeNode).VEObject) as ItemInfo).ItemID;
-						if (indx >= par.Nodes.Count || (par.Nodes[indx] as VETreeNode).VEObject.ToString() != _LastSectionInfo.ToString() || itemido != section.ItemID)
+						if (indx >= par.Nodes.Count || (par.Nodes[indx] as VETreeNode).VEObject.ToString() != _LastSectionInfo.ToString() || itemido !=section.ItemID)
 						{
 							tn = new VETreeNode(_LastSectionInfo);
 							par.Nodes.Insert(indx, tn);
 							// if the new section was flagged as either having an enhanced link for Title or Contents, create the 
 							// Enhanced section:
-							Section sectiontmp = Section.Get(section.ItemID);       // need to do this because of 'caching' problem.
+							Section sectiontmp = Section.Get(section.ItemID);		// need to do this because of 'caching' problem.
 							if (sectiontmp.SectionConfig.LinkEnhanced == "T" || sectiontmp.SectionConfig.LinkEnhanced == "Y")
 								CreateEnhancedForSection(newtype, sectiontmp, savLastSectionInfo, sectiontmp.DisplayNumber, sectiontmp.MyContent.Text);
 							sectiontmp.Dispose();
@@ -2981,7 +2965,7 @@ namespace Volian.Controls.Library
 				if (s2 != -1)
 				{
 					DeleteItemInfoAndChildren(_LastSectionInfo);// Delete Item and reset Previous and Next
-																// B2020-087 refresh the tree node after canceling the creation of the subsection
+					// B2020-087 refresh the tree node after canceling the creation of the subsection
 					_LastTreeNode.ChildrenLoaded = false;
 					_LastTreeNode.RefreshNode();
 					_LastTreeNode.Collapse();
@@ -2989,7 +2973,7 @@ namespace Volian.Controls.Library
 			}
 			#endregion
 			#region InsertStep
-			else if (newtype == MenuSelections.Step)                // insert step from section - no substeps from tree.
+			else if (newtype == MenuSelections.Step)				// insert step from section - no substeps from tree.
 			{
 				string message = string.Empty;
 				if (!MySessionInfo.CanCheckOutItem(_LastSectionInfo.MyProcedure.ItemID, CheckOutType.Procedure, ref message))
@@ -3066,7 +3050,7 @@ namespace Volian.Controls.Library
 					using (Procedure newenhProcedure = Procedure.MakeProcedure(enhDVInfo, enhDVInfo.Procedures.Count != 0 ? enhDVInfo.Procedures[enhDVInfo.Procedures.Count - 1] : null, null, "New Procedure", 0))
 					{
 						SaveEnhancedForProcedure(sourceProc, newenhProcedure, ded.Type);
-						RefreshRelatedNode(ProcedureInfo.Get(newenhProcedure.ItemID));      // this updates the treeview to include the new enhanced procedure
+						RefreshRelatedNode(ProcedureInfo.Get(newenhProcedure.ItemID));		// this updates the treeview to include the new enhanced procedure
 					}
 				}
 			}
@@ -3164,7 +3148,7 @@ namespace Volian.Controls.Library
 		{
 			SectionConfig newenhcfg = new SectionConfig(newenhSection);
 			newenhcfg.AddEnhancedDocument(0, sourceSect.ItemID);
-			newenhcfg.SaveEnhancedDocuments();          // does this save data?
+			newenhcfg.SaveEnhancedDocuments();			// does this save data?
 			using (Content c1 = Content.Get(newenhSection.ContentID))
 			{
 				c1.Config = newenhcfg.ToString();
@@ -3178,7 +3162,7 @@ namespace Volian.Controls.Library
 				cs.Save();
 			}
 		}
-
+		
 		private Section CreateNewSection()
 		{
 			// B2020-087 the config for SubSection_Edit was sometimes set even when there wasn't any subsections, 
@@ -3218,7 +3202,7 @@ namespace Volian.Controls.Library
 				// The parent step was not open in the step editor, just create new step(s) and add treenode.
 				int newId = -1;
 				// B2020-076: if this step has a template, insert template steps. 
-				int topType = ii.GetSmartTemplateTopLevelIndxOfThisType(20002);
+				int topType = ii.GetSmartTemplateTopLevelIndxOfThisType(20002); 
 				if (topType != -1)
 				{
 					ItemInfo tmp = null;
@@ -3245,12 +3229,12 @@ namespace Volian.Controls.Library
 
 			// see if enhanced related steps need created:
 			SectionConfig scfgE = _LastItemInfo.ActiveSection.MyConfig as SectionConfig; // C2018-003 fixed use of getting the active section
-			if (scfgE != null && scfgE.Section_LnkEnh == "Y")
+			if (scfgE != null && scfgE.Section_LnkEnh=="Y")
 			{
 				// set up which item to insert from based on whether editor was open (see comment from 11/17 above).
 				EnhancedDocuments enhdocs = null;
 				ItemInfo.EAddpingPart addpart = ItemInfo.EAddpingPart.Child;
-				if (_LastItemInfo.MyPrevious != null)       // the code above will do the MakeStep regardless of whether editor is up if this is the only step.
+				if (_LastItemInfo.MyPrevious != null)		// the code above will do the MakeStep regardless of whether editor is up if this is the only step.
 				{
 					addpart = ItemInfo.EAddpingPart.After;
 					ItemInfo lstSrc = _LastItemInfo.MyPrevious;
@@ -3422,7 +3406,7 @@ namespace Volian.Controls.Library
 				result = FlexibleMessageBox.Show("Are you sure you want to delete this " + typeDescription + "?", "Verify Delete",
 				MessageBoxButtons.YesNo, MessageBoxIcon.Question);
 			}
-			if (_LastProcedureInfo != null || result == DialogResult.Yes)
+			if (_LastProcedureInfo != null  || result == DialogResult.Yes)
 			{
 				if (_LastFolderInfo != null)
 				{
@@ -3438,7 +3422,7 @@ namespace Volian.Controls.Library
 					{
 						foreach (DVEnhancedDocument dve in dvc.MyEnhancedDocuments)
 						{
-							if (dve.Type != 0)
+							if (dve.Type != 0) 
 								DocVersion.Delete(dve.VersionID);
 							else
 							{
@@ -3484,7 +3468,7 @@ namespace Volian.Controls.Library
 							if (ed.Type != 0) enhIds.Add(ed.ItemID);
 						// always return false because an event gets fired to delete tree nodes.
 						if (!DeleteItemInfoAndChildren(_LastProcedureInfo)) return false;
-
+						
 						_LastProcedureInfo = null;
 						foreach (int enhId in enhIds)
 						{
@@ -3528,7 +3512,7 @@ namespace Volian.Controls.Library
 						// just clear enhanced links back
 						_LastSectionInfo.ClearEnhancedSectionLink();
 					}
-					OnSectionShouldClose(this, new vlnTreeSectionInfoEventArgs(_LastSectionInfo, true));
+					OnSectionShouldClose(this, new vlnTreeSectionInfoEventArgs(_LastSectionInfo,true));
 					// always return false because an event gets fired to delete tree nodes.
 					if (!DeleteItemInfoAndChildren(_LastSectionInfo))
 					{
@@ -3583,41 +3567,6 @@ namespace Volian.Controls.Library
 			}
 			return false;
 		}
-		
-		public void RemoveFolder(int folderId)
-		{
-			TreeNode nodeToRemove = FindNodeById(folderId, this.Nodes);
-			if (nodeToRemove != null)
-			{
-				// Perform the removal logic
-				nodeToRemove.Remove(); // This removes the node from its parent
-			}
-		}
-		private TreeNode FindNodeById(int folderId, TreeNodeCollection nodes)
-		{
-			foreach (TreeNode node in nodes)
-			{
-				VETreeNode vetNode = node as VETreeNode;
-				if (vetNode != null)
-				{
-					FolderInfo folderInfo = vetNode.VEObject as FolderInfo;
-					if (folderInfo != null && folderInfo.FolderID == folderId)
-					{
-						return node;
-					}
-					else
-					{
-						TreeNode foundNode = FindNodeById(folderId, node.Nodes);
-						if (foundNode != null)
-						{
-							return foundNode;
-						}
-					}
-				}
-			}
-			return null;
-		}
-
 		private bool DeleteItemInfoAndChildren(ItemInfo ii)
 		{
 			DateTime dtStart = DateTime.Now;