C2024-036 Add Filtering ability to the main PROMS procedure tree.

Typing a procedure number or title into the search box and pressing enter/clicking the tree view search button will down base the PROMS procedure tree to matching procedures/folders.

PROMS/ReferencedObjects/LibSource/RODBInterface/VlnXml.cs

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

@@ -14765,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];
@@ -14981,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];
@@ -18917,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
 	==========================================================================================================
 	*/
@@ -18936,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'
@@ -24377,8 +24264,8 @@ BEGIN TRY -- Try Block
 	DECLARE @RevDate varchar(255)
 	DECLARE @RevDescription varchar(255)
 
-	set @RevDate = '08/13/2025 8:07 AM'
+	set @RevDate = '08/18/2025 2:07 PM'
-	set @RevDescription = 'Improve Performance loading procedures with Alarms'
+	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" />
@@ -226,6 +224,12 @@
     <Compile Include="dlgPickROFolder.designer.cs">
       <DependentUpon>dlgPickROFolder.cs</DependentUpon>
     </Compile>
+    <Compile Include="dlgPrintAllApprovedProcedures.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="dlgPrintAllApprovedProcedures.Designer.cs">
+      <DependentUpon>dlgPrintAllApprovedProcedures.cs</DependentUpon>
+    </Compile>
     <Compile Include="DlgPrintProcedure.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -244,12 +248,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>
@@ -268,6 +266,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>
@@ -298,12 +302,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>
@@ -367,6 +365,9 @@
     <EmbeddedResource Include="dlgImpHowToHandleROs.resx">
       <DependentUpon>dlgImpHowToHandleROs.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="dlgPrintAllApprovedProcedures.resx">
+      <DependentUpon>dlgPrintAllApprovedProcedures.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="DlgPrintProcedure.resx">
       <DependentUpon>DlgPrintProcedure.cs</DependentUpon>
       <SubType>Designer</SubType>
@@ -374,12 +375,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>
@@ -395,9 +396,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>
@@ -505,6 +503,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>
@@ -595,8 +594,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/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, selectedSlave); // "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/dlgExportImport.cs

@@ -7,7 +7,7 @@ using Volian.Controls.Library;
 using Volian.Base.Library;
 using System.Xml;
 using System.IO;
-using Ionic.Zip;
+using System.IO.Compression;
 using System.Text.RegularExpressions;
 using JR.Utils.GUI.Forms;
 using System.Linq;
@@ -75,9 +75,8 @@ namespace VEPROMS
 			xa.InnerText = value;
 			return xa;
 		}
-		public dlgExportImport(string mode, FolderInfo folderInfo, frmVEPROMS myFrmVEPROMS, E_UCFImportOptions frset, int unitIndex = 0)
+		public dlgExportImport(string mode, FolderInfo folderInfo, frmVEPROMS myFrmVEPROMS, int unitIndex = 0)
 		{
-			UCFImportDefaultFromSettings = frset;
 			MyFrmVEPROMS = myFrmVEPROMS;// Save frmVEPROMS for Import to shutoff SessionPing
 			_MyMode = mode;
 			MyFolder = folderInfo;
@@ -97,9 +96,8 @@ namespace VEPROMS
 				FormClosed += RemoveUnit_OnClose;
 			}
 		}
-		public dlgExportImport(string mode, DocVersionInfo docVersionInfo, frmVEPROMS myFrmVEPROMS, E_UCFImportOptions frset, int unitIndex = 0)
+		public dlgExportImport(string mode, DocVersionInfo docVersionInfo, frmVEPROMS myFrmVEPROMS, int unitIndex = 0)
 		{
-			UCFImportDefaultFromSettings = frset;
 			MyFrmVEPROMS = myFrmVEPROMS;// Save frmVEPROMS for Import to shutoff SessionPing
 			_MyMode = mode;
 			MyDocVersion = docVersionInfo;
@@ -120,9 +118,8 @@ namespace VEPROMS
 				FormClosed += RemoveUnit_OnClose;
 			}
 		}
-		public dlgExportImport(string mode, ProcedureInfo procedureInfo, frmVEPROMS myFrmVEPROMS, E_UCFImportOptions frset, int unitIndex = 0)
+		public dlgExportImport(string mode, ProcedureInfo procedureInfo, frmVEPROMS myFrmVEPROMS, int unitIndex = 0)
 		{
-			UCFImportDefaultFromSettings = frset;
 			MyFrmVEPROMS = myFrmVEPROMS;// Save frmVEPROMS for Import to shutoff SessionPing
 			_MyMode = mode;
 			MyProcedure = procedureInfo;
@@ -188,14 +185,13 @@ namespace VEPROMS
 			if (MyFolder != null)
 			{
 				sfd.FileName = string.Format("{0}-{1}.expx", Database.ActiveDatabase, MyFolder.Name);
-                if (sfd.ShowDialog(this) == DialogResult.OK && sfd.FileName != string.Empty)
+				if (sfd.ShowDialog(this) == DialogResult.OK && sfd.FileName != string.Empty)
-                {
+				{
-                    txtExport.Text = sfd.FileName;
+					txtExport.Text = sfd.FileName;
-                    if (File.Exists(txtExport.Text))
+					if (File.Exists(txtExport.Text))
-                        File.Delete(txtExport.Text);
+						File.Delete(txtExport.Text);
-                    MyExpxZipFile = new ZipFile(txtExport.Text, Encoding.UTF8);
+					MyExpZipFileName = txtExport.Text;
-                    MyExpxZipFile.Save();
+				}
-                }
             }
 			else if (MyProcedure != null)
 			{
@@ -211,8 +207,8 @@ namespace VEPROMS
 			else
 				lblExportStatus.Text = "Awaiting Export File Name:";
 		}
-		private ZipFile MyExpxZipFile = null;
+		private string MyExpZipFileName = null;
-		private ZipFile MyImpxZipFile = null;
+		private string MyImpZipFileName = null;
 		private DateTime MyStart;
 		private bool successfullExport = true;
 
@@ -724,28 +720,9 @@ namespace VEPROMS
 				ImportProcedureNew(xd);
 				isImported = true;
 			}
-			if (isImported && UCFImportCase == E_UCFImportOptions.LoadForSetOnly) UpdateFormatForUCFInSet();
 			return true;// Import Suceeded
 		}
-		private void UpdateFormatForUCFInSet()
+
-		{
-			// this gets called if the UCFImportCase == LoadForSetOnly, i.e. only items in this PROCEDURE Set whose formats point to a
-			// UCF format should point to the updated (copied) UCF format.
-			if (renamedUCFFormatId == null) return;
-			foreach (int key in renamedUCFFormatId.Keys)
-			{
-				using (ContentInfoList cil = ContentInfoList.FixFormatIDAfterImport(MyDocVersion.VersionID.ToString(), renamedUCFFormatId[key], key))
-				{
-					foreach (ContentInfo ci in cil)
-					{
-						using (Content c = ci.Get())
-						{
-							ContentInfo.Refresh(c);
-						}
-					}
-				}
-			}
-		}
 		// Added Error Handling to assure that Change Manager is turned-on regardless of success or failure of the import
 		// B2019-046: improved error handling (added return value & error message)
 		private bool TryToLoadImportDataDocument()
@@ -892,84 +869,95 @@ namespace VEPROMS
 		}
 		private bool LoadImportDataDocument()
 		{
-			floatFoldout = new Dictionary<int, int>();
+			using (FileStream zipToOpen = new FileStream(MyExpZipFileName, FileMode.OpenOrCreate))
-			ZipEntry ze = MyExpxZipFile[0];
-			string fn = PEIPath + @"\" + ze.FileName;
-			ze.Extract(PEIPath, ExtractExistingFileAction.OverwriteSilently);
-			XmlDocument xd = new XmlDocument();
-			xd.Load(fn);
-			bool didImp = LoadFormats(xd, "folder/formats/format");
-			if (!didImp)
 			{
-				this.Cursor = Cursors.Default;
+				using (ZipArchive MyExpxZipFile = new ZipArchive(zipToOpen, ZipArchiveMode.Update))
-				this.btnImport.Enabled = true; // allow user to select a different export file to import
-				this.btnDoImport.Enabled = true; // allow user to change mind and perform the import
-				return false; // Return False to Indicate that the Import did not succeed
-			}
-			string name = xd.DocumentElement.Attributes.GetNamedItem("name").InnerText;
-			Folder ff = AddFolder(Folder.Get(MyFolder.FolderID), xd, name);
-			if (ff == null)
-			{
-				// C2020-032: Import Procedure set when existing name exists, allow user to import with 'Copy (#) of'. 
-				//	This is similar functionality to the import of a procedure without the overwrite part.
-				string msg = string.Format("The procedure set you are importing, {0}, already exists.\n\nDo you want to import {0} as a COPY of the existing set?\n\nThis will prefix the name with \"Copy (#) of\"", name);
-				DialogResult dr = MessageBox.Show(this, msg, "Create Copy Of Existing Procedure Set", MessageBoxButtons.OKCancel, MessageBoxIcon.Stop);
-				if (dr == DialogResult.OK)
 				{
-					string number = "";
+					floatFoldout = new Dictionary<int, int>();
-					int max = -1;
+					ZipArchiveEntry ze = MyExpxZipFile.Entries[0];
-					// get maximum number of existing copies.
+					if (!Directory.Exists(Path.Combine(PEIPath, "folder")))
-					foreach (FolderInfo fi in MyFolder.ChildFolders)
+						Directory.CreateDirectory(Path.Combine(PEIPath, "folder"));
+					string fn = Path.Combine(PEIPath, "folder", ze.Name);
+					ze.ExtractToFile(fn, true);
+					XmlDocument xd = new XmlDocument();
+					xd.Load(fn);
+					bool didImp = LoadFormats(xd, "folder/formats/format");
+					if (!didImp)
 					{
-						int indx = fi.Name.IndexOf("Copy (");
+						this.Cursor = Cursors.Default;
-						if (indx > -1)
+						this.btnImport.Enabled = true; // allow user to select a different export file to import
-						{
+						this.btnDoImport.Enabled = true; // allow user to change mind and perform the import
-							int indxend = fi.Name.IndexOf(")", indx);
+						return false; // Return False to Indicate that the Import did not succeed
-							if (indxend > indx)
-							{
-								string tmp = fi.Name.Substring(indx + 6, indxend - (indx + 6));
-								int ii = Convert.ToInt32(tmp);
-								if (ii > max) max = ii;
-							}
-						}
 					}
-					number = max > -1 ? (max + 1).ToString() : "1";
+					string name = xd.DocumentElement.Attributes.GetNamedItem("name").InnerText;
-					name = string.Format("Copy ({0}) of {1}", number, name);
+					Folder ff = AddFolder(Folder.Get(MyFolder.FolderID), xd, name);
+					if (ff == null)
+					{
+						// C2020-032: Import Procedure set when existing name exists, allow user to import with 'Copy (#) of'. 
+						//	This is similar functionality to the import of a procedure without the overwrite part.
+						string msg = string.Format("The procedure set you are importing, {0}, already exists.\n\nDo you want to import {0} as a COPY of the existing set?\n\nThis will prefix the name with \"Copy (#) of\"", name);
+						DialogResult dr = MessageBox.Show(this, msg, "Create Copy Of Existing Procedure Set", MessageBoxButtons.OKCancel, MessageBoxIcon.Stop);
+						if (dr == DialogResult.OK)
+						{
+							string number = "";
+							int max = -1;
+							MyFolder.RefreshChildFolders();
+							// get maximum number of existing copies.
+							foreach (FolderInfo fi in MyFolder.ChildFolders)
+							{
+								int indx = fi.Name.IndexOf("Copy (");
+								if (indx > -1)
+								{
+									int indxend = fi.Name.IndexOf(")", indx);
+									if (indxend > indx)
+									{
+										string tmp = fi.Name.Substring(indx + 6, indxend - (indx + 6));
+										int ii = Convert.ToInt32(tmp);
+										if (ii > max) max = ii;
+									}
+								}
+							}
+							number = max > -1 ? (max + 1).ToString() : "1";
+							name = string.Format("Copy ({0}) of {1}", number, name);
 
-					ff = AddFolder(Folder.Get(MyFolder.FolderID), xd, name);
+							ff = AddFolder(Folder.Get(MyFolder.FolderID), xd, name);
+						}
+						else
+							return false;
+					}
+					_MyNewFolder = FolderInfo.Get(ff.FolderID);
+					AddAnnotationTypes(xd);
+					DocVersionInfo dvi = AddDocVersion(ff, xd);
+					MyDocVersion = dvi;
+					xd = null;
+					lblImportStatus.Text = "Creating Procedures...";
+					Application.DoEvents();
+					ProcedureInfo pi = null;
+					pbImportProcedure.Value = 0;
+					pbImportProcedure.Maximum = MyExpxZipFile.Entries.Count - 1;
+					if (!Directory.Exists(Path.Combine(PEIPath, "procedures")))
+						Directory.CreateDirectory(Path.Combine(PEIPath, "procedures"));
+					for (int i = 1; i < MyExpxZipFile.Entries.Count; i++)
+					{
+						ze = MyExpxZipFile.Entries[i];
+						fn = Path.Combine(PEIPath, "procedures", ze.Name);
+						ze.ExtractToFile(fn, true);
+						xd = new XmlDocument();
+						xd.Load(fn);
+						pi = AddProcedure(xd.DocumentElement, dvi, pi);
+						GC.Collect(); // need to cleanup memory after importing each procedure due to use of Regular Expressions in processing RO and Transition links
+					}
+					DirectoryInfo di = new DirectoryInfo(PEIPath);
+					DirectoryInfo[] dis = di.GetDirectories();
+					for (int d = 0; d < dis.Length; d++)
+						dis[d].Delete(true);
+					lblImportStatus.Text = "Updating Transitions";
+					AddTransitions();
+					FixFloatingFoldouts();
+					SaveTransitionAndItemContentIDs();
+					return true;
 				}
-				else
-					return false;
 			}
-			_MyNewFolder = FolderInfo.Get(ff.FolderID);
-			AddAnnotationTypes(xd);
-			DocVersionInfo dvi = AddDocVersion(ff, xd);
-			MyDocVersion = dvi;
-			xd = null;
-			lblImportStatus.Text = "Creating Procedures...";
-			Application.DoEvents();
-			ProcedureInfo pi = null;
-			pbImportProcedure.Value = 0;
-			pbImportProcedure.Maximum = MyExpxZipFile.Entries.Count - 1;
-			for (int i = 1; i < MyExpxZipFile.Entries.Count; i++)
-			{
-				ze = MyExpxZipFile[i];
-				fn = PEIPath + @"\" + ze.FileName;
-				ze.Extract(PEIPath, ExtractExistingFileAction.OverwriteSilently);
-				xd = new XmlDocument();
-				xd.Load(fn);
-				pi = AddProcedure(xd.DocumentElement, dvi, pi);
-				GC.Collect(); // need to cleanup memory after importing each procedure due to use of Regular Expressions in processing RO and Transition links
-			}
-			DirectoryInfo di = new DirectoryInfo(PEIPath);
-			DirectoryInfo[] dis = di.GetDirectories();
-			for (int d = 0; d < dis.Length; d++)
-				dis[d].Delete(true);
-			lblImportStatus.Text = "Updating Transitions";
-			AddTransitions();
-			FixFloatingFoldouts();
-			SaveTransitionAndItemContentIDs();
-			return true;
 		}
 		private void FixSectionStart(ProcedureInfo pi)
 		{
@@ -1014,8 +1002,6 @@ namespace VEPROMS
 				c.Save();
 			}
 		}
-		private E_UCFImportOptions UCFImportDefaultFromSettings;
-		private E_UCFImportOptions UCFImportCase = E_UCFImportOptions.LoadOnlyImported;
 		Dictionary<string, string> existingCopyFCName = new Dictionary<string, string>();
 		// note that this is used when importing a folder or a procedure (procedure was added for UCF changes)
 		private bool LoadFormats(XmlDocument xd, string xmlpath)
@@ -1057,7 +1043,6 @@ namespace VEPROMS
 						{
 							existingFC.Add(exFI.Config);
 							importedFC.Add(config);
-							conflictingUCFdata = true;
 							fname.Add(name);
 						}
 						else
@@ -1066,22 +1051,6 @@ namespace VEPROMS
 				}
 			}
 
-			// there is a difference in UCF data, see if user wants sections to use the existing or new ucf data:
-			if (conflictingUCFdata)
-			{
-				// Bring up dialog to allow user to choose how the UCF data is handled:
-				// Importing of a procedure(s) (names of UCF exist in current DB and in exported DB)
-				//Case 0 - ignore (don't bring in new UCF)
-				//Case 1 - bringing in new UCF and not using it
-				//Case 2 - bringing in new UCF and only using it for imported data
-				//Case 3 - bringing in new UCF and using it across the board
-				//Case 4 - bringing in new UCF and using it for the current procedure set  (not applicable for procedure sets)
-				UCFImportCase = UCFImportDefaultFromSettings;		// from the options/settings
-				dlgUCFImportOptions ucfoptDlg = new dlgUCFImportOptions(fname, existingFC, importedFC, UCFImportCase, xmlpath);
-				DialogResult dr = ucfoptDlg.ShowDialog();
-				if (dr != DialogResult.OK) return false;
-				UCFImportCase = ucfoptDlg.UCFImportOptionsCase;	// may be reset from dialog.
-			}
 			// first see if any of the imported formats have different data.  If so, 
 			foreach (XmlNode nd in nl)
 			{
@@ -1133,102 +1102,12 @@ namespace VEPROMS
 				// various cases listed above:
 				if (existingFormat.ContainsKey(name))
 				{
-					// if case 0 and this ucf already exists, ignore it:
-					if (UCFImportCase == E_UCFImportOptions.Ignore) continue;
 
-					// if case 1, 2, 4 and the name exists, make a 'copy' of the newly imported format:
-					// need to add this format - name must be unique so add 'COPY(x) of 'original name'' where x is unique number:
-					if (UCFImportCase == E_UCFImportOptions.LoadNotUsed || UCFImportCase == E_UCFImportOptions.LoadOnlyImported || UCFImportCase == E_UCFImportOptions.LoadForSetOnly)
-					{
-						int count = (fil.Where(fi => fi.Name.EndsWith(name))).Count();
-                        if (count > 0)
-						{
-							string origname = name;
-							name = string.Format("Copy {0} of {1}", count.ToString(), name);
-							if (UCFImportCase == E_UCFImportOptions.LoadOnlyImported || UCFImportCase == E_UCFImportOptions.LoadForSetOnly)
-							{
-								if (renamedUCFFormatName == null) renamedUCFFormatName = new Dictionary<string, string>();
-								renamedUCFFormatName.Add(origname, name);
-							}
-						}
-					}
-					// if case 3, take the existing config data and create in a record whose name is Old(x) of 'original name' (the record
-					// creation gets done below).  Then modify the existing record to have the config data.  The result is that any
-					// sections that used this UCF throughout the database will have the new config data.
-					if (UCFImportCase == E_UCFImportOptions.LoadUseAll)
-					{
-						string savname = name;
-						int count = (fil.Where(fi => fi.Name.EndsWith(name))).Count();
-                        if (count > 0)
-						{
-							name = string.Format("Old {0} of {1}", count.ToString(), name);
-						}
-						// update the 'old' record by getting the original config data.
-						string savdesc = null;
-						DateTime savdts = DateTime.Now;
-						string savuid = null;
-						int savpar = 0;
-						string savconfig = null;
-						using (Format origRecord = Format.Get(existingFormat[savname]))
-						{
-							savdesc = origRecord.Description;
-							savdts = origRecord.DTS;
-							savuid = origRecord.UserID;
-							savpar = origRecord.ParentID;
-							savconfig = origRecord.Config;
-							origRecord.Name = savname;
-							origRecord.Description = description;
-							origRecord.DTS = dts;
-							origRecord.UserID = userid;
-							origRecord.MyParent = pformat;
-							origRecord.Config = config;
-							origRecord.Save();
-							description = savdesc;
-							dts = savdts;
-							userid = savuid;
-							pformat = Format.Get(savpar);
-							config = savconfig;
-
-						}
-					}
 
 				}
-				if (UCFImportCase == 0)		// ignore it
-				{
-					importedFormat.Add(formatid, name);
-				}
-				else
-				{
-					Format rec = Format.MakeFormat(pformat, name, description, null, null, dts, userid);
-					rec.Config = config;
-					rec.Save();
-					if (UCFImportCase == E_UCFImportOptions.LoadNotUsed || UCFImportCase == E_UCFImportOptions.LoadUseAll)   // don't reset format id (case 1 don't use it, case 3 copies new data into original record
-						importedFormat.Add(formatid, name);
-					else if (UCFImportCase == E_UCFImportOptions.LoadOnlyImported || UCFImportCase == E_UCFImportOptions.LoadForSetOnly)		// case 2 uses it for any items imported, case 4 uses it for any sections within current set
-					{
-						existingFormat.Add(name, rec.FormatID);		// change to original name?
-						importedFormat.Add(rec.FormatID, name);
 
-						// get format id for the original named format
+				importedFormat.Add(formatid, name);
-						if (UCFImportCase == E_UCFImportOptions.LoadForSetOnly && renamedUCFFormatName != null)
+
-						{
-							int origformatid = -1;
-							foreach (var kvp in renamedUCFFormatName)
-							{
-								if (kvp.Value == name)
-								{
-									origformatid = existingFormat[kvp.Key];
-									break;
-								}
-							}
-							if (origformatid != -1)
-							{
-								if (renamedUCFFormatId == null) renamedUCFFormatId = new Dictionary<int, int>();
-								renamedUCFFormatId.Add(rec.FormatID, origformatid);
-							}
-						}
-					}
-				}
 			}
 			FormatInfoList.Reset();
 			return true;
@@ -1254,85 +1133,85 @@ namespace VEPROMS
 		// the xml files are then added (or replaced) in the .impx file.
 		private void SaveTransitionAndItemContentIDs()
 		{
-			XmlDocument xd = new XmlDocument();
+			using (FileStream zipToOpen = new FileStream(MyImpZipFileName, FileMode.OpenOrCreate))
-			XmlElement xe = xd.CreateElement("items");
-			xd.AppendChild(xe);
-			string fn = PEIPath + @"\items.xml";
-			foreach (int key in Old2NewItem.Keys)
 			{
-				xe = xd.CreateElement("item");
+				using (ZipArchive MyImpxZipFile = new ZipArchive(zipToOpen, ZipArchiveMode.Update))
-				xe.Attributes.SetNamedItem(AddAttribute(xd, "old", key.ToString()));
-				xe.Attributes.SetNamedItem(AddAttribute(xd, "new", Old2NewItem[key].ToString()));
-				xd.DocumentElement.AppendChild(xe);
-			}
-			xd.Save(fn);
-			ZipEntry ze = MyImpxZipFile["items.xml"];
-			MyImpxZipFile.RemoveEntry(ze);
-			MyImpxZipFile.Save();
-			MyImpxZipFile.AddFile(fn, "");
-			MyImpxZipFile.Save();
-			File.Delete(fn);
-			xd = new XmlDocument();
-			xe = xd.CreateElement("contents");
-			xd.AppendChild(xe);
-			fn = PEIPath + @"\contents.xml";
-			foreach (int key in Old2NewContent.Keys)
-			{
-				xe = xd.CreateElement("content");
-				xe.Attributes.SetNamedItem(AddAttribute(xd, "old", key.ToString()));
-				xe.Attributes.SetNamedItem(AddAttribute(xd, "new", Old2NewContent[key].ToString()));
-				xd.DocumentElement.AppendChild(xe);
-			}
-			xd.Save(fn);
-			ze = MyImpxZipFile["contents.xml"];
-			MyImpxZipFile.RemoveEntry(ze);
-			MyImpxZipFile.Save();
-			MyImpxZipFile.AddFile(fn, "");
-			MyImpxZipFile.Save();
-			File.Delete(fn);
-			xd = new XmlDocument();
-			xe = xd.CreateElement("transitions");
-			xd.AppendChild(xe);
-			fn = PEIPath + @"\transitions.xml";
-			if (PendingTransitions != null && PendingTransitions.DocumentElement.HasChildNodes)
-			{
-				foreach (XmlNode nd in PendingTransitions.DocumentElement.ChildNodes)
 				{
-					if (nd.InnerText == "")
+					XmlDocument xd = new XmlDocument();
-						xd.DocumentElement.AppendChild(xd.ImportNode(nd, true));
+					XmlElement xe = xd.CreateElement("items");
+					xd.AppendChild(xe);
+					string fn = PEIPath + @"\items.xml";
+					foreach (int key in Old2NewItem.Keys)
+					{
+						xe = xd.CreateElement("item");
+						xe.Attributes.SetNamedItem(AddAttribute(xd, "old", key.ToString()));
+						xe.Attributes.SetNamedItem(AddAttribute(xd, "new", Old2NewItem[key].ToString()));
+						xd.DocumentElement.AppendChild(xe);
+					}
+					xd.Save(fn);
+					ZipArchiveEntry ze = MyImpxZipFile.GetEntry("items.xml");
+					ze.Delete();
+                    _ = MyImpxZipFile.CreateEntryFromFile(fn, Path.GetFileName(fn));
+					File.Delete(fn);
+					xd = new XmlDocument();
+					xe = xd.CreateElement("contents");
+					xd.AppendChild(xe);
+					fn = PEIPath + @"\contents.xml";
+					foreach (int key in Old2NewContent.Keys)
+					{
+						xe = xd.CreateElement("content");
+						xe.Attributes.SetNamedItem(AddAttribute(xd, "old", key.ToString()));
+						xe.Attributes.SetNamedItem(AddAttribute(xd, "new", Old2NewContent[key].ToString()));
+						xd.DocumentElement.AppendChild(xe);
+					}
+					xd.Save(fn);
+					ze = MyImpxZipFile.GetEntry("contents.xml");
+					ze.Delete();
+                    _ = MyImpxZipFile.CreateEntryFromFile(fn, Path.GetFileName(fn));
+					File.Delete(fn);
+					xd = new XmlDocument();
+					xe = xd.CreateElement("transitions");
+					xd.AppendChild(xe);
+					fn = PEIPath + @"\transitions.xml";
+					if (PendingTransitions != null && PendingTransitions.DocumentElement.HasChildNodes)
+					{
+						foreach (XmlNode nd in PendingTransitions.DocumentElement.ChildNodes)
+						{
+							if (nd.InnerText == "")
+								xd.DocumentElement.AppendChild(xd.ImportNode(nd, true));
+						}
+					}
+					xd.Save(fn);
+					ze = MyImpxZipFile.GetEntry("transitions.xml");
+					ze.Delete();
+                    _ = MyImpxZipFile.CreateEntryFromFile(fn, Path.GetFileName(fn));
+					File.Delete(fn);
 				}
 			}
-			xd.Save(fn);
-			ze = MyImpxZipFile["transitions.xml"];
-			MyImpxZipFile.RemoveEntry(ze);
-			MyImpxZipFile.Save();
-			MyImpxZipFile.AddFile(fn, "");
-			MyImpxZipFile.Save();
-			File.Delete(fn);
 		}
 
 		// This is called only when we are importing an entire folder and there is a .impx file (a zip file)
 		// the name of the .impx file is based on the folder name containing the export file being imported
 		// This will read in the saved ItemIDs (old and new), ContentIDs (old andnew), library document IDs (old and new), and pending transitions
-		private void ReadTransitionAndItemContentIDs()
+		private void ReadTransitionAndItemContentIDs(ZipArchive MyImpxZipFile)
 		{
-			ZipEntry ze = MyImpxZipFile["items.xml"];
+			ZipArchiveEntry ze = MyImpxZipFile.GetEntry("items.xml");
-			ze.Extract(PEIPath, ExtractExistingFileAction.OverwriteSilently);
 			string fn = PEIPath + @"\items.xml";
+			ze.ExtractToFile(fn, true);
 			XmlDocument xd = new XmlDocument();
 			xd.Load(fn);
 			// B2016-176, B2016-197  Transitions were no always properly resolved - don't load in the old item ids
 			File.Delete(fn);
-			ze = MyImpxZipFile["contents.xml"];
+			ze = MyImpxZipFile.GetEntry("contents.xml");
-			ze.Extract(PEIPath, ExtractExistingFileAction.OverwriteSilently);
 			fn = PEIPath + @"\contents.xml";
+			ze.ExtractToFile(fn, true);
 			xd = new XmlDocument();
 			xd.Load(fn);
 			// B2016-176, B2016-197  Transitions were no always properly resolved - don't load in the old content ids
 			File.Delete(fn);
-			ze = MyImpxZipFile["libdocs.xml"];
+			ze = MyImpxZipFile.GetEntry("libdocs.xml");
-			ze.Extract(PEIPath, ExtractExistingFileAction.OverwriteSilently);
 			fn = PEIPath + @"\libdocs.xml";
+			ze.ExtractToFile(fn, true);
 			xd = new XmlDocument();
 			xd.Load(fn);
 			XmlNodeList nl = xd.SelectNodes("//libdoc");
@@ -1344,9 +1223,9 @@ namespace VEPROMS
 				Old2NewLibDoc.Add(oldid, newid);
 			}
 			File.Delete(fn);
-			ze = MyImpxZipFile["transitions.xml"];
+			ze = MyImpxZipFile.GetEntry("transitions.xml");
-			ze.Extract(PEIPath, ExtractExistingFileAction.OverwriteSilently);
 			fn = PEIPath + @"\transitions.xml";
+			ze.ExtractToFile(fn, true);
 			PendingTransitions.Load(fn);
 			File.Delete(fn);
 		}
@@ -1374,53 +1253,53 @@ namespace VEPROMS
                 else
                     dn = fi.Name.Substring(0, fi.Name.IndexOf("."));
                 txtImport.Text = ofd.FileName;
-                ReadOptions ro = new ReadOptions();
+				MyExpZipFileName = txtImport.Text;
-                ro.Encoding = Encoding.UTF8;
+				string fn = string.Format(@"{0}\{1}.impx", PEIPath, dn);
-                MyExpxZipFile = ZipFile.Read(txtImport.Text, ro);
+				MyImpZipFileName = fn;
-                string fn = string.Format(@"{0}\{1}.impx", PEIPath, dn);
+				if (File.Exists(fn))
-                if (File.Exists(fn))
                 {
-                    MyImpxZipFile = ZipFile.Read(fn, ro);
+					using (ZipArchive MyImpxZipFile = ZipFile.OpenRead(fn))
-                    ReadTransitionAndItemContentIDs();
+						ReadTransitionAndItemContentIDs(MyImpxZipFile);
                 }
                 else
                 {
-                    MyImpxZipFile = new ZipFile(fn, Encoding.UTF8);
+					using (FileStream zipToOpen = new FileStream(fn, FileMode.OpenOrCreate))
-                    //transitions
+					{
-                    XmlElement xe = PendingTransitions.CreateElement("transitions");
+						using (ZipArchive MyImpxZipFile = new ZipArchive(zipToOpen, ZipArchiveMode.Update))
-                    PendingTransitions.AppendChild(xe);
+                        {
-                    fn = PEIPath + @"\transitions.xml";
+							//transitions
-                    PendingTransitions.Save(fn);
+							XmlElement xe = PendingTransitions.CreateElement("transitions");
-                    MyImpxZipFile.AddFile(fn, "");
+							PendingTransitions.AppendChild(xe);
-                    MyImpxZipFile.Save();
+							fn = PEIPath + @"\transitions.xml";
-                    File.Delete(fn);
+							PendingTransitions.Save(fn);
-                    //itemids
+                            _ = MyImpxZipFile.CreateEntryFromFile(fn, Path.GetFileName(fn));
-                    XmlDocument xd = new XmlDocument();
+							File.Delete(fn);
-                    xe = xd.CreateElement("items");
+							//itemids
-                    xd.AppendChild(xe);
+							XmlDocument xd = new XmlDocument();
-                    fn = PEIPath + @"\items.xml";
+							xe = xd.CreateElement("items");
-                    xd.Save(fn);
+							xd.AppendChild(xe);
-                    MyImpxZipFile.AddFile(fn, "");
+							fn = PEIPath + @"\items.xml";
-                    MyImpxZipFile.Save();
+							xd.Save(fn);
-                    File.Delete(fn);
+                            _ = MyImpxZipFile.CreateEntryFromFile(fn, Path.GetFileName(fn));
-                    //contentids
+							File.Delete(fn);
-                    xd = new XmlDocument();
+							//contentids
-                    xe = xd.CreateElement("contents");
+							xd = new XmlDocument();
-                    xd.AppendChild(xe);
+							xe = xd.CreateElement("contents");
-                    fn = PEIPath + @"\contents.xml";
+							xd.AppendChild(xe);
-                    xd.Save(fn);
+							fn = PEIPath + @"\contents.xml";
-                    MyImpxZipFile.AddFile(fn, "");
+							xd.Save(fn);
-                    MyImpxZipFile.Save();
+                            _ = MyImpxZipFile.CreateEntryFromFile(fn, Path.GetFileName(fn));
-                    File.Delete(fn);
+							File.Delete(fn);
-                    //libdocids
+							//libdocids
-                    xd = new XmlDocument();
+							xd = new XmlDocument();
-                    xe = xd.CreateElement("libdocs");
+							xe = xd.CreateElement("libdocs");
-                    xd.AppendChild(xe);
+							xd.AppendChild(xe);
-                    fn = PEIPath + @"\libdocs.xml";
+							fn = PEIPath + @"\libdocs.xml";
-                    xd.Save(fn);
+							xd.Save(fn);
-                    MyImpxZipFile.AddFile(fn, "");
+                            _ = MyImpxZipFile.CreateEntryFromFile(fn, Path.GetFileName(fn));
-                    MyImpxZipFile.Save();
+							File.Delete(fn);
-                    File.Delete(fn);
+						}
+					}
                 }
             }
             if (MyDocVersion != null)
@@ -1595,27 +1474,31 @@ namespace VEPROMS
 					ExportAssociation(xe, ai, "association");
 			string fn = PEIPath + @"\folder.xml";
 			xn.OwnerDocument.Save(fn);
-			MyExpxZipFile.AddFile(fn, "folder");
+			using (FileStream zipToOpen = new FileStream(MyExpZipFileName, FileMode.OpenOrCreate))
-			MyExpxZipFile.Save();
-			File.Delete(fn);
-			//here
-			lblExportStatus.Text = "Exporting Procedures...";
-			Application.DoEvents();
-			if (dvi.Procedures.Count > 0)
 			{
-				pbExportProcedure.Value = 0;
+				using (ZipArchive MyExpxZipFile = new ZipArchive(zipToOpen, ZipArchiveMode.Update))
-				pbExportProcedure.Maximum = dvi.Procedures.Count;
+                {
-				lblExportProcedure.Text = pbExportProcedure.Maximum.ToString() + " Procedures";
+                    _ = MyExpxZipFile.CreateEntryFromFile(fn, $"folder/{Path.GetFileName(fn)}");
-				foreach (ItemInfo ii in dvi.Procedures)
-				{
-					XmlDocument xd = new XmlDocument();
-					ExportItem(xd, ii, "procedure");
-					fn = string.Format(@"{0}\proc{1}.xml", PEIPath, pbExportProcedure.Value.ToString().PadLeft(4, '0'));
-					xd.Save(fn);
-					MyExpxZipFile.AddFile(fn, "procedures");
-					MyExpxZipFile.Save();
 					File.Delete(fn);
-					xd = null;
+					//here
+					lblExportStatus.Text = "Exporting Procedures...";
+					Application.DoEvents();
+					if (dvi.Procedures.Count > 0)
+					{
+						pbExportProcedure.Value = 0;
+						pbExportProcedure.Maximum = dvi.Procedures.Count;
+						lblExportProcedure.Text = pbExportProcedure.Maximum.ToString() + " Procedures";
+						foreach (ItemInfo ii in dvi.Procedures)
+						{
+							XmlDocument xd = new XmlDocument();
+							ExportItem(xd, ii, "procedure");
+							fn = string.Format(@"{0}\proc{1}.xml", PEIPath, pbExportProcedure.Value.ToString().PadLeft(4, '0'));
+							xd.Save(fn);
+                            _ = MyExpxZipFile.CreateEntryFromFile(fn, $"procedures/{Path.GetFileName(fn)}");
+							File.Delete(fn);
+							xd = null;
+						}
+					}
 				}
 			}
 		}
@@ -1839,12 +1722,14 @@ namespace VEPROMS
 			//and handled/overridden in dlgExportEP.cs
         }
 
-		protected virtual void SetROLocation(ref XmlElement xindivid, ROFSTLookup.rochild roc, RODbInfo rodb, bool isMulti)
+		protected virtual void SetEPEnhancedDocLinks(ref XmlElement xe, ItemInfo ii)
 		{
 			//do nothing - this will be for Electronic procedures only
 			//and handled/overridden in dlgExportEP.cs	
 		}
-		protected virtual void SetEPEnhancedDocLinks(ref XmlElement xe, ItemInfo ii)
+
+
+		protected virtual void SetROLocation(ref XmlElement xindivid, ROFSTLookup.rochild roc, RODbInfo rodb, bool isMulti)
 		{
 			//do nothing - this will be for Electronic procedures only
 			//and handled/overridden in dlgExportEP.cs	

PROMS/VEPROMS User Interface/dlgExportImportEP.cs

@@ -21,7 +21,7 @@ namespace VEPROMS
 
 		private static Regex _ROAccPageTokenPattern = new Regex("[<][^<>-]+-[^<>]+[>]");
 
-        public dlgExportImportEP(string mode, FolderInfo folderInfo, frmVEPROMS myFrmVEPROMS, int annotationTypeId, int unitIndex = 0) : base(mode, folderInfo, myFrmVEPROMS, (E_UCFImportOptions)0, unitIndex)
+        public dlgExportImportEP(string mode, FolderInfo folderInfo, frmVEPROMS myFrmVEPROMS, int annotationTypeId, int unitIndex = 0) : base(mode, folderInfo, myFrmVEPROMS, ( unitIndex))
         {
             _AnnotationType = AnnotationTypeInfo.Get(annotationTypeId);
             _ExportBothConvertedandNot = true;
@@ -29,7 +29,7 @@ namespace VEPROMS
             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, (E_UCFImportOptions)0, unitIndex)
+        public dlgExportImportEP(string mode, DocVersionInfo docVersionInfo, frmVEPROMS myFrmVEPROMS, int annotationTypeId, int unitIndex = 0) : base(mode, docVersionInfo, myFrmVEPROMS, (unitIndex))
         {
             _AnnotationType = AnnotationTypeInfo.Get(annotationTypeId);
             _ExportBothConvertedandNot = true;
@@ -37,7 +37,7 @@ namespace VEPROMS
             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, (E_UCFImportOptions)0, unitIndex)
+        public dlgExportImportEP(string mode, ProcedureInfo procedureInfo, frmVEPROMS myFrmVEPROMS, int annotationTypeId, int unitIndex = 0) : base(mode, procedureInfo, myFrmVEPROMS, (unitIndex))
 		{
 			_AnnotationType = AnnotationTypeInfo.Get(annotationTypeId);
 			_ExportBothConvertedandNot = true;

PROMS/VEPROMS User Interface/dlgPrintAllApprovedProcedures.Designer.cs

@@ -0,0 +1,136 @@
+
+namespace VEPROMS
+{
+	partial class dlgPrintAllApprovedProcedures
+	{
+		/// <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(dlgPrintAllApprovedProcedures));
+			this.txbApprovedPDFsPath = new DevComponents.DotNetBar.Controls.TextBoxX();
+			this.labelX1 = new DevComponents.DotNetBar.LabelX();
+			this.ppBtnPDFLoc = new DevComponents.DotNetBar.ButtonX();
+			this.ApprovedPDFsFolderDlg = new System.Windows.Forms.FolderBrowserDialog();
+			this.btnPrntAllAprv = new DevComponents.DotNetBar.ButtonX();
+			this.btnCancel = new DevComponents.DotNetBar.ButtonX();
+			this.SuspendLayout();
+			// 
+			// txbApprovedPDFsPath
+			// 
+			// 
+			// 
+			// 
+			this.txbApprovedPDFsPath.Border.Class = "TextBoxBorder";
+			this.txbApprovedPDFsPath.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.txbApprovedPDFsPath.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.txbApprovedPDFsPath.Location = new System.Drawing.Point(11, 45);
+			this.txbApprovedPDFsPath.Name = "txbApprovedPDFsPath";
+			this.txbApprovedPDFsPath.PreventEnterBeep = true;
+			this.txbApprovedPDFsPath.Size = new System.Drawing.Size(611, 22);
+			this.txbApprovedPDFsPath.TabIndex = 0;
+			this.txbApprovedPDFsPath.WatermarkText = "Enter to Path of where to Place All Approved PDFs";
+			this.txbApprovedPDFsPath.TextChanged += new System.EventHandler(this.txbApprovedPDFsPath_TextChanged);
+			// 
+			// labelX1
+			// 
+			// 
+			// 
+			// 
+			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(12, 22);
+			this.labelX1.Name = "labelX1";
+			this.labelX1.Size = new System.Drawing.Size(360, 23);
+			this.labelX1.TabIndex = 1;
+			this.labelX1.Text = "Approved PDFs Location:";
+			// 
+			// ppBtnPDFLoc
+			// 
+			this.ppBtnPDFLoc.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+			this.ppBtnPDFLoc.Image = ((System.Drawing.Image)(resources.GetObject("ppBtnPDFLoc.Image")));
+			this.ppBtnPDFLoc.Location = new System.Drawing.Point(627, 45);
+			this.ppBtnPDFLoc.Margin = new System.Windows.Forms.Padding(2);
+			this.ppBtnPDFLoc.Name = "ppBtnPDFLoc";
+			this.ppBtnPDFLoc.Size = new System.Drawing.Size(37, 22);
+			this.ppBtnPDFLoc.TabIndex = 32;
+			this.ppBtnPDFLoc.Click += new System.EventHandler(this.ppBtnPDFLoc_Click);
+			// 
+			// btnPrntAllAprv
+			// 
+			this.btnPrntAllAprv.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+			this.btnPrntAllAprv.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+			this.btnPrntAllAprv.Enabled = false;
+			this.btnPrntAllAprv.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.btnPrntAllAprv.Location = new System.Drawing.Point(397, 120);
+			this.btnPrntAllAprv.Name = "btnPrntAllAprv";
+			this.btnPrntAllAprv.Size = new System.Drawing.Size(132, 26);
+			this.btnPrntAllAprv.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+			this.btnPrntAllAprv.TabIndex = 33;
+			this.btnPrntAllAprv.Text = "Print All Approved";
+			this.btnPrntAllAprv.Click += new System.EventHandler(this.btnPrntAllAprv_Click);
+			// 
+			// btnCancel
+			// 
+			this.btnCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+			this.btnCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+			this.btnCancel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.btnCancel.Location = new System.Drawing.Point(564, 120);
+			this.btnCancel.Name = "btnCancel";
+			this.btnCancel.Size = new System.Drawing.Size(99, 26);
+			this.btnCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+			this.btnCancel.TabIndex = 34;
+			this.btnCancel.Text = "Close";
+			this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
+			// 
+			// dlgPrintAllApprovedProcedures
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.ClientSize = new System.Drawing.Size(675, 161);
+			this.Controls.Add(this.btnCancel);
+			this.Controls.Add(this.btnPrntAllAprv);
+			this.Controls.Add(this.ppBtnPDFLoc);
+			this.Controls.Add(this.labelX1);
+			this.Controls.Add(this.txbApprovedPDFsPath);
+			this.Cursor = System.Windows.Forms.Cursors.Default;
+			this.DoubleBuffered = true;
+			this.Name = "dlgPrintAllApprovedProcedures";
+			this.ShowIcon = false;
+			this.Text = "Print All Approved Procedures";
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private DevComponents.DotNetBar.Controls.TextBoxX txbApprovedPDFsPath;
+		private DevComponents.DotNetBar.LabelX labelX1;
+		private DevComponents.DotNetBar.ButtonX ppBtnPDFLoc;
+		private System.Windows.Forms.FolderBrowserDialog ApprovedPDFsFolderDlg;
+		private DevComponents.DotNetBar.ButtonX btnPrntAllAprv;
+		private DevComponents.DotNetBar.ButtonX btnCancel;
+	}
+}

PROMS/VEPROMS User Interface/dlgPrintAllApprovedProcedures.cs

@@ -0,0 +1,202 @@
+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 System.IO;
+using VEPROMS.CSLA.Library;
+using JR.Utils.GUI.Forms;
+
+namespace VEPROMS
+{
+	public partial class dlgPrintAllApprovedProcedures : DevComponents.DotNetBar.Office2007Form
+	{
+		private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+		private StringBuilder NotApproved;
+		private DocVersionInfo _DocVersionInfo = null;
+		private int unitId = 0;
+		public dlgPrintAllApprovedProcedures(DocVersionInfo dvi)
+		{
+			InitializeComponent();
+			_DocVersionInfo = dvi;
+			unitId = (_DocVersionInfo.DocVersionConfig.SelectedSlave < 0) ? 0 : _DocVersionInfo.DocVersionConfig.SelectedSlave; // set unitId to zero if not Parent/Child
+			NotApproved = new StringBuilder();
+			txbApprovedPDFsPath.Text = BuildInitialPDFPath(); // set to default approved PDF path
+		}
+		// create an approved PDFs path based on the user's Documents folder and the tree path to the working draft
+		private string BuildInitialPDFPath()
+		{
+			// start with the SearchDVPath which is the node path staring with the top of the PROMS Procedure tree (VEPROMS)
+			string rtnstr =  _DocVersionInfo.ActiveParent.SearchDVPath;
+
+			// remove top tree node (VEPROMS) and put a " - " between each tree node name
+			rtnstr = rtnstr.Substring(rtnstr.IndexOf("\a") + 1).Replace("\a", " - ");
+
+			// add the user's path to the My Documments folder to the start of the path
+			rtnstr = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + "\\" + rtnstr;
+
+			// check if we are printing Approved Child Procedures
+			// if SelectedSlave is > 0 then we are printing Approved Child Procedures and
+			// subtract one from the index (unitId) into the list of child names (UnitNames)
+			if (unitId > 0)
+				rtnstr += "\\" + _DocVersionInfo.UnitNames[unitId - 1]; // append Child name to path
+			return rtnstr;
+		}
+
+		private void ppBtnPDFLoc_Click(object sender, EventArgs e)
+		{
+			if (txbApprovedPDFsPath.Text.Length > 0)
+				ApprovedPDFsFolderDlg.SelectedPath = txbApprovedPDFsPath.Text;
+			DialogResult dr = ApprovedPDFsFolderDlg.ShowDialog();
+			if (dr == DialogResult.OK)
+			{
+				txbApprovedPDFsPath.Text = ApprovedPDFsFolderDlg.SelectedPath;
+			}
+		}
+
+		private bool FolderIsWritable(string dirPath)
+		{
+			try
+			{
+				using (FileStream fs = File.Create(Path.Combine(dirPath, Path.GetRandomFileName()), 1,	FileOptions.DeleteOnClose))
+				{ }
+				return true;
+			}
+			catch
+			{
+				return false;
+			}
+		}
+
+		private void btnPrntAllAprv_Click(object sender, EventArgs e)
+		{
+			try
+			{
+				// Create folder if needed, clear the folder 
+				if (!Directory.Exists(txbApprovedPDFsPath.Text))
+					Directory.CreateDirectory(txbApprovedPDFsPath.Text);
+
+				// check if the folder location is writable
+				if (!FolderIsWritable(txbApprovedPDFsPath.Text))
+				{
+					MessageBox.Show("Cannot Write to this folder.\n\nSelect a different location.", "Invalid Folder Access", MessageBoxButtons.OK, MessageBoxIcon.Error);
+					btnPrntAllAprv.Enabled = false;
+				}
+				else
+				{
+					int pdfCount = 0;
+					DeleteExistingPDFs(); // delete existing PDFs in the target folder
+										  // Get the Child index for Parent/Child procedure - if not Parent/Child this will be zero
+					foreach (ProcedureInfo myProc in _DocVersionInfo.Procedures)
+					{
+						RevisionInfoList ril = RevisionInfoList.GetByItemID(myProc.ItemID);
+						if (ril.Count == 0)
+						{
+							NotApproved.AppendLine(string.Format("No approved Version for {0}", (myProc.PDFNumber.Length > 0) ? myProc.PDFNumber : myProc.DisplayText));
+						}
+						else
+						{
+							bool foundApproved = false;
+							foreach (RevisionInfo revinfo in ril)
+							{
+								// if not Parent/Child, "unitId" and "Applicability_index" will be zero
+								if (unitId == revinfo.MyConfig.Applicability_Index)
+								{
+									if (revinfo.LatestVersion.MyStage.IsApproved > 0)
+									{
+										foundApproved = true;
+										ItemInfo ii = ItemInfo.Get(revinfo.ItemID);
+										ii.MyDocVersion.DocVersionConfig.SelectedSlave = unitId;
+										ProcedureInfo prcInfo = ProcedureInfo.Get(ii.ItemID);
+										SaveApprovedPDFToFolder(revinfo, prcInfo.PDFNumber);// save PDF to folder
+										pdfCount++;
+										break; // got the latest Approved - jump out of foreach revision info loop
+									}
+								}
+							}
+							if (!foundApproved) NotApproved.AppendLine(string.Format("No approved Version for {0}", myProc.PDFNumber));
+
+						}
+					}
+					// if no Approved PDFs were save, display general message and exit
+					if (pdfCount == 0)
+					{
+						string msg = "There are no Approved Procedure PDFs in this procedure set.\n\n Approved Procedures PDFs are created when a procedure is approved using the PROMS Approval function.";
+						FlexibleMessageBox.Show(msg, "Print PDFs Completed", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+					}
+					else // we saved some approved PDFs tell user how many were saved and list procedures that were not approved
+					{
+						string msg = string.Format("{0} PDFs were saved at\n\n{1}", pdfCount, txbApprovedPDFsPath.Text);
+						if (NotApproved.Length > 0)
+						{
+							msg += string.Format("\n\n--------------------------------------------\n\nPDFs for the Following were not Generated:\n\n{0}", NotApproved.ToString());
+						}
+						FlexibleMessageBox.Show(msg, "Print PDFs Completed", MessageBoxButtons.OK, MessageBoxIcon.Information);
+					}
+				}
+			}
+			catch (Exception ex)
+			{
+				_MyLog.Error("Print All Approved PDFs", ex);// save error in PROMS error log
+				MessageBox.Show(ex.Message, ex.GetType().FullName, MessageBoxButtons.OK, MessageBoxIcon.Error);
+			}
+			this.Close(); // close dialog
+		}
+		private void SaveApprovedPDFToFolder(RevisionInfo revInfo,string PDFName)
+		{
+			byte[] buffer = revInfo.LatestVersion.PDF;
+			string PDFFilePath = string.Format("{0}\\{1}.PDF", txbApprovedPDFsPath.Text, PDFName);
+			try
+			{
+				FileStream fs = new FileStream(PDFFilePath, FileMode.Create);
+				fs.Write(buffer, 0, buffer.Length);
+				fs.Close();
+			}
+			catch (Exception ex)
+			{
+				string str = string.Format("Could not create {0}", PDFFilePath);
+				NotApproved.AppendLine(str); // save to list of procedure that were not approved
+				_MyLog.Info(str, ex);// save error in PROMS error log
+			}
+
+		}
+		private void DeleteExistingPDFs()
+		{
+			DirectoryInfo di = new DirectoryInfo(txbApprovedPDFsPath.Text);
+			FileInfo[] fis;
+			//DirectoryInfo[] diAry = di.GetDirectories(txbApprovedPDFsPath.Text);
+			//DirectoryInfo di_fmtgen;
+			// remove all of the PDF fils
+			//di_fmtgen = diAry[0];
+			try
+			{
+				fis = di.GetFiles("*.pdf");
+				foreach (FileInfo fi in fis)
+				{
+					if (fi.IsReadOnly) fi.IsReadOnly = false;
+					fi.Delete();
+				}
+			}
+			catch (Exception ex)
+			{
+				string str = string.Format("Cannot delete files in {0}", txbApprovedPDFsPath.Text);
+				MessageBox.Show(str, "Error deleting files", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				_MyLog.Info(str, ex); // save error in PROMS error log
+
+			}
+		}
+		private void txbApprovedPDFsPath_TextChanged(object sender, EventArgs e)
+		{
+			btnPrntAllAprv.Enabled = txbApprovedPDFsPath.Text.Length > 0;
+		}
+
+		private void btnCancel_Click(object sender, EventArgs e)
+		{
+			this.Close();
+		}
+	}
+}

PROMS/VEPROMS User Interface/dlgPrintAllApprovedProcedures.resx

@@ -112,15 +112,30 @@
     <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="ppBtnPDFLoc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
+        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAr2AAAK9gHCr3ADAAACc0lE
+        QVQ4T6WSWUjUURSH/w899GSRGoVgZIlYIAaGVA8hSouaUm6FkiaUWyWGYq7NuM7oLI46pWLOqNOoo5Wl
+        GFYIhSIRWi6UmJoFhaWYGiq5feFIg9tL9fDBvYf7+ziccwVA+B82FDYjs1DnKlbpuSktJ1ttIEmmTf4r
+        QUisGp8IedDy+VpCmWWaSk9chsYvOLYQoU6nDKjTKVlPU41Evl70h8ikojO+UXK8I/KMAvq7tcxO1Br5
+        Na5nflSDoVxOvS4jbX14GZ9IBd7hKjzDChBqKxTMjFetCS+OFDHfG0NVmZTK4iw0hWmU5KVyR5ZIgSSe
+        1TKhWpvLzHetKbw0UgT9idAbtikbBPdKJfz8WmIKN9flGnliyKFBL+FhZRYGTTr6EjHl6lvcVSVTrEhE
+        nZtglAmVJVlMfco3tj3UKqK+SsHikBiGM9byUQyDSdAXC++i6KrxJzrUq0LQqNOZHJDCZxmPquW0P5Wt
+        PFrd+ttg6PBloc2D2WcufKhw4OrFk5PRoV4HhVKViB/vxQy3pVCvl7E0KIKe8JVgVyh0nGeh3YvZlhNM
+        NR1jrO4Q4ghbLrhZ5BlnUKRIYaw7gfu6XDpfSqEvBnouQ2cQS6/OMvfiNNPNxxmvd+JbtT0dmdsJ9LDB
+        yc7MzihQ5yTS05LKA10ODKTCm2B47cdcqyfTz12YaHBm1ODAF+1+emXmiML24XjAqtG0hfzseGrLpfQ+
+        jqRDKZhol22hRbKVxrRt1CRboom34vaNPQS6711ydrR2NwmUGXEoRVfITggh6XrA8mS55O/GuVNHcD3q
+        wGEHW+xtrLDebcHOHWbsMjdb+w9WX/6F370P0Tty1Sp4AAAAAElFTkSuQmCC
+</value>
+  </data>
+  <metadata name="ApprovedPDFsFolderDlg.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>
-  </metadata>
 </root>

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.
+			// When opening Admin tools Repair tab will be default.
-			this.sideNavItmCheck.Checked = true;
+			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(bool noProcs)
-		private void ResetTV()
-		{
-			ResetTV(false);
-		}
-		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 (fic.ChildFolderCount > 0 && LoadChildFolders(fic, tnc, noProcs))
-				{
+                    loadedChildWorkingDraft = true;
-					if (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 (!noProcs && dvi.Procedures.Count > 0)
-					{
+                        LoadProcedures(dvi, tnc);
-						if (dvi.Procedures.Count > 0)
+                    rtnval = true;
-							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("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(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;
+				FolderInfo fi = kvp;
-				int itemID = (int)fi.FolderID;
+				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,9 +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>
+  <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>
+  <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.Designer.cs

@@ -1211,7 +1211,6 @@ namespace VEPROMS
 			this.cbUCFLForSetOnly.Size = new System.Drawing.Size(105, 19);
 			this.cbUCFLForSetOnly.TabIndex = 5;
 			this.cbUCFLForSetOnly.Text = "Load For Set Only";
-			this.cbUCFLForSetOnly.CheckedChanged += new System.EventHandler(this.cbUCFLForSetOnly_CheckedChanged);
 			// 
 			// cbUCFLUseAll
 			// 
@@ -1227,7 +1226,6 @@ namespace VEPROMS
 			this.cbUCFLUseAll.Size = new System.Drawing.Size(105, 19);
 			this.cbUCFLUseAll.TabIndex = 4;
 			this.cbUCFLUseAll.Text = "Load Use All";
-			this.cbUCFLUseAll.CheckedChanged += new System.EventHandler(this.cbUCFLUseAll_CheckedChanged);
 			// 
 			// cbUCFLOnlyImport
 			// 
@@ -1243,7 +1241,6 @@ namespace VEPROMS
 			this.cbUCFLOnlyImport.Size = new System.Drawing.Size(105, 19);
 			this.cbUCFLOnlyImport.TabIndex = 3;
 			this.cbUCFLOnlyImport.Text = "Load Only Imported";
-			this.cbUCFLOnlyImport.CheckedChanged += new System.EventHandler(this.cbUCFLOnlyImport_CheckedChanged);
 			// 
 			// cbUCFLNotUsed
 			// 
@@ -1259,7 +1256,6 @@ namespace VEPROMS
 			this.cbUCFLNotUsed.Size = new System.Drawing.Size(88, 19);
 			this.cbUCFLNotUsed.TabIndex = 2;
 			this.cbUCFLNotUsed.Text = "Load Not Used";
-			this.cbUCFLNotUsed.CheckedChanged += new System.EventHandler(this.cbUCFLNotUsed_CheckedChanged);
 			// 
 			// cbUCFIgnore
 			// 
@@ -1275,7 +1271,6 @@ namespace VEPROMS
 			this.cbUCFIgnore.Size = new System.Drawing.Size(67, 19);
 			this.cbUCFIgnore.TabIndex = 1;
 			this.cbUCFIgnore.Text = "Ignore";
-			this.cbUCFIgnore.CheckedChanged += new System.EventHandler(this.cbUCFIgnore_CheckedChanged);
 			// 
 			// btnReset
 			// 

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;

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

@@ -71,9 +71,12 @@ namespace VEPROMS
 			this.labelItem10 = new DevComponents.DotNetBar.LabelItem();
 			this.bottomProgBar = new DevComponents.DotNetBar.ProgressBarItem();
 			this.labelItem9 = new DevComponents.DotNetBar.LabelItem();
+			this.lblPreEditView = new DevComponents.DotNetBar.LabelItem();
 			this.lblEditView = new DevComponents.DotNetBar.LabelItem();
 			this.labelItem11 = new DevComponents.DotNetBar.LabelItem();
 			this.btnItemInfo = new DevComponents.DotNetBar.ButtonItem();
+			this.btnFilter = new DevComponents.DotNetBar.ButtonItem();
+			this.txtFilter = new DevComponents.DotNetBar.TextBoxItem();
 			this.lblItemID = new DevComponents.DotNetBar.LabelItem();
 			this.lblResolution = new DevComponents.DotNetBar.LabelItem();
 			this.btnEditItem = new DevComponents.DotNetBar.ButtonItem();
@@ -524,19 +527,22 @@ namespace VEPROMS
 			this.bottomBar.Font = new System.Drawing.Font("Segoe UI", 9F);
 			this.bottomBar.IsMaximized = false;
 			this.bottomBar.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
-            this.labelItem10,
+			this.btnFilter,
+			this.txtFilter,
+			this.labelItem10,
             this.bottomProgBar,
             this.labelItem9,
-            this.lblEditView,
+			this.lblPreEditView,
-            this.labelItem11,
+			this.lblEditView,
-            this.btnItemInfo,
+			this.labelItem11,
-            this.lblItemID,
+			this.btnItemInfo,
-            this.lblResolution,
+			this.lblItemID,
-            this.btnEditItem,
+			this.lblResolution,
-            this.lblUser,
+			this.btnEditItem,
-            this.lblLastChange,
+			this.lblUser,
-            this.btnStepRTF,
+			this.lblLastChange,
-            this.btnFixMSWord});
+			this.btnStepRTF,
+			this.btnFixMSWord});
 			this.bottomBar.Location = new System.Drawing.Point(5, 573);
 			this.bottomBar.Name = "bottomBar";
 			this.bottomBar.Size = new System.Drawing.Size(1185, 25);
@@ -546,6 +552,21 @@ namespace VEPROMS
 			this.bottomBar.TabStop = false;
 			this.bottomBar.Text = "bar1";
 			// 
+			// btnFilter
+			// 
+			this.btnFilter.Name = "btnFilter";
+			this.btnFilter.Text = "Tree View Search:";
+			this.btnFilter.Click += SubmitFilter;
+			// 
+			// txtFilter
+			// 
+			this.txtFilter.TextBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
+			this.txtFilter.Name = "txtFilter";
+			this.txtFilter.TextBoxWidth = 120;
+			this.txtFilter.TextBox.TabIndex = 0;
+			this.txtFilter.TextBox.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.FilterEnterKey);
+			this.superTooltip1.SetSuperTooltip(this.txtFilter, new DevComponents.DotNetBar.SuperTooltipInfo("Filter", "", "This will filter the Procedure Tree in PROMS to Procedures containing entered words in the Procedure Number or Title. Press enter or the Tree View Search button to submit.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+			// 
 			// txtSearch
 			// 
 			this.txtSearch.Dock = System.Windows.Forms.DockStyle.Right;
@@ -647,6 +668,11 @@ namespace VEPROMS
 			this.lblEditView.ForeColor = System.Drawing.SystemColors.MenuText;
 			this.lblEditView.Name = "lblEditView";
 			this.lblEditView.Text = "Edit";
+			// lblEditView
+			// 
+			this.lblPreEditView.BorderSide = DevComponents.DotNetBar.eBorderSide.Left;
+			this.lblPreEditView.BorderType = DevComponents.DotNetBar.eBorderType.Bump;
+			this.lblPreEditView.Name = "lblPreEditView";
 			// 
 			// labelItem11
 			// 
@@ -1646,9 +1672,9 @@ namespace VEPROMS
 			this.ResumeLayout(false);
 
 		}
-		#endregion
+        #endregion
 
-		private DevComponents.DotNetBar.RibbonControl ribbonControl1;
+        private DevComponents.DotNetBar.RibbonControl ribbonControl1;
 		private DevComponents.DotNetBar.Office2007StartButton office2007StartButton1;
 		private DevComponents.DotNetBar.ItemContainer itemContainer1;
 		private DevComponents.DotNetBar.ItemContainer itemContainer2;
@@ -1744,8 +1770,11 @@ namespace VEPROMS
         private DevComponents.DotNetBar.TabItem tabItemLibDocs;
 		private Volian.Controls.Library.DisplayTags displayTags;
 		private Volian.Controls.Library.DisplaySearch displaySearch1;
+		private DevComponents.DotNetBar.LabelItem lblPreEditView;
 		private DevComponents.DotNetBar.LabelItem lblEditView;
 		private DevComponents.DotNetBar.ButtonItem btnItemInfo;
+		private DevComponents.DotNetBar.ButtonItem btnFilter;
+		private DevComponents.DotNetBar.TextBoxItem txtFilter;
 		private DevComponents.DotNetBar.ButtonItem btnFixMSWord;
 		private Volian.Controls.Library.DisplayBookMarks displayBookMarks;
 		//private DevComponents.DotNetBar.LabelItem lblLocked;

PROMS/VEPROMS User Interface/frmVEPROMS.cs

@@ -22,6 +22,9 @@ using Volian.Base.Library;
 using Volian.Print.Library;
 using JR.Utils.GUI.Forms;
 using System.Diagnostics;
+using System.Linq;
+using System.Collections.Concurrent;
+using System.Threading.Tasks;
 
 [assembly: log4net.Config.XmlConfigurator(Watch = true)]
 
@@ -269,8 +272,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
@@ -536,6 +537,7 @@ namespace VEPROMS
 			tv.QPrintSection += new vlnTreeViewEvent(tv_QPrintSection);
 			tv.QPrintProcedure += new vlnTreeViewEvent(tv_QPrintProcedure);
 			tv.PrintAllProcedures += new vlnTreeViewEvent(tv_PrintAllProcedures);
+			tv.PrintAllApprovedProcedures += new vlnTreeViewEvent(tv_PrintAllApprovedProcedures);
 			tv.ApproveProcedure += new vlnTreeViewEvent(tv_ApproveProcedure);
 			tv.ApproveAllProcedures += new vlnTreeViewEvent(tv_ApproveAllProcedures);
 			tv.ApproveSomeProcedures += new vlnTreeViewEvent(tv_ApproveSomeProcedures);
@@ -724,7 +726,7 @@ namespace VEPROMS
 					}
 					else
 					{
-						dlgExportImport dlg = new dlgExportImport(args.Index == 0 ? "Export" : "Import", fi, this, (E_UCFImportOptions)Properties.Settings.Default.UCFImportOpt);//Added frmVEPROMS Parameter
+						dlgExportImport dlg = new dlgExportImport(args.Index == 0 ? "Export" : "Import", fi, this);//Added frmVEPROMS Parameter
 						dlg.ShowDialog(this);
 
 						MySessionInfo.CheckInItem(ownerid);
@@ -778,7 +780,7 @@ namespace VEPROMS
 					else
 					{
 
-						dlgExportImport dlg = new dlgExportImport("Import", dvi, this, (E_UCFImportOptions)Properties.Settings.Default.UCFImportOpt);//Added frmVEPROMS Parameter
+						dlgExportImport dlg = new dlgExportImport("Import", dvi, this);//Added frmVEPROMS Parameter
 						dlg.MyNewProcedure = null;
 						dlg.ExternalTransitionItem = null;
 						dlg.ShowDialog(this);
@@ -820,7 +822,7 @@ namespace VEPROMS
 					else
 					{
 
-						dlgExportImport dlg = new dlgExportImport("Export", pi, this, (E_UCFImportOptions)0);//Added frmVEPROMS Parameter
+						dlgExportImport dlg = new dlgExportImport("Export", pi, this);//Added frmVEPROMS Parameter
 						dlg.ShowDialog(this);
 
 						MySessionInfo.CheckInItem(ownerid);
@@ -1215,6 +1217,26 @@ namespace VEPROMS
 			dvi.DocVersionConfig.SelectedSlave = 0;
 		}
 
+		// C2025-017 print all approved procedure to a specified folder
+		void tv_PrintAllApprovedProcedures(object sender, vlnTreeEventArgs args)
+		{
+			using (DocVersionInfo dvi = (args.Node as VETreeNode).VEObject as DocVersionInfo)
+			{
+				if (dvi == null) return;
+
+				tc.SaveCurrentEditItem(); // save the current edit item if user happens to be editing a procedure 
+
+				// add a diaglog to prompt for the path inwhich to put the approved pdfs 
+				int currentChildSetting = dvi.DocVersionConfig.SelectedSlave;
+				dvi.DocVersionConfig.SelectedSlave = args.UnitIndex; // set to selected child - will be -1 for non Parent/Child
+
+				dlgPrintAllApprovedProcedures dlgPrnAllAprv = new dlgPrintAllApprovedProcedures(dvi);
+				dlgPrnAllAprv.ShowDialog(this);
+
+				dvi.DocVersionConfig.SelectedSlave = currentChildSetting; // set back to what it was
+			}
+		}
+
 		void tv_PrintProcedure(object sender, vlnTreeEventArgs args)
 		{
 			ProcedureInfo pi = (args.Node as VETreeNode).VEObject as ProcedureInfo;
@@ -2010,9 +2032,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 btnGeneralTools;
-		private DevComponents.DotNetBar.ButtonItem btnUserControlOfFormatsImport;
+
 		private TabItemsToClose _MyCloseTabList = new TabItemsToClose();
 		
 		public TabItemsToClose MyCloseTabList
@@ -2202,45 +2224,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);
@@ -2251,13 +2243,22 @@ 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
 			{
@@ -2295,9 +2296,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;
@@ -2496,6 +2494,7 @@ namespace VEPROMS
 						int _ItemID = (int)TabState["ItemID"];
 						ItemInfo _Procedure = ItemInfo.Get(_ItemID);
 						// Open procedure in the editor.
+						if (_Procedure == null) continue; //skip and continue with foreach
 						OpenItem(_Procedure);
 						// SelectedStepTabPanel needs to be set so the print buttons on the ribbon will work.
 						SelectedStepTabPanel = tc.MyEditItem.MyStepPanel.MyStepTabPanel;
@@ -2775,6 +2774,199 @@ namespace VEPROMS
 			}
 		}
 
+		//C2024-036 IntelliSense
+		// Recursively Expand the Tree
+		// up to the procedure level
+		// Since items are only loaded as they are expanded,
+		// this is needed to search for matching text.
+		private void LoadAllProcedures(VETreeNode tn)
+        {
+			if (tn == null || tn.VEObject.IsProcedure)
+				return;
+
+			if (!tn.IsExpanded)
+				{ tn.Expand(); }
+
+            foreach (var nde in tn.Nodes)
+                LoadAllProcedures((VETreeNode)nde);
+        }
+
+		//C2024-036 IntelliSense
+		// Return a list containing all
+		// items in the Tree that match the entered text
+		// + any item that is a parent of those.
+		private List<IVEDrillDownReadOnly> GetMatchingTreeNodes(VETreeNode tn, string texttomatch)
+        {
+			List<IVEDrillDownReadOnly> matches = new List<IVEDrillDownReadOnly>();
+
+			//add any item that matches text
+			//and all parents back up to the top most item
+			if (tn.Text.ToLower().Contains(texttomatch.ToLower()))
+			{
+				matches.Add(tn.VEObject);
+				VETreeNode parent_tn = (VETreeNode) tn.Parent;
+				while (parent_tn != null)
+				{
+					if (!matches.Contains(parent_tn.VEObject))
+						{ matches.Add(parent_tn.VEObject); }
+					parent_tn = (VETreeNode)parent_tn.Parent;
+				}
+			}
+
+			if (!tn.VEObject.IsProcedure)
+			{
+				//if not at a procedure level,
+				//loop through sub items
+				//to check those for matches
+				foreach (VETreeNode nde in tn.Nodes.OfType<VETreeNode>())
+				{
+					if (nde.Text != "Dummy VETreeNode(IVEDrillDownReadOnly o)")
+                    {
+						List<IVEDrillDownReadOnly> tmpmatches = GetMatchingTreeNodes(nde, texttomatch);
+						matches.AddRange(from mtch in tmpmatches
+										 where !matches.Contains(mtch)
+										 select mtch);
+					}
+				}
+			}
+
+			return matches;
+		}
+
+		//C2024-036 IntelliSense
+		// Recursively loop through the Child Nodes
+		// in the TreeView
+		// remove anything not in the list
+		private bool FilterTreeNodes(VETreeNode tn, List<IVEDrillDownReadOnly> filterlist)
+		{
+			if (tn == null)
+				return false;
+
+			if (!filterlist.Contains(tn.VEObject) && (tn != (VETreeNode) tv.Nodes[0])) //Note:Always keep the top node
+			{
+				return true;
+			}
+			else if (!tn.VEObject.IsProcedure)
+			{
+				//if not a procedure
+				//mark the sub-items that need removal
+				List<TreeNode> lst = (from VETreeNode nde in tn.Nodes.OfType<VETreeNode>()
+                                      where FilterTreeNodes(nde, filterlist)
+                                      select (TreeNode) nde).ToList();
+
+				//remove all items in the removal list
+				//need to do this separately as can't modify the collection while looping through it above
+                while (lst.Count > 0)
+				{
+					tn.Nodes.Remove(lst[0]);
+					lst.Remove(lst[0]);
+				}
+
+				//found a folder that matched that has no matching procedures
+				//if this is case, allow folder to be expanded
+				if (tn.Nodes.Count == 0 && filterlist.Contains(tn.VEObject))
+                {
+					tn.ChildrenLoaded = false;
+					tn.RefreshNode();
+				}
+			}
+
+			return false;
+
+		}
+
+		//C2024-036 IntelliSense
+		//Collection to block for task to complete
+		private BlockingCollection<string> blockingQueueFilter = new BlockingCollection<string>();
+
+		//C2024-036 IntelliSense
+		// When Text Changes, Perform the filtering
+		// Note that uses a blocking collection
+		// in case multiple events fire at the same time
+		// this is to prevent incorrect behavior when
+		//doing something like hitting backspace a bunch
+		private void SubmitFilter(object sender, EventArgs e)
+		{		
+			//Consumer
+			Task.Run(() =>
+			{
+				//Blocks until a new filter is available
+				while (!blockingQueueFilter.IsCompleted)
+				{
+					string fltrtxt = blockingQueueFilter.Take(); 
+					ProcessFilter(fltrtxt);
+				}
+			});
+
+			//Producer
+			Task.Run(() => { blockingQueueFilter.Add(txtFilter?.Text); });
+
+		}
+
+		//C2024-036 IntelliSense
+		// When Enter Key is pressed in the TextBox
+		private void FilterEnterKey(object sender, KeyPressEventArgs e)
+		{
+			if (e.KeyChar == '\r') // enter key pressed
+			{
+				e.Handled = true;
+				SubmitFilter(sender, e);
+			}
+		}
+
+		//C2024-036 IntelliSense
+		// When Text Changes, Perform the filtering
+		// Note that uses Invoke to
+		// avoid multi-threaded problems
+		//with the blocking collection
+		private void ProcessFilter(string fltrtxt)
+        {
+			//Step 1: reload the base tree
+			VETreeNode tbase = (VETreeNode)tv.Nodes[0];
+			tbase.ChildrenLoaded = false;
+			this.Invoke((Action) (() => { tbase.RefreshNode(); }));
+
+			if (!string.IsNullOrEmpty(fltrtxt))
+			{
+				//Step 2: Expand all TreeNodes
+				this.Invoke((Action)(() => { LoadAllProcedures(tbase); }));
+
+				//Step 3: get items that match filter to those containing the title or number
+				List<IVEDrillDownReadOnly> filterlist = GetMatchingTreeNodes(tbase, fltrtxt);
+
+				//Step 4: filter to those containing the title or number
+				this.Invoke((Action)(() => {FilterTreeNodes(tbase, filterlist);}));
+
+				//Step 5: refresh the view
+				this.Invoke((Action)(() => {tv.Update();}));
+
+				//Step 6: select 1st procedure in tree view
+				this.Invoke((Action)(() => {SelectFirstProcedure(filterlist);}));
+			}
+
+			//Step 7: set progress bar as done
+			this.Invoke((Action)(() => {ProgBarText = "Filtering Complete";}));
+
+		}
+
+		//C2024-036 IntelliSense
+		//Gives Focus to last child in first section of treeview
+		//then given focus to treeview 
+		//so that can click enter and open 1st found item/procedure
+		void SelectFirstProcedure(List<IVEDrillDownReadOnly> filterlist)
+        {
+			TreeNode tn = tv.Nodes[0];
+			while (tn.Nodes.Count > 0 && filterlist.Contains(((VETreeNode) tn).VEObject))
+			{
+				tn = tn.Nodes[0];
+			} 
+
+			tv.SelectedNode = tn;
+			tv.Enabled = true;
+			tv.SelectedNode.Collapse();
+			tv.Focus();
+		}
+
 		void btnPrevious_Click(object sender, EventArgs e)
 		{
 			CurrentID = FindPreviousLine();
@@ -2954,6 +3146,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)
@@ -3135,32 +3334,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();
@@ -5378,3 +5551,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;
+				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
+				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 onlyDoList = (E_ReplaceFlags)(rs.Flag & E_ReplaceFlags.BeforeList) == E_ReplaceFlags.BeforeList; // C2021-045, C2025-022 remove UFC
-					bool onlyIfFirstWord = (E_ReplaceFlags)(rs.Flag & FormatConfig.E_ReplaceFlagsUCF.FirstWord) == E_ReplaceFlags.FirstWord; // C2021-056
+					bool onlyIfFirstWord = (E_ReplaceFlags)(rs.Flag & E_ReplaceFlags.FirstWord) == E_ReplaceFlags.FirstWord; // C2021-056
-					bool doInPagelist = (E_ReplaceFlags)(rs.Flag & FormatConfig.E_ReplaceFlagsUCF.PageList) == E_ReplaceFlags.PageList; // B2021-132
+					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
+																														  //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 onlyDoList = (E_ReplaceFlags)(rs.Flag & E_ReplaceFlags.BeforeList) == E_ReplaceFlags.BeforeList; // C2021-045
-					bool onlyIfFirstWord = (E_ReplaceFlags)(rs.Flag & FormatConfig.E_ReplaceFlagsUCF.FirstWord) == E_ReplaceFlags.FirstWord; // C2021-056
+					bool onlyIfFirstWord = (E_ReplaceFlags)(rs.Flag) == E_ReplaceFlags.FirstWord; // C2021-056
-					bool doInPagelist = (E_ReplaceFlags)(rs.Flag & FormatConfig.E_ReplaceFlagsUCF.PageList) == E_ReplaceFlags.PageList; // B2021-132
+					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;
+        private ReplaceStr _MyWord;
-        public FormatConfig.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

@@ -6067,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;
@@ -6099,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;
@@ -6111,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)
@@ -6161,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/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/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.Base.Library/frmRtfEdit.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/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/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/vlnTreeView.cs

@@ -563,6 +563,11 @@ namespace Volian.Controls.Library
 		{
 			if (PrintAllProcedures != null) PrintAllProcedures(sender, args);
 		}
+		public event vlnTreeViewEvent PrintAllApprovedProcedures; //C2025-017 print all approved procedures
+		private void OnPrintAllApprovedProcedures(object sender, vlnTreeEventArgs args)
+		{
+			if (PrintAllApprovedProcedures != null) PrintAllApprovedProcedures(sender, args);
+		}
 		public event vlnTreeViewEvent SelectDateToStartChangeBars;
 		private void OnSelectDateToStartChangeBars(object sender, vlnTreeEventArgs args)
 		{
@@ -784,6 +789,7 @@ namespace Volian.Controls.Library
 								MenuItem mip = new MenuItem("Print All Procedures for");
 								MenuItem mia = new MenuItem("Approve All Procedures for");
 								MenuItem mis = new MenuItem("Approve Some Procedures for");
+								MenuItem mir = new MenuItem("Print All Approved Procedures for"); // C2025-017 print all approved procedures
 								int k = 0;
 								foreach (string s in dvi.UnitNames)
 								{
@@ -794,6 +800,8 @@ namespace Volian.Controls.Library
 									ma.Tag = k;
 									MenuItem ms = mis.MenuItems.Add(s, new EventHandler(miMultiUnit_Click));
 									ms.Tag = k;
+									MenuItem mr = mir.MenuItems.Add(s, new EventHandler(miMultiUnit_Click)); // C2025-017 print all approved procedures
+									mr.Tag = k;
 								}
 								//MenuItem mmp = mip.MenuItems.Add("All Units", new EventHandler(miMultiUnit_Click));
 								//mmp.Tag = 0;
@@ -804,6 +812,7 @@ namespace Volian.Controls.Library
 								cm.MenuItems.Add(mip);
 								cm.MenuItems.Add(mia);
 								cm.MenuItems.Add(mis);
+								cm.MenuItems.Add(mir); // C2025-017 print all approved procedures
 							}
 							else
 							{
@@ -811,6 +820,7 @@ namespace Volian.Controls.Library
 								cm.MenuItems.Add("Print All Procedures", new EventHandler(mi_Click));
 								cm.MenuItems.Add("Approve All Procedures", new EventHandler(mi_Click));
 								cm.MenuItems.Add("Approve Some Procedures", new EventHandler(mi_Click));
+								cm.MenuItems.Add("Print All Approved Procedures", new EventHandler(mi_Click));
 							}
 							cm.MenuItems.Add("Report All Procedures Inconsistencies", new EventHandler(mi_Click));
 						}
@@ -2035,6 +2045,9 @@ namespace Volian.Controls.Library
 				case "Create Time Critical Action Summary":
 					OnCreateTimeCriticalActionSummary(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0, mi.Text, (int)mi.Tag));
 					break;
+				case "Print All Approved Procedures for": //C2025-017 print all approved procedures
+					OnPrintAllApprovedProcedures(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0, mi.Text, (int)mi.Tag));
+					break;
 				default:
 					if (mip.Text.StartsWith("Showing Change Bars Starting"))
 						OnSelectDateToStartChangeBars(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0));
@@ -2133,16 +2146,6 @@ namespace Volian.Controls.Library
 				OnPrintTransitionReport(this, new vlnTreeEventArgs(SelectedNode as VETreeNode));
 				return;
 			}
-
-
-
-
-
-
-
-
-
-
 			if (mi.Text == "Export Procedure Set" || mi.Text == "Export Procedure")
 			{
 				OnExportImportProcedureSets(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0));
@@ -2346,6 +2349,9 @@ namespace Volian.Controls.Library
 				//case "Check In Procedure Set":
 				//  CheckInDocVersion(SelectedNode as VETreeNode);
 				//  break;
+				case "Print All Approved Procedures": //C2025-017 print all approved procedures
+					OnPrintAllApprovedProcedures(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0));
+					break;
 				default:
 					if (mi.Text.StartsWith("Showing Change Bars Starting"))
 						OnSelectDateToStartChangeBars(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0));

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;