C2025-022-Remove-UCF-2

good for testing phase

PROMS/Formats/Formats.csproj

@@ -180,6 +180,7 @@
     <Content Include="fmtall\CPL_03all.xml" />
     <Content Include="fmtall\CPSAMGDataall.xml" />
     <Content Include="fmtall\CPSAMGDEVall.xml" />
+    <Content Include="fmtall\EPTSTBCK1all.xml" />
     <Content Include="fmtall\EPTST1all.xml" />
     <Content Include="fmtall\CWEall.xml" />
     <Content Include="fmtall\CWEDEVall.xml" />

PROMS/ReferencedObjects/LibSource/RODBInterface/VlnXml.cs

@@ -735,23 +735,27 @@ namespace RODBInterface
 				else
 					parentValue = nd.InnerText;
 
-				//applicValues = "";
-				applicValues = string.Format("<APL DefaultVal={0}", parentValue);
-				int pcChildIdx = 0;
-				//C2022-001 only save the child ro value in the RO.FST if it is different than the parent (default) value
-				foreach (string c in pcChildern)
+				if (parentName != "#whitespace")
 				{
-					//string csufx = CvtUserFldToFld(c);
-					pcChildIdx++;
-					string csufx = string.Format("_PCCHILD{0}", pcChildIdx);
-					//applicValues += ",";
-					XmlNode cn = elmnode.SelectSingleNode(parentName + csufx);
-					if (cn == null || cn.InnerText.Length == 0) // B2024-004 use Parent value if Child text length is zero
-						applicValues += string.Format(",UnitIdx={0} Value={1}", pcChildIdx, parentValue); // use parent value as default
-					else
+					//applicValues = "";
+					applicValues = string.Format("<APL DefaultVal={0}", parentValue);
+					int pcChildIdx = 0;
+					//C2022-001 only save the child ro value in the RO.FST if it is different than the parent (default) value
+
+					foreach (string c in pcChildern)
 					{
-						if (parentValue != cn.InnerText)
-							applicValues += string.Format(",UnitIdx={0} Value={1}", pcChildIdx, cn.InnerText);
+						//string csufx = CvtUserFldToFld(c);
+						pcChildIdx++;
+						string csufx = string.Format("_PCCHILD{0}", pcChildIdx);
+						//applicValues += ",";
+						XmlNode cn = elmnode.SelectSingleNode(parentName + csufx);
+						if (cn == null || cn.InnerText.Length == 0) // B2024-004 use Parent value if Child text length is zero
+							applicValues += string.Format(",UnitIdx={0} Value={1}", pcChildIdx, parentValue); // use parent value as default
+						else
+						{
+							if (parentValue != cn.InnerText)
+								applicValues += string.Format(",UnitIdx={0} Value={1}", pcChildIdx, cn.InnerText);
+						}
 					}
 				}
 				applicValues += " /APL>";

PROMS/VEPROMS User Interface/App.config

@@ -199,4 +199,4 @@
       </providers>
     </roleManager>
   </system.web>
-</configuration>
+</configuration>

PROMS/VEPROMS User Interface/DlgAnnotationsSelect.cs

@@ -0,0 +1,203 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using VEPROMS.CSLA.Library;
+
+namespace VEPROMS
+{
+    // C2025-027 Annotation Type Filtering
+    public partial class dlgAnnotationsSelect : Form
+    {
+        public dlgAnnotationsSelect()
+        {
+            InitializeComponent();
+        }
+
+        public dlgAnnotationsSelect(string userid)
+        {
+            InitializeComponent();
+            UserID = userid;
+        }
+
+        private int _MyItemID;
+        public int MyItemID
+        {
+            get { return _MyItemID; }
+            set { _MyItemID = value; }
+        }
+
+        private string _UserID;
+        public string UserID
+        {
+            get { return _UserID; }
+            set { _UserID = value; }
+        }
+
+        private void btnSelect_Click(object sender, EventArgs e)
+        {
+            MoveSelectedItems(lstUnselected, lstSelected);
+        }
+
+        // Move selected items to lstUnselected.
+        private void btnDeselect_Click(object sender, EventArgs e)
+        {
+            MoveSelectedItems(lstSelected, lstUnselected);
+        }
+
+        // Move selected items from one ListBox to another.
+        private void MoveSelectedItems(ListBox lstFrom, ListBox lstTo)
+        {
+            while (lstFrom.SelectedItems.Count > 0)
+            {
+                lstSelected.DisplayMember = "NameStr";
+                lstSelected.ValueMember = "TypeID";
+
+                AnnotataionItem item = (AnnotataionItem)lstFrom.SelectedItems[0];
+                lstTo.Items.Add(new AnnotataionItem(item.NameStr, item.TypeID));
+                lstFrom.Items.Remove(item);
+            }
+            SetButtonsEditable();
+            btnUpdate.Enabled = true;
+        }
+
+        // Move all items to lstSelected.
+        private void btnSelectAll_Click(object sender, EventArgs e)
+        {
+            MoveAllItems(lstUnselected, lstSelected);
+            btnUpdate.Enabled = true;
+        }
+
+        // Move all items to lstUnselected.
+        private void btnDeselectAll_Click(object sender, EventArgs e)
+        {
+            MoveAllItems(lstSelected, lstUnselected);
+            btnUpdate.Enabled = true;
+        }
+
+        // Move all items from one ListBox to another.
+        private void MoveAllItems(ListBox lstFrom, ListBox lstTo)
+        {
+            lstTo.Items.AddRange(lstFrom.Items);
+            lstFrom.Items.Clear();
+            SetButtonsEditable();
+            btnUpdate.Enabled = true;
+        }
+
+        // Enable and disable buttons.
+        private void lst_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            SetButtonsEditable();
+        }
+        // Save selected list to DB.
+        private void btnUpdate_Click(object sender, EventArgs e)
+        {
+            saveChanges();
+        }
+        public class AnnotataionItem
+        {
+            private string _NameStr;
+            private int _TypeID;
+
+            public AnnotataionItem(string NameStr, int TypeID)
+            {
+                this._NameStr = NameStr;
+                this._TypeID = TypeID;
+            }
+            public string NameStr
+            {
+                get
+                {
+                    return _NameStr;
+                }
+            }
+            public int TypeID
+            {
+                get
+                {
+                    return _TypeID;
+                }
+            }
+        }
+
+        // Enable and disable buttons.
+        private void SetButtonsEditable()
+        {
+            btnSelect.Enabled = (lstUnselected.SelectedItems.Count > 0);
+            btnSelectAll.Enabled = (lstUnselected.Items.Count > 0);
+            btnDeselect.Enabled = (lstSelected.SelectedItems.Count > 0);
+            btnDeselectAll.Enabled = (lstSelected.Items.Count > 0);
+        }
+
+        private void DlgAnnotationsSelect_Load(object sender, EventArgs e)
+        {
+            lstUnselected.DisplayMember = "NameStr";
+            lstUnselected.ValueMember = "TypeID";
+            SetButtonsEditable();
+            DataTable AnnoType = AnnotationstypeSelections.GetAnnoTypes(UserID);
+            foreach (DataRow dr in AnnoType.Rows)
+            {
+                lstUnselected.Items.Add(new AnnotataionItem(dr["Name"].ToString(), (int)dr["TypeID"]));
+            }
+
+            lstSelected.DisplayMember = "NameStr";
+            lstSelected.ValueMember = "TypeID";
+            DataTable lstSelectedTbl = VEPROMS.CSLA.Library.AnnotationstypeSelections.Retrieve(UserID);
+
+            foreach (DataRow lstSelectedRow in lstSelectedTbl.Rows)
+            {
+                lstSelected.Items.Add(new AnnotataionItem(lstSelectedRow["Name"].ToString(), (int)lstSelectedRow["TypeID"]));
+            }
+            btnUpdate.Enabled = false;
+        }
+
+        private void btnCancel_Click_1(object sender, EventArgs e)
+        {
+            if (btnUpdate.Enabled == true)
+            {
+                string message = "Changes have not yet been saved.  Do you want to save the changes prior to closing?";
+                string title = "Save Annotation Selections";
+                MessageBoxButtons buttons = MessageBoxButtons.YesNo;
+                DialogResult result = MessageBox.Show(message, title, buttons);
+                if (result == DialogResult.Yes)
+                {
+                    saveChanges();
+                    this.Close();
+                }
+                else
+                {
+                    this.Close();
+                }
+            }
+            else
+            {
+                this.Close();
+            }
+        }
+
+        private DataTable coverToTable()
+        {
+            DataTable dt = new DataTable();
+            dt.Columns.Add("TypeID", typeof(Int32));
+
+
+            foreach (AnnotataionItem item in lstSelected.Items.OfType<AnnotataionItem>())
+            {
+                dt.Rows.Add(item.TypeID);
+            }
+            return dt;
+        }
+        private void saveChanges()
+        {
+            DataTable dt2 = coverToTable();
+            VEPROMS.CSLA.Library.AnnotationstypeSelections.Update(dt2, UserID);
+            btnUpdate.Enabled = false;
+        }
+    }
+}
+

PROMS/VEPROMS User Interface/DlgAnnotationsSelect.resx

@@ -112,9 +112,9 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>

PROMS/VEPROMS User Interface/DlgPrintProcedure.cs

@@ -66,6 +66,12 @@ namespace VEPROMS
 			set { _prtSectID = value; }
 		}
 
+		private bool _OverwritePDF;
+		public bool OverwritePDF
+		{
+			get { return cbxOverwritePDF2.Checked; }
+			set { cbxOverwritePDF2.Checked = value; }
+		}
 
 		// C2018-033 Used to turn off using the date/time PDF file prefix and suffix when doing batch file autmatic baseline print testing (frmVEPROMS.cs RunAutomatic())
 		//           This is needed so the the automatic baselines can compare results from different runs of PROMS

PROMS/VEPROMS User Interface/PROMSFixes.Sql

@@ -1,5 +1,3 @@
-
-
 Set NoCount On;
 
 If (db_name() in('master','model','msdn','tempdb'))
@@ -13637,8 +13635,8 @@ WITH EXECUTE AS OWNER
 AS
 BEGIN TRY -- Try Block
 	BEGIN TRANSACTION
-	Update Contents set Text = Replace(Replace(Replace(Replace(Replace(Replace(Replace(Text,'\emdash','\u8209?'),'\endash','\u8209?'),'\u8213?','\u8209?'),'\u8212?','\u8209?'),'\u8211?','\u8209?'),'\u8210?','\u8209?'),'\u8208?','\u8209?')
-	where Text Like '%\u8208?%' or Text Like '%\u8210?%' or Text Like '%\u8211?%' or Text Like '%\u8212?%' or Text Like '%\u8213?%' or Text Like '%\endash%' or Text Like '%\emdash%'
+    Update Contents set Text = Replace(Replace(Replace(Replace(Replace(Replace(Replace(Replace(Text,'\emdash','\u8209?'),'\endash','\u8209?'),'\u8213?','\u8209?'),'\u8212?','\u8209?'),'\u8211?','\u8209?'),'\u8210?','\u8209?'),'\u8208?','\u8209?'),NCHAR(8209),'\u8209?')
+    where Text Like '%\u8208?%' or Text Like '%\u8210?%' or Text Like '%\u8211?%' or Text Like '%\u8212?%' or Text Like '%\u8213?%' or Text Like '%\endash%' or Text Like '%\emdash%'or Text Like '%' + NCHAR(8209) + '%'	IF( @@TRANCOUNT > 0 ) COMMIT
 	IF( @@TRANCOUNT > 0 ) COMMIT
 END TRY
 BEGIN CATCH -- Catch Block
@@ -14767,40 +14765,11 @@ IF (@@Error = 0) PRINT 'StoredProcedure [getJustFormat] Succeeded'
 ELSE PRINT 'StoredProcedure [getJustFormat] Error on Creation'
 go
 
-
+-- Remove getFormatNoUCF from DB (UCF) no longer used.
 IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[getFormatNoUCF]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
 	DROP PROCEDURE [getFormatNoUCF];
 GO
-CREATE PROCEDURE [dbo].[getFormatNoUCF]
-(
-	@FormatID int
-)
-WITH EXECUTE AS OWNER
-AS
-	SELECT
-		[FormatID],
-		[ParentID],
-		[Name],
-		[Description],
-		[Data],
-		[Config],
-		[GenMac],
-		[DTS],
-		[UserID],
-		[LastChanged],
-		(SELECT COUNT(*) FROM [Contents] WHERE [Contents].[FormatID]=[Formats].[FormatID]) [ContentCount],
-		(SELECT COUNT(*) FROM [DocVersions] WHERE [DocVersions].[FormatID]=[Formats].[FormatID]) [DocVersionCount],
-		(SELECT COUNT(*) FROM [Folders] WHERE [Folders].[FormatID]=[Formats].[FormatID]) [FolderCount],
-		(SELECT COUNT(*) FROM [Formats] [Children] WHERE [Children].[ParentID]=[Formats].[FormatID]) [ChildCount]
-	FROM [Formats]
-	WHERE [FormatID]=@FormatID
 
-	RETURN
-GO
--- Display the status of Proc creation
-IF (@@Error = 0) PRINT 'StoredProcedure [getFormatNoUCF] Succeeded'
-ELSE PRINT 'StoredProcedure [getFormatNoUCF] Error on Creation'
-GO
 
 IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[vefn_GetItemsMatchingFormatItems]') AND OBJECTPROPERTY(id,N'IsTableFunction') = 1)
 	DROP FUNCTION [vefn_GetItemsMatchingFormatItems];
@@ -14983,100 +14952,10 @@ IF (@@Error = 0) PRINT 'StoredProcedure [vefn_GetFolderMatchingFormatItems] Succ
 ELSE PRINT 'StoredProcedure [vefn_GetFolderMatchingFormatItems] Error on Creation'
 go
 
+-- Remove vesp_ClearOverrideFormatsByFolder (UCF) from DB.  No longer used.
 IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[vesp_ClearOverrideFormatsByFolder]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
 	DROP PROCEDURE [vesp_ClearOverrideFormatsByFolder];
 GO
-CREATE PROCEDURE [dbo].[vesp_ClearOverrideFormatsByFolder](@FolderID int, @FormatID int, @NewFormatID int)
-WITH EXECUTE AS OWNER
-AS
-BEGIN
-DECLARE @ClearedContents TABLE
-(
-	ContentID int
-)
-DECLARE @ClearedFolders TABLE
-(
-	FolderID int
-)
-DECLARE @ClearedDocVersions TABLE
-(
-	VersionID int
-)
-
-insert into @ClearedContents
-select cc.ContentID from (select contentid from contents where formatid is not null) cc
-join vefn_GetFolderMatchingFormatItems(@FolderID, @FormatID, @NewFormatID) vi on vi.ContentID = cc.ContentID
-
--- update any folders & docversions that are using that formatid to clear them, i.e. so they inherit.  To do this
--- get lists of folders & docversions that have non-null format ids that should be null.
-
-BEGIN
-With Folderz([FolderID], [FormatID]) as
-		(
-			select FF.FolderID, FF.FormatID from Folders FF
-			Where FF.FolderID = @FolderID
-			UNION ALL
-			select FF.FolderID, FF.FormatID from Folders FF
-			Join Folderz ZZ on FF.ParentID = ZZ.FolderID
-			Where FF.FolderID != @FolderID and (FF.FormatID is null or FF.FormatID = @FormatID or FF.FormatID = @NewFormatID)
-		)
-		insert into @ClearedFolders
-		select ZZ.FolderID 
-		from Folderz ZZ
-		where ZZ.FormatID is not null and ZZ.FolderID != @FolderID  -- don't include folder passed in, only do children (folder is done in code)
-		OPTION (MAXRECURSION 10000)
-END
-
-BEGIN
-With Folderz([FolderID]) as
-		(
-			select FF.FolderID from Folders FF
-			Where FF.FolderID = @FolderID
-			UNION ALL
-			select FF.FolderID from Folders FF
-			Join Folderz ZZ on FF.ParentID = ZZ.FolderID
-			Where FF.FolderID != @FolderID and (FF.FormatID is null or FF.FormatID = @FormatID or FF.FormatID = @NewFormatID)
-		)
-		insert into @ClearedDocVersions
-		select DV.VersionID
-			from Folderz ZZ
-			Left Join DocVersions DV ON DV.FolderID = ZZ.FolderID
-			where VersionID is not null and DV.FormatID is not null and (DV.FormatID = @FormatID or DV.FormatID = @NewFormatID)
-		OPTION (MAXRECURSION 10000)
-END
-update Folders set formatid = null where FolderID in (select FolderID from @ClearedFolders)
-update DocVersions set formatid = null where VersionID in (select VersionID from @ClearedDocVersions)
-
--- now update all of the contents that were found
-update contents set formatid = null where contentID in (select contentid from @ClearedContents)
-
-select [ContentID],
-		[Number],
-		[Text],
-		[Type],
-		[FormatID],
-		[Config],
-		[DTS],
-		[UserID],
-		[LastChanged],
-		(SELECT COUNT(*) FROM [Details] WHERE [Details].[ContentID]=[Contents].[ContentID]) [DetailCount],
-		(SELECT COUNT(*) FROM [Entries] WHERE [Entries].[ContentID]=[Contents].[ContentID]) [EntryCount],
-		(SELECT COUNT(*) FROM [Grids] WHERE [Grids].[ContentID]=[Contents].[ContentID]) [GridCount],
-		(SELECT COUNT(*) FROM [Images] WHERE [Images].[ContentID]=[Contents].[ContentID]) [ImageCount],
-		(SELECT COUNT(*) FROM [Items] WHERE [Items].[ContentID]=[Contents].[ContentID]) [ItemCount],
-		(SELECT COUNT(*) FROM [Parts] WHERE [Parts].[ContentID]=[Contents].[ContentID]) [PartCount],
-		(SELECT COUNT(*) FROM [RoUsages] WHERE [RoUsages].[ContentID]=[Contents].[ContentID]) [RoUsageCount],
-		(SELECT COUNT(*) FROM [Transitions] WHERE [Transitions].[FromID]=[Contents].[ContentID]) [TransitionCount],
-		(SELECT COUNT(*) FROM [ZContents] WHERE [ZContents].[ContentID]=[Contents].[ContentID]) [ZContentCount]
-	FROM contents where contentid in (select ContentID from @ClearedContents)
-RETURN
-END
-
-GO
--- Display the status of Proc creation
-IF (@@Error = 0) PRINT 'Procedure Creation: vesp_ClearOverrideFormatsByFolder Succeeded'
-ELSE PRINT 'Procedure Creation: vesp_ClearOverrideFormatsByFolder Error on Creation'
-GO
 
 IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[vesp_ClearOverrideFormatsByDocVersion]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
 	DROP PROCEDURE [vesp_ClearOverrideFormatsByDocVersion];
@@ -17322,7 +17201,7 @@ GO
 			[RofstID] [int] NOT NULL,
 			[roid] [varchar](50) NOT NULL,
 			[value] [varchar](max) NOT NULL,
-			[AccPageID] [varchar](max) NULL,
+			[AccPageID] [varchar](100) NULL,
 		 CONSTRAINT [PK_RofstDefaultValue] PRIMARY KEY CLUSTERED 
 		(
 			[RofstID] ASC,
@@ -18919,9 +18798,10 @@ GO
 			Copyright 2020 - Volian Enterprises, Inc. All rights reserved.
 	*****************************************************************************/
 	/*
-	==========================================================================================================
-		Author:			Jake Ropar
+		==========================================================================================================
+		Author:			Jake Ropar / Matthew Schill
 		Create Date:	06/23/2022
+		Modify Date:    08/18/2025
 		Description:	Finalizes Rofst Header Record / Updates LoadedDate if Success
 	==========================================================================================================
 	*/
@@ -18938,13 +18818,18 @@ GO
 		Set LoadedDate = GetDate()
 		Where RofstID = @RofstID;
 
+
+		--always rebuild the rofst child and default indexes
+		DBCC DBREINDEX ('RofstChild');
+		DBCC DBREINDEX ('RofstDefaultValue');	
+
 		-- Rebuild/Reorganize Indexes
 		Exec [dbo].[vesp_UtilityCheckIndexes] 20.0, 5.0, 0, 1;
 
-	
+
 		Return;
 	End
-	Go
+	GO
 
 	IF (@@Error = 0) PRINT 'Procedure Creation: [vesp_RofstHeaderFinalizeLoad] Succeeded'
 	ELSE PRINT 'Procedure Creation: [vesp_RofstHeaderFinalizeLoad] Error on Creation'
@@ -24026,7 +23911,7 @@ Begin -- Rofst Tables
 	 CONSTRAINT [PK_EPFormats] PRIMARY KEY CLUSTERED 
 	(
 		[FormatID] ASC
-	)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON, OPTIMIZE_FOR_SEQUENTIAL_KEY = OFF) ON [PRIMARY]
+	)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
 	) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
 
 	IF (@@Error = 0) PRINT 'Table Creation: [EPFormats] Succeeded'
@@ -24035,6 +23920,7 @@ Begin -- Rofst Tables
 End
 Go
 
+
 IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[vesp_UpdateEPFormat]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
 	DROP PROCEDURE [vesp_UpdateEPFormat];
 GO
@@ -24075,6 +23961,217 @@ ELSE
 
 GO
 
+-- C2025-027 Annotation Type Filtering
+/****** Object:  Table [dbo].[AnnotationTypeSelections]    Script Date: 7/10/2025 2:38:23 PM ******/
+SET ANSI_NULLS ON
+GO
+
+SET QUOTED_IDENTIFIER ON
+GO
+
+-- =============================================
+-- Author:		Paul Larsen
+-- Create date: 07/10/2025
+-- Description:	Store user Annotation selections for annotation filter.
+-- =============================================
+IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[AnnotationTypeSelections]') AND type in (N'U'))
+BEGIN
+
+	CREATE TABLE [dbo].[AnnotationTypeSelections](
+		[ASTypeID] [int] IDENTITY(1,1) NOT NULL,
+		[TypeID] [int] NULL,
+		[UserID] [varchar](50) NULL,
+		[LastChanged] [datetime] NULL,
+		CONSTRAINT [PK_AnnotationTypeSelections] PRIMARY KEY CLUSTERED 
+		([ASTypeID] ASC)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+			) ON [PRIMARY]
+END
+
+IF OBJECT_ID('DF_AnnotationTypeSelections_LastChanged', 'D') IS NULL
+	ALTER TABLE AnnotationTypeSelections ADD CONSTRAINT [DF_AnnotationTypeSelections_LastChanged]  DEFAULT (getdate()) for [LastChanged];
+GO
+
+IF EXISTS (SELECT *  FROM sys.indexes  WHERE name='idx_AnnotationTypeSelections_UserIDTypeID' 
+AND object_id = OBJECT_ID('[dbo].[AnnotationTypeSelections]'))
+begin
+DROP INDEX [idx_AnnotationTypeSelections_UserIDTypeID] ON [dbo].[AnnotationTypeSelections];
+end
+
+CREATE UNIQUE INDEX [idx_AnnotationTypeSelections_UserIDTypeID] ON [dbo].[AnnotationTypeSelections]
+(
+[UserID] ASC,
+[TypeID] ASC
+)
+INCLUDE (ASTypeID)
+WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+GO
+
+-- C2025-027 Annotation Type Filtering
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[getAnnotationSelectListTypes]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
+	DROP PROCEDURE [getAnnotationSelectListTypes];
+GO
+
+-- =============================================
+-- Author:		Paul Larsen
+-- Create date: 7/10/2025
+-- Description:	Retrieve Annotation Types not added to Annotation type filtering by user.
+-- =============================================
+CREATE PROCEDURE [dbo].[getAnnotationSelectListTypes]
+(
+	@UserID varchar(50)
+)
+WITH EXECUTE AS OWNER
+AS
+	SELECT
+		AT.[TypeID],
+		AT.[Name],
+		AT.[Config],
+		AT.[DTS],
+		AT.[UserID],
+		AT.[LastChanged],
+		(SELECT COUNT(*) FROM [Annotations] WHERE [Annotations].[TypeID]= AT.[TypeID]) [AnnotationCount],
+		AT.[IsEPAnnotationType]
+	FROM [AnnotationTypes] AT
+	LEFT OUTER JOIN AnnotationTypeSelections ATS 
+	ON ATS.TypeID = AT.TypeID AND ATS.UserID = @UserID	    
+	WHERE ATS.ASTypeID IS NULL
+GO
+
+-- C2025-027 Annotation Type Filtering
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[getAnnotationstypeSelections]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
+	DROP PROCEDURE [getAnnotationstypeSelections];
+GO
+
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+-- =============================================
+-- Author:		Paul Larsen
+-- Create date: 07/10/2025
+-- Description:	Retrieve Current Annotation Types 
+-- =============================================
+
+CREATE PROC [dbo].[getAnnotationstypeSelections]
+(
+	@UsrID varchar(50)
+)
+AS
+	BEGIN
+		SELECT [ASTypeID]
+			  ,ATS.[TypeID]
+			  ,ATS.[UserID]
+			  ,AT.[Name]
+			  ,AT.[Config]
+			  ,ATS.[LastChanged]
+			  ,AT.[UserID]
+			  ,AT.[IsEPAnnotationType]
+		FROM [dbo].[AnnotationTypeSelections] ATS
+		INNER JOIN AnnotationTypes AT ON AT.TypeID = ATS.TypeID
+		WHERE ATS.UserID = @UsrID
+	END
+
+GO
+
+-- C2025-027 Annotation Type Filtering
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[getAnnotationstypeFiltered]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
+	DROP PROCEDURE [getAnnotationstypeFiltered];
+GO
+
+-- =============================================
+-- Author:		Paul Larsen
+-- Create date: 07/10/2025
+-- Description:	Retrieve Current Annotation Types 
+-- =============================================
+
+CREATE PROC [dbo].[getAnnotationstypeFiltered]
+(
+	@UsrID varchar(50)
+)
+AS
+BEGIN
+	IF((SELECT count(TypeID) FROM AnnotationTypeSelections WHERE UserID = @UsrID) > 0)
+	BEGIN
+		SELECT [ASTypeID]
+			  ,ATS.[TypeID]
+			  ,ATS.[UserID]
+			  ,AT.[Name]
+			  ,AT.[Config]
+			  ,ATS.[LastChanged]
+			  ,AT.[UserID]
+			  ,AT.[IsEPAnnotationType]
+		FROM [dbo].[AnnotationTypeSelections] ATS
+		INNER JOIN AnnotationTypes AT ON AT.TypeID = ATS.TypeID
+		WHERE ATS.UserID = @UsrID
+	END
+	ELSE
+	BEGIN
+		SELECT
+			[TypeID],
+			[Name],
+			[Config],
+			[DTS],
+			[UserID],
+			[LastChanged],
+			(SELECT COUNT(*) FROM [Annotations] WHERE [Annotations].[TypeID]=[AnnotationTypes].[TypeID]) [AnnotationCount],
+			[IsEPAnnotationType]
+		FROM [AnnotationTypes]
+	END
+END
+
+GO
+
+-- C2025-027 Annotation Type Filtering
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[UpdateAnnotationstypeSelections]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
+	DROP PROCEDURE [UpdateAnnotationstypeSelections];
+
+-- Need to drop UpdateAnnotationstypeSelections SP first so script can drop and recreate the TableValAnnotTypeSelections table type 
+
+IF EXISTS( SELECT * FROM INFORMATION_SCHEMA.DOMAINS WHERE Domain_Name = 'TableValAnnotTypeSelections' )
+    DROP TYPE [dbo].[TableValAnnotTypeSelections]
+
+CREATE TYPE [dbo].[TableValAnnotTypeSelections] AS TABLE(
+	[TypeID] [int] NOT NULL
+							
+)
+GO
+
+/****** Object:  StoredProcedure [dbo].[UpdateAnnotationstypeSelections]    Script Date: 7/21/2025 8:51:42 PM ******/
+
+-- =============================================
+-- Author:		Paul Larsen
+-- Create date: 07/21/2025
+-- Description:	Manage user choice annotation types
+-- =============================================
+CREATE PROC [dbo].[UpdateAnnotationstypeSelections]
+(
+	@TempTable AS dbo.TableValAnnotTypeSelections READONLY,
+	@UserID [varchar](50) NULL
+)
+AS
+BEGIN
+																	 
+															
+
+	DELETE FROM AnnotationTypeSelections where UserID = @UserID
+	AND
+	TypeID not in
+	(Select TypeID From @TempTable tmp)
+
+	--this would insert all the ones that are in the uploaded table and not already in AnnotationTypeSelections
+	Insert INTO AnnotationTypeSelections (TypeID, UserID)
+	Select tmp.TypeID, @UserID
+	FROM
+	@TempTable tmp
+	LEFT OUTER JOIN
+	AnnotationTypeSelections ATS on ATS.TypeID = tmp.TypeID
+	AND ATS.UserID = @UserID
+	where
+	ATS.ASTypeID IS NULL
+
+END
+GO
+
 IF (@@Error = 0) PRINT 'Running vesp_UpdateEPFormat Succeeded'
 ELSE PRINT 'Running vesp_UpdateEPFormat Failed to Execute'
 GO
@@ -24083,6 +24180,56 @@ Go
 ---  end changes for:
 ---C2025-023 - Electronic Procedures - Modifications to PROMS
 
+/*
+==========================================================================================================
+ Begin: C2025-045: Improve Performance loading procedures with Alarms
+==========================================================================================================
+*/
+
+IF Exists(SELECT 1 from information_schema.columns where character_maximum_length=-1 and column_name = 'AccPageID' and table_name = 'RofstDefaultValue')
+Begin
+ALTER TABLE RofstDefaultValue ALTER COLUMN AccPageID varchar(100)
+END
+GO
+
+IF (@@Error = 0) PRINT 'Updating size of RofstDefaultValue.AccPageID Succeeded'
+ELSE PRINT 'Updating size of RofstDefaultValue.AccPageID Failed to Execute'
+GO
+
+EXEC sp_refreshview [dbo.vwRofstData_RofstDefaultValues]
+EXEC sp_refreshview [dbo.vwRofstData_RofstBaseRoids]
+GO
+
+IF (@@Error = 0) PRINT 'Refreshing views: (vwRofstData_RofstDefaultValues,vwRofstData_RofstBaseRoids) Succeeded'
+ELSE PRINT 'Refreshing views: (vwRofstData_RofstDefaultValues,vwRofstData_RofstBaseRoids) Failed to Execute'
+GO
+
+IF NOT EXISTS (SELECT * FROM dbo.sysindexes WHERE name = 'IX_RofstDefaultValue_RofstID_AccPageID')
+BEGIN
+CREATE NONCLUSTERED INDEX [IX_RofstDefaultValue_RofstID_AccPageID] ON [dbo].[RofstDefaultValue]
+(
+    [RofstID] ASC,
+	[AccPageID] ASC
+)
+INCLUDE
+(
+       [roid]
+      ,[value]
+)
+WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+
+END
+GO
+
+IF (@@Error = 0) PRINT 'Adding Index IX_RofstDefaultValue_RofstID_AccPageID Succeeded'
+ELSE PRINT 'Adding Index IX_RofstDefaultValue_RofstID_AccPageID Failed to Execute'
+GO
+
+/*
+==========================================================================================================
+ End: C2025-045: Improve Performance loading procedures with Alarms
+==========================================================================================================
+*/
 
 /*
   ---------------------------------------------------------------------------
@@ -24117,8 +24264,8 @@ BEGIN TRY -- Try Block
 	DECLARE @RevDate varchar(255)
 	DECLARE @RevDescription varchar(255)
 
-	set @RevDate = '6/20/2025 3:07 PM'
-	set @RevDescription = 'Annotation Support'
+	set @RevDate = '08/18/2025 2:07 PM'
+	set @RevDescription = 'Updated Index maintenance that occurs after RO FST Load to improve RO Performance'
 
 	Select  cast(@RevDate as datetime) RevDate, @RevDescription  RevDescription
 	PRINT 'SQL Code Revision ' + @RevDate + ' - ' + @RevDescription

PROMS/VEPROMS User Interface/Properties/Resources.Designer.cs

@@ -250,6 +250,16 @@ namespace VEPROMS.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap toolbox {
+            get {
+                object obj = ResourceManager.GetObject("toolbox", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>

PROMS/VEPROMS User Interface/Properties/Settings.Designer.cs

@@ -410,17 +410,5 @@ namespace VEPROMS.Properties {
                 this["VisioPath"] = value;
             }
         }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("0")]
-        public int UCFImportOpt {
-            get {
-                return ((int)(this["UCFImportOpt"]));
-            }
-            set {
-                this["UCFImportOpt"] = value;
-            }
-        }
     }
 }

PROMS/VEPROMS User Interface/Properties/Settings.settings

@@ -80,11 +80,9 @@
     <Setting Name="UpdateSettings" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
-
     <Setting Name="cbShwRplWrdsColor" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    
     <Setting Name="PasteNoReturns" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
@@ -103,8 +101,5 @@
     <Setting Name="VisioPath" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
-    <Setting Name="UCFImportOpt" Type="System.Int32" Scope="User">
-      <Value Profile="(Default)">0</Value>
-    </Setting>
   </Settings>
 </SettingsFile>

PROMS/VEPROMS User Interface/VEPROMS_UI.csproj

@@ -111,10 +111,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\3rdPartyLibraries\DotNetBar\DotNetBar4.6Build\DevComponents.DotNetBar2.dll</HintPath>
     </Reference>
-    <Reference Include="Ionic.Zip, Version=1.9.1.8, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\3rdPartyLibraries\Ionic\Ionic.Zip.dll</HintPath>
-    </Reference>
     <Reference Include="Itenso.Rtf.Interpreter">
       <HintPath>..\..\..\..\3rdPartyLibraries\RtfConverter\bin\Debug\Itenso.Rtf.Interpreter.dll</HintPath>
     </Reference>
@@ -133,6 +129,8 @@
     <Reference Include="System.Deployment" />
     <Reference Include="System.Design" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.IO.Compression.FileSystem" />
     <Reference Include="System.Runtime.Remoting" />
     <Reference Include="System.Web" />
     <Reference Include="System.Web.Extensions" />
@@ -152,6 +150,17 @@
       <DependentUpon>AboutVEPROMS.cs</DependentUpon>
     </Compile>
     <Compile Include="BookMarks.cs" />
+    <Compile Include="dlgAnnotationsSelect.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="dlgAnnotationsSelect.Designer.cs">
+      <DependentUpon>dlgAnnotationsSelect.cs</DependentUpon>
+    </Compile>
+    <Compile Include="dlgAnnotationsSelect.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>dlgAnnotationsSelect.resx</DependentUpon>
+    </Compile>
     <Compile Include="dlgApproveProcedure.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -164,6 +173,9 @@
     <Compile Include="dlgCheckedOutProcedure.designer.cs">
       <DependentUpon>dlgCheckedOutProcedure.cs</DependentUpon>
     </Compile>
+    <Compile Include="dlgExportImportEP.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="dlgMSWordMessage.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -230,12 +242,6 @@
     <Compile Include="dlgTransitionReport.designer.cs">
       <DependentUpon>dlgTransitionReport.cs</DependentUpon>
     </Compile>
-    <Compile Include="dlgUCFDetail.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="dlgUCFDetail.Designer.cs">
-      <DependentUpon>dlgUCFDetail.cs</DependentUpon>
-    </Compile>
     <Compile Include="frmAnnotationsCleanup.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -254,6 +260,12 @@
     <Compile Include="frmBatchRefreshCheckedOut.designer.cs">
       <DependentUpon>frmBatchRefreshCheckedOut.cs</DependentUpon>
     </Compile>
+    <Compile Include="frmGenTools.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frmGenTools.designer.cs">
+      <DependentUpon>frmGenTools.cs</DependentUpon>
+    </Compile>
     <Compile Include="frmManageUser.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -284,12 +296,6 @@
     <Compile Include="frmSI.Designer.cs">
       <DependentUpon>frmSI.cs</DependentUpon>
     </Compile>
-    <Compile Include="frmUCF.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="frmUCF.designer.cs">
-      <DependentUpon>frmUCF.cs</DependentUpon>
-    </Compile>
     <Compile Include="frmVEPROMS.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -337,6 +343,10 @@
       <SubType>Designer</SubType>
       <DependentUpon>AboutVEPROMS.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="dlgAnnotationsSelect.resx">
+      <DependentUpon>dlgAnnotationsSelect.cs</DependentUpon>
+      <Generator>ResXFileCodeGenerator</Generator>
+    </EmbeddedResource>
     <EmbeddedResource Include="dlgMSWordMessage.resx">
       <DependentUpon>dlgMSWordMessage.cs</DependentUpon>
     </EmbeddedResource>
@@ -356,12 +366,12 @@
     <EmbeddedResource Include="dlgSetChangeBarStartDate.resx">
       <DependentUpon>dlgSetChangeBarStartDate.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="dlgUCFDetail.resx">
-      <DependentUpon>dlgUCFDetail.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="frmAnnotationsCleanup.resx">
       <DependentUpon>frmAnnotationsCleanup.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="frmGenTools.resx">
+      <DependentUpon>frmGenTools.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="frmPDFStatusForm.resx">
       <DependentUpon>frmPDFStatusForm.cs</DependentUpon>
       <SubType>Designer</SubType>
@@ -377,9 +387,6 @@
     <EmbeddedResource Include="frmSI.resx">
       <DependentUpon>frmSI.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="frmUCF.resx">
-      <DependentUpon>frmUCF.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="frmVEPROMS.resx">
       <SubType>Designer</SubType>
       <DependentUpon>frmVEPROMS.cs</DependentUpon>
@@ -487,6 +494,7 @@
     <Content Include="PROMSRollback %28v2.0%29.Sql">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Resources\toolbox.png" />
     <Content Include="ROBuild.Sql">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -577,8 +585,6 @@
     <Content Include="Resources\Save.png" />
     <Content Include="Resources\SaveAllHS.png" />
     <Content Include="Resources\SaveAs.png" />
-    <Content Include="UCFDetails.xsl" />
-    <Content Include="UCFSummary.xsl" />
     <Content Include="VEicon.ico" />
     <Content Include="veproms.ico" />
     <Content Include="Vicon.ico" />

PROMS/VEPROMS User Interface/dlgAnnotationsSelect.Designer.cs

@@ -0,0 +1,229 @@
+
+namespace VEPROMS
+{
+	partial class dlgAnnotationsSelect
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.lstUnselected = new System.Windows.Forms.ListBox();
+			this.lstSelected = new System.Windows.Forms.ListBox();
+			this.btnSelect = new System.Windows.Forms.Button();
+			this.btnSelectAll = new System.Windows.Forms.Button();
+			this.btnDeselectAll = new System.Windows.Forms.Button();
+			this.btnDeselect = new System.Windows.Forms.Button();
+			this.btnUpdate = new System.Windows.Forms.Button();
+			this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
+			this.btnCancel = new System.Windows.Forms.Button();
+			this.lblMessage = new System.Windows.Forms.Label();
+			this.lblAvailableTypes = new System.Windows.Forms.Label();
+			this.lblSelected = new System.Windows.Forms.Label();
+			this.tableLayoutPanel1.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// lstUnselected
+			// 
+			this.lstUnselected.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.lstUnselected.FormattingEnabled = true;
+			this.lstUnselected.IntegralHeight = false;
+			this.lstUnselected.ItemHeight = 16;
+			this.lstUnselected.Location = new System.Drawing.Point(3, 3);
+			this.lstUnselected.Name = "lstUnselected";
+			this.tableLayoutPanel1.SetRowSpan(this.lstUnselected, 4);
+			this.lstUnselected.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended;
+			this.lstUnselected.Size = new System.Drawing.Size(287, 347);
+			this.lstUnselected.TabIndex = 0;
+			this.lstUnselected.SelectedIndexChanged += new System.EventHandler(this.lst_SelectedIndexChanged);
+			// 
+			// lstSelected
+			// 
+			this.lstSelected.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.lstSelected.FormattingEnabled = true;
+			this.lstSelected.IntegralHeight = false;
+			this.lstSelected.ItemHeight = 16;
+			this.lstSelected.Location = new System.Drawing.Point(334, 3);
+			this.lstSelected.Name = "lstSelected";
+			this.tableLayoutPanel1.SetRowSpan(this.lstSelected, 4);
+			this.lstSelected.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended;
+			this.lstSelected.Size = new System.Drawing.Size(288, 347);
+			this.lstSelected.TabIndex = 1;
+			this.lstSelected.SelectedIndexChanged += new System.EventHandler(this.lst_SelectedIndexChanged);
+			// 
+			// btnSelect
+			// 
+			this.btnSelect.Anchor = System.Windows.Forms.AnchorStyles.None;
+			this.btnSelect.Location = new System.Drawing.Point(298, 32);
+			this.btnSelect.Name = "btnSelect";
+			this.btnSelect.Size = new System.Drawing.Size(28, 23);
+			this.btnSelect.TabIndex = 2;
+			this.btnSelect.Text = ">";
+			this.btnSelect.UseVisualStyleBackColor = true;
+			this.btnSelect.Click += new System.EventHandler(this.btnSelect_Click);
+			// 
+			// btnSelectAll
+			// 
+			this.btnSelectAll.Anchor = System.Windows.Forms.AnchorStyles.None;
+			this.btnSelectAll.Location = new System.Drawing.Point(296, 120);
+			this.btnSelectAll.Name = "btnSelectAll";
+			this.btnSelectAll.Size = new System.Drawing.Size(32, 23);
+			this.btnSelectAll.TabIndex = 3;
+			this.btnSelectAll.Text = ">>";
+			this.btnSelectAll.UseVisualStyleBackColor = true;
+			this.btnSelectAll.Click += new System.EventHandler(this.btnSelectAll_Click);
+			// 
+			// btnDeselectAll
+			// 
+			this.btnDeselectAll.Anchor = System.Windows.Forms.AnchorStyles.None;
+			this.btnDeselectAll.Location = new System.Drawing.Point(297, 207);
+			this.btnDeselectAll.Name = "btnDeselectAll";
+			this.btnDeselectAll.Size = new System.Drawing.Size(30, 26);
+			this.btnDeselectAll.TabIndex = 5;
+			this.btnDeselectAll.Text = "<<";
+			this.btnDeselectAll.UseVisualStyleBackColor = true;
+			this.btnDeselectAll.Click += new System.EventHandler(this.btnDeselectAll_Click);
+			// 
+			// btnDeselect
+			// 
+			this.btnDeselect.Anchor = System.Windows.Forms.AnchorStyles.None;
+			this.btnDeselect.Location = new System.Drawing.Point(298, 297);
+			this.btnDeselect.Name = "btnDeselect";
+			this.btnDeselect.Size = new System.Drawing.Size(28, 23);
+			this.btnDeselect.TabIndex = 4;
+			this.btnDeselect.Text = "<";
+			this.btnDeselect.UseVisualStyleBackColor = true;
+			this.btnDeselect.Click += new System.EventHandler(this.btnDeselect_Click);
+			// 
+			// btnUpdate
+			// 
+			this.btnUpdate.Anchor = System.Windows.Forms.AnchorStyles.None;
+			this.btnUpdate.Location = new System.Drawing.Point(536, 422);
+			this.btnUpdate.Name = "btnUpdate";
+			this.btnUpdate.Size = new System.Drawing.Size(100, 35);
+			this.btnUpdate.TabIndex = 8;
+			this.btnUpdate.Text = "Save";
+			this.btnUpdate.UseVisualStyleBackColor = true;
+			this.btnUpdate.Click += new System.EventHandler(this.btnUpdate_Click);
+			// 
+			// tableLayoutPanel1
+			// 
+			this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+			this.tableLayoutPanel1.ColumnCount = 3;
+			this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
+			this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 38F));
+			this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
+			this.tableLayoutPanel1.Controls.Add(this.lstUnselected, 0, 0);
+			this.tableLayoutPanel1.Controls.Add(this.lstSelected, 2, 0);
+			this.tableLayoutPanel1.Controls.Add(this.btnDeselect, 1, 3);
+			this.tableLayoutPanel1.Controls.Add(this.btnDeselectAll, 1, 2);
+			this.tableLayoutPanel1.Controls.Add(this.btnSelect, 1, 0);
+			this.tableLayoutPanel1.Controls.Add(this.btnSelectAll, 1, 1);
+			this.tableLayoutPanel1.Location = new System.Drawing.Point(12, 62);
+			this.tableLayoutPanel1.Name = "tableLayoutPanel1";
+			this.tableLayoutPanel1.RowCount = 4;
+			this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F));
+			this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F));
+			this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F));
+			this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F));
+			this.tableLayoutPanel1.Size = new System.Drawing.Size(625, 353);
+			this.tableLayoutPanel1.TabIndex = 6;
+			// 
+			// btnCancel
+			// 
+			this.btnCancel.Location = new System.Drawing.Point(411, 422);
+			this.btnCancel.Name = "btnCancel";
+			this.btnCancel.Size = new System.Drawing.Size(100, 35);
+			this.btnCancel.TabIndex = 9;
+			this.btnCancel.Text = "Close";
+			this.btnCancel.UseVisualStyleBackColor = true;
+			this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click_1);
+			// 
+			// lblMessage
+			// 
+			this.lblMessage.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.lblMessage.Location = new System.Drawing.Point(43, 12);
+			this.lblMessage.Name = "lblMessage";
+			this.lblMessage.Size = new System.Drawing.Size(317, 16);
+			this.lblMessage.TabIndex = 10;
+			this.lblMessage.Text = "Updates will appear when PROMS is restarted.";
+			// 
+			// lblAvailableTypes
+			// 
+			this.lblAvailableTypes.AutoSize = true;
+			this.lblAvailableTypes.Location = new System.Drawing.Point(12, 43);
+			this.lblAvailableTypes.Name = "lblAvailableTypes";
+			this.lblAvailableTypes.Size = new System.Drawing.Size(110, 16);
+			this.lblAvailableTypes.TabIndex = 11;
+			this.lblAvailableTypes.Text = "Types Available ";
+			// 
+			// lblSelected
+			// 
+			this.lblSelected.AutoSize = true;
+			this.lblSelected.Location = new System.Drawing.Point(343, 43);
+			this.lblSelected.Name = "lblSelected";
+			this.lblSelected.Size = new System.Drawing.Size(104, 16);
+			this.lblSelected.TabIndex = 12;
+			this.lblSelected.Text = "Types Selected";
+			// 
+			// dlgAnnotationsSelect
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.ClientSize = new System.Drawing.Size(653, 466);
+			this.Controls.Add(this.lblSelected);
+			this.Controls.Add(this.lblAvailableTypes);
+			this.Controls.Add(this.btnCancel);
+			this.Controls.Add(this.tableLayoutPanel1);
+			this.Controls.Add(this.btnUpdate);
+			this.Controls.Add(this.lblMessage);
+			this.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.Name = "dlgAnnotationsSelect";
+			this.Text = "Filter Annotation Types";
+			this.Load += new System.EventHandler(this.DlgAnnotationsSelect_Load);
+			this.tableLayoutPanel1.ResumeLayout(false);
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+		private System.Windows.Forms.ListBox lstUnselected;
+		private System.Windows.Forms.ListBox lstSelected;
+		private System.Windows.Forms.Button btnSelect;
+		private System.Windows.Forms.Button btnSelectAll;
+		private System.Windows.Forms.Button btnDeselectAll;
+		private System.Windows.Forms.Button btnDeselect;
+		private System.Windows.Forms.Button btnUpdate;
+
+		private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
+		private System.Windows.Forms.Button btnCancel;
+		private System.Windows.Forms.Label lblMessage;
+		private System.Windows.Forms.Label lblAvailableTypes;
+		private System.Windows.Forms.Label lblSelected;
+	}
+}

PROMS/VEPROMS User Interface/dlgApproveProcedure.cs

@@ -1309,7 +1309,7 @@ namespace VEPROMS
 				pi.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
 				if (si.IsApproved == 1)
 				{
-					dlgExportImport dlg = new dlgExportImport("Export", pi, MyFrmVEPROMS, (E_UCFImportOptions)0); // "true tell export to convert ROs and Transitions to text
+					dlgExportImport dlg = new dlgExportImport("Export", pi, MyFrmVEPROMS, (selectedSlave)); // "true tell export to convert ROs and Transitions to text
 					dlg.DocReplace = frm.DocReplace;  // this tells approval to prepare an export file with resolved transitions and ROs, word sections are saved with resolved ROs during approval PDF creation and saved in DocReplace
 					System.Xml.XmlDocument xd = new System.Xml.XmlDocument();
 					dlg.ExportItem(xd, pi, "procedure");

PROMS/VEPROMS User Interface/dlgExportImportEP.cs

@@ -0,0 +1,347 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Xml;
+using VEPROMS.CSLA.Library;
+
+namespace VEPROMS
+{
+    //C2025-024 Electronic Procedures - Phase 2 (PROMS XML output)
+    //class inherits from normal import/export form
+    //then adds additional functionality
+#pragma warning disable S101 // Types should be named in PascalCase
+    public partial class dlgExportImportEP : dlgExportImport
+#pragma warning restore S101 // Types should be named in PascalCase
+	{
+		private readonly AnnotationTypeInfo _AnnotationType;
+        private readonly string multiseparator = ",";
+
+		private static Regex _ROAccPageTokenPattern = new Regex("[<][^<>-]+-[^<>]+[>]");
+
+        public dlgExportImportEP(string mode, FolderInfo folderInfo, frmVEPROMS myFrmVEPROMS, int annotationTypeId, int unitIndex = 0) : base(mode, folderInfo, myFrmVEPROMS, ( unitIndex))
+        {
+            _AnnotationType = AnnotationTypeInfo.Get(annotationTypeId);
+            _ExportBothConvertedandNot = true;
+            DocReplace = new Dictionary<int, byte[]>();
+            FormClosed += OnClose;
+            Text = $"{mode} Electronic Procedure ({_AnnotationType.Name}) Dialog for {folderInfo.Name}";
+		}
+        public dlgExportImportEP(string mode, DocVersionInfo docVersionInfo, frmVEPROMS myFrmVEPROMS, int annotationTypeId, int unitIndex = 0) : base(mode, docVersionInfo, myFrmVEPROMS, (unitIndex))
+        {
+            _AnnotationType = AnnotationTypeInfo.Get(annotationTypeId);
+            _ExportBothConvertedandNot = true;
+            DocReplace = new Dictionary<int, byte[]>();
+            FormClosed += OnClose;
+            Text = $"{mode} Electronic Procedure ({_AnnotationType.Name}) Dialog for {docVersionInfo.Name} of {docVersionInfo.MyFolder.Name}";
+		}
+        public dlgExportImportEP(string mode, ProcedureInfo procedureInfo, frmVEPROMS myFrmVEPROMS, int annotationTypeId, int unitIndex = 0) : base(mode, procedureInfo, myFrmVEPROMS, (unitIndex))
+		{
+			_AnnotationType = AnnotationTypeInfo.Get(annotationTypeId);
+			_ExportBothConvertedandNot = true;
+			DocReplace = new Dictionary<int, byte[]>();
+			FormClosed += OnClose;
+			Text = $"{mode} Electronic Procedure ({_AnnotationType.Name}) Dialog for {procedureInfo.DisplayNumber}";
+		}
+
+		//Overridden function to handle export of EP data
+		protected override void ExportEPAnnotationInfo(XmlElement xe, ItemInfo ii)
+		{
+			if (_UnitIndex > 0)
+            {
+				ii.MyDocVersion.DocVersionConfig.SelectedSlave = _UnitIndex;
+				ii.MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave = _UnitIndex;
+            }
+
+            //switch to handle customizations for different formats
+            switch (ii.ActiveFormat.PlantFormat.EPFormatFiles.Find(x => x.AnnotationTypeID == _AnnotationType.TypeID)?.Name)
+			{
+				default:
+					ExportEPAnnotationInfo_Default(xe, ii);
+					break;
+			}
+
+			ii.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
+			ii.MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
+
+		}
+
+		//default export of EP Data
+		private void ExportEPAnnotationInfo_Default(XmlElement xe, ItemInfo ii)
+		{
+			//Add tab text to item
+			string steptab = Volian.Print.Library.PDFReport.BuildStepTab(ii);
+			xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "StepTab", steptab));
+
+			//Add db sequence to item
+			string dbsequence = dbSeq(ii);
+			xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "dbsequence", dbsequence));
+
+			//get first transition in item and add it as an xml element
+			if (ii.MyContent.ContentTransitionCount > 0)
+			{
+				TransitionInfo ct = ii.MyContent.ContentTransitions[0];
+				xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "TransitionToItemID", ct.ToID.ToString()));
+				xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "TransitionTodbsequence", dbSeq(ct.ToID)));
+			}
+
+			//export EP annotation details under an EPInfo node
+			if (ii.ItemAnnotations != null)
+			{
+				XmlElement xepinfo = xe.OwnerDocument.CreateElement("EPInfo");
+
+				EPFields myEPFields = ii.GetValidEPFields(_AnnotationType.TypeID);
+				ROFSTLookup lookup = ii.MyDocVersion.DocVersionAssociations[0].MyROFst.GetROFSTLookup(ii.MyDocVersion);
+				bool epexportblank = ii.EPexportblank(_AnnotationType.TypeID); //should blank xml elements export?
+
+				//grab the current RO db so will know location of RO files and default graphics ext.
+                using (RODbInfo myRODB = (RODbInfoList.Get()).FirstOrDefault(x => x.RODbID == ii.MyDocVersion.DocVersionAssociations[0].MyROFst.RODbID))
+                {
+					//For each annotation in the item that is of the current EP Annotation type
+					foreach (var EPAnnotation in ii.ItemAnnotations.Where(x => x.TypeID == _AnnotationType.TypeID))
+					{
+						var EPAnnotationConfig = new AnnotationConfig(EPAnnotation.Config);
+
+						XmlElement xepdetails = xe.OwnerDocument.CreateElement("Details");
+						//include the annotation ID for reference
+						xepdetails.Attributes.SetNamedItem(AddAttribute(xepdetails.OwnerDocument, "AnnotationID", EPAnnotation.AnnotationID.ToString()));
+
+						//loop through each EP Field - name the xml elements the EP.name
+						foreach (EPField EP in myEPFields)
+						{
+							string val = EPAnnotationConfig.GetValue("EP", EP.name);
+
+							if (epexportblank || !string.IsNullOrEmpty(val))
+							{
+
+								if (_UnitIndex != 0)
+								{
+									val = DisplayText.ResolveUnitSpecific(ii.MyDocVersion, val);
+								}
+
+								XmlElement xindivid = xe.OwnerDocument.CreateElement(EP.name);
+
+								//need to resolve ROs ROSingle, ROMulti, in text
+								//get values
+								switch (EP.type.ToLower())
+								{
+									case "text":
+
+										//for text, check if any embedded ROs
+										//if none, set the xml element to the text
+										//otherwise resolve the ROs
+										MatchCollection matches = _ROAccPageTokenPattern.Matches(val);
+										if (matches.Count == 0)
+										{
+											xindivid.InnerText = val;
+										}
+										else
+										{
+											//resolve ROs
+											//text ROs will replace the AccID key in the text
+											//for binary objects like images,
+											//we will keep the AccID in the text and output the binary as a separate child
+											//XML element with the same xml name as the AccID
+											foreach (Match m in matches)
+											{
+												ROFSTLookup.rochild roc = lookup.GetROChildByAccPageID(m.Groups[0].Value);
+
+												// Exclude replacing Images since are binary - for those, add a sub item
+												if (Enumerable.Range(8, 15).Contains(roc.type))
+												{
+													xindivid.InnerText = val;
+
+													XmlElement xroid = AddGraphic(xindivid, m.Groups[0].Value, roc, myRODB, roc.type != 8);
+
+													xindivid.AppendChild(xroid);
+												}
+												else if (!string.IsNullOrEmpty(roc.value))
+												{
+													bool convertCaretToDeltaSymbol = (ii.ActiveSection != null) && ii.ActiveSection.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta;
+
+													string rocvalue = roc.value.Replace("`", "\xB0");
+													rocvalue = rocvalue.Replace("\xF8", "\xB0");
+													rocvalue = rocvalue.Replace("\x7F", "\x394"); //delta
+													if (convertCaretToDeltaSymbol) rocvalue = rocvalue.Replace("^", "\x394"); // delta
+													val = val.Replace($"{m.Groups[0].Value}", rocvalue);
+													xindivid.InnerText = val;
+												}
+											}
+										}
+										break;
+									case "rosingle":
+										//Get the output columns from the EPFormatFile
+										//set the "Item" nodes value = to those resolved items
+										//separated by multiseparator
+										XmlElement xindivid_rosingle = xindivid.OwnerDocument.CreateElement("Item");
+										xindivid_rosingle.Attributes.SetNamedItem(AddAttribute(xindivid_rosingle.OwnerDocument, "ROID", val));
+
+										//add values specified in EP input list
+										List<string> ro_single_tmp = EP.getROValuesList(EPAnnotation, val);
+										xindivid_rosingle.InnerText = String.Join(multiseparator, ro_single_tmp.ToArray());
+
+										//if image, add location and binary of image
+										// - images are type 8
+										//   but if multiple return values could combine
+										//   for example an text (1) + image (8) would be 9
+										ROFSTLookup.rochild roc_single = lookup.GetRoChild(val);
+										if (Enumerable.Range(8, 15).Contains(roc_single.type))
+										{
+											XmlElement xroid = AddGraphic(xindivid, val, roc_single, myRODB, roc_single.type != 8);
+											xindivid_rosingle.AppendChild(xroid);
+										}
+
+										xindivid.AppendChild(xindivid_rosingle);
+										break;
+									case "romulti":
+										//Get the output columns from the EPFormatFile
+										//create an "Item" subnode for each selected RO
+										//set the nodes value = to those resolved items
+										//separated by multiseparator
+										foreach (string ival in val.Split(multiseparator.ToCharArray()))
+										{
+											XmlElement xindivid_romulti = xindivid.OwnerDocument.CreateElement("Item");
+											xindivid_romulti.Attributes.SetNamedItem(AddAttribute(xindivid_romulti.OwnerDocument, "ROID", ival));
+
+											//add values specified in EP input list
+											List<string> ro_multi_tmp = EP.getROValuesList(EPAnnotation, ival);
+											xindivid_romulti.InnerText = String.Join(multiseparator, ro_multi_tmp.ToArray());
+
+											//if image, add location and binary of image
+											// - images are type 8
+											//   but if multiple return values could combine
+											//   for example an text (1) + image (8) would be 9
+											ROFSTLookup.rochild roc_multi = lookup.GetRoChild(ival);
+											if (Enumerable.Range(8, 15).Contains(roc_multi.type))
+											{
+												XmlElement xroid = AddGraphic(xindivid, ival, roc_multi, myRODB, roc_multi.type != 8);
+												xindivid_romulti.AppendChild(xroid);
+											}
+
+											xindivid.AppendChild(xindivid_romulti);
+										}
+										break;
+									case "tableinput":
+										xindivid.InnerText = val;
+										break;
+									default:
+										xindivid.InnerText = val;
+										break;
+								}
+								xepdetails.AppendChild(xindivid);
+							}
+						}
+						xepinfo.AppendChild(xepdetails);
+					}
+
+				}
+
+				xe.AppendChild(xepinfo);
+			}
+
+		}
+
+		//return a db sequence string from an Item ID
+		private string dbSeq(int itemID)
+		{
+			using (ItemInfo ii = ItemInfo.Get(itemID))
+            {
+				return dbSeq(ii);
+			}
+		}
+
+        //return a db sequence string from an ItemInfo
+        private string dbSeq(ItemInfo ii) => $"{((FolderInfo)ii.MyDocVersion.ActiveParent).Name}:{ii.MyProcedure.DisplayNumber} {ii.MyProcedure.DisplayText}:{ii.DBSequence}";
+
+        //For Exporting an RO that is an image
+        //returns the Location and FileName of the RO Image
+        private string GetROImageFileLocation(ROFSTLookup.rochild roc, RODbInfo rodb, bool isMulti)
+		{
+			string rodbpath = rodb.FolderPath;
+
+			string rocval = roc.value;
+			if (rocval == null) rocval = Array.Find(roc.children, x => x.value.Contains('.')).value;
+
+			if (rocval == null) return "";
+			string imgname;
+			if (isMulti)
+			{
+				imgname = rocval.Substring(rocval.IndexOf(' ') + 1, rocval.IndexOf("\r\n") - rocval.IndexOf(' ') - 1);
+			}
+			else
+			{
+				imgname = rocval.Substring(0, rocval.IndexOf('\n'));
+			}
+			int thedot = imgname.LastIndexOf('.');
+			string fname = imgname;
+			if (thedot == -1 || (thedot != (imgname.Length - 4)))
+			{
+				RODbConfig roDbCfg = new RODbConfig(rodb.Config);
+				fname += string.Format(".{0}", roDbCfg.GetDefaultGraphicExtension());
+			}
+
+			string imgfile = Path.Combine(rodbpath, fname);
+			return imgfile;
+		}
+
+		//For Exporting an RO that is an image
+		//returns an xmlElement
+		// - that is a child to xindivid
+		// - that has a name of Name
+		// - that has a value of the binary representation of the image
+		// - that has an attribute designating the location of the image file
+		private XmlElement AddGraphic(XmlElement xindivid, string Name, ROFSTLookup.rochild roc, RODbInfo rodb, bool isMulti)
+		{
+            Name = Name.Replace("<", "").Replace(">", "");
+
+			XmlElement xroid = xindivid.OwnerDocument.CreateElement(Name);
+
+			string imgfile = GetROImageFileLocation(roc, rodb, isMulti);
+			if (string.IsNullOrEmpty(imgfile)) return xroid;
+			xroid.Attributes.SetNamedItem(AddAttribute(xroid.OwnerDocument, "Location", imgfile));
+
+			if (File.Exists(imgfile))
+			{
+				using (FileStream fsIn = new FileStream(imgfile, FileMode.Open, FileAccess.Read, FileShare.Read))
+				{
+					// Create an instance of StreamReader that can read characters from the FileStream.
+					using (BinaryReader r = new BinaryReader(fsIn))
+						xroid.InnerText = Encoding.Default.GetString(r.ReadBytes((int)fsIn.Length));
+				}
+			}
+
+			return xroid;
+		}
+
+		//overridden - used to set the RO location for RO Images that are not in annotations
+		protected override void SetROLocation(ref XmlElement xindivid, ROFSTLookup.rochild roc, RODbInfo rodb, bool isMulti)
+		{
+			string imgfile = GetROImageFileLocation(roc, rodb, isMulti);
+			if (!string.IsNullOrEmpty(imgfile)) xindivid.Attributes.SetNamedItem(AddAttribute(xindivid.OwnerDocument, "Location", imgfile));
+		}
+
+		//overridden - used to set specific enhanced doc info
+		protected override void SetEPEnhancedDocLinks(ref XmlElement xe, ItemInfo ii)
+		{
+			EnhancedDocuments eds = ii.GetMyEnhancedDocuments();
+
+			if (eds != null && eds.Count == 1)
+			{
+				xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "EnhancedDocType", eds[0].Type.ToString()));
+				xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "EnhancedDocToItemID", eds[0].ItemID.ToString()));
+				xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "EnhancedDocToDbSeq", dbSeq(eds[0].ItemID)));
+			}
+		}
+
+		//clear objects to release memory
+		private void OnClose(object sender, EventArgs e)
+		{
+			DocReplace.Clear();
+			DocReplace = null;
+		}
+
+
+	}
+}

PROMS/VEPROMS User Interface/dlgUCFDetail.Designer.cs

@@ -1,61 +0,0 @@
-namespace VEPROMS
-{
-	partial class dlgUCFDetail
-	{
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-			{
-				components.Dispose();
-			}
-			base.Dispose(disposing);
-		}
-
-		#region Windows Form Designer generated code
-
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			this.wbBrDet = new System.Windows.Forms.WebBrowser();
-			this.SuspendLayout();
-			// 
-			// wbBrDet
-			// 
-			this.wbBrDet.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.wbBrDet.Location = new System.Drawing.Point(0, 0);
-			this.wbBrDet.MinimumSize = new System.Drawing.Size(20, 20);
-			this.wbBrDet.Name = "wbBrDet";
-			this.wbBrDet.Size = new System.Drawing.Size(897, 445);
-			this.wbBrDet.TabIndex = 0;
-			// 
-			// dlgUCFDetail
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(897, 445);
-			this.Controls.Add(this.wbBrDet);
-			this.Name = "dlgUCFDetail";
-			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-			this.Text = "User Control of Format Details";
-			this.Load += new System.EventHandler(this.dlgUCFDetail_Load);
-			this.ResumeLayout(false);
-
-		}
-
-		#endregion
-
-		private System.Windows.Forms.WebBrowser wbBrDet;
-	}
-}

PROMS/VEPROMS User Interface/dlgUCFDetail.cs

@@ -1,77 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
-using System.Xml;
-using System.IO;
-using System.Xml.Xsl;
-
-namespace VEPROMS
-{
-	public partial class dlgUCFDetail : Form
-	{
-		private string MyFormatConfig;
-		private string UCFName;
-		private string Description;
-		// This brings up the dialog for displaying the details of what is contained in this User Control of Format
-		// as defined by the formatConfig.  It uses XSL to display the xml. The XSL can be found in UCFDetails.xsl.
-		// The result is displayed in a web browser control on the dialog.
-		public dlgUCFDetail(string formatConfig, string name, string desc)
-		{
-			MyFormatConfig = formatConfig;
-			UCFName = name;
-			Description = desc;
-			InitializeComponent();
-		}
-		private void AddAttribute(XmlNode xn, string name, object value)
-		{
-			XmlAttribute xa = xn.OwnerDocument.CreateAttribute(name);
-			xa.Value = value.ToString();
-			xn.Attributes.Append(xa);
-		}
-		private void dlgUCFDetail_Load(object sender, EventArgs e)
-		{
-			try
-			{
-				//need to add the UCF name & description to this:
-				XmlDocument xd = new XmlDocument();
-				xd.LoadXml(MyFormatConfig);
-				XmlNodeList xnl = xd.GetElementsByTagName("FormatConfig");
-				if (xnl != null && xnl.Count > 0)
-				{
-					AddAttribute(xnl[0], "Name", UCFName);
-					AddAttribute(xnl[0], "Description", Description);
-				}
-
-				string sXSLSummary = System.IO.File.ReadAllText(Application.StartupPath + "\\" + "UCFDetails.xsl");
-				StringWriter sw = new StringWriter();
-				StringWriter xsw = new StringWriter();
-				using (XmlReader xrt = XmlReader.Create(new StringReader(sXSLSummary)))
-				{
-					XmlTextWriter tx = new XmlTextWriter(xsw);
-					xd.WriteTo(tx);
-					string tmp = sw.ToString();
-					tmp = xd.InnerXml;
-					using (XmlReader xri = XmlReader.Create(new StringReader(tmp)))
-					{
-						using (XmlWriter xwo = XmlWriter.Create(sw))
-						{
-							XslCompiledTransform xsl = new XslCompiledTransform();
-							xsl.Load(xrt);
-							xsl.Transform(xri, xwo); // Perform Transform
-						}
-						this.wbBrDet.DocumentText = sw.ToString();
-					}
-				}
-			}
-			catch (Exception ex)
-			{
-				MessageBox.Show("Problem occurred displaying the details.", "UCF Warning", MessageBoxButtons.OK);
-			}
-		}
-	}
-}

PROMS/VEPROMS User Interface/dlgUCFDetail.resx

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

PROMS/VEPROMS User Interface/frmBatchRefresh.Designer.cs

@@ -70,17 +70,6 @@
             this.labelX6 = new DevComponents.DotNetBar.LabelX();
             this.warningBox1 = new DevComponents.DotNetBar.Controls.WarningBox();
             this.btnFixLinks = new DevComponents.DotNetBar.ButtonX();
-            this.sideNavPanel1 = new DevComponents.DotNetBar.Controls.SideNavPanel();
-            this.warningBox3 = new DevComponents.DotNetBar.Controls.WarningBox();
-            this.labelX7 = new DevComponents.DotNetBar.LabelX();
-            this.line1 = new DevComponents.DotNetBar.Controls.Line();
-            this.swCkObsoleteROData = new DevComponents.DotNetBar.Controls.SwitchButton();
-            this.swHiddenDataLocs = new DevComponents.DotNetBar.Controls.SwitchButton();
-            this.labelX3 = new DevComponents.DotNetBar.LabelX();
-            this.labelX2 = new DevComponents.DotNetBar.LabelX();
-            this.swCkOrphanDataRecs = new DevComponents.DotNetBar.Controls.SwitchButton();
-            this.labelX1 = new DevComponents.DotNetBar.LabelX();
-            this.btnRunCheck = new DevComponents.DotNetBar.ButtonX();
             this.sideNavPanel2 = new DevComponents.DotNetBar.Controls.SideNavPanel();
             this.swRefreshTblsForSrch = new DevComponents.DotNetBar.Controls.SwitchButton();
             this.lblRefreshTblForSrch = new DevComponents.DotNetBar.LabelX();
@@ -97,14 +86,10 @@
             this.labelX8 = new DevComponents.DotNetBar.LabelX();
             this.line2 = new DevComponents.DotNetBar.Controls.Line();
             this.btnRunRepair = 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();
             this.sideNavItmRepair = new DevComponents.DotNetBar.Controls.SideNavItem();
             this.sideNavItmLinks = new DevComponents.DotNetBar.Controls.SideNavItem();
-            this.sideNavItmUsers = new DevComponents.DotNetBar.Controls.SideNavItem();
             this.sideNavItmDelete = new DevComponents.DotNetBar.Controls.SideNavItem();
             this.sideNavItmExit = new DevComponents.DotNetBar.Controls.SideNavItem();
             this.panelEx4 = new DevComponents.DotNetBar.PanelEx();
@@ -129,9 +114,7 @@
             this.sideNav1.SuspendLayout();
             this.sideNavPanel4.SuspendLayout();
             this.sideNavPanel3.SuspendLayout();
-            this.sideNavPanel1.SuspendLayout();
             this.sideNavPanel2.SuspendLayout();
-            this.sideNavPanel5.SuspendLayout();
             this.panelEx4.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -467,21 +450,17 @@
             // sideNav1
             // 
             this.sideNav1.BackColor = System.Drawing.SystemColors.Control;
+            this.sideNav1.Controls.Add(this.sideNavPanel2);
             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.sideNavPanel5);
             this.sideNav1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.sideNav1.EnableClose = false;
             this.sideNav1.EnableMaximize = false;
             this.sideNav1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
             this.sideNavItem1,
             this.separator1,
-            this.sideNavItmCheck,
             this.sideNavItmRepair,
             this.sideNavItmLinks,
-            this.sideNavItmUsers,
             this.sideNavItmDelete,
             this.sideNavItmExit});
             this.sideNav1.Location = new System.Drawing.Point(0, 0);
@@ -505,6 +484,7 @@
             this.sideNavPanel4.Name = "sideNavPanel4";
             this.sideNavPanel4.Size = new System.Drawing.Size(299, 493);
             this.sideNavPanel4.TabIndex = 27;
+            this.sideNavPanel4.Visible = false;
             // 
             // swDeleteFolder
             // 
@@ -759,173 +739,6 @@
             this.btnFixLinks.Text = "Process Links";
             this.btnFixLinks.Click += new System.EventHandler(this.btnFixLinks_Click);
             // 
-            // sideNavPanel1
-            // 
-            this.sideNavPanel1.Controls.Add(this.warningBox3);
-            this.sideNavPanel1.Controls.Add(this.labelX7);
-            this.sideNavPanel1.Controls.Add(this.line1);
-            this.sideNavPanel1.Controls.Add(this.swCkObsoleteROData);
-            this.sideNavPanel1.Controls.Add(this.swHiddenDataLocs);
-            this.sideNavPanel1.Controls.Add(this.labelX3);
-            this.sideNavPanel1.Controls.Add(this.labelX2);
-            this.sideNavPanel1.Controls.Add(this.swCkOrphanDataRecs);
-            this.sideNavPanel1.Controls.Add(this.labelX1);
-            this.sideNavPanel1.Controls.Add(this.btnRunCheck);
-            this.sideNavPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.sideNavPanel1.Location = new System.Drawing.Point(89, 31);
-            this.sideNavPanel1.Name = "sideNavPanel1";
-            this.sideNavPanel1.Size = new System.Drawing.Size(291, 494);
-            this.sideNavPanel1.TabIndex = 2;
-            this.sideNavPanel1.Visible = false;
-            // 
-            // warningBox3
-            // 
-            this.warningBox3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(196)))), ((int)(((byte)(219)))), ((int)(((byte)(249)))));
-            this.warningBox3.CloseButtonVisible = false;
-            this.warningBox3.Image = ((System.Drawing.Image)(resources.GetObject("warningBox3.Image")));
-            this.warningBox3.Location = new System.Drawing.Point(17, 207);
-            this.warningBox3.Margin = new System.Windows.Forms.Padding(4);
-            this.warningBox3.Name = "warningBox3";
-            this.warningBox3.OptionsButtonVisible = false;
-            this.warningBox3.Size = new System.Drawing.Size(264, 32);
-            this.warningBox3.TabIndex = 29;
-            this.warningBox3.Text = "<b>NOTE</b> These tools can take a long time to run";
-            // 
-            // labelX7
-            // 
-            this.labelX7.BackColor = System.Drawing.Color.Transparent;
-            // 
-            // 
-            // 
-            this.labelX7.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.labelX7.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.labelX7.Location = new System.Drawing.Point(5, 3);
-            this.labelX7.Name = "labelX7";
-            this.labelX7.Size = new System.Drawing.Size(251, 22);
-            this.labelX7.TabIndex = 19;
-            this.labelX7.Text = "Check for these Data Issues:";
-            // 
-            // line1
-            // 
-            this.line1.BackColor = System.Drawing.Color.Transparent;
-            this.line1.Location = new System.Drawing.Point(8, 179);
-            this.line1.Name = "line1";
-            this.line1.Size = new System.Drawing.Size(285, 12);
-            this.line1.TabIndex = 18;
-            this.line1.Text = "line1";
-            // 
-            // swCkObsoleteROData
-            // 
-            // 
-            // 
-            // 
-            this.swCkObsoleteROData.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.swCkObsoleteROData.Location = new System.Drawing.Point(10, 99);
-            this.swCkObsoleteROData.Name = "swCkObsoleteROData";
-            this.swCkObsoleteROData.Size = new System.Drawing.Size(91, 22);
-            this.swCkObsoleteROData.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.superTooltip1.SetSuperTooltip(this.swCkObsoleteROData, new DevComponents.DotNetBar.SuperTooltipInfo("Obsolete RO Data", "", resources.GetString("swCkObsoleteROData.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 135)));
-            this.swCkObsoleteROData.SwitchClickTogglesValue = true;
-            this.swCkObsoleteROData.TabIndex = 14;
-            this.swCkObsoleteROData.Value = true;
-            this.swCkObsoleteROData.ValueObject = "Y";
-            this.swCkObsoleteROData.ValueChanged += new System.EventHandler(this.swCk_ValueChanged);
-            // 
-            // swHiddenDataLocs
-            // 
-            // 
-            // 
-            // 
-            this.swHiddenDataLocs.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.swHiddenDataLocs.Location = new System.Drawing.Point(10, 71);
-            this.swHiddenDataLocs.Name = "swHiddenDataLocs";
-            this.swHiddenDataLocs.Size = new System.Drawing.Size(91, 22);
-            this.swHiddenDataLocs.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.superTooltip1.SetSuperTooltip(this.swHiddenDataLocs, new DevComponents.DotNetBar.SuperTooltipInfo("Hidden Data Locations", "", resources.GetString("swHiddenDataLocs.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
-            this.swHiddenDataLocs.SwitchClickTogglesValue = true;
-            this.swHiddenDataLocs.TabIndex = 15;
-            this.swHiddenDataLocs.Value = true;
-            this.swHiddenDataLocs.ValueObject = "Y";
-            this.swHiddenDataLocs.ValueChanged += new System.EventHandler(this.swCk_ValueChanged);
-            // 
-            // labelX3
-            // 
-            this.labelX3.BackColor = System.Drawing.Color.Transparent;
-            // 
-            // 
-            // 
-            this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.labelX3.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.labelX3.Location = new System.Drawing.Point(107, 99);
-            this.labelX3.Name = "labelX3";
-            this.labelX3.Size = new System.Drawing.Size(154, 22);
-            this.superTooltip1.SetSuperTooltip(this.labelX3, new DevComponents.DotNetBar.SuperTooltipInfo("Obsolete RO Data", "", resources.GetString("labelX3.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 135)));
-            this.labelX3.TabIndex = 11;
-            this.labelX3.Text = "Obsolete RO Data";
-            // 
-            // labelX2
-            // 
-            this.labelX2.BackColor = System.Drawing.Color.Transparent;
-            // 
-            // 
-            // 
-            this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.labelX2.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.labelX2.Location = new System.Drawing.Point(107, 71);
-            this.labelX2.Name = "labelX2";
-            this.labelX2.Size = new System.Drawing.Size(140, 22);
-            this.superTooltip1.SetSuperTooltip(this.labelX2, new DevComponents.DotNetBar.SuperTooltipInfo("Hidden Data Locations", "", resources.GetString("labelX2.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
-            this.labelX2.TabIndex = 12;
-            this.labelX2.Text = "Hidden Data Locations";
-            // 
-            // swCkOrphanDataRecs
-            // 
-            // 
-            // 
-            // 
-            this.swCkOrphanDataRecs.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.swCkOrphanDataRecs.Location = new System.Drawing.Point(10, 43);
-            this.swCkOrphanDataRecs.Name = "swCkOrphanDataRecs";
-            this.swCkOrphanDataRecs.Size = new System.Drawing.Size(91, 22);
-            this.swCkOrphanDataRecs.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.superTooltip1.SetSuperTooltip(this.swCkOrphanDataRecs, new DevComponents.DotNetBar.SuperTooltipInfo("Orphan Data Records", "", resources.GetString("swCkOrphanDataRecs.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(275, 193)));
-            this.swCkOrphanDataRecs.SwitchClickTogglesValue = true;
-            this.swCkOrphanDataRecs.TabIndex = 9;
-            this.swCkOrphanDataRecs.Value = true;
-            this.swCkOrphanDataRecs.ValueObject = "Y";
-            this.swCkOrphanDataRecs.ValueChanged += new System.EventHandler(this.swCk_ValueChanged);
-            // 
-            // labelX1
-            // 
-            this.labelX1.BackColor = System.Drawing.Color.Transparent;
-            // 
-            // 
-            // 
-            this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.labelX1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.labelX1.Location = new System.Drawing.Point(107, 43);
-            this.labelX1.Name = "labelX1";
-            this.labelX1.Size = new System.Drawing.Size(172, 22);
-            this.superTooltip1.SetSuperTooltip(this.labelX1, new DevComponents.DotNetBar.SuperTooltipInfo("Orphan Data Records", "", resources.GetString("labelX1.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(275, 190)));
-            this.labelX1.TabIndex = 8;
-            this.labelX1.Text = "Orphan Data Records";
-            // 
-            // btnRunCheck
-            // 
-            this.btnRunCheck.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
-            this.btnRunCheck.Checked = true;
-            this.btnRunCheck.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-            this.btnRunCheck.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btnRunCheck.Location = new System.Drawing.Point(5, 150);
-            this.btnRunCheck.Name = "btnRunCheck";
-            this.btnRunCheck.Size = new System.Drawing.Size(286, 23);
-            this.btnRunCheck.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.superTooltip1.SetSuperTooltip(this.btnRunCheck, new DevComponents.DotNetBar.SuperTooltipInfo("Run Check", "", "This will run the database check tools selected.\r\n\r\nClick on the on/off switches " +
-            "to turn on/off each tool.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 100)));
-            this.btnRunCheck.TabIndex = 7;
-            this.btnRunCheck.Text = "Run Check";
-            this.btnRunCheck.Click += new System.EventHandler(this.btnRunCheck_Click);
-            // 
             // sideNavPanel2
             // 
             this.sideNavPanel2.Controls.Add(this.swRefreshTblsForSrch);
@@ -944,11 +757,10 @@
             this.sideNavPanel2.Controls.Add(this.line2);
             this.sideNavPanel2.Controls.Add(this.btnRunRepair);
             this.sideNavPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.sideNavPanel2.Location = new System.Drawing.Point(89, 31);
+            this.sideNavPanel2.Location = new System.Drawing.Point(81, 31);
             this.sideNavPanel2.Name = "sideNavPanel2";
-            this.sideNavPanel2.Size = new System.Drawing.Size(291, 494);
+            this.sideNavPanel2.Size = new System.Drawing.Size(299, 493);
             this.sideNavPanel2.TabIndex = 6;
-            this.sideNavPanel2.Visible = false;
             // 
             // swRefreshTblsForSrch
             // 
@@ -1176,31 +988,6 @@
             this.btnRunRepair.Text = "Run Repair";
             this.btnRunRepair.Click += new System.EventHandler(this.btnRunRepair_Click);
             // 
-            // 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);
-            // 
             // sideNavItem1
             // 
             this.sideNavItem1.IsSystemMenu = true;
@@ -1218,16 +1005,9 @@
             this.separator1.Padding.Top = 2;
             this.separator1.SeparatorOrientation = DevComponents.DotNetBar.eDesignMarkerOrientation.Vertical;
             // 
-            // sideNavItmCheck
-            // 
-            this.sideNavItmCheck.Name = "sideNavItmCheck";
-            this.sideNavItmCheck.Panel = this.sideNavPanel1;
-            this.sideNavItmCheck.Symbol = "";
-            this.sideNavItmCheck.Text = "Check";
-            this.sideNavItmCheck.Click += new System.EventHandler(this.sideNavItmCheck_Click);
-            // 
             // sideNavItmRepair
             // 
+            this.sideNavItmRepair.Checked = true;
             this.sideNavItmRepair.Name = "sideNavItmRepair";
             this.sideNavItmRepair.Panel = this.sideNavPanel2;
             this.sideNavItmRepair.Symbol = "";
@@ -1242,17 +1022,8 @@
             this.sideNavItmLinks.Text = "Links";
             this.sideNavItmLinks.Click += new System.EventHandler(this.sideNavItmLinks_Click);
             // 
-            // sideNavItmUsers
-            // 
-            this.sideNavItmUsers.Name = "sideNavItmUsers";
-            this.sideNavItmUsers.Panel = this.sideNavPanel5;
-            this.sideNavItmUsers.Symbol = "";
-            this.sideNavItmUsers.Text = "Users";
-            this.sideNavItmUsers.Click += new System.EventHandler(this.sideNavItmUsers_Click);
-            // 
             // sideNavItmDelete
             // 
-            this.sideNavItmDelete.Checked = true;
             this.sideNavItmDelete.Name = "sideNavItmDelete";
             this.sideNavItmDelete.Panel = this.sideNavPanel4;
             this.sideNavItmDelete.Symbol = "";
@@ -1392,9 +1163,7 @@
             this.sideNav1.PerformLayout();
             this.sideNavPanel4.ResumeLayout(false);
             this.sideNavPanel3.ResumeLayout(false);
-            this.sideNavPanel1.ResumeLayout(false);
             this.sideNavPanel2.ResumeLayout(false);
-            this.sideNavPanel5.ResumeLayout(false);
             this.panelEx4.ResumeLayout(false);
             this.ResumeLayout(false);
 
@@ -1422,16 +1191,6 @@
 		private System.Windows.Forms.CheckBox chkLater;
 		private System.Windows.Forms.Label label4;
 		private DevComponents.DotNetBar.Controls.SideNav sideNav1;
-		private DevComponents.DotNetBar.Controls.SideNavPanel sideNavPanel1;
-		private DevComponents.DotNetBar.LabelX labelX7;
-		private DevComponents.DotNetBar.Controls.Line line1;
-		private DevComponents.DotNetBar.Controls.SwitchButton swCkObsoleteROData;
-		private DevComponents.DotNetBar.Controls.SwitchButton swHiddenDataLocs;
-		private DevComponents.DotNetBar.LabelX labelX3;
-		private DevComponents.DotNetBar.LabelX labelX2;
-		private DevComponents.DotNetBar.Controls.SwitchButton swCkOrphanDataRecs;
-		private DevComponents.DotNetBar.LabelX labelX1;
-		private DevComponents.DotNetBar.ButtonX btnRunCheck;
 		private DevComponents.DotNetBar.Controls.SideNavPanel sideNavPanel2;
 		private DevComponents.DotNetBar.Controls.SwitchButton swRmObsoleteROData;
 		private DevComponents.DotNetBar.Controls.SwitchButton swRefreshWordAttmts;
@@ -1444,16 +1203,12 @@
 		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;
 		private DevComponents.DotNetBar.Separator separator1;
-		private DevComponents.DotNetBar.Controls.SideNavItem sideNavItmCheck;
 		private DevComponents.DotNetBar.Controls.SideNavItem sideNavItmRepair;
 		private DevComponents.DotNetBar.Controls.SideNavItem sideNavItmLinks;
-		private DevComponents.DotNetBar.Controls.SideNavItem sideNavItmUsers;
 		private DevComponents.DotNetBar.Controls.SideNavItem sideNavItmExit;
 		private DevComponents.DotNetBar.LabelX lblAdmToolProgressType;
 		private DevComponents.DotNetBar.ProgressSteps progressSteps1;
@@ -1473,7 +1228,6 @@
 		private DevComponents.DotNetBar.LabelX labelX6;
 		private DevComponents.DotNetBar.Controls.WarningBox warningBox5;
 		private DevComponents.DotNetBar.Controls.Line line3;
-		private DevComponents.DotNetBar.Controls.WarningBox warningBox3;
 		private DevComponents.DotNetBar.Controls.WarningBox warningBox4;
 		private DevComponents.DotNetBar.Controls.WarningBox warningBox2;
 		private DevComponents.DotNetBar.Controls.SwitchButton swRefreshTblsForSrch;

PROMS/VEPROMS User Interface/frmBatchRefresh.cs

@@ -34,8 +34,8 @@ namespace VEPROMS
 			_veProms = veProms;
 
 
-			// When opening Admin tools Check tab will be default.
-			this.sideNavItmCheck.Checked = true;
+			// When opening Admin tools Repair tab will be default.
+			this.sideNavItmRepair.Checked = true;
 
 			if (sideNavItmDelete.Checked)
 			{
@@ -95,7 +95,6 @@ namespace VEPROMS
 			int affectedRows = ESP_FixHyphens.Execute("vesp_FixHyphens") / 2;// Two results for each change
 			txtProcess.AppendText(string.Format("Fixed {0} Hyphens", affectedRows));
 			txtProcess.AppendText(Environment.NewLine);
-			//txtProcess.AppendText(Environment.NewLine);
 			txtResults.AppendText(string.Format("{0} Hyphens were Fixed.", affectedRows));
 			txtResults.AppendText(Environment.NewLine);
 			txtResults.AppendText(Environment.NewLine);
@@ -143,16 +142,10 @@ namespace VEPROMS
 			return false;
 		}
 
-		private List<string> myTreeNodePath;
-		private void ResetTV()
-		{
-			ResetTV(false);
-		}
-		private void ResetTV(bool noProcs)
+        private void ResetTV(bool noProcs)
 		{
 			btnFixLinks.Enabled = false;
 			this.Cursor = Cursors.WaitCursor;
-			//myTreeNodePath = new List<string>();
 			myTV.Nodes.Clear();
 			myDocVersions.Clear();
 			myFolders.Clear();
@@ -165,10 +158,6 @@ namespace VEPROMS
 				myTV.SelectedNode.Expand();
 			this.Cursor = Cursors.Default;
 		}
-		private void ResetDelTV()
-		{
-			ResetDelTV(false);
-		}
 		private void ResetDelTV(bool noProcs)
 		{
 			btnFixLinks.Enabled = false;
@@ -208,13 +197,10 @@ namespace VEPROMS
 				TreeNode tnc = tn.Nodes.Add(fic.Name);
 				tnc.Tag = fic;
 
-				if (fic.ChildFolderCount > 0)
-				{
-					if (LoadChildFolders(fic, tnc, noProcs))
-						loadedChildWorkingDraft = true;
-				}
+                if (fic.ChildFolderCount > 0 && LoadChildFolders(fic, tnc, noProcs))
+                    loadedChildWorkingDraft = true;
 
-				if (fic.FolderDocVersionCount > 0)
+                if (fic.FolderDocVersionCount > 0)
 				{
 					if (!LoadDocVersions(fic, tnc, noProcs))
 						tnc.Remove();
@@ -252,12 +238,9 @@ namespace VEPROMS
 				{
 					tnc.Tag = dvi;
 					myDocVersions.Add(tnc, dvi);
-					if (!noProcs)
-					{
-						if (dvi.Procedures.Count > 0)
-							LoadProcedures(dvi, tnc);
-					}
-					rtnval = true;
+                    if (!noProcs && dvi.Procedures.Count > 0)
+                        LoadProcedures(dvi, tnc);
+                    rtnval = true;
 				}
 				else
 				{
@@ -273,7 +256,7 @@ namespace VEPROMS
 		}
 		private void LoadProcedures(DocVersionInfo dvi, TreeNode tnc)
 		{
-			foreach (ProcedureInfo pi in dvi.Procedures)
+			foreach (ProcedureInfo pi in dvi.Procedures.OfType<ProcedureInfo>())
 			{
 				TreeNode tn = tnc.Nodes.Add(string.Format("{0} {1}", pi.DisplayNumber, pi.DisplayText));
 				myProcedures.Add(tn, pi);
@@ -327,7 +310,7 @@ namespace VEPROMS
 						// C2023-002:  Loop through the docversion's procedures to determine which cannot be open and add to
 						//	list.  The frmBatchRefreshCheckedOut dialog operates on procedures, not docversions.
 						string msgp = string.Empty;
-						foreach (ProcedureInfo pi in dq.Procedures)
+						foreach (ProcedureInfo pi in dq.Procedures.OfType<ProcedureInfo>())
 						{
 							if (!MySessionInfo.CanCheckOutItem(pi.ItemID, CheckOutType.Procedure, ref msgp)) pil.Add(pi);
 						}
@@ -520,7 +503,6 @@ namespace VEPROMS
 			foreach (TreeNode tn in myProcedures.Keys)
 				if (tn.Checked)
 					pil.Add(myProcedures[tn]);
-			//PopulateTransitionInfoLists(pil);
 			DateTime pStart = DateTime.Now;
 			txtProcess.AppendText("Refresh Transitions");
 			txtProcess.AppendText(Environment.NewLine);
@@ -710,7 +692,7 @@ namespace VEPROMS
 								cc.Save();
 							}
 						}
-						catch (Exception ex)
+						catch
 						{
 							this.Cursor = Cursors.Default;
 							return -cntfix;
@@ -722,42 +704,6 @@ namespace VEPROMS
 			}
 			return cntfix;
 		}
-		// C2017-030 - new Admin Tools user interface
-		// tool renamed to Identify Orphan Items
-		private void IdentifyDisconnectedItems()
-		{
-			this.Cursor = Cursors.WaitCursor;
-			DateTime pStart = DateTime.Now;
-			txtProcess.AppendText("Identifing Orphan Items");
-			txtProcess.AppendText(Environment.NewLine);
-			txtProcess.AppendText(string.Format("Started: {0}", pStart.ToString("MM/dd/yyyy @ HH:mm")));
-			txtProcess.AppendText(Environment.NewLine);
-			Application.DoEvents();
-			int rowCount = ESP_IdentifyDisconnectedItems.Execute("vesp_GetDisconnectedItemsCount");
-			txtProcess.AppendText(string.Format("Orphan Items Count:  {0}", rowCount));
-			txtProcess.AppendText(Environment.NewLine);
-			if (rowCount > 0)
-			{
-				txtResults.AppendText(string.Format("The database contains {0} Orphan items.", rowCount));
-				txtResults.AppendText(Environment.NewLine);
-				txtResults.AppendText("These can be removed via the Remove Orphan Data Records in the Repair tools");
-				txtResults.AppendText(Environment.NewLine);
-				txtResults.AppendText(Environment.NewLine);
-			}
-			else
-			{
-				txtResults.AppendText("No Orphan Records Found");// B2017-108 Always output results even if there isn't any 
-				txtResults.AppendText(Environment.NewLine);
-				txtResults.AppendText(Environment.NewLine);
-			}
-			DateTime pEnd = DateTime.Now;
-			txtProcess.AppendText(string.Format("Completed: {0}", pEnd.ToString("MM/dd/yyyy @ HH:mm")));
-			txtProcess.AppendText(Environment.NewLine);
-			txtProcess.AppendText(Environment.NewLine);
-			Application.DoEvents();
-			this.Cursor = Cursors.Default;
-			//MessageBox.Show(string.Format("{0} Completed", "Orphan Items Check"), "Orphan Items");
-		}
 
 		// C2017-030 - new Admin Tools user interface
 		// tool renamed to Remove Orphan Items
@@ -777,8 +723,6 @@ namespace VEPROMS
 				int rowCount2 = ESP_IdentifyDisconnectedItems.Execute("vesp_GetDisconnectedItemsCount");
 				txtProcess.AppendText(string.Format("Orphan Items Purged: {0}", rowCount));
 				txtProcess.AppendText(Environment.NewLine);
-				//txtProcess.AppendText(Environment.NewLine);
-				//txtResults.Clear();
 				txtResults.AppendText(string.Format("The database contained {0} Orphan items.", rowCount));
 				txtResults.AppendText(Environment.NewLine);
 				txtResults.AppendText(Environment.NewLine);
@@ -795,11 +739,10 @@ namespace VEPROMS
 			}
 			else
 			{
-				//txtResults.Clear();
 				txtResults.AppendText(string.Format("The database contained {0} Orphan items.", rowCount));
 				txtResults.AppendText(Environment.NewLine);
 				txtResults.AppendText(Environment.NewLine);
-				txtResults.AppendText(string.Format("No Orpan Items to Purge!"));
+				txtResults.AppendText("No Orpan Items to Purge!");
 				txtResults.AppendText(Environment.NewLine);
 				txtResults.AppendText(Environment.NewLine);
 			}
@@ -811,45 +754,6 @@ namespace VEPROMS
 			this.Cursor = Cursors.Default;
 		}
 
-		// C2017-030 - new Admin Tools user interface
-		// is one of two tools run from Check Obsolete RO Data
-		private void IdentifyUnusedRoFstsAndFigures()
-		{
-			this.Cursor = Cursors.WaitCursor;
-			DateTime pStart = DateTime.Now;
-			txtProcess.AppendText("Identifing Unused RoFsts and Figures");
-			txtProcess.AppendText(Environment.NewLine);
-			txtProcess.AppendText(string.Format("Started: {0}", pStart.ToString("MM/dd/yyyy @ HH:mm")));
-			txtProcess.AppendText(Environment.NewLine);
-			Application.DoEvents();
-			int rowCountRoFst = ESP_GetUnusedRoFsts.Execute("vesp_GetUnusedRoFstsCount");
-			int rowCountFigures = ESP_GetUnusedFigures.Execute("vesp_GetUnusedFiguresCount");
-			txtProcess.AppendText(string.Format("Unused RoFsts Count:  {0}, Unused Figures Count:  {1}", rowCountRoFst, rowCountFigures));
-			txtProcess.AppendText(Environment.NewLine);
-			if (rowCountRoFst > 0 || rowCountFigures > 0)
-			{
-				txtResults.AppendText(string.Format("The database contains {0} unused RoFsts.", rowCountRoFst));
-				txtResults.AppendText(Environment.NewLine);
-				txtResults.AppendText(string.Format("The database contains {0} unused Figures items.", rowCountFigures));
-				txtResults.AppendText(Environment.NewLine);
-				txtResults.AppendText(Environment.NewLine);
-			}
-			else
-			{
-				txtResults.AppendText("No Unused  RoFsts or Figures Found"); // B2017-108 Always output results even if there isn't any
-				txtResults.AppendText(Environment.NewLine);
-				txtResults.AppendText(Environment.NewLine);
-			}
-
-			DateTime pEnd = DateTime.Now;
-			txtProcess.AppendText(string.Format("Completed: {0}", pEnd.ToString("MM/dd/yyyy @ HH:mm")));
-			txtProcess.AppendText(Environment.NewLine);
-			txtProcess.AppendText(string.Format("Started: {0}", pStart.ToString("MM/dd/yyyy @ HH:mm")));
-			txtProcess.AppendText(Environment.NewLine);
-			Application.DoEvents();
-			this.Cursor = Cursors.Default;
-		}
-
 		// C2017-030 - new Admin Tools user interface is one of two tools run from Remove Obsolete RO Data
 		private void RemoveUnusedRoFstsAndFigures()
 		{
@@ -893,41 +797,7 @@ namespace VEPROMS
 			{
 				txtProcess.AppendText(string.Format("The database contained {0} unused RoFSTs or Figures.", rowCountRoFst + rowCountFigures));
 				txtProcess.AppendText(Environment.NewLine);
-				txtResults.AppendText(string.Format("No Unused ROFSTs To Remove."));
-				txtResults.AppendText(Environment.NewLine);
-				txtResults.AppendText(Environment.NewLine);
-			}
-			DateTime pEnd = DateTime.Now;
-			txtProcess.AppendText(string.Format("Completed: {0}", pEnd.ToString("MM/dd/yyyy @ HH:mm")));
-			txtProcess.AppendText(Environment.NewLine);
-			txtProcess.AppendText(Environment.NewLine);
-			Application.DoEvents();
-			this.Cursor = Cursors.Default;
-		}
-
-		// C2017-030 - new Admin Tools user interface
-		// is one of two tools run from Check Obsolete RO Data
-		private void IdentifyROAssociations()
-		{
-			this.Cursor = Cursors.WaitCursor;
-			DateTime pStart = DateTime.Now;
-			txtProcess.AppendText("Identifing Unused RO Associations");
-			txtProcess.AppendText(Environment.NewLine);
-			txtProcess.AppendText(string.Format("Started: {0}", pStart.ToString("MM/dd/yyyy @ HH:mm")));
-			txtProcess.AppendText(Environment.NewLine);
-			Application.DoEvents();
-			int rowCount = ESP_GetROAssoc.Execute("vesp_GetUnusedROAssociationsCount");
-			txtProcess.AppendText(string.Format("Unused RO Associations Count:  {0}", rowCount));
-			txtProcess.AppendText(Environment.NewLine);
-			if (rowCount > 0)
-			{
-				txtResults.AppendText(string.Format("The database contains {0} unused RO Associations.", rowCount));
-				txtResults.AppendText(Environment.NewLine);
-				txtResults.AppendText(Environment.NewLine);
-			}
-			else
-			{
-				txtResults.AppendText("No unused RO Associations Found");// B2017-108 Always output results even if there isn't any
+				txtResults.AppendText("No Unused ROFSTs To Remove.");
 				txtResults.AppendText(Environment.NewLine);
 				txtResults.AppendText(Environment.NewLine);
 			}
@@ -976,7 +846,7 @@ namespace VEPROMS
 				txtResults.AppendText(string.Format("The database contained {0} Unused RO Associations.", rowCount));
 				txtResults.AppendText(Environment.NewLine);
 				txtResults.AppendText(Environment.NewLine);
-				txtResults.AppendText(string.Format("No Unused RO Associations to Purge."));
+				txtResults.AppendText("No Unused RO Associations to Purge.");
 				txtResults.AppendText(Environment.NewLine);
 				txtResults.AppendText(Environment.NewLine);
 			}
@@ -988,49 +858,6 @@ namespace VEPROMS
 			this.Cursor = Cursors.Default;
 		}
 
-		// C2017-030 - new Admin Tools user interface
-		// tool was renamed to Hidden Data Locations (on Check list)
-		private void IdentifyNonEditableItems()
-		{
-			this.Cursor = Cursors.WaitCursor;
-			DateTime pStart = DateTime.Now;
-			txtProcess.AppendText("Identifing Hidden Item Locations");
-			txtProcess.AppendText(Environment.NewLine);
-			txtProcess.AppendText(string.Format("Started: {0}", pStart.ToString("MM/dd/yyyy @ HH:mm")));
-			txtProcess.AppendText(Environment.NewLine);
-			Application.DoEvents();
-			List<ItemInfo> myItems = ESP_IdentifyNonEditableItems.Execute("vesp_GetNonEditableItems");
-			txtProcess.AppendText(string.Format("Hidden Items Count:  {0}", myItems.Count));
-			txtProcess.AppendText(Environment.NewLine);
-			if (myItems.Count > 0)
-			{
-				txtResults.AppendText("The following items are hidden (non-editable)...");
-				txtResults.AppendText(Environment.NewLine);
-				txtResults.AppendText(Environment.NewLine);
-				foreach (ItemInfo ii in myItems)
-				{
-					txtResults.AppendText(ii.Path);
-					txtResults.AppendText(Environment.NewLine);
-				}
-				txtResults.AppendText(Environment.NewLine);
-			}
-			else
-			{
-				txtResults.AppendText("No Hidden Data Found");// B2017-108 Always output results even if there isn't any
-				txtResults.AppendText(Environment.NewLine);
-				txtResults.AppendText(Environment.NewLine);
-			}
-			//C2025-011 RO Update Admin Tool Memory Enhancements 
-			//clear the list since no longer using it
-			myItems.Clear();
-			DateTime pEnd = DateTime.Now;
-			txtProcess.AppendText(string.Format("Completed: {0}", pEnd.ToString("MM/dd/yyyy @ HH:mm")));
-			txtProcess.AppendText(Environment.NewLine);
-			txtProcess.AppendText(Environment.NewLine);
-			Application.DoEvents();
-			this.Cursor = Cursors.Default;
-		}
-
 		// C2017-030 - new Admin Tools user interface
 		// tool was renamed to Show Users
 		private void GetDatabaseSessions()
@@ -1095,7 +922,6 @@ namespace VEPROMS
 				return;
 			}
 
-			//FileInfo fiRofst = new FileInfo(rofstPath);
 			Cursor = Cursors.WaitCursor;
 
 			using (DocVersion dv = DocVersion.Get(dq.VersionID))
@@ -1109,7 +935,6 @@ namespace VEPROMS
 				}
 				roFstInfo.ROTableUpdate += new ROFstInfoROTableUpdateEvent(roFstInfo_ROTableUpdate);
 				ROFst newrofst = ROFstInfo.RefreshROFst(dv, roFstInfo, DoProgressBarRefresh, txtProcess);
-				//ROFst newrofst = ROFstInfo.RefreshROFst(dv, roFstInfo, DoProgressBarRefresh, null);
 				roFstInfo.ROTableUpdate -= new ROFstInfoROTableUpdateEvent(roFstInfo_ROTableUpdate);
 			}
 
@@ -1122,14 +947,13 @@ namespace VEPROMS
 			txtResults.AppendText(Environment.NewLine);
 			txtResults.AppendText(Environment.NewLine);
 
-			return;
 		}
 
 		private void RefreshProcedureTransitions(ProcedureInfo pq)
 		{
 			DateTime start = DateTime.Now;
 			ProcedureInfo.ResetTranCounters();
-			ProcedureInfo.RefreshTransitions(pq);//, transitionsToDisconnected, transitionsToNonEditable);
+			ProcedureInfo.RefreshTransitions(pq);
 			TimeSpan ts = DateTime.Now - start;
 			// B2018-002 - Invalid Transitions - Display Transition Refresh Statistics
 			txtProcess.AppendText(string.Format("Procedure:  {1}{0}Checked {2} Transitions{0}Fixed {3} Transitions{0}Converted to Text {4} Transitions{0}Cant Fix (Annotation: Bad Transition Link) {5} Transitions{0}Elapsed Seconds:{6}{0}{0}", Environment.NewLine, pq.DisplayNumber, ProcedureInfo.TranCheckCount, ProcedureInfo.TranFixCount, ProcedureInfo.TranConvertCount, ProcedureInfo.TranCantFixCount, ts.TotalSeconds));
@@ -1145,41 +969,6 @@ namespace VEPROMS
 			return VlnFlexGrid.ROTableUpdate(sender, args);
 		}
 
-		private void PopulateTransitionInfoLists(List<ProcedureInfo> pil)
-		{
-			Dictionary<int, int> dic = new Dictionary<int, int>();
-			StringBuilder sb = new StringBuilder();
-			foreach (ProcedureInfo pi in pil)
-				if (!dic.ContainsKey(pi.MyDocVersion.VersionID))
-				{
-					dic.Add(pi.MyDocVersion.VersionID, pi.MyDocVersion.VersionID);
-					sb.Append(sb.Length == 0 ? pi.MyDocVersion.VersionID.ToString() : "," + pi.MyDocVersion.VersionID.ToString());
-				}
-			txtProcess.AppendText("Preparing to process...");
-			txtProcess.AppendText(Environment.NewLine);
-			Application.DoEvents();
-			//transitionsToDisconnected = TransitionInfoList.GetTransitionsToDisconnected(sb.ToString());
-			//transitionsToNonEditable = TransitionInfoList.GetTransitionsToNonEditable(sb.ToString());
-		}
-
-		private void ProgressBarShowText()
-		{
-			pbProcess.Refresh();
-			int percent = (int)(((double)(pbProcess.Value - pbProcess.Minimum) /
-			(double)(pbProcess.Maximum - pbProcess.Minimum)) * 100);
-			using (Graphics gr = pbProcess.CreateGraphics())
-			{
-				gr.DrawString(percent.ToString() + "%",
-						SystemFonts.DefaultFont,
-						Brushes.Black,
-						new PointF(pbProcess.Width / 2 - (gr.MeasureString(percent.ToString() + "%",
-								SystemFonts.DefaultFont).Width / 2.0F),
-						pbProcess.Height / 2 - (gr.MeasureString(percent.ToString() + "%",
-								SystemFonts.DefaultFont).Height / 2.0F)));
-			}
-			Application.DoEvents();
-		}
-
 		StringBuilder myFixes;
 		int myFixesCount = 0;
 		int myConvertCount = 0;
@@ -1199,7 +988,6 @@ namespace VEPROMS
 			{
 				txtResults.AppendText(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));
 				Application.DoEvents();
-				//myFixes.AppendLine(string.Format("Fixed Referenced Object for {1}{0}Old Text: {2}{0}New Text: {3}{0}", Environment.NewLine, (sender as ItemInfo).ShortPath, args.OldValue, args.NewValue));
 			}
 			else // B2018-002 - Invalid Transitions - Display Transition Cconversion Statistics
 			{
@@ -1354,14 +1142,6 @@ namespace VEPROMS
 			pnlLater.Enabled = chkLater.Checked;
 		}
 
-		// C2017-030 new Admin Tools user interface
-		private void sideNavItmCheck_Click(object sender, EventArgs e)
-		{
-			AdminToolType = E_AdminToolType.Check;
-			lblAdmToolProgressType.Text = "Checking:";
-			setupProgessSteps1();
-		}
-
 		// C2017-030 new Admin Tools user interface
 		private void sideNavItmRepair_Click(object sender, EventArgs e)
 		{
@@ -1387,13 +1167,6 @@ namespace VEPROMS
 				ResetTV(false);
 		}
 
-		// C2017-030 new Admin Tools user interface
-		private void sideNavItmUsers_Click(object sender, EventArgs e)
-		{
-			AdminToolType = E_AdminToolType.Users;
-			setupProgessSteps1();
-		}
-
 		// C2017-030 new Admin Tools user interface
 		private void sideNavItmExit_Click(object sender, EventArgs e)
 		{
@@ -1413,27 +1186,18 @@ namespace VEPROMS
 				ResetDelTV(false);
 		}
 
-		// new Admin Tools user interface for deletes
-		//private void sideNavItmDelete_Click_1(object sender, EventArgs e)
-		//{
-
-		//}
-
 		#region On/Off Swiches
 
 		// C2017-030 new Admin Tools user interface
 		private enum E_AdminToolType : int
 		{
-			Check = 0,
 			Repair = 1,
 			Links = 2,
-			Users = 3,
 			Delete = 4
 		};
-		private E_AdminToolType AdminToolType = 0;
+		private E_AdminToolType AdminToolType = E_AdminToolType.Repair;
 
 		DevComponents.DotNetBar.StepItem siOrphDatRecs = new DevComponents.DotNetBar.StepItem("siOrphDatRecs", "Orphan Data Records");
-		DevComponents.DotNetBar.StepItem siHiddenDataLocs = new DevComponents.DotNetBar.StepItem("siHiddenDataLocs", "Hidden Data");
 		DevComponents.DotNetBar.StepItem siObsoleteROData = new DevComponents.DotNetBar.StepItem("siObsoleteROData", "Obsolete RO Data");
 		DevComponents.DotNetBar.StepItem siStandardHyphens = new DevComponents.DotNetBar.StepItem("siStandardHyphens", "Standardize Hyphens");
 		DevComponents.DotNetBar.StepItem siRefreshAttmts = new DevComponents.DotNetBar.StepItem("siRefreshAttmts", "Refresh Word Attachments");
@@ -1446,18 +1210,6 @@ namespace VEPROMS
 
 			switch (AdminToolType)
 			{
-				case E_AdminToolType.Check:
-					if (swCkOrphanDataRecs.Value)
-						progressSteps1.Items.Add(siOrphDatRecs);
-					if (swHiddenDataLocs.Value)
-						progressSteps1.Items.Add(siHiddenDataLocs);
-					if (swCkObsoleteROData.Value)
-						progressSteps1.Items.Add(siObsoleteROData);
-					splitContainer3.Panel2Collapsed = false;
-					progressSteps1.Visible = true;
-					progressSteps1.Refresh();
-					break;
-
 				case E_AdminToolType.Repair:
 					if (swRmOrphanDataRecs.Value)
 						progressSteps1.Items.Add(siOrphDatRecs);
@@ -1475,7 +1227,6 @@ namespace VEPROMS
 					break;
 
 				case E_AdminToolType.Links:
-				case E_AdminToolType.Users:
 					splitContainer3.Panel2Collapsed = true;
 					progressSteps1.Visible = false;
 					break;
@@ -1532,7 +1283,6 @@ namespace VEPROMS
 		private void StepProgress(int prgStpIdx, int val)
 		{
 			((DevComponents.DotNetBar.StepItem)progressSteps1.Items[prgStpIdx]).Value = val;
-			return;
 		}
 
 		private void ClearStepProgress()
@@ -1595,42 +1345,6 @@ namespace VEPROMS
 				CheckROLinks(); // C2022-028 check for Bad RO Links
 		}
 
-		private void btnRunCheck_Click(object sender, EventArgs e)
-		{
-			if (!CheckProcessLater()) return;  // delay processing if set//B2017-221 Allow the batch dialog to close when waiting to process.
-
-			int prgStpIdx = -1;
-			txtResults.Clear();
-			txtProcess.Clear();
-
-			if (swCkOrphanDataRecs.Value)
-			{
-				StepProgress(++prgStpIdx, 50);
-				IdentifyDisconnectedItems(); // orphan items
-				StepProgress(prgStpIdx, 100);
-			}
-
-			if (swHiddenDataLocs.Value)
-			{
-				StepProgress(++prgStpIdx, 50);
-				IdentifyNonEditableItems(); // hidden items
-				StepProgress(prgStpIdx, 100);
-			}
-
-			if (swCkObsoleteROData.Value)
-			{
-				StepProgress(++prgStpIdx, 25);
-				IdentifyROAssociations();
-				StepProgress(prgStpIdx, 50);
-				IdentifyUnusedRoFstsAndFigures();
-				StepProgress(prgStpIdx, 100);
-			}
-
-			MessageBox.Show("Check Functions Completed", "Check");
-
-			ClearStepProgress();
-		}
-
 		private void btnRunRepair_Click(object sender, EventArgs e)
 		{
 			if (!CheckProcessLater()) return;  // delay processing if set//B2017-221 Allow the batch dialog to close when waiting to process.
@@ -1755,12 +1469,12 @@ namespace VEPROMS
 				if (!MySessionInfo.CanCheckOutItem(dq.VersionID, CheckOutType.DocVersion, ref msg))
 				{
 					string msgp = string.Empty;
-					foreach (ProcedureInfo pi in dq.Procedures)
+					foreach (ProcedureInfo pi in dq.Procedures.OfType<ProcedureInfo>())
 					{
 						if (!MySessionInfo.CanCheckOutItem(pi.ItemID, CheckOutType.Procedure, ref msgp))
 						{
 							FolderInfo fi = (FolderInfo)dq.ActiveParent;
-							int itemID = (int)fi.FolderID;
+							int itemID = fi.FolderID;
 							string folderName = fi.Name;
 
 							if (swDeleteFolder.Value)
@@ -1853,7 +1567,7 @@ namespace VEPROMS
 			{
 				//Gather folder information			
 				FolderInfo fi = (FolderInfo)kvp.ActiveParent;
-				int itemID = (int)fi.FolderID;
+				int itemID = fi.FolderID;
 				string folderName = fi.Name;
 
 				// Perform the deletion operation
@@ -1877,8 +1591,8 @@ namespace VEPROMS
 			foreach (var kvp in emptyFoldersToDelete)
 			{
 				//Gather folder information			
-				FolderInfo fi = (FolderInfo)kvp;
-				int itemID = (int)fi.FolderID;
+				FolderInfo fi = kvp;
+				int itemID = fi.FolderID;
 				string folderName = fi.Name;
 
 				// Perform the deletion operation
@@ -1929,9 +1643,8 @@ namespace VEPROMS
 
 				return true;
 			}
-			catch (Exception ex)
+			catch
 			{
-				string err = ex.ToString();
 				return false;
 			}
 		}

PROMS/VEPROMS User Interface/frmBatchRefresh.resx

@@ -120,196 +120,6 @@
   <metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <data name="swDeleteFolder.SuperTooltip" xml:space="preserve">
-    <value>This allows the user to remove folders and sub folders as well as their contents.
-
-Be sure a current backup of the database exists prior performing this function.
-
-It is recommended that this be done during off hours.
-
-</value>
-  </data>
-  <data name="labelX13.SuperTooltip" xml:space="preserve">
-    <value>This allows the user to remove folders and sub folders as well as their contents.
-
-Be sure a current backup of the database exists prior performing this function.
-
-It is recommended that this be done during off hours.
-
-</value>
-  </data>
-  <data name="swDeleteAnnotations.SuperTooltip" xml:space="preserve">
-    <value>This function will allow the user to remove annotations from the selected working drafts.
-
-Be sure a current backup of the database exists prior to running this function.
-
-If more than one working draft is selected, it is recommended that this be performed during off hours.</value>
-  </data>
-  <data name="labelX14.SuperTooltip" xml:space="preserve">
-    <value>This function will allow the user to remove annotations from the selected working drafts.
-
-Be sure a current backup of the database exists prior to running this function.
-
-If more than one working draft is selected, it is recommended that this be performed during off hours.</value>
-  </data>
-  <data name="btnDeleteItems.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/xhBQAAAp5JREFUOE+F
-        k11Ik1Ecxv9zouJ2E4TWnR8V5tAppJmYsLnNlaLTxAoiKIQiibpYSmEEmSSa0IVGISMUw7rpE+yiQiuk
-        /IhROssPyjanpL4udeq29z3nCdcH+Wb1g+fq/zzP+R8Oh+gvPK4kNWujp1IrPek8S5Hy+X9hbXSN9aVC
-        eq1FwEYN8vk/mWqiDPZwI+NOHbhLj8CdDaK7npLlvnWpO0AKqZV62YgO/GMquDMN0rAevkbqlHvXZdlG
-        h6Rn8eATu4GJncB0Fvh8HnwPYuGpJ4vcvwZbGYWJrcpPzGXG8ngGtsZFQJOggrS0B9J0MbwNIR9uHqRQ
-        ee4XPhuVSy814IIB/lk9QkIIanUomFgIzkux0qHB/CUqk+eCtB2jCLEl1M1mLcBSLthKHlQqJaKjw8FZ
-        Mbi/ENKXEizUKD/f2k9h8jz5mumk2K0F9xUAUgE4K0JUVDji4yLBvflgMyYwlxFL9zSYq6ITa8I3DlNY
-        wKZ0soVSgFkAXgwuFSEmJhJJiWqwCR3YSCbY2x0QB4zwnFc6W4p+22KxiY4EXiQF74kf6/L5vdi+TYV0
-        rRpsMB2sPxWsRwvpTTq87QmYOUNHg+HqQlL4ryscbK4UPGD5vu60CWw8G7evbkN7bSykXm0w/FMBew6E
-        CsXQFQMpaLKezP6OLeDL+8AFM5hLBzaciennKcFXUCgI7o7ENQWSfRcWmmPgPEW5tNJIj8QxM9hkDthY
-        FthAGlh/SvAPXC7fjOrjmyC+Sl5TsCpfdzYEK92llUbllDiaD3HEDPG9CaLDCGnI9IdEhwnioBHiOwMC
-        dj38fYbVglHy1FGJt57uL9ZS10IN9cxfJPvXCzTgqSKH5xwNzVXSkFBBDsFKA4KV7IKVegQrda2e7j5N
-        ud8AKwnMnBpmYFAAAAAASUVORK5CYII=
-</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/xhBQAAAp5JREFUOE+F
-        k11Ik1Ecxv9zouJ2E4TWnR8V5tAppJmYsLnNlaLTxAoiKIQiibpYSmEEmSSa0IVGISMUw7rpE+yiQiuk
-        /IhROssPyjanpL4udeq29z3nCdcH+Wb1g+fq/zzP+R8Oh+gvPK4kNWujp1IrPek8S5Hy+X9hbXSN9aVC
-        eq1FwEYN8vk/mWqiDPZwI+NOHbhLj8CdDaK7npLlvnWpO0AKqZV62YgO/GMquDMN0rAevkbqlHvXZdlG
-        h6Rn8eATu4GJncB0Fvh8HnwPYuGpJ4vcvwZbGYWJrcpPzGXG8ngGtsZFQJOggrS0B9J0MbwNIR9uHqRQ
-        ee4XPhuVSy814IIB/lk9QkIIanUomFgIzkux0qHB/CUqk+eCtB2jCLEl1M1mLcBSLthKHlQqJaKjw8FZ
-        Mbi/ENKXEizUKD/f2k9h8jz5mumk2K0F9xUAUgE4K0JUVDji4yLBvflgMyYwlxFL9zSYq6ITa8I3DlNY
-        wKZ0soVSgFkAXgwuFSEmJhJJiWqwCR3YSCbY2x0QB4zwnFc6W4p+22KxiY4EXiQF74kf6/L5vdi+TYV0
-        rRpsMB2sPxWsRwvpTTq87QmYOUNHg+HqQlL4ryscbK4UPGD5vu60CWw8G7evbkN7bSykXm0w/FMBew6E
-        CsXQFQMpaLKezP6OLeDL+8AFM5hLBzaciennKcFXUCgI7o7ENQWSfRcWmmPgPEW5tNJIj8QxM9hkDthY
-        FthAGlh/SvAPXC7fjOrjmyC+Sl5TsCpfdzYEK92llUbllDiaD3HEDPG9CaLDCGnI9IdEhwnioBHiOwMC
-        dj38fYbVglHy1FGJt57uL9ZS10IN9cxfJPvXCzTgqSKH5xwNzVXSkFBBDsFKA4KV7IKVegQrda2e7j5N
-        ud8AKwnMnBpmYFAAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="warningBox3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAp5JREFUOE+F
-        k11Ik1Ecxv9zouJ2E4TWnR8V5tAppJmYsLnNlaLTxAoiKIQiibpYSmEEmSSa0IVGISMUw7rpE+yiQiuk
-        /IhROssPyjanpL4udeq29z3nCdcH+Wb1g+fq/zzP+R8Oh+gvPK4kNWujp1IrPek8S5Hy+X9hbXSN9aVC
-        eq1FwEYN8vk/mWqiDPZwI+NOHbhLj8CdDaK7npLlvnWpO0AKqZV62YgO/GMquDMN0rAevkbqlHvXZdlG
-        h6Rn8eATu4GJncB0Fvh8HnwPYuGpJ4vcvwZbGYWJrcpPzGXG8ngGtsZFQJOggrS0B9J0MbwNIR9uHqRQ
-        ee4XPhuVSy814IIB/lk9QkIIanUomFgIzkux0qHB/CUqk+eCtB2jCLEl1M1mLcBSLthKHlQqJaKjw8FZ
-        Mbi/ENKXEizUKD/f2k9h8jz5mumk2K0F9xUAUgE4K0JUVDji4yLBvflgMyYwlxFL9zSYq6ITa8I3DlNY
-        wKZ0soVSgFkAXgwuFSEmJhJJiWqwCR3YSCbY2x0QB4zwnFc6W4p+22KxiY4EXiQF74kf6/L5vdi+TYV0
-        rRpsMB2sPxWsRwvpTTq87QmYOUNHg+HqQlL4ryscbK4UPGD5vu60CWw8G7evbkN7bSykXm0w/FMBew6E
-        CsXQFQMpaLKezP6OLeDL+8AFM5hLBzaciennKcFXUCgI7o7ENQWSfRcWmmPgPEW5tNJIj8QxM9hkDthY
-        FthAGlh/SvAPXC7fjOrjmyC+Sl5TsCpfdzYEK92llUbllDiaD3HEDPG9CaLDCGnI9IdEhwnioBHiOwMC
-        dj38fYbVglHy1FGJt57uL9ZS10IN9cxfJPvXCzTgqSKH5xwNzVXSkFBBDsFKA4KV7IKVegQrda2e7j5N
-        ud8AKwnMnBpmYFAAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="swCkObsoleteROData.SuperTooltip" xml:space="preserve">
-    <value>Referenced Objects databases are associated with a procedure set (such as Working Draft). 
-
-RO paths, ROFST versions, and the contents of RO figures are stored in the database when referenced. This tool will identify stored RO Paths, ROFST versions, and Figures that are no longer used.
-</value>
-  </data>
-  <data name="swHiddenDataLocs.SuperTooltip" xml:space="preserve">
-    <value>Typically, a section in PROMS only has sub-sections or steps.  When and existing section is divided into sub-sections, the resulting main section might have both.
-
-When this occurs, the step data in the main section can be marked as non-editable.  The user can no longer get to these steps and they can become forgotten as PROMS will ignore these non-editable steps when the procedure is printed.
-
-This tool will identify if the database has non-editable steps and provide a listing of these steps. The use can then go to these main sections, make them editable via the property page, and delete or move these steps.
-
-This tool may take an extended period of time to execute.
-</value>
-  </data>
-  <data name="labelX3.SuperTooltip" xml:space="preserve">
-    <value>Referenced Objects databases are associated with a procedure set (such as Working Draft). 
-
-RO paths, ROFST versions, and the contents of RO figures are stored in the database when referenced. This tool will identify stored RO Paths, ROFST versions, and Figures that are no longer used.
-</value>
-  </data>
-  <data name="labelX2.SuperTooltip" xml:space="preserve">
-    <value>Typically, a section in PROMS only has sub-sections or steps.  When and existing section is divided into sub-sections, the resulting main section might have both.
-
-When this occurs, the step data in the main section can be marked as non-editable.  The user can no longer get to these steps and they can become forgotten as PROMS will ignore these non-editable steps when the procedure is printed.
-
-This tool will identify if the database has non-editable steps and provide a listing of these steps. The use can then go to these main sections, make them editable via the property page, and delete or move these steps.
-
-This tool may take an extended period of time to execute.
-</value>
-  </data>
-  <data name="swCkOrphanDataRecs.SuperTooltip" xml:space="preserve">
-    <value>Everything in PROMS is inter-related.  A working draft knows what is its first procedure and a procedure knows what is its first step.  Likewise, a procedure knows what procedure is before it and after it.
-
-Should an item become orphaned (disconnected) from the rest of the data, it will no longer be accessible.  This tool detects any orphaned items in the database.
-
-This tool may take an extended period of time to execute.
-</value>
-  </data>
-  <data name="labelX1.SuperTooltip" xml:space="preserve">
-    <value>Everything in PROMS is inter-related.  A working draft knows what is its first procedure and a procedure knows what is its first step.  Likewise, a procedure knows what procedure is before it and after it.
-
-Should an item become orphaned (disconnected) from the rest of the data, it will no longer be accessible.  This tool detects any orphaned items in the database.
-
-This tool may take an extended period of time to execute.
-</value>
-  </data>
   <data name="swRefreshTblsForSrch.SuperTooltip" xml:space="preserve">
     <value>When Word attachments are modified and saved, PROMS will create a PDF of the attachment contents and save it in the database.  When this is done, all the of the RO references are resolved as well as pagination of the attachment.  This speeds up the overall printing of the procedure in that PROMS simply inserts the attachment contents.
 
@@ -322,6 +132,7 @@ This function will remove all of the saved attachment PDFS stored in the databas
 This function will remove all of the saved attachment PDFS stored in the database (not the PDFs of the entire procedure that you had previous printed).  This will force PROMS to regenerate (and save) the word attachment PDFs the next time the procedure is printed.
 </value>
   </data>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="warningBox4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAp5JREFUOE+F
@@ -404,6 +215,130 @@ 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="swDeleteFolder.SuperTooltip" xml:space="preserve">
+    <value>This allows the user to remove folders and sub folders as well as their contents.
+
+Be sure a current backup of the database exists prior performing this function.
+
+It is recommended that this be done during off hours.
+
+</value>
+  </data>
+  <data name="labelX13.SuperTooltip" xml:space="preserve">
+    <value>This allows the user to remove folders and sub folders as well as their contents.
+
+Be sure a current backup of the database exists prior performing this function.
+
+It is recommended that this be done during off hours.
+
+</value>
+  </data>
+  <data name="swDeleteAnnotations.SuperTooltip" xml:space="preserve">
+    <value>This function will allow the user to remove annotations from the selected working drafts.
+
+Be sure a current backup of the database exists prior to running this function.
+
+If more than one working draft is selected, it is recommended that this be performed during off hours.</value>
+  </data>
+  <data name="labelX14.SuperTooltip" xml:space="preserve">
+    <value>This function will allow the user to remove annotations from the selected working drafts.
+
+Be sure a current backup of the database exists prior to running this function.
+
+If more than one working draft is selected, it is recommended that this be performed during off hours.</value>
+  </data>
+  <data name="btnDeleteItems.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>
+  <data name="warningBox5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAp5JREFUOE+F
+        k11Ik1Ecxv9zouJ2E4TWnR8V5tAppJmYsLnNlaLTxAoiKIQiibpYSmEEmSSa0IVGISMUw7rpE+yiQiuk
+        /IhROssPyjanpL4udeq29z3nCdcH+Wb1g+fq/zzP+R8Oh+gvPK4kNWujp1IrPek8S5Hy+X9hbXSN9aVC
+        eq1FwEYN8vk/mWqiDPZwI+NOHbhLj8CdDaK7npLlvnWpO0AKqZV62YgO/GMquDMN0rAevkbqlHvXZdlG
+        h6Rn8eATu4GJncB0Fvh8HnwPYuGpJ4vcvwZbGYWJrcpPzGXG8ngGtsZFQJOggrS0B9J0MbwNIR9uHqRQ
+        ee4XPhuVSy814IIB/lk9QkIIanUomFgIzkux0qHB/CUqk+eCtB2jCLEl1M1mLcBSLthKHlQqJaKjw8FZ
+        Mbi/ENKXEizUKD/f2k9h8jz5mumk2K0F9xUAUgE4K0JUVDji4yLBvflgMyYwlxFL9zSYq6ITa8I3DlNY
+        wKZ0soVSgFkAXgwuFSEmJhJJiWqwCR3YSCbY2x0QB4zwnFc6W4p+22KxiY4EXiQF74kf6/L5vdi+TYV0
+        rRpsMB2sPxWsRwvpTTq87QmYOUNHg+HqQlL4ryscbK4UPGD5vu60CWw8G7evbkN7bSykXm0w/FMBew6E
+        CsXQFQMpaLKezP6OLeDL+8AFM5hLBzaciennKcFXUCgI7o7ENQWSfRcWmmPgPEW5tNJIj8QxM9hkDthY
+        FthAGlh/SvAPXC7fjOrjmyC+Sl5TsCpfdzYEK92llUbllDiaD3HEDPG9CaLDCGnI9IdEhwnioBHiOwMC
+        dj38fYbVglHy1FGJt57uL9ZS10IN9cxfJPvXCzTgqSKH5xwNzVXSkFBBDsFKA4KV7IKVegQrda2e7j5N
+        ud8AKwnMnBpmYFAAAAAASUVORK5CYII=
+</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/xhBQAAAp5JREFUOE+F
+        k11Ik1Ecxv9zouJ2E4TWnR8V5tAppJmYsLnNlaLTxAoiKIQiibpYSmEEmSSa0IVGISMUw7rpE+yiQiuk
+        /IhROssPyjanpL4udeq29z3nCdcH+Wb1g+fq/zzP+R8Oh+gvPK4kNWujp1IrPek8S5Hy+X9hbXSN9aVC
+        eq1FwEYN8vk/mWqiDPZwI+NOHbhLj8CdDaK7npLlvnWpO0AKqZV62YgO/GMquDMN0rAevkbqlHvXZdlG
+        h6Rn8eATu4GJncB0Fvh8HnwPYuGpJ4vcvwZbGYWJrcpPzGXG8ngGtsZFQJOggrS0B9J0MbwNIR9uHqRQ
+        ee4XPhuVSy814IIB/lk9QkIIanUomFgIzkux0qHB/CUqk+eCtB2jCLEl1M1mLcBSLthKHlQqJaKjw8FZ
+        Mbi/ENKXEizUKD/f2k9h8jz5mumk2K0F9xUAUgE4K0JUVDji4yLBvflgMyYwlxFL9zSYq6ITa8I3DlNY
+        wKZ0soVSgFkAXgwuFSEmJhJJiWqwCR3YSCbY2x0QB4zwnFc6W4p+22KxiY4EXiQF74kf6/L5vdi+TYV0
+        rRpsMB2sPxWsRwvpTTq87QmYOUNHg+HqQlL4ryscbK4UPGD5vu60CWw8G7evbkN7bSykXm0w/FMBew6E
+        CsXQFQMpaLKezP6OLeDL+8AFM5hLBzaciennKcFXUCgI7o7ENQWSfRcWmmPgPEW5tNJIj8QxM9hkDthY
+        FthAGlh/SvAPXC7fjOrjmyC+Sl5TsCpfdzYEK92llUbllDiaD3HEDPG9CaLDCGnI9IdEhwnioBHiOwMC
+        dj38fYbVglHy1FGJt57uL9ZS10IN9cxfJPvXCzTgqSKH5xwNzVXSkFBBDsFKA4KV7IKVegQrda2e7j5N
+        ud8AKwnMnBpmYFAAAAAASUVORK5CYII=
 </value>
   </data>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

PROMS/VEPROMS User Interface/frmFolderProperties.cs

@@ -128,7 +128,7 @@ namespace VEPROMS
 		private LocalAnnotationTypeInfoList myLocalAnnotationTypeInfoList = null; 
 		private StageInfoList myStageInfoList = null;
 		private LocalStageInfoList myLocalStageInfoList = null;
-        private int? _cmbxformatOriginal = null;
+
 		private void frmFolderProperties_Load(object sender, EventArgs e)
 		{
 			_Initializing = true;
@@ -149,7 +149,7 @@ namespace VEPROMS
 			ppCmbxFormat.DisplayMember = "FullName";
 			ppCmbxFormat.ValueMember = "FullName";
 			ppCmbxFormat.DataSource = FormatUtility.GetFilteredFormatList(FormatInfoList.SortedFormatInfoList);
-			if (_FolderConfig != null && _FolderConfig.MyFolder != null) _cmbxformatOriginal = _FolderConfig.MyFolder.FormatID;
+
 			if (_FolderConfig.FormatSelection != null)
 			{
 				ppCmbxFormat.SelectedValue = _FolderConfig.FormatSelection;
@@ -337,24 +337,7 @@ namespace VEPROMS
 				btnAnnoTypeUndo.PerformClick();
 			//if (btnAnnoTypeSave.Enabled) return;
 			folderConfigBindingSource.EndEdit();
-            // if there is a change to the format, clean up any overridden formats that point to the selected item before saving the format change:
-            if (_FolderConfig.MyFolder.FormatID != _cmbxformatOriginal)
-            {
-                // clean up & then refresh the configs
-                using (ContentInfoList cil = ContentInfoList.ClearOverrideFormatsByFolder(_FolderConfig.MyFolder.FolderID, _cmbxformatOriginal, _FolderConfig.MyFolder.FormatID))
-                {
-                    foreach (ContentInfo ci in cil)
-                    {
-                        using (Content c = ci.Get())
-                        {
-                            // first refresh configs because the ContentInfo.Refresh causes events to occur that refresh screen
-                            // and if configs aren't done first, the screen refresh, if based on config data, will not be correct.
-                            foreach (ItemInfo ii in ci.ContentItems) ii.RefreshConfig();
-                            ContentInfo.Refresh(c);
-                        }
-                    }
-                }
-            }
+
 			// Save Default settings for User
 			//
 			// Save whether we should display the default values on this property page

PROMS/VEPROMS User Interface/frmGenTools.cs

@@ -0,0 +1,436 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using VEPROMS.CSLA.Library;
+using System.IO;
+using Volian.Controls.Library;
+using DevComponents.DotNetBar;
+using JR.Utils.GUI.Forms;
+using System.Linq;
+
+namespace VEPROMS
+{
+	public partial class frmGenTools : Form
+	{
+		private SessionInfo _MySessionInfo;
+		public SessionInfo MySessionInfo
+		{
+			get { return _MySessionInfo; }
+			set { _MySessionInfo = value; }
+		}
+
+		public frmGenTools(SessionInfo sessionInfo, frmVEPROMS veProms)
+		{
+			InitializeComponent();
+			_MySessionInfo = sessionInfo;
+
+			// When opening General tools Check tab will be default.
+			this.sideNavItmCheck.Checked = true;
+
+			setupProgessSteps1(); // C2017-030 - new Tools user interface
+
+		}
+
+		private void frmGenTools_Load(object sender, EventArgs e)
+		{
+			IsClosing = false;//B2017-221 Allow the batch dialog to close when waiting to process.
+		}
+		private bool IsClosing = false;//B2017-221 Allow the batch dialog to close when waiting to process.
+		private void frmGenTools_FormClosing(object sender, EventArgs e)
+		{
+			IsClosing = true;//B2017-221 Allow the batch dialog to close when waiting to process.
+		}
+
+		// C2017-030 - new Tools user interface
+		// tool renamed to Identify Orphan Items
+		private void IdentifyDisconnectedItems()
+		{
+			this.Cursor = Cursors.WaitCursor;
+			DateTime pStart = DateTime.Now;
+			txtProcess.AppendText("Identifing Orphan Items");
+			txtProcess.AppendText(Environment.NewLine);
+			txtProcess.AppendText(string.Format("Started: {0}", pStart.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(Environment.NewLine);
+			Application.DoEvents();
+			int rowCount = ESP_IdentifyDisconnectedItems.Execute("vesp_GetDisconnectedItemsCount");
+			txtProcess.AppendText(string.Format("Orphan Items Count:  {0}", rowCount));
+			txtProcess.AppendText(Environment.NewLine);
+			if (rowCount > 0)
+			{
+				txtResults.AppendText(string.Format("The database contains {0} Orphan items.", rowCount));
+				txtResults.AppendText(Environment.NewLine);
+				txtResults.AppendText("These can be removed via the Remove Orphan Data Records in the Repair tools");
+				txtResults.AppendText(Environment.NewLine);
+				txtResults.AppendText(Environment.NewLine);
+			}
+			else
+			{
+				txtResults.AppendText("No Orphan Records Found");// B2017-108 Always output results even if there isn't any 
+				txtResults.AppendText(Environment.NewLine);
+				txtResults.AppendText(Environment.NewLine);
+			}
+			DateTime pEnd = DateTime.Now;
+			txtProcess.AppendText(string.Format("Completed: {0}", pEnd.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(Environment.NewLine);
+			txtProcess.AppendText(Environment.NewLine);
+			Application.DoEvents();
+			this.Cursor = Cursors.Default;
+		}
+
+		// C2017-030 - new Tools user interface
+		// is one of two tools run from Check Obsolete RO Data
+		private void IdentifyUnusedRoFstsAndFigures()
+		{
+			this.Cursor = Cursors.WaitCursor;
+			DateTime pStart = DateTime.Now;
+			txtProcess.AppendText("Identifing Unused RoFsts and Figures");
+			txtProcess.AppendText(Environment.NewLine);
+			txtProcess.AppendText(string.Format("Started: {0}", pStart.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(Environment.NewLine);
+			Application.DoEvents();
+			int rowCountRoFst = ESP_GetUnusedRoFsts.Execute("vesp_GetUnusedRoFstsCount");
+			int rowCountFigures = ESP_GetUnusedFigures.Execute("vesp_GetUnusedFiguresCount");
+			txtProcess.AppendText(string.Format("Unused RoFsts Count:  {0}, Unused Figures Count:  {1}", rowCountRoFst, rowCountFigures));
+			txtProcess.AppendText(Environment.NewLine);
+			if (rowCountRoFst > 0 || rowCountFigures > 0)
+			{
+				txtResults.AppendText(string.Format("The database contains {0} unused RoFsts.", rowCountRoFst));
+				txtResults.AppendText(Environment.NewLine);
+				txtResults.AppendText(string.Format("The database contains {0} unused Figures items.", rowCountFigures));
+				txtResults.AppendText(Environment.NewLine);
+				txtResults.AppendText(Environment.NewLine);
+			}
+			else
+			{
+				txtResults.AppendText("No Unused  RoFsts or Figures Found"); // B2017-108 Always output results even if there isn't any
+				txtResults.AppendText(Environment.NewLine);
+				txtResults.AppendText(Environment.NewLine);
+			}
+
+			DateTime pEnd = DateTime.Now;
+			txtProcess.AppendText(string.Format("Completed: {0}", pEnd.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(Environment.NewLine);
+			txtProcess.AppendText(string.Format("Started: {0}", pStart.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(Environment.NewLine);
+			Application.DoEvents();
+			this.Cursor = Cursors.Default;
+		}
+
+        // C2017-030 - new Tools user interface
+        // is one of two tools run from Check Obsolete RO Data
+        private void IdentifyROAssociations()
+		{
+			this.Cursor = Cursors.WaitCursor;
+			DateTime pStart = DateTime.Now;
+			txtProcess.AppendText("Identifing Unused RO Associations");
+			txtProcess.AppendText(Environment.NewLine);
+			txtProcess.AppendText(string.Format("Started: {0}", pStart.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(Environment.NewLine);
+			Application.DoEvents();
+			int rowCount = ESP_GetROAssoc.Execute("vesp_GetUnusedROAssociationsCount");
+			txtProcess.AppendText(string.Format("Unused RO Associations Count:  {0}", rowCount));
+			txtProcess.AppendText(Environment.NewLine);
+			if (rowCount > 0)
+			{
+				txtResults.AppendText(string.Format("The database contains {0} unused RO Associations.", rowCount));
+				txtResults.AppendText(Environment.NewLine);
+				txtResults.AppendText(Environment.NewLine);
+			}
+			else
+			{
+				txtResults.AppendText("No unused RO Associations Found");// B2017-108 Always output results even if there isn't any
+				txtResults.AppendText(Environment.NewLine);
+				txtResults.AppendText(Environment.NewLine);
+			}
+			DateTime pEnd = DateTime.Now;
+			txtProcess.AppendText(string.Format("Completed: {0}", pEnd.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(Environment.NewLine);
+			txtProcess.AppendText(Environment.NewLine);
+			Application.DoEvents();
+			this.Cursor = Cursors.Default;
+		}
+
+		// C2017-030 - new Tools user interface
+		// tool was renamed to Hidden Data Locations (on Check list)
+		private void IdentifyNonEditableItems()
+		{
+			this.Cursor = Cursors.WaitCursor;
+			DateTime pStart = DateTime.Now;
+			txtProcess.AppendText("Identifing Hidden Item Locations");
+			txtProcess.AppendText(Environment.NewLine);
+			txtProcess.AppendText(string.Format("Started: {0}", pStart.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(Environment.NewLine);
+			Application.DoEvents();
+			List<ItemInfo> myItems = ESP_IdentifyNonEditableItems.Execute("vesp_GetNonEditableItems");
+			txtProcess.AppendText(string.Format("Hidden Items Count:  {0}", myItems.Count));
+			txtProcess.AppendText(Environment.NewLine);
+			if (myItems.Count > 0)
+			{
+				txtResults.AppendText("The following items are hidden (non-editable)...");
+				txtResults.AppendText(Environment.NewLine);
+				txtResults.AppendText(Environment.NewLine);
+				foreach (ItemInfo ii in myItems)
+				{
+					txtResults.AppendText(ii.Path);
+					txtResults.AppendText(Environment.NewLine);
+				}
+				txtResults.AppendText(Environment.NewLine);
+			}
+			else
+			{
+				txtResults.AppendText("No Hidden Data Found");// B2017-108 Always output results even if there isn't any
+				txtResults.AppendText(Environment.NewLine);
+				txtResults.AppendText(Environment.NewLine);
+			}
+			//C2025-011 RO Update Tool Memory Enhancements 
+			//clear the list since no longer using it
+			myItems.Clear();
+			DateTime pEnd = DateTime.Now;
+			txtProcess.AppendText(string.Format("Completed: {0}", pEnd.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(Environment.NewLine);
+			txtProcess.AppendText(Environment.NewLine);
+			Application.DoEvents();
+			this.Cursor = Cursors.Default;
+		}
+
+		// C2017-030 - new Tools user interface
+		// tool was renamed to Show Users
+		private void GetDatabaseSessions()
+		{
+			this.Cursor = Cursors.WaitCursor;
+			DateTime pStart = DateTime.Now;
+			txtProcess.AppendText("Show Users in PROMS");
+			txtProcess.AppendText(Environment.NewLine);
+			txtProcess.AppendText(string.Format("Started: {0}", pStart.ToString("MM/dd/yyyy @ HH:mm")));
+			txtProcess.AppendText(Environment.NewLine);
+			Application.DoEvents();
+			txtResults.Clear();
+			txtResults.AppendText(ESP_GetDatabaseSessions.Execute("vesp_GetDatabaseSessions"));
+			DateTime pEnd = DateTime.Now;
+			txtProcess.AppendText(string.Format("Completed: {0}", pEnd.ToString("MM/dd/yyyy @ HH:mm")));
+			Application.DoEvents();
+			this.Cursor = Cursors.Default;
+			MessageBox.Show("Show Users Completed", "Show Users");
+		}
+
+        public List<string> roFstInfo_ROTableUpdate(object sender, ROFstInfoROTableUpdateEventArgs args)
+		{
+			return VlnFlexGrid.ROTableUpdate(sender, args);
+		}
+
+        private void btnClear_Click(object sender, EventArgs e)
+		{
+			txtResults.Clear();
+		}
+
+		private void btnSave_Click(object sender, EventArgs e)
+		{
+			SaveFileDialog sfd = new SaveFileDialog();
+			sfd.DefaultExt = "txt";
+			sfd.AddExtension = true;
+			sfd.Filter = "Text Files (*.txt)|*.txt";
+			sfd.FileName = string.Format("BatchRefreshResults_{0}", DateTime.Now.ToString("yyyyMMdd_HHmm"));
+			sfd.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + @"\VEPROMS";
+			DialogResult dr = sfd.ShowDialog();
+
+			if (dr == DialogResult.OK)
+			{
+				System.IO.StreamWriter sw = new System.IO.StreamWriter(sfd.FileName);
+				sw.Write(txtResults.Text);
+				sw.Close();
+			}
+		}
+
+		private ProgressBarItem _ProgressBar = null;
+
+		public ProgressBarItem ProgressBar
+		{
+			get { return _ProgressBar; }
+			set
+			{
+				_ProgressBar = value;
+				_ProgressBar.TextVisible = true;
+			}
+		}
+
+		private void chkLater_CheckedChanged(object sender, EventArgs e)
+		{
+			pnlLater.Enabled = chkLater.Checked;
+		}
+
+		// C2017-030 new Tools user interface
+		private void sideNavItmCheck_Click(object sender, EventArgs e)
+		{
+			GenToolType = E_GenToolType.Check;
+			lblAdmToolProgressType.Text = "Checking:";
+			setupProgessSteps1();
+		}
+
+		// C2017-030 new Tools user interface
+		private void sideNavItmUsers_Click(object sender, EventArgs e)
+		{
+			GenToolType = E_GenToolType.Users;
+			setupProgessSteps1();
+		}
+
+		// C2017-030 new Tools user interface
+		private void sideNavItmExit_Click(object sender, EventArgs e)
+		{
+			this.Close();
+		}
+
+		#region On/Off Swiches
+
+		// C2017-030 new Tools user interface
+		private enum E_GenToolType : int
+		{
+			Check = 0,
+			Users = 3
+		};
+		private E_GenToolType GenToolType = 0;
+
+		DevComponents.DotNetBar.StepItem siOrphDatRecs = new DevComponents.DotNetBar.StepItem("siOrphDatRecs", "Orphan Data Records");
+		DevComponents.DotNetBar.StepItem siHiddenDataLocs = new DevComponents.DotNetBar.StepItem("siHiddenDataLocs", "Hidden Data");
+		DevComponents.DotNetBar.StepItem siObsoleteROData = new DevComponents.DotNetBar.StepItem("siObsoleteROData", "Obsolete RO Data");
+
+		// this will update/rebuild the progress bar in the bottom panel of Tools
+		private void setupProgessSteps1()
+		{
+			progressSteps1.Visible = false;
+			progressSteps1.Items.Clear();
+
+			switch (GenToolType)
+			{
+				case E_GenToolType.Check:
+					if (swCkOrphanDataRecs.Value)
+						progressSteps1.Items.Add(siOrphDatRecs);
+					if (swHiddenDataLocs.Value)
+						progressSteps1.Items.Add(siHiddenDataLocs);
+					if (swCkObsoleteROData.Value)
+						progressSteps1.Items.Add(siObsoleteROData);
+					splitContainer3.Panel2Collapsed = false;
+					progressSteps1.Visible = true;
+					progressSteps1.Refresh();
+					break;
+
+				case E_GenToolType.Users:
+					splitContainer3.Panel2Collapsed = true;
+					progressSteps1.Visible = false;
+					break;
+			}
+		}
+
+		// used for all of the Switch buttons (ON/OFF buttons)
+		private void swCk_ValueChanged(object sender, EventArgs e)
+		{
+			setupProgessSteps1();
+		}
+
+		#endregion
+
+		// C2017-030 New Tools user interface
+		// functions to handle the progress bar in the bottom panel of Tools
+		private void StepProgress(int prgStpIdx, int val)
+		{
+			((DevComponents.DotNetBar.StepItem)progressSteps1.Items[prgStpIdx]).Value = val;
+		}
+
+		private void ClearStepProgress()
+		{
+			for (int i = 0; i < progressSteps1.Items.Count; i++)
+			{
+				((DevComponents.DotNetBar.StepItem)progressSteps1.Items[i]).Value = 0;
+			}
+		}
+
+		// C2017-030 New Tools user interface
+		// button clicks for processing selected tools
+		//B2017-221 Allow the batch dialog to close when waiting to process.
+		private bool CheckProcessLater()  // see if we should delay processing until later
+		{
+			if (chkLater.Checked)
+			{
+				long later = long.Parse(dtpDate.Value.ToString("yyyyMMdd") + dtpTime.Value.ToString("HHmm"));
+				long now = long.Parse(DateTime.Now.ToString("yyyyMMddHHmm"));
+
+				while (now < later)
+				{
+					txtProcess.Clear();
+					txtProcess.AppendText("Waiting...");
+					System.Threading.Thread.Sleep(1000);//Check each second
+					if (IsClosing) return false;//B2017-221 Allow the batch dialog to close when waiting to process.
+					Application.DoEvents();// Allow user interface to react
+					now = long.Parse(DateTime.Now.ToString("yyyyMMddHHmm"));
+				}
+			}
+
+			return true;// Close after complete
+		}
+
+		// C2017-030 new Tools user interface
+		private void btn_ShowUsers_Click(object sender, EventArgs e)
+		{
+			if (!CheckProcessLater()) return;  // delay processing if set//B2017-221 Allow the batch dialog to close when waiting to process.
+
+			txtProcess.Clear();
+			txtResults.Clear();
+
+			GetDatabaseSessions();
+		}
+
+		private void btnRunCheck_Click(object sender, EventArgs e)
+		{
+			if (!CheckProcessLater()) return;  // delay processing if set//B2017-221 Allow the batch dialog to close when waiting to process.
+
+			int prgStpIdx = -1;
+			txtResults.Clear();
+			txtProcess.Clear();
+
+			if (swCkOrphanDataRecs.Value)
+			{
+				StepProgress(++prgStpIdx, 50);
+				IdentifyDisconnectedItems(); // orphan items
+				StepProgress(prgStpIdx, 100);
+			}
+
+			if (swHiddenDataLocs.Value)
+			{
+				StepProgress(++prgStpIdx, 50);
+				IdentifyNonEditableItems(); // hidden items
+				StepProgress(prgStpIdx, 100);
+			}
+
+			if (swCkObsoleteROData.Value)
+			{
+				StepProgress(++prgStpIdx, 25);
+				IdentifyROAssociations();
+				StepProgress(prgStpIdx, 50);
+				IdentifyUnusedRoFstsAndFigures();
+				StepProgress(prgStpIdx, 100);
+			}
+
+			MessageBox.Show("Check Functions Completed", "Check");
+
+			ClearStepProgress();
+		}
+		
+		//C2025-011 RO Update Tool Memory Enhancements
+		private void txtProcess_TextChanged(object sender, EventArgs e)
+        {
+			//clears the stack to help with memory - should never need to undo text changes to this.
+			txtProcess.ClearUndo();
+		}
+
+        private void txtResults_TextChanged(object sender, EventArgs e)
+        {
+			//clears the stack to help with memory - should never need to undo text changes to this.
+			txtResults.ClearUndo();
+		}
+    }
+}
+
+
+
+

PROMS/VEPROMS User Interface/frmGenTools.designer.cs

@@ -0,0 +1,853 @@
+namespace VEPROMS
+{
+	partial class frmGenTools
+    {
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmGenTools));
+            this.splitContainer3 = new System.Windows.Forms.SplitContainer();
+            this.panelEx3 = new DevComponents.DotNetBar.PanelEx();
+            this.txtResults = new System.Windows.Forms.TextBox();
+            this.panel1 = new System.Windows.Forms.Panel();
+            this.btnSave = new System.Windows.Forms.Button();
+            this.btnClear = new System.Windows.Forms.Button();
+            this.label3 = new System.Windows.Forms.Label();
+            this.expandableSplitter2 = new DevComponents.DotNetBar.ExpandableSplitter();
+            this.panelEx2 = new DevComponents.DotNetBar.PanelEx();
+            this.txtProcess = new System.Windows.Forms.TextBox();
+            this.pbProcess = new System.Windows.Forms.ProgressBar();
+            this.label6 = new System.Windows.Forms.Label();
+            this.panel3 = new System.Windows.Forms.Panel();
+            this.pnlLater = new System.Windows.Forms.Panel();
+            this.label5 = new System.Windows.Forms.Label();
+            this.dtpTime = new System.Windows.Forms.DateTimePicker();
+            this.dtpDate = new System.Windows.Forms.DateTimePicker();
+            this.chkLater = new System.Windows.Forms.CheckBox();
+            this.label4 = new System.Windows.Forms.Label();
+            this.expandableSplitter1 = new DevComponents.DotNetBar.ExpandableSplitter();
+            this.panelEx1 = new DevComponents.DotNetBar.PanelEx();
+            this.sideNav1 = new DevComponents.DotNetBar.Controls.SideNav();
+            this.sideNavPanel1 = new DevComponents.DotNetBar.Controls.SideNavPanel();
+            this.warningBox3 = new DevComponents.DotNetBar.Controls.WarningBox();
+            this.labelX7 = new DevComponents.DotNetBar.LabelX();
+            this.line1 = new DevComponents.DotNetBar.Controls.Line();
+            this.swCkObsoleteROData = new DevComponents.DotNetBar.Controls.SwitchButton();
+            this.swHiddenDataLocs = new DevComponents.DotNetBar.Controls.SwitchButton();
+            this.labelX3 = new DevComponents.DotNetBar.LabelX();
+            this.labelX2 = new DevComponents.DotNetBar.LabelX();
+            this.swCkOrphanDataRecs = new DevComponents.DotNetBar.Controls.SwitchButton();
+            this.labelX1 = new DevComponents.DotNetBar.LabelX();
+            this.btnRunCheck = new DevComponents.DotNetBar.ButtonX();
+            this.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();
+            this.sideNavItmUsers = new DevComponents.DotNetBar.Controls.SideNavItem();
+            this.sideNavItmExit = new DevComponents.DotNetBar.Controls.SideNavItem();
+            this.panelEx4 = new DevComponents.DotNetBar.PanelEx();
+            this.progressSteps1 = new DevComponents.DotNetBar.ProgressSteps();
+            this.stepItem1 = new DevComponents.DotNetBar.StepItem();
+            this.stepItem2 = new DevComponents.DotNetBar.StepItem();
+            this.stepItem3 = new DevComponents.DotNetBar.StepItem();
+            this.stepItem4 = new DevComponents.DotNetBar.StepItem();
+            this.lblAdmToolProgressType = new DevComponents.DotNetBar.LabelX();
+            this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem();
+            this.superTooltip1 = new DevComponents.DotNetBar.SuperTooltip();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).BeginInit();
+            this.splitContainer3.Panel1.SuspendLayout();
+            this.splitContainer3.Panel2.SuspendLayout();
+            this.splitContainer3.SuspendLayout();
+            this.panelEx3.SuspendLayout();
+            this.panel1.SuspendLayout();
+            this.panelEx2.SuspendLayout();
+            this.panel3.SuspendLayout();
+            this.pnlLater.SuspendLayout();
+            this.panelEx1.SuspendLayout();
+            this.sideNav1.SuspendLayout();
+            this.sideNavPanel1.SuspendLayout();
+            this.sideNavPanel5.SuspendLayout();
+            this.panelEx4.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // splitContainer3
+            // 
+            this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitContainer3.Location = new System.Drawing.Point(0, 0);
+            this.splitContainer3.Name = "splitContainer3";
+            this.splitContainer3.Orientation = System.Windows.Forms.Orientation.Horizontal;
+            // 
+            // splitContainer3.Panel1
+            // 
+            this.splitContainer3.Panel1.Controls.Add(this.panelEx3);
+            this.splitContainer3.Panel1.Controls.Add(this.expandableSplitter2);
+            this.splitContainer3.Panel1.Controls.Add(this.panelEx2);
+            this.splitContainer3.Panel1.Controls.Add(this.expandableSplitter1);
+            this.splitContainer3.Panel1.Controls.Add(this.panelEx1);
+            // 
+            // splitContainer3.Panel2
+            // 
+            this.splitContainer3.Panel2.BackColor = System.Drawing.SystemColors.Control;
+            this.splitContainer3.Panel2.Controls.Add(this.panelEx4);
+            this.splitContainer3.Size = new System.Drawing.Size(1177, 586);
+            this.splitContainer3.SplitterDistance = 525;
+            this.splitContainer3.TabIndex = 2;
+            // 
+            // panelEx3
+            // 
+            this.panelEx3.CanvasColor = System.Drawing.SystemColors.Control;
+            this.panelEx3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.panelEx3.Controls.Add(this.txtResults);
+            this.panelEx3.Controls.Add(this.panel1);
+            this.panelEx3.Controls.Add(this.label3);
+            this.panelEx3.DisabledBackColor = System.Drawing.Color.Empty;
+            this.panelEx3.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panelEx3.Location = new System.Drawing.Point(688, 0);
+            this.panelEx3.Name = "panelEx3";
+            this.panelEx3.Size = new System.Drawing.Size(489, 525);
+            this.panelEx3.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.panelEx3.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
+            this.panelEx3.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
+            this.panelEx3.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+            this.panelEx3.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            this.panelEx3.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+            this.panelEx3.Style.GradientAngle = 90;
+            this.panelEx3.TabIndex = 31;
+            this.panelEx3.Text = "panelEx3";
+            // 
+            // txtResults
+            // 
+            this.txtResults.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.txtResults.Font = new System.Drawing.Font("Consolas", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.txtResults.Location = new System.Drawing.Point(0, 52);
+            this.txtResults.Multiline = true;
+            this.txtResults.Name = "txtResults";
+            this.txtResults.ScrollBars = System.Windows.Forms.ScrollBars.Both;
+            this.txtResults.Size = new System.Drawing.Size(489, 473);
+            this.txtResults.TabIndex = 4;
+            this.txtResults.TextChanged += new System.EventHandler(this.txtResults_TextChanged);
+            // 
+            // panel1
+            // 
+            this.panel1.Controls.Add(this.btnSave);
+            this.panel1.Controls.Add(this.btnClear);
+            this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.panel1.Location = new System.Drawing.Point(0, 23);
+            this.panel1.Name = "panel1";
+            this.panel1.Size = new System.Drawing.Size(489, 29);
+            this.panel1.TabIndex = 3;
+            // 
+            // btnSave
+            // 
+            this.btnSave.Dock = System.Windows.Forms.DockStyle.Left;
+            this.btnSave.Location = new System.Drawing.Point(95, 0);
+            this.btnSave.Name = "btnSave";
+            this.btnSave.Size = new System.Drawing.Size(95, 29);
+            this.btnSave.TabIndex = 3;
+            this.btnSave.Text = "Save Results";
+            this.btnSave.UseVisualStyleBackColor = true;
+            this.btnSave.Click += new System.EventHandler(this.btnSave_Click);
+            // 
+            // btnClear
+            // 
+            this.btnClear.Dock = System.Windows.Forms.DockStyle.Left;
+            this.btnClear.Location = new System.Drawing.Point(0, 0);
+            this.btnClear.Name = "btnClear";
+            this.btnClear.Size = new System.Drawing.Size(95, 29);
+            this.btnClear.TabIndex = 2;
+            this.btnClear.Text = "Clear Results";
+            this.btnClear.UseVisualStyleBackColor = true;
+            this.btnClear.Click += new System.EventHandler(this.btnClear_Click);
+            // 
+            // label3
+            // 
+            this.label3.BackColor = System.Drawing.SystemColors.ActiveCaption;
+            this.label3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.label3.Dock = System.Windows.Forms.DockStyle.Top;
+            this.label3.Location = new System.Drawing.Point(0, 0);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(489, 23);
+            this.label3.TabIndex = 2;
+            this.label3.Text = "Results";
+            this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // expandableSplitter2
+            // 
+            this.expandableSplitter2.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(101)))), ((int)(((byte)(147)))), ((int)(((byte)(207)))));
+            this.expandableSplitter2.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            this.expandableSplitter2.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
+            this.expandableSplitter2.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(101)))), ((int)(((byte)(147)))), ((int)(((byte)(207)))));
+            this.expandableSplitter2.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            this.expandableSplitter2.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
+            this.expandableSplitter2.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
+            this.expandableSplitter2.GripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
+            this.expandableSplitter2.GripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
+            this.expandableSplitter2.GripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(227)))), ((int)(((byte)(239)))), ((int)(((byte)(255)))));
+            this.expandableSplitter2.GripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
+            this.expandableSplitter2.HotBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(252)))), ((int)(((byte)(151)))), ((int)(((byte)(61)))));
+            this.expandableSplitter2.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(184)))), ((int)(((byte)(94)))));
+            this.expandableSplitter2.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2;
+            this.expandableSplitter2.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground;
+            this.expandableSplitter2.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(101)))), ((int)(((byte)(147)))), ((int)(((byte)(207)))));
+            this.expandableSplitter2.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            this.expandableSplitter2.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
+            this.expandableSplitter2.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
+            this.expandableSplitter2.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(101)))), ((int)(((byte)(147)))), ((int)(((byte)(207)))));
+            this.expandableSplitter2.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            this.expandableSplitter2.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(227)))), ((int)(((byte)(239)))), ((int)(((byte)(255)))));
+            this.expandableSplitter2.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
+            this.expandableSplitter2.Location = new System.Drawing.Point(682, 0);
+            this.expandableSplitter2.Name = "expandableSplitter2";
+            this.expandableSplitter2.Size = new System.Drawing.Size(6, 525);
+            this.expandableSplitter2.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007;
+            this.expandableSplitter2.TabIndex = 38;
+            this.expandableSplitter2.TabStop = false;
+            // 
+            // panelEx2
+            // 
+            this.panelEx2.CanvasColor = System.Drawing.SystemColors.Control;
+            this.panelEx2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.panelEx2.Controls.Add(this.txtProcess);
+            this.panelEx2.Controls.Add(this.pbProcess);
+            this.panelEx2.Controls.Add(this.label6);
+            this.panelEx2.Controls.Add(this.panel3);
+            this.panelEx2.Controls.Add(this.label4);
+            this.panelEx2.DisabledBackColor = System.Drawing.Color.Empty;
+            this.panelEx2.Dock = System.Windows.Forms.DockStyle.Left;
+            this.panelEx2.Location = new System.Drawing.Point(391, 0);
+            this.panelEx2.Name = "panelEx2";
+            this.panelEx2.Size = new System.Drawing.Size(291, 525);
+            this.panelEx2.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.panelEx2.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
+            this.panelEx2.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
+            this.panelEx2.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+            this.panelEx2.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            this.panelEx2.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+            this.panelEx2.Style.GradientAngle = 90;
+            this.panelEx2.TabIndex = 22;
+            this.panelEx2.Text = "panelEx2";
+            // 
+            // txtProcess
+            // 
+            this.txtProcess.AcceptsReturn = true;
+            this.txtProcess.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.txtProcess.Font = new System.Drawing.Font("Consolas", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.txtProcess.Location = new System.Drawing.Point(0, 150);
+            this.txtProcess.Multiline = true;
+            this.txtProcess.Name = "txtProcess";
+            this.txtProcess.ScrollBars = System.Windows.Forms.ScrollBars.Both;
+            this.txtProcess.Size = new System.Drawing.Size(291, 375);
+            this.txtProcess.TabIndex = 5;
+            this.txtProcess.TextChanged += new System.EventHandler(this.txtProcess_TextChanged);
+            // 
+            // pbProcess
+            // 
+            this.pbProcess.Dock = System.Windows.Forms.DockStyle.Top;
+            this.pbProcess.Location = new System.Drawing.Point(0, 125);
+            this.pbProcess.Name = "pbProcess";
+            this.pbProcess.Size = new System.Drawing.Size(291, 25);
+            this.pbProcess.TabIndex = 6;
+            // 
+            // label6
+            // 
+            this.label6.BackColor = System.Drawing.SystemColors.ActiveCaption;
+            this.label6.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.label6.Dock = System.Windows.Forms.DockStyle.Top;
+            this.label6.Location = new System.Drawing.Point(0, 102);
+            this.label6.Name = "label6";
+            this.label6.Size = new System.Drawing.Size(291, 23);
+            this.label6.TabIndex = 3;
+            this.label6.Text = "Process Status";
+            this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // panel3
+            // 
+            this.panel3.Controls.Add(this.pnlLater);
+            this.panel3.Controls.Add(this.chkLater);
+            this.panel3.Dock = System.Windows.Forms.DockStyle.Top;
+            this.panel3.Location = new System.Drawing.Point(0, 23);
+            this.panel3.Name = "panel3";
+            this.panel3.Padding = new System.Windows.Forms.Padding(6);
+            this.panel3.Size = new System.Drawing.Size(291, 79);
+            this.panel3.TabIndex = 2;
+            // 
+            // pnlLater
+            // 
+            this.pnlLater.Controls.Add(this.label5);
+            this.pnlLater.Controls.Add(this.dtpTime);
+            this.pnlLater.Controls.Add(this.dtpDate);
+            this.pnlLater.Dock = System.Windows.Forms.DockStyle.Top;
+            this.pnlLater.Enabled = false;
+            this.pnlLater.Location = new System.Drawing.Point(6, 23);
+            this.pnlLater.Name = "pnlLater";
+            this.pnlLater.Padding = new System.Windows.Forms.Padding(6);
+            this.pnlLater.Size = new System.Drawing.Size(279, 37);
+            this.pnlLater.TabIndex = 3;
+            // 
+            // label5
+            // 
+            this.label5.AutoSize = true;
+            this.label5.Location = new System.Drawing.Point(105, 15);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(18, 13);
+            this.label5.TabIndex = 5;
+            this.label5.Text = "@";
+            // 
+            // dtpTime
+            // 
+            this.dtpTime.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.dtpTime.CustomFormat = "HH:mm";
+            this.dtpTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
+            this.dtpTime.Location = new System.Drawing.Point(129, 9);
+            this.dtpTime.Name = "dtpTime";
+            this.dtpTime.ShowUpDown = true;
+            this.dtpTime.Size = new System.Drawing.Size(133, 20);
+            this.dtpTime.TabIndex = 4;
+            // 
+            // dtpDate
+            // 
+            this.dtpDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
+            this.dtpDate.Location = new System.Drawing.Point(9, 9);
+            this.dtpDate.Name = "dtpDate";
+            this.dtpDate.Size = new System.Drawing.Size(90, 20);
+            this.dtpDate.TabIndex = 3;
+            // 
+            // chkLater
+            // 
+            this.chkLater.AutoSize = true;
+            this.chkLater.Dock = System.Windows.Forms.DockStyle.Top;
+            this.chkLater.Location = new System.Drawing.Point(6, 6);
+            this.chkLater.Name = "chkLater";
+            this.chkLater.Size = new System.Drawing.Size(279, 17);
+            this.chkLater.TabIndex = 4;
+            this.chkLater.Text = "Process Later";
+            this.chkLater.UseVisualStyleBackColor = true;
+            this.chkLater.CheckedChanged += new System.EventHandler(this.chkLater_CheckedChanged);
+            // 
+            // label4
+            // 
+            this.label4.BackColor = System.Drawing.SystemColors.ActiveCaption;
+            this.label4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.label4.Dock = System.Windows.Forms.DockStyle.Top;
+            this.label4.Location = new System.Drawing.Point(0, 0);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(291, 23);
+            this.label4.TabIndex = 3;
+            this.label4.Text = "Process";
+            this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // expandableSplitter1
+            // 
+            this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(101)))), ((int)(((byte)(147)))), ((int)(((byte)(207)))));
+            this.expandableSplitter1.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            this.expandableSplitter1.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
+            this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(101)))), ((int)(((byte)(147)))), ((int)(((byte)(207)))));
+            this.expandableSplitter1.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            this.expandableSplitter1.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
+            this.expandableSplitter1.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
+            this.expandableSplitter1.GripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
+            this.expandableSplitter1.GripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
+            this.expandableSplitter1.GripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(227)))), ((int)(((byte)(239)))), ((int)(((byte)(255)))));
+            this.expandableSplitter1.GripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
+            this.expandableSplitter1.HotBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(252)))), ((int)(((byte)(151)))), ((int)(((byte)(61)))));
+            this.expandableSplitter1.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(184)))), ((int)(((byte)(94)))));
+            this.expandableSplitter1.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2;
+            this.expandableSplitter1.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground;
+            this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(101)))), ((int)(((byte)(147)))), ((int)(((byte)(207)))));
+            this.expandableSplitter1.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            this.expandableSplitter1.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
+            this.expandableSplitter1.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
+            this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(101)))), ((int)(((byte)(147)))), ((int)(((byte)(207)))));
+            this.expandableSplitter1.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            this.expandableSplitter1.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(227)))), ((int)(((byte)(239)))), ((int)(((byte)(255)))));
+            this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
+            this.expandableSplitter1.Location = new System.Drawing.Point(385, 0);
+            this.expandableSplitter1.Name = "expandableSplitter1";
+            this.expandableSplitter1.Size = new System.Drawing.Size(6, 525);
+            this.expandableSplitter1.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007;
+            this.expandableSplitter1.TabIndex = 4;
+            this.expandableSplitter1.TabStop = false;
+            // 
+            // panelEx1
+            // 
+            this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control;
+            this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.panelEx1.Controls.Add(this.sideNav1);
+            this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty;
+            this.panelEx1.Dock = System.Windows.Forms.DockStyle.Left;
+            this.panelEx1.Location = new System.Drawing.Point(0, 0);
+            this.panelEx1.Name = "panelEx1";
+            this.panelEx1.Size = new System.Drawing.Size(385, 525);
+            this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
+            this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
+            this.panelEx1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+            this.panelEx1.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            this.panelEx1.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+            this.panelEx1.Style.GradientAngle = 90;
+            this.panelEx1.TabIndex = 0;
+            this.panelEx1.Text = "panelEx1";
+            // 
+            // sideNav1
+            // 
+            this.sideNav1.BackColor = System.Drawing.SystemColors.Control;
+            this.sideNav1.Controls.Add(this.sideNavPanel1);
+            this.sideNav1.Controls.Add(this.sideNavPanel5);
+            this.sideNav1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.sideNav1.EnableClose = false;
+            this.sideNav1.EnableMaximize = false;
+            this.sideNav1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            this.sideNavItem1,
+            this.separator1,
+            this.sideNavItmCheck,
+            this.sideNavItmUsers,
+            this.sideNavItmExit});
+            this.sideNav1.Location = new System.Drawing.Point(0, 0);
+            this.sideNav1.Name = "sideNav1";
+            this.sideNav1.Padding = new System.Windows.Forms.Padding(1);
+            this.sideNav1.Size = new System.Drawing.Size(385, 525);
+            this.sideNav1.TabIndex = 3;
+            this.sideNav1.Text = "sideNav1";
+            // 
+            // sideNavPanel1
+            // 
+            this.sideNavPanel1.Controls.Add(this.warningBox3);
+            this.sideNavPanel1.Controls.Add(this.labelX7);
+            this.sideNavPanel1.Controls.Add(this.line1);
+            this.sideNavPanel1.Controls.Add(this.swCkObsoleteROData);
+            this.sideNavPanel1.Controls.Add(this.swHiddenDataLocs);
+            this.sideNavPanel1.Controls.Add(this.labelX3);
+            this.sideNavPanel1.Controls.Add(this.labelX2);
+            this.sideNavPanel1.Controls.Add(this.swCkOrphanDataRecs);
+            this.sideNavPanel1.Controls.Add(this.labelX1);
+            this.sideNavPanel1.Controls.Add(this.btnRunCheck);
+            this.sideNavPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.sideNavPanel1.Location = new System.Drawing.Point(88, 31);
+            this.sideNavPanel1.Name = "sideNavPanel1";
+            this.sideNavPanel1.Size = new System.Drawing.Size(292, 493);
+            this.sideNavPanel1.TabIndex = 2;
+            // 
+            // warningBox3
+            // 
+            this.warningBox3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(196)))), ((int)(((byte)(219)))), ((int)(((byte)(249)))));
+            this.warningBox3.CloseButtonVisible = false;
+            this.warningBox3.Image = ((System.Drawing.Image)(resources.GetObject("warningBox3.Image")));
+            this.warningBox3.Location = new System.Drawing.Point(17, 207);
+            this.warningBox3.Margin = new System.Windows.Forms.Padding(4);
+            this.warningBox3.Name = "warningBox3";
+            this.warningBox3.OptionsButtonVisible = false;
+            this.warningBox3.Size = new System.Drawing.Size(264, 32);
+            this.warningBox3.TabIndex = 29;
+            this.warningBox3.Text = "<b>NOTE</b> These tools can take a long time to run";
+            // 
+            // labelX7
+            // 
+            this.labelX7.BackColor = System.Drawing.Color.Transparent;
+            // 
+            // 
+            // 
+            this.labelX7.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.labelX7.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.labelX7.Location = new System.Drawing.Point(5, 3);
+            this.labelX7.Name = "labelX7";
+            this.labelX7.Size = new System.Drawing.Size(251, 22);
+            this.labelX7.TabIndex = 19;
+            this.labelX7.Text = "Check for these Data Issues:";
+            // 
+            // line1
+            // 
+            this.line1.BackColor = System.Drawing.Color.Transparent;
+            this.line1.Location = new System.Drawing.Point(8, 179);
+            this.line1.Name = "line1";
+            this.line1.Size = new System.Drawing.Size(285, 12);
+            this.line1.TabIndex = 18;
+            this.line1.Text = "line1";
+            // 
+            // swCkObsoleteROData
+            // 
+            // 
+            // 
+            // 
+            this.swCkObsoleteROData.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.swCkObsoleteROData.Location = new System.Drawing.Point(10, 99);
+            this.swCkObsoleteROData.Name = "swCkObsoleteROData";
+            this.swCkObsoleteROData.Size = new System.Drawing.Size(91, 22);
+            this.swCkObsoleteROData.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.superTooltip1.SetSuperTooltip(this.swCkObsoleteROData, new DevComponents.DotNetBar.SuperTooltipInfo("Obsolete RO Data", "", resources.GetString("swCkObsoleteROData.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 135)));
+            this.swCkObsoleteROData.SwitchClickTogglesValue = true;
+            this.swCkObsoleteROData.TabIndex = 14;
+            this.swCkObsoleteROData.Value = true;
+            this.swCkObsoleteROData.ValueObject = "Y";
+            this.swCkObsoleteROData.ValueChanged += new System.EventHandler(this.swCk_ValueChanged);
+            // 
+            // swHiddenDataLocs
+            // 
+            // 
+            // 
+            // 
+            this.swHiddenDataLocs.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.swHiddenDataLocs.Location = new System.Drawing.Point(10, 71);
+            this.swHiddenDataLocs.Name = "swHiddenDataLocs";
+            this.swHiddenDataLocs.Size = new System.Drawing.Size(91, 22);
+            this.swHiddenDataLocs.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.superTooltip1.SetSuperTooltip(this.swHiddenDataLocs, new DevComponents.DotNetBar.SuperTooltipInfo("Hidden Data Locations", "", resources.GetString("swHiddenDataLocs.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+            this.swHiddenDataLocs.SwitchClickTogglesValue = true;
+            this.swHiddenDataLocs.TabIndex = 15;
+            this.swHiddenDataLocs.Value = true;
+            this.swHiddenDataLocs.ValueObject = "Y";
+            this.swHiddenDataLocs.ValueChanged += new System.EventHandler(this.swCk_ValueChanged);
+            // 
+            // labelX3
+            // 
+            this.labelX3.BackColor = System.Drawing.Color.Transparent;
+            // 
+            // 
+            // 
+            this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.labelX3.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.labelX3.Location = new System.Drawing.Point(107, 99);
+            this.labelX3.Name = "labelX3";
+            this.labelX3.Size = new System.Drawing.Size(154, 22);
+            this.superTooltip1.SetSuperTooltip(this.labelX3, new DevComponents.DotNetBar.SuperTooltipInfo("Obsolete RO Data", "", resources.GetString("labelX3.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 135)));
+            this.labelX3.TabIndex = 11;
+            this.labelX3.Text = "Obsolete RO Data";
+            // 
+            // labelX2
+            // 
+            this.labelX2.BackColor = System.Drawing.Color.Transparent;
+            // 
+            // 
+            // 
+            this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.labelX2.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.labelX2.Location = new System.Drawing.Point(107, 71);
+            this.labelX2.Name = "labelX2";
+            this.labelX2.Size = new System.Drawing.Size(140, 22);
+            this.superTooltip1.SetSuperTooltip(this.labelX2, new DevComponents.DotNetBar.SuperTooltipInfo("Hidden Data Locations", "", resources.GetString("labelX2.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+            this.labelX2.TabIndex = 12;
+            this.labelX2.Text = "Hidden Data Locations";
+            // 
+            // swCkOrphanDataRecs
+            // 
+            // 
+            // 
+            // 
+            this.swCkOrphanDataRecs.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.swCkOrphanDataRecs.Location = new System.Drawing.Point(10, 43);
+            this.swCkOrphanDataRecs.Name = "swCkOrphanDataRecs";
+            this.swCkOrphanDataRecs.Size = new System.Drawing.Size(91, 22);
+            this.swCkOrphanDataRecs.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.superTooltip1.SetSuperTooltip(this.swCkOrphanDataRecs, new DevComponents.DotNetBar.SuperTooltipInfo("Orphan Data Records", "", resources.GetString("swCkOrphanDataRecs.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(275, 193)));
+            this.swCkOrphanDataRecs.SwitchClickTogglesValue = true;
+            this.swCkOrphanDataRecs.TabIndex = 9;
+            this.swCkOrphanDataRecs.Value = true;
+            this.swCkOrphanDataRecs.ValueObject = "Y";
+            this.swCkOrphanDataRecs.ValueChanged += new System.EventHandler(this.swCk_ValueChanged);
+            // 
+            // labelX1
+            // 
+            this.labelX1.BackColor = System.Drawing.Color.Transparent;
+            // 
+            // 
+            // 
+            this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.labelX1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.labelX1.Location = new System.Drawing.Point(107, 43);
+            this.labelX1.Name = "labelX1";
+            this.labelX1.Size = new System.Drawing.Size(172, 22);
+            this.superTooltip1.SetSuperTooltip(this.labelX1, new DevComponents.DotNetBar.SuperTooltipInfo("Orphan Data Records", "", resources.GetString("labelX1.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(275, 190)));
+            this.labelX1.TabIndex = 8;
+            this.labelX1.Text = "Orphan Data Records";
+            // 
+            // btnRunCheck
+            // 
+            this.btnRunCheck.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            this.btnRunCheck.Checked = true;
+            this.btnRunCheck.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.btnRunCheck.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btnRunCheck.Location = new System.Drawing.Point(5, 150);
+            this.btnRunCheck.Name = "btnRunCheck";
+            this.btnRunCheck.Size = new System.Drawing.Size(286, 23);
+            this.btnRunCheck.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.superTooltip1.SetSuperTooltip(this.btnRunCheck, new DevComponents.DotNetBar.SuperTooltipInfo("Run Check", "", "This will run the database check tools selected.\r\n\r\nClick on the on/off switches " +
+            "to turn on/off each tool.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 100)));
+            this.btnRunCheck.TabIndex = 7;
+            this.btnRunCheck.Text = "Run Check";
+            this.btnRunCheck.Click += new System.EventHandler(this.btnRunCheck_Click);
+            // 
+            // sideNavPanel5
+            // 
+            this.sideNavPanel5.Controls.Add(this.btn_ShowUsers);
+            this.sideNavPanel5.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.sideNavPanel5.Location = new System.Drawing.Point(88, 31);
+            this.sideNavPanel5.Name = "sideNavPanel5";
+            this.sideNavPanel5.Size = new System.Drawing.Size(292, 493);
+            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);
+            // 
+            // sideNavItem1
+            // 
+            this.sideNavItem1.IsSystemMenu = true;
+            this.sideNavItem1.Name = "sideNavItem1";
+            this.sideNavItem1.Symbol = "";
+            this.sideNavItem1.Text = "General\r\nTools";
+            // 
+            // separator1
+            // 
+            this.separator1.FixedSize = new System.Drawing.Size(3, 1);
+            this.separator1.Name = "separator1";
+            this.separator1.Padding.Bottom = 2;
+            this.separator1.Padding.Left = 6;
+            this.separator1.Padding.Right = 6;
+            this.separator1.Padding.Top = 2;
+            this.separator1.SeparatorOrientation = DevComponents.DotNetBar.eDesignMarkerOrientation.Vertical;
+            // 
+            // sideNavItmCheck
+            // 
+            this.sideNavItmCheck.Checked = true;
+            this.sideNavItmCheck.Name = "sideNavItmCheck";
+            this.sideNavItmCheck.Panel = this.sideNavPanel1;
+            this.sideNavItmCheck.Symbol = "";
+            this.sideNavItmCheck.Text = "Check";
+            this.sideNavItmCheck.Click += new System.EventHandler(this.sideNavItmCheck_Click);
+            // 
+            // sideNavItmUsers
+            // 
+            this.sideNavItmUsers.Name = "sideNavItmUsers";
+            this.sideNavItmUsers.Panel = this.sideNavPanel5;
+            this.sideNavItmUsers.Symbol = "";
+            this.sideNavItmUsers.Text = "Users";
+            this.sideNavItmUsers.Click += new System.EventHandler(this.sideNavItmUsers_Click);
+            // 
+            // sideNavItmExit
+            // 
+            this.sideNavItmExit.Name = "sideNavItmExit";
+            this.sideNavItmExit.Symbol = "";
+            this.sideNavItmExit.Text = "Exit";
+            this.sideNavItmExit.Click += new System.EventHandler(this.sideNavItmExit_Click);
+            // 
+            // panelEx4
+            // 
+            this.panelEx4.CanvasColor = System.Drawing.SystemColors.Control;
+            this.panelEx4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.panelEx4.Controls.Add(this.progressSteps1);
+            this.panelEx4.Controls.Add(this.lblAdmToolProgressType);
+            this.panelEx4.DialogResult = System.Windows.Forms.DialogResult.OK;
+            this.panelEx4.DisabledBackColor = System.Drawing.Color.Empty;
+            this.panelEx4.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panelEx4.Location = new System.Drawing.Point(0, 0);
+            this.panelEx4.Name = "panelEx4";
+            this.panelEx4.Size = new System.Drawing.Size(1177, 57);
+            this.panelEx4.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.panelEx4.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
+            this.panelEx4.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
+            this.panelEx4.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+            this.panelEx4.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            this.panelEx4.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+            this.panelEx4.Style.GradientAngle = 90;
+            this.panelEx4.TabIndex = 20;
+            // 
+            // progressSteps1
+            // 
+            this.progressSteps1.BackColor = System.Drawing.Color.Transparent;
+            // 
+            // 
+            // 
+            this.progressSteps1.BackgroundStyle.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240)))));
+            this.progressSteps1.BackgroundStyle.Class = "ProgressSteps";
+            this.progressSteps1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.progressSteps1.ContainerControlProcessDialogKey = true;
+            this.progressSteps1.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.progressSteps1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            this.stepItem1,
+            this.stepItem2,
+            this.stepItem3,
+            this.stepItem4});
+            this.progressSteps1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
+            this.progressSteps1.Location = new System.Drawing.Point(123, 18);
+            this.progressSteps1.Name = "progressSteps1";
+            this.progressSteps1.Size = new System.Drawing.Size(1032, 26);
+            this.progressSteps1.TabIndex = 18;
+            // 
+            // stepItem1
+            // 
+            this.stepItem1.Maximum = 10;
+            this.stepItem1.Name = "stepItem1";
+            this.stepItem1.SymbolSize = 13F;
+            this.stepItem1.Text = "Discon";
+            // 
+            // stepItem2
+            // 
+            this.stepItem2.Maximum = 10;
+            this.stepItem2.Name = "stepItem2";
+            this.stepItem2.SymbolSize = 13F;
+            this.stepItem2.Text = "Non-Edit";
+            // 
+            // stepItem3
+            // 
+            this.stepItem3.Maximum = 10;
+            this.stepItem3.Name = "stepItem3";
+            this.stepItem3.SymbolSize = 13F;
+            this.stepItem3.Text = "RO Assoc";
+            // 
+            // stepItem4
+            // 
+            this.stepItem4.Maximum = 10;
+            this.stepItem4.Name = "stepItem4";
+            this.stepItem4.SymbolSize = 13F;
+            this.stepItem4.Text = "FST+Figs";
+            // 
+            // lblAdmToolProgressType
+            // 
+            this.lblAdmToolProgressType.BackColor = System.Drawing.Color.Transparent;
+            // 
+            // 
+            // 
+            this.lblAdmToolProgressType.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.lblAdmToolProgressType.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.lblAdmToolProgressType.Location = new System.Drawing.Point(19, 10);
+            this.lblAdmToolProgressType.Name = "lblAdmToolProgressType";
+            this.lblAdmToolProgressType.Size = new System.Drawing.Size(98, 34);
+            this.lblAdmToolProgressType.TabIndex = 19;
+            this.lblAdmToolProgressType.Text = "Checking:";
+            // 
+            // buttonItem1
+            // 
+            this.buttonItem1.Name = "buttonItem1";
+            this.buttonItem1.Text = "buttonItem1";
+            // 
+            // superTooltip1
+            // 
+            this.superTooltip1.DefaultTooltipSettings = new DevComponents.DotNetBar.SuperTooltipInfo("", "", "", null, null, DevComponents.DotNetBar.eTooltipColor.Gray);
+            this.superTooltip1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
+            // 
+            // frmGenTools
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1177, 586);
+            this.Controls.Add(this.splitContainer3);
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "frmGenTools";
+            this.ShowIcon = false;
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "General Tools";
+            this.Load += new System.EventHandler(this.frmGenTools_Load);
+            this.splitContainer3.Panel1.ResumeLayout(false);
+            this.splitContainer3.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).EndInit();
+            this.splitContainer3.ResumeLayout(false);
+            this.panelEx3.ResumeLayout(false);
+            this.panelEx3.PerformLayout();
+            this.panel1.ResumeLayout(false);
+            this.panelEx2.ResumeLayout(false);
+            this.panelEx2.PerformLayout();
+            this.panel3.ResumeLayout(false);
+            this.panel3.PerformLayout();
+            this.pnlLater.ResumeLayout(false);
+            this.pnlLater.PerformLayout();
+            this.panelEx1.ResumeLayout(false);
+            this.sideNav1.ResumeLayout(false);
+            this.sideNav1.PerformLayout();
+            this.sideNavPanel1.ResumeLayout(false);
+            this.sideNavPanel5.ResumeLayout(false);
+            this.panelEx4.ResumeLayout(false);
+            this.ResumeLayout(false);
+
+		}
+
+		#endregion
+		private System.Windows.Forms.SplitContainer splitContainer3;
+		private DevComponents.DotNetBar.PanelEx panelEx3;
+		private System.Windows.Forms.TextBox txtResults;
+		private System.Windows.Forms.Panel panel1;
+		private System.Windows.Forms.Button btnSave;
+		private System.Windows.Forms.Button btnClear;
+		private System.Windows.Forms.Label label3;
+		private DevComponents.DotNetBar.PanelEx panelEx2;
+		private System.Windows.Forms.TextBox txtProcess;
+		private System.Windows.Forms.ProgressBar pbProcess;
+		private System.Windows.Forms.Label label6;
+		private System.Windows.Forms.Panel panel3;
+		private System.Windows.Forms.Panel pnlLater;
+		private System.Windows.Forms.Label label5;
+		private System.Windows.Forms.DateTimePicker dtpTime;
+		private System.Windows.Forms.DateTimePicker dtpDate;
+		private System.Windows.Forms.CheckBox chkLater;
+		private System.Windows.Forms.Label label4;
+		private DevComponents.DotNetBar.Controls.SideNav sideNav1;
+		private DevComponents.DotNetBar.Controls.SideNavPanel sideNavPanel1;
+		private DevComponents.DotNetBar.LabelX labelX7;
+		private DevComponents.DotNetBar.Controls.Line line1;
+		private DevComponents.DotNetBar.Controls.SwitchButton swCkObsoleteROData;
+		private DevComponents.DotNetBar.Controls.SwitchButton swHiddenDataLocs;
+		private DevComponents.DotNetBar.LabelX labelX3;
+		private DevComponents.DotNetBar.LabelX labelX2;
+		private DevComponents.DotNetBar.Controls.SwitchButton swCkOrphanDataRecs;
+		private DevComponents.DotNetBar.LabelX labelX1;
+		private DevComponents.DotNetBar.ButtonX btnRunCheck;
+		private DevComponents.DotNetBar.Controls.SideNavPanel sideNavPanel5;
+		private DevComponents.DotNetBar.ButtonX btn_ShowUsers;
+		private DevComponents.DotNetBar.Controls.SideNavItem sideNavItem1;
+		private DevComponents.DotNetBar.Separator separator1;
+		private DevComponents.DotNetBar.Controls.SideNavItem sideNavItmCheck;
+		private DevComponents.DotNetBar.Controls.SideNavItem sideNavItmUsers;
+		private DevComponents.DotNetBar.Controls.SideNavItem sideNavItmExit;
+		private DevComponents.DotNetBar.LabelX lblAdmToolProgressType;
+		private DevComponents.DotNetBar.ProgressSteps progressSteps1;
+		private DevComponents.DotNetBar.StepItem stepItem1;
+		private DevComponents.DotNetBar.StepItem stepItem2;
+		private DevComponents.DotNetBar.StepItem stepItem3;
+		private DevComponents.DotNetBar.StepItem stepItem4;
+		private DevComponents.DotNetBar.SuperTooltip superTooltip1;
+		private DevComponents.DotNetBar.ExpandableSplitter expandableSplitter2;
+		private DevComponents.DotNetBar.ExpandableSplitter expandableSplitter1;
+		private DevComponents.DotNetBar.PanelEx panelEx1;
+		private DevComponents.DotNetBar.PanelEx panelEx4;
+		private DevComponents.DotNetBar.Controls.WarningBox warningBox3;
+		private DevComponents.DotNetBar.ButtonItem buttonItem1;
+	}
+}
+
+

PROMS/VEPROMS User Interface/frmGenTools.resx

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -112,15 +112,81 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="warningBox3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAp5JREFUOE+F
+        k11Ik1Ecxv9zouJ2E4TWnR8V5tAppJmYsLnNlaLTxAoiKIQiibpYSmEEmSSa0IVGISMUw7rpE+yiQiuk
+        /IhROssPyjanpL4udeq29z3nCdcH+Wb1g+fq/zzP+R8Oh+gvPK4kNWujp1IrPek8S5Hy+X9hbXSN9aVC
+        eq1FwEYN8vk/mWqiDPZwI+NOHbhLj8CdDaK7npLlvnWpO0AKqZV62YgO/GMquDMN0rAevkbqlHvXZdlG
+        h6Rn8eATu4GJncB0Fvh8HnwPYuGpJ4vcvwZbGYWJrcpPzGXG8ngGtsZFQJOggrS0B9J0MbwNIR9uHqRQ
+        ee4XPhuVSy814IIB/lk9QkIIanUomFgIzkux0qHB/CUqk+eCtB2jCLEl1M1mLcBSLthKHlQqJaKjw8FZ
+        Mbi/ENKXEizUKD/f2k9h8jz5mumk2K0F9xUAUgE4K0JUVDji4yLBvflgMyYwlxFL9zSYq6ITa8I3DlNY
+        wKZ0soVSgFkAXgwuFSEmJhJJiWqwCR3YSCbY2x0QB4zwnFc6W4p+22KxiY4EXiQF74kf6/L5vdi+TYV0
+        rRpsMB2sPxWsRwvpTTq87QmYOUNHg+HqQlL4ryscbK4UPGD5vu60CWw8G7evbkN7bSykXm0w/FMBew6E
+        CsXQFQMpaLKezP6OLeDL+8AFM5hLBzaciennKcFXUCgI7o7ENQWSfRcWmmPgPEW5tNJIj8QxM9hkDthY
+        FthAGlh/SvAPXC7fjOrjmyC+Sl5TsCpfdzYEK92llUbllDiaD3HEDPG9CaLDCGnI9IdEhwnioBHiOwMC
+        dj38fYbVglHy1FGJt57uL9ZS10IN9cxfJPvXCzTgqSKH5xwNzVXSkFBBDsFKA4KV7IKVegQrda2e7j5N
+        ud8AKwnMnBpmYFAAAAAASUVORK5CYII=
+</value>
+  </data>
+  <metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="wbBrwsExisting.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
+  <data name="swCkObsoleteROData.SuperTooltip" xml:space="preserve">
+    <value>Referenced Objects databases are associated with a procedure set (such as Working Draft). 
+
+RO paths, ROFST versions, and the contents of RO figures are stored in the database when referenced. This tool will identify stored RO Paths, ROFST versions, and Figures that are no longer used.
+</value>
+  </data>
+  <data name="swHiddenDataLocs.SuperTooltip" xml:space="preserve">
+    <value>Typically, a section in PROMS only has sub-sections or steps.  When and existing section is divided into sub-sections, the resulting main section might have both.
+
+When this occurs, the step data in the main section can be marked as non-editable.  The user can no longer get to these steps and they can become forgotten as PROMS will ignore these non-editable steps when the procedure is printed.
+
+This tool will identify if the database has non-editable steps and provide a listing of these steps. The use can then go to these main sections, make them editable via the property page, and delete or move these steps.
+
+This tool may take an extended period of time to execute.
+</value>
+  </data>
+  <data name="labelX3.SuperTooltip" xml:space="preserve">
+    <value>Referenced Objects databases are associated with a procedure set (such as Working Draft). 
+
+RO paths, ROFST versions, and the contents of RO figures are stored in the database when referenced. This tool will identify stored RO Paths, ROFST versions, and Figures that are no longer used.
+</value>
+  </data>
+  <data name="labelX2.SuperTooltip" xml:space="preserve">
+    <value>Typically, a section in PROMS only has sub-sections or steps.  When and existing section is divided into sub-sections, the resulting main section might have both.
+
+When this occurs, the step data in the main section can be marked as non-editable.  The user can no longer get to these steps and they can become forgotten as PROMS will ignore these non-editable steps when the procedure is printed.
+
+This tool will identify if the database has non-editable steps and provide a listing of these steps. The use can then go to these main sections, make them editable via the property page, and delete or move these steps.
+
+This tool may take an extended period of time to execute.
+</value>
+  </data>
+  <data name="swCkOrphanDataRecs.SuperTooltip" xml:space="preserve">
+    <value>Everything in PROMS is inter-related.  A working draft knows what is its first procedure and a procedure knows what is its first step.  Likewise, a procedure knows what procedure is before it and after it.
+
+Should an item become orphaned (disconnected) from the rest of the data, it will no longer be accessible.  This tool detects any orphaned items in the database.
+
+This tool may take an extended period of time to execute.
+</value>
+  </data>
+  <data name="labelX1.SuperTooltip" xml:space="preserve">
+    <value>Everything in PROMS is inter-related.  A working draft knows what is its first procedure and a procedure knows what is its first step.  Likewise, a procedure knows what procedure is before it and after it.
+
+Should an item become orphaned (disconnected) from the rest of the data, it will no longer be accessible.  This tool detects any orphaned items in the database.
+
+This tool may take an extended period of time to execute.
+</value>
+  </data>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>46</value>
   </metadata>
 </root>

PROMS/VEPROMS User Interface/frmSectionProperties.cs

@@ -120,7 +120,7 @@ namespace VEPROMS
 			PlantFormat pf = _SectionConfig.MyFormat != null ? _SectionConfig.MyFormat.PlantFormat : _SectionConfig.MyDefaultFormat.PlantFormat;
 			CheckOffList chkoffList = pf.FormatData.ProcData.CheckOffData.CheckOffList;
 			CheckOffHeaderList chkoffHeaderList = pf.FormatData.ProcData.CheckOffData.CheckOffHeaderList;
-			int maxindx = pf.FormatData.ProcData.CheckOffUCF ? pf.FormatData.ProcData.CheckOffData.CheckOffList.MaxIndex : pf.FormatData.ProcData.CheckOffData.CheckOffList.MaxIndexNoInherit;
+			int maxindx = pf.FormatData.ProcData.CheckOffData.CheckOffList.MaxIndexNoInherit;
 			// C2020-003 use the _CheckOffIndex dictionary to get and save the index of the selected checkoff from the sorted checkoff list
 			// B2020-039: Added the check for a valid selected index so that crash doesn't occur
 			if (ppGpbxSignoffCheckoff.Enabled && (chkoffList != null && maxindx > 1)
@@ -796,7 +796,7 @@ namespace VEPROMS
 			CheckOffList chkoffList = pf.FormatData.ProcData.CheckOffData.CheckOffList;
 			if (chkoffList != null) chkoffList.Sort(CompareCheckoffUsingOrderBy); // C2020-003 sort the checkoff list via the Index and/or OrderBy elements
 			CheckOffHeaderList chkoffHeaderList = pf.FormatData.ProcData.CheckOffData.CheckOffHeaderList;
-			int maxindx = pf.FormatData.ProcData.CheckOffUCF ? pf.FormatData.ProcData.CheckOffData.CheckOffList.MaxIndex : pf.FormatData.ProcData.CheckOffData.CheckOffList.MaxIndexNoInherit;
+			int maxindx = pf.FormatData.ProcData.CheckOffData.CheckOffList.MaxIndexNoInherit;
 			// B2019-013: was crashing on indexer of checkofflist. If there were UCF checkoffs but none in original format, the indexer
 			//  was failing for index of 0  (indexer code went through index attribute of xml and was returning null even though there
 			//  were items in list).

PROMS/VEPROMS User Interface/frmSysOptions.cs

@@ -75,24 +75,6 @@ namespace VEPROMS
 			cbEnhancedDocumentSync.Checked = Settings.Default.SyncEnhancedDocuments;
 			cbSeparateWindows.Checked = Settings.Default.SeparateWindows;
 			txbxVisioPath.Text = Settings.Default.VisioPath;
-			switch (Settings.Default.UCFImportOpt)		// see dlgExportImport for descripton of these options.
-			{
-				case 0:
-					cbUCFIgnore.Checked = true;
-					break;
-				case 1:
-					cbUCFLNotUsed.Checked = true;
-					break;
-				case 2:
-					cbUCFLOnlyImport.Checked = true;
-					break;
-				case 3:
-					cbUCFLUseAll.Checked = true;
-					break;
-				case 4:
-					cbUCFLForSetOnly.Checked = true;
-					break;
-			}
 
 			//CSM - C2024-031 - Getting User Settings
 			//and set checkboxes based on what they are set to
@@ -118,6 +100,7 @@ namespace VEPROMS
 				Settings.Default.PastePlainText = cbPastePlainText.Checked;
 			}
 		}
+	
 		private void cbPasteNoReturns_CheckedChanged(object sender, EventArgs e)
 		{
 			if (!_initializing)
@@ -193,7 +176,6 @@ namespace VEPROMS
 		private	bool ss_SyncEnhancedDocuments;
 		private	bool ss_SeparateWindows;
 		private	string ss_VisioPath;
-		private int ss_UCFImportOpt;
 
 		private void SaveStartingSettings()
 		{
@@ -210,7 +192,6 @@ namespace VEPROMS
 			ss_SyncEnhancedDocuments = Settings.Default.SyncEnhancedDocuments;
 			ss_SeparateWindows = Settings.Default.SeparateWindows;
 			ss_VisioPath = Settings.Default.VisioPath;
-			ss_UCFImportOpt = Settings.Default.UCFImportOpt;
 		}
 
 		private void RestoreStartingSettings() // used with the cancel button
@@ -227,7 +208,6 @@ namespace VEPROMS
 			Settings.Default.SyncEnhancedDocuments = ss_SyncEnhancedDocuments;
 			Settings.Default.SeparateWindows = ss_SeparateWindows;
 			Settings.Default.VisioPath = ss_VisioPath;
-			Settings.Default.UCFImportOpt = ss_UCFImportOpt;
 		}
 
 
@@ -315,45 +295,7 @@ namespace VEPROMS
 			Settings.Default.VisioPath = txbxVisioPath.Text;
 		}
 
-		private void cbUCFIgnore_CheckedChanged(object sender, EventArgs e)
-		{
-			if (!_initializing)
-			{
-				Settings.Default.UCFImportOpt = 0;
-			}
-		}
 
-		private void cbUCFLNotUsed_CheckedChanged(object sender, EventArgs e)
-		{
-			if (!_initializing)
-			{
-				Settings.Default.UCFImportOpt = 1;
-			}
-		}
-
-		private void cbUCFLOnlyImport_CheckedChanged(object sender, EventArgs e)
-		{
-			if (!_initializing)
-			{
-				Settings.Default.UCFImportOpt = 2;
-			}
-		}
-
-		private void cbUCFLUseAll_CheckedChanged(object sender, EventArgs e)
-		{
-			if (!_initializing)
-			{
-				Settings.Default.UCFImportOpt = 3;
-			}
-		}
-
-		private void cbUCFLForSetOnly_CheckedChanged(object sender, EventArgs e)
-		{
-			if (!_initializing)
-			{
-				Settings.Default.UCFImportOpt = 4;
-			}
-		}
 		private void cbOTRemember_CheckedChanged(object sender, EventArgs e)
 		{
 			cbOTAutoOpen.Enabled = cbOTAutoOpen.Visible = cbShwRplWrdsColor.Checked;
@@ -365,5 +307,11 @@ namespace VEPROMS
 			Properties.Settings.Default.cbShwRplWrdsColor = cbShwRplWrdsColor.Checked; // update setting value
 			Properties.Settings.Default.Save(); // save settings
 		}
-    }
+
+		private void cbShwAnnoFilter_Click(object sender, EventArgs e)
+		{
+			frmVEPROMS.tv_SelectAnnotations();
+		}
+
+	}
 }

PROMS/VEPROMS User Interface/frmUCF.designer.cs

@@ -1,287 +0,0 @@
-namespace VEPROMS
-{
-	partial class frmUCF
-	{
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		//protected override void Dispose(bool disposing)
-		//{
-		//	if (disposing && (components != null))
-		//	{
-		//		components.Dispose();
-		//	}
-		//	base.Dispose(disposing);
-		//}
-
-		#region Windows Form Designer generated code
-
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			this.PGpanelBtm = new System.Windows.Forms.Panel();
-			this.btnSave = new System.Windows.Forms.Button();
-			this.btnDelete = new System.Windows.Forms.Button();
-			this.btnReset = new System.Windows.Forms.Button();
-			this.btnSaveAs = new System.Windows.Forms.Button();
-			this.lblPGItem = new System.Windows.Forms.Label();
-			this.btnSaveClose = new System.Windows.Forms.Button();
-			this.btnCancel = new System.Windows.Forms.Button();
-			this.PG = new System.Windows.Forms.PropertyGrid();
-			this.pnlFormatList = new System.Windows.Forms.Panel();
-			this.tbUCFSummary = new System.Windows.Forms.TextBox();
-			this.btnDetails = new System.Windows.Forms.Button();
-			this.lblSummary = new System.Windows.Forms.Label();
-			this.lblDerivedFrom = new System.Windows.Forms.Label();
-			this.lblDerFrom = new System.Windows.Forms.Label();
-			this.cbxFormatList = new System.Windows.Forms.ComboBox();
-			this.lblFormatList = new System.Windows.Forms.Label();
-			this.PGpanelBtm.SuspendLayout();
-			this.pnlFormatList.SuspendLayout();
-			this.SuspendLayout();
-			// 
-			// PGpanelBtm
-			// 
-			this.PGpanelBtm.Controls.Add(this.btnSave);
-			this.PGpanelBtm.Controls.Add(this.btnDelete);
-			this.PGpanelBtm.Controls.Add(this.btnReset);
-			this.PGpanelBtm.Controls.Add(this.btnSaveAs);
-			this.PGpanelBtm.Controls.Add(this.lblPGItem);
-			this.PGpanelBtm.Controls.Add(this.btnSaveClose);
-			this.PGpanelBtm.Controls.Add(this.btnCancel);
-			this.PGpanelBtm.Dock = System.Windows.Forms.DockStyle.Bottom;
-			this.PGpanelBtm.Location = new System.Drawing.Point(0, 560);
-			this.PGpanelBtm.Name = "PGpanelBtm";
-			this.PGpanelBtm.Size = new System.Drawing.Size(614, 68);
-			this.PGpanelBtm.TabIndex = 0;
-			// 
-			// btnSave
-			// 
-			this.btnSave.Dock = System.Windows.Forms.DockStyle.Right;
-			this.btnSave.Enabled = false;
-			this.btnSave.Location = new System.Drawing.Point(164, 0);
-			this.btnSave.Name = "btnSave";
-			this.btnSave.Size = new System.Drawing.Size(75, 68);
-			this.btnSave.TabIndex = 6;
-			this.btnSave.Text = "Save";
-			this.btnSave.UseVisualStyleBackColor = true;
-			this.btnSave.Visible = false;
-			this.btnSave.Click += new System.EventHandler(this.btnSave_Click);
-			// 
-			// btnDelete
-			// 
-			this.btnDelete.Dock = System.Windows.Forms.DockStyle.Right;
-			this.btnDelete.Enabled = false;
-			this.btnDelete.Location = new System.Drawing.Point(239, 0);
-			this.btnDelete.Name = "btnDelete";
-			this.btnDelete.Size = new System.Drawing.Size(75, 68);
-			this.btnDelete.TabIndex = 5;
-			this.btnDelete.Text = "Delete";
-			this.btnDelete.UseVisualStyleBackColor = true;
-			this.btnDelete.Click += new System.EventHandler(this.btnDelete_Click);
-			// 
-			// btnReset
-			// 
-			this.btnReset.Dock = System.Windows.Forms.DockStyle.Right;
-			this.btnReset.Enabled = false;
-			this.btnReset.Location = new System.Drawing.Point(314, 0);
-			this.btnReset.Name = "btnReset";
-			this.btnReset.Size = new System.Drawing.Size(75, 68);
-			this.btnReset.TabIndex = 4;
-			this.btnReset.Text = "Reset";
-			this.btnReset.UseVisualStyleBackColor = true;
-			this.btnReset.Click += new System.EventHandler(this.btnReset_Click);
-			// 
-			// btnSaveAs
-			// 
-			this.btnSaveAs.Dock = System.Windows.Forms.DockStyle.Right;
-			this.btnSaveAs.Enabled = false;
-			this.btnSaveAs.Location = new System.Drawing.Point(389, 0);
-			this.btnSaveAs.Name = "btnSaveAs";
-			this.btnSaveAs.Size = new System.Drawing.Size(75, 68);
-			this.btnSaveAs.TabIndex = 3;
-			this.btnSaveAs.Text = "Save As";
-			this.btnSaveAs.UseVisualStyleBackColor = true;
-			this.btnSaveAs.Click += new System.EventHandler(this.btnSaveAs_Click);
-			// 
-			// lblPGItem
-			// 
-			this.lblPGItem.AutoSize = true;
-			this.lblPGItem.Location = new System.Drawing.Point(39, 20);
-			this.lblPGItem.Name = "lblPGItem";
-			this.lblPGItem.Size = new System.Drawing.Size(46, 17);
-			this.lblPGItem.TabIndex = 2;
-			this.lblPGItem.Text = "label1";
-			this.lblPGItem.Visible = false;
-			// 
-			// btnSaveClose
-			// 
-			this.btnSaveClose.DialogResult = System.Windows.Forms.DialogResult.OK;
-			this.btnSaveClose.Dock = System.Windows.Forms.DockStyle.Right;
-			this.btnSaveClose.Enabled = false;
-			this.btnSaveClose.Location = new System.Drawing.Point(464, 0);
-			this.btnSaveClose.Name = "btnSaveClose";
-			this.btnSaveClose.Size = new System.Drawing.Size(75, 68);
-			this.btnSaveClose.TabIndex = 1;
-			this.btnSaveClose.Text = "Save and Close";
-			this.btnSaveClose.UseVisualStyleBackColor = true;
-			this.btnSaveClose.Click += new System.EventHandler(this.btnSaveClose_Click);
-			// 
-			// btnCancel
-			// 
-			this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.btnCancel.Dock = System.Windows.Forms.DockStyle.Right;
-			this.btnCancel.Location = new System.Drawing.Point(539, 0);
-			this.btnCancel.Name = "btnCancel";
-			this.btnCancel.Size = new System.Drawing.Size(75, 68);
-			this.btnCancel.TabIndex = 0;
-			this.btnCancel.Text = "Cancel";
-			this.btnCancel.UseVisualStyleBackColor = true;
-			this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
-			// 
-			// PG
-			// 
-			this.PG.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left)));
-			this.PG.Font = new System.Drawing.Font("Arial Rounded MT Bold", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.PG.LineColor = System.Drawing.SystemColors.ControlDark;
-			this.PG.Location = new System.Drawing.Point(0, 155);
-			this.PG.Name = "PG";
-			this.PG.Size = new System.Drawing.Size(614, 405);
-			this.PG.TabIndex = 1;
-			// 
-			// pnlFormatList
-			// 
-			this.pnlFormatList.Controls.Add(this.tbUCFSummary);
-			this.pnlFormatList.Controls.Add(this.btnDetails);
-			this.pnlFormatList.Controls.Add(this.lblSummary);
-			this.pnlFormatList.Controls.Add(this.lblDerivedFrom);
-			this.pnlFormatList.Controls.Add(this.lblDerFrom);
-			this.pnlFormatList.Controls.Add(this.cbxFormatList);
-			this.pnlFormatList.Controls.Add(this.lblFormatList);
-			this.pnlFormatList.Dock = System.Windows.Forms.DockStyle.Top;
-			this.pnlFormatList.Location = new System.Drawing.Point(0, 0);
-			this.pnlFormatList.Name = "pnlFormatList";
-			this.pnlFormatList.Size = new System.Drawing.Size(614, 149);
-			this.pnlFormatList.TabIndex = 3;
-			// 
-			// tbUCFSummary
-			// 
-			this.tbUCFSummary.BackColor = System.Drawing.SystemColors.Control;
-			this.tbUCFSummary.BorderStyle = System.Windows.Forms.BorderStyle.None;
-			this.tbUCFSummary.Location = new System.Drawing.Point(33, 120);
-			this.tbUCFSummary.Name = "tbUCFSummary";
-			this.tbUCFSummary.Size = new System.Drawing.Size(485, 15);
-			this.tbUCFSummary.TabIndex = 7;
-			// 
-			// btnDetails
-			// 
-			this.btnDetails.Location = new System.Drawing.Point(539, 112);
-			this.btnDetails.Name = "btnDetails";
-			this.btnDetails.Size = new System.Drawing.Size(63, 33);
-			this.btnDetails.TabIndex = 6;
-			this.btnDetails.Text = "Details";
-			this.btnDetails.UseVisualStyleBackColor = true;
-			this.btnDetails.Visible = false;
-			this.btnDetails.Click += new System.EventHandler(this.btnDetails_Click);
-			// 
-			// lblSummary
-			// 
-			this.lblSummary.AutoSize = true;
-			this.lblSummary.Location = new System.Drawing.Point(5, 96);
-			this.lblSummary.Name = "lblSummary";
-			this.lblSummary.Size = new System.Drawing.Size(71, 17);
-			this.lblSummary.TabIndex = 4;
-			this.lblSummary.Text = "Summary:";
-			this.lblSummary.Visible = false;
-			// 
-			// lblDerivedFrom
-			// 
-			this.lblDerivedFrom.AutoSize = true;
-			this.lblDerivedFrom.Location = new System.Drawing.Point(33, 75);
-			this.lblDerivedFrom.Name = "lblDerivedFrom";
-			this.lblDerivedFrom.Size = new System.Drawing.Size(0, 17);
-			this.lblDerivedFrom.TabIndex = 3;
-			this.lblDerivedFrom.Visible = false;
-			// 
-			// lblDerFrom
-			// 
-			this.lblDerFrom.AutoSize = true;
-			this.lblDerFrom.Location = new System.Drawing.Point(3, 52);
-			this.lblDerFrom.Name = "lblDerFrom";
-			this.lblDerFrom.Size = new System.Drawing.Size(97, 17);
-			this.lblDerFrom.TabIndex = 2;
-			this.lblDerFrom.Text = "Derived From:";
-			this.lblDerFrom.Visible = false;
-			// 
-			// cbxFormatList
-			// 
-			this.cbxFormatList.FormattingEnabled = true;
-			this.cbxFormatList.Location = new System.Drawing.Point(23, 25);
-			this.cbxFormatList.Name = "cbxFormatList";
-			this.cbxFormatList.Size = new System.Drawing.Size(550, 24);
-			this.cbxFormatList.Sorted = true;
-			this.cbxFormatList.TabIndex = 1;
-			this.cbxFormatList.SelectedIndexChanged += new System.EventHandler(this.cbxFormatList_SelectedIndexChanged);
-			// 
-			// lblFormatList
-			// 
-			this.lblFormatList.AutoSize = true;
-			this.lblFormatList.Location = new System.Drawing.Point(5, 4);
-			this.lblFormatList.Name = "lblFormatList";
-			this.lblFormatList.Size = new System.Drawing.Size(115, 17);
-			this.lblFormatList.TabIndex = 0;
-			this.lblFormatList.Text = "Selected Format:";
-			// 
-			// frmUCF
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(614, 628);
-			this.Controls.Add(this.pnlFormatList);
-			this.Controls.Add(this.PG);
-			this.Controls.Add(this.PGpanelBtm);
-			this.Name = "frmUCF";
-			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-			this.Text = "User Control of Format";
-			this.Load += new System.EventHandler(this.frmUCF_Load);
-			this.PGpanelBtm.ResumeLayout(false);
-			this.PGpanelBtm.PerformLayout();
-			this.pnlFormatList.ResumeLayout(false);
-			this.pnlFormatList.PerformLayout();
-			this.ResumeLayout(false);
-
-		}
-
-		#endregion
-
-		private System.Windows.Forms.Panel PGpanelBtm;
-		private System.Windows.Forms.Button btnSaveClose;
-		private System.Windows.Forms.Button btnCancel;
-        private System.Windows.Forms.PropertyGrid PG;
-		private System.Windows.Forms.Panel pnlFormatList;
-		private System.Windows.Forms.Label lblFormatList;
-		private System.Windows.Forms.ComboBox cbxFormatList;
-        private System.Windows.Forms.Label lblPGItem;
-        private System.Windows.Forms.Button btnSaveAs;
-        private System.Windows.Forms.Button btnReset;
-        private System.Windows.Forms.Button btnDelete;
-        private System.Windows.Forms.Label lblDerivedFrom;
-        private System.Windows.Forms.Label lblDerFrom;
-		private System.Windows.Forms.Button btnDetails;
-		private System.Windows.Forms.Label lblSummary;
-		private System.Windows.Forms.TextBox tbUCFSummary;
-		private System.Windows.Forms.Button btnSave;
-
-	}
-}
-

PROMS/VEPROMS User Interface/frmUCF.resx

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

PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs

@@ -721,7 +721,7 @@ namespace VEPROMS
 			this.epAnnotations.Dock = System.Windows.Forms.DockStyle.Bottom;
 			this.epAnnotations.Enabled = false;
 			this.epAnnotations.Expanded = false;
-			this.epAnnotations.ExpandedBounds = new System.Drawing.Rectangle(4, 544, 1187, 202);
+			this.epAnnotations.ExpandedBounds = new System.Drawing.Rectangle(5, 371, 1185, 202);
 			this.epAnnotations.ExpandOnTitleClick = true;
 			this.epAnnotations.Location = new System.Drawing.Point(5, 547);
 			this.epAnnotations.Name = "epAnnotations";
@@ -761,7 +761,7 @@ namespace VEPROMS
 			this.ctrlAnnotationDetails.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.ctrlAnnotationDetails.Enabled = false;
 			this.ctrlAnnotationDetails.Location = new System.Drawing.Point(0, 26);
-			this.ctrlAnnotationDetails.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+			this.ctrlAnnotationDetails.Margin = new System.Windows.Forms.Padding(2);
 			this.ctrlAnnotationDetails.MyUserInfo = null;
 			this.ctrlAnnotationDetails.Name = "ctrlAnnotationDetails";
 			this.ctrlAnnotationDetails.ProcItem = null;

PROMS/VEPROMS User Interface/frmVEPROMS.cs

@@ -269,8 +269,6 @@ namespace VEPROMS
 			return true;
 		}
 
-		private E_UCFImportOptions _UCFImportOptionsFromSettings;
-
 		public frmVEPROMS()
 		{
 			// The following Try/Catch was added to protect against a problem seen by Kathy and Michelle
@@ -543,7 +541,6 @@ namespace VEPROMS
 			tv.RefreshCheckedOutProcedures += new vlnTreeViewEvent(tv_RefreshCheckedOutProcedures);
 			tv.ProcedureCheckedOutTo += new vlnTreeViewEvent(tv_ProcedureCheckedOutTo);
 			tv.ViewPDF += new vlnTreeViewPdfEvent(tv_ViewPDF);
-
 			displayApplicability.ApplicabilityViewModeChanged += new DisplayApplicability.DisplayApplicabilityEvent(displayApplicability_ApplicabilityViewModeChanged);
 			
 			tv.ExportImportProcedureSets += new vlnTreeViewEvent(tv_ExportImportProcedureSets);
@@ -708,15 +705,32 @@ namespace VEPROMS
 				else
 				{
 					int ownerid = MySessionInfo.CheckOutItem(fi.FolderID, CheckOutType.Session);
-					
-					dlgExportImport dlg = new dlgExportImport(args.Index == 0 ? "Export" : "Import", fi, this, (E_UCFImportOptions)Properties.Settings.Default.UCFImportOpt);//Added frmVEPROMS Parameter
-					dlg.ShowDialog(this);
 
-					MySessionInfo.CheckInItem(ownerid);
-
-					if (args.Index == 1 && dlg.MyNewFolder != null)
+					//C2025-024 Electronic Procedures - Phase 2 (PROMS XML output)
+					//form for exporting Electronic Procedures from FolderInfo
+					if (args.AnnotationTypeId > 0)
 					{
-						tv.AddNewNode(dlg.MyNewFolder);
+						dlgExportImportEP dlg = new dlgExportImportEP(args.Index == 0 ? "Export" : "Import", fi, this, args.AnnotationTypeId, args.UnitIndex);
+						dlg.ShowDialog(this);
+
+						MySessionInfo.CheckInItem(ownerid);
+
+						if (args.Index == 1 && dlg.MyNewFolder != null)
+						{
+							tv.AddNewNode(dlg.MyNewFolder);
+						}
+					}
+					else
+					{
+						dlgExportImport dlg = new dlgExportImport(args.Index == 0 ? "Export" : "Import", fi, this);//Added frmVEPROMS Parameter
+						dlg.ShowDialog(this);
+
+						MySessionInfo.CheckInItem(ownerid);
+
+						if (args.Index == 1 && dlg.MyNewFolder != null)
+						{
+							tv.AddNewNode(dlg.MyNewFolder);
+						}
 					}
 				}
 			}
@@ -742,18 +756,40 @@ namespace VEPROMS
 
 					int ownerid = MySessionInfo.CheckOutItem(dvi.VersionID, CheckOutType.DocVersion);
 
-					dlgExportImport dlg = new dlgExportImport("Import", dvi, this, (E_UCFImportOptions)Properties.Settings.Default.UCFImportOpt);//Added frmVEPROMS Parameter
-					dlg.MyNewProcedure = null;
-					dlg.ExternalTransitionItem = null;
-					dlg.ShowDialog(this);
+					//C2025-024 Electronic Procedures - Phase 2 (PROMS XML output)
+					//form for exporting Electronic Procedures from DocVersionInfo
+					if (args.AnnotationTypeId > 0)
+					{
+						dlgExportImportEP dlg = new dlgExportImportEP(args.Index == 0 ? "Export" : "Import", dvi, this, args.AnnotationTypeId, args.UnitIndex);
+						dlg.MyNewProcedure = null;
+						dlg.ExternalTransitionItem = null;
+						dlg.ShowDialog(this);
 
-					MySessionInfo.CheckInItem(ownerid);
+						MySessionInfo.CheckInItem(ownerid);
 
-					if (dlg.MyNewProcedure != null)
-						tv.AddNewNode(dlg.MyNewProcedure);
+						if (dlg.MyNewProcedure != null)
+							tv.AddNewNode(dlg.MyNewProcedure);
+
+						if (dlg.ExternalTransitionItem != null)
+							tc.OpenItem(dlg.ExternalTransitionItem);
+					}
+					else
+					{
+
+						dlgExportImport dlg = new dlgExportImport("Import", dvi, this);//Added frmVEPROMS Parameter
+						dlg.MyNewProcedure = null;
+						dlg.ExternalTransitionItem = null;
+						dlg.ShowDialog(this);
+
+						MySessionInfo.CheckInItem(ownerid);
+
+						if (dlg.MyNewProcedure != null)
+							tv.AddNewNode(dlg.MyNewProcedure);
+
+						if (dlg.ExternalTransitionItem != null)
+							tc.OpenItem(dlg.ExternalTransitionItem);
+					}
 
-					if (dlg.ExternalTransitionItem != null)
-						tc.OpenItem(dlg.ExternalTransitionItem);
 				}
 			}
 
@@ -769,10 +805,24 @@ namespace VEPROMS
 				else
 				{
 					int ownerid = MySessionInfo.CheckOutItem(pi.ItemID, CheckOutType.Procedure);
-					dlgExportImport dlg = new dlgExportImport("Export", pi, this, (E_UCFImportOptions)0);//Added frmVEPROMS Parameter
-					dlg.ShowDialog(this);
 
-					MySessionInfo.CheckInItem(ownerid);
+					//C2025-024 Electronic Procedures - Phase 2 (PROMS XML output)
+					//form for exporting Electronic Procedures from ProcedureInfo
+					if (args.AnnotationTypeId > 0)
+					{
+						dlgExportImportEP dlg = new dlgExportImportEP("Export", pi, this, args.AnnotationTypeId, args.UnitIndex);
+						dlg.ShowDialog(this);
+
+						MySessionInfo.CheckInItem(ownerid);
+					}
+					else
+					{
+
+						dlgExportImport dlg = new dlgExportImport("Export", pi, this);//Added frmVEPROMS Parameter
+						dlg.ShowDialog(this);
+
+						MySessionInfo.CheckInItem(ownerid);
+					}
 				}
 			}
 		}
@@ -1193,6 +1243,7 @@ namespace VEPROMS
 
 				using (DlgPrintProcedure prnDlg = new DlgPrintProcedure(pi))
 				{
+					prnDlg.OverwritePDF = false; // turn off overwriting of PDFs B2025-041
 					prnDlg.SelectedSlave = args.UnitIndex;
 					prnDlg.MySessionInfo = MySessionInfo;
 					prnDlg.SetupForProcedure();  // Setup filename
@@ -1216,7 +1267,7 @@ namespace VEPROMS
 
 		//Print Section
 		//C2025-028 Add a Quick Print Section option
-	
+
 		void tv_PrintSection(object sender, vlnTreeEventArgs args)
 		{
 			PrintSection(sender, args, false);
@@ -1226,7 +1277,7 @@ namespace VEPROMS
 			PrintSection(sender, args, true);
 		}
 
-		void PrintSection(object sender, vlnTreeEventArgs args, bool quickprint)  
+		void PrintSection(object sender, vlnTreeEventArgs args, bool quickprint)
 		{
 			try
 			{
@@ -1296,7 +1347,11 @@ namespace VEPROMS
 
 			pi.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
 		}
-
+		public static void tv_SelectAnnotations()
+		{
+			dlgAnnotationsSelect sannoDlg = new dlgAnnotationsSelect(VlnSettings.UserID);
+			sannoDlg.ShowDialog(); // RHM 20120925 - Center dialog over PROMS window
+		}
 		void tv_CreateTimeCriticalActionSummary(object sender, vlnTreeEventArgs args)
 		{
 			DialogResult dr = System.Windows.Forms.DialogResult.Yes;
@@ -1483,9 +1538,11 @@ namespace VEPROMS
 			// and if they are not the same, use the CurrentItem from the main frmVEPROMS.
 			ProcedureInfo piThis = null;
 			if (_CurrentItem != null) piThis = _CurrentItem.MyProcedure;
-
 			ProcedureInfo pi = args.Proc as ProcedureInfo;
-			if (piThis != null && pi.ItemID != piThis.ItemID) pi = piThis;
+			if (args.OringFlg == 1) // B2025-036 split screen print issue. if oringFlg == 1 the ctrl-p keys was pressed.
+			{
+				if (piThis != null && pi.ItemID != piThis.ItemID) pi = piThis;
+			}
 
 			// Check if Procedure Info is null
 			if (pi == null) return;
@@ -1527,8 +1584,11 @@ namespace VEPROMS
 			if (_CurrentItem != null) piThis = _CurrentItem.MyProcedure;
 
 			ProcedureInfo pi = args.Proc as ProcedureInfo;
-			if (piThis != null && pi.ItemID != piThis.ItemID) pi = piThis;
 
+			if (args.OringFlg == 1) // B2025-036 split screen print issue. if oringFlg == 1 the ctrl-p keys was pressed.
+			{
+				if (piThis != null && pi.ItemID != piThis.ItemID) pi = piThis;
+			}
 			// Check if Procedure Info is null
 			if (pi == null) return;
 
@@ -1541,6 +1601,7 @@ namespace VEPROMS
 			{
 				using (DlgPrintProcedure prnDlg = new DlgPrintProcedure(pi))
 				{
+					prnDlg.OverwritePDF = false; // turn off overwriting of PDFs C2025-048.
 					prnDlg.SelectedSlave = pi.ProcedureConfig.SelectedSlave == 0 ? -1 : pi.ProcedureConfig.SelectedSlave; //added by jcb 20130718 to support create pdf button when multi-unit and user selects a unit
 					prnDlg.MySessionInfo = MySessionInfo;
 					prnDlg.SetupForProcedure();  // Setup filename
@@ -1947,9 +2008,9 @@ namespace VEPROMS
 		private DevComponents.DotNetBar.ButtonItem btnAdministrativeTools;
 		private DevComponents.DotNetBar.ButtonItem btnSecurity;
 		private DevComponents.DotNetBar.ButtonItem btnFormats;
-		private DevComponents.DotNetBar.ButtonItem btnUserControlOfFormats;
-		private DevComponents.DotNetBar.ButtonItem btnUserControlOfFormatsExport;
-		private DevComponents.DotNetBar.ButtonItem btnUserControlOfFormatsImport;
+
+		private DevComponents.DotNetBar.ButtonItem btnGeneralTools;
+
 		private TabItemsToClose _MyCloseTabList = new TabItemsToClose();
 		
 		public TabItemsToClose MyCloseTabList
@@ -2139,45 +2200,15 @@ namespace VEPROMS
 			InitializeSecurity();
 			UpdateUser();
 
-			//btnSecurity = new ButtonItem("btnSecurity", "Security");    // C2019-002: move security & format items into submenus
-			//btnFormats = new ButtonItem("btnFormats", "Formats");
-			//btnAdmin.SubItems.Add(btnSecurity);
-			//btnAdmin.SubItems.Add(btnFormats);
-			//btnUserControlOfFormats = new ButtonItem("btnUserControlOfFormats", "User Control of Formats");
-			//btnFormats.SubItems.Add(btnUpdateFormats);
-			//btnFormats.SubItems.Add(btnUserControlOfFormats);
-			//btnUserControlOfFormats.Click += new EventHandler(btnUserControlOfFormats_Click);
-			//btnUserControlOfFormatsExport = new ButtonItem("btnUserControlOfFormatsExport", "Export User Control of Formats");
-			//btnFormats.SubItems.Add(btnUserControlOfFormatsExport);
-			//btnUserControlOfFormatsExport.Click += new EventHandler(btnUserControlOfFormatsExport_Click);
-			//btnUserControlOfFormatsImport = new ButtonItem("btnUserControlOfFormatsImport", "Import User Control of Formats");
-			//btnFormats.SubItems.Add(btnUserControlOfFormatsImport);
-			//btnUserControlOfFormatsImport.Click += new EventHandler(btnUserControlOfFormatsImport_Click);
-			//btnManageSecurity = new ButtonItem("btnManageSecurity", "Manage Security");
-			//btnSecurity.SubItems.Add(btnManageSecurity);
-			//btnManageSecurity.Click += new EventHandler(btnManageSecurity_Click);
-
-
 			btnSecurity = new ButtonItem("btnSecurity", "Security");    // C2019-002: move security & format items into submenus
 			btnFormats = new ButtonItem("btnFormats", "Formats");
 			btnAdmin.SubItems.Add(btnSecurity);
 			// btnAdmin.SubItems.Add(btnFormats); // C2024 - 041 remove from Admin(V button) menu
 			btnAdmin.SubItems.Add(btnUpdateFormats); // C2024 - 041 remove from Admin(V button) menu
-			btnUserControlOfFormats = new ButtonItem("btnUserControlOfFormats", "User Control of Formats");
-			//btnFormats.SubItems.Add(btnUpdateFormats);
-			//btnFormats.SubItems.Add(btnUserControlOfFormats);  // C2024-041 remove from Admin (V button) menu
-			btnUserControlOfFormats.Click += new EventHandler(btnUserControlOfFormats_Click);
-			btnUserControlOfFormatsExport = new ButtonItem("btnUserControlOfFormatsExport", "Export User Control of Formats");
-			//btnFormats.SubItems.Add(btnUserControlOfFormatsExport); // C2024-041 remove from Admin (V button) menu
-			btnUserControlOfFormatsExport.Click += new EventHandler(btnUserControlOfFormatsExport_Click);
-			btnUserControlOfFormatsImport = new ButtonItem("btnUserControlOfFormatsImport", "Import User Control of Formats");
-			//btnFormats.SubItems.Add(btnUserControlOfFormatsImport); // C2024-041 remove from Admin (V button) menu
-			btnUserControlOfFormatsImport.Click += new EventHandler(btnUserControlOfFormatsImport_Click);
 			btnManageSecurity = new ButtonItem("btnManageSecurity", "Manage Security");
 			btnSecurity.SubItems.Add(btnManageSecurity);
 			btnManageSecurity.Click += new EventHandler(btnManageSecurity_Click);
 
-
 			//added by jcb: menu item to reset security requires password to implement
 			btnResetSecurity = new ButtonItem("btnResetSecurity", "Reset Security");
 			btnSecurity.SubItems.Add(btnResetSecurity);
@@ -2188,14 +2219,23 @@ namespace VEPROMS
 			btnAdministrativeTools.Click += new EventHandler(btnAdministrativeTools_Click);
 			btnAdmin.SubItems.Add(btnAdministrativeTools);
 
+			//general Tools
+			btnGeneralTools = new ButtonItem("btnGeneralTools", "General Tools");
+			btnGeneralTools.Visible = btnGeneralTools.Enabled = true;
+			btnGeneralTools.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
+			btnGeneralTools.CanCustomize = false;
+			btnGeneralTools.Image = global::VEPROMS.Properties.Resources.toolbox;
+			btnGeneralTools.Click += new EventHandler(btnGeneralTools_Click);
+			itemContainer3.SubItems.Add(btnGeneralTools);
+
+
 			// C2025-031 added tool tip messages
 			this.superTooltip1.SetSuperTooltip(btnManageSecurity, new SuperTooltipInfo("Manage Security", "", "Add, Modify, and Delete PROMS User Access", null, null, eTooltipColor.Gray));
-			// remove commented out line below when User Control of Formats code is deleted
-			//this.superTooltip1.SetSuperTooltip(btnUserControlOfFormats, new SuperTooltipInfo("User Control Of Formats", null, null, null, null, eTooltipColor.Gray));
 			this.superTooltip1.SetSuperTooltip(btnResetSecurity, new SuperTooltipInfo("Reset Security", "", "WARNING this will \nREMOVE ALL PROMS USERS and Reset to the\nOriginal Volian Defaults", null, null, eTooltipColor.Gray));
 			this.superTooltip1.SetSuperTooltip(btnAdministrativeTools, new SuperTooltipInfo("Administrative Tools", "", "Open the PROMS Adminstration Tools Window", null, null, eTooltipColor.Gray));
 			this.superTooltip1.SetSuperTooltip(btnUpdateFormats, new SuperTooltipInfo("Update Formats", "", "Install New Formats \n or Re-Install Formats", null, null, eTooltipColor.Gray));
-			
+			this.superTooltip1.SetSuperTooltip(btnGeneralTools, new SuperTooltipInfo("General Tools", "", "Open the PROMS General Tools Window", null, null, eTooltipColor.Gray));
+
 			try
 			{
 				MyUserInfo = UserInfo.GetByUserID(VlnSettings.UserID);
@@ -2232,9 +2272,6 @@ namespace VEPROMS
 
 			bool isVisible = MyUserInfo.IsAdministrator();
 
-			btnUserControlOfFormats.Visible = isVisible;
-			btnUserControlOfFormatsExport.Visible = isVisible;
-			btnUserControlOfFormatsImport.Visible = isVisible;
 			btnManageSecurity.Visible = isVisible;
 			btnUpdateFormats.Visible = isVisible;
 			btnResetSecurity.Visible = isVisible;
@@ -2891,6 +2928,13 @@ namespace VEPROMS
 			frm.ShowDialog(this);
 		}
 
+		void btnGeneralTools_Click(object sender, EventArgs e)
+		{
+			frmGenTools frm = new frmGenTools(MySessionInfo, this);
+			frm.ProgressBar = bottomProgBar;
+			frm.ShowDialog(this);
+		}
+
 		private static VolianTimer _TimeActivity1 = new VolianTimer("frmVEPROMS.cs tmrCloseTabItems_Tick", 2108);
 
 		void tmrCloseTabItems_Tick(object sender, EventArgs e)
@@ -3072,32 +3116,6 @@ namespace VEPROMS
 			}
 		}
 
-		void btnUserControlOfFormats_Click(object sender, EventArgs e)
-		{
-			frmUCF frmucf = new frmUCF();
-			DialogResult dr = frmucf.ShowDialog(this);
-		}
-
-		void btnUserControlOfFormatsExport_Click(object sender, EventArgs e)
-		{
-			DocVersionInfo dvi = null;
-
-			dlgExportImport dlg = new dlgExportImport("Export Formats", dvi, this, (E_UCFImportOptions)0);
-			dlg.MyNewProcedure = null;
-			dlg.ExternalTransitionItem = null;
-			dlg.ShowDialog(this);
-		}
-
-		void btnUserControlOfFormatsImport_Click(object sender, EventArgs e)
-		{
-			DocVersionInfo dvi = null;
-
-			dlgExportImport dlg = new dlgExportImport("Import Formats", dvi, this, (E_UCFImportOptions)0);
-			dlg.MyNewProcedure = null;
-			dlg.ExternalTransitionItem = null;
-			dlg.ShowDialog(this);
-		}
-
 		void btnManageSecurity_Click(object sender, EventArgs e)
 		{
 			dlgManageSecurity dlg = new dlgManageSecurity();
@@ -5315,3 +5333,11 @@ namespace VEPROMS
 	}
 
 }
+
+
+
+
+
+
+
+

PROMS/VEPROMS.CSLA.Library/Config/FormatConfig.cs

@@ -213,14 +213,7 @@ namespace VEPROMS.CSLA.Library
 		[TypeConverter(typeof(ExpandableObjectConverter))]
 		public class Flags
 		{
-			private bool? _CheckOffUCF;
-			[DisplayName("UCF CheckOffs")]
-			[Description("Additional UCF Check Offs and Sign Offs")]
-			public bool? CheckOffUCF
-			{
-				get { return _CheckOffUCF; }
-				set { _CheckOffUCF = value; }
-			}
+
 			private bool? _PartialStepCompression;
 			[DisplayName("Partial Step Compression")]
 			[Description("Automatically compress last sub-steps to fit on page")]
@@ -272,41 +265,7 @@ namespace VEPROMS.CSLA.Library
 		}
 		#endregion ReplaceStrData
 		#region ReplaceStr
-		[Flags]
-		public enum E_ReplaceFlagsUCF : uint
-		{
-			High = 0x0001,		    // Do ReplaceWords in HIGH LEVEL STEPS
-			RNO = 0x0002,		    // Do ReplaceWords in RNOS
-			Caution = 0x0004,		    // Do ReplaceWords in CAUTIONS
-			Note = 0x0008,		    // Do ReplaceWords in NOTES
-			Table = 0x0010,		    // Do ReplaceWords in TABLES
-			Substep = 0x0020,		    // Do ReplaceWords in SUBSTEPS
-			Attach = 0x0040,		    // Do ReplaceWords in ATTACHMENTS
-			Bkgd = 0x0080,		// Do ReplaceWords in BACKGROUNDS
-			DiffUnit = 0x0100,		// Do ReplaceWords ONLY for different UNIT # 
-			TOC = 0x0200,		    // Do in auto table-of-contents 
-			StatTree = 0x0400,
-			HLSSetpnt = 0x0800,		// Do ReplaceWords in HighLevelStep SETPoiNTs
-			Trans = 0x1000,		    // Do ReplaceWords in TRANSITIONS
-			Setpoint = 0x2000,		// Do ReplaceWords in SETPOINTS
 
-			// Case Sensitivity Flags - default is off (Case Sensitive Replace)
-			CaseInsens = 0x0000C000,	// Do ReplaceWords for all words thatmatch, regardless of case,
-			//   and replace with the ReplaceWith string as is
-			// B2019-022: do not support CaseInsensFirst & CaseInsensAll - there is no supporting replace word code:
-			//CaseInsensFirst = 0x4000,	// Do ReplaceWords for all words thatexactly match the ReplaceWord, 
-			//   except the case of the first character may be different
-			//CaseInsensAll = 0x8000,	// Do ReplaceWords for all words that match the ReplaceWord, regardless of case
-
-			Partials = 0x10000,   // Do replace even on partial matches
-			Plackeep = 0x20000,   // Do replace in PlaceKeepers
-			InSecTitle = 0x40000,
-			BeforeTrans = 0x80000,   // Only do replace if the string occurs immediately before a transition.
-			BeforeList = 0x100000,   // C2021-045 Only if the text ends with a colon ":"
-			PageList = 0x200000,     // F2021-053 Do replace words for PageList items that are ROs
-			FirstWord = 0x400000,   // C2021-056 Do only if is the first word in the text
-			NotInRO = 0x800000      // B2022-015 BNPPalr: Determine whether RO text should have Replace Words applied
-		}
 		[Serializable]
 		[TypeConverter(typeof(ExpandableObjectConverter))]
 		public class ReplaceStr
@@ -319,15 +278,7 @@ namespace VEPROMS.CSLA.Library
 				get { return _State; }
 				set { _State = value; }
 			}
-			private E_ReplaceFlagsUCF _Flag;
-			[Editor(typeof(FlagEnumUIEditor), typeof(System.Drawing.Design.UITypeEditor))]
-			[XmlAttribute("Flag")]
-			[DisplayName("Flags (Use In)")]         // Note that [Description] is not used in collection items (that use collection editor)
-			public E_ReplaceFlagsUCF Flag
-			{
-				get { return (E_ReplaceFlagsUCF)_Flag; }
-				set { _Flag = value; }
-			}
+
 			private string _ReplaceWord;
 			[XmlAttribute("ReplaceWord")]
 			[DisplayName("Replace Word")]
@@ -341,7 +292,6 @@ namespace VEPROMS.CSLA.Library
 				}
 			}
 			private string _ReplaceWith;
-			[Editor(typeof(RtfEditor), typeof(System.Drawing.Design.UITypeEditor))]
 
 			[XmlAttribute("ReplaceWith")]
 			[DisplayName("With")]

PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs

@@ -839,7 +839,7 @@ namespace VEPROMS.CSLA.Library
 				{
 					using (SqlCommand cmd = cn.CreateCommand())
 					{
-						cmd.CommandTimeout = Database.DefaultTimeout;
+						cmd.CommandTimeout = 0;
 						cmd.CommandType = CommandType.StoredProcedure;
 						cmd.CommandText = "vesp_RofstHeaderFinalizeLoad";
 

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

@@ -1755,165 +1755,6 @@ namespace VEPROMS.CSLA.Library
 
 		#endregion
 
-		#region UCF Fix FormatId After Import
-		private class FixFormatIDAfterImportCriteria
-		{
-			private string _DocVersionList;
-			public string DocVersionList
-			{
-				get { return _DocVersionList; }
-				set { _DocVersionList = value; }
-			}
-			private int _OldFormatID;
-			public int OldFormatID
-			{
-				get { return _OldFormatID; }
-				set { _OldFormatID = value; }
-			}
-			private int _NewFormatID;
-			public int NewFormatID
-			{
-				get { return _NewFormatID; }
-				set { _NewFormatID = value; }
-			}
-			public FixFormatIDAfterImportCriteria(string dvlst, int oldfid, int newfid)
-			{
-				_DocVersionList = dvlst;
-				_OldFormatID = oldfid;
-				_NewFormatID = newfid;
-			}
-		}
-
-		private void DataPortal_Fetch(FixFormatIDAfterImportCriteria criteria)
-		{
-			try
-			{
-				using (SqlConnection cn = Database.VEPROMS_SqlConnection)
-				{
-					using (SqlCommand cm = cn.CreateCommand())
-					{
-						cm.CommandType = CommandType.StoredProcedure;
-						cm.CommandText = "vesp_UpdateVersionFormatForUCF";
-						cm.Parameters.AddWithValue("@VersionList", criteria.DocVersionList);
-						cm.Parameters.AddWithValue("@OldFormatID", criteria.OldFormatID);
-						cm.Parameters.AddWithValue("@NewFormatID", criteria.NewFormatID);
-						cm.CommandTimeout = Database.DefaultTimeout;
-						using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader()))
-						{
-							IsReadOnly = false;
-							while (dr.Read())
-							{
-								ContentInfo contentInfo = new ContentInfo(dr);
-								this.Add(contentInfo);
-							}
-							IsReadOnly = true;
-						}
-					}
-				}
-			}
-			catch (Exception ex)
-			{
-				Database.LogException("FixFormatIDAfterImport.DataPortal_Fetch", ex);
-				throw new DbCslaException("FixFormatIDAfterImport.DataPortal_Fetch", ex);
-			}
-		}
-
-		public static ContentInfoList FixFormatIDAfterImport(string dvlst, int oldfid, int newfid)
-		{
-			try
-			{
-				ContentInfoList tmp = DataPortal.Fetch<ContentInfoList>(new FixFormatIDAfterImportCriteria(dvlst, oldfid, newfid));
-				return tmp;
-			}
-			catch (Exception ex)
-			{
-				throw new DbCslaException("Error on ContentInfoList.FixFormatIDAfterImport", ex);
-			}
-		}
-
-		#endregion
-
-		#region UCF Clear Overwridden Formats
-		private class ClearOverrideFormatsByFolderCriteria
-		{
-			public ClearOverrideFormatsByFolderCriteria(int folderID, int? formatID, int? newformatID)
-			{
-				_FormatID = formatID;
-				_FolderID = folderID;
-				_NewFormatID = newformatID;
-			}
-			private int? _FormatID;
-			public int? FormatID
-			{
-				get { return _FormatID; }
-				set { _FormatID = value; }
-			}
-			private int? _NewFormatID;
-			public int? NewFormatID
-			{
-				get { return _NewFormatID; }
-				set { _NewFormatID = value; }
-			}
-			private int _FolderID;
-			public int FolderID
-			{
-				get { return _FolderID; }
-				set { _FolderID = value; }
-			}
-		}
-
-		private void DataPortal_Fetch(ClearOverrideFormatsByFolderCriteria criteria)
-		{
-			try
-			{
-				using (SqlConnection cn = Database.VEPROMS_SqlConnection)
-				{
-					using (SqlCommand cm = cn.CreateCommand())
-					{
-						cm.CommandType = CommandType.StoredProcedure;
-						cm.CommandText = "vesp_ClearOverrideFormatsByFolder";
-						cm.Parameters.AddWithValue("@FolderID", criteria.FolderID);
-						if (criteria.FormatID == null)
-							cm.Parameters.AddWithValue("@FormatID", DBNull.Value);
-						else
-							cm.Parameters.AddWithValue("@FormatID", criteria.FormatID);
-						if (criteria.NewFormatID == null)
-							cm.Parameters.AddWithValue("@NewFormatID", DBNull.Value);
-						else
-							cm.Parameters.AddWithValue("@NewFormatID", criteria.NewFormatID);
-						cm.CommandTimeout = Database.DefaultTimeout;
-						using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader()))
-						{
-							IsReadOnly = false;
-							while (dr.Read())
-							{
-								ContentInfo contentInfo = new ContentInfo(dr);
-								this.Add(contentInfo);
-							}
-							IsReadOnly = true;
-						}
-					}
-				}
-			}
-			catch (Exception ex)
-			{
-				Database.LogException("ClearOverrideFormatsByFolderCriteria.DataPortal_Fetch", ex);
-				throw new DbCslaException("ClearOverrideFormatsByFolderCriteria.DataPortal_Fetch", ex);
-			}
-		}
-
-		public static ContentInfoList ClearOverrideFormatsByFolder(int folderID, int? formatID, int? newformatID)
-		{
-			try
-			{
-				ContentInfoList tmp = DataPortal.Fetch<ContentInfoList>(new ClearOverrideFormatsByFolderCriteria(folderID, formatID, newformatID));
-				return tmp;
-			}
-			catch (Exception ex)
-			{
-				throw new DbCslaException("Error on ContentInfoList.ClearOverrideFormatsByFolder", ex);
-			}
-		}
 
 		private class ClearOverrideFormatsByDocVersionCriteria
 		{
@@ -2077,7 +1918,6 @@ namespace VEPROMS.CSLA.Library
 			}
 		}
 
-		#endregion
 
 		#region Enhanced
 

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

@@ -2153,7 +2153,7 @@ namespace VEPROMS.CSLA.Library
 		//    return Text;
 		//}
 #endregion
-		private static Dictionary<FormatConfig.ReplaceStr, Regex> dicReplaceRegex = new Dictionary<FormatConfig.ReplaceStr, Regex>();
+		private static Dictionary<ReplaceStr, Regex> dicReplaceRegex = new Dictionary<ReplaceStr, Regex>();
 		private static bool? _ProcessReplaceWords;
 		public static bool ProcessReplaceWords
 		{
@@ -2178,7 +2178,7 @@ namespace VEPROMS.CSLA.Library
 			// F2021-053: BNPP Alarm - need ability to have super/sub scripts in the text of Alarm Tables (ROs).
 			//	if doing replace words for Page List items, the current item is not a step, use _DoReplWordInPageList flags this
 			if (_MyItemInfo.MyContent.Type < 20000 && !_DoReplWordInPageList) return Text;   // for now only replace in steps.
-			FormatConfig.ReplaceStrData rsl = _MyFormat.PlantFormat.UCFandOrigReplaceStrData;
+			ReplaceStrList rsl = _MyFormat.PlantFormat.FormatData.SectData.ReplaceStrList;
 			if (rsl.Count == 1 && (rsl[0].ReplaceWord == null || rsl[0].ReplaceWord == "")) return Text;
 
 			// F2021-093: Handle partials first and then plain replace words.  Need to do this so that the words don't get processed by plain replace
@@ -2193,15 +2193,15 @@ namespace VEPROMS.CSLA.Library
 			// Loop through text looking for words to be replaced
 			Dictionary<E_ReplaceFlags?, bool> shouldReplace = new Dictionary<E_ReplaceFlags?, bool>();
 			//int profileDepth = ProfileTimer.Push(">>>> DoReplaceWords2.ForLoop");
-			foreach (FormatConfig.ReplaceStr rs in rsl)
+			foreach (ReplaceStr rs in rsl)
 			{
-				bool dopartial = (E_ReplaceFlags)(rs.Flag & FormatConfig.E_ReplaceFlagsUCF.Partials) == E_ReplaceFlags.Partials;
-				if (!dopartial)		// F2021-093: Partials moved into their own method and done first
+				bool dopartial = (rs.Flag & E_ReplaceFlags.Partials) == E_ReplaceFlags.Partials; // from pre-UCF
+				if (!dopartial)     // F2021-093: Partials moved into their own method and done first
 				{
-					bool onlyDoList = (E_ReplaceFlags)(rs.Flag & FormatConfig.E_ReplaceFlagsUCF.BeforeList) == E_ReplaceFlags.BeforeList; // C2021-045
-					bool onlyIfFirstWord = (E_ReplaceFlags)(rs.Flag & FormatConfig.E_ReplaceFlagsUCF.FirstWord) == E_ReplaceFlags.FirstWord; // C2021-056
-					bool doInPagelist = (E_ReplaceFlags)(rs.Flag & FormatConfig.E_ReplaceFlagsUCF.PageList) == E_ReplaceFlags.PageList; // B2021-132
-																																		//B2021-132 only do replacewords in paglist if the replaceword pagelist flag is set
+					bool onlyDoList = (E_ReplaceFlags)(rs.Flag & E_ReplaceFlags.BeforeList) == E_ReplaceFlags.BeforeList; // C2021-045, C2025-022 remove UFC
+					bool onlyIfFirstWord = (E_ReplaceFlags)(rs.Flag & E_ReplaceFlags.FirstWord) == E_ReplaceFlags.FirstWord; // C2021-056
+					bool doInPagelist = (E_ReplaceFlags)(rs.Flag & E_ReplaceFlags.PageList) == E_ReplaceFlags.PageList; // B2021-132
+																														  //B2021-132 only do replacewords in paglist if the replaceword pagelist flag is set
 					if (_DoReplWordInPageList && !doInPagelist) continue;
 
 					// note that the order of this check is important.  Check in this order...
@@ -2228,7 +2228,9 @@ namespace VEPROMS.CSLA.Library
 					{
 						if (!dicReplaceRegex.ContainsKey(rs))
 						{
-							RegexOptions myOptions = (E_ReplaceFlags)(rs.Flag & FormatConfig.E_ReplaceFlagsUCF.CaseInsens) == E_ReplaceFlags.CaseInsens ? RegexOptions.IgnoreCase : RegexOptions.None;
+							RegexOptions myOptions = (E_ReplaceFlags)(rs.Flag & E_ReplaceFlags.CaseInsens) == E_ReplaceFlags.CaseInsens ? RegexOptions.IgnoreCase : RegexOptions.None;
+							//RegexOptions myOptions = (E_ReplaceFlags)(rs.Flag) == E_ReplaceFlags.CaseInsens ? RegexOptions.IgnoreCase : RegexOptions.None;
+							//RegexOptions myOptions = (rs.Flag & E_ReplaceFlags.CaseInsens) == E_ReplaceFlags.CaseInsens ? RegexOptions.IgnoreCase : RegexOptions.None;
 							//int profileDepth3 = ProfileTimer.Push(">>>> DoReplaceWords2.BuildMatch");
 							// CASEINSENS: Do ReplaceWords for all words that match, regardless of case, and replace with the ReplaceWith string as is
 							//RegexOptions myOptions = (rs.Flag & E_ReplaceFlags.CaseInsens) == E_ReplaceFlags.CaseInsens ? RegexOptions.IgnoreCase & RegexOptions.Singleline : RegexOptions.None & RegexOptions.Singleline;
@@ -2268,18 +2270,18 @@ namespace VEPROMS.CSLA.Library
 		// F2021-093:  separate out partial replace words so that they can all be done before normal replace words.  Partials read in the 'repword', use
 		//		it as-is as a dotnet regular expression to do replacement.  Aside from the dotnet regular expression process, the rest of this
 		//		code is similar to plain regular expressions, in terms of processing flags for which steps, etc.
-		private string DoReplacePartials(string Text, FormatConfig.ReplaceStrData rsl)
+		private string DoReplacePartials(string Text, ReplaceStrList rsl)
 		{
-			Dictionary<FormatConfig.ReplaceStr, Regex> partialReplaceList = new Dictionary<FormatConfig.ReplaceStr, Regex>();
+			Dictionary<ReplaceStr, Regex> partialReplaceList = new Dictionary<ReplaceStr, Regex>();
 			Dictionary<E_ReplaceFlags?, bool> shouldReplace = new Dictionary<E_ReplaceFlags?, bool>();
-			foreach (FormatConfig.ReplaceStr rs in rsl)
+			foreach (ReplaceStr rs in rsl)
 			{
-				bool dopartial = (E_ReplaceFlags)(rs.Flag & FormatConfig.E_ReplaceFlagsUCF.Partials) == E_ReplaceFlags.Partials;
+				bool dopartial = (E_ReplaceFlags)(rs.Flag & E_ReplaceFlags.Partials) == E_ReplaceFlags.Partials;
 				if (dopartial)
 				{
-					bool onlyDoList = (E_ReplaceFlags)(rs.Flag & FormatConfig.E_ReplaceFlagsUCF.BeforeList) == E_ReplaceFlags.BeforeList; // C2021-045
-					bool onlyIfFirstWord = (E_ReplaceFlags)(rs.Flag & FormatConfig.E_ReplaceFlagsUCF.FirstWord) == E_ReplaceFlags.FirstWord; // C2021-056
-					bool doInPagelist = (E_ReplaceFlags)(rs.Flag & FormatConfig.E_ReplaceFlagsUCF.PageList) == E_ReplaceFlags.PageList; // B2021-132
+					bool onlyDoList = (E_ReplaceFlags)(rs.Flag & E_ReplaceFlags.BeforeList) == E_ReplaceFlags.BeforeList; // C2021-045
+					bool onlyIfFirstWord = (E_ReplaceFlags)(rs.Flag) == E_ReplaceFlags.FirstWord; // C2021-056
+					bool doInPagelist = (E_ReplaceFlags)(rs.Flag & E_ReplaceFlags.PageList) == E_ReplaceFlags.PageList; // B2021-132
 																																		//B2021-132 only do replacewords in paglist if the replaceword pagelist flag is set
 					if (_DoReplWordInPageList && !doInPagelist) continue;
 
@@ -2304,7 +2306,7 @@ namespace VEPROMS.CSLA.Library
 					{
 						if (!dicReplaceRegex.ContainsKey(rs))
 						{
-							RegexOptions myOptions = (E_ReplaceFlags)(rs.Flag & FormatConfig.E_ReplaceFlagsUCF.CaseInsens) == E_ReplaceFlags.CaseInsens ? RegexOptions.IgnoreCase : RegexOptions.None;
+							RegexOptions myOptions = (E_ReplaceFlags)(rs.Flag & E_ReplaceFlags.CaseInsens) == E_ReplaceFlags.CaseInsens ? RegexOptions.IgnoreCase : RegexOptions.None;
 							dicReplaceRegex.Add(rs, new Regex(rs.ReplaceWord, myOptions));
 						}
 						try
@@ -2320,7 +2322,7 @@ namespace VEPROMS.CSLA.Library
 				Text = Text.Replace(@"\xA0", @"\u160?"); //replace hard space
 				try
 				{
-					foreach (FormatConfig.ReplaceStr prs in partialReplaceList.Keys)
+					foreach (ReplaceStr prs in partialReplaceList.Keys)
 						Text = partialReplaceList[prs].Replace(Text, prs.ReplaceWith);
 					//if (partialReplaceList.Count>0) GC.Collect();		// microsoft had a memory leak in regular expression code - this REALLY slows it down though
 				}
@@ -2486,7 +2488,7 @@ namespace VEPROMS.CSLA.Library
 			_Font = font;
 			_MyItemInfo = myItemInfo;
 		}
-		public void Add(Regex myRegEx, FormatConfig.ReplaceStr myWord)
+		public void Add(Regex myRegEx, ReplaceStr myWord)
 		{
 			MatchCollection myMatches = myRegEx.Matches(_Text);
 			foreach (Match myMatch in myMatches)
@@ -2529,7 +2531,7 @@ namespace VEPROMS.CSLA.Library
 			}
 			return false;
 		}
-        public void Add(Match myMatch, FormatConfig.ReplaceStr myWord)
+        public void Add(Match myMatch, ReplaceStr myWord)
 		{
 			// If one already exists for this location, then don't add another.
 			if (ContainsKey(myMatch.Index)) return;
@@ -2563,12 +2565,12 @@ namespace VEPROMS.CSLA.Library
 				{
 					// B2022-015 BNPPalr: Determine whether RO text should have Replace Words applied. InLinkAndNotInRoFlag checks
 					//	for flag on replace word item & checks that it is within and RO link
-					bool InLinkAndNotInRoFlag = ((foundMatch.MyWord.Flag & FormatConfig.E_ReplaceFlagsUCF.NotInRO) != 0) ? VerifyWithinLink(text, foundMatch, offset) : false;
+					bool InLinkAndNotInRoFlag = ((foundMatch.MyWord.Flag & E_ReplaceFlags.NotInRO) != 0) ? VerifyWithinLink(text, foundMatch, offset) : false;
 					if (!InLinkAndNotInRoFlag && VerifyNoHardSpace(text, foundMatch, offset) && VerifyNoLink(text, foundMatch, offset))
 					{
 						//if(offset != 0 || foundMatch.MyMatch.Index != 0 || !foundMatch.MyWord.ReplaceWith.StartsWith(@"{\par}"))
 						//{
-						if (((foundMatch.MyWord.Flag & FormatConfig.E_ReplaceFlagsUCF.DiffUnit) == 0) || DiffUnit(foundMatch.MyWord.ReplaceWord, _MyItemInfo, "UNIT "))
+						if (((foundMatch.MyWord.Flag & E_ReplaceFlags.DiffUnit) == 0) || DiffUnit(foundMatch.MyWord.ReplaceWord, _MyItemInfo, "UNIT "))
 						{
 							string with = foundMatch.MyWord.ReplaceWith;
 							if (offset == 0 && with.StartsWith(@"{\par}"))
@@ -2723,13 +2725,13 @@ namespace VEPROMS.CSLA.Library
 			get { return _MyMatch; }
 			set { _MyMatch = value; }
 		}
-        private FormatConfig.ReplaceStr _MyWord;
-        public FormatConfig.ReplaceStr MyWord
+        private ReplaceStr _MyWord;
+        public ReplaceStr MyWord
 		{
 			get { return _MyWord; }
 			set { _MyWord = value; }
 		}
-        public FoundMatch(Match myMatch, FormatConfig.ReplaceStr myWord)
+        public FoundMatch(Match myMatch, ReplaceStr myWord)
 		{
 			_MyMatch = myMatch;
 			_MyWord = myWord;

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

@@ -594,70 +594,7 @@ public partial class FormatInfo : IFormatOrFormatInfo
 				throw new DbCslaException("FormatInfo.DataPortal_Fetch", ex);
 			}
 		}
-        // Get format data, but do not resolve the 'Data' and 'Genmac' fields, i.e. keep empty if they are
-        // empty.
-        public static FormatInfo GetFormatNoUCFByFormatID(int formatID)
-        {
-            try
-            {
-                FormatInfo tmp = DataPortal.Fetch<FormatInfo>(new FormatIDNoUCFCriteria(formatID));
-                if (tmp.ErrorMessage == "No Record Found")
-                {
-                    tmp.Dispose(); // Clean-up FormatInfo
-                    tmp = null;
-                }
-                return tmp;
-            }
-            catch (Exception ex)
-            {
-                throw new DbCslaException("Error on FormatInfo.GetFormatNoUCFByFormatID", ex);
-            }
-        }
-        protected class FormatIDNoUCFCriteria
-        {
-            private int _FormatID;
-            public int FormatID { get { return _FormatID; } }
-            public FormatIDNoUCFCriteria(int formatID)
-            {
-                _FormatID = formatID;
-            }
-        }
-        private void DataPortal_Fetch(FormatIDNoUCFCriteria criteria)
-        {
-            if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] FormatInfo.DataPortal_Fetch", GetHashCode());
-            try
-            {
-                using (SqlConnection cn = Database.VEPROMS_SqlConnection)
-                {
-                    ApplicationContext.LocalContext["cn"] = cn;
-                    using (SqlCommand cm = cn.CreateCommand())
-                    {
-                        cm.CommandType = CommandType.StoredProcedure;
-                        cm.CommandText = "getFormatNoUCF";
-                        cm.Parameters.AddWithValue("@FormatID", criteria.FormatID);
-                        cm.CommandTimeout = Database.DefaultTimeout;
-                        using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader()))
-                        {
-                            if (!dr.Read())
-                            {
-                                _ErrorMessage = "No Record Found";
-                                return;
-                            }
-                            ReadData(dr);
-                        }
-                    }
-                    // removing of item only needed for local data portal
-                    if (ApplicationContext.ExecutionLocation == ApplicationContext.ExecutionLocations.Client)
-                        ApplicationContext.LocalContext.Remove("cn");
-                }
-            }
-            catch (Exception ex)
-            {
-                if (_MyLog.IsErrorEnabled) _MyLog.Error("FormatInfo.DataPortal_Fetch", ex);
-                _ErrorMessage = ex.Message;
-                throw new DbCslaException("FormatInfo.DataPortal_Fetch", ex);
-            }
-        }
+
 		#region PlantFormat
 		[NonSerialized]
 		private PlantFormat _PlantFormat;

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

@@ -346,21 +346,21 @@ namespace VEPROMS.CSLA.Library
 			{
 				var ii = _CacheByPrimaryKey.FirstOrDefault();
 
-					while (ii.Value.Count > 0)
-					{
-						if (ii.Value[0]?.MyContent?.ContentParts != null)
-							{ foreach (PartInfo pi in ii.Value[0]?.MyContent?.ContentParts) pi.Dispose(); }
-						ii.Value[0].Dispose();
-					}
+				while (ii.Value.Count > 0)
+				{
+					if (ii.Value[0]?.MyContent?.ContentParts != null)
+					{ foreach (PartInfo pi in ii.Value[0]?.MyContent?.ContentParts) pi.Dispose(); }
+					ii.Value[0].Dispose();
+				}
 				_CacheByPrimaryKey.Remove(ii.Key);
 			}
 
 			while (_CacheList.Count > 0)
-				{
-					if (_CacheList[0]?.MyContent?.ContentParts != null)
-						{foreach (PartInfo pi in _CacheList[0]?.MyContent?.ContentParts) pi.Dispose(); }
-					_CacheList[0].Dispose();
-				}
+			{
+				if (_CacheList[0]?.MyContent?.ContentParts != null)
+					{foreach (PartInfo pi in _CacheList[0]?.MyContent?.ContentParts) pi.Dispose(); }
+				_CacheList[0].Dispose();
+			}
 		}
 
 		private bool _PrintAllAtOnce = false;
@@ -450,86 +450,86 @@ namespace VEPROMS.CSLA.Library
 			StringBuilder sret = new StringBuilder();
 			ItemInfo pitem = this;
 			while (!pitem.IsSection && !pitem.IsHigh)
-            {
+			{
 				using (StepInfo stpinfo = StepInfo.Get(pitem.ItemID))
-                {
-                    string thisTab = stpinfo.MyTab.CleanText;
+				{
+					string thisTab = stpinfo.MyTab.CleanText;
 
-                    string typeName = stpinfo.FormatStepData.StepEditData.TypeMenu.MenuItem;
+					string typeName = stpinfo.FormatStepData.StepEditData.TypeMenu.MenuItem;
 
-                    if (!string.IsNullOrEmpty(thisTab))
-                    {
-                        thisTab = thisTab.Trim();
-                    }
+					if (!string.IsNullOrEmpty(thisTab))
+					{
+						thisTab = thisTab.Trim();
+					}
 
-                    // if the tab is null or
-                    // if the the tab is not a letter or number OR
-                    // the tab is an AND or OR type and is the letter "o"
-                    // then reset the tab an empty string so that the type name along with the count of that type 
-                    // (ex. "AND 2", "OR 3")
-                    if (string.IsNullOrEmpty(thisTab) || (thisTab != string.Empty && (!(char.IsLetterOrDigit(thisTab[0])) || ((pitem.IsAnd || pitem.IsOr || pitem.IsCaution || pitem.IsNote) && thisTab.Contains("o")))))
-                    {
-                        thisTab = string.Empty;
-                    }
+					// if the tab is null or
+					// if the the tab is not a letter or number OR
+					// the tab is an AND or OR type and is the letter "o"
+					// then reset the tab an empty string so that the type name along with the count of that type 
+					// (ex. "AND 2", "OR 3")
+					if (string.IsNullOrEmpty(thisTab) || (thisTab != string.Empty && (!(char.IsLetterOrDigit(thisTab[0])) || ((pitem.IsAnd || pitem.IsOr || pitem.IsCaution || pitem.IsNote) && thisTab.Contains("o")))))
+					{
+						thisTab = string.Empty;
+					}
 
-                    if (pitem.IsRNOPart)
-                    {
-                        if (string.IsNullOrEmpty(thisTab))
-                        {
-                            sret.Insert(0, "RNO.");
-                        }
-                        else
-                        {
-                            thisTab = thisTab.Trim();
+					if (pitem.IsRNOPart)
+					{
+						if (string.IsNullOrEmpty(thisTab))
+						{
+							sret.Insert(0, "RNO.");
+						}
+						else
+						{
+							thisTab = thisTab.Trim();
 
-                            if (!thisTab.EndsWith(".") && !thisTab.EndsWith(")"))
-                            {
-                                thisTab += ".";
-                            }
+							if (!thisTab.EndsWith(".") && !thisTab.EndsWith(")"))
+							{
+								thisTab += ".";
+							}
 
-                            sret.Insert(0, "RNO." + thisTab);
-                        }
-                    }
-                    else if (pitem.IsCaution || pitem.IsNote)
-                    {
-                        // add the Caution or Note count to the tab (ex "Caution 1", "Note 2")
-                        if (string.IsNullOrEmpty(thisTab))
-                        {
-                            sret.Append("{" + typeName + " " + pitem.Ordinal.ToString() + "}");
-                        }
-                        else
-                        {
-                            thisTab = thisTab.Trim(" ".ToCharArray());
-                            sret.Append(thisTab + " " + pitem.Ordinal.ToString() + sret);
-                        }
-                    }
-                    else
-                    {
-                        if (!string.IsNullOrEmpty(thisTab))
-                        {
-                            thisTab = thisTab.Trim(" ".ToCharArray());
+							sret.Insert(0, "RNO." + thisTab);
+						}
+					}
+					else if (pitem.IsCaution || pitem.IsNote)
+					{
+						// add the Caution or Note count to the tab (ex "Caution 1", "Note 2")
+						if (string.IsNullOrEmpty(thisTab))
+						{
+							sret.Append("{" + typeName + " " + pitem.Ordinal.ToString() + "}");
+						}
+						else
+						{
+							thisTab = thisTab.Trim(" ".ToCharArray());
+							sret.Append(thisTab + " " + pitem.Ordinal.ToString() + sret);
+						}
+					}
+					else
+					{
+						if (!string.IsNullOrEmpty(thisTab))
+						{
+							thisTab = thisTab.Trim(" ".ToCharArray());
 
-                            if (!thisTab.EndsWith(".") && !thisTab.EndsWith(")"))
-                            {
-                                thisTab += ".";
-                            }
-                        }
-                        else
-                        {
-                            thisTab = "{" + typeName + " " + pitem.Ordinal.ToString() + "}.";
-                        }
+							if (!thisTab.EndsWith(".") && !thisTab.EndsWith(")"))
+							{
+								thisTab += ".";
+							}
+						}
+						else
+						{
+							thisTab = "{" + typeName + " " + pitem.Ordinal.ToString() + "}.";
+						}
 
-                        sret.Insert(0, thisTab);
-                    }
-                }
+						sret.Insert(0, thisTab);
+					}
+				}
 
-                pitem = pitem.ActiveParent as ItemInfo;
+				pitem = pitem.ActiveParent as ItemInfo;
 
-                if (pitem == null)
-                    break;
-            }
+				if (pitem == null)
+					break;
+			}
 
-            return sret.ToString().Trim(" .)".ToCharArray());
+			return sret.ToString().Trim(" .)".ToCharArray());
 		}
 
 		public void SetHeader(VE_Font myFont, string myText)
@@ -574,11 +574,11 @@ namespace VEPROMS.CSLA.Library
 			}
 			_MyPrevious = null; // Reset list so that the next line gets a new list
 			if (MyPrevious != null) MyPrevious.RefreshNextItems(); // Update List for new value
-			//if (_ContentID != tmp.ContentID)
-			//{
+																   //if (_ContentID != tmp.ContentID)
+																   //{
 			if (MyContent != null) MyContent.RefreshContentItems(); // Update List for old value
 			_ContentID = tmp.ContentID; // Update the value
-			//}
+										//}
 			_MyContent = null; // Reset list so that the next line gets a new list
 			if (MyContent != null) MyContent.RefreshContentItems(); // Update List for new value
 			_DTS = tmp.DTS;
@@ -674,12 +674,12 @@ namespace VEPROMS.CSLA.Library
 				}
 			}
 		}
-		
+
 		internal static void SetParentSectionAndDocVersion(ItemInfo itemInfo, IVEDrillDownReadOnly itemParent, SectionInfo sectionInfo, ProcedureInfo procInfo, DocVersionInfo docVersionInfo, bool isAutomatic = false)
 		{
 			// B2022-107: Display Progress Bar Messages/Statuses when a new ROFST binary file is loaded into the database
 			// 						Added Optional Parameter "bool isAutomatic = false" to disable the RofstLoadingStatus pop-up screen when printing baselines
-			
+
 			if (itemInfo == null) return;
 			itemInfo.LoadAllAtOnce = true;
 			itemInfo.ActiveParent = itemParent;
@@ -721,7 +721,7 @@ namespace VEPROMS.CSLA.Library
 					}
 				}
 		}
-		
+
 		/// <summary>
 		/// The following method is used only in print because the 'printed' data is loaded into
 		/// memory before printing. Find the next item from memory (do not go out to database).
@@ -784,7 +784,7 @@ namespace VEPROMS.CSLA.Library
 				{
 					bool forceConvertToText = false;
 					TranCheckCount++;
-					
+
 					if (!forceConvertToText)
 					{
 						if (traninfo.MyItemToID.ActiveSection != null)
@@ -802,7 +802,7 @@ namespace VEPROMS.CSLA.Library
 								content.FixTransitionText(traninfo, true);
 								content.Save();
 							}
- 						}
+						}
 					}
 					// B2025-020 Null Reference fix. Added check for valid index into the TransitionTypeList
 					if (!forceConvertToText)
@@ -812,7 +812,7 @@ namespace VEPROMS.CSLA.Library
 							forceConvertToText = true;
 							TranFixCount++;
 							itemInfo.MyContent.FixTransitionText(traninfo, itemInfo, "Reason for Change: Transition type is not available");
-							using (Content content = Content.Get(itemInfo.MyContent.ContentID)) 
+							using (Content content = Content.Get(itemInfo.MyContent.ContentID))
 							{
 								content.FixTransitionText(traninfo, true);
 								content.Save();
@@ -835,14 +835,14 @@ namespace VEPROMS.CSLA.Library
 										content.FixTransitionText(traninfo, true);
 										content.Save();
 									}
- 								}
+								}
 							}
 						}
 					}
 
 					if (!forceConvertToText)
 					{
-						if (itemInfo.MyDocVersion != null && traninfo.MyItemToID.MyDocVersion != null && itemInfo.MyDocVersion.VersionID != traninfo.MyItemToID.MyDocVersion.VersionID)	//different doc version
+						if (itemInfo.MyDocVersion != null && traninfo.MyItemToID.MyDocVersion != null && itemInfo.MyDocVersion.VersionID != traninfo.MyItemToID.MyDocVersion.VersionID) //different doc version
 						{
 							if (!itemInfo.ActiveFormat.PlantFormat.FormatData.TransData.TransTypeList[traninfo.TranType].TransMenu.Contains("Proc"))    //internal format
 							{
@@ -903,7 +903,7 @@ namespace VEPROMS.CSLA.Library
 				if (itemInfo.MyContent.Text.Contains("Link:Transition"))
 				{
 					Content content = Content.Get(itemInfo.MyContent.ContentID);
-					
+
 					if (itemInfo.MyContent.ContentTransitions != null)
 					{
 						foreach (TransitionInfo ct in itemInfo.MyContent.ContentTransitions)
@@ -913,7 +913,7 @@ namespace VEPROMS.CSLA.Library
 					}
 
 					itemInfo.MyContent.RefreshContentTransitions();
-				
+
 					while (content.Text.Contains("Link:Transition"))
 					{
 						TranCheckCount++;
@@ -931,7 +931,7 @@ namespace VEPROMS.CSLA.Library
 						else // B2018-043 Eliminate infinite loop for invalid transition structure
 						{
 							// Add annotation for Invalid Transition
-							AddInvalidTransitionAnnotation(itemInfo,"Invalid Transition Format");
+							AddInvalidTransitionAnnotation(itemInfo, "Invalid Transition Format");
 							break;
 						}
 					}
@@ -984,16 +984,16 @@ namespace VEPROMS.CSLA.Library
 			ContentInfo myContent = itemInfo.MyContent;
 			string txt = myContent.Text;
 			string regDelete = @"(\\v |)\<START\]\#Link\:Transition(|Range)\:[0-9]+ [0-9]+ [0-9]+(| [0-9]+)\[END\>(\\v0 |)";
-			string txt2=txt;
+			string txt2 = txt;
 
-			do{
+			do {
 				txt = txt2;
 				txt2 = Regex.Replace(txt, regDelete, "");
-			} while(txt2 != txt);
+			} while (txt2 != txt);
 
-			if(txt2 != myContent.Text)
+			if (txt2 != myContent.Text)
 			{
-				using(Content tmp = myContent.Get())
+				using (Content tmp = myContent.Get())
 				{
 					tmp.Text = txt2;
 					tmp.Save();
@@ -1001,7 +1001,7 @@ namespace VEPROMS.CSLA.Library
 				AddInvalidTransitionAnnotation(itemInfo, "Removed Empty Transition Text");
 			}
 		}
-		
+
 		private static bool IsTransitionToNonEditable(TransitionInfo ti)
 		{
 			foreach (TransitionInfo til in TransitionsToNonEditable)
@@ -1032,7 +1032,7 @@ namespace VEPROMS.CSLA.Library
 		public static int ROCheckCount = 0;
 		public static int ROFixCount = 0;
 		private static AnnotationType _VolianCommentType = null; // Using this to flag ro value issues with byron to braidwood
-		
+
 		public static AnnotationType VolianCommentType
 		{
 			get
@@ -1065,7 +1065,7 @@ namespace VEPROMS.CSLA.Library
 
 						string roval = lookup.GetTranslatedRoValue(rousage.ROID, this.ActiveSection.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, this.ActiveSection.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false, this);
 						ROFSTLookup.rochild roch = lookup.GetRoChild(rousage.ROID);
-						
+
 						this.MyContent.FixContentText(rousage, roval, roch.type, rofstinfo, this);
 						string newText = this.MyContent.Text;
 
@@ -1263,7 +1263,7 @@ namespace VEPROMS.CSLA.Library
 				}
 			}
 		}
-		
+
 		public static string GetCombinedTab(ItemInfo itemInfo, string parTab)
 		{
 			string pTab = parTab == null ? "" : parTab;
@@ -1276,7 +1276,7 @@ namespace VEPROMS.CSLA.Library
 			// for supplemental information, bulleted tabs need to be included in the tab.  The 'isletterordigit' should not occur for supinfo items -
 			// and this includes the parent of the supinfo since that is the tab used for supinfo concatenated with its parent. (B2017-120)
 			// // B2020-154: Added check for the tab to start with '(', tabs that started with this were not included in the combined tab
-			if (thisTab != null && thisTab != "" && (!char.IsLetterOrDigit(thisTab[0]) && thisTab[0] != '(') && !vcbHeaderCheck && !itemInfo.IsInSupInfo && (itemInfo.SupInfos == null || itemInfo.SupInfos.Count <= 0 )) return pTab;
+			if (thisTab != null && thisTab != "" && (!char.IsLetterOrDigit(thisTab[0]) && thisTab[0] != '(') && !vcbHeaderCheck && !itemInfo.IsInSupInfo && (itemInfo.SupInfos == null || itemInfo.SupInfos.Count <= 0)) return pTab;
 			if (itemInfo.FormatStepData.NumberWithLevel) pTab = itemInfo.MyHLS.MyTab.CleanText.Trim();
 			// if the parent tab ends with a alphanumeric and this tab is alphanumeric, add a '.' to separate them 
 			// also, include use the separator for bullets if doing the supplemental information tab (B2017-120)
@@ -1285,7 +1285,7 @@ namespace VEPROMS.CSLA.Library
 			if (ms && mn) pTab = pTab.TrimEnd() + ".";
 			// remove ending '.' (if this is a hls, don't remove the '.')
 			if (!itemInfo.IsHigh && thisTab.EndsWith(".")) thisTab = thisTab.Substring(0, thisTab.Length - 1);
-			if (itemInfo.HasParentTab) return thisTab.Trim();		// F2020-023: if tab includes parent tab already, don't concatenate it
+			if (itemInfo.HasParentTab) return thisTab.Trim();       // F2020-023: if tab includes parent tab already, don't concatenate it
 			return pTab + thisTab.Trim();
 		}
 
@@ -1341,8 +1341,8 @@ namespace VEPROMS.CSLA.Library
 							// B2023-037: loading print text, resolve the RO symbols 
 
 							bool GTLT = !itemInfo.IsTable && sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue;
-							bool GLTArrows = !itemInfo.IsTable &&  sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue;
-							string roval = lookup.GetTranslatedRoValue(rousage.ROID, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta,    sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, GTLT || GLTArrows, itemInfo);
+							bool GLTArrows = !itemInfo.IsTable && sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue;
+							string roval = lookup.GetTranslatedRoValue(rousage.ROID, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, GTLT || GLTArrows, itemInfo);
 							ROFSTLookup.rochild roch = lookup.GetRoChild(rousage.ROID);
 							itemInfo.MyContent.FixContentText(rousage, roval, roch.type, rofstinfo, itemInfo);
 						}
@@ -1367,7 +1367,7 @@ namespace VEPROMS.CSLA.Library
 					}
 				}
 			}
-			
+
 			if (itemInfo.MyContent.ContentTransitionCount > 0)
 			{
 				foreach (TransitionInfo traninfo in itemInfo.MyContent.ContentTransitions)
@@ -1440,14 +1440,14 @@ namespace VEPROMS.CSLA.Library
 		private float _MSWordPageCount = 0;
 		public float MSWordPageCount
 		{
-			get { 
+			get {
 				if (_MSWordPageCount == 0) // C2018-011 Get the proper word page count from the saved pdf attachment
 					if (MyContent.MyEntry != null && MyContent.MyEntry.MyDocument != null)
 					{
 						PdfInfo pi = PdfInfo.Get(this, false);
-						if(pi != null) _MSWordPageCount = (float)pi.PageCount;// B2018-071 Don't crash on invalid MS Word section
+						if (pi != null) _MSWordPageCount = (float)pi.PageCount;// B2018-071 Don't crash on invalid MS Word section
 					}
-				return _MSWordPageCount; 
+				return _MSWordPageCount;
 			}
 			set { _MSWordPageCount = value; }
 		}
@@ -1649,7 +1649,7 @@ namespace VEPROMS.CSLA.Library
 			// the addition of the parent.IsNote, the note was breaking between 2 ANDs (the 1st AND was a 
 			// steplevel of 5, but the 2nd was a steplevel of 4).  If something similar is seen with Cautions, 
 			// that check could be added.
-			if (!item.IsRNOPart && !item.IsHigh && (item.MyPrevious == null || (((item.ActiveFormat.PlantFormat.FormatData.PurchaseOptions & E_PurchaseOptions.EnhancedBackgrounds) != E_PurchaseOptions.EnhancedBackgrounds) 
+			if (!item.IsRNOPart && !item.IsHigh && (item.MyPrevious == null || (((item.ActiveFormat.PlantFormat.FormatData.PurchaseOptions & E_PurchaseOptions.EnhancedBackgrounds) != E_PurchaseOptions.EnhancedBackgrounds)
 				&& item.MyParent != null && item.MyParent.IsNote)))
 				level += firstInc;
 			else
@@ -1716,7 +1716,7 @@ namespace VEPROMS.CSLA.Library
 				}
 				return maxRNOLevel;
 			}
-		
+
 		}
 		private bool ParentAndOr
 		{
@@ -1767,7 +1767,7 @@ namespace VEPROMS.CSLA.Library
 			RemoveEnhancedFromConfig(false);
 		}
 
-	public void RemoveEnhancedFromConfig(bool doOneStepOnly)
+		public void RemoveEnhancedFromConfig(bool doOneStepOnly)
 		{
 			XmlDocument xd = new XmlDocument();
 			if (this.MyContent.Config == null || this.MyContent.Config == "") return;  // B2017-164 & B2017-172 check for null or empty config
@@ -1782,7 +1782,7 @@ namespace VEPROMS.CSLA.Library
 					ctmp.Config = config;
 					ctmp.Save();
 					ContentInfo.Refresh(ctmp);
-					_MyConfig = null;				// refresh the memory value
+					_MyConfig = null;               // refresh the memory value
 				}
 			}
 			if (doOneStepOnly) return;
@@ -2071,7 +2071,7 @@ namespace VEPROMS.CSLA.Library
 			{
 				bool rval = false;
 				ItemInfo itm = this;
-				while (itm != null &&!itm.IsHigh && !rval)
+				while (itm != null && !itm.IsHigh && !rval)
 				{
 					rval = itm.IsCautionOrNotePart;
 					if (!rval) itm = itm.MyParent;
@@ -2111,6 +2111,16 @@ namespace VEPROMS.CSLA.Library
 			return (sd.Type == type);
 		}
 
+		// C2025-024 - Electronic Procedures - Export
+		//return if should export blanks
+		public bool EPexportblank(int AnnTypeID)
+		{
+			if (ActiveFormat.PlantFormat.EPFormatFiles.Count == 0 || !ActiveFormat.PlantFormat.EPFormatFiles.Exists(x => x.AnnotationTypeID == AnnTypeID)) 
+				return true;
+			else
+				return ActiveFormat.PlantFormat.EPFormatFiles.Find(x => x.AnnotationTypeID == AnnTypeID).exportblank;
+		}
+
 		// C2025-023 - Electronic Procedures - Modifications to PROMS
 		//return EPFields that match this step type or a parent step type
 		public EPFields GetValidEPFields(int AnnTypeID)
@@ -6057,7 +6067,7 @@ namespace VEPROMS.CSLA.Library
 			// To determine if the section has a checkoff...
 			//  Section won't have checkoffs if there is no checkofflist, or 
 			ProcData pd = ActiveFormat.PlantFormat.FormatData.ProcData;
-			int maxindx = pd.CheckOffUCF ? pd.CheckOffData.CheckOffList.MaxIndex : pd.CheckOffData.CheckOffList.MaxIndexNoInherit;
+			int maxindx = pd.CheckOffData.CheckOffList.MaxIndexNoInherit;
 			if (pd.CheckOffData == null || pd.CheckOffData.CheckOffList == null || maxindx <= 0) return false;
 			if (pd.CheckOffData.CheckOffHeaderList == null || pd.CheckOffData.CheckOffHeaderList.MaxIndex <= 1) return true;
 			//if (pd.CheckOffData == null || pd.CheckOffData.CheckOffHeaderList == null || pd.CheckOffData.CheckOffHeaderList.Count <= 1) return false;
@@ -6089,7 +6099,7 @@ namespace VEPROMS.CSLA.Library
 		private int SectionDefaultCheckOffIndex()
 		{
 			ProcData pd = ActiveFormat.PlantFormat.FormatData.ProcData;
-			int maxindx = pd.CheckOffUCF ? pd.CheckOffData.CheckOffList.MaxIndex : pd.CheckOffData.CheckOffList.MaxIndexNoInherit;
+			int maxindx = pd.CheckOffData.CheckOffList.MaxIndexNoInherit;
 			if (pd.CheckOffData != null && pd.CheckOffData.CheckOffList != null && maxindx == 2) return 0;   // if only two items, first is macro - use it.
 			SectionConfig sc = ActiveSection.MyConfig as SectionConfig;
 			return sc.Section_CheckoffListSelection;
@@ -6101,23 +6111,7 @@ namespace VEPROMS.CSLA.Library
 			if (!SectionHasCheckOffs()) return null;
 			int stpCoIndx = CheckOffIndex();		// this step has a checkoff defined
 			if (stpCoIndx == -1) return null;
-            if (stpCoIndx > 1)
-            {
-                if (ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffUCF && stpCoIndx >= 100)
-                {
-                    // get index, if greater than 100, store that - otherwise store index down list.
-                    // if this format does not have ucf signoffs, indx is just the selected index from the combo box.
-                    foreach (CheckOff co in ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffData.CheckOffList)
-                    {
-                        if (stpCoIndx == co.Index)
-                        {
-                            stpCoIndx = (int)co.Index;
-                            break;
-                        }
-                    }
-                }
-                return ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffData.CheckOffList[stpCoIndx];        // DO override of CheckOffList[] to get ucf
-            }
+
 			int sectCoIndx = SectionDefaultCheckOffIndex();  // no checkoff on step, see if there is a section default.
 			if (sectCoIndx == -1) return null;
 			if ((ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffData.CheckOffOnHLSOnly && IsHigh)
@@ -6151,7 +6145,7 @@ namespace VEPROMS.CSLA.Library
 			get
 			{
 				ProcData pd = ActiveFormat.PlantFormat.FormatData.ProcData;
-				int maxindx = pd.CheckOffUCF ? pd.CheckOffData.CheckOffList.MaxIndex : pd.CheckOffData.CheckOffList.MaxIndexNoInherit;
+				int maxindx = pd.CheckOffData.CheckOffList.MaxIndexNoInherit;
 				if (pd.CheckOffData != null && pd.CheckOffData.CheckOffList != null && maxindx == 2 && pd.CheckOffData.CheckOffList[0].MenuItem == "Enabled")
 					return true;   // if only two items, first is macro - use it.
 				return false;

PROMS/VEPROMS.CSLA.Library/Format/ENums.cs

@@ -249,13 +249,5 @@ namespace VEPROMS.CSLA.Library
 		SupInfoPdfPrint = 2,
 		Merge = 3
 	}
-	public enum E_UCFImportOptions : uint
-	{
-		Ignore = 0,
-		LoadNotUsed = 1,
-		LoadOnlyImported = 2,
-		LoadUseAll = 3,
-		LoadForSetOnly = 4
-	}
 	#endregion
 }

PROMS/VEPROMS.CSLA.Library/Format/EPFormatFile.cs

@@ -11,138 +11,157 @@ using static VEPROMS.CSLA.Library.ROFSTLookup;
 
 namespace VEPROMS.CSLA.Library
 {
-	//C2025-023 - Electronic Procedures - Modifications to PROMS
-	// class to handle storage and access of EPFormatFile and EPFormatFile details
-	#region EPFormatFiles
-	[TypeConverter(typeof(vlnListConverter<EPFormatFiles, EPFormatFile>))]
-	public class EPFormatFiles : vlnFormatList<EPFormatFile>
-	{
-		public EPFormatFiles(XmlNodeList xmlNodeList) : base(xmlNodeList) { }
-	}
-	#endregion
-	#region EPFormatFile
-	public class EPFormatFile : vlnFormatItem
-	{
-		#region Constructor
-		public EPFormatFile(XmlNode xmlNode) : base(xmlNode) { }
-		public EPFormatFile() : base() { }
-		#endregion
-		#region Business Fields
-		// Name of the EP Viewer Format File
-		private LazyLoad<string> _Name;
-		[DisplayName("Name")]
-		[Description("EP Viewer File Name")]
-		public string Name
-		{
-			get
-			{
-				return LazyLoad(ref _Name, "@Name");
-			}
-		}
-		// Name of the EP Viewer Format File
-		private LazyLoad<string> _Description;
-		[DisplayName("Description")]
-		[Description("EP Viewer Description")]
-		public string Description
-		{
-			get
-			{
-				return LazyLoad(ref _Description, "@Description");
-			}
-		}
-		// Id of Annotation Type Associated with this file
-		private LazyLoad<int?> _AnnotationTypeID;
-		[DisplayName("AnnotationTypeID")]
-		[Description("Id of Annotation Type Associated with this file")]
-		public int? AnnotationTypeID
-		{
-			get
-			{
-				return LazyLoad(ref _AnnotationTypeID, "@AnnotationTypeID");
-			}
-		}
-		// returns a list of fields that are defined in the EP format's structure
-		private EPFields _FieldList;
-		public EPFields FieldList
-		{
-			get
-			{
-				XmlDocument xd = GetEPFormatData(Name);
-				return _FieldList == null ? _FieldList = new EPFields(xd.SelectNodes("/EPFormat/EPField")) : _FieldList;
-			}
-		}
-		#endregion
-		#region Business Methods
-		// update all in-use annotation types that have Electronic Procedures
-		public static void UpdateAllInUseEPAnnotationTypes()
-		{
-			foreach (int formatid in GetAllInUseFormats())
-			{
-				PlantFormat frmt = FormatInfo.Get(formatid).PlantFormat;
-				foreach (EPFormatFile EP in frmt.EPFormatFiles)
+    //C2025-023 - Electronic Procedures - Modifications to PROMS
+    // class to handle storage and access of EPFormatFile and EPFormatFile details
+    #region EPFormatFiles
+    [TypeConverter(typeof(vlnListConverter<EPFormatFiles, EPFormatFile>))]
+    public class EPFormatFiles : vlnFormatList<EPFormatFile>
+    {
+        public EPFormatFiles(XmlNodeList xmlNodeList) : base(xmlNodeList) { }
+    }
+    #endregion
+    #region EPFormatFile
+    public class EPFormatFile : vlnFormatItem
+    {
+        #region Constructor
+        public EPFormatFile(XmlNode xmlNode) : base(xmlNode) { }
+        public EPFormatFile() : base() { }
+        #endregion
+        #region Business Fields
+        // Name of the EP Viewer Format File
+        private LazyLoad<string> _Name;
+        [DisplayName("Name")]
+        [Description("EP Viewer File Name")]
+        public string Name
+        {
+            get
+            {
+                return LazyLoad(ref _Name, "@Name");
+            }
+        }
+        // Name of the EP Viewer Format File
+        private LazyLoad<string> _Description;
+        [DisplayName("Description")]
+        [Description("EP Viewer Description")]
+        public string Description
+        {
+            get
+            {
+                return LazyLoad(ref _Description, "@Description");
+            }
+        }
+        // Id of Annotation Type Associated with this file
+        private LazyLoad<int?> _AnnotationTypeID;
+        [DisplayName("AnnotationTypeID")]
+        [Description("Id of Annotation Type Associated with this file")]
+        public int? AnnotationTypeID
+        {
+            get
+            {
+                return LazyLoad(ref _AnnotationTypeID, "@AnnotationTypeID");
+            }
+        }
+
+        // Return Name of Annotation that EP Format File is Attached to
+        public string AnnotationName()
+        {
+            return AnnotationTypeInfo.Get((int) AnnotationTypeID).Name;
+        }
+
+        //if xml value is blank, should element export?
+        //defaults to true
+        private LazyLoad<bool> _exportblank;
+        [DisplayName("exportblank")]
+        [Description("if xml value is blank, should element export?")]
+        public bool exportblank
+        {
+            get
+            {
+                return LazyLoad(ref _exportblank, "@exportblank");
+            }
+        }
+        // returns a list of fields that are defined in the EP format's structure
+        private EPFields _FieldList;
+        public EPFields FieldList
+        {
+            get
+            {
+                XmlDocument xd = GetEPFormatData(Name);
+                return _FieldList ?? (_FieldList = new EPFields(xd.SelectNodes("/EPFormat/EPField")));
+            }
+        }
+        #endregion
+        #region Business Methods
+        // update all in-use annotation types that have Electronic Procedures
+        public static void UpdateAllInUseEPAnnotationTypes()
+        {
+            foreach (int formatid in GetAllInUseFormats())
+            {
+                PlantFormat frmt = FormatInfo.Get(formatid).PlantFormat;
+                foreach (EPFormatFile EP in frmt.EPFormatFiles)
                 {
-					UpdateAnnotationTypeAsEP((int) EP.AnnotationTypeID);
-				}			
-			}
-		}
-		#endregion
-		#region Data Access
-		// static - Load EP Format details - save to db (insert/update)
-		public static void UpdateEPFormat(string name, string data, string userID)
-		{
-			using (SqlConnection cn = Database.VEPROMS_SqlConnection)
-			{
-				using (SqlCommand cm = cn.CreateCommand())
-				{
-					cm.CommandType = CommandType.StoredProcedure;
-					cm.CommandText = "vesp_UpdateEPFormat";
-					cm.Parameters.AddWithValue("@name", name);
-					cm.Parameters.AddWithValue("@data", data);
-					cm.Parameters.AddWithValue("@userID", userID);
-					cm.CommandTimeout = Database.DefaultTimeout;
-					cm.ExecuteNonQuery();
-				}
-			}
-		}
+                    UpdateAnnotationTypeAsEP((int) EP.AnnotationTypeID);
+                }
+            }
+        }
+        #endregion
+        #region Data Access
+        // static - Load EP Format details - save to db (insert/update)
+        public static void UpdateEPFormat(string name, string data, string userID)
+        {
+            using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+            {
+                using (SqlCommand cm = cn.CreateCommand())
+                {
+                    cm.CommandType = CommandType.StoredProcedure;
+                    cm.CommandText = "vesp_UpdateEPFormat";
+                    cm.Parameters.AddWithValue("@name", name);
+                    cm.Parameters.AddWithValue("@data", data);
+                    cm.Parameters.AddWithValue("@userID", userID);
+                    cm.CommandTimeout = Database.DefaultTimeout;
+                    cm.ExecuteNonQuery();
+                }
+            }
+        }
 
-		// load data for getting fieldlist for this EPFormat
-		public static XmlDocument GetEPFormatData(string name)
-		{
-			name = name.Replace(".xml", "");
+        // load data for getting fieldlist for this EPFormat
+        public static XmlDocument GetEPFormatData(string name)
+        {
+            name = name.Replace(".xml", "");
 
-			using (SqlConnection cn = Database.VEPROMS_SqlConnection)
-			{
-				using (SqlCommand cm = cn.CreateCommand())
-				{
-					cm.CommandType = CommandType.Text;
-					cm.CommandText = "Select Data FROM EPFormats where Name = @Name";
-					cm.Parameters.AddWithValue("@Name", name);
-					cm.CommandTimeout = Database.DefaultTimeout;
-					using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader()))
-					{
-						if (dr.Read())
-						{
-							XmlDocument xd = new XmlDocument();
-							xd.XmlResolver = null;
-							xd.LoadXml(dr.GetString("Data"));
-							return xd;
-						}
-					}
-				}
-			}
+            using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+            {
+                using (SqlCommand cm = cn.CreateCommand())
+                {
+                    cm.CommandType = CommandType.Text;
+                    cm.CommandText = "Select Data FROM EPFormats where Name = @Name";
+                    cm.Parameters.AddWithValue("@Name", name);
+                    cm.CommandTimeout = Database.DefaultTimeout;
+                    using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader()))
+                    {
+                        if (dr.Read())
+                        {
+                            XmlDocument xd = new XmlDocument();
+                            xd.XmlResolver = null;
+                            xd.LoadXml(dr.GetString("Data"));
+                            return xd;
+                        }
+                    }
+                }
+            }
 
-			return null;
-		}
+            return null;
+        }
 
-		// Get all in-use formats
-		public static List<int> GetAllInUseFormats()
-		{
-			using (SqlConnection cn = Database.VEPROMS_SqlConnection)
-			{
-				using (SqlCommand cm = cn.CreateCommand())
-				{
-					cm.CommandType = CommandType.Text;
-					cm.CommandText = @"SELECT Distinct Formats.[FormatID]
+        // Get all in-use formats
+        public static List<int> GetAllInUseFormats()
+        {
+            using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+            {
+                using (SqlCommand cm = cn.CreateCommand())
+                {
+                    cm.CommandType = CommandType.Text;
+                    cm.CommandText = @"SELECT Distinct Formats.[FormatID]
 										FROM 
 										(
 											 SELECT FormatID FROM Contents
@@ -153,260 +172,272 @@ namespace VEPROMS.CSLA.Library
 										) inuse
 										inner join Formats
 										on inuse.FormatID = Formats.FormatID";
-					cm.CommandTimeout = Database.DefaultTimeout;
+                    cm.CommandTimeout = Database.DefaultTimeout;
 
-					using (DataTable dt = new DataTable())
-					{
-						using (SqlDataAdapter da = new SqlDataAdapter(cm))
-						{
-							da.Fill(dt);
-							return dt.AsEnumerable().Select(x => x.Field<int>("FormatID")).ToList();
-						}
-					}
+                    using (DataTable dt = new DataTable())
+                    {
+                        using (SqlDataAdapter da = new SqlDataAdapter(cm))
+                        {
+                            da.Fill(dt);
+                            return dt.AsEnumerable().Select(x => x.Field<int>("FormatID")).ToList();
+                        }
+                    }
 
-				}
-			}
-		}
+                }
+            }
+        }
 
-		// update an annotation type as an Electronic Procedure Annotation Type
-		public static void UpdateAnnotationTypeAsEP(int typeID)
-		{
-			using (SqlConnection cn = Database.VEPROMS_SqlConnection)
-			{
-				using (SqlCommand cm = cn.CreateCommand())
-				{
-					cm.CommandType = CommandType.Text;
-					cm.CommandText = @"Update AnnotationTypes
+        // update an annotation type as an Electronic Procedure Annotation Type
+        public static void UpdateAnnotationTypeAsEP(int typeID)
+        {
+            using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+            {
+                using (SqlCommand cm = cn.CreateCommand())
+                {
+                    cm.CommandType = CommandType.Text;
+                    cm.CommandText = @"Update AnnotationTypes
 										SET IsEPAnnotationType = 1
 									    WHERE TypeID = @typeID";
-					cm.Parameters.AddWithValue("@typeID", typeID);
-					cm.CommandTimeout = Database.DefaultTimeout;
-					cm.ExecuteNonQuery();
-				}
-			}
-		}
+                    cm.Parameters.AddWithValue("@typeID", typeID);
+                    cm.CommandTimeout = Database.DefaultTimeout;
+                    cm.ExecuteNonQuery();
+                }
+            }
+        }
 
-		// Returns true if there are any EP Annotation Types
-		public static bool IsEPAnnotationType()
-		{
-			try
-			{
-				using (SqlConnection cn = Database.VEPROMS_SqlConnection)
-				{
-					using (SqlCommand cm = cn.CreateCommand())
-					{
-						cm.CommandType = CommandType.Text;
-						cm.CommandText = @"SELECT RESULT = CASE WHEN 
+        // Returns true if there are any EP Annotation Types
+        public static bool IsEPAnnotationType()
+        {
+            try
+            {
+                using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+                {
+                    using (SqlCommand cm = cn.CreateCommand())
+                    {
+                        cm.CommandType = CommandType.Text;
+                        cm.CommandText = @"SELECT RESULT = CASE WHEN 
 						EXISTS(SELECT 1 FROM AnnotationTypes where IsEPAnnotationType = 1) 
 						THEN 1 ELSE 0 END";
-						cm.CommandTimeout = Database.DefaultTimeout;
-						using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader()))
-						{
-							if (dr.Read() && dr.GetInt32("RESULT") == 1)
-								return true;
-						}
-					}
-				}
-			}
-			catch
-			{
-				// EP Support has not yet been added for this DB
-				// IsEPAnnotationType does not exist
-				// need to run PROMS Fixes
-				// until then will ignore EP code
-				// instead of crashing for a field not found
-			}
+                        cm.CommandTimeout = Database.DefaultTimeout;
+                        using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader()))
+                        {
+                            if (dr.Read() && dr.GetInt32("RESULT") == 1)
+                                return true;
+                        }
+                    }
+                }
+            }
+            catch
+            {
+                // EP Support has not yet been added for this DB
+                // IsEPAnnotationType does not exist
+                // need to run PROMS Fixes
+                // until then will ignore EP code
+                // instead of crashing for a field not found
+            }
 
-			return false;
-		}
-		#endregion
-	}
+            return false;
+        }
+        #endregion
+    }
 
-	public class EPFields : vlnFormatList<EPField>
-	{
+    public class EPFields : vlnFormatList<EPField>
+    {
         public EPFields()
         {
         }
 
         public EPFields(XmlNodeList xmlNodeList) : base(xmlNodeList) { }
-	}
-	// EP field class
-	public class EPField : vlnFormatItem
-	{
-		public EPField(XmlNode xmlNode) : base(xmlNode) { }
-		public EPField() : base() { }
-		private LazyLoad<string> _name;
-		public string name
-		{
-			get
-			{
-				return LazyLoad(ref _name, "@name");
-			}
-		}
-		private LazyLoad<string> _type;
-		public string type
-		{
-			get
-			{
-				return LazyLoad(ref _type, "@type");
-			}
-		}
-		private LazyLoad<string> _label;
-		public string label
-		{
-			get
-			{
-				string tmp = LazyLoad(ref _label, "@label");
+    }
+    // EP field class
+    public class EPField : vlnFormatItem
+    {
+        public EPField(XmlNode xmlNode) : base(xmlNode) { }
+        public EPField() : base() { }
+        private LazyLoad<string> _name;
+        public string name
+        {
+            get
+            {
+                return LazyLoad(ref _name, "@name");
+            }
+        }
+        private LazyLoad<string> _type;
+        public string type
+        {
+            get
+            {
+                return LazyLoad(ref _type, "@type");
+            }
+        }
+        private LazyLoad<string> _label;
+        public string label
+        {
+            get
+            {
+                string tmp = LazyLoad(ref _label, "@label");
 
-				if (string.IsNullOrEmpty(tmp))
-					return LazyLoad(ref _name, "@name");
-				else
-					return tmp;
-			}
-		}
-		private LazyLoad<string> _text;
-		public string text
-		{
-			get
-			{
-				return LazyLoad(ref _text, "@text");
-			}
-		}
-		//roid of group item that individual sub-items will be the choices for the list/combobox for ROSINGLE and ROMULTI
-		private LazyLoad<string> _rosource;
-		public string rosource
-		{
-			get
-			{
-				return LazyLoad(ref _rosource, "@rosource");
-			}
-		}
-		//the columns in the RO that will be included in the exports
-		private LazyLoad<string> _returncols;
-		public List<string> returncols()
-		{
-			try
-			{
-				string tmp = LazyLoad(ref _returncols, "@returncols");
+                if (string.IsNullOrEmpty(tmp))
+                    return LazyLoad(ref _name, "@name");
+                else
+                    return tmp;
+            }
+        }
+        private LazyLoad<string> _text;
+        public string text
+        {
+            get
+            {
+                return LazyLoad(ref _text, "@text");
+            }
+        }
+        //roid of group item that individual sub-items will be the choices for the list/combobox for ROSINGLE and ROMULTI
+        private LazyLoad<string> _rosource;
+        public string rosource
+        {
+            get
+            {
+                return LazyLoad(ref _rosource, "@rosource");
+            }
+        }
+        //the columns in the RO that will be included in the exports
+        private LazyLoad<string> _returncols;
+        public List<string> returncols()
+        {
+            try
+            {
+                string tmp = LazyLoad(ref _returncols, "@returncols");
 
-				if (string.IsNullOrEmpty(tmp))
-					return new List<string>();
-				else
-					return tmp.Split(',').Select(p => p.Trim()).ToList();
-			}
-			catch
-			{
-				throw new ArgumentException($"Error in returncols for EP file: {((EPFormatFile)MyParentFormat).Name}.xml, field: {name}");
-			}
-		}
+                if (string.IsNullOrEmpty(tmp))
+                    return new List<string>();
+                else
+                    return tmp.Split(',').Select(p => p.Trim()).ToList();
+            }
+            catch
+            {
+                throw new ArgumentException($"Error in returncols for EP file, field: {name}");
+            }
+        }
 
-		//number of lines for a multi-line text box to span
-		private LazyLoad<int?> _numlines;
-		public int numlines
-		{
-			get
-			{
-				int? tmp = LazyLoad(ref _numlines, "@numlines");
+        //number of lines for a multi-line text box to span
+        private LazyLoad<int?> _numlines;
+        public int numlines
+        {
+            get
+            {
+                int? tmp = LazyLoad(ref _numlines, "@numlines");
 
-				if (tmp == null)
-					return 1;
+                if (tmp == null)
+                    return 1;
 
-				return (int) tmp;
-			}
-		}
-		//step types that the EPForma Item is valid for (as a list of types)
-		private LazyLoad<string> _validforsteptypes;
+                return (int) tmp;
+            }
+        }
+        //step types that the EPForma Item is valid for (as a list of types)
+        private LazyLoad<string> _validforsteptypes;
         public List<string> validforsteptypes()
-		{
-			try
-			{
-				string tmp = LazyLoad(ref _validforsteptypes, "@validforsteptypes");
-				return tmp.Split(',').Select(p => p.Trim()).ToList();
-			}
-			catch
-			{
-				throw new ArgumentException($"Error in validforsteptypes for EP file: {((EPFormatFile) MyParentFormat).Name}.xml, field: {name}");
-			}
-		}
-		public bool IsValidForStepType(string StepType)
-		{
-			List<string> tmp = validforsteptypes();
-			return tmp.Contains(StepType);
-		}
+        {
+            try
+            {
+                string tmp = LazyLoad(ref _validforsteptypes, "@validforsteptypes");
+                return tmp.Split(',').Select(p => p.Trim()).ToList();
+            }
+            catch
+            {
+                throw new ArgumentException($"Error in validforsteptypes for EP file, field: {name}");
+            }
+        }
+        public bool IsValidForStepType(string StepType)
+        {
+            List<string> tmp = validforsteptypes();
+            return tmp.Contains(StepType);
+        }
 
-		//return a list of items based on the ROsource specified in the EPFormat File
-		//will return all RO items under the Group that's roid = the rosource
-		public List<ROListItem> getROList(AnnotationInfo currAnn, bool includeblank)
-		{
-			if (string.IsNullOrEmpty(rosource))
-				return new List<ROListItem>();
+        //return a list of items based on the ROsource specified in the EPFormat File
+        //will return all RO items under the Group that's roid = the rosource
+        public List<ROListItem> getROList(AnnotationInfo currAnn, bool includeblank)
+        {
+            if (string.IsNullOrEmpty(rosource))
+                return new List<ROListItem>();
 
-			try
-			{
-				DocVersionInfo MyDocVersion = currAnn.MyItem.MyDocVersion;
-				ROFSTLookup lookup = MyDocVersion.DocVersionAssociations[0].MyROFst.GetROFSTLookup(MyDocVersion);
+            try
+            {
+                DocVersionInfo MyDocVersion = currAnn.MyItem.MyDocVersion;
 
-				string roid = FormatRoidKey(rosource, false);
-				rochild[] children = lookup.GetRoChildrenByRoid(roid);
+                if (MyDocVersion.DocVersionAssociations != null && MyDocVersion.DocVersionAssociations.Any())
+                {
+                    ROFSTLookup lookup = MyDocVersion.DocVersionAssociations[0].MyROFst.GetROFSTLookup(MyDocVersion);
 
-				List<ROListItem> mylist = children.Select(x => new ROListItem(x.title, x.roid.Substring(0, 12))).ToList();
-				if (includeblank)
-					mylist.Insert(0, new ROListItem("", ""));
+                    string roid = FormatRoidKey(rosource, false);
+                    rochild[] children = lookup.GetRoChildrenByRoid(roid);
 
-				return mylist;
-			}
-			catch (Exception Ex)
-			{
-				throw new ArgumentException($"Error in rosource for EP file: {((EPFormatFile)MyParentFormat).Name}.xml, field: {name}");
-			}
-		}
+                    List<ROListItem> mylist = children.Select(x => new ROListItem(x.title, x.roid.Substring(0, 12))).ToList();
+                    if (includeblank)
+                        mylist.Insert(0, new ROListItem("", ""));
 
+                    return mylist;
+                }
+                else
+                {
+                    return new List<ROListItem>
+                    {
+                        new ROListItem("", "")
+                    };
+                }
 
-		//return a list of values for the specified ROID
-		//given the EP items return columns
-		//will return all RO items under the Group that's roid = the rosource
-		public List<string> getROValuesList(AnnotationInfo currAnn, string roid)
-		{
-			if (string.IsNullOrEmpty(roid))
-				return new List<string>();
+            }
+            catch
+            {
+                throw new ArgumentException($"Error in rosource for EP file, field: {name}");
+            }
+        }
 
-			List<string> values = new List<string>();
-			DocVersionInfo MyDocVersion = currAnn.MyItem.MyDocVersion;
-			ROFSTLookup lookup = MyDocVersion.DocVersionAssociations[0].MyROFst.GetROFSTLookup(MyDocVersion);
-			rochild ro = lookup.GetRoChild(roid);
+        //return a list of values for the specified ROID
+        //given the EP items return columns
+        //will return all RO items under the Group that's roid = the rosource
+        public List<string> getROValuesList(AnnotationInfo currAnn, string roid)
+        {
+            if (string.IsNullOrEmpty(roid))
+                return new List<string>();
 
-			List<string> rtncols = returncols();
+            List<string> values = new List<string>();
+            DocVersionInfo MyDocVersion = currAnn.MyItem.MyDocVersion;
+            ROFSTLookup lookup = MyDocVersion.DocVersionAssociations[0].MyROFst.GetROFSTLookup(MyDocVersion);
+            rochild ro = lookup.GetRoChild(roid);
 
-			if (rtncols.Count == 0)
-			{
-				values.Add(ro.value);
-			}
-			else 
-			{
-				foreach (string rcol in rtncols)
-				{
-					rochild ro_indiv = Array.Find(ro.children, x => x.appid.EndsWith($".{rcol}"));
-					if (ro_indiv.value != null) values.Add(ro_indiv.value);
-				}
-			}
+            List<string> rtncols = returncols();
 
-			return values;
+            if (rtncols.Count == 0)
+            {
+                values.Add(ro.value);
+            }
+            else
+            {
+                foreach (string rcol in rtncols)
+                {
+                    rochild ro_indiv = Array.Find(ro.children, x => x.appid.EndsWith($".{rcol}"));
+                    if (ro_indiv.value != null) values.Add(ro_indiv.value);
+                }
+            }
 
-		}
-	}
-	#endregion
-	//C2025-023 - Electronic Procedures - Modifications to PROMS
-	// class to handle return of RO Lists
-	#region EPFormatFiles
-	public class ROListItem
-	{
-		public string Text { get; private set; }
-		public string Value { get; private set; }
-		public ROListItem(string _text, string _value)
-		{
-			Text = _text; Value = _value;
-		}
-	}
-	#endregion
+            return values;
+
+        }
+    }
+
+    #endregion
+    //C2025-023 - Electronic Procedures - Modifications to PROMS
+    // class to handle return of RO Lists
+    #region EPFormatFiles
+    public class ROListItem
+    {
+        public string Text { get; private set; }
+        public string Value { get; private set; }
+        public ROListItem(string _text, string _value)
+        {
+            Text = _text; Value = _value;
+        }
+    }
+    #endregion
 }
 

PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs

@@ -36,27 +36,14 @@ namespace VEPROMS.CSLA.Library
 		// User Control of Format allows a PROMS user to make modifications to a very limited set of format settings
 		// Variables in this region are not set in the format files.  They are used only in the C# code
 
-		// when IgnoreUCF is true, get the original data, i.e. don't apply any UCF changes to it
+		// when IgnoreUCF is true, get the original data, i.e.don't apply any UCF changes to it
 		private static bool _IgnoreUCF = false;
 		public static bool IgnoreUCF
 		{
 			get { return PlantFormat._IgnoreUCF; }
 			set { PlantFormat._IgnoreUCF = value; }
 		}
-		// flags that the User Control of Format setting for using additional UCF checkoffs is active
-		private static bool _DoingUCFCheckOffs = false;
-		public static bool DoingUCFCheckOffs
-		{
-			get { return PlantFormat._DoingUCFCheckOffs; }
-			set { PlantFormat._DoingUCFCheckOffs = value; }
-		}
-		// flags the value that should be used (true/false) for using additional UCF checkoffs (used with DoingUCFCheckOffs)
-		private static bool _DoingUCFCheckOffsUse = false;
-		public static bool DoingUCFCheckOffsUse
-		{
-			get { return PlantFormat._DoingUCFCheckOffsUse; }
-			set { PlantFormat._DoingUCFCheckOffsUse = value; }
-		}
+
 		#endregion //User Control of Format (UCF)
 		public static FormatConfig GetFormatConfig(IFormatOrFormatInfo format)
 		{
@@ -126,72 +113,6 @@ namespace VEPROMS.CSLA.Library
             XmlNodeList nl = XmlDoc.SelectNodes(xpath);
             return nl.Count > 0;
         }
-        private FormatConfig.ReplaceStrData _UCFandOrigReplaceStrData = null;
-		// This will return a complete list of ReplaceWords, combining those in the original plant format
-		// with the ones added by the user via User Control of Format (UCF)
-        public FormatConfig.ReplaceStrData UCFandOrigReplaceStrData
-        {
-            get
-            {
-                if (_UCFandOrigReplaceStrData != null) return _UCFandOrigReplaceStrData;
-                _UCFandOrigReplaceStrData = GetMergedReplaceList(this);
-                return _UCFandOrigReplaceStrData;
-            }
-        }
-        private FormatConfig.ReplaceStrData GetMergedReplaceList(PlantFormat OriginalPlantFormat)
-        {
-            // need to compare the original format list with the list as it is stored for working with property grid.  
-            FormatConfig.ReplaceStrData retlist = new FormatConfig.ReplaceStrData();        // merged list
-            List<string> inoriglist = new List<string>();      // use this list to find new items in formatconfig (see below)
-            foreach (ReplaceStr origrepstr in OriginalPlantFormat.FormatData.SectData.ReplaceStrList)
-            {
-                // In the format config list (UCF), find the 'ReplaceWord'.  This is the 'key' for defining whether the
-                // replace word has been overwridden by UCF data.  If it exists, use it:
-                FormatConfig.ReplaceStr usethisone = null;
-                bool deleted = false;
-                // States for replacewords: 0 = no change, -1 deleted, 1 added, 2 modified
-                if (FormatConfig != null)
-                {
-                    foreach (FormatConfig.ReplaceStr ucfrepstr in FormatConfig.PlantFormat.FormatData.ReplaceStrData)
-                    {
-                        if (ucfrepstr.ReplaceWord == origrepstr.ReplaceWord)
-                        {
-                            if (ucfrepstr.State == -1) deleted = true;
-                            else usethisone = ucfrepstr;
-                            ucfrepstr.State = 2;
-                            inoriglist.Add(origrepstr.ReplaceWord);
-                            break;
-                        }
-                    }
-                }
-                if (!deleted && usethisone == null)
-                {
-                    usethisone = new FormatConfig.ReplaceStr();
-                    usethisone.Flag = (FormatConfig.E_ReplaceFlagsUCF)origrepstr.Flag;
-                    usethisone.State = 0;   // no change
-                    usethisone.ReplaceWith = origrepstr.ReplaceWith;
-                    usethisone.ReplaceWord = origrepstr.ReplaceWord;
-                }
-                if (!deleted) retlist.Add(usethisone);
-            }
-            // now add in any ucf only replacements, any that are not in the inoriglist
-            if (FormatConfig != null)
-            {
-                foreach (FormatConfig.ReplaceStr ucfrepstr in FormatConfig.PlantFormat.FormatData.ReplaceStrData)
-                {
-                    if (!inoriglist.Contains(ucfrepstr.ReplaceWord))
-                    {
-                        FormatConfig.ReplaceStr newone = new FormatConfig.ReplaceStr();
-                        newone.Flag = (FormatConfig.E_ReplaceFlagsUCF)ucfrepstr.Flag;
-                        newone.State = 1;
-                        newone.ReplaceWith = ucfrepstr.ReplaceWith;
-                        newone.ReplaceWord = ucfrepstr.ReplaceWord;
-                        retlist.Add(newone);
-                    }
-                }
-            }
-            return (retlist);
-        }
 
 		//C2025-023 - Electronic Procedures - Modifications to PROMS
 		// EPFormatFiles contains which Electronic Procedure Format files apply to this main format file.
@@ -1579,25 +1500,6 @@ namespace VEPROMS.CSLA.Library
 				return _PSI == null ? _PSI = new PSI(SelectSingleNode("PSI")) : _PSI;
 			}
 		}
-		private LazyLoad<bool> _CheckOffUCF;
-		public bool CheckOffUCF
-		{
-			get
-			{
-				// The following line is used in UCF (User Control of Format).
-				// This needs to be able to control a change in setting in UCF versus its use:
-				//  - This is a special case since the original format, using the value in BaseAll, is always 'false'.  And the value
-				//    should never be set in original volian plant format files, if the additional UCF checkoffs are to be used, this must
-				//    be set in the UCF user interface.
-				if (PlantFormat.DoingUCFCheckOffs) return PlantFormat.DoingUCFCheckOffsUse;
-
-				if (PlantFormat.IgnoreUCF) return LazyLoad(ref _CheckOffUCF, "@CheckOffUCF");
-				bool? localvalue = null;			// comes to here if in edit or print - use any UCF data before going to original format.
-				FormatConfig fc = PlantFormat.GetFormatConfig(MyFormat);
-				if (fc != null) localvalue = fc.PlantFormat.FormatData.Flags.CheckOffUCF;
-				return localvalue ?? LazyLoad(ref _CheckOffUCF, "@CheckOffUCF");
-			}
-		}
 
 		// specifies the maxiumn length of the procedure title before PROMS considers to wrap the title
 		// this is used with the {PROCTITLE} PageStyle toekn
@@ -1946,53 +1848,9 @@ namespace VEPROMS.CSLA.Library
 			{
                 if (_CheckOffList != null) return _CheckOffList;
 
-				// Get a list of checkoffs that should be included:
-				//  if !UseCheckOffUCF (Baseall has it as false. User can change setting in UCF to true)
-				//		if !IgnoreUCF, i.e. use UCF changes, return original lists with only active items (Inactive = false)
-				//		if IgnoreUCF, return original lists with all items
-				//	if UseCheckOffUCF is true use the merged lists from current format and baseall.xml and
-				//		do the same processing for IgnoreUCF described above.
-
-				// UseCheckOffUCF is false or there is no FormatConfig (UCF) data:
-				FormatConfig fc = PlantFormat.GetFormatConfig(MyFormat);
-				if (!MyFormat.PlantFormat.FormatData.ProcData.CheckOffUCF || fc==null)
-				{
-					_CheckOffList = new CheckOffList(SelectNodes("CheckOffList/CheckOff"), MyFormat);
-					// B2019-100: If Ignoring the UCF data, just return the entire list.  Also, return entire list if there is no UCF data (fc == null)
-					if (PlantFormat.IgnoreUCF || fc == null) return _CheckOffList;
-					// If not ignoring UCF settings, only return those that are active
-					foreach (FormatConfig.CheckOff co in fc.PlantFormat.FormatData.CheckOffList)
-					{
-						foreach (CheckOff coo in _CheckOffList)
-						{
-							if ((int)coo.Index == Convert.ToInt32(co.Index) && !(bool)co.Active)
-							{
-								_CheckOffList.Remove(coo);
-								break;
-							}
-						}
-					}
-					return _CheckOffList;         
-				}
-				// UseCheckOfffUCF is true:
 				// merge the checkoff list from the current format and the checkoff list from the base format
 				_CheckOffList = new CheckOffList(SelectNodes("CheckOffList/CheckOff"), MyFormat);
-				CheckOffList retlist2 = new CheckOffList(SelectNodes("../CheckOffDataUCF/CheckOffList/CheckOff"), MyFormat);
-				if (retlist2 != null && retlist2.Count > 0) foreach (CheckOff co in retlist2) _CheckOffList.Add(co);
-				if (PlantFormat.IgnoreUCF) return _CheckOffList;
 
-				// if applying UCF, then remove those that are inactive:
-				foreach (FormatConfig.CheckOff co in fc.PlantFormat.FormatData.CheckOffList)
-				{
-					foreach (CheckOff coo in _CheckOffList)
-					{
-						if ((int)coo.Index == Convert.ToInt32(co.Index) && !(bool)co.Active)
-						{
-							_CheckOffList.Remove(coo);
-							break;
-						}
-					}
-				}
 				return _CheckOffList; 
 			}
 		}
@@ -2008,77 +1866,13 @@ namespace VEPROMS.CSLA.Library
 			{
 				if (_CheckOffHeaderList != null) return _CheckOffHeaderList;
 				FormatConfig fc = PlantFormat.GetFormatConfig(MyFormat);
-				if (!MyFormat.PlantFormat.FormatData.ProcData.CheckOffUCF || fc == null)
-				{
-					_CheckOffHeaderList = new CheckOffHeaderList(SelectNodes("CheckOffHeaderList/CheckOffHeader"), MyFormat);
-					// Depending on the IgnoreUCF flag, either return this list with UCF Inactive flags set or return the
-					// list as is.
-					if (PlantFormat.IgnoreUCF || fc == null) return _CheckOffHeaderList;
-					// If not ignoring UCF settings, only return those that are active
-					foreach (FormatConfig.CheckOffHeader coh in fc.PlantFormat.FormatData.CheckOffHeaderList)
-					{
-						foreach (CheckOffHeader coo in _CheckOffHeaderList)
-						{
-							if ((int)coo.Index == Convert.ToInt32(coh.Index) && !(bool)coh.Active)
-							{
-								_CheckOffHeaderList.Remove(coo);
-								break;
-							}
-						}
-					}
-					return _CheckOffHeaderList;
-				}
+
 				// merge the checkoff header lists from the current format and the list from the base
 				_CheckOffHeaderList = new CheckOffHeaderList(SelectNodes("CheckOffHeaderList/CheckOffHeader"), MyFormat);
-				CheckOffHeaderList retlist2 = new CheckOffHeaderList(SelectNodes("../CheckOffDataUCF/CheckOffHeaderList/CheckOffHeader"), MyFormat);
-				if (retlist2 != null && retlist2.Count > 0) foreach (CheckOffHeader co in retlist2) _CheckOffHeaderList.Add(co);
-				if (PlantFormat.IgnoreUCF) return _CheckOffHeaderList;
 
-				// if applying UCF, then remove those that are inactive.
-				foreach (FormatConfig.CheckOffHeader coh in fc.PlantFormat.FormatData.CheckOffHeaderList)
-				{
-					foreach (CheckOffHeader cooh in _CheckOffHeaderList)
-					{
-						if ((int)cooh.Index == Convert.ToInt32(coh.Index) && !(bool)coh.Active)
-						{
-							_CheckOffHeaderList.Remove(cooh);
-							break;
-						}
-					}
-				}
 				return _CheckOffHeaderList;
 			}
 		}
-		public void CheckOffHeaderListRefresh(bool CheckOffUCF)
-		{
-			if (!CheckOffUCF)
-			{
-				_CheckOffHeaderList = new CheckOffHeaderList(SelectNodes("CheckOffHeaderList/CheckOffHeader"), MyFormat);
-				// Depending on the IgnoreUCF flag, either return this list with UCF Inactive flags set or return the
-				// list as is.
-				FormatConfig fc = PlantFormat.GetFormatConfig(MyFormat);
-				if (PlantFormat.IgnoreUCF || fc == null) return;
-				// If not ignoring UCF settings, only return those that are active
-				foreach (FormatConfig.CheckOffHeader coh in fc.PlantFormat.FormatData.CheckOffHeaderList)
-				{
-					foreach (CheckOffHeader coo in _CheckOffHeaderList)
-					{
-						if ((int)coo.Index == Convert.ToInt32(coh.Index) && !(bool)coh.Active)
-						{
-							_CheckOffHeaderList.Remove(coo);
-							break;
-						}
-					}
-				}
-				return;
-			}
-			// if coming from the UCF dialog, then check for the 'ignoreUCF' this will flag whether to only 
-			// merge the checkoff header lists from the current format and the list from the base
-			CheckOffHeaderList retlist = new CheckOffHeaderList(SelectNodes("CheckOffHeaderList/CheckOffHeader"), MyFormat);
-			CheckOffHeaderList retlist2 = new CheckOffHeaderList(SelectNodes("../CheckOffDataUCF/CheckOffHeaderList/CheckOffHeader"), MyFormat);
-			if (retlist2 != null && retlist2.Count > 0) foreach (CheckOffHeader co in retlist2) retlist.Add(co);
-			_CheckOffHeaderList = retlist;
-		}
 
 		// This is used with the {INITIALS} pagelist token and will put the word "INITIALS" at the specified pagelist
 		// location for the checkoff column header. Used by Calvert Cliffs (BGEOI and BGESTP formats)

PROMS/VEPROMS.CSLA.Library/Minimal/AnnotationstypeSections.cs

@@ -0,0 +1,175 @@
+using System;
+using System.Collections.Generic;
+using System.Collections;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Data;
+using System.Data.SqlClient;
+using System.Text.RegularExpressions;
+using Csla;
+using Csla.Data;
+using System.Configuration;
+using System.IO;
+using System.ComponentModel;
+
+
+//namespace VEPROMS.CSLA.Library;
+
+// C2025-027 this new file is used to support (data retrival) for selecting Annotation types to display on the Annotation screen.  This is related to Annotation type filtering through V->Options.
+
+namespace VEPROMS.CSLA.Library
+{
+	public class AnnotationstypeSelections
+	{
+		public static DataTable Get(string UserID)
+		{
+			using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+			{
+				using (SqlCommand cm = cn.CreateCommand())
+				{
+					try
+					{
+						cm.CommandType = CommandType.StoredProcedure;
+						cm.CommandText = "getAnnotationstypeFiltered";
+						cm.CommandTimeout = Database.DefaultTimeout;
+						cm.Parameters.AddWithValue("@UsrID", UserID);
+						SqlDataAdapter da = new SqlDataAdapter(cm);
+						SqlDataReader reader = cm.ExecuteReader();
+						DataTable dt = new DataTable();
+						dt.Load(reader);
+						// if the user has not created a annotation sub-set list saved to AnnotationTypeSelections table.
+						if (dt.Rows.Count < 1)
+						{
+							DataRow row;
+							int rowflg = 0;
+							foreach (AnnotationTypeInfo annosel in DataPortal.Fetch<AnnotationTypeInfoList>())
+							{
+								// C2025-027 need to use a datatable instead of AnnotationTypeInfoList so the global search Annotations will not be effected by the Annotation select list selections
+								if (rowflg == 0)
+								{
+									row = dt.NewRow();
+									dt.Rows.Add(row);
+									rowflg = 1;
+								}
+								else
+								{
+									row = dt.NewRow();
+									row["TypeID"] = annosel.TypeID;
+									row["Name"] = annosel.Name;
+									row["Config"] = annosel.Config;
+									row["DTS"] = annosel.DTS;
+									row["UserID"] = annosel.UserID;
+									row["IsEPAnnotationType"] = annosel.IsEPAnnotationType;
+									dt.Rows.Add(row);
+								}
+
+
+							};
+						}
+						return dt;
+
+					}
+					catch (Exception ex)
+					{
+						//B2025-004
+						//if it fails loading previously open tabs, simply treat it as if no tabs were open
+						//instead of crashing
+						return new DataTable();
+					}
+
+				}
+			}
+		}
+		public static DataTable Retrieve(string UserID)
+		{
+			using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+			{
+				using (SqlCommand cm = cn.CreateCommand())
+				{
+					try
+					{
+						cm.CommandType = CommandType.StoredProcedure;
+						cm.CommandText = "getAnnotationstypeSelections";
+						cm.CommandTimeout = Database.DefaultTimeout;
+						cm.Parameters.AddWithValue("@UsrID", UserID);
+						SqlDataAdapter da = new SqlDataAdapter(cm);
+						SqlDataReader reader = cm.ExecuteReader();
+						DataTable dt = new DataTable();
+						dt.Load(reader);
+
+						return dt;
+
+					}
+					catch (Exception ex)
+					{
+						//B2025-004
+						//if it fails loading previously open tabs, simply treat it as if no tabs were open
+						//instead of crashing
+						return new DataTable();
+					}
+
+				}
+			}
+		}
+		public static DataTable GetAnnoTypes(string UserID)
+		{
+			using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+			{
+				using (SqlCommand cm = cn.CreateCommand())
+				{
+					try
+					{
+						cm.CommandType = CommandType.StoredProcedure;
+						cm.CommandText = "getAnnotationSelectListTypes";
+						cm.CommandTimeout = Database.DefaultTimeout;
+						SqlDataAdapter da = new SqlDataAdapter(cm);
+						cm.Parameters.AddWithValue("@UserID", UserID);
+						SqlDataReader reader = cm.ExecuteReader();
+						DataTable dt = new DataTable();
+						dt.Load(reader);
+
+						return dt;
+
+					}
+					catch (Exception ex)
+					{
+						//B2025-004
+						//if it fails loading previously open tabs, simply treat it as if no tabs were open
+						//instead of crashing
+						return new DataTable();
+					}
+
+				}
+			}
+		}
+
+		public static void Update(DataTable dt, string UserID)
+		{
+			using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+			{
+				using (SqlCommand cm = cn.CreateCommand())
+				{
+					try
+					{
+						cm.CommandType = CommandType.StoredProcedure;
+						cm.CommandText = "UpdateAnnotationstypeSelections";
+						cm.CommandTimeout = Database.DefaultTimeout;
+
+						//Pass table Valued parameter to Store Procedure
+						SqlParameter sqlParam = cm.Parameters.AddWithValue("@TempTable", dt);
+						sqlParam.SqlDbType = SqlDbType.Structured;
+						cm.Parameters.AddWithValue("@UserID", UserID);
+						cm.ExecuteNonQuery();
+					}
+					catch (Exception ex)
+					{
+						throw new DbCslaException("Error in UpdateAnnotationstypeSelections: update failed", ex);
+					}
+				}
+			}
+		}
+
+	}
+}
+

PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj

@@ -387,6 +387,7 @@
     <Compile Include="Generated\ZContentInfo.cs" />
     <Compile Include="Generated\ZTransition.cs" />
     <Compile Include="Generated\ZTransitionInfo.cs" />
+    <Compile Include="Minimal\AnnotationstypeSections.cs" />
     <Compile Include="Minimal\UserSettings.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="VEObjects\VEDrillDown.cs" />

PROMS/VEPROMS/VEPROMS.sln

@@ -38,6 +38,9 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Baseline", "..\Baseline\Baseline.csproj", "{8B29E0DE-B6C9-4041-8817-319FDE3123C4}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RoAccessToSql", "..\RoAccessToSql\RoAccessToSql.csproj", "{1EC96BDA-01E7-4153-A95D-6A4A36FA278E}"
+	ProjectSection(ProjectDependencies) = postProject
+		{AEEE9FD1-6892-45E2-A67E-418C06D46FF9} = {AEEE9FD1-6892-45E2-A67E-418C06D46FF9}
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

PROMS/Volian.Base.Library/RtfEditor.cs

@@ -1,36 +0,0 @@
-using System.ComponentModel;
-using System.Drawing.Design;
-using System.Windows.Forms;
-using System.Windows.Forms.Design;
-using System;
-
-
-namespace Volian.Base.Library
-{
-    // The RtfEditor inherits from the UITypeEditor and is used to edit Rtf fields. This provides the interface for fields in FormatConfig
-    // and uses the frmRtfEdit to provide a mechanism to do basic editing of text with a subset of rtf command support.
-	public class RtfEditor : UITypeEditor
-	{
-		public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context)
-		{
-			return UITypeEditorEditStyle.Modal;
-		}
-		public override object EditValue(ITypeDescriptorContext context, System.IServiceProvider provider, object value)
-		{
-			IWindowsFormsEditorService svc = provider.GetService(typeof(IWindowsFormsEditorService)) as IWindowsFormsEditorService;
-			string rw = value as string;
-			if (svc != null && rw != null)
-			{
-				using (frmRtfEdit form = new frmRtfEdit())
-				{
-					form.Value = rw;
-					if (svc.ShowDialog(form) == DialogResult.OK)
-					{
-						rw = form.Value; // update object
-					}
-				}
-			}
-			return rw;
-		}
-	}
-}

PROMS/Volian.Base.Library/Volian.Base.Library.csproj

@@ -101,17 +101,10 @@
     <Compile Include="FrmPopupStatusMessage.Designer.cs">
       <DependentUpon>FrmPopupStatusMessage.cs</DependentUpon>
     </Compile>
-    <Compile Include="frmRtfEdit.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="frmRtfEdit.Designer.cs">
-      <DependentUpon>frmRtfEdit.cs</DependentUpon>
-    </Compile>
     <Compile Include="GenericSerializer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="PropGridCollEditor.cs" />
     <Compile Include="RTBAPI.cs" />
-    <Compile Include="RtfEditor.cs" />
     <Compile Include="RtfTools.cs" />
     <Compile Include="TmpFile.cs" />
     <Compile Include="ValidFileName.cs" />
@@ -126,9 +119,6 @@
     <EmbeddedResource Include="FrmPopupStatusMessage.resx">
       <DependentUpon>FrmPopupStatusMessage.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="frmRtfEdit.resx">
-      <DependentUpon>frmRtfEdit.cs</DependentUpon>
-    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

PROMS/Volian.Base.Library/frmRtfEdit.Designer.cs

@@ -1,179 +0,0 @@
-namespace Volian.Base.Library
-{
-	partial class frmRtfEdit
-	{
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-			{
-				components.Dispose();
-			}
-			base.Dispose(disposing);
-		}
-
-		#region Windows Form Designer generated code
-
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			this.btnOK = new System.Windows.Forms.Button();
-			this.btnCancel = new System.Windows.Forms.Button();
-			this.rtfBox = new System.Windows.Forms.RichTextBox();
-			this.btnBold = new DevComponents.DotNetBar.ButtonX();
-			this.btnItalics = new DevComponents.DotNetBar.ButtonX();
-			this.btnUnderline = new DevComponents.DotNetBar.ButtonX();
-			this.btnSubscript = new DevComponents.DotNetBar.ButtonX();
-			this.btnSuperscript = new DevComponents.DotNetBar.ButtonX();
-			this.btnHardspace = new DevComponents.DotNetBar.ButtonX();
-			this.SuspendLayout();
-			// 
-			// btnOK
-			// 
-			this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK;
-			this.btnOK.Location = new System.Drawing.Point(38, 144);
-			this.btnOK.Name = "btnOK";
-			this.btnOK.Size = new System.Drawing.Size(75, 23);
-			this.btnOK.TabIndex = 3;
-			this.btnOK.Text = "OK";
-			this.btnOK.UseVisualStyleBackColor = true;
-			this.btnOK.Click += new System.EventHandler(this.btnOK_Click);
-			// 
-			// btnCancel
-			// 
-			this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.btnCancel.Location = new System.Drawing.Point(143, 144);
-			this.btnCancel.Name = "btnCancel";
-			this.btnCancel.Size = new System.Drawing.Size(75, 23);
-			this.btnCancel.TabIndex = 4;
-			this.btnCancel.Text = "Cancel";
-			this.btnCancel.UseVisualStyleBackColor = true;
-			this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
-			// 
-			// rtfBox
-			// 
-			this.rtfBox.Location = new System.Drawing.Point(38, 73);
-			this.rtfBox.Name = "rtfBox";
-			this.rtfBox.Size = new System.Drawing.Size(214, 50);
-			this.rtfBox.TabIndex = 5;
-			this.rtfBox.Text = "";
-			this.rtfBox.SelectionChanged += new System.EventHandler(this.rtfBox_SelectionChanged);
-			// 
-			// btnBold
-			// 
-			this.btnBold.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
-			this.btnBold.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-			this.btnBold.Location = new System.Drawing.Point(12, 12);
-			this.btnBold.Name = "btnBold";
-			this.btnBold.Size = new System.Drawing.Size(31, 24);
-			this.btnBold.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-			this.btnBold.TabIndex = 6;
-			this.btnBold.Text = "B";
-			this.btnBold.Click += new System.EventHandler(this.btnBold_Click);
-			// 
-			// btnItalics
-			// 
-			this.btnItalics.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
-			this.btnItalics.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-			this.btnItalics.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.btnItalics.Location = new System.Drawing.Point(43, 12);
-			this.btnItalics.Name = "btnItalics";
-			this.btnItalics.Size = new System.Drawing.Size(31, 24);
-			this.btnItalics.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-			this.btnItalics.TabIndex = 7;
-			this.btnItalics.Text = "I";
-			this.btnItalics.Click += new System.EventHandler(this.btnItalics_Click);
-			// 
-			// btnUnderline
-			// 
-			this.btnUnderline.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
-			this.btnUnderline.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-			this.btnUnderline.Location = new System.Drawing.Point(74, 12);
-			this.btnUnderline.Name = "btnUnderline";
-			this.btnUnderline.Size = new System.Drawing.Size(31, 24);
-			this.btnUnderline.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-			this.btnUnderline.TabIndex = 8;
-			this.btnUnderline.Text = "U";
-			this.btnUnderline.Click += new System.EventHandler(this.btnUnderline_Click);
-			// 
-			// btnSubscript
-			// 
-			this.btnSubscript.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
-			this.btnSubscript.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-			this.btnSubscript.Location = new System.Drawing.Point(12, 42);
-			this.btnSubscript.Name = "btnSubscript";
-			this.btnSubscript.Size = new System.Drawing.Size(75, 23);
-			this.btnSubscript.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-			this.btnSubscript.TabIndex = 9;
-			this.btnSubscript.Text = "Subscript";
-			this.btnSubscript.Click += new System.EventHandler(this.btnSubscript_Click);
-			// 
-			// btnSuperscript
-			// 
-			this.btnSuperscript.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
-			this.btnSuperscript.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-			this.btnSuperscript.Location = new System.Drawing.Point(90, 42);
-			this.btnSuperscript.Name = "btnSuperscript";
-			this.btnSuperscript.Size = new System.Drawing.Size(75, 23);
-			this.btnSuperscript.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-			this.btnSuperscript.TabIndex = 10;
-			this.btnSuperscript.Text = "Superscript";
-			this.btnSuperscript.Click += new System.EventHandler(this.btnSuperscript_Click);
-			// 
-			// btnHardspace
-			// 
-			this.btnHardspace.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
-			this.btnHardspace.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-			this.btnHardspace.Location = new System.Drawing.Point(150, 10);
-			this.btnHardspace.Name = "btnHardspace";
-			this.btnHardspace.Size = new System.Drawing.Size(37, 26);
-			this.btnHardspace.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-			this.btnHardspace.TabIndex = 11;
-			this.btnHardspace.Text = "HS";
-			this.btnHardspace.Click += new System.EventHandler(this.btnHardspace_Click);
-			// 
-			// frmRtfEdit
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(282, 198);
-			this.Controls.Add(this.btnHardspace);
-			this.Controls.Add(this.btnSuperscript);
-			this.Controls.Add(this.btnSubscript);
-			this.Controls.Add(this.btnUnderline);
-			this.Controls.Add(this.btnItalics);
-			this.Controls.Add(this.btnBold);
-			this.Controls.Add(this.rtfBox);
-			this.Controls.Add(this.btnCancel);
-			this.Controls.Add(this.btnOK);
-			this.Name = "frmRtfEdit";
-			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-			this.Text = "Rich Text Edit";
-			this.ResumeLayout(false);
-
-		}
-
-		#endregion
-
-		private System.Windows.Forms.Button btnOK;
-		private System.Windows.Forms.Button btnCancel;
-		private System.Windows.Forms.RichTextBox rtfBox;
-		private DevComponents.DotNetBar.ButtonX btnBold;
-		private DevComponents.DotNetBar.ButtonX btnItalics;
-		private DevComponents.DotNetBar.ButtonX btnUnderline;
-		private DevComponents.DotNetBar.ButtonX btnSubscript;
-		private DevComponents.DotNetBar.ButtonX btnSuperscript;
-		private DevComponents.DotNetBar.ButtonX btnHardspace;
-	}
-}

PROMS/Volian.Base.Library/frmRtfEdit.cs

@@ -1,199 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
-using System.Text.RegularExpressions;
-using DevComponents.DotNetBar;
-
-namespace Volian.Base.Library
-{
-    // this is the form used in the UCF (User Control of Format) feature that displays text and allows the user to modify it to
-    // add/remove various text attributes: Underline, bold, italics, super/sub script & Hard space.
-	public partial class frmRtfEdit : Form
-	{
-		public frmRtfEdit()
-		{
-			InitializeComponent();
-		}
-		private static Regex regHyphen = new Regex(@"(?<!\\)(\\u8208\?|\\u8210\?|\\u8211\?|\\u8212\?|\\u8213\?|\\_|\\endash|\\emdash)");
-        // Value is used by the UITypeEditor, RtfEditor, to set/return the text that is being edited.
-		public string Value
-		{
-			get 
-			{
-				string rtbString = regHyphen.Replace(RtfToDbText(rtfBox.Rtf).Replace("<BackSlash>", "\\\\"), @"\u8209?");
-				int indx = rtbString.IndexOf('-');
-				while (indx > -1)
-				{
-					if (indx > 2)
-					{
-						if (rtbString[indx - 1] != 'i' || rtbString[indx - 2] != 'f' || rtbString[indx - 3] != '\\')
-						{
-							rtbString = rtbString.Remove(indx, 1);
-							rtbString = rtbString.Insert(indx, @"\u8209?");
-						}
-						if (indx + 1 > rtbString.Length) indx = -1;
-						else indx = rtbString.IndexOf('-', indx + 1);
-					}
-				}
-				return rtbString; 
-			}
-			set 
-			{
-				string makeRtf = @"{\rtf1\ansi\ansicpg1252\deff0\deflang1033{\fonttbl{\f0\fnil\fcharset0 Microsoft Sans Serif;}}\viewkind4\uc1\pard\f0\fs16 " + value + @"\par}";
-				makeRtf = makeRtf.Replace(@"\xa0", "'");
-				rtfBox.Rtf = makeRtf;
-			}
-		}
-        // when saving text, keep all of the necessary rtf commands that are used to define the text attributes. The rest are removed
-		public static string StaticReplaceRTFClause(Match m)
-		{
-			try
-			{
-				string token = m.Groups[1].Value;
-				switch (token[1])
-				{
-					case '\\':
-						return token;
-					case 'u':
-						if (Regex.IsMatch(token, @"^\\u[0-9]+$"))
-							return token; // Special Charcaters
-						if (Regex.IsMatch(token, @"^\\ulnone ?$"))
-							return token;
-						if (Regex.IsMatch(token, @"^\\ul.*$"))
-							return token; // Underline
-						if (Regex.IsMatch(token, @"^\\up[0-9] ?$"))
-							return token; // shift up (superscript)
-						break;
-					case 'd':
-						if (Regex.IsMatch(token, @"^\\dn[0-9] ?$"))
-							return token; // shift down (subscript)
-						break;
-					case '\'': // Special Character
-						return token;
-					case 'b': // Bold
-						return token;
-					case 'i': // Italics
-						return token;
-					case '{': // look for escape for curly braces:
-						return token;
-					case '}':
-						return token;
-					case 'l':
-						if (Regex.IsMatch(token, @"^\\line ?$")) return token;
-						if (Regex.IsMatch(token, @"^\\li[-0-9]+ ?$")) return token; // line indent
-						break;
-					case 'f':
-						if (Regex.IsMatch(token, @"^\\fi[-0-9]+ ?$")) return token; // first line indent
-						break;
-                    case 'p':
-                        if (Regex.IsMatch(token, @"^\\par ?$")) return @"{\par}";
-                        break;
-				}
-			}
-			catch (Exception ex)
-			{
-				Console.WriteLine("StaticReplaceRTFClause {0} - {1}", ex.GetType().Name, ex.Message);
-			}
-			return "";//Strip All
-		}
-        // remove all of the rtf commands that are not needed to define the attributes of text that are supported:
-		private static Regex reg1 = new Regex(@"\\par\r\n(?!\\)");
-		private static Regex reg2 = new Regex(@"[\r\n]", RegexOptions.Singleline); // Strip Carriage Returns and Newlines
-		private static Regex reg3 = new Regex(@"^\{(.*)\}$", RegexOptions.Singleline); // Strip Opening and Closing Braces
-		private static Regex reg4 = new Regex(@"\{[^{]*?\}", RegexOptions.Singleline); // Strip Clauses - remove anything from curly braces
-		private static Regex reg5 = new Regex(@"\{[^{]*?\}", RegexOptions.Singleline); // Strip Clauses - remove anything from curly braces
-		private static Regex reg6 = new Regex(@"(\\[^' \\?\r\n\t]+)(?=\\)");  // add space after token if followed by token
-		private static Regex reg7 = new Regex(@"(\\[^' \\?\r\n\t]+ )");  // take backslash xyz and evaluates them
-		private static Regex reg8 = new Regex(@"(\\[^' \\?\r\n\t]+) (?=\\)");  // remove space between tokens
-		private static Regex reg9 = new Regex(@"(\\[^' \\?\r\n\t]+) (?=\r\n)");  // remove space before /r/n
-        private static Regex reg10 = new Regex(@"(\\[0-9a-z]+)$");      // end of text attribute needs a 'space'
-		private string RtfToDbText(string rtf)
-		{
-			// replace \{ & \} with (![ & (!] respectively and then redo at end.  The curly braces
-			// are rtf so were getting removed and/or not handled correctly.
-			string retval = rtf.Replace(@"\{", @" (![");
-			retval = retval.Replace(@"\}", @" (!]");
-
-			// remove carriage return/newlines after \par commands (these are introduced by rtb
-			// for hard returns, goes into rtb as \par and comes out as \par\r\n):
-			retval = reg1.Replace(retval, "\\par ");
-			retval = retval.Replace("\\v0\r\n", "\\v0 "); // Replace Carriage Return and Newline after comment 
-			retval = reg2.Replace(retval, ""); // Strip Carriage Returns and Newlines
-			retval = reg3.Replace(retval, "$1"); // Strip Opening and Closing Braces
-			retval = reg4.Replace(retval, ""); // Strip Clauses - remove anything from curly braces
-			retval = reg5.Replace(retval, ""); // Strip Clauses - remove anything from curly braces
-			retval = reg6.Replace(retval, "$1 ");  // add space after token if followed by token
-			retval = reg7.Replace(retval, new MatchEvaluator(StaticReplaceRTFClause));  // take backslash xyz and evaluates them
-			retval = reg8.Replace(retval, "$1");  // remove space between tokens
-			retval = reg9.Replace(retval, "$1");  // remove space before /r/n
-            if (retval.EndsWith(@"{\par}")) retval = retval.Remove(retval.Length - 6, 6);
-            retval = reg10.Replace(retval, "$1 ");
-			// remove \r\n at end of string if the string has 2 or more characters
-			if (retval.EndsWith("\r\n")) retval = retval.Remove(retval.Length - 2, 2);
-			if (retval.Length == 0) return "";
-			if (retval.EndsWith(@"\v")) retval = retval.Remove(retval.Length - 2, 2);
-			retval = retval.Replace(@" (![", @"\{");
-			retval = retval.Replace(@" (!]", @"\}");
-			retval = retval.Replace("`",@"\xA0");
-			return retval;
-		}
-		private void btnBold_Click(object sender, EventArgs e)
-		{
-			RTBAPI.ToggleBold(!RTBAPI.IsBold(rtfBox), rtfBox, rtfBox.SelectionLength == 0 ? RTBAPI.RTBSelection.SCF_DEFAULT : RTBAPI.RTBSelection.SCF_SELECTION);
-			btnBold.Checked = RTBAPI.IsBold(rtfBox);
-		}
-		private void btnItalics_Click(object sender, EventArgs e)
-		{
-			RTBAPI.ToggleItalic(!RTBAPI.IsItalic(rtfBox), rtfBox, rtfBox.SelectionLength == 0 ? RTBAPI.RTBSelection.SCF_DEFAULT : RTBAPI.RTBSelection.SCF_SELECTION);
-			btnItalics.Checked = RTBAPI.IsItalic(rtfBox);
-		}
-		private void btnUnderline_Click(object sender, EventArgs e)
-		{
-			RTBAPI.ToggleUnderline(!RTBAPI.IsUnderline(rtfBox), rtfBox, rtfBox.SelectionLength == 0 ? RTBAPI.RTBSelection.SCF_DEFAULT : RTBAPI.RTBSelection.SCF_SELECTION);
-			btnUnderline.Checked = RTBAPI.IsUnderline(rtfBox);
-		}
-		private void btnSubscript_Click(object sender, EventArgs e)
-		{
-			RTBAPI.ToggleSubscript(!RTBAPI.IsSubScript(rtfBox), rtfBox, rtfBox.SelectionLength == 0 ? RTBAPI.RTBSelection.SCF_DEFAULT : RTBAPI.RTBSelection.SCF_SELECTION);
-			btnSubscript.Checked = RTBAPI.IsSubScript(rtfBox);
-		}
-		private void btnSuperscript_Click(object sender, EventArgs e)
-		{
-			RTBAPI.ToggleSuperscript(!RTBAPI.IsSuperScript(rtfBox), rtfBox, rtfBox.SelectionLength == 0 ? RTBAPI.RTBSelection.SCF_DEFAULT : RTBAPI.RTBSelection.SCF_SELECTION);
-			btnSuperscript.Checked = RTBAPI.IsSuperScript(rtfBox);
-		}
-		private void btnOK_Click(object sender, EventArgs e)
-		{
-		}
-		private void btnCancel_Click(object sender, EventArgs e)
-		{
-		}
-		private void rtfBox_SelectionChanged(object sender, EventArgs e)
-		{
-			btnBold.Checked = RTBAPI.IsBold(rtfBox);
-			btnItalics.Checked = RTBAPI.IsItalic(rtfBox);
-			btnUnderline.Checked = RTBAPI.IsUnderline(rtfBox);
-		}
-		private void btnHardspace_Click(object sender, EventArgs e)
-		{
-			AddText("`");
-		}
-		private void AddText(string str)
-		{
-			// See comments in AddRtf(string str) to explain the font style setting
-			RTBAPI.E_FontStyle fs = RTBAPI.GetFontStyle(rtfBox);
-			int positionStart = rtfBox.SelectionStart;
-			rtfBox.SelectedText = str;
-			int positionAfter = rtfBox.SelectionStart;
-			rtfBox.Select(positionStart, positionAfter - positionStart);
-			RTBAPI.SetFontStyle(rtfBox, fs);
-			rtfBox.Select(positionAfter, 0);
-		}
-	}
-}
-

PROMS/Volian.Controls.Library/AnnotationDetails.cs

@@ -119,8 +119,8 @@ namespace Volian.Controls.Library
 					if (CurrentItem.MyDocVersion != null)
 						if (CurrentItem.MyDocVersion.DocVersionAssociationCount > 0)
 							_ROPath = CurrentItem.MyDocVersion.DocVersionAssociations[0].MyROFst.MyRODb.FolderPath;
-					ProcItem = CurrentItem.MyProcedure;
-				}
+
+		}
 				public AnnotationInfo FirstExeAnnotation(ItemInfo ii) 
 				{
 					if (ii == null) return null;
@@ -364,7 +364,11 @@ namespace Volian.Controls.Library
 
 			cbGridAnnoType.DisplayMember = "Name";
 			cbGridAnnoType.ValueMember = "TypeId";
-			cbGridAnnoType.DataSource = AnnotationTypeInfoList.Get().Clone();
+
+			//C2025 - 027 Annotation Type Filtering
+			cbGridAnnoType.WatermarkText = "Select Annotation Type";
+			cbGridAnnoType.DataSource = VEPROMS.CSLA.Library.AnnotationstypeSelections.Get(MyUserInfo.UserID);
+
 			// If there are no annotatons, then selected index is -1 (not defined), otherwise select the first.
 			// This was done so that it could be saved if there was text entered but user moves to another steprtb without selecting save button
 			// so that annotation gets saved.

PROMS/Volian.Controls.Library/DisplayTags.cs

@@ -315,12 +315,6 @@ namespace Volian.Controls.Library
 
 			if (StepOverRide()) cmbCheckoff.Enabled = false;	// Checkoffs already assigned to AER
 
-			//// if there are no checkoffs OR
-			//// if this is a sign-off, the checkoff list is not enabled either (matches 16bit functionality) At some point, we
-			//// may want to allow them to turn off the checkoff
-			//if ((fmtdata.ProcData.CheckOffData.CheckOffList == null || fmtdata.ProcData.CheckOffData.CheckOffList.Count == 0) ||
-			//    fmtdata.ProcData.CheckOffData.Menu=="Signoff")
-			//    cmbCheckoff.Enabled = false;
 			cbCAS.Enabled = (!CurItemInfo.IsFigure && !CurItemInfo.IsRtfRaw);
 			cbTCAS.Enabled = (!CurItemInfo.IsFigure && !CurItemInfo.IsRtfRaw); //F2022-024 Time Critical Action Summary
 			if (((CurItemInfo.ActiveFormat.PlantFormat.FormatData.PurchaseOptions.Value & E_PurchaseOptions.EnhancedBackgrounds) == E_PurchaseOptions.EnhancedBackgrounds) ||
@@ -367,7 +361,7 @@ namespace Volian.Controls.Library
 			if (fmtdata.ProcData.CheckOffData.CheckoffOnSubStepsOnly)
 				_checkoffsAllowed = cmbCheckoff.Enabled = CurItemInfo.IsType("Substep");
 
-			int maxindx = fmtdata.ProcData.CheckOffUCF ? fmtdata.ProcData.CheckOffData.CheckOffList.MaxIndex : fmtdata.ProcData.CheckOffData.CheckOffList.MaxIndexNoInherit;
+			int maxindx = fmtdata.ProcData.CheckOffData.CheckOffList.MaxIndexNoInherit;
 			if (_checkoffsAllowed && !(fmtdata.ProcData.CheckOffData.CheckOffList == null) && !(maxindx == 0))
 			{
 				CheckOffList chkoffList = fmtdata.ProcData.CheckOffData.CheckOffList;
@@ -856,21 +850,6 @@ namespace Volian.Controls.Library
 			MyEditItem.SaveContents();
 			// set selected index in the step's config.
 			int indx = _CheckOffIndex[cmbCheckoff.SelectedIndex]; // C2020-003 get the non-sorted index from the sorted index
-            // get index, if greater than 100, store that - otherwise store index down list.
-            // if this format does not have ucf signoffs, indx is just the selected index from the combo box.
-            if (CurItemInfo.ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffUCF)
-            {
-                // get index, if greater than 100, store that - otherwise store index down list.
-                // if this format does not have ucf signoffs, indx is just the selected index from the combo mobx.
-                foreach (CheckOff co in CurItemInfo.ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffData.CheckOffList)
-                {
-                    if (cmbCheckoff.SelectedItem == co.MenuItem)
-                    {
-                        if ((int)co.Index >= 100) indx = (int)co.Index;
-                        break;
-                    }
-                }
-            }
 			StepConfig sc = CurItemInfo.MyConfig as StepConfig;
 			sc.Step_CheckOffIndex = indx;
 			//using (Content cnt = Content.Get(CurItemInfo.MyContent.ContentID))

PROMS/Volian.Controls.Library/StepRTB.cs

@@ -1284,7 +1284,7 @@ namespace Volian.Controls.Library
 			}
 			selectedRtfSB.Append(@"{\rtf1\ansi\ansicpg1252\deff0\deflang1033{\fonttbl{\f0\fnil\fcharset2 " + myFont.FontFamily.Name + @";}"); //}\f0\fs" + this.Font.SizeInPoints * 2 + @" " + myDisplayTextElement.Text + @"}}";
             if (!isFixed)
-                selectedRtfSB.Append(@"{\f1\fnil\fcharset0 " + Volian.Base.Library.vlnFont.ProportionalSymbolFont + @";}}{\colortbl ;\red255\green0\blue0;}");  // C2017-036 get best available proportional font for symbols
+                selectedRtfSB.Append(@"{\f1\fnil\fcharset0 " + Volian.Base.Library.vlnFont.ProportionalSymbolFont + @";}}{\colortbl ;\red255\green0\blue0;\red0\green0\blue255;}");  // C2017-036 get best available proportional font for symbols - B2025-039 add Blue for Colored Replace Words
             else
 				selectedRtfSB.Append(@"{\f1\fnil\fcharset0 FreeMono;}}{\colortbl ;\red255\green0\blue0;\red0\green0\blue255;}");  // FreeMono is now used for the edit screen only.  VESymbFix and Consolas are used for printing
 			selectedRtfSB.Append("\r\n");

PROMS/Volian.Controls.Library/StepTabRibbon.cs

@@ -618,6 +618,15 @@ namespace Volian.Controls.Library
 		}
 		private int _MyLastFormatID = -1;
 		private StepRTB _MyStepRTB;
+		private static int _OringFlg; 
+		public static int OringFlg
+		{
+			get { return _OringFlg; }
+			set
+			{
+				_OringFlg = value;
+			}
+		}
 		public StepRTB MyStepRTB
 		{
 			get { return _MyStepRTB; }
@@ -4096,6 +4105,7 @@ namespace Volian.Controls.Library
 
 		public void DoCopyStep()
 		{
+			MyEditItem.SaveCurrentAndContents(); // B2025-038 copy step and text to another procedure in another screen.
 			// highlight selected step(s) and prompt to see if selection is what user wants:
 			if (MyFlexGrid != null) MyEditItem.IdentifyMe(true);
 			MyEditItem.IdentifyChildren(true);
@@ -4143,16 +4153,22 @@ namespace Volian.Controls.Library
 
 		private void btnPdfCreate_Click(object sender, EventArgs e)
 		{
+				// B2025-036 split screen print issue. if oringFlg == 1 the ctrl-p keys was pressed.
+			_OringFlg = 0;
+			DevComponents.DotNetBar.eEventSource oring = ((DevComponents.DotNetBar.Events.EventSourceArgs)e).Source;
+			if (oring == eEventSource.Keyboard)
+				_OringFlg = 1;
+
 			if (MyItemInfo == null) return;   // if creating a pdf before rtb exists, return;
 			if (MyEditItem != null) MyEditItem.SaveCurrentAndContents();
-			OnPrintRequest(new StepTabRibbonEventArgs(MyItemInfo.MyProcedure), 0);
+			OnPrintRequest(new StepTabRibbonEventArgs(MyItemInfo.MyProcedure, _OringFlg), 0);
 		}
 
 		private void btnPdfQuickCreate_Click(object sender, EventArgs e)
 		{
 			if (MyItemInfo == null) return;   // if creating a pdf before rtb exists, return;
 			if (MyEditItem != null) MyEditItem.SaveCurrentAndContents();
-			OnPrintRequest(new StepTabRibbonEventArgs(MyItemInfo.MyProcedure), 1);
+			OnPrintRequest(new StepTabRibbonEventArgs(MyItemInfo.MyProcedure, _OringFlg), 1);
 		}
 
 		private void btnCASCreate_Click(object sender, EventArgs e)
@@ -4814,9 +4830,10 @@ namespace Volian.Controls.Library
 	public class StepTabRibbonEventArgs : EventArgs
 	{
 		public StepTabRibbonEventArgs() { ; }
-		public StepTabRibbonEventArgs(ItemInfo proc)
+		public StepTabRibbonEventArgs(ItemInfo proc, int oringFlg = 0)
 		{
 			_Proc = proc;
+			OringFlg = oringFlg;
 		}
 		private ItemInfo _Proc;
 
@@ -4825,6 +4842,13 @@ namespace Volian.Controls.Library
 			get { return _Proc; }
 			set { _Proc = value; }
 		}
+			// B2025-036 split screen print issue. if oringFlg == 1 the ctrl-p keys was pressed.
+		private int _OringFlg;
+		public int OringFlg
+		{
+			get { return _OringFlg; }
+			set { _OringFlg = value; }
+		}
 	}
 	public delegate void StepTabRibbonEvent(object sender, StepTabRibbonEventArgs args);
 

PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj

@@ -218,12 +218,6 @@
     <Compile Include="dlgEnhMissingItem.Designer.cs">
       <DependentUpon>dlgEnhMissingItem.cs</DependentUpon>
     </Compile>
-    <Compile Include="dlgUCFImportOptions.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="dlgUCFImportOptions.Designer.cs">
-      <DependentUpon>dlgUCFImportOptions.cs</DependentUpon>
-    </Compile>
     <Compile Include="EditItem.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -479,9 +473,6 @@
     <EmbeddedResource Include="dlgEnhMissingItem.resx">
       <DependentUpon>dlgEnhMissingItem.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="dlgUCFImportOptions.resx">
-      <DependentUpon>dlgUCFImportOptions.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="FindReplace.resx">
       <DependentUpon>FindReplace.cs</DependentUpon>
       <SubType>Designer</SubType>

PROMS/Volian.Controls.Library/dlgUCFImportOptions.Designer.cs

@@ -1,397 +0,0 @@
-namespace Volian.Controls.Library
-{
-	partial class dlgUCFImportOptions
-	{
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-			{
-				components.Dispose();
-			}
-			base.Dispose(disposing);
-		}
-
-		#region Windows Form Designer generated code
-
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			this.btnOk = new System.Windows.Forms.Button();
-			this.btnCancel = new System.Windows.Forms.Button();
-			this.pnlOptions = new System.Windows.Forms.Panel();
-			this.pnlChoices = new System.Windows.Forms.Panel();
-			this.cmbFNames = new DevComponents.DotNetBar.Controls.ComboBoxEx();
-			this.grPnlLoad = new DevComponents.DotNetBar.Controls.GroupPanel();
-			this.grPnlUse = new DevComponents.DotNetBar.Controls.GroupPanel();
-			this.rbOnlyImported = new System.Windows.Forms.RadioButton();
-			this.rbAll = new System.Windows.Forms.RadioButton();
-			this.rbSetOnly = new System.Windows.Forms.RadioButton();
-			this.cbUse = new DevComponents.DotNetBar.Controls.CheckBoxX();
-			this.lblLoadFormat = new DevComponents.DotNetBar.LabelX();
-			this.sBtnLoad = new DevComponents.DotNetBar.Controls.SwitchButton();
-			this.lblFmt = new System.Windows.Forms.Label();
-			this.pnlXmlDiff = new System.Windows.Forms.Panel();
-			this.wbBrwsExisting = new System.Windows.Forms.WebBrowser();
-			this.splitterWebBrowsers = new System.Windows.Forms.Splitter();
-			this.pnlWbBrwsImp = new System.Windows.Forms.Panel();
-			this.wbBrwsImporting = new System.Windows.Forms.WebBrowser();
-			this.superTooltip1 = new DevComponents.DotNetBar.SuperTooltip();
-			this.pnlChoices.SuspendLayout();
-			this.grPnlLoad.SuspendLayout();
-			this.grPnlUse.SuspendLayout();
-			this.pnlXmlDiff.SuspendLayout();
-			this.pnlWbBrwsImp.SuspendLayout();
-			this.SuspendLayout();
-			// 
-			// btnOk
-			// 
-			this.btnOk.DialogResult = System.Windows.Forms.DialogResult.OK;
-			this.btnOk.Location = new System.Drawing.Point(31, 356);
-			this.btnOk.Name = "btnOk";
-			this.btnOk.Size = new System.Drawing.Size(65, 23);
-			this.btnOk.TabIndex = 5;
-			this.btnOk.Text = "OK";
-			this.btnOk.UseVisualStyleBackColor = true;
-			this.btnOk.Click += new System.EventHandler(this.btnOk_Click);
-			// 
-			// btnCancel
-			// 
-			this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.btnCancel.Location = new System.Drawing.Point(121, 356);
-			this.btnCancel.Name = "btnCancel";
-			this.btnCancel.Size = new System.Drawing.Size(65, 23);
-			this.btnCancel.TabIndex = 6;
-			this.btnCancel.Text = "Cancel";
-			this.btnCancel.UseVisualStyleBackColor = true;
-			// 
-			// pnlOptions
-			// 
-			this.pnlOptions.Location = new System.Drawing.Point(0, 0);
-			this.pnlOptions.Name = "pnlOptions";
-			this.pnlOptions.Size = new System.Drawing.Size(200, 100);
-			this.pnlOptions.TabIndex = 0;
-			// 
-			// pnlChoices
-			// 
-			this.pnlChoices.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left)));
-			this.pnlChoices.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-			this.pnlChoices.Controls.Add(this.cmbFNames);
-			this.pnlChoices.Controls.Add(this.grPnlLoad);
-			this.pnlChoices.Controls.Add(this.lblLoadFormat);
-			this.pnlChoices.Controls.Add(this.sBtnLoad);
-			this.pnlChoices.Controls.Add(this.lblFmt);
-			this.pnlChoices.Controls.Add(this.btnCancel);
-			this.pnlChoices.Controls.Add(this.btnOk);
-			this.pnlChoices.Location = new System.Drawing.Point(0, 0);
-			this.pnlChoices.Name = "pnlChoices";
-			this.pnlChoices.Size = new System.Drawing.Size(250, 606);
-			this.pnlChoices.TabIndex = 7;
-			// 
-			// cmbFNames
-			// 
-			this.cmbFNames.DisplayMember = "Text";
-			this.cmbFNames.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
-			this.cmbFNames.FormattingEnabled = true;
-			this.cmbFNames.ItemHeight = 16;
-			this.cmbFNames.Location = new System.Drawing.Point(26, 48);
-			this.cmbFNames.Name = "cmbFNames";
-			this.cmbFNames.Size = new System.Drawing.Size(191, 22);
-			this.cmbFNames.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-			this.cmbFNames.TabIndex = 15;
-			this.cmbFNames.SelectedIndexChanged += new System.EventHandler(this.cmbFNames_SelectedIndexChanged);
-			// 
-			// grPnlLoad
-			// 
-			this.grPnlLoad.CanvasColor = System.Drawing.SystemColors.Control;
-			this.grPnlLoad.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
-			this.grPnlLoad.Controls.Add(this.grPnlUse);
-			this.grPnlLoad.Controls.Add(this.cbUse);
-			this.grPnlLoad.DisabledBackColor = System.Drawing.Color.Empty;
-			this.grPnlLoad.Location = new System.Drawing.Point(11, 130);
-			this.grPnlLoad.Name = "grPnlLoad";
-			this.grPnlLoad.Size = new System.Drawing.Size(224, 184);
-			// 
-			// 
-			// 
-			this.grPnlLoad.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
-			this.grPnlLoad.Style.BackColorGradientAngle = 90;
-			this.grPnlLoad.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
-			this.grPnlLoad.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.grPnlLoad.Style.BorderBottomWidth = 1;
-			this.grPnlLoad.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
-			this.grPnlLoad.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.grPnlLoad.Style.BorderLeftWidth = 1;
-			this.grPnlLoad.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.grPnlLoad.Style.BorderRightWidth = 1;
-			this.grPnlLoad.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.grPnlLoad.Style.BorderTopWidth = 1;
-			this.grPnlLoad.Style.CornerDiameter = 4;
-			this.grPnlLoad.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
-			this.grPnlLoad.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
-			this.grPnlLoad.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
-			this.grPnlLoad.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
-			// 
-			// 
-			// 
-			this.grPnlLoad.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			// 
-			// 
-			// 
-			this.grPnlLoad.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.grPnlLoad.TabIndex = 14;
-			this.grPnlLoad.Text = "Load Options";
-			// 
-			// grPnlUse
-			// 
-			this.grPnlUse.BackColor = System.Drawing.Color.Transparent;
-			this.grPnlUse.CanvasColor = System.Drawing.SystemColors.Control;
-			this.grPnlUse.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
-			this.grPnlUse.Controls.Add(this.rbOnlyImported);
-			this.grPnlUse.Controls.Add(this.rbAll);
-			this.grPnlUse.Controls.Add(this.rbSetOnly);
-			this.grPnlUse.DisabledBackColor = System.Drawing.Color.Empty;
-			this.grPnlUse.Location = new System.Drawing.Point(15, 39);
-			this.grPnlUse.Name = "grPnlUse";
-			this.grPnlUse.Size = new System.Drawing.Size(181, 119);
-			// 
-			// 
-			// 
-			this.grPnlUse.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
-			this.grPnlUse.Style.BackColorGradientAngle = 90;
-			this.grPnlUse.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
-			this.grPnlUse.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.grPnlUse.Style.BorderBottomWidth = 1;
-			this.grPnlUse.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
-			this.grPnlUse.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.grPnlUse.Style.BorderLeftWidth = 1;
-			this.grPnlUse.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.grPnlUse.Style.BorderRightWidth = 1;
-			this.grPnlUse.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.grPnlUse.Style.BorderTopWidth = 1;
-			this.grPnlUse.Style.CornerDiameter = 4;
-			this.grPnlUse.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
-			this.grPnlUse.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
-			this.grPnlUse.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
-			this.grPnlUse.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
-			// 
-			// 
-			// 
-			this.grPnlUse.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			// 
-			// 
-			// 
-			this.grPnlUse.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.grPnlUse.TabIndex = 1;
-			this.grPnlUse.Text = "In Procedure(s)";
-			// 
-			// rbOnlyImported
-			// 
-			this.rbOnlyImported.AutoSize = true;
-			this.rbOnlyImported.BackColor = System.Drawing.Color.Transparent;
-			this.rbOnlyImported.Location = new System.Drawing.Point(12, 6);
-			this.rbOnlyImported.Name = "rbOnlyImported";
-			this.rbOnlyImported.Size = new System.Drawing.Size(142, 21);
-			this.superTooltip1.SetSuperTooltip(this.rbOnlyImported, new DevComponents.DotNetBar.SuperTooltipInfo("For Imported Only", "", "The changed UCF will only be used by the procedure(s) that are being imported.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
-			this.rbOnlyImported.TabIndex = 5;
-			this.rbOnlyImported.TabStop = true;
-			this.rbOnlyImported.Text = "For Imported Only";
-			this.rbOnlyImported.UseVisualStyleBackColor = false;
-			// 
-			// rbAll
-			// 
-			this.rbAll.AutoSize = true;
-			this.rbAll.BackColor = System.Drawing.Color.Transparent;
-			this.rbAll.Location = new System.Drawing.Point(12, 33);
-			this.rbAll.Name = "rbAll";
-			this.rbAll.RightToLeft = System.Windows.Forms.RightToLeft.No;
-			this.rbAll.Size = new System.Drawing.Size(69, 21);
-			this.superTooltip1.SetSuperTooltip(this.rbAll, new DevComponents.DotNetBar.SuperTooltipInfo("For All ", "", "The changed UCF will be used in all procedure(s) and section(s) within the databa" +
-            "se that referenced this UCF.  The one that existed in the database will be renam" +
-            "ed to \'Old N of UCFname\'.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
-			this.rbAll.TabIndex = 6;
-			this.rbAll.TabStop = true;
-			this.rbAll.Text = "For All";
-			this.rbAll.UseVisualStyleBackColor = false;
-			// 
-			// rbSetOnly
-			// 
-			this.rbSetOnly.AutoSize = true;
-			this.rbSetOnly.BackColor = System.Drawing.Color.Transparent;
-			this.rbSetOnly.Location = new System.Drawing.Point(12, 60);
-			this.rbSetOnly.Name = "rbSetOnly";
-			this.rbSetOnly.RightToLeft = System.Windows.Forms.RightToLeft.No;
-			this.rbSetOnly.Size = new System.Drawing.Size(108, 21);
-			this.superTooltip1.SetSuperTooltip(this.rbSetOnly, new DevComponents.DotNetBar.SuperTooltipInfo("For Set Only", "", "The changed UCF will only be used by the procedure(s)/sections(s) within the proc" +
-            "edure set that this procedure belongs.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
-			this.rbSetOnly.TabIndex = 7;
-			this.rbSetOnly.TabStop = true;
-			this.rbSetOnly.Text = "For Set Only";
-			this.rbSetOnly.UseVisualStyleBackColor = false;
-			// 
-			// cbUse
-			// 
-			this.cbUse.BackColor = System.Drawing.Color.Transparent;
-			// 
-			// 
-			// 
-			this.cbUse.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.cbUse.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.cbUse.Location = new System.Drawing.Point(17, 5);
-			this.cbUse.Name = "cbUse";
-			this.cbUse.Size = new System.Drawing.Size(125, 28);
-			this.cbUse.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-			this.superTooltip1.SetSuperTooltip(this.cbUse, new DevComponents.DotNetBar.SuperTooltipInfo("Use", "", "If checked, the changes will be used as defined In Procedure(s) below. Otherwise," +
-            " the format is loaded but not used.  ", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
-			this.cbUse.TabIndex = 0;
-			this.cbUse.Text = "Use";
-			this.cbUse.CheckedChanged += new System.EventHandler(this.cbUse_CheckedChanged);
-			// 
-			// lblLoadFormat
-			// 
-			// 
-			// 
-			// 
-			this.lblLoadFormat.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.lblLoadFormat.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.lblLoadFormat.Location = new System.Drawing.Point(124, 89);
-			this.lblLoadFormat.Name = "lblLoadFormat";
-			this.lblLoadFormat.Size = new System.Drawing.Size(94, 24);
-			this.superTooltip1.SetSuperTooltip(this.lblLoadFormat, new DevComponents.DotNetBar.SuperTooltipInfo("Load Format", "", "The User Control of Format changes will be loaded (imported) into the database. O" +
-            "therwise it will be ignored and the existing User Control of Format will be used" +
-            ".", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
-			this.lblLoadFormat.TabIndex = 13;
-			this.lblLoadFormat.Text = "Load Format";
-			// 
-			// sBtnLoad
-			// 
-			this.sBtnLoad.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.sBtnLoad.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.sBtnLoad.Location = new System.Drawing.Point(13, 88);
-			this.sBtnLoad.Name = "sBtnLoad";
-			this.sBtnLoad.Size = new System.Drawing.Size(102, 26);
-			this.sBtnLoad.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-			this.sBtnLoad.TabIndex = 12;
-			this.sBtnLoad.ValueChanged += new System.EventHandler(this.sBtnLoad_ValueChanged);
-			// 
-			// lblFmt
-			// 
-			this.lblFmt.AutoSize = true;
-			this.lblFmt.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.lblFmt.Location = new System.Drawing.Point(16, 19);
-			this.lblFmt.Name = "lblFmt";
-			this.lblFmt.Size = new System.Drawing.Size(140, 18);
-			this.lblFmt.TabIndex = 8;
-			this.lblFmt.Text = "Changes to Format:";
-			// 
-			// pnlXmlDiff
-			// 
-			this.pnlXmlDiff.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-			this.pnlXmlDiff.Controls.Add(this.wbBrwsExisting);
-			this.pnlXmlDiff.Controls.Add(this.splitterWebBrowsers);
-			this.pnlXmlDiff.Controls.Add(this.pnlWbBrwsImp);
-			this.pnlXmlDiff.Location = new System.Drawing.Point(255, 0);
-			this.pnlXmlDiff.Name = "pnlXmlDiff";
-			this.pnlXmlDiff.Size = new System.Drawing.Size(548, 601);
-			this.pnlXmlDiff.TabIndex = 8;
-			// 
-			// wbBrwsExisting
-			// 
-			this.wbBrwsExisting.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.wbBrwsExisting.Location = new System.Drawing.Point(0, 0);
-			this.wbBrwsExisting.MinimumSize = new System.Drawing.Size(20, 20);
-			this.wbBrwsExisting.Name = "wbBrwsExisting";
-			this.wbBrwsExisting.Size = new System.Drawing.Size(548, 298);
-			this.wbBrwsExisting.TabIndex = 0;
-			// 
-			// splitterWebBrowsers
-			// 
-			this.splitterWebBrowsers.Dock = System.Windows.Forms.DockStyle.Bottom;
-			this.splitterWebBrowsers.Location = new System.Drawing.Point(0, 298);
-			this.splitterWebBrowsers.Name = "splitterWebBrowsers";
-			this.splitterWebBrowsers.Size = new System.Drawing.Size(548, 3);
-			this.splitterWebBrowsers.TabIndex = 2;
-			this.splitterWebBrowsers.TabStop = false;
-			// 
-			// pnlWbBrwsImp
-			// 
-			this.pnlWbBrwsImp.Controls.Add(this.wbBrwsImporting);
-			this.pnlWbBrwsImp.Dock = System.Windows.Forms.DockStyle.Bottom;
-			this.pnlWbBrwsImp.Location = new System.Drawing.Point(0, 301);
-			this.pnlWbBrwsImp.Name = "panel1";
-			this.pnlWbBrwsImp.Size = new System.Drawing.Size(548, 300);
-			this.pnlWbBrwsImp.TabIndex = 3;
-			// 
-			// wbBrwsImporting
-			// 
-			this.wbBrwsImporting.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.wbBrwsImporting.Location = new System.Drawing.Point(0, 0);
-			this.wbBrwsImporting.MinimumSize = new System.Drawing.Size(20, 20);
-			this.wbBrwsImporting.Name = "wbBrwsImporting";
-			this.wbBrwsImporting.Size = new System.Drawing.Size(548, 300);
-			this.wbBrwsImporting.TabIndex = 0;
-			// 
-			// superTooltip1
-			// 
-			this.superTooltip1.DefaultTooltipSettings = new DevComponents.DotNetBar.SuperTooltipInfo("", "", "", null, null, DevComponents.DotNetBar.eTooltipColor.Gray);
-			this.superTooltip1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
-			// 
-			// dlgUCFImportOptions
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(803, 606);
-			this.Controls.Add(this.pnlXmlDiff);
-			this.Controls.Add(this.pnlChoices);
-			this.Name = "dlgUCFImportOptions";
-			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-			this.Text = "User Control Of Format - Import Options";
-			this.pnlChoices.ResumeLayout(false);
-			this.pnlChoices.PerformLayout();
-			this.grPnlLoad.ResumeLayout(false);
-			this.grPnlUse.ResumeLayout(false);
-			this.grPnlUse.PerformLayout();
-			this.pnlXmlDiff.ResumeLayout(false);
-			this.pnlWbBrwsImp.ResumeLayout(false);
-			this.ResumeLayout(false);
-
-		}
-
-		#endregion
-
-		private System.Windows.Forms.Button btnOk;
-		private System.Windows.Forms.Button btnCancel;
-		private System.Windows.Forms.Panel pnlOptions;
-		private System.Windows.Forms.Panel pnlXmlDiff;
-		private System.Windows.Forms.WebBrowser wbBrwsExisting;
-		private System.Windows.Forms.Panel pnlChoices;
-		private System.Windows.Forms.Label lblFmt;
-		private DevComponents.DotNetBar.LabelX lblLoadFormat;
-		private DevComponents.DotNetBar.Controls.SwitchButton sBtnLoad;
-		private DevComponents.DotNetBar.Controls.GroupPanel grPnlLoad;
-		private DevComponents.DotNetBar.Controls.GroupPanel grPnlUse;
-		private DevComponents.DotNetBar.Controls.CheckBoxX cbUse;
-		private System.Windows.Forms.RadioButton rbOnlyImported;
-		private System.Windows.Forms.RadioButton rbAll;
-		private System.Windows.Forms.RadioButton rbSetOnly;
-		private DevComponents.DotNetBar.SuperTooltip superTooltip1;
-		private DevComponents.DotNetBar.Controls.ComboBoxEx cmbFNames;
-		private System.Windows.Forms.Splitter splitterWebBrowsers;
-		private System.Windows.Forms.Panel pnlWbBrwsImp;
-		private System.Windows.Forms.WebBrowser wbBrwsImporting;
-	}
-}

PROMS/Volian.Controls.Library/dlgUCFImportOptions.cs

@@ -1,183 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
-using System.Xml;
-using System.Xml.Linq;
-using System.Xml.Xsl;
-using System.IO;
-using VEPROMS.CSLA.Library;
-
-namespace Volian.Controls.Library
-{
-	// This dialog is used when the imported UCF is different than one existing in the database.  It allows the user to 
-	// select whether to overwrite, copy, etc.  See the user interface project/dlgExportImport.cs for the options.
-	public partial class dlgUCFImportOptions : Form
-	{
-		List<string>ExistingFC;
-		List<string>ImportedFC;
-		private bool _Initializing = false;
-		public E_UCFImportOptions UCFImportOptionsCase = E_UCFImportOptions.LoadOnlyImported;
-		public dlgUCFImportOptions(List<string> name, List<string> existingFC, List<string> importedFC, E_UCFImportOptions defImpOpt, string xmlpath)
-		{
-			_Initializing = true;
-			InitializeComponent();
-			InitializeFNamesCombo(name);
-			ExistingFC = existingFC;
-			ImportedFC = importedFC;
-			cmbFNames.SelectedIndex = 0;		// this displays the web browser differences for first name in the combo box.
-
-			// initialize the import of UCF option radio buttons:
-			UCFImportOptionsCase = defImpOpt;
-			rbSetOnly.Visible = !xmlpath.ToLower().Contains("folder");
-			if (defImpOpt == E_UCFImportOptions.Ignore)
-			{
-				sBtnLoad.Value = false;
-				grPnlLoad.Enabled = false;
-				grPnlUse.Enabled = false;
-			}
-			else if (defImpOpt == E_UCFImportOptions.LoadNotUsed)
-			{
-				sBtnLoad.Value = true;
-				grPnlLoad.Enabled = true;
-				cbUse.Checked = false;
-				grPnlUse.Enabled = false;
-			}
-			else if (defImpOpt == E_UCFImportOptions.LoadOnlyImported)
-			{
-				sBtnLoad.Value = true;
-				grPnlLoad.Enabled = true;
-				cbUse.Checked = true;
-				grPnlUse.Enabled = true;
-				rbOnlyImported.Checked = true;
-			}
-			else if (defImpOpt == E_UCFImportOptions.LoadUseAll)
-			{
-				sBtnLoad.Value = true;
-				grPnlLoad.Enabled = true;
-				cbUse.Checked = true;
-				grPnlUse.Enabled = true;
-				rbAll.Checked = true;
-			}
-			else if (defImpOpt == E_UCFImportOptions.LoadForSetOnly)
-			{
-				sBtnLoad.Value = true;
-				grPnlLoad.Enabled = true;
-				cbUse.Checked = true;
-				grPnlUse.Enabled = true;
-				rbSetOnly.Checked = true;
-			}
-			_Initializing = false;
-			return;
-		}
-
-		private void InitializeFNamesCombo(List<string> name)
-		{
-			foreach (string str in name)
-				cmbFNames.Items.Add(str);
-		}
-
-		private void DisplayXmlDiff(string existingFC, string importedFC)
-		{
-			XmlDocument xd = new XmlDocument();
-			xd.LoadXml(existingFC);
-			XmlNodeList xnl = xd.GetElementsByTagName("FormatConfig");
-			if (xnl != null && xnl.Count > 0) AddAttribute(xnl[0], "Version", "Existing");
-			string sXSLSummary = System.IO.File.ReadAllText(Application.StartupPath + "\\" + "UCFImpDetails.xsl");
-			StringWriter sw = new StringWriter();
-			StringWriter xsw = new StringWriter();
-			using (XmlReader xrt = XmlReader.Create(new StringReader(sXSLSummary)))
-			{
-				XmlTextWriter tx = new XmlTextWriter(xsw);
-				xd.WriteTo(tx);
-				string tmp = sw.ToString();
-				tmp = xd.InnerXml;
-				using (XmlReader xri = XmlReader.Create(new StringReader(tmp)))
-				{
-					using (XmlWriter xwo = XmlWriter.Create(sw))
-					{
-						XslCompiledTransform xsl = new XslCompiledTransform();
-						xsl.Load(xrt);
-						xsl.Transform(xri, xwo); // Perform Transform
-					}
-					wbBrwsExisting.DocumentText = sw.ToString();
-				}
-			}
-			StringWriter sw1 = new StringWriter();
-			StringWriter xsw1 = new StringWriter();
-			XmlDocument xd1 = new XmlDocument();
-			xd1.LoadXml(importedFC);
-			xnl = xd1.GetElementsByTagName("FormatConfig");
-			if (xnl != null && xnl.Count > 0) AddAttribute(xnl[0], "Version", "Importing");
-			using (XmlReader xrt = XmlReader.Create(new StringReader(sXSLSummary)))
-			{
-				XmlTextWriter tx = new XmlTextWriter(xsw1);
-				xd1.WriteTo(tx);
-				string tmp = xd1.InnerXml;
-				using (XmlReader xri = XmlReader.Create(new StringReader(tmp)))
-				{
-					using (XmlWriter xwo = XmlWriter.Create(sw1))
-					{
-						XslCompiledTransform xsl = new XslCompiledTransform();
-						xsl.Load(xrt);
-						xsl.Transform(xri, xwo); // Perform Transform
-					}
-					wbBrwsImporting.DocumentText = sw1.ToString();
-				}
-			}
-		}
-
-		private void AddAttribute(XmlNode xn, string name, string value)
-		{
-			XmlAttribute xa = xn.OwnerDocument.CreateAttribute(name);
-			xa.Value = value.ToString();
-			xn.Attributes.Append(xa);
-		}
-		private void btnOk_Click(object sender, EventArgs e)
-		{
-			if (!sBtnLoad.Value) UCFImportOptionsCase = E_UCFImportOptions.Ignore;
-			else if (!cbUse.Checked) UCFImportOptionsCase = E_UCFImportOptions.LoadNotUsed;
-			else if (rbOnlyImported.Checked) UCFImportOptionsCase = E_UCFImportOptions.LoadOnlyImported;
-			else if (rbAll.Checked) UCFImportOptionsCase = E_UCFImportOptions.LoadUseAll;
-			else if (rbSetOnly.Checked) UCFImportOptionsCase = E_UCFImportOptions.LoadForSetOnly;
-			this.Close();
-		}
-
-		private void sBtnLoad_ValueChanged(object sender, EventArgs e)		// Import options for UCF Change: Load switch button
-		{
-			if (_Initializing) return;
-			if (sBtnLoad.Value)
-			{
-				grPnlLoad.Enabled = true;		// Import the ucf change. let user select whether to use it.
-				grPnlUse.Enabled = false;
-				cbUse.Checked = false;
-			}
-			else
-			{
-				grPnlLoad.Enabled = false;		// Don't import the ucf change.
-				grPnlUse.Enabled = false;
-			}
-		}
-
-		private void cbUse_CheckedChanged(object sender, EventArgs e)		// Import options for UCF Change: use checkbox
-		{
-			if (_Initializing) return;
-			if (cbUse.Checked)
-				grPnlUse.Enabled = true;		// Use the change.  enable the load group & select for imported only
-			else
-				grPnlUse.Enabled = false;		// Don't use the change.
-		}
-
-		private void cmbFNames_SelectedIndexChanged(object sender, EventArgs e)
-		{
-			int indx = cmbFNames.SelectedIndex;
-			string existingFC = ExistingFC[indx];
-			string importedFC = ImportedFC[indx];
-			DisplayXmlDiff(existingFC, importedFC);
-		}
-	}
-}

PROMS/Volian.Controls.Library/frmEPAnnotationDetails.cs

@@ -120,7 +120,7 @@ namespace Volian.Controls.Library
                     foreach (string t in tmps) cmb.Items.Add(t.Trim());
                     string val = MyConfig.GetValue("EP", EP.name);
                     if (val != null && val != "") cmb.SelectedItem = val;
-					cmb.DropDownWidth = TextRenderer.MeasureText(tmps.OrderByDescending(x => x.Length).First(), cmb.Font).Width + SystemInformation.VerticalScrollBarWidth;
+					cmb.DropDownWidth = TextRenderer.MeasureText(tmps.OrderByDescending(x => x.Length).FirstOrDefault(), cmb.Font).Width + SystemInformation.VerticalScrollBarWidth;
 					cmb.Width = cmb.DropDownWidth;
 					_DicComboBox.Add(EP.name, cmb);
 					panelEP.Controls.Add(cmb, 1, panelEP.RowCount - 1);
@@ -135,7 +135,7 @@ namespace Volian.Controls.Library
 					cmb.ValueMember = "Value";
 					cmb.DataSource = tmps;
 					cmb.DropDownStyle = ComboBoxStyle.DropDownList;
-					cmb.DropDownWidth = TextRenderer.MeasureText(tmps.OrderByDescending(x => x.Text.Length).First().Text, cmb.Font).Width + SystemInformation.VerticalScrollBarWidth;
+					cmb.DropDownWidth = TextRenderer.MeasureText(tmps.OrderByDescending(x => x.Text.Length).FirstOrDefault()?.Text, cmb.Font).Width + SystemInformation.VerticalScrollBarWidth;
 					cmb.Width = cmb.DropDownWidth;
 
 					_DicSingleRO.Add(EP.name, cmb);
@@ -148,7 +148,7 @@ namespace Volian.Controls.Library
 					List<ROListItem> tmps = EP.getROList(currAnn, false);
 					lb.DisplayMember = "Text";
 					lb.ValueMember = "Value";
-					lb.Width = TextRenderer.MeasureText(tmps.OrderByDescending(x => x.Text.Length).First().Text, lb.Font).Width + SystemInformation.VerticalScrollBarWidth;
+					lb.Width = TextRenderer.MeasureText(tmps.OrderByDescending(x => x.Text.Length).FirstOrDefault()?.Text, lb.Font).Width + SystemInformation.VerticalScrollBarWidth;
 
 					lb.DataSource = tmps;
 					_DicMultiRO.Add(EP.name, lb);

PROMS/Volian.Controls.Library/vlnTreeView.cs

@@ -152,6 +152,15 @@ namespace Volian.Controls.Library
 			get { return _Index; }
 			set { _Index = value; }
 		}
+
+		//C2025-024 Electronic Procedures - Phase 2 (PROMS XML output)
+		//AnnotationType that would be doing an export for
+		private int _AnnotationTypeId = -1;
+		public int AnnotationTypeId
+		{
+			get { return _AnnotationTypeId; }
+			set { _AnnotationTypeId = value; }
+		}
 		//jcb multiunit
 		private string _Unit;
 		public string Unit
@@ -179,6 +188,13 @@ namespace Volian.Controls.Library
 			_Destination = destination;
 			_Index = index;
 		}
+		public vlnTreeEventArgs(TreeNode node, TreeNode destination, int index, int annTypeId)
+		{
+			_Node = node;
+			_Destination = destination;
+			_Index = index;
+			_AnnotationTypeId = annTypeId;
+		}
 		//jcb multiunit
 		public vlnTreeEventArgs(TreeNode node, TreeNode destination, int index, string unit, int unitIndex)
 		{
@@ -188,6 +204,15 @@ namespace Volian.Controls.Library
 			_Unit = unit;
 			_UnitIndex = unitIndex;
 		}
+		public vlnTreeEventArgs(TreeNode node, TreeNode destination, int index, string unit, int unitIndex, int annTypeId)
+		{
+			_Node = node;
+			_Destination = destination;
+			_Index = index;
+			_Unit = unit;
+			_UnitIndex = unitIndex;
+			_AnnotationTypeId = annTypeId;
+		}
 		//end jcb multiunit
 		#endregion
 		public override string ToString()
@@ -573,11 +598,6 @@ namespace Volian.Controls.Library
 		{
 			if (ProcedureCheckedOutTo != null) ProcedureCheckedOutTo(sender, args);
 		}
-
-
-
-
-
 		public event vlnTreeViewEvent ExportImportProcedureSets;
 		private void OnExportImportProcedureSets(object sender, vlnTreeEventArgs args)
 		{
@@ -711,7 +731,10 @@ namespace Volian.Controls.Library
 						if (ui.IsAdministrator() || ui.IsSetAdministrator(fi))// && fi.MyParent == null) //VEPROMS level
 						{
 							if (fi.HasWorkingDraft)
+							{
 								cm.MenuItems.Add("Export Procedure Set", new EventHandler(mi_Click));
+								//AddEPExport(cm.MenuItems, 0, null);
+							}
 							else
 								cm.MenuItems.Add("Import Procedure Set", new EventHandler(mi_Click));
 							if (DoSpecificInfo)
@@ -847,6 +870,9 @@ namespace Volian.Controls.Library
 						if (ui.IsAdministrator() || ui.IsSetAdministrator(pri.MyDocVersion))
 						{
 							cm.MenuItems.Add("Export Procedure", mi_Click);
+							//C2025-024 Proms XML Output - if have any EP Format files, add dropdown menu for exporting EP formats
+							if (pri.ActiveFormat.PlantFormat.EPFormatFiles.Count > 0)
+								AddEPExport(cm.MenuItems, pri.MyDocVersion.MultiUnitCount, pri.MyDocVersion.UnitNames, pri.ActiveFormat.PlantFormat.EPFormatFiles);
 						}
 						if (ui.IsAdministrator() || ui.IsSetAdministrator(pri.MyDocVersion) || ui.IsWriter(pri.MyDocVersion))
 						{
@@ -871,6 +897,7 @@ namespace Volian.Controls.Library
 								MenuItem miqp = new MenuItem("Quick Print");
 								//MenuItem mips = new MenuItem("Print Section");
 								MenuItem mia = new MenuItem("Approve");
+
 								int k = 0;
 								foreach (string s in pri.MyDocVersion.UnitNames)
 								{
@@ -1359,6 +1386,43 @@ namespace Volian.Controls.Library
 			}
 		}
 
+		//C2025-024 Electronic Procedures - Phase 2 (PROMS XML output)
+		// Add context menu for exporting Electronic Procedures
+		// if has an Electronic procedure
+		// then loop through and add an Export for each EP Viewer
+		private void AddEPExport(Menu.MenuItemCollection menuItems, int MultiUnitCount, string[] UnitNames, EPFormatFiles EPFiles)
+		{
+			//add outer menu
+			MenuItem mi = menuItems.Add("Electronic Procedure Viewer Export");
+			foreach (EPFormatFile epAnnType in EPFiles)
+			{
+
+				//Add item for each individual EP Viewer
+				MenuItem mv = mi.MenuItems.Add(epAnnType.AnnotationName());
+
+				//tag will be of format:
+				//{EP Annotation Type ID},{Unit}
+				//if not multi-unit, unit will be zero.
+				if (MultiUnitCount > 1)
+				{
+					//if multi-unit, add menu item for each unit
+					int k = 0;
+					foreach (string s in UnitNames)
+					{
+						k++;
+						MenuItem multiunit_mv = mv.MenuItems.Add(s);
+						multiunit_mv.Tag = $"{epAnnType.AnnotationTypeID},{k}";
+						multiunit_mv.Click += new EventHandler(miEP_Click);
+					}
+				}
+				else
+				{
+					mv.Tag = $"{epAnnType.AnnotationTypeID},0";
+					mv.Click += new EventHandler(miEP_Click);
+				}
+			}
+		}
+
 		private void AddApprovedRevisionsMultiUnit(Menu.MenuItemCollection menuItemCollection, ProcedureInfo pri)
 		{
 			_currentPri = pri;
@@ -1542,6 +1606,27 @@ namespace Volian.Controls.Library
 			FlexibleMessageBox.Show("Approved procedure saved to import file " + fileName, "Creating Export of Approved Procedure", MessageBoxButtons.OK, MessageBoxIcon.Information);
 		}
 
+		//C2025-015 Get a partial folder path. This will be used in building the PDF file name when viewing Approved procedures
+		string ProcFolderPathforApprovedPDF(string fullPath)
+		{
+			string rtnStr = "";
+			try
+			{
+				// the fullPath string that is passed in ends with the Working Draft node. We want to trim that off
+				string[] strParts = fullPath.Substring(0, fullPath.LastIndexOf("\\")).Split('\\'); //fullPath.Replace("\\Working Draft","").Split('\\');
+				int lastPart = Math.Max(strParts.Length - 1, 0);
+				rtnStr = strParts[lastPart];
+				if (rtnStr.ToUpper().StartsWith("UNIT"))
+				{
+					rtnStr = strParts[lastPart - 1] + "_" + rtnStr;
+				}
+			}
+			catch
+			{
+				rtnStr = fullPath.Replace("\\", "_"); // just return the full path with _ intead of backslashes
+			}
+			return rtnStr;
+		}
 
 		void ApprovedRevision_Click(object sender, EventArgs e)
 		{
@@ -1555,7 +1640,10 @@ namespace Volian.Controls.Library
 				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" : "");
+			ProcedureInfo prcInfo = ProcedureInfo.Get(ri.ItemID);
+			// C2025-015 build a file name that includes a partial folder path and approved revision number
+			string approvedPDFName = string.Format("{0}_{1} Revision {2}", ProcFolderPathforApprovedPDF(prcInfo.SearchDVPath_clean), prcInfo.PDFNumber,ri.RevisionNumber);
+			vlnTreeViewPdfArgs args = new vlnTreeViewPdfArgs(Volian.Base.Library.TmpFile.CreateFileName(approvedPDFName), ri.LatestVersion.PDF, superceded ? "Superceded" : "");
 			OnViewPDF(sender, args);
 			//			System.Diagnostics.Process pp = System.Diagnostics.Process.Start(GetDocPdf(ri, superceded));
 		}
@@ -1564,6 +1652,7 @@ namespace Volian.Controls.Library
 			bool superceded = false;
 			MenuItem mi = sender as MenuItem;
 			if (mi == null) return;
+			string childName = "";
 			//RevisionInfo ri = mi.Tag as RevisionInfo;
 			RevisionInfo ri = RevisionInfo.Get(int.Parse(mi.Tag.ToString()));
 			{
@@ -1571,12 +1660,22 @@ namespace Volian.Controls.Library
 				//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)
 					superceded = true;
+			// C2025_015 get the child's name to append to file name
+				mip = mip.Parent as MenuItem;
+				if (mip != null)
+				{
+					childName = "_"  + mip.Text;
+				}
 			}
 			ItemInfo ii = ItemInfo.Get(ri.ItemID);
 			ii.MyDocVersion.DocVersionConfig.SelectedSlave = ri.MyConfig.Applicability_Index;
-			vlnTreeViewPdfArgs args = new vlnTreeViewPdfArgs(Volian.Base.Library.TmpFile.CreateFileName(ProcedureInfo.Get(ri.ItemID).PDFNumber), ri.LatestVersion.PDF, superceded ? "Superceded" : "");
+			ProcedureInfo prcInfo = ProcedureInfo.Get(ri.ItemID);
+			if (prcInfo.MyContent.Number.ToUpper().Contains("<U") || ii.MyDocVersion.DocVersionConfig.Unit_ProcedureNumber.Contains("#"))
+				childName = ""; // unit identification already part of procedure number-no need to add the child name to the PDF file name
+			// C2025-015 build a file name that includes a partial folder path, the child name and approved revision number
+			string approvedPDFName = string.Format("{0}{1}_{2} Revision {3}", ProcFolderPathforApprovedPDF(prcInfo.SearchDVPath_clean),childName, prcInfo.PDFNumber, ri.RevisionNumber);
+			vlnTreeViewPdfArgs args = new vlnTreeViewPdfArgs(Volian.Base.Library.TmpFile.CreateFileName(approvedPDFName), ri.LatestVersion.PDF, superceded ? "Superceded" : "");
 			OnViewPDF(sender, args);
-			//			System.Diagnostics.Process pp = System.Diagnostics.Process.Start(GetDocPdf(ri, superceded));
 		}
 		void SummaryOfChanges_Click(object sender, EventArgs e)
 		{
@@ -2255,6 +2354,23 @@ namespace Volian.Controls.Library
 					break;
 			}
 		}
+
+		//C2025-024 Electronic Procedures - Phase 2 (PROMS XML output)
+		// Handles clicking of items in the context menu
+		// for exporting Electronic Procedures
+		//   tag will be of format:
+		//   {EP Annotation Type ID},{Unit}
+		//   if not multi-unit, unit will be zero.
+		void miEP_Click(object sender, EventArgs e)
+		{
+			MenuItem mi = sender as MenuItem;
+			int annTypeid = int.Parse(((string)mi.Tag).Split(',')[0]);
+			int unit = int.Parse(((string)mi.Tag).Split(',')[1]);
+			if (unit == 0)
+				OnExportImportProcedureSets(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0, annTypeid));
+			else
+				OnExportImportProcedureSets(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0, "", unit, annTypeid));
+		}
 		private bool _doingCollapseNode = false; // B2016-058 when collapse is done, it always calls the drag node event which doesn't appear to be needed
 		private void CollapseProcedures()
 		{

PROMS/Volian.Print.Library/PDFReport.cs

@@ -1688,7 +1688,7 @@ namespace Volian.Print.Library
 			System.Windows.Forms.MessageBox.Show(msg.ToString(), "Error during PDF creation for search:", System.Windows.Forms.MessageBoxButtons.OK, System.Windows.Forms.MessageBoxIcon.Exclamation);
 		}
 
-		private static string BuildStepTab(ItemInfo item)
+		public static string BuildStepTab(ItemInfo item)
 		{
 			if (item == null)
 				return string.Empty;

PROMS/Volian.Print.Library/vlnParagraph.cs

@@ -4458,12 +4458,6 @@ namespace Volian.Print.Library
 							xloc_co = XOffset + (relX > 0 ? Width : 0) + relX;
 						}
 					}
-					// if there is ucf value for adjusting the alignment for checkoffs, use it:
-					FormatConfig fc = PlantFormat.GetFormatConfig(formatInfo);
-					if (fc != null && fc.PlantFormat.FormatData.CheckOffXOffAdj != null)
-					{
-						if (co.Index > 99) xloc_co += ((float)fc.PlantFormat.FormatData.CheckOffXOffAdj * 72);
-					}
 
 					// CheckOffXtraLines was introduced for the additional lines needed for the longer signoffs
 					// for VCBA (&WST1), for F2016-061.
@@ -5215,7 +5209,7 @@ namespace Volian.Print.Library
 
 			// First see if there is any checkoff data in the format file and that there
 			// is a pagelist item for the checkoff header.
-			int maxindx = itemInfo.ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffUCF ? itemInfo.ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffData.CheckOffList.MaxIndex : itemInfo.ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffData.CheckOffList.MaxIndexNoInherit;
+			int maxindx = itemInfo.ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffData.CheckOffList.MaxIndexNoInherit;
 			if (maxindx <= 0) return;
 			if (MyPageHelper.PageListCheckOffHeader == null) return;