Attempted fixes for enhanced tests

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>

PROMS/VEPROMS User Interface/frmAnnotationsCleanup.Designer.cs

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

PROMS/VEPROMS User Interface/frmAnnotationsCleanup.cs

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

PROMS/VEPROMS User Interface/frmAnnotationsCleanup.resx

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

PROMS/VEPROMS User Interface/frmBatchRefresh.cs

@@ -24,27 +24,10 @@ namespace VEPROMS
 		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
-
-		private frmVEPROMS _veProms;
-		
-		public frmBatchRefresh(SessionInfo sessionInfo, frmVEPROMS veProms)
+		public frmBatchRefresh(SessionInfo sessionInfo)
 		{
 			InitializeComponent();
 			_MySessionInfo = sessionInfo;
-			_veProms = veProms;
-
-			if (sideNavItmDelete.Checked)
-			{
-				AdminToolType = (E_AdminToolType)4;
-				if (swDeleteFolder.Value)
-				{
-					ResetDelTV(true);
-					setupProgessSteps1();
-				}
-				else
-					ResetDelTV(false);
-			}
-
 			setupProgessSteps1(); // C2017-030 - new Admin Tools user interface
 			UserInfo ui = UserInfo.GetByUserID(MySessionInfo.UserID);
 			IsAdministratorUser = ui.IsAdministrator();
@@ -60,18 +43,11 @@ 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;
@@ -98,7 +74,6 @@ namespace VEPROMS
 
 		private Dictionary<TreeNode, ProcedureInfo> myProcedures = new Dictionary<TreeNode, ProcedureInfo>();
 		private Dictionary<TreeNode, DocVersionInfo> myDocVersions = new Dictionary<TreeNode, DocVersionInfo>();
-		private Dictionary<TreeNode, FolderInfo> myFolders = new Dictionary<TreeNode, FolderInfo>();
 		private void frmBatchRefresh_Load(object sender, EventArgs e)
 		{
 			IsClosing = false;//B2017-221 Allow the batch dialog to close when waiting to process.
@@ -141,8 +116,6 @@ namespace VEPROMS
 			//myTreeNodePath = new List<string>();
 			myTV.Nodes.Clear();
 			myDocVersions.Clear();
-			myFolders.Clear();
-
 			FolderInfo fi = FolderInfo.GetTop();
 			TreeNode tn = myTV.Nodes.Add(fi.Name);
 			tn.Tag = fi;
@@ -152,87 +125,30 @@ namespace VEPROMS
 				myTV.SelectedNode.Expand();
 			this.Cursor = Cursors.Default;
 		}
-		private void ResetDelTV()
-		{
-			ResetDelTV(false);
-		}
-		private void ResetDelTV(bool noProcs)
-		{
-			btnFixLinks.Enabled = false;
-			this.Cursor = Cursors.WaitCursor;
-			myTVdel.Nodes.Clear();
-			myDocVersions.Clear();
-			FolderInfo fi = FolderInfo.GetTop();
-
-			if (fi.ChildFolderCount > 0)
-			{
-				TreeNode tn = new TreeNode(fi.Name);
-				tn.Tag = fi;
-				tn.StateImageIndex = -1; // Hide the checkbox for the root node
-				LoadChildFolders(fi, tn, noProcs);
-				myTVdel.Nodes.Add(tn);
-			}
-
-			if (myTVdel.SelectedNode != null)
-				myTVdel.SelectedNode.Expand();
-
-			//Expand if folders
-			if (noProcs)
-				myTVdel.ExpandAll();
-
-			this.Cursor = Cursors.Default;
-		}
-
 		// B2021-060 Higher level folders where being removed from the tree even if there was a child folder that containe a working draft set
 		private bool LoadChildFolders(FolderInfo fi, TreeNode tn, bool noProcs)
 		{
 			bool loadedWorkingDraft = false;
-			bool loadedChildWorkingDraft = false;
-
+			bool loadedChildWorkingDraft = false; // B2021-060 flag when child folder working draft is loaded
 			foreach (FolderInfo fic in fi.SortedChildFolders)
 			{
 				TreeNode tnc = tn.Nodes.Add(fic.Name);
 				tnc.Tag = fic;
-
 				if (fic.ChildFolderCount > 0)
-				{
 					if(LoadChildFolders(fic, tnc, noProcs))
-					{
 						loadedChildWorkingDraft=true;
-					}
-				}
-
+				// B2020-114 and C2020-035 only show folders the Set Admin can access
 				if (fic.FolderDocVersionCount > 0)
 				{
 					if (!LoadDocVersions(fic, tnc, noProcs))
-					{
 						tnc.Remove();
-					}
 					else
-					{
 						loadedWorkingDraft = true;
 				}
 			}
-				else
-				{
-					// Add the folder to the dictionary
-					if (!myFolders.ContainsKey(tnc))
-					{
-						myFolders.Add(tnc, fic);
-					}
-				}
-			}
-
-			if (loadedChildWorkingDraft)
-			{
-				loadedWorkingDraft = true;
-			}
-
+			if (loadedChildWorkingDraft) loadedWorkingDraft = true; // B2021-060 if child folder working draft loaded set loadedWorkingDraft
 			if (tn.Parent != null && !loadedWorkingDraft)
-			{
 				tn.Remove();
-			}
-
 			return loadedWorkingDraft;
 		}
 		private bool LoadDocVersions(FolderInfo fic, TreeNode tnc, bool noProcs)
@@ -1205,35 +1121,10 @@ namespace VEPROMS
 					CheckChildNodes(e.Node, e.Node.Checked);
 				}
 			}
-			if (swDeleteAnnotations.Value)
-			{
-				if (e.Node.Checked)
-				{
-					DiselectParentNodes(e.Node.Parent);
-					DiselectChildNodes(e.Node.Nodes);
-				}
-			}
 
 			btnFixLinks.Enabled = AtLeastOneNodeChecked(); // C2017-030 support for Refresh Transitions/Update RO Values
 		}
-		private void DiselectParentNodes(TreeNode parent)
-		{
-			while (parent != null)
-			{
-				if (parent.Checked)
-					parent.Checked = false;
-				parent = parent.Parent;
-			}
-		}
-		private void DiselectChildNodes(TreeNodeCollection childes)
-		{
-			foreach (TreeNode oneChild in childes)
-			{
-				if (oneChild.Checked)
-					oneChild.Checked = false;
-				DiselectChildNodes(oneChild.Nodes);
-			}
-		}
+
 		private void CheckChildNodes(TreeNode treeNode, bool ischecked)
 		{
 			foreach (TreeNode tn in treeNode.Nodes)
@@ -1247,80 +1138,6 @@ namespace VEPROMS
 			}
 		}
 
-		//After check model to select and deselect nodes on the delete and annotation tree.
-		private void myTV_AfterCheck_DelAnn(object sender, TreeViewEventArgs e)
-		{
-			if (e.Action != TreeViewAction.Unknown)
-			{
-				if (e.Node.Nodes.Count > 0)
-				{
-					CheckChildNodes_DelAnn(e.Node, e.Node.Checked);
-				}
-			}
-
-			if (e.Node.Checked)
-			{
-				// Ensure child nodes follow the parent node's state
-				CheckChildNodes_DelAnn(e.Node, e.Node.Checked);
-			}
-			else
-			{
-				// Automatically deselect parent nodes if current node is unchecked
-				if (swDeleteFolder.Value) 
-					DiselectParentNodes_DelAnn(e.Node);
-			}
-
-			btnFixLinks.Enabled = AtLeastOneNodeChecked_DelAnn(); // Ensure button is enabled based on custom logic
-		}
-		private void DiselectParentNodes_DelAnn(TreeNode node)
-		{
-			TreeNode parent = node.Parent;
-			while (parent != null)
-			{
-				parent.Checked = false;
-				parent = parent.Parent;
-			}
-		}
-		private void DiselectChildNodes_DelAnn(TreeNodeCollection children)
-		{
-			foreach (TreeNode child in children)
-			{
-				child.Checked = false;
-				DiselectChildNodes_DelAnn(child.Nodes);
-			}
-		}
-		private void CheckChildNodes_DelAnn(TreeNode treeNode, bool isChecked)
-		{
-			foreach (TreeNode tn in treeNode.Nodes)
-			{
-				tn.Checked = isChecked;
-
-				if (tn.Nodes.Count > 0)
-					CheckChildNodes_DelAnn(tn, isChecked);
-			}
-		}
-		private bool AtLeastOneNodeChecked_DelAnn()
-		{
-			foreach (TreeNode node in myTV.Nodes)
-			{
-				if (node.Checked || AnyChildNodeChecked_DelAnn(node))
-					return true;
-			}
-			return false;
-		}				
-		private bool AnyChildNodeChecked_DelAnn(TreeNode node)
-		{
-			foreach (TreeNode childNode in node.Nodes)
-			{
-				if (childNode.Checked || AnyChildNodeChecked_DelAnn(childNode))
-					return true;
-			}
-			return false;
-		}
-
-
-
-
 		private ProgressBarItem _ProgressBar = null;
 
 		public ProgressBarItem ProgressBar
@@ -1429,24 +1246,6 @@ namespace VEPROMS
 			this.Close();
 		}
 
-		// new Admin Tools user interface for deletes
-		private void sideNavItmDelete_Click(object sender, EventArgs e)
-		{
-			AdminToolType = E_AdminToolType.Delete;			
-			setupProgessSteps1();
-
-			if (swDeleteFolder.Value)
-				ResetDelTV(true);
-			else
-				ResetDelTV(false);
-		}
-
-		// new Admin Tools user interface for deletes
-		//private void sideNavItmDelete_Click_1(object sender, EventArgs e)
-		//{
-
-		//}
-
 		#region On/Off Swiches
 
 		// C2017-030 new Admin Tools user interface
@@ -1455,8 +1254,7 @@ namespace VEPROMS
 			Check = 0,
 			Repair = 1,
 			Links = 2,
-			Users = 3,
-			Delete = 4
+			Users = 3
 		};
 		private E_AdminToolType AdminToolType = 0;
 
@@ -1507,23 +1305,6 @@ namespace VEPROMS
 					splitContainer3.Panel2Collapsed = true;
 					progressSteps1.Visible = false;
 					break;
-
-				case E_AdminToolType.Delete:
-					if (swDeleteFolder.Value)
-					{
-						splitContainer3.Panel2Collapsed = false;
-						progressSteps1.Items.Add(siOrphDatRecs);
-						lblAdmToolProgressType.Text = "Repairing: ";
-						progressSteps1.Visible = true;
-						progressSteps1.Refresh();
-					}
-					else
-					{
-						lblAdmToolProgressType.Text = "";
-						splitContainer3.Panel2Collapsed = true;
-						progressSteps1.Visible = false;
-					}
-					break;
 			}
 		}
 
@@ -1719,171 +1500,5 @@ namespace VEPROMS
 			}
 
 		}
-
-
-		//C2024-005 Delete Annotations, Delete Folders
-		private void swDeleteAnnotations_ValueChanged(object sender, EventArgs e)
-		{
-			setupProgessSteps1();
-			swDeleteFolder.Value = !swDeleteAnnotations.Value;
-			if (swDeleteFolder.Value)
-				ResetDelTV(true);		
-			else
-				ResetDelTV(false);
-		}
-
-		private void swDeleteFolder_ValueChanged(object sender, EventArgs e)
-		{
-			setupProgessSteps1();
-			swDeleteAnnotations.Value = !swDeleteFolder.Value;
-			if (swDeleteFolder.Value)
-				ResetDelTV(true);
-			else
-				ResetDelTV(false);
-		}
-
-		private void btnDeleteItems_Click(object sender, EventArgs e)
-		{
-			//clear
-			txtResults.Clear();
-			txtProcess.Clear();
-
-			if (swDeleteFolder.Value)
-			{
-				if (FlexibleMessageBox.Show(this, "You sure you want to remove the selected folders and their contents?", "Confirm Folder Deletion", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
-				{
-					txtProcess.AppendText("Deleting Folders...");
-
-						//Load Selected Folders with docversions
-					List<DocVersionInfo> dvil = new List<DocVersionInfo>();
-					foreach (TreeNode tn in myDocVersions.Keys)
-						if (tn.Checked)
-							dvil.Add(myDocVersions[tn]);
-
-					//Load Selected Folders with docversions
-					List<FolderInfo> ef = new List<FolderInfo>();
-					foreach (TreeNode tn in myFolders.Keys)
-						if (tn.Checked)
-							ef.Add(myFolders[tn]);
-
-					ProcessDelete(dvil, ef);
 	}
 }
-			else
-			{
-					// Write progress status
-				txtProcess.AppendText("Deleting Annotations...");
-
-					// Create a list of procedures the user selected
-				List<ProcedureInfo> pil = new List<ProcedureInfo>();
-				foreach (TreeNode tn in myProcedures.Keys)
-					if (tn.Checked)
-						pil.Add(myProcedures[tn]);
-
-					// Create a list of doc versions the user selected
-				List<DocVersionInfo> dvil = new List<DocVersionInfo>();
-				foreach (TreeNode tn in myDocVersions.Keys)
-					if (tn.Checked)
-						dvil.Add(myDocVersions[tn]);
-
-				frmAnnotationsCleanup frmAnnoDel = new frmAnnotationsCleanup(this, pil, dvil);
-				
-				frmAnnoDel.ShowDialog();
-			}
-		}
-
-		private void ProcessDelete(List<DocVersionInfo> foldersToDelete, List<FolderInfo> emptyFoldersToDelete)
-		{
-			DateTime pStart = DateTime.Now;
-			txtProcess.AppendText(Environment.NewLine);
-			txtProcess.AppendText(pStart.ToString("MM/dd/yyyy @ HH:mm"));
-			txtProcess.AppendText(Environment.NewLine);
-
-			foreach (var kvp in foldersToDelete)
-			{
-				//Gather folder information			
-				FolderInfo fi = (FolderInfo)kvp.ActiveParent;
-				int itemID = (int)fi.FolderID;
-				string folderName = fi.Name;
-
-				// Perform the deletion operation
-				bool deletionSuccessful = DeleteFolderByID(itemID);
-
-				// Update txtProcess with the progress
-				if (deletionSuccessful)
-				{
-					txtProcess.AppendText($"Successfully deleted folder: {folderName} (ID: {itemID})");
-				}
-				else
-				{
-					txtProcess.AppendText($"Failed to delete folder: {folderName} (ID: {itemID})");
-				}
-				txtProcess.AppendText(Environment.NewLine);
-			}
-
-
-			//Delete non working info folders.
-			foreach (var kvp in emptyFoldersToDelete)
-			{
-				//Gather folder information			
-				FolderInfo fi = (FolderInfo)kvp;
-				int itemID = (int)fi.FolderID;
-				string folderName = fi.Name;
-
-				// Perform the deletion operation
-				bool deletionSuccessful = DeleteFolderByID(itemID);
-
-				// Update txtProcess with the progress
-				if (deletionSuccessful)
-				{
-					txtProcess.AppendText($"Successfully deleted folder: {folderName} (ID: {itemID})");
-				}
-				else
-				{
-					txtProcess.AppendText($"Failed to delete folder: {folderName} (ID: {itemID})");
-				}
-				txtProcess.AppendText(Environment.NewLine);
-			}
-
-			//Run Repair
-			int prgStpIdx = -1;
-			StepProgress(++prgStpIdx, 50);
-			PurgeDisconnectedItems(); // Orphan Items
-			StepProgress(prgStpIdx, 100);
-
-			//rebuild
-			ResetDelTV(true);
-
-			MessageBox.Show("Folder Deletion Completed", "Delete Folders");
-			ClearStepProgress();
-		}
-		private bool DeleteFolderByID(int folderID)
-		{
-			try
-			{
-				//Delete
-				Folder.DeleteFolderAdmin(folderID);
-
-				//update treeview UI via veProms
-				_veProms.tv_FolderDelete(folderID);
-
-				return true;
-			}
-			catch 
-			{
-				return false;
-			}
-		}
-
-		public List<ProcedureInfo> RetrieveChkAnnotations()
-		{
-			List<ProcedureInfo> pil = new List<ProcedureInfo>();
-			foreach (TreeNode tn in myProcedures.Keys)
-				if (tn.Checked)
-					pil.Add(myProcedures[tn]);
-			return pil;
-		}
-	}
-}
-
-

PROMS/VEPROMS User Interface/frmBatchRefresh.resx

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

PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs

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

PROMS/VEPROMS User Interface/frmVEPROMS.cs

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

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

@@ -225,86 +225,6 @@ namespace VEPROMS.CSLA.Library
 				throw new DbCslaException("Error on Annotation.Delete", ex);
 			}
 		}
-
-		public static void DeleteAnnotationProcByType(int typID, string procList)
-		{
-			if (!CanDeleteObject())
-				throw new System.Security.SecurityException("User not authorized to remove a Annotation");
-			try
-			{
-				DataPortal.Delete(new DeleteAnnotationProcByTypeCriteria(typID, procList));
-				AnnotationInfo.StaticOnInfoChanged();
-			}
-			catch (Exception ex)
-			{
-				System.Data.SqlClient.SqlException exSQL = SqlException(ex);
-				if (exSQL != null && exSQL.Message.Contains("###Cannot Delete Item###"))
-					throw exSQL;
-				Console.WriteLine("AnnotationExt: Stacktrace = {0}", ex.StackTrace);
-				throw new DbCslaException("Error on Annotation.Delete", ex);
-			}
-		}
-
-		public static void DeleteAnnotationDocvByType(int typID, string versionID)
-		{
-			if (!CanDeleteObject())
-				throw new System.Security.SecurityException("User not authorized to remove a Annotation");
-			try
-			{
-				DataPortal.Delete(new DeleteAnnotationDocvByTypeCriteria(typID, versionID));
-				AnnotationInfo.StaticOnInfoChanged();
-			}
-			catch (Exception ex)
-			{
-				System.Data.SqlClient.SqlException exSQL = SqlException(ex);
-				if (exSQL != null && exSQL.Message.Contains("###Cannot Delete Item###"))
-					throw exSQL;
-				Console.WriteLine("AnnotationExt: Stacktrace = {0}", ex.StackTrace);
-				throw new DbCslaException("Error on Annotation.Delete", ex);
-			}
-		}
-
-		public static int getAnnotationProcCnt(int typID, string procList)
-		{
-			if (!CanGetObject())
-				throw new System.Security.SecurityException("User not authorized to remove a Annotation");
-			try
-			{
-				Annotation ProcCnt  = DataPortal.Fetch<Annotation>(new getAnnotationCountProcCriteria(typID, procList));
-				AnnotationInfo.StaticOnInfoChanged();
-				return Annotation.ProcCnt;
-				//return Int32.Parse(ProcCnt);
-			}
-			catch (Exception ex)
-			{
-				System.Data.SqlClient.SqlException exSQL = SqlException(ex);
-				if (exSQL != null && exSQL.Message.Contains("###Cannot retrieve Item###"))
-					throw exSQL;
-				Console.WriteLine("AnnotationExt: Stacktrace = {0}", ex.StackTrace);
-				throw new DbCslaException("Error on getAnnotationCountProcCriteria", ex);
-			}
-		}
-
-		public static int getAnnotationCountDocv(int typID, string procList)
-		{
-			if (!CanGetObject())
-				throw new System.Security.SecurityException("User not authorized to remove a Annotation");
-			try
-			{
-				Annotation DocvCnt = DataPortal.Fetch<Annotation>(new getAnnotationCountDocvCriteria(typID, procList));
-				AnnotationInfo.StaticOnInfoChanged();
-				return Annotation.DocvCnt;
-			}
-			catch (Exception ex)
-			{
-				System.Data.SqlClient.SqlException exSQL = SqlException(ex);
-				if (exSQL != null && exSQL.Message.Contains("###Cannot retrieve Item###"))
-					throw exSQL;
-				Console.WriteLine("AnnotationExt: Stacktrace = {0}", ex.StackTrace);
-				throw new DbCslaException("Error on getAnnotationCountDocvCriteria", ex);
-			}
-		}
-
 		private static System.Data.SqlClient.SqlException SqlException(Exception ex)
 		{
 			Type sqlExType = typeof(System.Data.SqlClient.SqlException);
@@ -360,209 +280,12 @@ namespace VEPROMS.CSLA.Library
 				throw new DbCslaException("Item.DataPortal_Delete", ex);
 			}
 		}
-
-		[Serializable()]
-		protected class DeleteAnnotationProcByTypeCriteria
-		{
-			private int _typeID;
-			public int TypeID
-			{ get { return _typeID; } }
-
-			private string _procList;
-			public string ProcList
-			{ get { return _procList; } }
-			public DeleteAnnotationProcByTypeCriteria(int typeID, string procList)
-			{
-				_typeID = typeID;
-				_procList = procList;
 	}
+	//public partial class AnnotationTypeAnnotations
+	//{
+	//   public static int GetAnnotationID()
+	//   {
+	//      return AnnotationTypeAnnotat
+	//   }
+	//}
 }
-		[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);
-			}
-		}
-	}
-}
-
-

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

@@ -1944,6 +1944,54 @@ namespace VEPROMS.CSLA.Library
 		}
 		#endregion
 		#region DataPortal
+		private void DataPortal_Fetch(PastingPartEnhancedCriteria criteria)
+		{
+			if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] ItemInfo.DataPortal_Fetch", GetHashCode());
+			try
+			{
+				using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+				{
+					Csla.ApplicationContext.LocalContext["cn"] = cn;
+					using (SqlCommand cm = cn.CreateCommand())
+					{
+						cm.CommandType = CommandType.StoredProcedure;
+						cm.Parameters.AddWithValue("@StartItemID", criteria.StartItemID);  // copy children
+						cm.Parameters.AddWithValue("@ItemID", criteria.ItemID);            //copy to
+						cm.Parameters.AddWithValue("@Type", criteria.Type);
+						cm.Parameters.AddWithValue("@DTS", criteria.DTS);
+						cm.Parameters.AddWithValue("@UserID", criteria.UserID);
+						SqlParameter param_ItemID = new SqlParameter("@NewItemID", SqlDbType.Int);
+						param_ItemID.Direction = ParameterDirection.Output;
+						cm.Parameters.Add(param_ItemID);
+						cm.CommandText = "PasteItemEnhancedReplace";
+						//cm.CommandText = "PasteItemReplace";
+						cm.CommandTimeout = Database.DefaultTimeout;
+						using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader()))
+						{
+							//int newItemID = (int)cm.Parameters["@NewItemID"].Value;
+							if (!dr.Read())
+							{
+								_ErrorMessage = "No Record Found";
+								return;
+							}
+							ReadData(dr);
+						}
+					}
+					// removing of item only needed for local data portal
+					if (Csla.ApplicationContext.ExecutionLocation == Csla.ApplicationContext.ExecutionLocations.Client)
+						Csla.ApplicationContext.LocalContext.Remove("cn");
+				}
+			}
+			catch (Exception ex)
+			{
+				if (!ex.Message.Contains("This step has been deleted") && !ex.Message.Contains("This current step has been deleted in another session"))
+				{
+					if (_MyLog.IsErrorEnabled) _MyLog.Error("ItemInfo.DataPortal_Fetch", ex);
+				}
+				_ErrorMessage = ex.Message;
+				throw new DbCslaException("ItemInfo.DataPortal_Fetch", ex);
+			}
+		}
 		private void DataPortal_Fetch(PastingPartCriteria criteria)
 		{
 			if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] ItemInfo.DataPortal_Fetch", GetHashCode());
@@ -2066,6 +2114,68 @@ namespace VEPROMS.CSLA.Library
 			}
 		}
 		#endregion
+		#region PastingPartEnhancedCriteria
+		[Serializable()]
+		public class PastingPartEnhancedCriteria
+		{
+			#region Properties
+			private int _StartItemID;
+			public int StartItemID
+			{
+				get { return _StartItemID; }
+				set { _StartItemID = value; }
+			}
+			private int _ItemID;            // paste relative to this itemid
+			public int ItemID
+			{
+				get { return _ItemID; }
+				set { _ItemID = value; }
+			}
+			private EAddpingPart _AddType;
+			public EAddpingPart AddType
+			{
+				get { return _AddType; }
+				set { _AddType = value; }
+			}
+			private int? _FromType = null;
+			public int? FromType
+			{
+				get { return _FromType; }
+				set { _FromType = value; }
+			}
+			private int? _Type = null;
+			public int? Type
+			{
+				get { return _Type; }
+				set { _Type = value; }
+			}
+			private DateTime _DTS;
+			public DateTime DTS
+			{
+				get { return _DTS; }
+				set { _DTS = value; }
+			}
+			private string _UserID;
+			public string UserID
+			{
+				get { return _UserID; }
+				set { _UserID = value; }
+			}
+			#endregion
+			#region Constructor
+			public PastingPartEnhancedCriteria(int startItemid, int itemID, EAddpingPart addType, int? type, int? fromType, DateTime dts, string userID)
+			{
+				_StartItemID = startItemid;
+				_ItemID = itemID;
+				_AddType = addType;
+				_Type = type;
+				_FromType = fromType;
+				_DTS = dts;
+				_UserID = userID;
+			}
+			#endregion
+		}
+		#endregion
 		#region PastingPartCriteria
 		[Serializable()]
 		public class PastingPartCriteria
@@ -2356,6 +2466,17 @@ namespace VEPROMS.CSLA.Library
 			_MyPrevious = null; // Reset list so that the next line gets a new list
 			if (MyPrevious != null) MyPrevious.RefreshNextItems(); // Update List for new value
 		}
+		internal static ItemInfo CopyPasteReplaceEnhancedItemInfoFetch(int copyStartID, ItemInfo itemInfo) // int itemID, int? type, int? fromType)
+		{
+			ItemInfo tmp = null;
+			tmp = DataPortal.Fetch<StepInfo>(new ItemInfo.PastingPartEnhancedCriteria(copyStartID, itemInfo.ItemID, ItemInfo.EAddpingPart.Replace, itemInfo.MyContent.Type, itemInfo.MyContent.Type, DateTime.Now, Volian.Base.Library.VlnSettings.UserID));
+			if (tmp == null)
+			{
+				tmp = ItemInfo.Get(copyStartID);
+			}
+			AddToCache(tmp);
+			return tmp;
+		}
 		internal static ItemInfo CopyPasteReplaceItemInfoFetch(int copyStartID, ItemInfo itemInfo) // int itemID, int? type, int? fromType)
 		{
 			ItemInfo tmp = null;
@@ -2503,10 +2624,18 @@ namespace VEPROMS.CSLA.Library
 
 		public static ItemInfo PasteReplace(ItemInfo itemInfo, int copyStartID, string chgid, TreeNode treeNodeReplace)
 		{
+			if (itemInfo.IsEnhancedStep)
+			{
+				// don't replace the step, just remove current children & add new children:
+				if (!CanDeleteObject())
+					throw new System.Security.SecurityException("User not authorized to remove a Item");
+
+			}
 			bool tmp = false;
 			return PasteReplace(itemInfo, copyStartID, chgid, treeNodeReplace, ref tmp);
 		}
 		// B2017-179 return a bool (firstTrans) if  we could not replace the step but the user wants to position to the first transition that needs resolved
+		// B2017-179 return a bool (firstTrans) if  we could not replace the step but the user wants to position to the first transition that needs resolved
 		public static ItemInfo PasteReplace(ItemInfo itemInfo, int copyStartID, string chgid, TreeNode treeNodeReplace, ref bool firstTrans)
 		{
 			firstTrans = false;
@@ -2517,10 +2646,19 @@ namespace VEPROMS.CSLA.Library
 			// B2023-101 Handle Paste Replace when procedure to be replaced has Incoming Transitions, i.e. do a separate try/catch for this case
 			ItemInfo newItemInfo = null;
 			try
+			{
+				// if this item is an enhanced item, do a pastereplace specific to it:
+				if (itemInfo.IsEnhancedStep)
+				{
+					newItemInfo = ItemInfo.CopyPasteReplaceEnhancedItemInfoFetch(copyStartID, itemInfo);
+					if (newItemInfo == null) return null;
+				}
+				else
 				{
 					newItemInfo = ItemInfo.CopyPasteReplaceItemInfoFetch(copyStartID, itemInfo); //itemInfo.ItemID, itemInfo.MyContent.Type, itemInfo.MyContent.Type);
 					if (newItemInfo == null) return null;
 				}
+			}
 			catch (Exception ex1)
 			{
 				if (ex1.Message.Contains("has External Transitions and has no next step")

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

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

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

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

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

@@ -713,6 +713,7 @@ namespace Volian.Controls.Library
 				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 = MyStepPanel?.SelectedEditItem?.ActiveParent;
 
 			StepConfig savOrigPasteConfig = MyItemInfo.MyConfig as StepConfig;
 			int TopMostYBefore = TopMostEditItem.Top;
@@ -1944,7 +1936,7 @@ namespace Volian.Controls.Library
 					sia.IdentifyChildren(highlight);
 				}
 			}
-			if (MyBeforeEditItems != null)
+			if (MyBeforeEditItems != null && !MyItemInfo.IsEnhancedStep)
 			{
 				foreach (EditItem sib in MyBeforeEditItems)
 				{

PROMS/Volian.Controls.Library/StepTabRibbon.cs

@@ -1750,7 +1750,7 @@ namespace Volian.Controls.Library
 			// note in follow if statements, 'setting' == false when in enhanced document:
 			if (setting && MyItemInfo.IsStep && (eds == null || eds.Count == 0))	// this step is in enhanced, but not linked // B2018-112 and is allowed to edit
 				allowDel = true;    // allow delete if not linked
-			btnCpyStp.Enabled = setting;
+			btnCpyStp.Enabled = MyUserInfo.IsAllowedToEdit(Mydvi); // setting;
 																   //B20170-158 Allow a Unlinked Step to be pasted before or after a linked step.
 			StepTabPanel tmp = Parent as StepTabPanel;
 			//B2020-058: crash on null reference
@@ -1761,6 +1761,10 @@ namespace Volian.Controls.Library
 				{
 					if (MyItemInfo.IsEnhancedStep) btnPasteReplace.Enabled = btnCMPasteReplace.Enabled = false;
 				}
+				else if (tmp.MyDisplayTabControl.MyCopyStep.IsEnhancedStep && tmp.MyDisplayTabControl.MyCopyStep.MyDocVersion.VersionID == MyItemInfo.MyDocVersion.VersionID)
+				{
+					btnPasteBefore.Enabled = btnPasteAfter.Enabled = MyUserInfo.IsAllowedToEdit(Mydvi);
+				}
 			}
 			else
 				btnStepPaste.Enabled = setting;

PROMS/Volian.Controls.Library/vlnTreeView.cs

@@ -26,7 +26,6 @@ namespace Volian.Controls.Library
   public delegate void vlnTreeViewItemInfoEvent(object sender, vlnTreeItemInfoEventArgs args);
 	public delegate bool vlnTreeViewBoolEvent(object sender, vlnTreeEventArgs args);
 	public delegate bool vlnTreeViewItemInfoDeleteEvent(object sender, vlnTreeItemInfoEventArgs args);
-	public delegate bool vlnTreeViewItemInfoDeleteFolderEvent(object sender, vlnTreeFolderDeleteEventArgs args);
 	public delegate bool vlnTreeViewItemInfoInsertEvent(object sender, vlnTreeItemInfoInsertEventArgs args);
 	public delegate bool vlnTreeViewItemInfoPasteEvent(object sender, vlnTreeItemInfoPasteEventArgs args);
 	public delegate TreeNode vlnTreeViewTreeNodeEvent(object sender, vlnTreeEventArgs args);
@@ -221,15 +220,6 @@ namespace Volian.Controls.Library
 		}
 		#endregion
 	}
-	public class vlnTreeFolderDeleteEventArgs : EventArgs
-	{
-		public int FolderId { get; }
-
-		public vlnTreeFolderDeleteEventArgs(int folderId)
-		{
-			FolderId = folderId;
-		}
-	}
 	public enum E_InsertType {Before, After, Child};
 	public partial class vlnTreeItemInfoInsertEventArgs
 	{
@@ -437,12 +427,6 @@ namespace Volian.Controls.Library
 			if (DeleteItemInfo != null) return DeleteItemInfo(sender, args);
 			return false;
 		}
-		public event vlnTreeViewItemInfoDeleteFolderEvent DeleteFolder;
-		private bool OnDeleteFolder(object sender, vlnTreeFolderDeleteEventArgs args)
-		{
-			if (DeleteItemInfo != null) return DeleteFolder(sender, args);
-			return false;
-		}
 		public event vlnTreeViewItemInfoInsertEvent InsertItemInfo;
 		private bool OnInsertItemInfo(object sender, vlnTreeItemInfoInsertEventArgs args)
 		{
@@ -3583,41 +3567,6 @@ namespace Volian.Controls.Library
 			}
 			return false;
 		}
-		
-		public void RemoveFolder(int folderId)
-		{
-			TreeNode nodeToRemove = FindNodeById(folderId, this.Nodes);
-			if (nodeToRemove != null)
-			{
-				// Perform the removal logic
-				nodeToRemove.Remove(); // This removes the node from its parent
-			}
-		}
-		private TreeNode FindNodeById(int folderId, TreeNodeCollection nodes)
-		{
-			foreach (TreeNode node in nodes)
-			{
-				VETreeNode vetNode = node as VETreeNode;
-				if (vetNode != null)
-				{
-					FolderInfo folderInfo = vetNode.VEObject as FolderInfo;
-					if (folderInfo != null && folderInfo.FolderID == folderId)
-					{
-						return node;
-					}
-					else
-					{
-						TreeNode foundNode = FindNodeById(folderId, node.Nodes);
-						if (foundNode != null)
-						{
-							return foundNode;
-						}
-					}
-				}
-			}
-			return null;
-		}
-
 		private bool DeleteItemInfoAndChildren(ItemInfo ii)
 		{
 			DateTime dtStart = DateTime.Now;