C2021-059 Attempting to resolve conflicts try 1

Reviewed-on: #355
Reviewed-by: Kathy Ruffing <kruffing@volian.com>
Code reviewed successfully

PROMS/VEPROMS User Interface/DlgPrintProcedure.cs

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

PROMS/VEPROMS User Interface/PROMSFixes.Sql

@@ -1,3 +1,5 @@
+
+
 Set NoCount On;
 
 If (db_name() in('master','model','msdn','tempdb'))
@@ -22230,12 +22232,13 @@ Go
 
 	/*
 ==========================================================================================================
- Begin: C2024-004: KL - Update Copy Replace functionality, (remove ''copy of'')
+ Begin: C2024-004 | B2024-041: KL - Update Copy Replace functionality, (remove ''copy of'')
 ==========================================================================================================
 */
 	
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[CopyItemAndChildren]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
-	DROP PROCEDURE [CopyItemAndChildren];
+
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[ReplaceItemAndChildren]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
+	DROP PROCEDURE [ReplaceItemAndChildren];
 GO
 	
 	/*****************************************************************************
@@ -22245,11 +22248,22 @@ GO
 	/*
 	==========================================================================================================
 	 Author:		Kevin Laskey
-	 Modified Date:	07/09/2024
-	 Description:	Copy Item and its Children
+	 Create Date:	07/15/2024
+	 Description:	B2024-041: "Copy of" is no longer being appended for paste before/after
 	==========================================================================================================
 	 */
-CREATE PROCEDURE [dbo].[CopyItemAndChildren]
+
+/****** Object:  StoredProcedure [dbo].[CopyItemAndChildren]    Script Date: 7/15/2024 9:29:21 AM ******/
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+	
+/*****************************************************************************
+   Volian Enterprises - Proprietary Information - DO NOT COPY OR DISTRIBUTE
+       Copyright 2012 - Volian Enterprises, Inc. All rights reserved.
+*****************************************************************************/
+CREATE PROCEDURE [dbo].[ReplaceItemAndChildren]
 (
 	@StartItemID INT,
 	@DestFormatID INT,
@@ -22294,7 +22308,6 @@ INSERT INTO @Children SELECT ItemID,ItemID,ContentID,ContentID,FormatID,FormatID
 -- <<< Copy Contents >>>
 -- Create new content rows to match the existing rows.  Set the type to the Current ContentID temporarily
 -- so that the new content rows can be associated with the existing content rows.
--- Rem 'Copy Of ' + before first [Number] for C2024-004 (KL)
 INSERT INTO Contents
   ([Number],[Text],[Type],[FormatID],[Config],[DTS],[UserID])
 	select CASE when [ContentID] = @StartContentID and [Type]<20000 then [Number] else [Number] end,
@@ -22622,21 +22635,624 @@ BEGIN CATCH -- Catch Block
  	ELSE IF( @@TRANCOUNT > 1 ) COMMIT -- Otherwise commit.  Top level will rollback
 	EXEC vlnErrorHandler
 END CATCH
+GO
 
+
+
+
+
+
+
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[PasteItemReplace]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
+	DROP PROCEDURE [PasteItemReplace];
+GO
+	
+	/*****************************************************************************
+	   Volian Enterprises - Proprietary Information - DO NOT COPY OR DISTRIBUTE
+		   Copyright 2024 - Volian Enterprises, Inc. All rights reserved.
+	*****************************************************************************/
+	/*
+	==========================================================================================================
+	 Author:		Kevin Laskey
+	 Create Date:	07/15/2024
+	 Description:	B2024-041: "Copy of" is no longer being appended for paste before/after
+	==========================================================================================================
+	 */
+
+	 
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+/****** Object:  StoredProcedure [dbo].[PasteItemReplace]    Script Date: 03/20/2012 16:02:54 ******/
+/*
+declare @NewItemID int
+declare @dts datetime
+set @newitemid = 0
+set @dts = getdate()
+exec PasteItemReplace 398,397,20014,@dts,'bodine',@NewItemID output
+*/
+-- ItemID is item to replace
+-- StartItemID is item to copy	
+/*****************************************************************************
+   Volian Enterprises - Proprietary Information - DO NOT COPY OR DISTRIBUTE
+       Copyright 2012 - Volian Enterprises, Inc. All rights reserved.
+*****************************************************************************/
+CREATE PROCEDURE [dbo].[PasteItemReplace]
+(
+	@ItemID int=null,	@StartItemID int=null,
+	@Type int=null, @DTS datetime,	@UserID nvarchar(100),
+	@NewItemID int output
+)
+WITH EXECUTE AS OWNER
+AS
+BEGIN TRY -- Try Block
+	BEGIN TRANSACTION
+		DECLARE @ContentID AS INT
+		DECLARE @NextItemID AS INT
+		DECLARE @PreviousItemID AS INT
+		DECLARE @ExternalChildCount AS INT
+		DECLARE @ExternalCount AS INT
+		DECLARE @Path AS VARCHAR(MAX)
+		DECLARE @Children AS TABLE
+		(
+			ItemID INT PRIMARY KEY,
+			ContentID INT
+		)
+		
+	if exists (select * from tblitems where itemid = @ItemID and DeleteStatus !=0)
+		BEGIN
+			RAISERROR ('###Cannot Paste Step###This current step has been deleted in another session',16,1)
+			RETURN
+		END
+		-- First check if the replaced item can be deleted, i.e. it doesn't have transitions
+		-- pointing to it or children.
+
+		DECLARE @ExternalTrans TABLE
+		(
+			[FromItemID] int,
+			[TransitionID] [int] NOT NULL,
+			[FromID] [int] NOT NULL,
+			[ToID] [int] NOT NULL,
+			[RangeID] [int] NOT NULL,
+			[Config] [nvarchar](max) NULL
+		)
+		SET NOCOUNT ON
+	DECLARE @DeleteID int
+	INSERT INTO DeleteLog (UserID) VALUES (@UserID)
+	SELECT @DeleteID = SCOPE_IDENTITY()
+		SELECT @ContentID = ContentID, @PreviousItemID = PreviousID FROM Items WHERE ItemID = @ItemID
+		SELECT @NextItemID = ItemID FROM Items WHERE PreviousID = @ItemID
+		--SELECT @ExternalCount = count(*) FROM vefn_FindExternalTransitions(@ItemID)
+		SELECT @ExternalChildCount = count(*) FROM vefn_FindExternalChildTransitions(@ItemID)
+		SET @Path = [dbo].[ve_GetShortPath](@ItemID)
+
+		--IF @ExternalCount > 0  AND @NextItemID is null
+		--BEGIN
+		--	RAISERROR ('###Cannot Delete Item###Step %d has External Transitions and has no next step - (%s)',16,1,@ItemID,@Path)
+		--	RETURN
+		--END
+
+		IF @ExternalChildCount > 0
+		BEGIN
+			RAISERROR ('###Cannot Delete Item###Step %d has External Transitions to it''s children - (%s)',16,1,@ItemID,@Path)
+			RETURN
+		END
+
+		-- Copy the item, 'NewItemID' represents the new item(s)
+		-- DestFormatID is the formatid for the destination parent's format
+		DECLARE @DestFormatID int
+		SET @DestFormatID = .dbo.vefn_GetInheritedFormat(@ItemID, 0)
+		EXECUTE ReplaceItemAndChildren @StartItemID, @DestFormatID, @UserID, @NewItemID OUTPUT
+
+		-- Adjust the next/previous to point to the new item
+		
+		DECLARE @PreviousID int
+		SELECT @PreviousID = [PreviousID]
+			FROM [ITEMS] II
+			WHERE [ItemID]=@ItemID
+		UPDATE [ITEMS] SET [PreviousID]=@PreviousID where [ItemID]=@NewItemID
+		UPDATE [CONTENTS] SET [Type]=@Type
+			FROM [CONTENTS] CC JOIN [ITEMS] ii ON CC.[ContentID]=II.[ContentID]
+			WHERE [ItemID]=@NewItemID
+		UPDATE [ITEMS] SET [PreviousID]=@NewItemID where [PreviousID]=@ItemID
+		UPDATE [PARTS] SET [ItemID]=@NewItemID where [ItemID]=@ItemID
+		
+		-- UPDATE DocVersion if this was a procedure
+		UPDATE DocVersions SET ItemID=@NewItemID where ItemID = @ItemID
+		
+		-- If there were 'external transitions' that pointed to the original
+		-- top replaced step, adjust them to point to the new top.
+		INSERT INTO @ExternalTrans SELECT * FROM vefn_FindExternalTransitions(@ItemID)
+	OPTION (MAXRECURSION 10000)
+		IF (SELECT COUNT(*) from @ExternalTrans) > 0
+		BEGIN
+			-- Update content records for the transitions
+			Update CC
+				Set Text = DBO.vefn_FixTransitionText(Text,TT.TransitionID,TT.TranType,TT.ToID,TT.RangeID,@ItemID,@NewItemID)
+			From CONTENTS CC
+				JOIN Transitions TT ON TT.FromID = CC.ContentID
+				WHERE TransitionID in(Select TransitionID from @ExternalTrans)
+			-- Update transitions that point to @ItemID to Point to @NextItemID
+			UPDATE TRANSITIONS
+				SET ToID = case when ToID = @ItemID then @NewItemID else ToID END,
+				RangeID = case when RangeID = @ItemID then @NewItemID else RangeID END
+				WHERE TransitionID in(Select TransitionID from @ExternalTrans)
+
+			DECLARE @typeID int -- AnnotationType
+			SELECT @typeID = TypeID from AnnotationTypes where Name = 'Verification Required'
+			IF(@typeID IS NULL)
+			BEGIN
+				INSERT INTO [AnnotationTypes]	([Name],[UserID])	VALUES	('Verification Required','Volian')
+				SELECT @typeID = SCOPE_IDENTITY()
+			END
+			-- Add 'Verification Required' annotions for transtions that pointed to top step
+			-- and need to point to
+			INSERT INTO [Annotations] ([ItemID],[TypeID],[SearchText],[UserID])	
+			SELECT ItemID, @typeID,'Verify Replaced Step Transition Destination',@UserID
+				FROM Items where ItemID in (SELECT FromItemID FROM @ExternalTrans)
+
+		END
+		-- Remove the old one
+		
+		-- Get list of Children
+		INSERT INTO @Children SELECT * FROM vefn_ChildItems(@ItemID)
+		-- Delete Annotations for @ItemID and children
+		DELETE from Annotations where ItemID in(Select ItemID from @Children)
+		-- Delete Details associated with @ContentID and children
+		DELETE from Details where ContentID in(Select ContentID from @Children)
+		-- Delete Grids associated with @ContentID and children
+		DELETE from Grids where ContentID in(Select ContentID from @Children)
+		-- Delete Images associated with @ContentID and children
+		DELETE from Images where ContentID in(Select ContentID from @Children)
+		-- Delete Entries associated with @ContentID and children
+		DELETE from Entries where ContentID in(Select ContentID from @Children)
+		-- Delete ROUsages associated with @ContentID and children
+		DELETE from RoUsages where ContentID in(Select ContentID from @Children)
+		-- Delete ZTransitions records associated with @ContentID and children
+		DELETE FROM ZTransitions where TransitionID
+			in(SELECT TransitionID from Transitions where FromID in(SELECT ContentID FROM @Children) or FromID = @ContentID)
+		-- Delete Transitions associated with @ContentID and children
+		DELETE FROM Transitions where FromID in(SELECT ContentID FROM @Children) or FromID = @ContentID
+		-- Delete Parts associated with @ContentID and children
+		DELETE from Parts where ContentID in(Select ContentID from @Children)
+		-- Delete ZContents associated with @ContentID and children
+		DELETE from ZContents where ContentID in(Select ContentID from @Children)
+		-- Disconnect Items from Each Other
+		DELETE from Items where ItemID in(Select ItemID from @Children) and PreviousID Is Not Null
+		-- Disconnect Items to be deleted from each other
+		Update Items set PreviousID = null where ItemID in (Select ItemID from @Children) and PreviousID Is Not Null
+		-- Delete Item Records
+		DELETE from Items where ItemID in(Select ItemID from @Children)
+		-- DELETE Contents
+		DELETE from Contents where ContentID in(Select ContentID from @Children)
+--delete from itemaudits where itemid = @newitemid
+delete from itemaudits where itemid in (select itemid from vefn_ChildItems(@newitemid))
+--delete from contentaudits where contentid = (select contentid from items where itemid = @newitemid)
+delete from contentaudits where contentid in (select contentid from vefn_ChildItems(@newitemid))
+	DELETE from DeleteLog where DeleteID = @DeleteID
+	IF( @@TRANCOUNT > 0 ) COMMIT
+	EXECUTE GetItem @NewItemID
+END TRY
+BEGIN CATCH -- Catch Block
+	IF( @@TRANCOUNT = 1 ) ROLLBACK -- Only rollback if top level
+ 	ELSE IF( @@TRANCOUNT > 1 ) COMMIT -- Otherwise commit.  Top level will rollback
+	EXEC vlnErrorHandler
+END CATCH
+go
+
+
+
+
+
+
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[CopyItemAndChildren]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
+	DROP PROCEDURE [CopyItemAndChildren];
+GO
+	
+	/*****************************************************************************
+	   Volian Enterprises - Proprietary Information - DO NOT COPY OR DISTRIBUTE
+		   Copyright 2024 - Volian Enterprises, Inc. All rights reserved.
+	*****************************************************************************/
+	/*
+	==========================================================================================================
+	 Author:		Kevin Laskey
+	 Create Date:	07/15/2024
+	 Description:	B2024-041: "Copy of" is no longer being appended for paste before/after
+	==========================================================================================================
+	 */
+
+
+/****** Object:  StoredProcedure [dbo].[CopyItemAndChildren]    Script Date: 7/15/2024 10:01:59 AM ******/
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+	
+/*****************************************************************************
+   Volian Enterprises - Proprietary Information - DO NOT COPY OR DISTRIBUTE
+       Copyright 2012 - Volian Enterprises, Inc. All rights reserved.
+*****************************************************************************/
+CREATE PROCEDURE [dbo].[CopyItemAndChildren]
+(
+	@StartItemID INT,
+	@DestFormatID INT,
+	@UserID NVARCHAR(100),
+	@NewStartItemID int output
+)
+WITH EXECUTE AS OWNER
+AS
+BEGIN TRY -- Try Block
+
+--+-----------------------------------------------------------------+
+--& BEGIN TRANSACTION to make these changes temporary               &
+--+-----------------------------------------------------------------+
+	BEGIN TRANSACTION
+	if exists (select * from tblitems where itemid = @StartItemID and DeleteStatus !=0)
+		BEGIN
+			RAISERROR ('###Cannot Paste Step###This step has been deleted',16,1)
+			RETURN
+		END
+DECLARE @Children AS TABLE
+(
+	ItemID INT PRIMARY KEY,
+	NewItemID INT,
+	ContentID INT,
+	NewContentID INT,
+	FormatID INT,
+	NewFormatID INT
+)
+DECLARE @NewDocuments AS TABLE
+(
+	DocID INT PRIMARY KEY,
+	NewDocID INT
+)
+-- Locals
+DECLARE @DTS DATETIME -- DTS of all New Items
+DECLARE @StartContentID INT
+Select @StartContentID = ContentID from Items where ItemID = @StartItemID
+SET @DTS = GETDATE() -- Get the current Date and Time
+-- Get a list of all of the Items to be copied based upon StartItemID and EndItemID
+-- If the StartItemID = EndItemID then it is a single item and it's children
+INSERT INTO @Children SELECT ItemID,ItemID,ContentID,ContentID,FormatID,FormatID FROM vefn_ChildItemsRange(@StartItemID,@StartItemID,null)
+-- <<< Copy Contents >>>
+-- Create new content rows to match the existing rows.  Set the type to the Current ContentID temporarily
+-- so that the new content rows can be associated with the existing content rows.
+INSERT INTO Contents
+  ([Number],[Text],[Type],[FormatID],[Config],[DTS],[UserID])
+	select CASE when [ContentID] = @StartContentID and [Type]<20000 then 'Copy Of ' + [Number] else [Number] end,
+	[Text],[ContentID],[FormatID],[Config],@DTS,@UserID
+ from Contents where ContentID in(Select ContentID from @Children)
+-- Update the @Children with the NewConentIDs
+--print 'A	' + cast(datediff(s,@dts,getdate()) as varchar(100))
+UPDATE NN set NN.NewContentID = CC.ContentID
+From Contents CC
+Join @Children NN on NN.ContentID = CC.Type AND CC.DTS = @DTS and CC.UserID = @UserID
+-- Reset the Type column in the Contents table with the Type column from the original Records.
+--print 'B	' + cast(datediff(s,@dts,getdate()) as varchar(100))
+DECLARE @SourceType INT
+Select @SourceType = Type from Contents where ContentID = @StartContentID
+if @SourceType =  0
+	BEGIN
+		UPDATE CC set CC.Type = CC2.Type, CC.DTS = CC2.DTS, CC.UserID = CC2.UserID
+		From Contents CC
+		Join @Children NN on NN.NewContentID = CC.ContentID
+		Join Contents CC2 on NN.ContentID = CC2.ContentID
+	END
+else
+	BEGIN
+UPDATE CC set CC.Type = CC2.Type
+From Contents CC
+Join @Children NN on NN.NewContentID = CC.ContentID
+Join Contents CC2 on NN.ContentID = CC2.ContentID
+	END
+--print 'B1	' + cast(datediff(s,@dts,getdate()) as varchar(100))
+-- Contents are done
+	-- SELECT * From Contents where DTS = @DTS and UserID = @UserID
+-- <<< Copy Grids >>>
+INSERT INTO [Grids]([ContentID],[Data],[Config],[DTS],[UserID])
+	SELECT NN.[NewContentID],[Data],[Config],@DTS,@UserID
+		FROM [Grids] GG Join @Children NN on GG.ContentID = NN.ContentID
+-- <<< Copy Images >>>
+--print 'B2	' + cast(datediff(s,@dts,getdate()) as varchar(100))
+INSERT INTO [Images]([ContentID],[ImageType],[FileName],[Data],[Config],[DTS],[UserID])
+	SELECT NN.[NewContentID],[ImageType],[FileName],[Data],[Config],@DTS,@UserID
+		FROM [Images] II Join @Children NN on II.ContentID = NN.ContentID
+-- Create new item rows based upon the current item rows and the @Children table, with the NewContentIDs
+--print 'B3	' + cast(datediff(s,@dts,getdate()) as varchar(100))
+INSERT INTO [Items] ([PreviousID],[ContentID],[DTS],[UserID])
+     SELECT II.[PreviousID], -- Leave the PreviousID as is for now
+			NN.NewContentID, @DTS, @UserID
+			from @Children NN
+			join Items II on II.ContentID = NN.ContentID
+-- Update the @Children with the NewItemIDs
+--print 'B4	' + cast(datediff(s,@dts,getdate()) as varchar(100))
+UPDATE NN set NN.NewItemID = II.ItemID
+From Items II
+Join @Children NN on NN.NewContentID = II.ContentID AND II.DTS = @DTS and II.UserID = @UserID
+DECLARE @NewItemID int
+SELECT @NewItemID = NewItemID
+	FROM @Children
+	WHERE ItemID = @StartItemID
+--print 'B5	' + cast(datediff(s,@dts,getdate()) as varchar(100))
+UPDATE NN SET NN.[NewFormatID] = CC.[FormatID]
+	FROM @Children NN
+	Join vefn_ChildItemsRange(@NewItemID,@NewItemID,@DestFormatID) CC
+	ON NN.NewItemID = CC.ItemID
+-- The @Children table is now complete
+	--SELECT * From @Children
+-- Update the PreviousID in the new Item rows, to the new ItemIDs based upon the old ItemIDs
+--print 'B6	' + cast(datediff(s,@dts,getdate()) as varchar(100))
+Update II Set II.[PreviousID] = NN.NewItemID
+from Items II
+Join @Children NN on NN.ItemID = II.PreviousID AND II.DTS = @DTS and II.UserID = @UserID
+-- Get the new ItemIDs based upon the old ItemIDs
+SELECT @NewStartItemID = NewItemID from @Children where ItemID = @StartItemID
+--SELECT @NewEndItemID = NewItemID from @Children where ItemID = @EndItemID
+-- Set the PreviousID for the starting Item to null temporarily.
+-- This will be adjusted based upon where the step is inserted.
+--print 'B7	' + cast(datediff(s,@dts,getdate()) as varchar(100))
+Update Items Set PreviousID = null where ItemID = @NewStartItemID
+if @SourceType =  0
+	BEGIN
+		UPDATE II SET II.DTS = II2.DTS, II.UserID = II2.UserID
+		From Items II
+		Join @Children NN on NN.NewItemID = II.ItemID
+		Join Items II2 on NN.ItemID = II2.ItemID
+		WHERE NN.ItemID = @StartItemID
+	END
+--print 'C	' + cast(datediff(s,@dts,getdate()) as varchar(100))
+-- Items are done
+	--SELECT * From Items where DTS = @DTS and UserID = @UserID
+-- <<< Copy Parts >>>
+INSERT INTO [Parts] ([ContentID],[FromType],[ItemID],[DTS],[UserID])
+Select NNF.NewContentID,[FromType],NNT.NewItemID, @DTS, @UserID from Parts PP
+JOIN @Children NNF on PP.ContentID = NNF.ContentID
+JOIN @Children NNT on PP.ItemID = NNT.ItemID
+--print 'D	' + cast(datediff(s,@dts,getdate()) as varchar(100))
+-- Parts are done
+	-- SELECT * From Parts where DTS = @DTS and UserID = @UserID
+-- <<< Copy Annotations >>>
+INSERT INTO [Annotations] ([ItemID],[TypeID],[RtfText],[SearchText],[Config],[DTS],[UserID])
+     Select NewItemID, TypeID, RtfText, SearchText, Config, @DTS, @UserID
+			from Annotations AA Join @Children NN on AA.ItemID = NN.ItemID
+--print 'E	' + cast(datediff(s,@dts,getdate()) as varchar(100))
+-- Annotations are done
+	-- SELECT * From Annotations where DTS = @DTS and UserID = @UserID
+-- <<< Copy Documents and Entries>>>
+-- logic to create Entries for Library Documents
+INSERT INTO [Entries] ([ContentID],[DocID],[DTS],[UserID])
+	SELECT NN.[NewContentID],EE.[DocID],@DTS,@UserID
+  FROM [Entries] EE JOIN @Children NN on NN.ContentID = EE.ContentID
+	JOIN [Documents] DD on EE.[DocID] = DD.[DocID] and Isnull(LibTitle,'') <> ''
+-- Logic to create new documents for any documents used that do not have libtitles
+INSERT INTO [Documents] ([LibTitle],[DocContent],[DocAscii],[Config],[DTS],[UserID],[FileExtension])
+  OUTPUT CAST(INSERTED.[LibTitle] as INT),INSERTED.[DocID] INTO @NewDocuments
+	SELECT str(DD.[DocID]),[DocContent],[DocAscii],[Config],@DTS,@UserID,[FileExtension]
+  FROM [Entries] EE JOIN @Children NN on NN.ContentID = EE.ContentID
+	JOIN [Documents] DD on EE.[DocID] = DD.[DocID] and Isnull(LibTitle,'') = ''
+UPDATE DD SET LibTitle = ''
+	FROM Documents DD JOIN @NewDocuments ND on DD.[DocID] = ND.[NewDocID]
+	where DTS = @DTS and UserID = @UserID
+--print 'F	' + cast(datediff(s,@dts,getdate()) as varchar(100))
+-- Documents are Done
+	-- SELECT * From Documents where DTS = @DTS and UserID = @UserID
+-- Logic to create entries for these newly created documents
+INSERT INTO [Entries] ([ContentID],[DocID],[DTS],[UserID])
+	SELECT NN.[NewContentID],ND.[NewDocID],@DTS,@UserID
+  FROM [Entries] EE JOIN @Children NN on NN.ContentID = EE.ContentID
+	JOIN @NewDocuments ND on EE.[DocID] = ND.[DocID]
+-- Logic to Create DROUsages for these newly created documents
+INSERT INTO [DROUsages] ([DocID],[ROID],[Config],[DTS],[UserID],[RODbID])
+ 	SELECT ND.[NewDocID],[ROID],[Config],@DTS,@UserID,[RODbID]
+  FROM [DROUsages] RR
+	JOIN @NewDocuments ND on RR.[DocID] = ND.[DocID]
+
+--print 'G	' + cast(datediff(s,@dts,getdate()) as varchar(100))
+-- Entries are done
+	-- SELECT * From Entries EE JOIN Documents DD on ee.DocID = DD.DocID where EE.DTS = @DTS and EE.UserID = @UserID
+-- <<< Copy RoUsages >>>
+INSERT INTO [RoUsages] ([ContentID],[ROID],[Config],[DTS],[UserID],[RODbID])
+	SELECT NN.[NewContentID],CAST([ROUsageID] as nvarchar(16)),[Config],@DTS,@UserID,[RODbID]
+		FROM [RoUsages] RR Join @Children NN on RR.ContentID = NN.ContentID
+-- Update content records for newly copied records to use correct RO usage ids in the RO tags
+DECLARE @RowsAffected int
+SET @RowsAffected=1
+WHILE @RowsAffected > 0
+BEGIN
+	UPDATE CC SET [TEXT] = C2.NewText
+	FROM CONTENTS CC
+	JOIN (SELECT C1.ContentID, .dbo.vefn_FixROText(C1.Text, CAST([ROID] as int), [ROUsageID]) NewText
+	FROM CONTENTS C1
+	JOIN @Children NN on C1.ContentID = NN.NewContentID
+	JOIN RoUsages RO on NN.NewContentID = RO.ContentID where Len([ROID]) < 12) C2 ON CC.ContentID = C2.ContentID
+	WHERE [TEXT] <> C2.NewText
+	SET @RowsAffected = @@RowCount
+END
+-- Update grid records for newly copied records to use correct RO usage ids in the RO tags
+SET @RowsAffected=1
+WHILE @RowsAffected > 0
+BEGIN
+	UPDATE GG SET [Data] = G2.NewData
+	FROM GRIDS GG
+	JOIN (SELECT G1.ContentID, .dbo.vefn_FixROData(G1.Data, CAST([ROID] as int), [ROUsageID]) NewData
+	FROM GRIDS G1
+	JOIN @Children NN on G1.ContentID = NN.NewContentID
+	JOIN RoUsages RO on NN.NewContentID = RO.ContentID where Len([ROID]) < 12) G2 ON GG.ContentID = G2.ContentID
+	WHERE Cast([Data] as nvarchar(max)) <> cast(G2.NewData as nvarchar(max))
+	SET @RowsAffected = @@RowCount
+END
+UPDATE RON SET [ROID] = ROO.[ROID]
+	FROM RoUsages RON
+	JOIN @Children NN on RON.ContentID = NN.NewContentID
+	JOIN RoUsages ROO on CAST(RON.ROID as int) = ROO.RoUsageID
+	where Len(RON.[ROID]) < 12
+--print 'H	' + cast(datediff(s,@dts,getdate()) as varchar(100))
+-- RoUsages are done
+	-- SELECT * From RoUsages where DTS = @DTS and UserID = @UserID
+
+-- <<< Copy Transtions >>>
+-- Note that the inserted record has the 'TranType' field set to old transitionid.  This is done
+-- so that the next step can replace the old transitionid with the new transitionid in the
+-- content record's transition tokens.  The TranType gets reset after the content records are
+-- updated.
+-- Also note that the 'toid/rangeid' may need converted to newly copied ids or may not.  If it's
+-- not a range, then it always is converted to new, if there is a new.  If it's a range, both
+-- the toid & the rangeid must be new in order for the conversion to be correct.  You cannot
+-- have part of the range pointing to the new and part of the range pointing to the original
+-- locations.
+
+INSERT INTO .[dbo].[Transitions] ([FromID],[ToID],[RangeID],[IsRange],[TranType],[Config],[DTS],[UserID])
+	SELECT NNF.[NewContentID],
+		-- if both toid & range are null, use the original toid & rangeid
+		CASE WHEN NNT.[NewItemID] is null or NNR.[NewItemID] is null THEN [ToID] ELSE NNT.[NewItemID] END,
+		CASE WHEN NNT.[NewItemID] is null or NNR.[NewItemID] is null THEN [RangeID] ELSE NNR.[NewItemID] END,
+		[IsRange],[TransitionID],[Config],@DTS,@UserID
+	FROM .[dbo].[Transitions] TT
+	JOIN @Children NNF on TT.[FromID] = NNF.[ContentID]
+	LEFT JOIN @Children NNT on TT.[ToID] = NNT.[ItemID]
+	LEFT JOIN @Children NNR on TT.[RangeID] = NNR.[ItemID]
+--print 'H1	' + cast(datediff(s,@dts,getdate()) as varchar(100))
+-- -- Update content records for newly copied records to use correct TransitionIDs in the Transition tags
+SET @RowsAffected=1
+WHILE @RowsAffected > 0
+BEGIN
+UPDATE CC SET [TEXT] = C2.NewText
+	FROM CONTENTS CC
+	JOIN (SELECT C1.ContentID, .dbo.vefn_FixTransitionTextForCopy(C1.Text, TRO.TransitionID, TRO.TranType,  TRO.[ToID], TRO.[RangeID],TR.[TransitionID], TR.[ToID], TR.[RangeID], .dbo.vefn_GetNewTranType(NN.FormatID, NN.NewFormatID, TRO.TranType)) NewText
+	FROM CONTENTS C1
+	JOIN @Children NN on C1.ContentID = NN.NewContentID
+	JOIN Transitions TR on NN.NewContentID = TR.FromID
+	JOIN Transitions TRO on TR.TranType = TRO.TransitionID) C2 ON CC.ContentID = C2.ContentID
+	WHERE [TEXT] <> C2.NewText
+	SET @RowsAffected = @@RowCount
+END
+--print 'H2	' + cast(datediff(s,@dts,getdate()) as varchar(100))
+--set nocount off
+-- -- Update grid records for newly copied records to use correct TransitionIDs in the Transition tags
+declare @grids table
+(
+contentid int primary key,
+data xml
+)
+insert into @grids select gg.contentid,gg.data from GRIDS GG
+	where gg.contentid in (select nn.newcontentid from
+	@Children NN
+	JOIN Transitions TR on NN.NewContentID = TR.FromID
+	JOIN Transitions TRO on TR.TranType = TRO.TransitionID)
+--print 'H2.1	' + cast(datediff(s,@dts,getdate()) as varchar(100))
+--select * from @grids
+SET @RowsAffected=1
+WHILE @RowsAffected > 0
+BEGIN
+UPDATE GG SET [DATA] = G2.NewData
+	FROM @GRIDS GG
+	JOIN (SELECT G1.ContentID, .dbo.vefn_FixTransitionDataForCopy(G1.Data, TRO.TransitionID, TRO.TranType,  TRO.[ToID], TRO.[RangeID],TR.[TransitionID], TR.[ToID], TR.[RangeID], .dbo.vefn_GetNewTranType(NN.FormatID, NN.NewFormatID, TRO.TranType)) NewData
+	FROM @GRIDS G1
+	JOIN @Children NN on G1.ContentID = NN.NewContentID
+	JOIN Transitions TR on NN.NewContentID = TR.FromID
+	JOIN Transitions TRO on TR.TranType = TRO.TransitionID) G2 ON GG.ContentID = G2.ContentID
+	WHERE Cast([DATA] as nvarchar(max)) <> CAST(G2.NewData as nvarchar(max))
+	SET @RowsAffected = @@RowCount
+END
+--print 'H2.2	' + cast(datediff(s,@dts,getdate()) as varchar(100))
+update GG set data = g1.data from Grids gg join @grids g1 on gg.contentid = g1.contentid
+--print 'H3	' + cast(datediff(s,@dts,getdate()) as varchar(100))
+--set nocount on
+-- Add 'Verification Required' AnnotationType
+	DECLARE @typeID int
+	SELECT @typeID = TypeID from AnnotationTypes where Name = 'Verification Required'
+	IF(@typeID IS NULL)
+	BEGIN
+		INSERT INTO [AnnotationTypes]	([Name],[UserID])	VALUES	('Verification Required','Volian')
+		SELECT @typeID = SCOPE_IDENTITY()
+	END
+	-- Add "Verification Required" Annotation for each Transition whose transition format changes
+INSERT INTO [Annotations] ([ItemID],[TypeID],[SearchText],[UserID])
+		SELECT NN.NewItemID, @typeID,'Verify Transition Format',@UserID
+			FROM Transitions TR
+			JOIN @Children NN on TR.FromID = NN.NewContentID
+			JOIN Transitions TRO on TR.TranType = TRO.TransitionID
+			WHERE .dbo.vefn_CompareTranFormat(NN.FormatID, NN.NewFormatID, TRO.TranType) <> 0
+--print 'H4	' + cast(datediff(s,@dts,getdate()) as varchar(100))
+UPDATE TR SET TR.[TranType] = .dbo.vefn_GetNewTranType(NN.FormatID, NN.NewFormatID, TRO.TranType)
+	FROM Transitions TR
+	JOIN @Children NN on TR.FromID = NN.NewContentID
+	JOIN Transitions TRO on TR.TranType = TRO.TransitionID
+--print 'H5	' + cast(datediff(s,@dts,getdate()) as varchar(100))
+-- Transitions are done
+	-- SELECT * From Transitions where DTS = @DTS and UserID = @UserID
+--print 'Z	' + cast(datediff(s,@dts,getdate()) as varchar(100))
+--foldouts fixing code
+if exists (select * from contents where contentid in (select newcontentid from @children) and config like '%FloatingFoldout%')
+begin
+	--insert into #mytemp
+	select cc.contentid,xsteps.value('@FloatingFoldout','int') oldfoldoutid,(select newitemid 
+	from @children 
+	where itemid = xsteps.value('@FloatingFoldout','int')) newfoldoutid,xconfig 
+	into #mytemp 
+	from (select *,cast(config as xml) xconfig from contents where contentid in (select newcontentid from @children)) cc
+	cross apply xconfig.nodes('Config/Step') tsteps(xsteps)
+	--build @cmd string
+	declare @cmd nvarchar(max)
+	declare cmds cursor for
+	select distinct 'update #mytemp set xconfig.modify(''replace value of (Config/Step/@FloatingFoldout)[1] with "'
+	 + cast(newfoldoutid as varchar(10))
+	 + '"'') where xconfig.value(''(Config/Step/@FloatingFoldout)[1]'',''int'') = '
+	 + cast(oldfoldoutid as varchar(10))
+	from #mytemp
+	--execute cursor over rows
+	open cmds
+	fetch next from cmds into @cmd
+	while @@fetch_status = 0
+	begin
+		exec sp_executesql @cmd
+		fetch next from cmds into @cmd
+	end
+	close cmds
+	deallocate cmds
+	--actually update contents
+	update cc set config = cast(xconfig as varchar(max)) from contents cc join #mytemp mt on cc.contentid = mt.contentid
+	--get rid of #mytemp
+	drop table #mytemp
+end
+--end foldouts fixing code
+--section start
+DECLARE @NewContentID int
+Select @NewContentID = NewContentID from @Children where ItemID = @StartItemID
+DECLARE @Config varchar(max)
+DECLARE @XConfig xml
+select @Config = config from contents where contentid = @NewContentID
+select @XConfig = cast(@Config as xml)
+if @Config like '%SectionStart%' begin
+	DECLARE @SectionStart int
+	select @SectionStart = xproc.value('@SectionStart','int') from @xconfig.nodes('Config/Procedure') tproc(xproc)
+	DECLARE @NewSectionStart int
+	select @NewSectionStart = newitemid from @children where itemid = @SectionStart
+	DECLARE @cmd2 nvarchar(max)
+	set @cmd2 = '
+		declare @XConfig xml; 
+		set @XConfig = cast(''' + @Config + ''' as xml); 
+		set @XConfig.modify(''replace value of (Config/Procedure/@SectionStart)[1] with "' + cast(@NewSectionStart as nvarchar(10)) + '"''); 
+		update contents set config = cast(@XConfig as varchar(max)) where contentid = ' + cast(@NewContentID as nvarchar(10)) + ';'
+	exec sp_executesql @cmd2
+end
+--end section start
+	IF( @@TRANCOUNT > 0 ) COMMIT
+END TRY
+BEGIN CATCH -- Catch Block
+	IF( @@TRANCOUNT = 1 ) ROLLBACK -- Only rollback if top level
+ 	ELSE IF( @@TRANCOUNT > 1 ) COMMIT -- Otherwise commit.  Top level will rollback
+	EXEC vlnErrorHandler
+END CATCH
 Go
 
-	IF (@@Error = 0) PRINT 'Procedure Creation: [CopyItemAndChildren] Succeeded'
-	ELSE PRINT 'Procedure Creation: [CopyItemAndChildren] Error on Creation'
-	GO
-
 /*
 ==========================================================================================================
  End: C2024-004: KL - Update Copy Replace functionality, (remove ''copy of'')
 ==========================================================================================================
 */
 
-
-
 /*
 ==========================================================================================================
  Begin: C2024-005: PRL - SPs to support Admin tool to clean Annotations
@@ -22712,7 +23328,7 @@ AS
 
 	-- Delete Annotations
 	DELETE FROM Ann 
-	FROM tblAnnotations Ann INNER JOIN @Annotationitems AI ON Ann.itemid = AI.AllItemIDs WHERE TypeID = @typeidI beleive the 
+	FROM tblAnnotations Ann INNER JOIN @Annotationitems AI ON Ann.itemid = AI.AllItemIDs WHERE TypeID = @typeid 
 	
 GO
 
@@ -22905,8 +23521,88 @@ GO
 
 
 
+/*
+==========================================================================================================
+ Start: C2021-059: SQL to delete folders using admin tool
+==========================================================================================================
+*/
+
+IF EXISTS (SELECT * FROM sys.objects WHERE type = 'P' AND name = 'deleteFolderAdmin')
+DROP PROCEDURE [dbo].[deleteFolderAdmin]
+GO
+
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+	
+/*****************************************************************************
+   Volian Enterprises - Proprietary Information - DO NOT COPY OR DISTRIBUTE
+       Copyright 2012 - Volian Enterprises, Inc. All rights reserved.
+*****************************************************************************/
+CREATE PROCEDURE [dbo].[deleteFolderAdmin]
+
+(
+	@FolderID int
+)
+WITH EXECUTE AS OWNER
+AS
+BEGIN TRY -- Try Block
+	BEGIN TRANSACTION
+	DELETE From Assignments WHERE [FolderID]=@FolderID
+	DELETE From Associations where VersionID in (select versionid from DocVersions where folderid = @FolderID)
+	DELETE From DocVersions where VersionID in (select versionid from DocVersions where folderid= @FolderID)
+	DELETE From DocVersions where [FolderID]=@FolderID
+	
+	-- Delete from items where ItemID matches
+	DELETE FROM tblitems
+	WHERE ItemID IN (
+		SELECT DISTINCT ItemID
+		FROM docversions
+		WHERE folderID = @folderID
+	);
+
+	
+	-- Delete from items where ItemID matches
+	DELETE FROM tblitems
+	WHERE ItemID IN (
+		SELECT DISTINCT ItemID
+		FROM docversions
+		WHERE folderID = @folderID
+	);
+
+	-- Delete from tblContents where ContentID matches
+	DELETE FROM tblContents
+	WHERE ContentID IN (
+		SELECT DISTINCT c.ContentID
+		FROM tblContents c
+		JOIN items i ON c.ContentID = i.ItemID
+		WHERE i.ItemID IN (
+			SELECT DISTINCT ItemID
+			FROM docversions
+			WHERE folderID = @folderID
+		)
+	);
+
+	DELETE From Folders WHERE [ParentID] = @FolderID
+	DELETE From Folders WHERE [FolderID] = @FolderID
+
+
+	IF( @@TRANCOUNT > 0 ) COMMIT
+END TRY
+BEGIN CATCH -- Catch Block
+	IF( @@TRANCOUNT = 1 ) ROLLBACK -- Only rollback if top level
+ 	ELSE IF( @@TRANCOUNT > 1 ) COMMIT -- Otherwise commit.  Top level will rollback
+	EXEC vlnErrorHandler
+END CATCH
+
+GO
+/*
+==========================================================================================================
+ End: C2021-059: SQL to delete folders using admin tool
+==========================================================================================================
+*/
 
------------------------------------------------------------------------------
 /*
   ---------------------------------------------------------------------------
   |                       ADD New Code Before this Block                    |
@@ -22940,8 +23636,8 @@ BEGIN TRY -- Try Block
 	DECLARE @RevDate varchar(255)
 	DECLARE @RevDescription varchar(255)
 
-	set @RevDate = '07/16/2024 5:00 PM'
-	set @RevDescription = 'C2024-005: An Admin tool that can delete a group of annotations should be developed'
+	set @RevDate = '07/29/2024 11:24'
+	set @RevDescription = 'C2021-059 Add SQL for Admin tool delete folders.'
 
 	Select  cast(@RevDate as datetime) RevDate, @RevDescription  RevDescription
 	PRINT 'SQL Code Revision ' + @RevDate + ' - ' + @RevDescription
@@ -22959,6 +23655,3 @@ ELSE PRINT 'StoredProcedure [vesp_GetSQLCodeRevision] Error on Creation'
 go
 
 Exec vesp_GetSQLCodeRevision;
-
-
-

PROMS/VEPROMS User Interface/Properties/licenses.licx

@@ -1,3 +1,2 @@
-C1.Win.C1Input.C1ComboBox, C1.Win.C1Input.2, Version=2.0.20213.532, Culture=neutral, PublicKeyToken=7e7ff60f0c214f9a
-C1.Win.C1FlexGrid.C1FlexGrid, C1.Win.C1FlexGrid.2, Version=2.0.20213.532, Culture=neutral, PublicKeyToken=79882d576c6336da
-C1.Win.C1SpellChecker.C1SpellChecker, C1.Win.C1SpellChecker.2, Version=2.0.20213.532, Culture=neutral, PublicKeyToken=79882d576c6336da
+C1.Win.C1FlexGrid.C1FlexGrid, C1.Win.C1FlexGrid.2
+C1.Win.C1SpellChecker.C1SpellChecker, C1.Win.C1SpellChecker.2

PROMS/VEPROMS User Interface/frmAnnotationsCleanup.Designer.cs

@@ -56,9 +56,9 @@ namespace VEPROMS
 			this.lblAnnotationsList.AutoSize = true;
 			this.lblAnnotationsList.Location = new System.Drawing.Point(26, 21);
 			this.lblAnnotationsList.Name = "lblAnnotationsList";
-			this.lblAnnotationsList.Size = new System.Drawing.Size(169, 13);
+			this.lblAnnotationsList.Size = new System.Drawing.Size(175, 13);
 			this.lblAnnotationsList.TabIndex = 1;
-			this.lblAnnotationsList.Text = "Select a Annotation Type to Clean";
+			this.lblAnnotationsList.Text = "Select an Annotation Type to Clean";
 			// 
 			// btnClean
 			// 
@@ -73,11 +73,12 @@ namespace VEPROMS
 			// lblCountNumber
 			// 
 			this.lblCountNumber.AutoSize = true;
-			this.lblCountNumber.Location = new System.Drawing.Point(392, 100);
+			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
 			// 

PROMS/VEPROMS User Interface/frmAnnotationsCleanup.cs

@@ -129,6 +129,7 @@ namespace VEPROMS
 			// 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;
@@ -144,6 +145,7 @@ namespace VEPROMS
 				deletecountDocv = Annotation.getAnnotationCountDocv(AnnotationTyp, getAnnotationDocvItems(dvil2));
 			}
 			lblCountNumber.Text = (deletecountProc + deletecountDocv).ToString();
+			btnClean.Enabled = true;
 
 		}
 			// Close form.

PROMS/VEPROMS User Interface/frmAnnotationsCleanup.resx

@@ -121,4 +121,3 @@
     <value>17, 17</value>
   </metadata>
 </root>
-

PROMS/VEPROMS User Interface/frmBatchRefresh.Designer.cs

@@ -59,6 +59,17 @@
 			this.labelX14 = new DevComponents.DotNetBar.LabelX();
 			this.myTVdel = new System.Windows.Forms.TreeView();
 			this.btnDeleteItems = new DevComponents.DotNetBar.ButtonX();
+			this.sideNavPanel3 = new DevComponents.DotNetBar.Controls.SideNavPanel();
+			this.swCheckROLinks = new DevComponents.DotNetBar.Controls.SwitchButton();
+			this.labelX12 = new DevComponents.DotNetBar.LabelX();
+			this.warningBox5 = new DevComponents.DotNetBar.Controls.WarningBox();
+			this.line3 = new DevComponents.DotNetBar.Controls.Line();
+			this.swUpdateROVals = new DevComponents.DotNetBar.Controls.SwitchButton();
+			this.swRefreshTrans = new DevComponents.DotNetBar.Controls.SwitchButton();
+			this.labelX11 = new DevComponents.DotNetBar.LabelX();
+			this.labelX6 = new DevComponents.DotNetBar.LabelX();
+			this.warningBox1 = new DevComponents.DotNetBar.Controls.WarningBox();
+			this.btnFixLinks = new DevComponents.DotNetBar.ButtonX();
 			this.sideNavPanel1 = new DevComponents.DotNetBar.Controls.SideNavPanel();
 			this.warningBox3 = new DevComponents.DotNetBar.Controls.WarningBox();
 			this.labelX7 = new DevComponents.DotNetBar.LabelX();
@@ -86,17 +97,8 @@
 			this.labelX8 = new DevComponents.DotNetBar.LabelX();
 			this.line2 = new DevComponents.DotNetBar.Controls.Line();
 			this.btnRunRepair = new DevComponents.DotNetBar.ButtonX();
-			this.sideNavPanel3 = new DevComponents.DotNetBar.Controls.SideNavPanel();
-			this.swCheckROLinks = new DevComponents.DotNetBar.Controls.SwitchButton();
-			this.labelX12 = new DevComponents.DotNetBar.LabelX();
-			this.warningBox5 = new DevComponents.DotNetBar.Controls.WarningBox();
-			this.line3 = new DevComponents.DotNetBar.Controls.Line();
-			this.swUpdateROVals = new DevComponents.DotNetBar.Controls.SwitchButton();
-			this.swRefreshTrans = new DevComponents.DotNetBar.Controls.SwitchButton();
-			this.labelX11 = new DevComponents.DotNetBar.LabelX();
-			this.labelX6 = new DevComponents.DotNetBar.LabelX();
-			this.warningBox1 = new DevComponents.DotNetBar.Controls.WarningBox();
-			this.btnFixLinks = new DevComponents.DotNetBar.ButtonX();
+			this.sideNavPanel5 = new DevComponents.DotNetBar.Controls.SideNavPanel();
+			this.btn_ShowUsers = new DevComponents.DotNetBar.ButtonX();
 			this.sideNavItem1 = new DevComponents.DotNetBar.Controls.SideNavItem();
 			this.separator1 = new DevComponents.DotNetBar.Separator();
 			this.sideNavItmCheck = new DevComponents.DotNetBar.Controls.SideNavItem();
@@ -126,9 +128,10 @@
 			this.panelEx1.SuspendLayout();
 			this.sideNav1.SuspendLayout();
 			this.sideNavPanel4.SuspendLayout();
+			this.sideNavPanel3.SuspendLayout();
 			this.sideNavPanel1.SuspendLayout();
 			this.sideNavPanel2.SuspendLayout();
-			this.sideNavPanel3.SuspendLayout();
+			this.sideNavPanel5.SuspendLayout();
 			this.panelEx4.SuspendLayout();
 			this.SuspendLayout();
 			// 
@@ -138,9 +141,10 @@
 			| System.Windows.Forms.AnchorStyles.Left)
 			| System.Windows.Forms.AnchorStyles.Right)));
 			this.myTV.CheckBoxes = true;
-			this.myTV.Location = new System.Drawing.Point(0, 230);
+			this.myTV.Dock = System.Windows.Forms.DockStyle.Bottom;
+			this.myTV.Location = new System.Drawing.Point(0, 184);
 			this.myTV.Name = "myTV";
-			this.myTV.Size = new System.Drawing.Size(183, 226);
+			this.myTV.Size = new System.Drawing.Size(291, 310);
 			this.myTV.TabIndex = 4;
 			this.myTV.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.myTV_AfterCheck);
 			// 
@@ -465,9 +469,10 @@
 			// 
 			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.sideNavPanel2);
-			this.sideNav1.Controls.Add(this.sideNavPanel3);
+			this.sideNav1.Controls.Add(this.sideNavPanel5);
 			this.sideNav1.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.sideNav1.EnableClose = false;
 			this.sideNav1.EnableMaximize = false;
@@ -501,6 +506,31 @@
 			this.sideNavPanel4.Size = new System.Drawing.Size(291, 494);
 			this.sideNavPanel4.TabIndex = 27;
 			//
+			// sideNavPanel5
+			// 
+			this.sideNavPanel5.Controls.Add(this.btn_ShowUsers);
+			this.sideNavPanel5.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.sideNavPanel5.Location = new System.Drawing.Point(81, 31);
+			this.sideNavPanel5.Name = "sideNavPanel5";
+			this.sideNavPanel5.Size = new System.Drawing.Size(299, 494);
+			this.sideNavPanel5.TabIndex = 14;
+			this.sideNavPanel5.Visible = false;
+			// 
+			// btn_ShowUsers
+			// 
+			this.btn_ShowUsers.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+			this.btn_ShowUsers.Checked = true;
+			this.btn_ShowUsers.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+			this.btn_ShowUsers.Location = new System.Drawing.Point(57, 37);
+			this.btn_ShowUsers.Name = "btn_ShowUsers";
+			this.btn_ShowUsers.Size = new System.Drawing.Size(171, 23);
+			this.btn_ShowUsers.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+			this.superTooltip1.SetSuperTooltip(this.btn_ShowUsers, new DevComponents.DotNetBar.SuperTooltipInfo("Show Users", "", "This will return all of the users currently with open sessions in the database an" +
+			"d the details of any items they have checked out.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 80)));
+			this.btn_ShowUsers.TabIndex = 0;
+			this.btn_ShowUsers.Text = "Show Users";
+			this.btn_ShowUsers.Click += new System.EventHandler(this.btn_ShowUsers_Click);
+			// 
 			// swDeleteFolder
 			// 
 			// 
@@ -561,7 +591,7 @@
 			this.labelX14.Location = new System.Drawing.Point(85, 14);
 			this.labelX14.Name = "labelX14";
 			this.labelX14.Size = new System.Drawing.Size(186, 22);
-			this.superTooltip1.SetSuperTooltip(this.labelX14, new DevComponents.DotNetBar.SuperTooltipInfo("Refresh Transitions", "", resources.GetString("labelX14.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(256, 175)));
+			this.superTooltip1.SetSuperTooltip(this.labelX14, new DevComponents.DotNetBar.SuperTooltipInfo("Process Deletions", "", resources.GetString("labelX14.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 175)));
 			this.labelX14.TabIndex = 36;
 			this.labelX14.Text = "Delete Annotations";
 			// 
@@ -571,27 +601,194 @@
 			| System.Windows.Forms.AnchorStyles.Left)
 			| System.Windows.Forms.AnchorStyles.Right)));
 			this.myTVdel.CheckBoxes = true;
-			this.myTVdel.Location = new System.Drawing.Point(14, 145);
+			this.myTVdel.Dock = System.Windows.Forms.DockStyle.Bottom;
+			this.myTVdel.Location = new System.Drawing.Point(0, 127);
 			this.myTVdel.Name = "myTVdel";
-			this.myTVdel.Size = new System.Drawing.Size(267, 331);
+			this.myTVdel.Size = new System.Drawing.Size(291, 367);
 			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(3, 98);
+			this.btnDeleteItems.Location = new System.Drawing.Point(39, 98);
 			this.btnDeleteItems.Name = "btnDeleteItems";
-			this.btnDeleteItems.Size = new System.Drawing.Size(280, 23);
+			this.btnDeleteItems.Size = new System.Drawing.Size(212, 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" +
+			this.superTooltip1.SetSuperTooltip(this.btnDeleteItems, new DevComponents.DotNetBar.SuperTooltipInfo("Process Deletions", "", "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.\r\n\r\nClick on the on" +
 			"/off switches to turn on/off each tool.\r\n\r\nNote that only one of these tools can" +
-            " be run at a time.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 130)));
+			" be run at a time.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 175)));
 			this.btnDeleteItems.TabIndex = 35;
 			this.btnDeleteItems.Text = "Process Deletions";
 			this.btnDeleteItems.Click += new System.EventHandler(this.btnDeleteItems_Click);
 			// 
+			// sideNavPanel3
+			// 
+			this.sideNavPanel3.Controls.Add(this.swCheckROLinks);
+			this.sideNavPanel3.Controls.Add(this.labelX12);
+			this.sideNavPanel3.Controls.Add(this.warningBox5);
+			this.sideNavPanel3.Controls.Add(this.line3);
+			this.sideNavPanel3.Controls.Add(this.swUpdateROVals);
+			this.sideNavPanel3.Controls.Add(this.swRefreshTrans);
+			this.sideNavPanel3.Controls.Add(this.labelX11);
+			this.sideNavPanel3.Controls.Add(this.labelX6);
+			this.sideNavPanel3.Controls.Add(this.warningBox1);
+			this.sideNavPanel3.Controls.Add(this.myTV);
+			this.sideNavPanel3.Controls.Add(this.btnFixLinks);
+			this.sideNavPanel3.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.sideNavPanel3.Location = new System.Drawing.Point(89, 31);
+			this.sideNavPanel3.Name = "sideNavPanel3";
+			this.sideNavPanel3.Size = new System.Drawing.Size(291, 494);
+			this.sideNavPanel3.TabIndex = 10;
+			this.sideNavPanel3.Visible = false;
+			// 
+			// swCheckROLinks
+			// 
+			// 
+			// 
+			// 
+			this.swCheckROLinks.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.swCheckROLinks.Location = new System.Drawing.Point(10, 66);
+			this.swCheckROLinks.Name = "swCheckROLinks";
+			this.swCheckROLinks.Size = new System.Drawing.Size(91, 22);
+			this.swCheckROLinks.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+			this.superTooltip1.SetSuperTooltip(this.swCheckROLinks, new DevComponents.DotNetBar.SuperTooltipInfo("Check RO Links", "", resources.GetString("swCheckROLinks.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 150)));
+			this.swCheckROLinks.SwitchClickTogglesValue = true;
+			this.swCheckROLinks.TabIndex = 33;
+			this.swCheckROLinks.ValueChanged += new System.EventHandler(this.swCheckROLinks_ValueChanged);
+			// 
+			// labelX12
+			// 
+			this.labelX12.BackColor = System.Drawing.Color.Transparent;
+			// 
+			// 
+			// 
+			this.labelX12.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.labelX12.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.labelX12.Location = new System.Drawing.Point(107, 66);
+			this.labelX12.Name = "labelX12";
+			this.labelX12.Size = new System.Drawing.Size(186, 22);
+			this.superTooltip1.SetSuperTooltip(this.labelX12, new DevComponents.DotNetBar.SuperTooltipInfo("Check RO Links", "", resources.GetString("labelX12.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(350, 175)));
+			this.labelX12.TabIndex = 32;
+			this.labelX12.Text = "Check RO Links";
+			// 
+			// warningBox5
+			// 
+			this.warningBox5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(196)))), ((int)(((byte)(219)))), ((int)(((byte)(249)))));
+			this.warningBox5.CloseButtonVisible = false;
+			this.warningBox5.Image = ((System.Drawing.Image)(resources.GetObject("warningBox5.Image")));
+			this.warningBox5.Location = new System.Drawing.Point(17, 145);
+			this.warningBox5.Margin = new System.Windows.Forms.Padding(4);
+			this.warningBox5.Name = "warningBox5";
+			this.warningBox5.OptionsButtonVisible = false;
+			this.warningBox5.Size = new System.Drawing.Size(262, 32);
+			this.warningBox5.TabIndex = 31;
+			this.warningBox5.Text = "<b>NOTE</b> These tools can take a long time to run";
+			// 
+			// line3
+			// 
+			this.line3.BackColor = System.Drawing.Color.Transparent;
+			this.line3.Location = new System.Drawing.Point(6, 127);
+			this.line3.Name = "line3";
+			this.line3.Size = new System.Drawing.Size(285, 12);
+			this.line3.TabIndex = 30;
+			this.line3.Text = "line3";
+			// 
+			// swUpdateROVals
+			// 
+			// 
+			// 
+			// 
+			this.swUpdateROVals.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.swUpdateROVals.Location = new System.Drawing.Point(10, 10);
+			this.swUpdateROVals.Name = "swUpdateROVals";
+			this.swUpdateROVals.Size = new System.Drawing.Size(91, 22);
+			this.swUpdateROVals.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+			this.superTooltip1.SetSuperTooltip(this.swUpdateROVals, new DevComponents.DotNetBar.SuperTooltipInfo("Update RO Values", "", resources.GetString("swUpdateROVals.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 150)));
+			this.swUpdateROVals.SwitchClickTogglesValue = true;
+			this.swUpdateROVals.TabIndex = 29;
+			this.swUpdateROVals.Value = true;
+			this.swUpdateROVals.ValueObject = "Y";
+			this.swUpdateROVals.ValueChanged += new System.EventHandler(this.swUpdateROVals_ValueChanged);
+			// 
+			// swRefreshTrans
+			// 
+			// 
+			// 
+			// 
+			this.swRefreshTrans.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.swRefreshTrans.Location = new System.Drawing.Point(10, 38);
+			this.swRefreshTrans.Name = "swRefreshTrans";
+			this.swRefreshTrans.Size = new System.Drawing.Size(91, 22);
+			this.swRefreshTrans.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+			this.superTooltip1.SetSuperTooltip(this.swRefreshTrans, new DevComponents.DotNetBar.SuperTooltipInfo("Refresh Transitions", "", resources.GetString("swRefreshTrans.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(265, 175)));
+			this.swRefreshTrans.SwitchClickTogglesValue = true;
+			this.swRefreshTrans.TabIndex = 29;
+			this.swRefreshTrans.ValueChanged += new System.EventHandler(this.swRefreshTrans_ValueChanged);
+			// 
+			// labelX11
+			// 
+			this.labelX11.BackColor = System.Drawing.Color.Transparent;
+			// 
+			// 
+			// 
+			this.labelX11.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.labelX11.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.labelX11.Location = new System.Drawing.Point(107, 10);
+			this.labelX11.Name = "labelX11";
+			this.labelX11.Size = new System.Drawing.Size(186, 22);
+			this.superTooltip1.SetSuperTooltip(this.labelX11, new DevComponents.DotNetBar.SuperTooltipInfo("Update RO Values", "", resources.GetString("labelX11.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 150)));
+			this.labelX11.TabIndex = 28;
+			this.labelX11.Text = "Update RO Values";
+			// 
+			// labelX6
+			// 
+			this.labelX6.BackColor = System.Drawing.Color.Transparent;
+			// 
+			// 
+			// 
+			this.labelX6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.labelX6.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.labelX6.Location = new System.Drawing.Point(107, 38);
+			this.labelX6.Name = "labelX6";
+			this.labelX6.Size = new System.Drawing.Size(186, 22);
+			this.superTooltip1.SetSuperTooltip(this.labelX6, new DevComponents.DotNetBar.SuperTooltipInfo("Refresh Transitions", "", resources.GetString("labelX6.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(256, 175)));
+			this.labelX6.TabIndex = 28;
+			this.labelX6.Text = "Refresh Transitions";
+			// 
+			// warningBox1
+			// 
+			this.warningBox1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(196)))), ((int)(((byte)(219)))), ((int)(((byte)(249)))));
+			this.warningBox1.CloseButtonVisible = false;
+			this.warningBox1.Image = ((System.Drawing.Image)(resources.GetObject("warningBox1.Image")));
+			this.warningBox1.Location = new System.Drawing.Point(17, 181);
+			this.warningBox1.Margin = new System.Windows.Forms.Padding(4);
+			this.warningBox1.Name = "warningBox1";
+			this.warningBox1.OptionsButtonVisible = false;
+			this.warningBox1.Size = new System.Drawing.Size(262, 43);
+			this.warningBox1.TabIndex = 7;
+			this.warningBox1.Text = " Be sure there is a current backup of the \r\n database prior to running these func" +
+	"tions";
+			// 
+			// btnFixLinks
+			// 
+			this.btnFixLinks.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+			this.btnFixLinks.Checked = true;
+			this.btnFixLinks.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+			this.btnFixLinks.Location = new System.Drawing.Point(10, 98);
+			this.btnFixLinks.Name = "btnFixLinks";
+			this.btnFixLinks.Size = new System.Drawing.Size(280, 23);
+			this.btnFixLinks.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+			this.superTooltip1.SetSuperTooltip(this.btnFixLinks, new DevComponents.DotNetBar.SuperTooltipInfo("Process Links", "", "This will run the selected RO Links or Transitions Links tool.\r\n\r\nClick on the on" +
+			"/off switches to turn on/off each tool.\r\n\r\nNote that only one of these tools can" +
+			" be run at a time.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 130)));
+			this.btnFixLinks.TabIndex = 6;
+			this.btnFixLinks.Text = "Process Links";
+			this.btnFixLinks.Click += new System.EventHandler(this.btnFixLinks_Click);
+			// 
 			// sideNavPanel1
 			// 
 			this.sideNavPanel1.Controls.Add(this.warningBox3);
@@ -1009,170 +1206,6 @@
 			this.btnRunRepair.Text = "Run Repair";
 			this.btnRunRepair.Click += new System.EventHandler(this.btnRunRepair_Click);
 			// 
-			// sideNavPanel3
-			// 
-			this.sideNavPanel3.Controls.Add(this.swCheckROLinks);
-			this.sideNavPanel3.Controls.Add(this.labelX12);
-			this.sideNavPanel3.Controls.Add(this.warningBox5);
-			this.sideNavPanel3.Controls.Add(this.line3);
-			this.sideNavPanel3.Controls.Add(this.swUpdateROVals);
-			this.sideNavPanel3.Controls.Add(this.swRefreshTrans);
-			this.sideNavPanel3.Controls.Add(this.labelX11);
-			this.sideNavPanel3.Controls.Add(this.labelX6);
-			this.sideNavPanel3.Controls.Add(this.warningBox1);
-			this.sideNavPanel3.Controls.Add(this.myTV);
-			this.sideNavPanel3.Controls.Add(this.btnFixLinks);
-			this.sideNavPanel3.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.sideNavPanel3.Location = new System.Drawing.Point(89, 31);
-			this.sideNavPanel3.Name = "sideNavPanel3";
-			this.sideNavPanel3.Size = new System.Drawing.Size(291, 494);
-			this.sideNavPanel3.TabIndex = 10;
-			this.sideNavPanel3.Visible = false;
-			// 
-			// swCheckROLinks
-			// 
-			// 
-			// 
-			// 
-			this.swCheckROLinks.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.swCheckROLinks.Location = new System.Drawing.Point(10, 66);
-			this.swCheckROLinks.Name = "swCheckROLinks";
-			this.swCheckROLinks.Size = new System.Drawing.Size(91, 22);
-			this.swCheckROLinks.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-			this.superTooltip1.SetSuperTooltip(this.swCheckROLinks, new DevComponents.DotNetBar.SuperTooltipInfo("Check RO Links", "", resources.GetString("swCheckROLinks.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 150)));
-			this.swCheckROLinks.SwitchClickTogglesValue = true;
-			this.swCheckROLinks.TabIndex = 33;
-			this.swCheckROLinks.ValueChanged += new System.EventHandler(this.swCheckROLinks_ValueChanged);
-			// 
-			// labelX12
-			// 
-			this.labelX12.BackColor = System.Drawing.Color.Transparent;
-			// 
-			// 
-			// 
-			this.labelX12.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.labelX12.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.labelX12.Location = new System.Drawing.Point(107, 66);
-			this.labelX12.Name = "labelX12";
-			this.labelX12.Size = new System.Drawing.Size(186, 22);
-			this.superTooltip1.SetSuperTooltip(this.labelX12, new DevComponents.DotNetBar.SuperTooltipInfo("Check RO Links", "", resources.GetString("labelX12.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(350, 175)));
-			this.labelX12.TabIndex = 32;
-			this.labelX12.Text = "Check RO Links";
-			// 
-			// warningBox5
-			// 
-			this.warningBox5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(196)))), ((int)(((byte)(219)))), ((int)(((byte)(249)))));
-			this.warningBox5.CloseButtonVisible = false;
-			this.warningBox5.Image = ((System.Drawing.Image)(resources.GetObject("warningBox5.Image")));
-			this.warningBox5.Location = new System.Drawing.Point(17, 145);
-			this.warningBox5.Margin = new System.Windows.Forms.Padding(4);
-			this.warningBox5.Name = "warningBox5";
-			this.warningBox5.OptionsButtonVisible = false;
-			this.warningBox5.Size = new System.Drawing.Size(262, 32);
-			this.warningBox5.TabIndex = 31;
-			this.warningBox5.Text = "<b>NOTE</b> These tools can take a long time to run";
-			// 
-			// line3
-			// 
-			this.line3.BackColor = System.Drawing.Color.Transparent;
-			this.line3.Location = new System.Drawing.Point(6, 127);
-			this.line3.Name = "line3";
-			this.line3.Size = new System.Drawing.Size(285, 12);
-			this.line3.TabIndex = 30;
-			this.line3.Text = "line3";
-			// 
-			// swUpdateROVals
-			// 
-			// 
-			// 
-			// 
-			this.swUpdateROVals.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.swUpdateROVals.Location = new System.Drawing.Point(10, 10);
-			this.swUpdateROVals.Name = "swUpdateROVals";
-			this.swUpdateROVals.Size = new System.Drawing.Size(91, 22);
-			this.swUpdateROVals.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-			this.superTooltip1.SetSuperTooltip(this.swUpdateROVals, new DevComponents.DotNetBar.SuperTooltipInfo("Update RO Values", "", resources.GetString("swUpdateROVals.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 150)));
-			this.swUpdateROVals.SwitchClickTogglesValue = true;
-			this.swUpdateROVals.TabIndex = 29;
-			this.swUpdateROVals.Value = true;
-			this.swUpdateROVals.ValueObject = "Y";
-			this.swUpdateROVals.ValueChanged += new System.EventHandler(this.swUpdateROVals_ValueChanged);
-			// 
-			// swRefreshTrans
-			// 
-			// 
-			// 
-			// 
-			this.swRefreshTrans.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.swRefreshTrans.Location = new System.Drawing.Point(10, 38);
-			this.swRefreshTrans.Name = "swRefreshTrans";
-			this.swRefreshTrans.Size = new System.Drawing.Size(91, 22);
-			this.swRefreshTrans.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-			this.superTooltip1.SetSuperTooltip(this.swRefreshTrans, new DevComponents.DotNetBar.SuperTooltipInfo("Refresh Transitions", "", resources.GetString("swRefreshTrans.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(265, 175)));
-			this.swRefreshTrans.SwitchClickTogglesValue = true;
-			this.swRefreshTrans.TabIndex = 29;
-			this.swRefreshTrans.ValueChanged += new System.EventHandler(this.swRefreshTrans_ValueChanged);
-			// 
-			// labelX11
-			// 
-			this.labelX11.BackColor = System.Drawing.Color.Transparent;
-			// 
-			// 
-			// 
-			this.labelX11.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.labelX11.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.labelX11.Location = new System.Drawing.Point(107, 10);
-			this.labelX11.Name = "labelX11";
-			this.labelX11.Size = new System.Drawing.Size(186, 22);
-			this.superTooltip1.SetSuperTooltip(this.labelX11, new DevComponents.DotNetBar.SuperTooltipInfo("Update RO Values", "", resources.GetString("labelX11.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 150)));
-			this.labelX11.TabIndex = 28;
-			this.labelX11.Text = "Update RO Values";
-			// 
-			// labelX6
-			// 
-			this.labelX6.BackColor = System.Drawing.Color.Transparent;
-			// 
-			// 
-			// 
-			this.labelX6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.labelX6.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.labelX6.Location = new System.Drawing.Point(107, 38);
-			this.labelX6.Name = "labelX6";
-			this.labelX6.Size = new System.Drawing.Size(186, 22);
-			this.superTooltip1.SetSuperTooltip(this.labelX6, new DevComponents.DotNetBar.SuperTooltipInfo("Refresh Transitions", "", resources.GetString("labelX6.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(256, 175)));
-			this.labelX6.TabIndex = 28;
-			this.labelX6.Text = "Refresh Transitions";
-			// 
-			// warningBox1
-			// 
-			this.warningBox1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(196)))), ((int)(((byte)(219)))), ((int)(((byte)(249)))));
-			this.warningBox1.CloseButtonVisible = false;
-			this.warningBox1.Image = ((System.Drawing.Image)(resources.GetObject("warningBox1.Image")));
-			this.warningBox1.Location = new System.Drawing.Point(17, 181);
-			this.warningBox1.Margin = new System.Windows.Forms.Padding(4);
-			this.warningBox1.Name = "warningBox1";
-			this.warningBox1.OptionsButtonVisible = false;
-			this.warningBox1.Size = new System.Drawing.Size(262, 43);
-			this.warningBox1.TabIndex = 7;
-			this.warningBox1.Text = " Be sure there is a current backup of the \r\n database prior to running these func" +
-    "tions";
-			// 
-			// btnFixLinks
-			// 
-			this.btnFixLinks.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
-			this.btnFixLinks.Checked = true;
-			this.btnFixLinks.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-			this.btnFixLinks.Location = new System.Drawing.Point(10, 98);
-			this.btnFixLinks.Name = "btnFixLinks";
-			this.btnFixLinks.Size = new System.Drawing.Size(280, 23);
-			this.btnFixLinks.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-			this.superTooltip1.SetSuperTooltip(this.btnFixLinks, new DevComponents.DotNetBar.SuperTooltipInfo("Process Links", "", "This will run the selected RO Links or Transitions Links tool.\r\n\r\nClick on the on" +
-            "/off switches to turn on/off each tool.\r\n\r\nNote that only one of these tools can" +
-            " be run at a time.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 130)));
-			this.btnFixLinks.TabIndex = 6;
-			this.btnFixLinks.Text = "Process Links";
-			this.btnFixLinks.Click += new System.EventHandler(this.btnFixLinks_Click);
-			// 
 			// sideNavItem1
 			// 
 			this.sideNavItem1.IsSystemMenu = true;
@@ -1217,8 +1250,7 @@
 			// sideNavItmUsers
 			// 
 			this.sideNavItmUsers.Name = "sideNavItmUsers";
-			this.sideNavItmUsers.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
-            this.buttonItem1});
+			this.sideNavItmUsers.Panel = this.sideNavPanel5;
 			this.sideNavItmUsers.Symbol = "";
 			this.sideNavItmUsers.Text = "Users";
 			this.sideNavItmUsers.Click += new System.EventHandler(this.sideNavItmUsers_Click);
@@ -1364,9 +1396,10 @@
 			this.sideNav1.ResumeLayout(false);
 			this.sideNav1.PerformLayout();
 			this.sideNavPanel4.ResumeLayout(false);
+			this.sideNavPanel3.ResumeLayout(false);
 			this.sideNavPanel1.ResumeLayout(false);
 			this.sideNavPanel2.ResumeLayout(false);
-			this.sideNavPanel3.ResumeLayout(false);
+			this.sideNavPanel5.ResumeLayout(false);
 			this.panelEx4.ResumeLayout(false);
 			this.ResumeLayout(false);
 
@@ -1416,6 +1449,8 @@
 		private DevComponents.DotNetBar.LabelX labelX8;
 		private DevComponents.DotNetBar.Controls.Line line2;
 		private DevComponents.DotNetBar.ButtonX btnRunRepair;
+		private DevComponents.DotNetBar.Controls.SideNavPanel sideNavPanel5;
+		private DevComponents.DotNetBar.ButtonX btn_ShowUsers;
 		private DevComponents.DotNetBar.Controls.SideNavPanel sideNavPanel3;
 		private DevComponents.DotNetBar.ButtonX btnFixLinks;
 		private DevComponents.DotNetBar.Controls.SideNavItem sideNavItem1;
@@ -1461,5 +1496,3 @@
 		private DevComponents.DotNetBar.Controls.SideNavItem sideNavItmDelete;
 	}
 }
-
-

PROMS/VEPROMS User Interface/frmBatchRefresh.cs

@@ -24,16 +24,23 @@ 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
-		public frmBatchRefresh(SessionInfo sessionInfo)
+
+		private frmVEPROMS _veProms;
+		
+		public frmBatchRefresh(SessionInfo sessionInfo, frmVEPROMS veProms)
 		{
 			InitializeComponent();
 			_MySessionInfo = sessionInfo;
+			_veProms = veProms;
 
 			if (sideNavItmDelete.Checked)
 			{
 				AdminToolType = (E_AdminToolType)4;
 				if (swDeleteFolder.Value)
+				{
 					ResetDelTV(true);
+					setupProgessSteps1();
+				}
 				else
 					ResetDelTV(false);
 			}
@@ -91,6 +98,7 @@ 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.
@@ -133,6 +141,8 @@ 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;
@@ -155,12 +165,6 @@ namespace VEPROMS
 			FolderInfo fi = FolderInfo.GetTop();
 
 			if (fi.ChildFolderCount > 0)
-			{
-				if (noProcs)
-				{
-					LoadBottomLevelFolders(fi, myTVdel);
-				}
-				else
 			{
 				TreeNode tn = new TreeNode(fi.Name);
 				tn.Tag = fi;
@@ -168,87 +172,68 @@ namespace VEPROMS
 				LoadChildFolders(fi, tn, noProcs);
 				myTVdel.Nodes.Add(tn);
 			}
-			}
 
 			if (myTVdel.SelectedNode != null)
 				myTVdel.SelectedNode.Expand();
-			this.Cursor = Cursors.Default;
 
-			//btnFixLinks.Enabled = false;
-			//this.Cursor = Cursors.WaitCursor;
-			////myTreeNodePath = new List<string>();
-			//myTVdel.Nodes.Clear();
-			//myDocVersions.Clear();
-			//FolderInfo fi = FolderInfo.GetTop();
-			//TreeNode tn = myTVdel.Nodes.Add(fi.Name );
-			//tn.Tag = fi;
-			//if (fi.ChildFolderCount > 0)
-			//{
-			//	if (noProcs)
-			//	{
-			//		LoadBottomLevelFolders(fi, myTVdel);
-			//	}
-			//	else
-			//		LoadChildFolders(fi, tn, noProcs);
-			//}
-			//if (myTVdel.SelectedNode != null)
-			//	myTVdel.SelectedNode.Expand();
-			//this.Cursor = Cursors.Default;
+			//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; // B2021-060 flag when child folder working draft is loaded
+			bool loadedChildWorkingDraft = false;
+
 			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;
 					}
 				}
-			if (loadedChildWorkingDraft) loadedWorkingDraft = true; // B2021-060 if child folder working draft loaded set loadedWorkingDraft
-			if (tn.Parent != null && !loadedWorkingDraft)
-				tn.Remove();
-			return loadedWorkingDraft;
-		}
-		/// <summary>
-		/// Load only bottom layer of folders into treenode.
-		/// </summary>
-		/// <param name="fi"></param>
-		/// <param name="tn"></param>
-		private void LoadBottomLevelFolders(FolderInfo fi, TreeView treeView)
-		{
-			foreach (FolderInfo fic in fi.SortedChildFolders)
-			{
-				if (fic.ChildFolderCount > 0)
-				{
-					// Recursively call for child folders
-					LoadBottomLevelFolders(fic, treeView);
-				}
 				else
 				{
-					if (fic.Name != "PROMS")
+					// Add the folder to the dictionary
+					if (!myFolders.ContainsKey(tnc))
 					{
-
-
-
-						// If the folder is a bottom-level folder (no child folders), add it directly to the TreeView
-						TreeNode tnc = treeView.Nodes.Add(fic.Name);
-						tnc.Tag = fic;
+						myFolders.Add(tnc, fic);
 					}
 				}
 			}
+
+			if (loadedChildWorkingDraft)
+			{
+				loadedWorkingDraft = true;
+			}
+
+			if (tn.Parent != null && !loadedWorkingDraft)
+			{
+				tn.Remove();
+			}
+
+			return loadedWorkingDraft;
 		}
 		private bool LoadDocVersions(FolderInfo fic, TreeNode tnc, bool noProcs)
 		{
@@ -1227,12 +1212,10 @@ namespace VEPROMS
 					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)
@@ -1242,7 +1225,6 @@ namespace VEPROMS
 				parent = parent.Parent;
 			}
 		}
-
 		private void DiselectChildNodes(TreeNodeCollection childes)
 		{
 			foreach (TreeNode oneChild in childes)
@@ -1252,8 +1234,6 @@ namespace VEPROMS
 				DiselectChildNodes(oneChild.Nodes);
 			}
 		}
-
-
 		private void CheckChildNodes(TreeNode treeNode, bool ischecked)
 		{
 			foreach (TreeNode tn in treeNode.Nodes)
@@ -1267,6 +1247,80 @@ 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
@@ -1379,7 +1433,6 @@ namespace VEPROMS
 		private void sideNavItmDelete_Click(object sender, EventArgs e)
 		{
 			AdminToolType = E_AdminToolType.Delete;			
-			lblAdmToolProgressType.Text = "";
 			setupProgessSteps1();
 
 			if (swDeleteFolder.Value)
@@ -1456,8 +1509,20 @@ namespace VEPROMS
 					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;
 			}
 		}
@@ -1659,6 +1724,7 @@ 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);		
@@ -1668,6 +1734,7 @@ namespace VEPROMS
 
 		private void swDeleteFolder_ValueChanged(object sender, EventArgs e)
 		{
+			setupProgessSteps1();
 			swDeleteAnnotations.Value = !swDeleteFolder.Value;
 			if (swDeleteFolder.Value)
 				ResetDelTV(true);
@@ -1681,40 +1748,26 @@ namespace VEPROMS
 			txtResults.Clear();
 			txtProcess.Clear();
 
-
 			if (swDeleteFolder.Value)
 			{
-				//TODO process deletions of folders
+				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...");
 
-				//List<ProcedureInfo> pil = new List<ProcedureInfo>();
-				//foreach (TreeNode tn in myProcedures.Keys)
-				//	if (tn.Checked)
-				//		pil.Add(myProcedures[tn]);
+						//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
-				Dictionary<int, string> folderData = new Dictionary<int, string>();
+					//Load Selected Folders with docversions
+					List<FolderInfo> ef = new List<FolderInfo>();
+					foreach (TreeNode tn in myFolders.Keys)
+						if (tn.Checked)
+							ef.Add(myFolders[tn]);
 
-				//List<FolderInfo> Flist = new List<FolderInfo>();
-				//foreach (TreeNode tn in myDocVersions.Keys)
-				//	if (tn.Checked)
-				//		Flist.Add();
-
-				//List<DocVersionInfo> dvil = new List<DocVersionInfo>();
-				//foreach (TreeNode tn in myDocVersions.Keys)
-				//	if (tn.Checked)
-				//		dvil.Add(myDocVersions[tn]);
-
-				//foreach (TreeNode tn in myTVdel.Nodes)
-				//{
-				//	if (tn.Checked)
-				//	{
-				//		var itemInfo = myProcedures[tn];
-				//		folderData.Add(itemInfo.ItemID, itemInfo.DisplayText);
-				//	}
-				//}
-
-				//ProcessDelete(dvil);
+					ProcessDelete(dvil, ef);
+				}
 			}
 			else
 			{
@@ -1736,12 +1789,10 @@ namespace VEPROMS
 				frmAnnotationsCleanup frmAnnoDel = new frmAnnotationsCleanup(this, pil, dvil);
 				
 				frmAnnoDel.ShowDialog();
-
-
 			}
 		}
 
-		private void ProcessDelete(List<DocVersionInfo> foldersToDelete)
+		private void ProcessDelete(List<DocVersionInfo> foldersToDelete, List<FolderInfo> emptyFoldersToDelete)
 		{
 			DateTime pStart = DateTime.Now;
 			txtProcess.AppendText(Environment.NewLine);
@@ -1750,11 +1801,12 @@ namespace VEPROMS
 
 			foreach (var kvp in foldersToDelete)
 			{
-				int itemID = (int)kvp.ItemID;
-				string folderName = kvp.Name;
+				//Gather folder information			
+				FolderInfo fi = (FolderInfo)kvp.ActiveParent;
+				int itemID = (int)fi.FolderID;
+				string folderName = fi.Name;
 
 				// Perform the deletion operation
-				// Assume DeleteFolderByID is a method that deletes the folder by its ItemID
 				bool deletionSuccessful = DeleteFolderByID(itemID);
 
 				// Update txtProcess with the progress
@@ -1768,13 +1820,59 @@ namespace VEPROMS
 				}
 				txtProcess.AppendText(Environment.NewLine);
 			}
-		}
-		// Example deletion method
-		private bool DeleteFolderByID(int itemID)
+
+
+			//Delete non working info folders.
+			foreach (var kvp in emptyFoldersToDelete)
 			{
-			// Implement your folder deletion logic here
-			// Return true if deletion was successful, false otherwise
-			return true; // Placeholder
+				//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()

PROMS/VEPROMS User Interface/frmBatchRefresh.resx

@@ -149,13 +149,98 @@ Be sure a current backup of the database exists prior to running this function.
 If more than one procedure is selected, it is recommended that this be performed during off hours.</value>
   </data>
   <data name="labelX14.SuperTooltip" xml:space="preserve">
+    <value>This will allow for the deletion of groups of annotations and allow for deleting entire folders within PROMS.  Use the tree nodes to select which items to delete.
+
+Click on the on/off switches to turn on/off each tool.
+
+Note that only one of these tools can be run at a time.</value>
+  </data>
+  <data name="swCheckROLinks.SuperTooltip" xml:space="preserve">
+    <value>This allows the user to check referenced objects links in procedure step data for multiple working drafts in a batch mode.
+
+Bad referenced bject links will be identified with an Bad RO Link annotation. Use the PROMS Search tool to list all of the steps that have this annotation.
+
+Be sure a current backup of the database exists prior performing this function.
+
+It is recommended that this be done during off hours.
+
+</value>
+  </data>
+  <data name="labelX12.SuperTooltip" xml:space="preserve">
+    <value>This allows the user to check referenced objects links in procedure step data for multiple working drafts in a batch mode.
+
+Bad referenced bject links will be identified with an Bad RO Link annotation. Use the PROMS Search tool to list all of the steps that have this annotation.
+
+Be sure a current backup of the database exists prior performing this function.
+
+It is recommended that this be done during off hours.
+</value>
+  </data>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="warningBox5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+      iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAplJREFUOE+N
+      k11IU2Ecxv9zouK8CULrzo8SU3QKaSYmOJ2uFL8SK4igEIok6qKUwggySTShC41CRiiGdWNfYBcVWiGl
+      FqN0lh+UTaekzuWcuu2c9316nSdKLPEHz817/s/zPv9zOPQ/nlVQEGulF3ILPe+8SIHK8eYR5lusLwHy
+      Oy08RqpXjjfHVCMlsydbGbekg4/r4HmwRbLWUZzyeGNqD5NK1O5lw8L8NQHckgh5SAdXA3UqIxuzZKSj
+      8ssI8Il9wMQeYDoVfD4HrsdhsNdRgTL2b4yl5Ce1qL+xcQOWxpKxMzwAMVEayIv7IU8XwVnv8+XuEfJV
+      xtfjMlKZ/CYG3JYJ96wOPj6EoCBfMCkfnJdguSMG89eoVBlfS+tJCpCafa1stgBYzAZbzoFGo0ZIiD84
+      KwJ350P+UQxHtfr7vUPkp9j+4GqiM1K3FtyVB8h5wlSI4GB/RIQHgjtzwWaywMb1WHwYg7lKOq3YVrlz
+      jPw8RrWFOUoAJhpwcaNciNDQQMRGB4FNpIMNp4B93A2pXw/7ZbWlufCvFguNdNzzOta7J5S6fP4AdkVq
+      kKQVAQNJYO8TwHq0kD8kwdkWhZkLdMJrrsonlfu2yszmSsA9Bat1p0XdsTTcvxmJtpowyL1ar/m3PKYM
+      2MpVgzcySUWTdWRwd+wAXzoo3r5B7CnqDqVg+lW89yuoVARrR/SaANm0F46mUFjOUjYtN9BTaVQYJzPA
+      RlPB+hNF3XjvP3C9bDuqTm2D9DZuTcCKXN1psJ2ndhGgnpJGciENGyB9zoJk1kMezFonySw0oIf0KVOs
+      oIO7L3MlYITstVTsrKNHCzXU5aimnvmrZPp5hfrtlWS2X6LBuQoatJWTWQz3C5mEeoS6hNqt5yj7FysJ
+      zJwL4b/EAAAAAElFTkSuQmCC
+    </value>
+  </data>
+  <data name="swUpdateROVals.SuperTooltip" xml:space="preserve">
+    <value>This allows the user to update referenced objects values for multiple working drafts in a batch mode.
+
+Be sure a current backup of the database exists prior performing this function.
+
+It is recommended that this be done during off hours.
+</value>
+  </data>
+  <data name="swRefreshTrans.SuperTooltip" xml:space="preserve">
     <value>This function will refresh transitions in all procedures selected below, whether they were selected individually or as a group via a procedure set.
 
 Be sure a current backup of the database exists prior to running this function.
 
 If more than one procedure is selected, it is recommended that this be performed during off hours.</value>
   </data>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="labelX11.SuperTooltip" xml:space="preserve">
+    <value>This allows the user to update referenced objects values for multiple working drafts in a batch mode.
+
+Be sure a current backup of the database exists prior performing this function.
+
+It is recommended that this be done during off hours.
+</value>
+  </data>
+  <data name="labelX6.SuperTooltip" xml:space="preserve">
+    <value>This function will refresh transitions in all procedures selected below, whether they were selected individually or as a group via a procedure set.
+
+Be sure a current backup of the database exists prior to running this function.
+
+If more than one procedure is selected, it is recommended that this be performed during off hours.</value>
+  </data>
+  <data name="warningBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+      iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAplJREFUOE+N
+      k11IU2Ecxv9zouK8CULrzo8SU3QKaSYmOJ2uFL8SK4igEIok6qKUwggySTShC41CRiiGdWNfYBcVWiGl
+      FqN0lh+UTaekzuWcuu2c9316nSdKLPEHz817/s/zPv9zOPQ/nlVQEGulF3ILPe+8SIHK8eYR5lusLwHy
+      Oy08RqpXjjfHVCMlsydbGbekg4/r4HmwRbLWUZzyeGNqD5NK1O5lw8L8NQHckgh5SAdXA3UqIxuzZKSj
+      8ssI8Il9wMQeYDoVfD4HrsdhsNdRgTL2b4yl5Ce1qL+xcQOWxpKxMzwAMVEayIv7IU8XwVnv8+XuEfJV
+      xtfjMlKZ/CYG3JYJ96wOPj6EoCBfMCkfnJdguSMG89eoVBlfS+tJCpCafa1stgBYzAZbzoFGo0ZIiD84
+      KwJ350P+UQxHtfr7vUPkp9j+4GqiM1K3FtyVB8h5wlSI4GB/RIQHgjtzwWaywMb1WHwYg7lKOq3YVrlz
+      jPw8RrWFOUoAJhpwcaNciNDQQMRGB4FNpIMNp4B93A2pXw/7ZbWlufCvFguNdNzzOta7J5S6fP4AdkVq
+      kKQVAQNJYO8TwHq0kD8kwdkWhZkLdMJrrsonlfu2yszmSsA9Bat1p0XdsTTcvxmJtpowyL1ar/m3PKYM
+      2MpVgzcySUWTdWRwd+wAXzoo3r5B7CnqDqVg+lW89yuoVARrR/SaANm0F46mUFjOUjYtN9BTaVQYJzPA
+      RlPB+hNF3XjvP3C9bDuqTm2D9DZuTcCKXN1psJ2ndhGgnpJGciENGyB9zoJk1kMezFonySw0oIf0KVOs
+      oIO7L3MlYITstVTsrKNHCzXU5aimnvmrZPp5hfrtlWS2X6LBuQoatJWTWQz3C5mEeoS6hNqt5yj7FysJ
+      zJwL4b/EAAAAAElFTkSuQmCC
+    </value>
+  </data>
   <data name="warningBox3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
       iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAplJREFUOE+N
@@ -171,7 +256,7 @@ If more than one procedure is selected, it is recommended that this be performed
       RlPB+hNF3XjvP3C9bDuqTm2D9DZuTcCKXN1psJ2ndhGgnpJGciENGyB9zoJk1kMezFonySw0oIf0KVOs
       oIO7L3MlYITstVTsrKNHCzXU5aimnvmrZPp5hfrtlWS2X6LBuQoatJWTWQz3C5mEeoS6hNqt5yj7FysJ
       zJwL4b/EAAAAAElFTkSuQmCC
-</value>
+    </value>
   </data>
   <data name="swCkObsoleteROData.SuperTooltip" xml:space="preserve">
     <value>Referenced Objects databases are associated with a procedure set (such as Working Draft). 
@@ -248,7 +333,7 @@ This function will remove all of the saved attachment PDFS stored in the databas
       RlPB+hNF3XjvP3C9bDuqTm2D9DZuTcCKXN1psJ2ndhGgnpJGciENGyB9zoJk1kMezFonySw0oIf0KVOs
       oIO7L3MlYITstVTsrKNHCzXU5aimnvmrZPp5hfrtlWS2X6LBuQoatJWTWQz3C5mEeoS6hNqt5yj7FysJ
       zJwL4b/EAAAAAElFTkSuQmCC
-</value>
+    </value>
   </data>
   <data name="warningBox2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -265,7 +350,7 @@ This function will remove all of the saved attachment PDFS stored in the databas
       RlPB+hNF3XjvP3C9bDuqTm2D9DZuTcCKXN1psJ2ndhGgnpJGciENGyB9zoJk1kMezFonySw0oIf0KVOs
       oIO7L3MlYITstVTsrKNHCzXU5aimnvmrZPp5hfrtlWS2X6LBuQoatJWTWQz3C5mEeoS6hNqt5yj7FysJ
       zJwL4b/EAAAAAElFTkSuQmCC
-</value>
+    </value>
   </data>
   <data name="swRmObsoleteROData.SuperTooltip" xml:space="preserve">
     <value>Referenced Objects databases are associated with a procedure set (such as Working Draft). 
@@ -315,91 +400,6 @@ Should an item become orphaned (disconnected) from the rest of the data, it will
     <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 removes any orphaned items from the database.
-</value>
-  </data>
-  <data name="swCheckROLinks.SuperTooltip" xml:space="preserve">
-    <value>This allows the user to check referenced objects links in procedure step data for multiple working drafts in a batch mode.
-
-Bad referenced bject links will be identified with an Bad RO Link annotation. Use the PROMS Search tool to list all of the steps that have this annotation.
-
-Be sure a current backup of the database exists prior performing this function.
-
-It is recommended that this be done during off hours.
-
-</value>
-  </data>
-  <data name="labelX12.SuperTooltip" xml:space="preserve">
-    <value>This allows the user to check referenced objects links in procedure step data for multiple working drafts in a batch mode.
-
-Bad referenced bject links will be identified with an Bad RO Link annotation. Use the PROMS Search tool to list all of the steps that have this annotation.
-
-Be sure a current backup of the database exists prior performing this function.
-
-It is recommended that this be done during off hours.
-</value>
-  </data>
-  <data name="warningBox5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAplJREFUOE+N
-        k11IU2Ecxv9zouK8CULrzo8SU3QKaSYmOJ2uFL8SK4igEIok6qKUwggySTShC41CRiiGdWNfYBcVWiGl
-        FqN0lh+UTaekzuWcuu2c9316nSdKLPEHz817/s/zPv9zOPQ/nlVQEGulF3ILPe+8SIHK8eYR5lusLwHy
-        Oy08RqpXjjfHVCMlsydbGbekg4/r4HmwRbLWUZzyeGNqD5NK1O5lw8L8NQHckgh5SAdXA3UqIxuzZKSj
-        8ssI8Il9wMQeYDoVfD4HrsdhsNdRgTL2b4yl5Ce1qL+xcQOWxpKxMzwAMVEayIv7IU8XwVnv8+XuEfJV
-        xtfjMlKZ/CYG3JYJ96wOPj6EoCBfMCkfnJdguSMG89eoVBlfS+tJCpCafa1stgBYzAZbzoFGo0ZIiD84
-        KwJ350P+UQxHtfr7vUPkp9j+4GqiM1K3FtyVB8h5wlSI4GB/RIQHgjtzwWaywMb1WHwYg7lKOq3YVrlz
-        jPw8RrWFOUoAJhpwcaNciNDQQMRGB4FNpIMNp4B93A2pXw/7ZbWlufCvFguNdNzzOta7J5S6fP4AdkVq
-        kKQVAQNJYO8TwHq0kD8kwdkWhZkLdMJrrsonlfu2yszmSsA9Bat1p0XdsTTcvxmJtpowyL1ar/m3PKYM
-        2MpVgzcySUWTdWRwd+wAXzoo3r5B7CnqDqVg+lW89yuoVARrR/SaANm0F46mUFjOUjYtN9BTaVQYJzPA
-        RlPB+hNF3XjvP3C9bDuqTm2D9DZuTcCKXN1psJ2ndhGgnpJGciENGyB9zoJk1kMezFonySw0oIf0KVOs
-        oIO7L3MlYITstVTsrKNHCzXU5aimnvmrZPp5hfrtlWS2X6LBuQoatJWTWQz3C5mEeoS6hNqt5yj7FysJ
-        zJwL4b/EAAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="swUpdateROVals.SuperTooltip" xml:space="preserve">
-    <value>This allows the user to update referenced objects values for multiple working drafts in a batch mode.
-
-Be sure a current backup of the database exists prior performing this function.
-
-It is recommended that this be done during off hours.
-</value>
-  </data>
-  <data name="swRefreshTrans.SuperTooltip" xml:space="preserve">
-    <value>This function will refresh transitions in all procedures selected below, whether they were selected individually or as a group via a procedure set.
-
-Be sure a current backup of the database exists prior to running this function.
-
-If more than one procedure is selected, it is recommended that this be performed during off hours.</value>
-  </data>
-  <data name="labelX11.SuperTooltip" xml:space="preserve">
-    <value>This allows the user to update referenced objects values for multiple working drafts in a batch mode.
-
-Be sure a current backup of the database exists prior performing this function.
-
-It is recommended that this be done during off hours.
-</value>
-  </data>
-  <data name="labelX6.SuperTooltip" xml:space="preserve">
-    <value>This function will refresh transitions in all procedures selected below, whether they were selected individually or as a group via a procedure set.
-
-Be sure a current backup of the database exists prior to running this function.
-
-If more than one procedure is selected, it is recommended that this be performed during off hours.</value>
-  </data>
-  <data name="warningBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAplJREFUOE+N
-        k11IU2Ecxv9zouK8CULrzo8SU3QKaSYmOJ2uFL8SK4igEIok6qKUwggySTShC41CRiiGdWNfYBcVWiGl
-        FqN0lh+UTaekzuWcuu2c9316nSdKLPEHz817/s/zPv9zOPQ/nlVQEGulF3ILPe+8SIHK8eYR5lusLwHy
-        Oy08RqpXjjfHVCMlsydbGbekg4/r4HmwRbLWUZzyeGNqD5NK1O5lw8L8NQHckgh5SAdXA3UqIxuzZKSj
-        8ssI8Il9wMQeYDoVfD4HrsdhsNdRgTL2b4yl5Ce1qL+xcQOWxpKxMzwAMVEayIv7IU8XwVnv8+XuEfJV
-        xtfjMlKZ/CYG3JYJ96wOPj6EoCBfMCkfnJdguSMG89eoVBlfS+tJCpCafa1stgBYzAZbzoFGo0ZIiD84
-        KwJ350P+UQxHtfr7vUPkp9j+4GqiM1K3FtyVB8h5wlSI4GB/RIQHgjtzwWaywMb1WHwYg7lKOq3YVrlz
-        jPw8RrWFOUoAJhpwcaNciNDQQMRGB4FNpIMNp4B93A2pXw/7ZbWlufCvFguNdNzzOta7J5S6fP4AdkVq
-        kKQVAQNJYO8TwHq0kD8kwdkWhZkLdMJrrsonlfu2yszmSsA9Bat1p0XdsTTcvxmJtpowyL1ar/m3PKYM
-        2MpVgzcySUWTdWRwd+wAXzoo3r5B7CnqDqVg+lW89yuoVARrR/SaANm0F46mUFjOUjYtN9BTaVQYJzPA
-        RlPB+hNF3XjvP3C9bDuqTm2D9DZuTcCKXN1psJ2ndhGgnpJGciENGyB9zoJk1kMezFonySw0oIf0KVOs
-        oIO7L3MlYITstVTsrKNHCzXU5aimnvmrZPp5hfrtlWS2X6LBuQoatJWTWQz3C5mEeoS6hNqt5yj7FysJ
-        zJwL4b/EAAAAAElFTkSuQmCC
 </value>
   </data>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

PROMS/VEPROMS User Interface/frmVEPROMS.cs

@@ -216,6 +216,8 @@ namespace VEPROMS
 			set { _MyDocVersion = value; }
 		}
 
+		
+
 		// C2015-022 setup the child PROMS window
 		public frmVEPROMS(frmVEPROMS myParent, DocVersionInfo myDocVersion)
 		{
@@ -254,6 +256,22 @@ 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()
@@ -475,6 +493,7 @@ 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);
@@ -1603,6 +1622,11 @@ 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);
@@ -2741,7 +2765,7 @@ namespace VEPROMS
 
 		void btnAdministrativeTools_Click(object sender, EventArgs e)
 		{
-			frmBatchRefresh frm = new frmBatchRefresh(MySessionInfo);
+			frmBatchRefresh frm = new frmBatchRefresh(MySessionInfo, this);
 			frm.ProgressBar = bottomProgBar;
 			frm.ShowDialog(this);
 		}

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

@@ -1433,6 +1433,31 @@ 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)
@@ -1536,6 +1561,8 @@ namespace VEPROMS.CSLA.Library
 				// Needs to be overriden to add new validation rules
 			}
 		}
+
+		
 		#endregion
 	} // Class
 	#region Converter

PROMS/VEPROMS.CSLA.Library/Properties/Settings.Designer.cs

@@ -1,36 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace VEPROMS.CSLA.Library.Properties {
-    
-    
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
-        
-        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-        
-        public static Settings Default {
-            get {
-                return defaultInstance;
-            }
-        }
-        
-        [global::System.Configuration.ApplicationScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)]
-        [global::System.Configuration.DefaultSettingValueAttribute("Data Source=plarsen;Initial Catalog=VEPROMS_BRAIDWOOD;Integrated Security=True")]
-        public string VEPROMS_BRAIDWOODConnectionString {
-            get {
-                return ((string)(this["VEPROMS_BRAIDWOODConnectionString"]));
-            }
-        }
-    }
-}

PROMS/VEPROMS.CSLA.Library/Properties/Settings.settings

@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="VEPROMS.CSLA.Library.Properties" GeneratedClassName="Settings">
-  <Profiles />
-  <Settings>
-    <Setting Name="VEPROMS_BRAIDWOODConnectionString" Type="(Connection string)" Scope="Application">
-      <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
-&lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-  &lt;ConnectionString&gt;Data Source=plarsen;Initial Catalog=VEPROMS_BRAIDWOOD;Integrated Security=True&lt;/ConnectionString&gt;
-  &lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
-&lt;/SerializableConnectionString&gt;</DesignTimeValue>
-      <Value Profile="(Default)">Data Source=plarsen;Initial Catalog=VEPROMS_BRAIDWOOD;Integrated Security=True</Value>
-    </Setting>
-  </Settings>
-</SettingsFile>

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

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

PROMS/VEPROMS.CSLA.Library/VEPROMS_BRAIDWOODDataSet.xsc

@@ -1 +0,0 @@
-

PROMS/VEPROMS.CSLA.Library/VEPROMS_BRAIDWOODDataSet.xss

@@ -1 +0,0 @@
-

PROMS/Volian.Controls.Library/DisplaySearch.cs

@@ -346,10 +346,11 @@ namespace Volian.Controls.Library
 								ch = (ROFSTLookup.rochild)cmboTreeROs.SelectedNode.Tag;
 								chld = ch.children;
 								// build a list of ROs to search
-								return _MyRODbID.ToString() + ":" + GetROsToSearch(chld);
-								//return _MyRODbID.ToString() + ":" + ch.roid + "0000," + GetROsToSearch(chld);
-								//if (strRtnStr.EndsWith(","))
-								//	strRtnStr = strRtnStr.Substring(0, strRtnStr.Length - 1);
+								// 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;
 							}
 						}
 					}
@@ -1939,6 +1940,13 @@ 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
@@ -1956,7 +1964,17 @@ namespace Volian.Controls.Library
 					if (roc.children != null && roc.children.Length > 0)
 						rtnstr += GetROsToSearch(roc.children);
 					else
-						rtnstr += ROFSTLookup.FormatRoidKey(roc.roid, false);
+					{
+						// B2022-118: If the ro has child nodes in tree view but they aren't loaded, load them
+						ROFSTLookup.rochild rot = roc;
+						MyROFSTLookup.LoadChildren(ref rot);
+						chld = rot.children;
+
+						if (rot.children != null && rot.children.Length > 0)
+							rtnstr += GetROsToSearch(rot.children);
+						else
+							rtnstr += string.Format("{0},", ROFSTLookup.FormatRoidKey(roc.roid, false));
+					}
 				}
 			}
 

PROMS/Volian.Controls.Library/DisplayTabControl.cs

@@ -669,7 +669,7 @@ namespace Volian.Controls.Library
 			ItemInfo proc = myItemInfo.MyProcedure; // Find procedure Item
 			string key = "Item - " + proc.ItemID.ToString();
 
-			if (_MyDisplayTabItems.ContainsKey(key)) // If procedure page open use it
+			if (_MyDisplayTabItems.ContainsKey(key) && pasteType != ItemInfo.EAddpingPart.Replace) // If procedure page open use it unless replace
 			{
 				DisplayTabItem pg = _MyDisplayTabItems[key];
 				if (pg.MyStepTabPanel.MyStepPanel._LookupEditItems.ContainsKey(myItemInfo.ItemID) &&
@@ -708,6 +708,11 @@ 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,8 +1825,16 @@ namespace Volian.Controls.Library
 			EditItem newFocus = null;
 			EditItem nextEditItem = MyNextEditItem;
 			EditItem prevEditItem = MyPreviousEditItem;
-			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;
+			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; 
+			}
 
 			StepConfig savOrigPasteConfig = MyItemInfo.MyConfig as StepConfig;
 			int TopMostYBefore = TopMostEditItem.Top;

PROMS/Volian.Controls.Library/VEPROMS_BRAIDWOODDataSet.xsc

@@ -1 +0,0 @@
-

PROMS/Volian.Controls.Library/VEPROMS_BRAIDWOODDataSet.xss

@@ -1 +0,0 @@
-

PROMS/Volian.Controls.Library/VEPROMS_BWDDataSet.xsc

@@ -1 +0,0 @@
-

PROMS/Volian.Controls.Library/VEPROMS_BWDDataSet.xss

@@ -1 +0,0 @@
-

PROMS/Volian.Controls.Library/vlnTreeView.cs

@@ -26,6 +26,7 @@ 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);
@@ -220,6 +221,15 @@ 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
 	{
@@ -427,6 +437,12 @@ 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)
 		{
@@ -697,7 +713,7 @@ namespace Volian.Controls.Library
 							{
 								if (!ui.IsAdministrator() && DoSpecificInfo) cm.MenuItems.Add("Procedure Set Specific Information", new EventHandler(mi_Click));
 								// B2020-111 only allow Set Administrator to add new folders inside folders they admininstrate
-								if (ui.IsAdministrator()||ui.IsSetAdministrator(fi.MyParent))
+								if (ui.IsAdministrator() || ui.IsSetAdministrator(fi.MyParent))
 								{
 									cm.MenuItems.Add("Insert Folder Before", new EventHandler(mi_Click));
 									cm.MenuItems.Add("Insert Folder After", new EventHandler(mi_Click));
@@ -1052,7 +1068,7 @@ namespace Volian.Controls.Library
 						ok = true;
 					else if (tn.VEObject is ItemInfo && (ui.IsAdministrator() || ui.IsSetAdministrator((tn.VEObject as ItemInfo).MyProcedure.MyDocVersion) || ui.IsWriter((tn.VEObject as ItemInfo).MyProcedure.MyDocVersion)))
 						ok = true;
-					if(ok)
+					if (ok)
 						Menu_Paste(tn, cm);
 					#endregion
 					//_MyLog.WarnFormat("Context Menu 5 - {0}", GC.GetTotalMemory(true));
@@ -1144,7 +1160,7 @@ namespace Volian.Controls.Library
 					// Add Properties to the menu unless at the very 'top' node or on a grouping (partinfo)
 					// node (RNOs, Steps, Cautions, Notes) or at the step level.
 					// B2020-105 Allow Set Administrators to rename folder's (sets of procedures) to which they have been given access.
-					if ( tn.VEObject is FolderInfo) ok = (ui.IsAdministrator() || ui.IsSetAdministrator(tn.VEObject as FolderInfo));
+					if (tn.VEObject is FolderInfo) ok = (ui.IsAdministrator() || ui.IsSetAdministrator(tn.VEObject as FolderInfo));
 					else ok = (tn.VEObject is DocVersionInfo) ? (ui.IsAdministrator() || ui.IsSetAdministrator(tn.VEObject as DocVersionInfo))
 						: (ui.IsAdministrator() || (tn.VEObject is ItemInfo) && (ui.IsSetAdministrator((tn.VEObject as ItemInfo).MyProcedure.MyDocVersion)
 						|| ui.IsWriter((tn.VEObject as ItemInfo).MyProcedure.MyDocVersion)));
@@ -1256,7 +1272,7 @@ namespace Volian.Controls.Library
 							// F2022-024 added Time Critical Action Summary option
 							foreach (MenuItem itm in cm.MenuItems)
 							{
-								if(itm.Text == "Procedure Specific Information" || itm.Text == "New Section" || itm.Text == "Approve" || itm.Text == "Open" || 
+								if (itm.Text == "Procedure Specific Information" || itm.Text == "New Section" || itm.Text == "Approve" || itm.Text == "Open" ||
 									itm.Text == "Copy" || itm.Text == "Delete" || itm.Text == "Properties..." || itm.Text == "Replace Existing Procedure" ||
 									itm.Text.StartsWith("Showing Change Bars Starting") || itm.Text == "Create Continuous Action Summary" ||
 									itm.Text == "Create Time Critical Action Summary" || itm.Text == "Export Procedure")
@@ -1267,7 +1283,7 @@ namespace Volian.Controls.Library
 						{
 							foreach (MenuItem itm in cm.MenuItems)
 							{
-								if(!itm.Text.StartsWith("Document Checked Out"))
+								if (!itm.Text.StartsWith("Document Checked Out"))
 									itm.Enabled = false;
 							}
 						}
@@ -1425,7 +1441,7 @@ namespace Volian.Controls.Library
 			RevisionConfig rc = ri.MyConfig as RevisionConfig;
 			// bug fix:  B2016-183 - add the child's name (ex Unit 1) to the export file name for Parent/Child procedures.
 			int applIdx = rc.Applicability_Index;
-			string str = (applIdx > 0)?_currentPri.MyDocVersion.UnitNames[applIdx-1] +"_":""; // if parent/child get the defined child name to inlcude the export filename
+			string str = (applIdx > 0) ? _currentPri.MyDocVersion.UnitNames[applIdx - 1] + "_" : ""; // if parent/child get the defined child name to inlcude the export filename
 			System.Xml.XmlDocument xd = new System.Xml.XmlDocument();
 			xd.LoadXml(ri.LatestVersion.ApprovedXML);
 			string PEIPath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + @"\VEPROMS\PEI_" + Database.VEPROMS_SqlConnection.Database;
@@ -1473,12 +1489,12 @@ namespace Volian.Controls.Library
 			{
 				MenuItem mip = mi.Parent as MenuItem;
 				//B2021-086 Added the check for the last revision stage is an Approved stage
-				if ((ri.RevisionID < int.Parse(mip.Parent.Tag.ToString())) && ri.LatestVersion.MyStage.IsApproved!=0)
+				if ((ri.RevisionID < int.Parse(mip.Parent.Tag.ToString())) && ri.LatestVersion.MyStage.IsApproved != 0)
 					superceded = true;
 			}
 			vlnTreeViewPdfArgs args = new vlnTreeViewPdfArgs(Volian.Base.Library.TmpFile.CreateFileName(ProcedureInfo.Get(ri.ItemID).PDFNumber), ri.LatestVersion.PDF, superceded ? "Superceded" : "");
 			OnViewPDF(sender, args);
-//			System.Diagnostics.Process pp = System.Diagnostics.Process.Start(GetDocPdf(ri, superceded));
+			//			System.Diagnostics.Process pp = System.Diagnostics.Process.Start(GetDocPdf(ri, superceded));
 		}
 		void MultiUnitApprovedRevision_Click(object sender, EventArgs e)
 		{
@@ -1825,7 +1841,7 @@ namespace Volian.Controls.Library
 					OnPrintSection(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0, mi.Text, (int)mi.Tag));
 					break;
 				case "Print All Procedures for":
-					OnPrintAllProcedures(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0,mi.Text,(int)mi.Tag));
+					OnPrintAllProcedures(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0, mi.Text, (int)mi.Tag));
 					break;
 				case "Approve":
 					OnApproveProcedure(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0, mi.Text, (int)mi.Tag));
@@ -1837,10 +1853,10 @@ namespace Volian.Controls.Library
 					OnApproveSomeProcedures(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0, mi.Text, (int)mi.Tag));
 					break;
 				case "Create Continuous Action Summary":
-					OnCreateContinuousActionSummary(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null,0,mi.Text,(int)mi.Tag));
+					OnCreateContinuousActionSummary(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0, mi.Text, (int)mi.Tag));
 					break;
 				case "Create Time Critical Action Summary":
-					OnCreateTimeCriticalActionSummary(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null,0,mi.Text,(int)mi.Tag));
+					OnCreateTimeCriticalActionSummary(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0, mi.Text, (int)mi.Tag));
 					break;
 				default:
 					if (mip.Text.StartsWith("Showing Change Bars Starting"))
@@ -2107,11 +2123,11 @@ namespace Volian.Controls.Library
 					UpdateROValues(SelectedNode as VETreeNode);
 					break;
 				case "Create Continuous Action Summary":
-					OnCreateContinuousActionSummary(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null,0));
+					OnCreateContinuousActionSummary(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0));
 					break;
 				// F2022-024 Time Critical Action Summary
 				case "Create Time Critical Action Summary":
-					OnCreateTimeCriticalActionSummary(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null,0));
+					OnCreateTimeCriticalActionSummary(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0));
 					break;
 				// B2017-243 added the following two Cannot Paste items when dealing with enhanced documents
 				// when then user selects these menu items a message box will appear giving more information as to why it cannot be pasted
@@ -2244,7 +2260,7 @@ namespace Volian.Controls.Library
 				swROUpdate.Write(string.Format("Fixed Referenced Object for {1}({4}){0}Old Text: {2}{0}New Text: {3}{0}{0}", Environment.NewLine, (sender as ItemInfo).ShortPath, args.OldValue, args.NewValue, (sender as ItemInfo).ItemID));
 		}
 
-		private ProgressBarItem _ProgressBar=null;
+		private ProgressBarItem _ProgressBar = null;
 		public ProgressBarItem ProgressBar
 		{
 			get { return _ProgressBar; }
@@ -2422,7 +2438,7 @@ namespace Volian.Controls.Library
 
 					// assume that item to paste is a procedure, otherwise the menuing would not have
 					// included the paste options
-					tn = (VETreeNode) tn.Nodes[tn.Nodes.Count - 1];
+					tn = (VETreeNode)tn.Nodes[tn.Nodes.Count - 1];
 					p = "After";
 				}
 				else  // this is an empty docversion:
@@ -2543,8 +2559,8 @@ namespace Volian.Controls.Library
 		}
 		private void PasteReplace(VETreeNode tn, int copyStartID, TreeNode treeNodeReplace)
 		{
-			VETreeNode prevtn = (VETreeNode) tn.PrevNode;
-			VETreeNode partn = (VETreeNode) tn.Parent;
+			VETreeNode prevtn = (VETreeNode)tn.PrevNode;
+			VETreeNode partn = (VETreeNode)tn.Parent;
 			ItemInfo ii = tn.VEObject as ItemInfo;
 			// F2021-009 display a message if pasting step will results in more sub-step levels than are defined in the format
 			ItemInfo.PasteStepIsWithinDefinedSubStepLevels(copyStartID, ii, true);
@@ -2594,7 +2610,7 @@ namespace Volian.Controls.Library
 		private void SetupNodeProperties()
 		{
 			VETreeNode tn = SelectedNode as VETreeNode;
-			if (tn==null)return;
+			if (tn == null) return;
 
 			if ((tn.VEObject as FolderInfo) != null)
 				OpenProperties(tn.VEObject as FolderInfo);
@@ -2606,7 +2622,7 @@ namespace Volian.Controls.Library
 				if (dvi != null && dvi.DocVersionAssociations != null && dvi.DocVersionAssociations.Count > 0) rofstid = dvi.DocVersionAssociations[0].MyROFst.ROFstID;
 				OpenProperties(tn.VEObject as DocVersionInfo);
 				if (dvi != null && dvi.DocVersionAssociations != null && dvi.DocVersionAssociations.Count > 0 && rofstid != dvi.DocVersionAssociations[0].MyROFst.ROFstID)
-					OnTabDisplay(this,new StepPanelTabDisplayEventArgs("DisplayROUpdateROFST"));
+					OnTabDisplay(this, new StepPanelTabDisplayEventArgs("DisplayROUpdateROFST"));
 			}
 			else if ((tn.VEObject as ProcedureInfo) != null)
 				OpenProperties(tn.VEObject as ProcedureInfo);
@@ -2740,7 +2756,7 @@ namespace Volian.Controls.Library
 						}
 						if (f1 != -1) Folder.Delete(f1);
 					}
-					else if (newtype == MenuSelections.FolderAfter||newtype == MenuSelections.FolderBefore)
+					else if (newtype == MenuSelections.FolderAfter || newtype == MenuSelections.FolderBefore)
 					{
 						int f2 = -1;
 						string uniquename = _LastFolderInfo.MyParent.UniqueChildName("New Folder");
@@ -2770,7 +2786,7 @@ namespace Volian.Controls.Library
 			else if (newtype == MenuSelections.Procedure)
 			{
 				int p1 = -1;
-				using (Procedure procedure = Procedure.MakeProcedure(_LastDocVersionInfo, _LastDocVersionInfo.Procedures.Count!=0?_LastDocVersionInfo.Procedures[_LastDocVersionInfo.Procedures.Count-1]:null, null, "New Procedure", 0))
+				using (Procedure procedure = Procedure.MakeProcedure(_LastDocVersionInfo, _LastDocVersionInfo.Procedures.Count != 0 ? _LastDocVersionInfo.Procedures[_LastDocVersionInfo.Procedures.Count - 1] : null, null, "New Procedure", 0))
 				{
 					ShowBrokenRules(procedure.BrokenRulesCollection);
 					SetLastValues(ProcedureInfo.Get(procedure.ItemID));
@@ -2866,7 +2882,7 @@ namespace Volian.Controls.Library
 									"If you would like to view or copy these hidden steps you will need to go\n" +
 									"into the properties of this section and check the Editable Data checkbox.\n" +
 									"You will then be able to view and copy those steps.  When finished, open\n" +
-									"the properties page again and uncheck the Editable Data checkbox.\n\n"+
+									"the properties page again and uncheck the Editable Data checkbox.\n\n" +
 									"Do you want to continue creating the subsection?";
 								if (FlexibleMessageBox.Show(this, msgstr, "Subsection Insert", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
 								{
@@ -2878,7 +2894,7 @@ namespace Volian.Controls.Library
 							if (!hasMetaSubs) doPseudo = true;
 						}
 					}
-					using(Section section = CreateNewSection())
+					using (Section section = CreateNewSection())
 					{
 						ShowBrokenRules(section.BrokenRulesCollection);
 						SectionInfo savLastSectionInfo = _LastSectionInfo;
@@ -2902,7 +2918,7 @@ namespace Volian.Controls.Library
 								// may have to add a 'steps' node if a step(s) already exist...
 								ItemInfo ii = (SelectedNode as VETreeNode).VEObject as ItemInfo;
 								int cpindx = 0;
-								if (SelectedNode.Nodes.Count>0)
+								if (SelectedNode.Nodes.Count > 0)
 								{
 									VETreeNode vtn = SelectedNode.Nodes[0] as VETreeNode;
 									// B2017-014: removed code that was adding a 2nd section part node. and also select node to
@@ -2946,8 +2962,8 @@ namespace Volian.Controls.Library
 					if (OnNodeOpenProperty(this, new vlnTreePropertyEventArgs("New Section", section.SectionConfig)) == DialogResult.OK)
 					{
 						int indx = tvindex + ((newtype == MenuSelections.SectionBefore) ? 0 : 1);
-						int itemido = (indx >= par.Nodes.Count)?-1:(((par.Nodes[indx] as VETreeNode).VEObject) as ItemInfo).ItemID;
-						if (indx >= par.Nodes.Count || (par.Nodes[indx] as VETreeNode).VEObject.ToString() != _LastSectionInfo.ToString() || itemido !=section.ItemID)
+						int itemido = (indx >= par.Nodes.Count) ? -1 : (((par.Nodes[indx] as VETreeNode).VEObject) as ItemInfo).ItemID;
+						if (indx >= par.Nodes.Count || (par.Nodes[indx] as VETreeNode).VEObject.ToString() != _LastSectionInfo.ToString() || itemido != section.ItemID)
 						{
 							tn = new VETreeNode(_LastSectionInfo);
 							par.Nodes.Insert(indx, tn);
@@ -3229,7 +3245,7 @@ namespace Volian.Controls.Library
 
 			// see if enhanced related steps need created:
 			SectionConfig scfgE = _LastItemInfo.ActiveSection.MyConfig as SectionConfig; // C2018-003 fixed use of getting the active section
-			if (scfgE != null && scfgE.Section_LnkEnh=="Y")
+			if (scfgE != null && scfgE.Section_LnkEnh == "Y")
 			{
 				// set up which item to insert from based on whether editor was open (see comment from 11/17 above).
 				EnhancedDocuments enhdocs = null;
@@ -3512,7 +3528,7 @@ namespace Volian.Controls.Library
 						// just clear enhanced links back
 						_LastSectionInfo.ClearEnhancedSectionLink();
 					}
-					OnSectionShouldClose(this, new vlnTreeSectionInfoEventArgs(_LastSectionInfo,true));
+					OnSectionShouldClose(this, new vlnTreeSectionInfoEventArgs(_LastSectionInfo, true));
 					// always return false because an event gets fired to delete tree nodes.
 					if (!DeleteItemInfoAndChildren(_LastSectionInfo))
 					{
@@ -3567,6 +3583,41 @@ 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;