PROMS/DropDownPanel/Controls/DropDownPanel.cs

@@ -28,7 +28,9 @@ namespace AT.STO.UI.Win
 
 			_dropDownHelper = new DropDownWindowHelper();
 
+			_dropDownHelper.DropDownClosed -= new DropDownClosedEventHandler(DropDownHelper_DropDownClosed);
 			_dropDownHelper.DropDownClosed += new DropDownClosedEventHandler(DropDownHelper_DropDownClosed);
+			_dropDownHelper.DropDownCancel -= new DropDownCancelEventHandler(DropDownHelper_DropDownCancel);
 			_dropDownHelper.DropDownCancel += new DropDownCancelEventHandler(DropDownHelper_DropDownCancel);
 			
 			combo.DisplayMember = "Text";
@@ -82,7 +84,9 @@ namespace AT.STO.UI.Win
 				DropDownForm dropDown = new DropDownForm(_dropDownControl);
 				
 				
+				dropDown.FinishEditing -= new DropDownValueChangedEventHandler(DropDown_FinishEditing);
 				dropDown.FinishEditing += new DropDownValueChangedEventHandler(DropDown_FinishEditing);
+				dropDown.ValueChanged -= new DropDownValueChangedEventHandler(DropDown_ValueChanged);
 				dropDown.ValueChanged += new DropDownValueChangedEventHandler(DropDown_ValueChanged);
 				
 				combo.DroppedDown = false;

PROMS/DropDownPanel/Forms/DropDownForm.cs

@@ -49,7 +49,9 @@ namespace AT.STO.UI.Win
 		{
 			base.OnShown(e);
 			
+			_control.FinishEditing -= new DropDownValueChangedEventHandler(Ctrl_FinishEditing);
 			_control.FinishEditing += new DropDownValueChangedEventHandler(Ctrl_FinishEditing);
+			_control.ValueChanged -= new DropDownValueChangedEventHandler(Ctrl_ValueChanged);
 			_control.ValueChanged += new DropDownValueChangedEventHandler(Ctrl_ValueChanged);
 		}
 	#endregion

PROMS/DropDownPanel/Helper/DropDownWindowHelper.cs

@@ -39,6 +39,7 @@ namespace AT.STO.UI.Win
 		public DropDownWindowHelper()
 		{
 			_filter = new DropDownMessageFilter(this);
+			_filter.DropDownCancel -= new DropDownCancelEventHandler(Popup_Cancel);
 			_filter.DropDownCancel += new DropDownCancelEventHandler(Popup_Cancel);
 		}
 	#endregion

PROMS/VEPROMS User Interface/DlgAnnotationsSelect.cs

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

PROMS/VEPROMS User Interface/DlgAnnotationsSelect.resx

@@ -0,0 +1,120 @@
+<?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/DlgPrintProcedure.cs

@@ -393,6 +393,7 @@ namespace VEPROMS
 		{
 			SetupForProcedure();
 			_MyTimer = new Timer();
+			_MyTimer.Tick -= new EventHandler(_MyTimer_Tick);
 			_MyTimer.Tick += new EventHandler(_MyTimer_Tick);
 			_MyTimer.Interval = 100;
 			_MyTimer.Enabled = true;

PROMS/VEPROMS User Interface/PROMSFixes.Sql

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

PROMS/VEPROMS User Interface/VEPROMS_UI.csproj

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

PROMS/VEPROMS User Interface/dlgAnnotationsSelect.Designer.cs

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

PROMS/VEPROMS User Interface/dlgApproveProcedure.cs

@@ -65,11 +65,13 @@ namespace VEPROMS
 			MyFrmVEPROMS = myFrmVEPROMS;// Save frmVEPROMS for Import to shutoff SessionPing
 			_MyApproval = new ApprovalInfo(myFrmVEPROMS);// Save frmVEPROMS for Import to shutoff SessionPing
 			ApplicabilityIndex = myDocVersion.DocVersionConfig.SelectedSlave;
+			this.ConsistencyPrintRequest -= new DisplayConsistencyReportEvent(dlgApproveProcedure_ConsistencyPrintRequest);
 			this.ConsistencyPrintRequest += new DisplayConsistencyReportEvent(dlgApproveProcedure_ConsistencyPrintRequest);
 			_MyDocVersion = myDocVersion;
 			_MyDocVersion.ResetProcedures();    // B2021-035: Pasted, modified number and deleted procedures not refreshed so missing from list
 			InitializeComponent();
 			FlexGridAddEvents();
+			_MyApproval.StatusUpdated -= new ApprovalStatusChangeEvent(_MyApproval_StatusUpdated);
 			_MyApproval.StatusUpdated += new ApprovalStatusChangeEvent(_MyApproval_StatusUpdated);
 			SetupComboBoxes();
 			foreach (ProcedureInfo pi in myDocVersion.Procedures)
@@ -101,6 +103,7 @@ namespace VEPROMS
 			//fgProcs.SetupEditor += new C1.Win.C1FlexGrid.RowColEventHandler(fgProcs_SetupEditor);
 			//fgProcs.StartEdit += new C1.Win.C1FlexGrid.RowColEventHandler(fgProcs_StartEdit);
 			//fgProcs.ValidateEdit += new C1.Win.C1FlexGrid.ValidateEditEventHandler(fgProcs_ValidateEdit);
+			fgProcs.ComboCloseUp -= new C1.Win.C1FlexGrid.RowColEventHandler(fgProcs_ComboCloseUp);
 			fgProcs.ComboCloseUp += new C1.Win.C1FlexGrid.RowColEventHandler(fgProcs_ComboCloseUp);
 			//fgProcs.MouseDown += new MouseEventHandler(fgProcs_MouseDown);
 			//fgProcs.MouseUp += new MouseEventHandler(fgProcs_MouseUp); 
@@ -275,6 +278,7 @@ namespace VEPROMS
 		{
 			MyFrmVEPROMS = myFrmVEPROMS;// Save frmVEPROMS for Import to shutoff SessionPing
 			_MyApproval = new ApprovalInfo(myFrmVEPROMS);// Save frmVEPROMS for Import to shutoff SessionPing
+			this.ConsistencyPrintRequest -= new DisplayConsistencyReportEvent(dlgApproveProcedure_ConsistencyPrintRequest);
 			this.ConsistencyPrintRequest += new DisplayConsistencyReportEvent(dlgApproveProcedure_ConsistencyPrintRequest);
 			_MyDocVersion = myDocVersion;
 			_MyDocVersion.ResetProcedures();    // B2021-035: Pasted, modified number and deleted procedures not refreshed so missing from list
@@ -295,6 +299,7 @@ namespace VEPROMS
 		{
 			MyFrmVEPROMS = myFrmVEPROMS;// Save frmVEPROMS for Import to shutoff SessionPing
 			_MyApproval = new ApprovalInfo(myFrmVEPROMS);// Save frmVEPROMS for Import to shutoff SessionPing
+			this.ConsistencyPrintRequest -= new DisplayConsistencyReportEvent(dlgApproveProcedure_ConsistencyPrintRequest);
 			this.ConsistencyPrintRequest += new DisplayConsistencyReportEvent(dlgApproveProcedure_ConsistencyPrintRequest);
 			_MyDocVersion = myProcedure.MyDocVersion;
 			_MyDocVersion.ResetProcedures();    // B2021-035: Pasted, modified number and deleted procedures not refreshed so missing from list
@@ -450,6 +455,7 @@ namespace VEPROMS
 			int checkedCount = clbMore.CheckedItems.Count;
 			string oldLabel = lblMore.Text;
 			pbMore.Visible = true;
+			ItemInfoList.ConsistencyCheckUpdated -= new ItemInfoListCCEvent(ItemInfoList_ConsistencyCheckUpdated);
 			ItemInfoList.ConsistencyCheckUpdated += new ItemInfoListCCEvent(ItemInfoList_ConsistencyCheckUpdated);
 			List<ProcedureInfo> myProcs = new List<ProcedureInfo>();
 			// B2018-136 use the list of procedures that have checkboxes and are checked (right panel) instead of the list to be approved (left panel)

PROMS/VEPROMS User Interface/dlgManageSecurity.cs

@@ -40,6 +40,7 @@ namespace VEPROMS
 				rb.Parent = pnlGroups;
 				rb.Dock = DockStyle.Top;
 				rb.Tag = gi;
+				rb.CheckedChanged -= new EventHandler(rb_CheckedChanged);
 				rb.CheckedChanged += new EventHandler(rb_CheckedChanged);
 				pnlGroups.Controls.Add(rb);
 				rb.BringToFront();

PROMS/VEPROMS User Interface/frmPDFStatusForm.cs

@@ -254,6 +254,7 @@ namespace VEPROMS
 			if (CancelStop) btnCancel.Visible = true;
 			Application.DoEvents();
 
+			MyPromsPrinter.StatusChanged -= new PromsPrinterStatusEvent(pp_StatusChanged);
 			MyPromsPrinter.StatusChanged += new PromsPrinterStatusEvent(pp_StatusChanged);
 			MyPromsPrinter.DocReplace = DocReplace;  // used when approve generates an export with unlinked ROs and Transitions
 

PROMS/VEPROMS User Interface/frmSysOptions.cs

@@ -365,5 +365,11 @@ namespace VEPROMS
 			Properties.Settings.Default.