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

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

@@ -70,17 +70,6 @@
 			this.labelX6 = new DevComponents.DotNetBar.LabelX();
 			this.warningBox1 = new DevComponents.DotNetBar.Controls.WarningBox();
 			this.btnFixLinks = new DevComponents.DotNetBar.ButtonX();
-			this.sideNavPanel1 = new DevComponents.DotNetBar.Controls.SideNavPanel();
-			this.warningBox3 = new DevComponents.DotNetBar.Controls.WarningBox();
-			this.labelX7 = new DevComponents.DotNetBar.LabelX();
-			this.line1 = new DevComponents.DotNetBar.Controls.Line();
-			this.swCkObsoleteROData = new DevComponents.DotNetBar.Controls.SwitchButton();
-			this.swHiddenDataLocs = new DevComponents.DotNetBar.Controls.SwitchButton();
-			this.labelX3 = new DevComponents.DotNetBar.LabelX();
-			this.labelX2 = new DevComponents.DotNetBar.LabelX();
-			this.swCkOrphanDataRecs = new DevComponents.DotNetBar.Controls.SwitchButton();
-			this.labelX1 = new DevComponents.DotNetBar.LabelX();
-			this.btnRunCheck = new DevComponents.DotNetBar.ButtonX();
 			this.sideNavPanel2 = new DevComponents.DotNetBar.Controls.SideNavPanel();
 			this.swRefreshTblsForSrch = new DevComponents.DotNetBar.Controls.SwitchButton();
 			this.lblRefreshTblForSrch = new DevComponents.DotNetBar.LabelX();
@@ -97,6 +86,17 @@
 			this.labelX8 = new DevComponents.DotNetBar.LabelX();
 			this.line2 = new DevComponents.DotNetBar.Controls.Line();
 			this.btnRunRepair = new DevComponents.DotNetBar.ButtonX();
+			this.sideNavPanel1 = new DevComponents.DotNetBar.Controls.SideNavPanel();
+			this.warningBox3 = new DevComponents.DotNetBar.Controls.WarningBox();
+			this.labelX7 = new DevComponents.DotNetBar.LabelX();
+			this.line1 = new DevComponents.DotNetBar.Controls.Line();
+			this.swCkObsoleteROData = new DevComponents.DotNetBar.Controls.SwitchButton();
+			this.swHiddenDataLocs = new DevComponents.DotNetBar.Controls.SwitchButton();
+			this.labelX3 = new DevComponents.DotNetBar.LabelX();
+			this.labelX2 = new DevComponents.DotNetBar.LabelX();
+			this.swCkOrphanDataRecs = new DevComponents.DotNetBar.Controls.SwitchButton();
+			this.labelX1 = new DevComponents.DotNetBar.LabelX();
+			this.btnRunCheck = new DevComponents.DotNetBar.ButtonX();
 			this.sideNavItem1 = new DevComponents.DotNetBar.Controls.SideNavItem();
 			this.separator1 = new DevComponents.DotNetBar.Separator();
 			this.sideNavItmCheck = new DevComponents.DotNetBar.Controls.SideNavItem();
@@ -104,7 +104,7 @@
 			this.sideNavItmLinks = new DevComponents.DotNetBar.Controls.SideNavItem();
 			this.sideNavItmUsers = new DevComponents.DotNetBar.Controls.SideNavItem();
 			this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem();
-			this.sideNavItmDelete = new DevComponents.DotNetBar.Controls.SideNavItem();
+			this.sideNavItemDelete = new DevComponents.DotNetBar.Controls.SideNavItem();
 			this.sideNavItmExit = new DevComponents.DotNetBar.Controls.SideNavItem();
 			this.panelEx4 = new DevComponents.DotNetBar.PanelEx();
 			this.progressSteps1 = new DevComponents.DotNetBar.ProgressSteps();
@@ -127,18 +127,20 @@
 			this.sideNav1.SuspendLayout();
 			this.sideNavPanel4.SuspendLayout();
 			this.sideNavPanel3.SuspendLayout();
-			this.sideNavPanel1.SuspendLayout();
 			this.sideNavPanel2.SuspendLayout();
+			this.sideNavPanel1.SuspendLayout();
 			this.panelEx4.SuspendLayout();
 			this.SuspendLayout();
 			// 
 			// myTV
 			// 
+			this.myTV.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
 			this.myTV.CheckBoxes = true;
-			this.myTV.Dock = System.Windows.Forms.DockStyle.Bottom;
-			this.myTV.Location = new System.Drawing.Point(0, 184);
+			this.myTV.Location = new System.Drawing.Point(0, 230);
 			this.myTV.Name = "myTV";
-			this.myTV.Size = new System.Drawing.Size(291, 310);
+			this.myTV.Size = new System.Drawing.Size(170, 218);
 			this.myTV.TabIndex = 4;
 			this.myTV.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.myTV_AfterCheck);
 			// 
@@ -348,7 +350,7 @@
 			this.pnlLater.Controls.Add(this.dtpDate);
 			this.pnlLater.Dock = System.Windows.Forms.DockStyle.Top;
 			this.pnlLater.Enabled = false;
-			this.pnlLater.Location = new System.Drawing.Point(6, 23);
+			this.pnlLater.Location = new System.Drawing.Point(6, 27);
 			this.pnlLater.Name = "pnlLater";
 			this.pnlLater.Padding = new System.Windows.Forms.Padding(6);
 			this.pnlLater.Size = new System.Drawing.Size(279, 37);
@@ -389,7 +391,7 @@
 			this.chkLater.Dock = System.Windows.Forms.DockStyle.Top;
 			this.chkLater.Location = new System.Drawing.Point(6, 6);
 			this.chkLater.Name = "chkLater";
-			this.chkLater.Size = new System.Drawing.Size(279, 17);
+			this.chkLater.Size = new System.Drawing.Size(279, 21);
 			this.chkLater.TabIndex = 4;
 			this.chkLater.Text = "Process Later";
 			this.chkLater.UseVisualStyleBackColor = true;
@@ -462,9 +464,9 @@
 			// sideNav1
 			// 
 			this.sideNav1.BackColor = System.Drawing.SystemColors.Control;
-			this.sideNav1.Controls.Add(this.sideNavPanel4);
 			this.sideNav1.Controls.Add(this.sideNavPanel3);
 			this.sideNav1.Controls.Add(this.sideNavPanel1);
+			this.sideNav1.Controls.Add(this.sideNavPanel4);
 			this.sideNav1.Controls.Add(this.sideNavPanel2);
 			this.sideNav1.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.sideNav1.EnableClose = false;
@@ -476,7 +478,7 @@
             this.sideNavItmRepair,
             this.sideNavItmLinks,
             this.sideNavItmUsers,
-            this.sideNavItmDelete,
+            this.sideNavItemDelete,
             this.sideNavItmExit});
 			this.sideNav1.Location = new System.Drawing.Point(0, 0);
 			this.sideNav1.Name = "sideNav1";
@@ -494,10 +496,11 @@
 			this.sideNavPanel4.Controls.Add(this.myTVdel);
 			this.sideNavPanel4.Controls.Add(this.btnDeleteItems);
 			this.sideNavPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.sideNavPanel4.Location = new System.Drawing.Point(89, 31);
+			this.sideNavPanel4.Location = new System.Drawing.Point(102, 39);
 			this.sideNavPanel4.Name = "sideNavPanel4";
-			this.sideNavPanel4.Size = new System.Drawing.Size(291, 494);
+			this.sideNavPanel4.Size = new System.Drawing.Size(278, 486);
 			this.sideNavPanel4.TabIndex = 27;
+			this.sideNavPanel4.Visible = false;
 			// 
 			// swDeleteFolder
 			// 
@@ -512,7 +515,6 @@
 			this.superTooltip1.SetSuperTooltip(this.swDeleteFolder, new DevComponents.DotNetBar.SuperTooltipInfo("Check RO Links", "", resources.GetString("swDeleteFolder.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 150)));
 			this.swDeleteFolder.SwitchClickTogglesValue = true;
 			this.swDeleteFolder.TabIndex = 39;
-			this.swDeleteFolder.Visible = false;
 			this.swDeleteFolder.ValueChanged += new System.EventHandler(this.swDeleteFolder_ValueChanged);
 			// 
 			// labelX13
@@ -529,7 +531,6 @@
 			this.superTooltip1.SetSuperTooltip(this.labelX13, new DevComponents.DotNetBar.SuperTooltipInfo("Check RO Links", "", resources.GetString("labelX13.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(350, 175)));
 			this.labelX13.TabIndex = 38;
 			this.labelX13.Text = "Delete Folders";
-			this.labelX13.Visible = false;
 			// 
 			// swDeleteAnnotations
 			// 
@@ -565,23 +566,23 @@
 			// 
 			// myTVdel
 			// 
+			this.myTVdel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
 			this.myTVdel.CheckBoxes = true;
-			this.myTVdel.Dock = System.Windows.Forms.DockStyle.Bottom;
-			this.myTVdel.Location = new System.Drawing.Point(0, 127);
+			this.myTVdel.Location = new System.Drawing.Point(14, 145);
 			this.myTVdel.Name = "myTVdel";
-			this.myTVdel.Size = new System.Drawing.Size(291, 367);
+			this.myTVdel.Size = new System.Drawing.Size(254, 323);
 			this.myTVdel.TabIndex = 34;
 			// 
 			// btnDeleteItems
 			// 
 			this.btnDeleteItems.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
-			this.btnDeleteItems.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
 			this.btnDeleteItems.Checked = true;
 			this.btnDeleteItems.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-			this.btnDeleteItems.Location = new System.Drawing.Point(39, 98);
+			this.btnDeleteItems.Location = new System.Drawing.Point(3, 98);
 			this.btnDeleteItems.Name = "btnDeleteItems";
-			this.btnDeleteItems.Size = new System.Drawing.Size(212, 23);
+			this.btnDeleteItems.Size = new System.Drawing.Size(280, 23);
 			this.btnDeleteItems.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
 			this.superTooltip1.SetSuperTooltip(this.btnDeleteItems, new DevComponents.DotNetBar.SuperTooltipInfo("Process Links", "", "This will run the selected RO Links or Transitions Links tool.\r\n\r\nClick on the on" +
             "/off switches to turn on/off each tool.\r\n\r\nNote that only one of these tools can" +
@@ -604,11 +605,10 @@
 			this.sideNavPanel3.Controls.Add(this.myTV);
 			this.sideNavPanel3.Controls.Add(this.btnFixLinks);
 			this.sideNavPanel3.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.sideNavPanel3.Location = new System.Drawing.Point(89, 31);
+			this.sideNavPanel3.Location = new System.Drawing.Point(102, 39);
 			this.sideNavPanel3.Name = "sideNavPanel3";
-			this.sideNavPanel3.Size = new System.Drawing.Size(291, 494);
+			this.sideNavPanel3.Size = new System.Drawing.Size(278, 486);
 			this.sideNavPanel3.TabIndex = 10;
-			this.sideNavPanel3.Visible = false;
 			// 
 			// swCheckROLinks
 			// 
@@ -646,7 +646,7 @@
 			this.warningBox5.CloseButtonVisible = false;
 			this.warningBox5.Image = ((System.Drawing.Image)(resources.GetObject("warningBox5.Image")));
 			this.warningBox5.Location = new System.Drawing.Point(17, 145);
-			this.warningBox5.Margin = new System.Windows.Forms.Padding(4);
+			this.warningBox5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
 			this.warningBox5.Name = "warningBox5";
 			this.warningBox5.OptionsButtonVisible = false;
 			this.warningBox5.Size = new System.Drawing.Size(262, 32);
@@ -730,7 +730,7 @@
 			this.warningBox1.CloseButtonVisible = false;
 			this.warningBox1.Image = ((System.Drawing.Image)(resources.GetObject("warningBox1.Image")));
 			this.warningBox1.Location = new System.Drawing.Point(17, 181);
-			this.warningBox1.Margin = new System.Windows.Forms.Padding(4);
+			this.warningBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
 			this.warningBox1.Name = "warningBox1";
 			this.warningBox1.OptionsButtonVisible = false;
 			this.warningBox1.Size = new System.Drawing.Size(262, 43);
@@ -754,173 +754,6 @@
 			this.btnFixLinks.Text = "Process Links";
 			this.btnFixLinks.Click += new System.EventHandler(this.btnFixLinks_Click);
 			// 
-			// sideNavPanel1
-			// 
-			this.sideNavPanel1.Controls.Add(this.warningBox3);
-			this.sideNavPanel1.Controls.Add(this.labelX7);
-			this.sideNavPanel1.Controls.Add(this.line1);
-			this.sideNavPanel1.Controls.Add(this.swCkObsoleteROData);
-			this.sideNavPanel1.Controls.Add(this.swHiddenDataLocs);
-			this.sideNavPanel1.Controls.Add(this.labelX3);
-			this.sideNavPanel1.Controls.Add(this.labelX2);
-			this.sideNavPanel1.Controls.Add(this.swCkOrphanDataRecs);
-			this.sideNavPanel1.Controls.Add(this.labelX1);
-			this.sideNavPanel1.Controls.Add(this.btnRunCheck);
-			this.sideNavPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.sideNavPanel1.Location = new System.Drawing.Point(89, 31);
-			this.sideNavPanel1.Name = "sideNavPanel1";
-			this.sideNavPanel1.Size = new System.Drawing.Size(291, 494);
-			this.sideNavPanel1.TabIndex = 2;
-			this.sideNavPanel1.Visible = false;
-			// 
-			// warningBox3
-			// 
-			this.warningBox3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(196)))), ((int)(((byte)(219)))), ((int)(((byte)(249)))));
-			this.warningBox3.CloseButtonVisible = false;
-			this.warningBox3.Image = ((System.Drawing.Image)(resources.GetObject("warningBox3.Image")));
-			this.warningBox3.Location = new System.Drawing.Point(17, 207);
-			this.warningBox3.Margin = new System.Windows.Forms.Padding(4);
-			this.warningBox3.Name = "warningBox3";
-			this.warningBox3.OptionsButtonVisible = false;
-			this.warningBox3.Size = new System.Drawing.Size(264, 32);
-			this.warningBox3.TabIndex = 29;
-			this.warningBox3.Text = "<b>NOTE</b> These tools can take a long time to run";
-			// 
-			// labelX7
-			// 
-			this.labelX7.BackColor = System.Drawing.Color.Transparent;
-			// 
-			// 
-			// 
-			this.labelX7.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.labelX7.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.labelX7.Location = new System.Drawing.Point(5, 3);
-			this.labelX7.Name = "labelX7";
-			this.labelX7.Size = new System.Drawing.Size(251, 22);
-			this.labelX7.TabIndex = 19;
-			this.labelX7.Text = "Check for these Data Issues:";
-			// 
-			// line1
-			// 
-			this.line1.BackColor = System.Drawing.Color.Transparent;
-			this.line1.Location = new System.Drawing.Point(8, 179);
-			this.line1.Name = "line1";
-			this.line1.Size = new System.Drawing.Size(285, 12);
-			this.line1.TabIndex = 18;
-			this.line1.Text = "line1";
-			// 
-			// swCkObsoleteROData
-			// 
-			// 
-			// 
-			// 
-			this.swCkObsoleteROData.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.swCkObsoleteROData.Location = new System.Drawing.Point(10, 99);
-			this.swCkObsoleteROData.Name = "swCkObsoleteROData";
-			this.swCkObsoleteROData.Size = new System.Drawing.Size(91, 22);
-			this.swCkObsoleteROData.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-			this.superTooltip1.SetSuperTooltip(this.swCkObsoleteROData, new DevComponents.DotNetBar.SuperTooltipInfo("Obsolete RO Data", "", resources.GetString("swCkObsoleteROData.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 135)));
-			this.swCkObsoleteROData.SwitchClickTogglesValue = true;
-			this.swCkObsoleteROData.TabIndex = 14;
-			this.swCkObsoleteROData.Value = true;
-			this.swCkObsoleteROData.ValueObject = "Y";
-			this.swCkObsoleteROData.ValueChanged += new System.EventHandler(this.swCk_ValueChanged);
-			// 
-			// swHiddenDataLocs
-			// 
-			// 
-			// 
-			// 
-			this.swHiddenDataLocs.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.swHiddenDataLocs.Location = new System.Drawing.Point(10, 71);
-			this.swHiddenDataLocs.Name = "swHiddenDataLocs";
-			this.swHiddenDataLocs.Size = new System.Drawing.Size(91, 22);
-			this.swHiddenDataLocs.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-			this.superTooltip1.SetSuperTooltip(this.swHiddenDataLocs, new DevComponents.DotNetBar.SuperTooltipInfo("Hidden Data Locations", "", resources.GetString("swHiddenDataLocs.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
-			this.swHiddenDataLocs.SwitchClickTogglesValue = true;
-			this.swHiddenDataLocs.TabIndex = 15;
-			this.swHiddenDataLocs.Value = true;
-			this.swHiddenDataLocs.ValueObject = "Y";
-			this.swHiddenDataLocs.ValueChanged += new System.EventHandler(this.swCk_ValueChanged);
-			// 
-			// labelX3
-			// 
-			this.labelX3.BackColor = System.Drawing.Color.Transparent;
-			// 
-			// 
-			// 
-			this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.labelX3.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.labelX3.Location = new System.Drawing.Point(107, 99);
-			this.labelX3.Name = "labelX3";
-			this.labelX3.Size = new System.Drawing.Size(154, 22);
-			this.superTooltip1.SetSuperTooltip(this.labelX3, new DevComponents.DotNetBar.SuperTooltipInfo("Obsolete RO Data", "", resources.GetString("labelX3.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 135)));
-			this.labelX3.TabIndex = 11;
-			this.labelX3.Text = "Obsolete RO Data";
-			// 
-			// labelX2
-			// 
-			this.labelX2.BackColor = System.Drawing.Color.Transparent;
-			// 
-			// 
-			// 
-			this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.labelX2.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.labelX2.Location = new System.Drawing.Point(107, 71);
-			this.labelX2.Name = "labelX2";
-			this.labelX2.Size = new System.Drawing.Size(140, 22);
-			this.superTooltip1.SetSuperTooltip(this.labelX2, new DevComponents.DotNetBar.SuperTooltipInfo("Hidden Data Locations", "", resources.GetString("labelX2.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
-			this.labelX2.TabIndex = 12;
-			this.labelX2.Text = "Hidden Data Locations";
-			// 
-			// swCkOrphanDataRecs
-			// 
-			// 
-			// 
-			// 
-			this.swCkOrphanDataRecs.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.swCkOrphanDataRecs.Location = new System.Drawing.Point(10, 43);
-			this.swCkOrphanDataRecs.Name = "swCkOrphanDataRecs";
-			this.swCkOrphanDataRecs.Size = new System.Drawing.Size(91, 22);
-			this.swCkOrphanDataRecs.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-			this.superTooltip1.SetSuperTooltip(this.swCkOrphanDataRecs, new DevComponents.DotNetBar.SuperTooltipInfo("Orphan Data Records", "", resources.GetString("swCkOrphanDataRecs.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(275, 193)));
-			this.swCkOrphanDataRecs.SwitchClickTogglesValue = true;
-			this.swCkOrphanDataRecs.TabIndex = 9;
-			this.swCkOrphanDataRecs.Value = true;
-			this.swCkOrphanDataRecs.ValueObject = "Y";
-			this.swCkOrphanDataRecs.ValueChanged += new System.EventHandler(this.swCk_ValueChanged);
-			// 
-			// labelX1
-			// 
-			this.labelX1.BackColor = System.Drawing.Color.Transparent;
-			// 
-			// 
-			// 
-			this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.labelX1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.labelX1.Location = new System.Drawing.Point(107, 43);
-			this.labelX1.Name = "labelX1";
-			this.labelX1.Size = new System.Drawing.Size(172, 22);
-			this.superTooltip1.SetSuperTooltip(this.labelX1, new DevComponents.DotNetBar.SuperTooltipInfo("Orphan Data Records", "", resources.GetString("labelX1.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(275, 190)));
-			this.labelX1.TabIndex = 8;
-			this.labelX1.Text = "Orphan Data Records";
-			// 
-			// btnRunCheck
-			// 
-			this.btnRunCheck.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
-			this.btnRunCheck.Checked = true;
-			this.btnRunCheck.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-			this.btnRunCheck.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.btnRunCheck.Location = new System.Drawing.Point(5, 150);
-			this.btnRunCheck.Name = "btnRunCheck";
-			this.btnRunCheck.Size = new System.Drawing.Size(286, 23);
-			this.btnRunCheck.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-			this.superTooltip1.SetSuperTooltip(this.btnRunCheck, new DevComponents.DotNetBar.SuperTooltipInfo("Run Check", "", "This will run the database check tools selected.\r\n\r\nClick on the on/off switches " +
-            "to turn on/off each tool.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 100)));
-			this.btnRunCheck.TabIndex = 7;
-			this.btnRunCheck.Text = "Run Check";
-			this.btnRunCheck.Click += new System.EventHandler(this.btnRunCheck_Click);
-			// 
 			// sideNavPanel2
 			// 
 			this.sideNavPanel2.Controls.Add(this.swRefreshTblsForSrch);
@@ -939,9 +772,9 @@
 			this.sideNavPanel2.Controls.Add(this.line2);
 			this.sideNavPanel2.Controls.Add(this.btnRunRepair);
 			this.sideNavPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.sideNavPanel2.Location = new System.Drawing.Point(89, 31);
+			this.sideNavPanel2.Location = new System.Drawing.Point(102, 39);
 			this.sideNavPanel2.Name = "sideNavPanel2";
-			this.sideNavPanel2.Size = new System.Drawing.Size(291, 494);
+			this.sideNavPanel2.Size = new System.Drawing.Size(278, 486);
 			this.sideNavPanel2.TabIndex = 6;
 			this.sideNavPanel2.Visible = false;
 			// 
@@ -983,7 +816,7 @@
 			this.warningBox4.CloseButtonVisible = false;
 			this.warningBox4.Image = ((System.Drawing.Image)(resources.GetObject("warningBox4.Image")));
 			this.warningBox4.Location = new System.Drawing.Point(12, 264);
-			this.warningBox4.Margin = new System.Windows.Forms.Padding(4);
+			this.warningBox4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
 			this.warningBox4.Name = "warningBox4";
 			this.warningBox4.OptionsButtonVisible = false;
 			this.warningBox4.Size = new System.Drawing.Size(264, 32);
@@ -996,7 +829,7 @@
 			this.warningBox2.CloseButtonVisible = false;
 			this.warningBox2.Image = ((System.Drawing.Image)(resources.GetObject("warningBox2.Image")));
 			this.warningBox2.Location = new System.Drawing.Point(12, 302);
-			this.warningBox2.Margin = new System.Windows.Forms.Padding(4);
+			this.warningBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
 			this.warningBox2.Name = "warningBox2";
 			this.warningBox2.OptionsButtonVisible = false;
 			this.warningBox2.Size = new System.Drawing.Size(264, 43);
@@ -1171,6 +1004,173 @@
 			this.btnRunRepair.Text = "Run Repair";
 			this.btnRunRepair.Click += new System.EventHandler(this.btnRunRepair_Click);
 			// 
+			// sideNavPanel1
+			// 
+			this.sideNavPanel1.Controls.Add(this.warningBox3);
+			this.sideNavPanel1.Controls.Add(this.labelX7);
+			this.sideNavPanel1.Controls.Add(this.line1);
+			this.sideNavPanel1.Controls.Add(this.swCkObsoleteROData);
+			this.sideNavPanel1.Controls.Add(this.swHiddenDataLocs);
+			this.sideNavPanel1.Controls.Add(this.labelX3);
+			this.sideNavPanel1.Controls.Add(this.labelX2);
+			this.sideNavPanel1.Controls.Add(this.swCkOrphanDataRecs);
+			this.sideNavPanel1.Controls.Add(this.labelX1);
+			this.sideNavPanel1.Controls.Add(this.btnRunCheck);
+			this.sideNavPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.sideNavPanel1.Location = new System.Drawing.Point(102, 39);
+			this.sideNavPanel1.Name = "sideNavPanel1";
+			this.sideNavPanel1.Size = new System.Drawing.Size(278, 486);
+			this.sideNavPanel1.TabIndex = 2;
+			this.sideNavPanel1.Visible = false;
+			// 
+			// warningBox3
+			// 
+			this.warningBox3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(196)))), ((int)(((byte)(219)))), ((int)(((byte)(249)))));
+			this.warningBox3.CloseButtonVisible = false;
+			this.warningBox3.Image = ((System.Drawing.Image)(resources.GetObject("warningBox3.Image")));
+			this.warningBox3.Location = new System.Drawing.Point(17, 207);
+			this.warningBox3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.warningBox3.Name = "warningBox3";
+			this.warningBox3.OptionsButtonVisible = false;
+			this.warningBox3.Size = new System.Drawing.Size(264, 32);
+			this.warningBox3.TabIndex = 29;
+			this.warningBox3.Text = "<b>NOTE</b> These tools can take a long time to run";
+			// 
+			// labelX7
+			// 
+			this.labelX7.BackColor = System.Drawing.Color.Transparent;
+			// 
+			// 
+			// 
+			this.labelX7.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.labelX7.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.labelX7.Location = new System.Drawing.Point(5, 3);
+			this.labelX7.Name = "labelX7";
+			this.labelX7.Size = new System.Drawing.Size(251, 22);
+			this.labelX7.TabIndex = 19;
+			this.labelX7.Text = "Check for these Data Issues:";
+			// 
+			// line1
+			// 
+			this.line1.BackColor = System.Drawing.Color.Transparent;
+			this.line1.Location = new System.Drawing.Point(8, 179);
+			this.line1.Name = "line1";
+			this.line1.Size = new System.Drawing.Size(285, 12);
+			this.line1.TabIndex = 18;
+			this.line1.Text = "line1";
+			// 
+			// swCkObsoleteROData
+			// 
+			// 
+			// 
+			// 
+			this.swCkObsoleteROData.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.swCkObsoleteROData.Location = new System.Drawing.Point(10, 99);
+			this.swCkObsoleteROData.Name = "swCkObsoleteROData";
+			this.swCkObsoleteROData.Size = new System.Drawing.Size(91, 22);
+			this.swCkObsoleteROData.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+			this.superTooltip1.SetSuperTooltip(this.swCkObsoleteROData, new DevComponents.DotNetBar.SuperTooltipInfo("Obsolete RO Data", "", resources.GetString("swCkObsoleteROData.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 135)));
+			this.swCkObsoleteROData.SwitchClickTogglesValue = true;
+			this.swCkObsoleteROData.TabIndex = 14;
+			this.swCkObsoleteROData.Value = true;
+			this.swCkObsoleteROData.ValueObject = "Y";
+			this.swCkObsoleteROData.ValueChanged += new System.EventHandler(this.swCk_ValueChanged);
+			// 
+			// swHiddenDataLocs
+			// 
+			// 
+			// 
+			// 
+			this.swHiddenDataLocs.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.swHiddenDataLocs.Location = new System.Drawing.Point(10, 71);
+			this.swHiddenDataLocs.Name = "swHiddenDataLocs";
+			this.swHiddenDataLocs.Size = new System.Drawing.Size(91, 22);
+			this.swHiddenDataLocs.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+			this.superTooltip1.SetSuperTooltip(this.swHiddenDataLocs, new DevComponents.DotNetBar.SuperTooltipInfo("Hidden Data Locations", "", resources.GetString("swHiddenDataLocs.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+			this.swHiddenDataLocs.SwitchClickTogglesValue = true;
+			this.swHiddenDataLocs.TabIndex = 15;
+			this.swHiddenDataLocs.Value = true;
+			this.swHiddenDataLocs.ValueObject = "Y";
+			this.swHiddenDataLocs.ValueChanged += new System.EventHandler(this.swCk_ValueChanged);
+			// 
+			// labelX3
+			// 
+			this.labelX3.BackColor = System.Drawing.Color.Transparent;
+			// 
+			// 
+			// 
+			this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.labelX3.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.labelX3.Location = new System.Drawing.Point(107, 99);
+			this.labelX3.Name = "labelX3";
+			this.labelX3.Size = new System.Drawing.Size(154, 22);
+			this.superTooltip1.SetSuperTooltip(this.labelX3, new DevComponents.DotNetBar.SuperTooltipInfo("Obsolete RO Data", "", resources.GetString("labelX3.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 135)));
+			this.labelX3.TabIndex = 11;
+			this.labelX3.Text = "Obsolete RO Data";
+			// 
+			// labelX2
+			// 
+			this.labelX2.BackColor = System.Drawing.Color.Transparent;
+			// 
+			// 
+			// 
+			this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.labelX2.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.labelX2.Location = new System.Drawing.Point(107, 71);
+			this.labelX2.Name = "labelX2";
+			this.labelX2.Size = new System.Drawing.Size(140, 22);
+			this.superTooltip1.SetSuperTooltip(this.labelX2, new DevComponents.DotNetBar.SuperTooltipInfo("Hidden Data Locations", "", resources.GetString("labelX2.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+			this.labelX2.TabIndex = 12;
+			this.labelX2.Text = "Hidden Data Locations";
+			// 
+			// swCkOrphanDataRecs
+			// 
+			// 
+			// 
+			// 
+			this.swCkOrphanDataRecs.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.swCkOrphanDataRecs.Location = new System.Drawing.Point(10, 43);
+			this.swCkOrphanDataRecs.Name = "swCkOrphanDataRecs";
+			this.swCkOrphanDataRecs.Size = new System.Drawing.Size(91, 22);
+			this.swCkOrphanDataRecs.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+			this.superTooltip1.SetSuperTooltip(this.swCkOrphanDataRecs, new DevComponents.DotNetBar.SuperTooltipInfo("Orphan Data Records", "", resources.GetString("swCkOrphanDataRecs.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(275, 193)));
+			this.swCkOrphanDataRecs.SwitchClickTogglesValue = true;
+			this.swCkOrphanDataRecs.TabIndex = 9;
+			this.swCkOrphanDataRecs.Value = true;
+			this.swCkOrphanDataRecs.ValueObject = "Y";
+			this.swCkOrphanDataRecs.ValueChanged += new System.EventHandler(this.swCk_ValueChanged);
+			// 
+			// labelX1
+			// 
+			this.labelX1.BackColor = System.Drawing.Color.Transparent;
+			// 
+			// 
+			// 
+			this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.labelX1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.labelX1.Location = new System.Drawing.Point(107, 43);
+			this.labelX1.Name = "labelX1";
+			this.labelX1.Size = new System.Drawing.Size(172, 22);
+			this.superTooltip1.SetSuperTooltip(this.labelX1, new DevComponents.DotNetBar.SuperTooltipInfo("Orphan Data Records", "", resources.GetString("labelX1.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(275, 190)));
+			this.labelX1.TabIndex = 8;
+			this.labelX1.Text = "Orphan Data Records";
+			// 
+			// btnRunCheck
+			// 
+			this.btnRunCheck.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+			this.btnRunCheck.Checked = true;
+			this.btnRunCheck.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+			this.btnRunCheck.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.btnRunCheck.Location = new System.Drawing.Point(5, 150);
+			this.btnRunCheck.Name = "btnRunCheck";
+			this.btnRunCheck.Size = new System.Drawing.Size(286, 23);
+			this.btnRunCheck.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+			this.superTooltip1.SetSuperTooltip(this.btnRunCheck, new DevComponents.DotNetBar.SuperTooltipInfo("Run Check", "", "This will run the database check tools selected.\r\n\r\nClick on the on/off switches " +
+            "to turn on/off each tool.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 100)));
+			this.btnRunCheck.TabIndex = 7;
+			this.btnRunCheck.Text = "Run Check";
+			this.btnRunCheck.Click += new System.EventHandler(this.btnRunCheck_Click);
+			// 
 			// sideNavItem1
 			// 
 			this.sideNavItem1.IsSystemMenu = true;
@@ -1206,6 +1206,7 @@
 			// 
 			// sideNavItmLinks
 			// 
+			this.sideNavItmLinks.Checked = true;
 			this.sideNavItmLinks.Name = "sideNavItmLinks";
 			this.sideNavItmLinks.Panel = this.sideNavPanel3;
 			this.sideNavItmLinks.Symbol = "";
@@ -1226,14 +1227,13 @@
 			this.buttonItem1.Name = "buttonItem1";
 			this.buttonItem1.Text = "buttonItem1";
 			// 
-			// sideNavItmDelete
+			// sideNavItemDelete
 			// 
-			this.sideNavItmDelete.Checked = true;
-			this.sideNavItmDelete.Name = "sideNavItmDelete";
-			this.sideNavItmDelete.Panel = this.sideNavPanel4;
-			this.sideNavItmDelete.Symbol = "";
-			this.sideNavItmDelete.Text = "Delete";
-			this.sideNavItmDelete.Click += new System.EventHandler(this.sideNavItmDelete_Click);
+			this.sideNavItemDelete.Name = "sideNavItemDelete";
+			this.sideNavItemDelete.Panel = this.sideNavPanel4;
+			this.sideNavItemDelete.Symbol = "";
+			this.sideNavItemDelete.Text = "Delete";
+			this.sideNavItemDelete.Click += new System.EventHandler(this.sideNavItemDelete_Click_1);
 			// 
 			// sideNavItmExit
 			// 
@@ -1363,8 +1363,8 @@
 			this.sideNav1.PerformLayout();
 			this.sideNavPanel4.ResumeLayout(false);
 			this.sideNavPanel3.ResumeLayout(false);
-			this.sideNavPanel1.ResumeLayout(false);
 			this.sideNavPanel2.ResumeLayout(false);
+			this.sideNavPanel1.ResumeLayout(false);
 			this.panelEx4.ResumeLayout(false);
 			this.ResumeLayout(false);
 
@@ -1456,8 +1456,6 @@
 		private DevComponents.DotNetBar.LabelX labelX14;
 		private System.Windows.Forms.TreeView myTVdel;
 		private DevComponents.DotNetBar.ButtonX btnDeleteItems;
-		private DevComponents.DotNetBar.Controls.SideNavItem sideNavItmDelete;
+		private DevComponents.DotNetBar.Controls.SideNavItem sideNavItemDelete;
 	}
 }
-
-

PROMS/VEPROMS User Interface/frmBatchRefresh.cs

@@ -22,25 +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
-												  // pass in session info to constructor
+		// C2017-030 - new Admin Tools user interface
+		// pass in session info to constructor
 		public frmBatchRefresh(SessionInfo sessionInfo)
 		{
 			InitializeComponent();
 			_MySessionInfo = sessionInfo;
-
-			// When opening Admin tools Check tab will be default.
-			this.sideNavItmCheck.Checked = true;
-
-			if (sideNavItmDelete.Checked)
-			{
-				AdminToolType = (E_AdminToolType)4;
-				if (swDeleteFolder.Value)
-					ResetDelTV(true);
-				else
-					ResetDelTV(false);
-			}
-
 			setupProgessSteps1(); // C2017-030 - new Admin Tools user interface
 			UserInfo ui = UserInfo.GetByUserID(MySessionInfo.UserID);
 			IsAdministratorUser = ui.IsAdministrator();
@@ -56,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
@@ -85,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();
@@ -209,8 +189,8 @@ namespace VEPROMS
 				TreeNode tnc = tn.Nodes.Add(fic.Name);
 				tnc.Tag = fic;
 				if (fic.ChildFolderCount > 0)
-					if (LoadChildFolders(fic, tnc, noProcs))
-						loadedChildWorkingDraft = true;
+					if(LoadChildFolders(fic, tnc, noProcs))
+						loadedChildWorkingDraft=true;
 				// B2020-114 and C2020-035 only show folders the Set Admin can access
 				if (fic.FolderDocVersionCount > 0)
 				{
@@ -303,7 +283,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)
@@ -353,7 +333,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)
@@ -375,7 +355,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)
@@ -514,7 +494,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);
@@ -551,19 +531,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);
@@ -592,10 +572,10 @@ namespace VEPROMS
 			}
 			this.Cursor = Cursors.Default;
 			// B2018-002 - Invalid Transitions - Display Transition Refresh Statisitic
-			if (numTransFixed == 0 && numTransConverted == 0)
-				MessageBox.Show(string.Format("{0} Transitions Checked.\n\nNo Transitions Modified.", numTransProcessed), "Refresh Transitions Completed");
+			if (numTransFixed == 0 && numTransConverted ==0)
+				MessageBox.Show(string.Format("{0} Transitions Checked.\n\nNo Transitions Modified.",numTransProcessed), "Refresh Transitions Completed");
 			else
-				MessageBox.Show(string.Format("{0} Transitions Checked.\n\n {1} Correct as is.\n\n {2} Transitions modified.\n\n {3} Transitions converted to text.", numTransProcessed, numTransProcessed - (numTransFixed + numTransConverted), numTransFixed, numTransConverted), "Refresh Transitions Completed");
+				MessageBox.Show(string.Format("{0} Transitions Checked.\n\n {1} Correct as is.\n\n {2} Transitions modified.\n\n {3} Transitions converted to text.", numTransProcessed, numTransProcessed - (numTransFixed + numTransConverted),numTransFixed, numTransConverted), "Refresh Transitions Completed");
 		}
 
 		// C2017-030 - new Admin Tools user interface
@@ -608,7 +588,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");
@@ -618,7 +598,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();
@@ -663,7 +643,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;
@@ -672,7 +652,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
 						{
@@ -690,7 +670,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();
@@ -717,7 +697,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");
@@ -738,7 +718,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();
@@ -754,7 +734,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");
@@ -791,7 +771,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();
@@ -806,7 +786,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");
@@ -829,9 +809,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;
@@ -844,7 +824,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");
@@ -885,7 +865,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();
@@ -900,7 +880,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");
@@ -919,7 +899,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();
@@ -934,7 +914,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");
@@ -968,7 +948,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();
@@ -983,11 +963,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)
 			{
@@ -1008,7 +988,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();
@@ -1023,16 +1003,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)
@@ -1170,7 +1150,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++;
@@ -1187,7 +1167,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));
 			}
 		}
 
@@ -1223,40 +1203,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)
@@ -1275,9 +1225,9 @@ namespace VEPROMS
 		public ProgressBarItem ProgressBar
 		{
 			get { return _ProgressBar; }
-			set
-			{
-				_ProgressBar = value;
+			set 
+			{ 
+				_ProgressBar = value; 
 				_ProgressBar.TextVisible = true;
 			}
 		}
@@ -1379,24 +1329,20 @@ namespace VEPROMS
 		}
 
 		// new Admin Tools user interface for deletes
-		private void sideNavItmDelete_Click(object sender, EventArgs e)
+		private void sideNavItemDelete_Click(object sender, EventArgs e)
 		{
-			AdminToolType = E_AdminToolType.Delete;
-			lblAdmToolProgressType.Text = "";
-			setupProgessSteps1();
 
+		}
+
+		// new Admin Tools user interface for deletes
+		private void sideNavItemDelete_Click_1(object sender, EventArgs e)
+		{			
 			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
@@ -1405,8 +1351,7 @@ namespace VEPROMS
 			Check = 0,
 			Repair = 1,
 			Links = 2,
-			Users = 3,
-			Delete = 4
+			Users = 3
 		};
 		private E_AdminToolType AdminToolType = 0;
 
@@ -1457,11 +1402,6 @@ namespace VEPROMS
 					splitContainer3.Panel2Collapsed = true;
 					progressSteps1.Visible = false;
 					break;
-
-				case E_AdminToolType.Delete:
-					splitContainer3.Panel2Collapsed = true;
-					progressSteps1.Visible = false;
-					break;
 			}
 		}
 
@@ -1696,51 +1636,31 @@ namespace VEPROMS
 				//		pil.Add(myProcedures[tn]);
 
 				////Load Selected Folders
-				Dictionary<int, string> folderData = new Dictionary<int, string>();
-
-				//List<FolderInfo> Flist = new List<FolderInfo>();
-				//foreach (TreeNode tn in myDocVersions.Keys)
-				//	if (tn.Checked)
-				//		Flist.Add();
+				//Dictionary<int, string> folderData = new Dictionary<int, string>();
 
 				//List<DocVersionInfo> dvil = new List<DocVersionInfo>();
-				//foreach (TreeNode tn in myDocVersions.Keys)
-				//	if (tn.Checked)
-				//		dvil.Add(myDocVersions[tn]);
-
 				//foreach (TreeNode tn in myTVdel.Nodes)
-				//{
 				//	if (tn.Checked)
 				//	{
-				//		var itemInfo = myProcedures[tn];
-				//		folderData.Add(itemInfo.ItemID, itemInfo.DisplayText);
+				//		tn.Tag = dvi;
+				//		myDocVersions.Add(tn, dvi);
 				//	}
-				//}
+
+				////foreach (TreeNode tn in myTVdel.Nodes)
+				////{
+				////	if (tn.Checked)
+				////	{
+				////		var itemInfo = myProcedures[tn];
+				////		folderData.Add(itemInfo.ItemID, itemInfo.DisplayText);
+				////	}
+				////}
 
 				//ProcessDelete(dvil);
 			}
 			else
 			{
-					// Write progress status
+				//TODO process deletions of annotations
 				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();
-
-
 			}
 		}
 
@@ -1779,16 +1699,5 @@ namespace VEPROMS
 			// Return true if deletion was successful, false otherwise
 			return true; // Placeholder
 		}
-
-		public List<ProcedureInfo> RetrieveChkAnnotations()
-		{
-			List<ProcedureInfo> pil = new List<ProcedureInfo>();
-			foreach (TreeNode tn in myProcedures.Keys)
-				if (tn.Checked)
-					pil.Add(myProcedures[tn]);
-			return pil;
-		}
 	}
 }
-
-

PROMS/VEPROMS User Interface/frmBatchRefresh.resx

@@ -120,41 +120,6 @@
   <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 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="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.
 
@@ -305,6 +270,41 @@ Should an item become orphaned (disconnected) from the rest of the data, it will
 
 This tool may take an extended period of time to execute.
 </value>
+  </data>
+  <data name="swDeleteFolder.SuperTooltip" xml:space="preserve">
+    <value>This allows the user to check referenced objects links in procedure step data for multiple working drafts in a batch mode.
+
+Bad referenced bject links will be identified with an Bad RO Link annotation. Use the PROMS Search tool to list all of the steps that have this annotation.
+
+Be sure a current backup of the database exists prior performing this function.
+
+It is recommended that this be done during off hours.
+
+</value>
+  </data>
+  <data name="labelX13.SuperTooltip" xml:space="preserve">
+    <value>This allows the user to check referenced objects links in procedure step data for multiple working drafts in a batch mode.
+
+Bad referenced bject links will be identified with an Bad RO Link annotation. Use the PROMS Search tool to list all of the steps that have this annotation.
+
+Be sure a current backup of the database exists prior performing this function.
+
+It is recommended that this be done during off hours.
+</value>
+  </data>
+  <data name="swDeleteAnnotations.SuperTooltip" xml:space="preserve">
+    <value>This function will refresh transitions in all procedures selected below, whether they were selected individually or as a group via a procedure set.
+
+Be sure a current backup of the database exists prior to running this function.
+
+If more than one procedure is selected, it is recommended that this be performed during off hours.</value>
+  </data>
+  <data name="labelX14.SuperTooltip" xml:space="preserve">
+    <value>This function will refresh transitions in all procedures selected below, whether they were selected individually or as a group via a procedure set.
+
+Be sure a current backup of the database exists prior to running this function.
+
+If more than one procedure is selected, it is recommended that this be performed during off hours.</value>
   </data>
   <data name="swRefreshTblsForSrch.SuperTooltip" xml:space="preserve">
     <value>When Word attachments are modified and saved, PROMS will create a PDF of the attachment contents and save it in the database.  When this is done, all the of the RO references are resolved as well as pagination of the attachment.  This speeds up the overall printing of the procedure in that PROMS simply inserts the attachment contents.
@@ -403,6 +403,6 @@ Should an item become orphaned (disconnected) from the rest of the data, it will
 </value>
   </data>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>46</value>
+    <value>193</value>
   </metadata>
 </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.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/Extension/ItemInsertExt.cs

@@ -2547,7 +2547,6 @@ namespace VEPROMS.CSLA.Library
 				newItemInfo.UpdateTransitionText();
 				newItemInfo.UpdateROText();
 				newItemInfo.UpdatePastedStepTransitionText();
-
 				// Add to tree
 				if (newItemInfo.NextItem != null)
 				{
@@ -2565,10 +2564,14 @@ namespace VEPROMS.CSLA.Library
 				}
 				else
 				{
-					//Create tree node for copied procedure when no other procedures exist in the working draft (treeNodeReplace)
-					VETreeNode tn = null;
-					tn = new VETreeNode(newItemInfo);
-					treeNodeReplace.Nodes.Add(tn);
+					//Create tree node for copied procedure when no other procedures exist in the folder
+					VETreeNode vtn = treeNodeReplace as VETreeNode;
+					DocVersionInfo dvi = vtn.VEObject as DocVersionInfo;
+	
+					ItemInfo newProc = dvi.PasteChild(copyStartID);
+					VETreeNode tn1 = new VETreeNode(newProc);
+					treeNodeReplace.Nodes.Add(tn1);        // add tree node to end of list.
+					treeNodeReplace = tn1;
 				}
 				return newItemInfo;
 			}

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
-								string strRtnStr = _MyRODbID.ToString() + ":" + GetROsToSearch(chld);
-								if (strRtnStr.EndsWith(","))
-									strRtnStr = strRtnStr.Substring(0, strRtnStr.Length - 1);
-								return strRtnStr;
+								return _MyRODbID.ToString() + ":" + GetROsToSearch(chld);
+								//return _MyRODbID.ToString() + ":" + ch.roid + "0000," + GetROsToSearch(chld);
+								//if (strRtnStr.EndsWith(","))
+								//	strRtnStr = strRtnStr.Substring(0, strRtnStr.Length - 1);
 							}
 						}
 					}
@@ -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
-					{
-						// 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));
-					}
+						rtnstr += 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;
-			try
-			{
-				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; 
-			}
+			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.
+			EditItem parentEditItem = ActiveParent;
 
 			StepConfig savOrigPasteConfig = MyItemInfo.MyConfig as StepConfig;
 			int TopMostYBefore = TopMostEditItem.Top;