Merge pull request 'Development' (#576) from Development into master

Merging Dev into Master after successful testing.

PROMS/Formats/Formats.csproj

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

PROMS/VEPROMS User Interface/DlgAnnotationsSelect.cs

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

PROMS/VEPROMS User Interface/DlgAnnotationsSelect.resx

@@ -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=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

PROMS/VEPROMS User Interface/PROMSFixes.Sql

@@ -1,3 +1,5 @@
+
+
 Set NoCount On;
 
 If (db_name() in('master','model','msdn','tempdb'))
@@ -24024,7 +24026,7 @@ Begin -- Rofst Tables
 	 CONSTRAINT [PK_EPFormats] PRIMARY KEY CLUSTERED 
 	(
 		[FormatID] ASC
-	)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+	)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON, OPTIMIZE_FOR_SEQUENTIAL_KEY = OFF) ON [PRIMARY]
 	) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
 
 	IF (@@Error = 0) PRINT 'Table Creation: [EPFormats] Succeeded'
@@ -24033,7 +24035,6 @@ Begin -- Rofst Tables
 End
 Go
 
-
 IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[vesp_UpdateEPFormat]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
 	DROP PROCEDURE [vesp_UpdateEPFormat];
 GO
@@ -24074,217 +24075,6 @@ ELSE
 
 GO
 
--- C2025-027 Annotation Type Filtering
-/****** Object:  Table [dbo].[AnnotationTypeSelections]    Script Date: 7/10/2025 2:38:23 PM ******/
-SET ANSI_NULLS ON
-GO
-
-SET QUOTED_IDENTIFIER ON
-GO
-
--- =============================================
--- Author:		Paul Larsen
--- Create date: 07/10/2025
--- Description:	Store user Annotation selections for annotation filter.
--- =============================================
-IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[AnnotationTypeSelections]') AND type in (N'U'))
-BEGIN
-
-	CREATE TABLE [dbo].[AnnotationTypeSelections](
-		[ASTypeID] [int] IDENTITY(1,1) NOT NULL,
-		[TypeID] [int] NULL,
-		[UserID] [varchar](50) NULL,
-		[LastChanged] [datetime] NULL,
-		CONSTRAINT [PK_AnnotationTypeSelections] PRIMARY KEY CLUSTERED 
-		([ASTypeID] ASC)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-			) ON [PRIMARY]
-END
-
-IF OBJECT_ID('DF_AnnotationTypeSelections_LastChanged', 'D') IS NULL
-	ALTER TABLE AnnotationTypeSelections ADD CONSTRAINT [DF_AnnotationTypeSelections_LastChanged]  DEFAULT (getdate()) for [LastChanged];
-GO
-
-IF EXISTS (SELECT *  FROM sys.indexes  WHERE name='idx_AnnotationTypeSelections_UserIDTypeID' 
-AND object_id = OBJECT_ID('[dbo].[AnnotationTypeSelections]'))
-begin
-DROP INDEX [idx_AnnotationTypeSelections_UserIDTypeID] ON [dbo].[AnnotationTypeSelections];
-end
-
-CREATE UNIQUE INDEX [idx_AnnotationTypeSelections_UserIDTypeID] ON [dbo].[AnnotationTypeSelections]
-(
-[UserID] ASC,
-[TypeID] ASC
-)
-INCLUDE (ASTypeID)
-WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-GO
-
--- C2025-027 Annotation Type Filtering
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[getAnnotationSelectListTypes]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
-	DROP PROCEDURE [getAnnotationSelectListTypes];
-GO
-
--- =============================================
--- Author:		Paul Larsen
--- Create date: 7/10/2025
--- Description:	Retrieve Annotation Types not added to Annotation type filtering by user.
--- =============================================
-CREATE PROCEDURE [dbo].[getAnnotationSelectListTypes]
-(
-	@UserID varchar(50)
-)
-WITH EXECUTE AS OWNER
-AS
-	SELECT
-		AT.[TypeID],
-		AT.[Name],
-		AT.[Config],
-		AT.[DTS],
-		AT.[UserID],
-		AT.[LastChanged],
-		(SELECT COUNT(*) FROM [Annotations] WHERE [Annotations].[TypeID]= AT.[TypeID]) [AnnotationCount],
-		AT.[IsEPAnnotationType]
-	FROM [AnnotationTypes] AT
-	LEFT OUTER JOIN AnnotationTypeSelections ATS 
-	ON ATS.TypeID = AT.TypeID AND ATS.UserID = @UserID	    
-	WHERE ATS.ASTypeID IS NULL
-GO
-
--- C2025-027 Annotation Type Filtering
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[getAnnotationstypeSelections]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
-	DROP PROCEDURE [getAnnotationstypeSelections];
-GO
-
-SET ANSI_NULLS ON
-GO
-SET QUOTED_IDENTIFIER ON
-GO
--- =============================================
--- Author:		Paul Larsen
--- Create date: 07/10/2025
--- Description:	Retrieve Current Annotation Types 
--- =============================================
-
-CREATE PROC [dbo].[getAnnotationstypeSelections]
-(
-	@UsrID varchar(50)
-)
-AS
-	BEGIN
-		SELECT [ASTypeID]
-			  ,ATS.[TypeID]
-			  ,ATS.[UserID]
-			  ,AT.[Name]
-			  ,AT.[Config]
-			  ,ATS.[LastChanged]
-			  ,AT.[UserID]
-			  ,AT.[IsEPAnnotationType]
-		FROM [dbo].[AnnotationTypeSelections] ATS
-		INNER JOIN AnnotationTypes AT ON AT.TypeID = ATS.TypeID
-		WHERE ATS.UserID = @UsrID
-	END
-
-GO
-
--- C2025-027 Annotation Type Filtering
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[getAnnotationstypeFiltered]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
-	DROP PROCEDURE [getAnnotationstypeFiltered];
-GO
-
--- =============================================
--- Author:		Paul Larsen
--- Create date: 07/10/2025
--- Description:	Retrieve Current Annotation Types 
--- =============================================
-
-CREATE PROC [dbo].[getAnnotationstypeFiltered]
-(
-	@UsrID varchar(50)
-)
-AS
-BEGIN
-	IF((SELECT count(TypeID) FROM AnnotationTypeSelections WHERE UserID = @UsrID) > 0)
-	BEGIN
-		SELECT [ASTypeID]
-			  ,ATS.[TypeID]
-			  ,ATS.[UserID]
-			  ,AT.[Name]
-			  ,AT.[Config]
-			  ,ATS.[LastChanged]
-			  ,AT.[UserID]
-			  ,AT.[IsEPAnnotationType]
-		FROM [dbo].[AnnotationTypeSelections] ATS
-		INNER JOIN AnnotationTypes AT ON AT.TypeID = ATS.TypeID
-		WHERE ATS.UserID = @UsrID
-	END
-	ELSE
-	BEGIN
-		SELECT
-			[TypeID],
-			[Name],
-			[Config],
-			[DTS],
-			[UserID],
-			[LastChanged],
-			(SELECT COUNT(*) FROM [Annotations] WHERE [Annotations].[TypeID]=[AnnotationTypes].[TypeID]) [AnnotationCount],
-			[IsEPAnnotationType]
-		FROM [AnnotationTypes]
-	END
-END
-
-GO
-
--- C2025-027 Annotation Type Filtering
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[UpdateAnnotationstypeSelections]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
-	DROP PROCEDURE [UpdateAnnotationstypeSelections];
-
--- Need to drop UpdateAnnotationstypeSelections SP first so script can drop and recreate the TableValAnnotTypeSelections table type 
-
-IF EXISTS( SELECT * FROM INFORMATION_SCHEMA.DOMAINS WHERE Domain_Name = 'TableValAnnotTypeSelections' )
-    DROP TYPE [dbo].[TableValAnnotTypeSelections]
-
-CREATE TYPE [dbo].[TableValAnnotTypeSelections] AS TABLE(
-	[TypeID] [int] NOT NULL
-							
-)
-GO
-
-/****** Object:  StoredProcedure [dbo].[UpdateAnnotationstypeSelections]    Script Date: 7/21/2025 8:51:42 PM ******/
-
--- =============================================
--- Author:		Paul Larsen
--- Create date: 07/21/2025
--- Description:	Manage user choice annotation types
--- =============================================
-CREATE PROC [dbo].[UpdateAnnotationstypeSelections]
-(
-	@TempTable AS dbo.TableValAnnotTypeSelections READONLY,
-	@UserID [varchar](50) NULL
-)
-AS
-BEGIN
-																	 
-															
-
-	DELETE FROM AnnotationTypeSelections where UserID = @UserID
-	AND
-	TypeID not in
-	(Select TypeID From @TempTable tmp)
-
-	--this would insert all the ones that are in the uploaded table and not already in AnnotationTypeSelections
-	Insert INTO AnnotationTypeSelections (TypeID, UserID)
-	Select tmp.TypeID, @UserID
-	FROM
-	@TempTable tmp
-	LEFT OUTER JOIN
-	AnnotationTypeSelections ATS on ATS.TypeID = tmp.TypeID
-	AND ATS.UserID = @UserID
-	where
-	ATS.ASTypeID IS NULL
-
-END
-GO
-
 IF (@@Error = 0) PRINT 'Running vesp_UpdateEPFormat Succeeded'
 ELSE PRINT 'Running vesp_UpdateEPFormat Failed to Execute'
 GO
@@ -24327,8 +24117,8 @@ BEGIN TRY -- Try Block
 	DECLARE @RevDate varchar(255)
 	DECLARE @RevDescription varchar(255)
 
-	set @RevDate = '07/31/2025 10:30 AM'
-	set @RevDescription = 'SQL Optimization'
+	set @RevDate = '6/20/2025 3:07 PM'
+	set @RevDescription = 'Annotation Support'
 
 	Select  cast(@RevDate as datetime) RevDate, @RevDescription  RevDescription
 	PRINT 'SQL Code Revision ' + @RevDate + ' - ' + @RevDescription

PROMS/VEPROMS User Interface/VEPROMS_UI.csproj

@@ -152,17 +152,6 @@
       <DependentUpon>AboutVEPROMS.cs</DependentUpon>
     </Compile>
     <Compile Include="BookMarks.cs" />
-    <Compile Include="dlgAnnotationsSelect.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="dlgAnnotationsSelect.Designer.cs">
-      <DependentUpon>dlgAnnotationsSelect.cs</DependentUpon>
-    </Compile>
-    <Compile Include="dlgAnnotationsSelect.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>dlgAnnotationsSelect.resx</DependentUpon>
-    </Compile>
     <Compile Include="dlgApproveProcedure.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -175,9 +164,6 @@
     <Compile Include="dlgCheckedOutProcedure.designer.cs">
       <DependentUpon>dlgCheckedOutProcedure.cs</DependentUpon>
     </Compile>
-    <Compile Include="dlgExportImportEP.cs">
-      <SubType>Form</SubType>
-    </Compile>
     <Compile Include="dlgMSWordMessage.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -351,10 +337,6 @@
       <SubType>Designer</SubType>
       <DependentUpon>AboutVEPROMS.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="dlgAnnotationsSelect.resx">
-      <DependentUpon>dlgAnnotationsSelect.cs</DependentUpon>
-      <Generator>ResXFileCodeGenerator</Generator>
-    </EmbeddedResource>
     <EmbeddedResource Include="dlgMSWordMessage.resx">
       <DependentUpon>dlgMSWordMessage.cs</DependentUpon>
     </EmbeddedResource>

PROMS/VEPROMS User Interface/dlgAnnotationsSelect.Designer.cs

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

PROMS/VEPROMS User Interface/dlgExportImportEP.cs

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

PROMS/VEPROMS User Interface/frmSysOptions.Designer.cs

@@ -30,7 +30,7 @@ namespace VEPROMS
 		{
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmSysOptions));
-			//this.btnCancel = new DevComponents.DotNetBar.ButtonX();
+            this.btnCancel = new DevComponents.DotNetBar.ButtonX();
             this.btnOK = new DevComponents.DotNetBar.ButtonX();
             this.gpSystemColor = new DevComponents.DotNetBar.Controls.GroupPanel();
             this.cbRibonBlack = new DevComponents.DotNetBar.Controls.CheckBoxX();
@@ -42,14 +42,11 @@ namespace VEPROMS
             this.btnGeneral = new DevComponents.DotNetBar.ButtonX();
             this.tcSysOpts = new DevComponents.DotNetBar.TabControl();
             this.tabControlPanel3 = new DevComponents.DotNetBar.TabControlPanel();
-			this.gpMSWordSum = new DevComponents.DotNetBar.Controls.GroupPanel();
-			this.cbMSWordPrompt = new DevComponents.DotNetBar.Controls.CheckBoxX();
             this.gpOpenTabs = new DevComponents.DotNetBar.Controls.GroupPanel();
             this.cbOTRemember = new DevComponents.DotNetBar.Controls.CheckBoxX();
             this.cbOTAutoOpen = new DevComponents.DotNetBar.Controls.CheckBoxX();
             this.gpShwRplWords = new DevComponents.DotNetBar.Controls.GroupPanel();
             this.cbShwRplWrdsColor = new DevComponents.DotNetBar.Controls.CheckBoxX();
-			this.gpAnnoTypeFilter = new DevComponents.DotNetBar.Controls.GroupPanel();
             this.gpVisioPath = new DevComponents.DotNetBar.Controls.GroupPanel();
             this.txbxVisioPath = new DevComponents.DotNetBar.Controls.TextBoxX();
             this.gpSeparateWindows = new DevComponents.DotNetBar.Controls.GroupPanel();
@@ -83,16 +80,15 @@ namespace VEPROMS
             this.cbUCFIgnore = new DevComponents.DotNetBar.Controls.CheckBoxX();
             this.btnReset = new DevComponents.DotNetBar.ButtonX();
             this.superTooltip1 = new DevComponents.DotNetBar.SuperTooltip();
-			this.cbShwAnnoFilter = new DevComponents.DotNetBar.ButtonX();
+            this.cbMSWordPrompt = new DevComponents.DotNetBar.Controls.CheckBoxX();
+            this.gpMSWordSum = new DevComponents.DotNetBar.Controls.GroupPanel();
             this.gpSystemColor.SuspendLayout();
             this.panButtons.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.tcSysOpts)).BeginInit();
             this.tcSysOpts.SuspendLayout();
             this.tabControlPanel3.SuspendLayout();
-			this.gpMSWordSum.SuspendLayout();
             this.gpOpenTabs.SuspendLayout();
             this.gpShwRplWords.SuspendLayout();
-			this.gpAnnoTypeFilter.SuspendLayout();
             this.gpVisioPath.SuspendLayout();
             this.gpSeparateWindows.SuspendLayout();
             this.gpEnhancedDocs.SuspendLayout();
@@ -102,24 +98,25 @@ namespace VEPROMS
             this.gpAnnotationSettings.SuspendLayout();
             this.gpTransRangeColor.SuspendLayout();
             this.gpPropPageStyle.SuspendLayout();
+            this.gpMSWordSum.SuspendLayout();
             this.SuspendLayout();
-			//// 
-			//// btnCancel
-			//// 
-			//this.btnCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
-			//this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			//this.btnCancel.Location = new System.Drawing.Point(616, 591);
-			//this.btnCancel.Margin = new System.Windows.Forms.Padding(2);
-			//this.btnCancel.Name = "btnCancel";
-			//this.btnCancel.Size = new System.Drawing.Size(56, 19);
-			//this.btnCancel.TabIndex = 0;
-			//this.btnCancel.Text = "Cancel";
-			//this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
+            // 
+            // btnCancel
+            // 
+            this.btnCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.btnCancel.Location = new System.Drawing.Point(616, 591);
+            this.btnCancel.Margin = new System.Windows.Forms.Padding(2);
+            this.btnCancel.Name = "btnCancel";
+            this.btnCancel.Size = new System.Drawing.Size(56, 19);
+            this.btnCancel.TabIndex = 0;
+            this.btnCancel.Text = "Cancel";
+            this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
             // 
             // btnOK
             // 
             this.btnOK.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
-			this.btnOK.Location = new System.Drawing.Point(616, 591);
+            this.btnOK.Location = new System.Drawing.Point(542, 591);
             this.btnOK.Margin = new System.Windows.Forms.Padding(2);
             this.btnOK.Name = "btnOK";
             this.btnOK.Size = new System.Drawing.Size(56, 19);
@@ -288,8 +285,8 @@ namespace VEPROMS
             this.tcSysOpts.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(194)))), ((int)(((byte)(217)))), ((int)(((byte)(247)))));
             this.tcSysOpts.CanReorderTabs = true;
             this.tcSysOpts.Controls.Add(this.tabControlPanel3);
-			this.tcSysOpts.Controls.Add(this.tabControlPanel2);
             this.tcSysOpts.Controls.Add(this.tabControlPanel1);
+            this.tcSysOpts.Controls.Add(this.tabControlPanel2);
             this.tcSysOpts.Location = new System.Drawing.Point(27, 17);
             this.tcSysOpts.Margin = new System.Windows.Forms.Padding(2);
             this.tcSysOpts.Name = "tcSysOpts";
@@ -310,7 +307,6 @@ namespace VEPROMS
             this.tabControlPanel3.Controls.Add(this.gpMSWordSum);
             this.tabControlPanel3.Controls.Add(this.gpOpenTabs);
             this.tabControlPanel3.Controls.Add(this.gpShwRplWords);
-			this.tabControlPanel3.Controls.Add(this.gpAnnoTypeFilter);
             this.tabControlPanel3.Controls.Add(this.gpVisioPath);
             this.tabControlPanel3.Controls.Add(this.gpSeparateWindows);
             this.tabControlPanel3.Controls.Add(this.gpEnhancedDocs);
@@ -337,62 +333,6 @@ namespace VEPROMS
             this.tabControlPanel3.TabItem = this.tiIntrFaceStngs;
             this.tabControlPanel3.ThemeAware = true;
             // 
-			// gpMSWordSum
-			// 
-			this.gpMSWordSum.BackColor = System.Drawing.Color.Transparent;
-			this.gpMSWordSum.CanvasColor = System.Drawing.SystemColors.Control;
-			this.gpMSWordSum.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
-			this.gpMSWordSum.Controls.Add(this.cbMSWordPrompt);
-			this.gpMSWordSum.DisabledBackColor = System.Drawing.Color.Empty;
-			this.gpMSWordSum.Location = new System.Drawing.Point(25, 347);
-			this.gpMSWordSum.Margin = new System.Windows.Forms.Padding(2);
-			this.gpMSWordSum.Name = "gpMSWordSum";
-			this.gpMSWordSum.Size = new System.Drawing.Size(119, 81);
-			// 
-			// 
-			// 
-			this.gpMSWordSum.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
-			this.gpMSWordSum.Style.BackColorGradientAngle = 90;
-			this.gpMSWordSum.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
-			this.gpMSWordSum.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.gpMSWordSum.Style.BorderBottomWidth = 1;
-			this.gpMSWordSum.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
-			this.gpMSWordSum.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.gpMSWordSum.Style.BorderLeftWidth = 1;
-			this.gpMSWordSum.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.gpMSWordSum.Style.BorderRightWidth = 1;
-			this.gpMSWordSum.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.gpMSWordSum.Style.BorderTopWidth = 1;
-			this.gpMSWordSum.Style.CornerDiameter = 4;
-			this.gpMSWordSum.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
-			this.gpMSWordSum.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
-			this.gpMSWordSum.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
-			this.gpMSWordSum.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
-			// 
-			// 
-			// 
-			this.gpMSWordSum.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			// 
-			// 
-			// 
-			this.gpMSWordSum.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.gpMSWordSum.TabIndex = 14;
-			this.gpMSWordSum.Text = "Opening in MS Word";
-			// 
-			// cbMSWordPrompt
-			// 
-			// 
-			// 
-			// 
-			this.cbMSWordPrompt.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.cbMSWordPrompt.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.cbMSWordPrompt.Location = new System.Drawing.Point(8, 5);
-			this.cbMSWordPrompt.Margin = new System.Windows.Forms.Padding(2);
-			this.cbMSWordPrompt.Name = "cbMSWordPrompt";
-			this.cbMSWordPrompt.Size = new System.Drawing.Size(92, 44);
-			this.cbMSWordPrompt.TabIndex = 9;
-			this.cbMSWordPrompt.Text = "Show Prompt For Summaries";
-			// 
             // gpOpenTabs
             // 
             this.gpOpenTabs.BackColor = System.Drawing.Color.Transparent;
@@ -524,46 +464,6 @@ namespace VEPROMS
             this.cbShwRplWrdsColor.Text = "Color Replace Words";
             this.cbShwRplWrdsColor.CheckedChanged += new System.EventHandler(this.cbShwRplWrdsColor_CheckedChanged);
             // 
-			// gpAnnoTypeFilter
-			// 
-			this.gpAnnoTypeFilter.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
-			this.gpAnnoTypeFilter.Controls.Add(this.cbShwAnnoFilter);
-			this.gpAnnoTypeFilter.DisabledBackColor = System.Drawing.Color.Empty;
-			this.gpAnnoTypeFilter.Location = new System.Drawing.Point(324, 12);
-			this.gpAnnoTypeFilter.Margin = new System.Windows.Forms.Padding(2);
-			this.gpAnnoTypeFilter.Name = "gpAnnoTypeFilter";
-			this.gpAnnoTypeFilter.Size = new System.Drawing.Size(150, 72);
-			// 
-			// 
-			// 
-			this.gpAnnoTypeFilter.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
-			this.gpAnnoTypeFilter.Style.BackColorGradientAngle = 90;
-			this.gpAnnoTypeFilter.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
-			this.gpAnnoTypeFilter.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.gpAnnoTypeFilter.Style.BorderBottomWidth = 1;
-			this.gpAnnoTypeFilter.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
-			this.gpAnnoTypeFilter.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.gpAnnoTypeFilter.Style.BorderLeftWidth = 1;
-			this.gpAnnoTypeFilter.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.gpAnnoTypeFilter.Style.BorderRightWidth = 1;
-			this.gpAnnoTypeFilter.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.gpAnnoTypeFilter.Style.BorderTopWidth = 1;
-			this.gpAnnoTypeFilter.Style.CornerDiameter = 4;
-			this.gpAnnoTypeFilter.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
-			this.gpAnnoTypeFilter.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
-			this.gpAnnoTypeFilter.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
-			this.gpAnnoTypeFilter.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
-			// 
-			// 
-			// 
-			this.gpAnnoTypeFilter.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			// 
-			// 
-			// 
-			this.gpAnnoTypeFilter.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.gpAnnoTypeFilter.TabIndex = 13;
-			this.gpAnnoTypeFilter.Text = "Filter Annotation Types";
-			// 
             // gpVisioPath
             // 
             this.gpVisioPath.BackColor = System.Drawing.Color.Transparent;
@@ -1155,7 +1055,7 @@ namespace VEPROMS
             this.tabControlPanel1.Margin = new System.Windows.Forms.Padding(2);
             this.tabControlPanel1.Name = "tabControlPanel1";
             this.tabControlPanel1.Padding = new System.Windows.Forms.Padding(1);
-			this.tabControlPanel1.Size = new System.Drawing.Size(645, 528);
+            this.tabControlPanel1.Size = new System.Drawing.Size(645, 430);
             this.tabControlPanel1.Style.BackColor1.Color = System.Drawing.SystemColors.Control;
             this.tabControlPanel1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
             this.tabControlPanel1.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) 
@@ -1296,31 +1196,75 @@ namespace VEPROMS
             this.superTooltip1.DefaultTooltipSettings = new DevComponents.DotNetBar.SuperTooltipInfo("", "", "", null, null, DevComponents.DotNetBar.eTooltipColor.Gray);
             this.superTooltip1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
             // 
-			// cbShwAnnoFilter
+            // cbMSWordPrompt
             // 
-			this.cbShwAnnoFilter.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
-			this.cbShwAnnoFilter.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-			this.cbShwAnnoFilter.Location = new System.Drawing.Point(25, 13);
-			this.cbShwAnnoFilter.Name = "cbShwAnnoFilter";
-			this.cbShwAnnoFilter.Size = new System.Drawing.Size(91, 23);
-			this.cbShwAnnoFilter.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-			this.cbShwAnnoFilter.TabIndex = 0;
-			this.cbShwAnnoFilter.Text = "Open";
-			this.cbShwAnnoFilter.Click += new System.EventHandler(this.cbShwAnnoFilter_Click);
+            // 
+            // 
+            // 
+            this.cbMSWordPrompt.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.cbMSWordPrompt.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.cbMSWordPrompt.Location = new System.Drawing.Point(8, 5);
+            this.cbMSWordPrompt.Margin = new System.Windows.Forms.Padding(2);
+            this.cbMSWordPrompt.Name = "cbMSWordPrompt";
+            this.cbMSWordPrompt.Size = new System.Drawing.Size(92, 44);
+            this.cbMSWordPrompt.TabIndex = 9;
+            this.cbMSWordPrompt.Text = "Show Prompt For Summaries";
+            // 
+            // gpMSWordSum
+            // 
+            this.gpMSWordSum.BackColor = System.Drawing.Color.Transparent;
+            this.gpMSWordSum.CanvasColor = System.Drawing.SystemColors.Control;
+            this.gpMSWordSum.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
+            this.gpMSWordSum.Controls.Add(this.cbMSWordPrompt);
+            this.gpMSWordSum.DisabledBackColor = System.Drawing.Color.Empty;
+            this.gpMSWordSum.Location = new System.Drawing.Point(25, 347);
+            this.gpMSWordSum.Margin = new System.Windows.Forms.Padding(2);
+            this.gpMSWordSum.Name = "gpMSWordSum";
+            this.gpMSWordSum.Size = new System.Drawing.Size(119, 81);
+            // 
+            // 
+            // 
+            this.gpMSWordSum.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
+            this.gpMSWordSum.Style.BackColorGradientAngle = 90;
+            this.gpMSWordSum.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
+            this.gpMSWordSum.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.gpMSWordSum.Style.BorderBottomWidth = 1;
+            this.gpMSWordSum.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            this.gpMSWordSum.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.gpMSWordSum.Style.BorderLeftWidth = 1;
+            this.gpMSWordSum.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.gpMSWordSum.Style.BorderRightWidth = 1;
+            this.gpMSWordSum.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.gpMSWordSum.Style.BorderTopWidth = 1;
+            this.gpMSWordSum.Style.CornerDiameter = 4;
+            this.gpMSWordSum.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
+            this.gpMSWordSum.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
+            this.gpMSWordSum.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+            this.gpMSWordSum.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
+            // 
+            // 
+            // 
+            this.gpMSWordSum.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.gpMSWordSum.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.gpMSWordSum.TabIndex = 14;
+            this.gpMSWordSum.Text = "Opening in MS Word";
             // 
             // frmSysOptions
             // 
             this.AcceptButton = this.btnOK;
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			//this.CancelButton = this.btnCancel;
+            this.CancelButton = this.btnCancel;
             this.ClientSize = new System.Drawing.Size(699, 620);
             this.ControlBox = false;
             this.Controls.Add(this.btnReset);
             this.Controls.Add(this.tcSysOpts);
             this.Controls.Add(this.panButtons);
             this.Controls.Add(this.btnOK);
-			//this.Controls.Add(this.btnCancel);
+            this.Controls.Add(this.btnCancel);
             this.DoubleBuffered = true;
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.Margin = new System.Windows.Forms.Padding(2);
@@ -1332,10 +1276,8 @@ namespace VEPROMS
             ((System.ComponentModel.ISupportInitialize)(this.tcSysOpts)).EndInit();
             this.tcSysOpts.ResumeLayout(false);
             this.tabControlPanel3.ResumeLayout(false);
-			this.gpMSWordSum.ResumeLayout(false);
             this.gpOpenTabs.ResumeLayout(false);
             this.gpShwRplWords.ResumeLayout(false);
-			this.gpAnnoTypeFilter.ResumeLayout(false);
             this.gpVisioPath.ResumeLayout(false);
             this.gpSeparateWindows.ResumeLayout(false);
             this.gpEnhancedDocs.ResumeLayout(false);
@@ -1345,6 +1287,7 @@ namespace VEPROMS
             this.gpAnnotationSettings.ResumeLayout(false);
             this.gpTransRangeColor.ResumeLayout(false);
             this.gpPropPageStyle.ResumeLayout(false);
+            this.gpMSWordSum.ResumeLayout(false);
             this.ResumeLayout(false);
 
 		}
@@ -1352,7 +1295,7 @@ namespace VEPROMS
 
 		#endregion
 
-		//private DevComponents.DotNetBar.ButtonX btnCancel;
+		private DevComponents.DotNetBar.ButtonX btnCancel;
 		private DevComponents.DotNetBar.ButtonX btnOK;
 		private DevComponents.DotNetBar.Controls.GroupPanel gpSystemColor;
 		private DevComponents.DotNetBar.Controls.CheckBoxX cbRibonBlack;
@@ -1400,12 +1343,10 @@ namespace VEPROMS
 		private DevComponents.DotNetBar.Controls.CheckBoxX cbUCFIgnore;
         private DevComponents.DotNetBar.Controls.GroupPanel gpOpenTabs;
         private DevComponents.DotNetBar.Controls.GroupPanel gpShwRplWords;        
-        private DevComponents.DotNetBar.Controls.GroupPanel gpAnnoTypeFilter;
         private DevComponents.DotNetBar.Controls.CheckBoxX cbOTRemember;
         private DevComponents.DotNetBar.Controls.CheckBoxX cbOTAutoOpen;
         private DevComponents.DotNetBar.Controls.CheckBoxX cbShwRplWrdsColor;
         private DevComponents.DotNetBar.Controls.GroupPanel gpMSWordSum;
         private DevComponents.DotNetBar.Controls.CheckBoxX cbMSWordPrompt;
-		private DevComponents.DotNetBar.ButtonX cbShwAnnoFilter;
     }
 }

PROMS/VEPROMS User Interface/frmSysOptions.cs

@@ -365,11 +365,5 @@ namespace VEPROMS
 			Properties.Settings.Default.cbShwRplWrdsColor = cbShwRplWrdsColor.Checked; // update setting value
 			Properties.Settings.Default.Save(); // save settings
 		}
-
-		private void cbShwAnnoFilter_Click(object sender, EventArgs e)
-		{
-			frmVEPROMS.tv_SelectAnnotations();
-		}
-
     }
 }

PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs

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

PROMS/VEPROMS User Interface/frmVEPROMS.cs

@@ -543,6 +543,7 @@ namespace VEPROMS
 			tv.RefreshCheckedOutProcedures += new vlnTreeViewEvent(tv_RefreshCheckedOutProcedures);
 			tv.ProcedureCheckedOutTo += new vlnTreeViewEvent(tv_ProcedureCheckedOutTo);
 			tv.ViewPDF += new vlnTreeViewPdfEvent(tv_ViewPDF);
+
 			displayApplicability.ApplicabilityViewModeChanged += new DisplayApplicability.DisplayApplicabilityEvent(displayApplicability_ApplicabilityViewModeChanged);
 			
 			tv.ExportImportProcedureSets += new vlnTreeViewEvent(tv_ExportImportProcedureSets);
@@ -708,22 +709,6 @@ namespace VEPROMS
 				{
 					int ownerid = MySessionInfo.CheckOutItem(fi.FolderID, CheckOutType.Session);
 					
-					//C2025-024 Electronic Procedures - Phase 2 (PROMS XML output)
-					//form for exporting Electronic Procedures from FolderInfo
-					if (args.AnnotationTypeId > 0)
-					{
-						dlgExportImportEP dlg = new dlgExportImportEP(args.Index == 0 ? "Export" : "Import", fi, this, args.AnnotationTypeId, args.UnitIndex);
-						dlg.ShowDialog(this);
-
-						MySessionInfo.CheckInItem(ownerid);
-
-						if (args.Index == 1 && dlg.MyNewFolder != null)
-						{
-							tv.AddNewNode(dlg.MyNewFolder);
-						}
-					}
-					else
-					{
 					dlgExportImport dlg = new dlgExportImport(args.Index == 0 ? "Export" : "Import", fi, this, (E_UCFImportOptions)Properties.Settings.Default.UCFImportOpt);//Added frmVEPROMS Parameter
 					dlg.ShowDialog(this);
 
@@ -735,7 +720,6 @@ namespace VEPROMS
 					}
 				}
 			}
-			}
 
 			if (dvi != null)
 			{
@@ -758,26 +742,6 @@ namespace VEPROMS
 
 					int ownerid = MySessionInfo.CheckOutItem(dvi.VersionID, CheckOutType.DocVersion);
 
-					//C2025-024 Electronic Procedures - Phase 2 (PROMS XML output)
-					//form for exporting Electronic Procedures from DocVersionInfo
-					if (args.AnnotationTypeId > 0)
-					{
-						dlgExportImportEP dlg = new dlgExportImportEP(args.Index == 0 ? "Export" : "Import", dvi, this, args.AnnotationTypeId, args.UnitIndex);
-						dlg.MyNewProcedure = null;
-						dlg.ExternalTransitionItem = null;
-						dlg.ShowDialog(this);
-
-						MySessionInfo.CheckInItem(ownerid);
-
-						if (dlg.MyNewProcedure != null)
-							tv.AddNewNode(dlg.MyNewProcedure);
-
-						if (dlg.ExternalTransitionItem != null)
-							tc.OpenItem(dlg.ExternalTransitionItem);
-					}
-					else
-					{
-
 					dlgExportImport dlg = new dlgExportImport("Import", dvi, this, (E_UCFImportOptions)Properties.Settings.Default.UCFImportOpt);//Added frmVEPROMS Parameter
 					dlg.MyNewProcedure = null;
 					dlg.ExternalTransitionItem = null;
@@ -791,8 +755,6 @@ namespace VEPROMS
 					if (dlg.ExternalTransitionItem != null)
 						tc.OpenItem(dlg.ExternalTransitionItem);
 				}
-
-				}
 			}
 
 			if (pi != null)
@@ -807,19 +769,6 @@ namespace VEPROMS
 				else
 				{
 					int ownerid = MySessionInfo.CheckOutItem(pi.ItemID, CheckOutType.Procedure);
-
-					//C2025-024 Electronic Procedures - Phase 2 (PROMS XML output)
-					//form for exporting Electronic Procedures from ProcedureInfo
-					if (args.AnnotationTypeId > 0)
-					{
-						dlgExportImportEP dlg = new dlgExportImportEP("Export", pi, this, args.AnnotationTypeId, args.UnitIndex);
-						dlg.ShowDialog(this);
-
-						MySessionInfo.CheckInItem(ownerid);
-					}
-					else
-					{
-
 					dlgExportImport dlg = new dlgExportImport("Export", pi, this, (E_UCFImportOptions)0);//Added frmVEPROMS Parameter
 					dlg.ShowDialog(this);
 
@@ -827,7 +776,6 @@ namespace VEPROMS
 				}
 			}
 		}
-		}
 
 		private void MakeDatabaseChanges()
 		{
@@ -1348,11 +1296,7 @@ namespace VEPROMS
 
 			pi.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
 		}
-		public static void tv_SelectAnnotations()
-		{
-			dlgAnnotationsSelect sannoDlg = new dlgAnnotationsSelect(VlnSettings.UserID);
-			sannoDlg.ShowDialog(); // RHM 20120925 - Center dialog over PROMS window
-		}
+
 		void tv_CreateTimeCriticalActionSummary(object sender, vlnTreeEventArgs args)
 		{
 			DialogResult dr = System.Windows.Forms.DialogResult.Yes;
@@ -1539,11 +1483,9 @@ namespace VEPROMS
 			// and if they are not the same, use the CurrentItem from the main frmVEPROMS.
 			ProcedureInfo piThis = null;
 			if (_CurrentItem != null) piThis = _CurrentItem.MyProcedure;
+
 			ProcedureInfo pi = args.Proc as ProcedureInfo;
-			if (args.OringFlg == 1) // B2025-036 split screen print issue. if oringFlg == 1 the ctrl-p keys was pressed.
-			{
 			if (piThis != null && pi.ItemID != piThis.ItemID) pi = piThis;
-			}
 
 			// Check if Procedure Info is null
 			if (pi == null) return;
@@ -1585,11 +1527,8 @@ namespace VEPROMS
 			if (_CurrentItem != null) piThis = _CurrentItem.MyProcedure;
 
 			ProcedureInfo pi = args.Proc as ProcedureInfo;
-
-			if (args.OringFlg == 1) // B2025-036 split screen print issue. if oringFlg == 1 the ctrl-p keys was pressed.
-			{
 			if (piThis != null && pi.ItemID != piThis.ItemID) pi = piThis;
-			}
+
 			// Check if Procedure Info is null
 			if (pi == null) return;
 

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

@@ -931,7 +931,7 @@ namespace VEPROMS.CSLA.Library
 						else // B2018-043 Eliminate infinite loop for invalid transition structure
 						{
 							// Add annotation for Invalid Transition
-							AddInvalidTransitionAnnotation(itemInfo, "Invalid Transition Format");
+							AddInvalidTransitionAnnotation(itemInfo,"Invalid Transition Format");
 							break;
 						}
 					}
@@ -984,16 +984,16 @@ namespace VEPROMS.CSLA.Library
 			ContentInfo myContent = itemInfo.MyContent;
 			string txt = myContent.Text;
 			string regDelete = @"(\\v |)\<START\]\#Link\:Transition(|Range)\:[0-9]+ [0-9]+ [0-9]+(| [0-9]+)\[END\>(\\v0 |)";
-			string txt2 = txt;
+			string txt2=txt;
 
-			do {
+			do{
 				txt = txt2;
 				txt2 = Regex.Replace(txt, regDelete, "");
-			} while (txt2 != txt);
+			} while(txt2 != txt);
 
-			if (txt2 != myContent.Text)
+			if(txt2 != myContent.Text)
 			{
-				using (Content tmp = myContent.Get())
+				using(Content tmp = myContent.Get())
 				{
 					tmp.Text = txt2;
 					tmp.Save();
@@ -1276,7 +1276,7 @@ namespace VEPROMS.CSLA.Library
 			// for supplemental information, bulleted tabs need to be included in the tab.  The 'isletterordigit' should not occur for supinfo items -
 			// and this includes the parent of the supinfo since that is the tab used for supinfo concatenated with its parent. (B2017-120)
 			// // B2020-154: Added check for the tab to start with '(', tabs that started with this were not included in the combined tab
-			if (thisTab != null && thisTab != "" && (!char.IsLetterOrDigit(thisTab[0]) && thisTab[0] != '(') && !vcbHeaderCheck && !itemInfo.IsInSupInfo && (itemInfo.SupInfos == null || itemInfo.SupInfos.Count <= 0)) return pTab;
+			if (thisTab != null && thisTab != "" && (!char.IsLetterOrDigit(thisTab[0]) && thisTab[0] != '(') && !vcbHeaderCheck && !itemInfo.IsInSupInfo && (itemInfo.SupInfos == null || itemInfo.SupInfos.Count <= 0 )) return pTab;
 			if (itemInfo.FormatStepData.NumberWithLevel) pTab = itemInfo.MyHLS.MyTab.CleanText.Trim();
 			// if the parent tab ends with a alphanumeric and this tab is alphanumeric, add a '.' to separate them 
 			// also, include use the separator for bullets if doing the supplemental information tab (B2017-120)
@@ -1445,7 +1445,7 @@ namespace VEPROMS.CSLA.Library
 					if (MyContent.MyEntry != null && MyContent.MyEntry.MyDocument != null)
 					{
 						PdfInfo pi = PdfInfo.Get(this, false);
-						if (pi != null) _MSWordPageCount = (float)pi.PageCount;// B2018-071 Don't crash on invalid MS Word section
+						if(pi != null) _MSWordPageCount = (float)pi.PageCount;// B2018-071 Don't crash on invalid MS Word section
 					}
 				return _MSWordPageCount; 
 			}
@@ -2071,7 +2071,7 @@ namespace VEPROMS.CSLA.Library
 			{
 				bool rval = false;
 				ItemInfo itm = this;
-				while (itm != null && !itm.IsHigh && !rval)
+				while (itm != null &&!itm.IsHigh && !rval)
 				{
 					rval = itm.IsCautionOrNotePart;
 					if (!rval) itm = itm.MyParent;
@@ -2111,16 +2111,6 @@ namespace VEPROMS.CSLA.Library
 			return (sd.Type == type);
 		}
 
-		// C2025-024 - Electronic Procedures - Export
-		//return if should export blanks
-		public bool EPexportblank(int AnnTypeID)
-		{
-			if (ActiveFormat.PlantFormat.EPFormatFiles.Count == 0 || !ActiveFormat.PlantFormat.EPFormatFiles.Exists(x => x.AnnotationTypeID == AnnTypeID)) 
-				return true;
-			else
-				return ActiveFormat.PlantFormat.EPFormatFiles.Find(x => x.AnnotationTypeID == AnnTypeID).exportblank;
-		}
-
 		// C2025-023 - Electronic Procedures - Modifications to PROMS
 		//return EPFields that match this step type or a parent step type
 		public EPFields GetValidEPFields(int AnnTypeID)

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

@@ -61,25 +61,6 @@ namespace VEPROMS.CSLA.Library
 				return LazyLoad(ref _AnnotationTypeID, "@AnnotationTypeID");
 			}
 		}
-
-        // Return Name of Annotation that EP Format File is Attached to
-        public string AnnotationName()
-        {
-            return AnnotationTypeInfo.Get((int) AnnotationTypeID).Name;
-        }
-
-        //if xml value is blank, should element export?
-        //defaults to true
-        private LazyLoad<bool> _exportblank;
-        [DisplayName("exportblank")]
-        [Description("if xml value is blank, should element export?")]
-        public bool exportblank
-        {
-            get
-            {
-                return LazyLoad(ref _exportblank, "@exportblank");
-            }
-        }
 		// returns a list of fields that are defined in the EP format's structure
 		private EPFields _FieldList;
 		public EPFields FieldList
@@ -87,7 +68,7 @@ namespace VEPROMS.CSLA.Library
 			get
 			{
 				XmlDocument xd = GetEPFormatData(Name);
-                return _FieldList ?? (_FieldList = new EPFields(xd.SelectNodes("/EPFormat/EPField")));
+				return _FieldList == null ? _FieldList = new EPFields(xd.SelectNodes("/EPFormat/EPField")) : _FieldList;
 			}
 		}
 		#endregion
@@ -315,7 +296,7 @@ namespace VEPROMS.CSLA.Library
 			}
 			catch
 			{
-                throw new ArgumentException($"Error in returncols for EP file, field: {name}");
+				throw new ArgumentException($"Error in returncols for EP file: {((EPFormatFile)MyParentFormat).Name}.xml, field: {name}");
 			}
 		}
 
@@ -344,7 +325,7 @@ namespace VEPROMS.CSLA.Library
 			}
 			catch
 			{
-                throw new ArgumentException($"Error in validforsteptypes for EP file, field: {name}");
+				throw new ArgumentException($"Error in validforsteptypes for EP file: {((EPFormatFile) MyParentFormat).Name}.xml, field: {name}");
 			}
 		}
 		public bool IsValidForStepType(string StepType)
@@ -363,9 +344,6 @@ namespace VEPROMS.CSLA.Library
 			try
 			{
 				DocVersionInfo MyDocVersion = currAnn.MyItem.MyDocVersion;
-
-                if (MyDocVersion.DocVersionAssociations != null && MyDocVersion.DocVersionAssociations.Any())
-                {
 				ROFSTLookup lookup = MyDocVersion.DocVersionAssociations[0].MyROFst.GetROFSTLookup(MyDocVersion);
 
 				string roid = FormatRoidKey(rosource, false);
@@ -377,20 +355,12 @@ namespace VEPROMS.CSLA.Library
 
 				return mylist;
 			}
-                else
+			catch (Exception Ex)
 			{
-                    return new List<ROListItem>
-                    {
-                        new ROListItem("", "")
-                    };
+				throw new ArgumentException($"Error in rosource for EP file: {((EPFormatFile)MyParentFormat).Name}.xml, field: {name}");
+			}
 		}
 
-            }
-            catch
-            {
-                throw new ArgumentException($"Error in rosource for EP file, field: {name}");
-            }
-        }
 
 		//return a list of values for the specified ROID
 		//given the EP items return columns
@@ -424,7 +394,6 @@ namespace VEPROMS.CSLA.Library
 
 		}
 	}
-
 	#endregion
 	//C2025-023 - Electronic Procedures - Modifications to PROMS
 	// class to handle return of RO Lists

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

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

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

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

PROMS/VEPROMS/VEPROMS.sln

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

PROMS/Volian.Controls.Library/AnnotationDetails.cs

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

PROMS/Volian.Controls.Library/StepRTB.cs

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

PROMS/Volian.Controls.Library/StepTabRibbon.cs

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

PROMS/Volian.Controls.Library/frmEPAnnotationDetails.cs

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

PROMS/Volian.Controls.Library/vlnTreeView.cs

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

PROMS/Volian.Print.Library/PDFReport.cs

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