C2025-039 Per the customer’s request, adjusted the “{Proc Num} (Procedure Number Only)" transition type in the Beaver Valley formats so that a procedure that contains only Word sections can be referenced.

good for testing

PROMS/VEPROMS User Interface/DlgAnnotationsSelect.cs

@@ -63,18 +63,21 @@ namespace VEPROMS
                 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.
@@ -83,6 +86,7 @@ namespace VEPROMS
             lstTo.Items.AddRange(lstFrom.Items);
             lstFrom.Items.Clear();
             SetButtonsEditable();
+            btnUpdate.Enabled = true;
         }
 
         // Enable and disable buttons.
@@ -93,8 +97,7 @@ namespace VEPROMS
         // Save selected list to DB.
         private void btnUpdate_Click(object sender, EventArgs e)
         {
-                DataTable dt2 = coverToTable(UserID);
+            saveChanges();
-                VEPROMS.CSLA.Library.AnnotationstypeSelections.Update(dt2);
         }
         public class AnnotataionItem
         {
@@ -145,36 +148,56 @@ namespace VEPROMS
             lstSelected.DisplayMember = "NameStr";
             lstSelected.ValueMember = "TypeID";
             DataTable lstSelectedTbl = VEPROMS.CSLA.Library.AnnotationstypeSelections.Retrieve(UserID);
-            if (lstSelectedTbl.Rows.Count > 0)
+
-            {
             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
-        private DataTable coverToTable(string userid)
+                {
+                    this.Close();
+                }
+            }
+            else
+            {
+                this.Close();
+            }
+        }
+
+        private DataTable coverToTable()
         {
-            int RowID = 0;
             DataTable dt = new DataTable();
             dt.Columns.Add("TypeID", typeof(Int32));
-            dt.Columns.Add("NameStr", typeof(string));
+
-            dt.Columns.Add("UserID", typeof(string));
-            dt.Columns.Add("RowID", typeof(string));
 
             foreach (AnnotataionItem item in lstSelected.Items.OfType<AnnotataionItem>())
             {
-                ++RowID;
+                dt.Rows.Add(item.TypeID);
-                dt.Rows.Add(item.TypeID, item.NameStr, userid, RowID);
             }
             return dt;
         }
+        private void saveChanges()
+        {
+            DataTable dt2 = coverToTable();
+            VEPROMS.CSLA.Library.AnnotationstypeSelections.Update(dt2, UserID);
+            btnUpdate.Enabled = false;
+        }
     }
 }
 

PROMS/VEPROMS User Interface/PROMSFixes.Sql

@@ -24024,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'
@@ -24074,15 +24074,7 @@ ELSE
 
 GO
 
-
-
-
-
 -- C2025-027 Annotation Type Filtering
-IF  EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[AnnotationTypeSelections]') AND type in (N'U'))
-DROP TABLE [dbo].[AnnotationTypeSelections]
-GO
-
 /****** Object:  Table [dbo].[AnnotationTypeSelections]    Script Date: 7/10/2025 2:38:23 PM ******/
 SET ANSI_NULLS ON
 GO
@@ -24095,28 +24087,36 @@ GO
 -- 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](
+	CREATE TABLE [dbo].[AnnotationTypeSelections](
 		[ASTypeID] [int] IDENTITY(1,1) NOT NULL,
 		[TypeID] [int] NULL,
-	[UsrID] [varchar](50) NULL,
+		[UserID] [varchar](50) NULL,
-	[Name] [nvarchar](100) NULL,
+		[LastChanged] [datetime] NULL,
-	[Config] [nvarchar](max) NULL,
+		CONSTRAINT [PK_AnnotationTypeSelections] PRIMARY KEY CLUSTERED 
-	[DTS] [datetime] NULL,
+		([ASTypeID] ASC)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-	[UserID] [nvarchar](100) NULL,
+			) ON [PRIMARY]
-	[LastChanged] [timestamp] NULL
+END
-) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
+
+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_UsrID' 
+IF EXISTS (SELECT *  FROM sys.indexes  WHERE name='idx_AnnotationTypeSelections_UserIDTypeID' 
 AND object_id = OBJECT_ID('[dbo].[AnnotationTypeSelections]'))
 begin
-DROP INDEX [idx_AnnotationTypeSelections_UsrID] ON [dbo].[AnnotationTypeSelections];
+DROP INDEX [idx_AnnotationTypeSelections_UserIDTypeID] ON [dbo].[AnnotationTypeSelections];
 end
 
-CREATE NONCLUSTERED INDEX idx_AnnotationTypeSelections_UsrID
+CREATE UNIQUE INDEX [idx_AnnotationTypeSelections_UserIDTypeID] ON [dbo].[AnnotationTypeSelections]
-    ON [dbo].[AnnotationTypeSelections] (UsrID)
+(
-INCLUDE (TypeID, Name)
+[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
@@ -24136,16 +24136,18 @@ CREATE PROCEDURE [dbo].[getAnnotationSelectListTypes]
 WITH EXECUTE AS OWNER
 AS
 	SELECT
-		[TypeID],
+		AT.[TypeID],
-		[Name],
+		AT.[Name],
-		[Config],
+		AT.[Config],
-		[DTS],
+		AT.[DTS],
-		[UserID],
+		AT.[UserID],
-		[LastChanged],
+		AT.[LastChanged],
-		(SELECT COUNT(*) FROM [Annotations] WHERE [Annotations].[TypeID]= [TypeID]) [AnnotationCount],
+		(SELECT COUNT(*) FROM [Annotations] WHERE [Annotations].[TypeID]= AT.[TypeID]) [AnnotationCount],
-		[IsEPAnnotationType]
+		AT.[IsEPAnnotationType]
-	FROM [AnnotationTypes] --A
+	FROM [AnnotationTypes] AT
-    WHERE TypeID NOT IN (SELECT TypeID FROM  AnnotationTypeSelections WHERE UsrID = @UserID)  
+	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
@@ -24171,18 +24173,19 @@ AS
 	BEGIN
 		SELECT [ASTypeID]
 			  ,ATS.[TypeID]
-			  ,[UsrID]
+			  ,ATS.[UserID]
 			  ,AT.[Name]
 			  ,AT.[Config]
-			  ,ATS.[DTS]
+			  ,ATS.[LastChanged]
 			  ,AT.[UserID]
 			  ,AT.[IsEPAnnotationType]
 		FROM [dbo].[AnnotationTypeSelections] ATS
 		INNER JOIN AnnotationTypes AT ON AT.TypeID = ATS.TypeID
-		WHERE UsrID = @UsrID
+		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];
@@ -24200,19 +24203,19 @@ CREATE PROC [dbo].[getAnnotationstypeFiltered]
 )
 AS
 BEGIN
-	IF((SELECT count(TypeID) FROM AnnotationTypeSelections WHERE UsrID = @UsrID) > 0)
+	IF((SELECT count(TypeID) FROM AnnotationTypeSelections WHERE UserID = @UsrID) > 0)
 	BEGIN
 		SELECT [ASTypeID]
 			  ,ATS.[TypeID]
-			  ,[UsrID]
+			  ,ATS.[UserID]
 			  ,AT.[Name]
 			  ,AT.[Config]
-			  ,ATS.[DTS]
+			  ,ATS.[LastChanged]
 			  ,AT.[UserID]
 			  ,AT.[IsEPAnnotationType]
 		FROM [dbo].[AnnotationTypeSelections] ATS
 		INNER JOIN AnnotationTypes AT ON AT.TypeID = ATS.TypeID
-		WHERE UsrID = @UsrID
+		WHERE ATS.UserID = @UsrID
 	END
 	ELSE
 	BEGIN
@@ -24241,14 +24244,8 @@ IF EXISTS( SELECT * FROM INFORMATION_SCHEMA.DOMAINS WHERE Domain_Name = 'TableVa
     DROP TYPE [dbo].[TableValAnnotTypeSelections]
 
 CREATE TYPE [dbo].[TableValAnnotTypeSelections] AS TABLE(
-	[TypeID] [int] NOT NULL,
+	[TypeID] [int] NOT NULL
-	[NameStr] [varchar](200) NULL,
+							
-	[UserID] [varchar](50) NULL,
-	[RowID] [int] NOT NULL,
-	PRIMARY KEY CLUSTERED 
-(
-	[RowID] ASC
-)WITH (IGNORE_DUP_KEY = OFF)
 )
 GO
 
@@ -24261,28 +24258,30 @@ GO
 -- =============================================
 CREATE PROC [dbo].[UpdateAnnotationstypeSelections]
 (
-	@TempTable AS dbo.TableValAnnotTypeSelections READONLY
+	@TempTable AS dbo.TableValAnnotTypeSelections READONLY,
+	@UserID [varchar](50) NULL
 )
 AS
 BEGIN
 																	 
-	DECLARE @cnt integer = 0
-	DECLARE @cnt2 integer = 0
-	SET @cnt = (SELECT count(*) from @TempTable)
-	DECLARE @UserID VARCHAR(50) =  (SELECT TOP 1 UserID FROM @TempTable)
-	DELETE FROM AnnotationTypeSelections WHERE usrID = @UserID;
 															
-	declare @i int
-	select @i = min(RowID) from @TempTable
-	declare @max int
-	select @max = max(RowID) from @TempTable
 
-	WHILE @i <= @max 
+	DELETE FROM AnnotationTypeSelections where UserID = @UserID
-	BEGIN
+	AND
-		INSERT INTO AnnotationTypeSelections (TypeID, Name, Usrid)
+	TypeID not in
-		select TypeID, NameStr, UserID from @TempTable where RowID = @i 
+	(Select TypeID From @TempTable tmp)
-		set @i = @i + 1
+
-	END
+	--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
 
@@ -24328,8 +24327,8 @@ BEGIN TRY -- Try Block
 	DECLARE @RevDate varchar(255)
 	DECLARE @RevDescription varchar(255)
 
-	set @RevDate = '07/10/2025 2:30 PM'
+	set @RevDate = '07/31/2025 10:30 AM'
-	set @RevDescription = 'C2025-027 Annotation Type Filtering'
+	set @RevDescription = 'SQL Optimization'
 
 	Select  cast(@RevDate as datetime) RevDate, @RevDescription  RevDescription
 	PRINT 'SQL Code Revision ' + @RevDate + ' - ' + @RevDescription

PROMS/VEPROMS User Interface/dlgAnnotationsSelect.Designer.cs

@@ -123,7 +123,7 @@ namespace VEPROMS
 			this.btnUpdate.Name = "btnUpdate";
 			this.btnUpdate.Size = new System.Drawing.Size(100, 35);
 			this.btnUpdate.TabIndex = 8;
-			this.btnUpdate.Text = "Update";
+			this.btnUpdate.Text = "Save";
 			this.btnUpdate.UseVisualStyleBackColor = true;
 			this.btnUpdate.Click += new System.EventHandler(this.btnUpdate_Click);
 			// 
@@ -203,7 +203,7 @@ namespace VEPROMS
 			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 = "Select Annotation Types";
+			this.Text = "Filter Annotation Types";
 			this.Load += new System.EventHandler(this.DlgAnnotationsSelect_Load);
 			this.tableLayoutPanel1.ResumeLayout(false);
 			this.ResumeLayout(false);

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();
@@ -103,23 +103,23 @@ namespace VEPROMS
 			this.gpTransRangeColor.SuspendLayout();
 			this.gpPropPageStyle.SuspendLayout();
 			this.SuspendLayout();
-			// 
+			//// 
-			// btnCancel
+			//// btnCancel
-			// 
+			//// 
-			this.btnCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+			//this.btnCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
-			this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			//this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.btnCancel.Location = new System.Drawing.Point(616, 591);
+			//this.btnCancel.Location = new System.Drawing.Point(616, 591);
-			this.btnCancel.Margin = new System.Windows.Forms.Padding(2);
+			//this.btnCancel.Margin = new System.Windows.Forms.Padding(2);
-			this.btnCancel.Name = "btnCancel";
+			//this.btnCancel.Name = "btnCancel";
-			this.btnCancel.Size = new System.Drawing.Size(56, 19);
+			//this.btnCancel.Size = new System.Drawing.Size(56, 19);
-			this.btnCancel.TabIndex = 0;
+			//this.btnCancel.TabIndex = 0;
-			this.btnCancel.Text = "Cancel";
+			//this.btnCancel.Text = "Cancel";
-			this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
+			//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(542, 591);
+			this.btnOK.Location = new System.Drawing.Point(616, 591);
 			this.btnOK.Margin = new System.Windows.Forms.Padding(2);
 			this.btnOK.Name = "btnOK";
 			this.btnOK.Size = new System.Drawing.Size(56, 19);
@@ -562,7 +562,7 @@ namespace VEPROMS
 			// 
 			this.gpAnnoTypeFilter.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			this.gpAnnoTypeFilter.TabIndex = 13;
-			this.gpAnnoTypeFilter.Text = "Select Annotation Types";
+			this.gpAnnoTypeFilter.Text = "Filter Annotation Types";
 			// 
 			// gpVisioPath
 			// 
@@ -1305,7 +1305,7 @@ namespace VEPROMS
 			this.cbShwAnnoFilter.Size = new System.Drawing.Size(91, 23);
 			this.cbShwAnnoFilter.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
 			this.cbShwAnnoFilter.TabIndex = 0;
-			this.cbShwAnnoFilter.Text = "Select";
+			this.cbShwAnnoFilter.Text = "Open";
 			this.cbShwAnnoFilter.Click += new System.EventHandler(this.cbShwAnnoFilter_Click);
 			// 
 			// frmSysOptions
@@ -1313,14 +1313,14 @@ namespace VEPROMS
 			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);
@@ -1352,7 +1352,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;

PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs

@@ -721,10 +721,11 @@ namespace VEPROMS
 			this.epAnnotations.Dock = System.Windows.Forms.DockStyle.Bottom;
 			this.epAnnotations.Enabled = false;
 			this.epAnnotations.Expanded = false;
-			this.epAnnotations.ExpandedBounds = new System.Drawing.Rectangle(4, 544, 1187, 202);
+			this.epAnnotations.ExpandedBounds = new System.Drawing.Rectangle(5, 371, 1185, 202);
 			this.epAnnotations.ExpandOnTitleClick = true;
-			this.epAnnotations.Location = new System.Drawing.Point(5, 324);
+			this.epAnnotations.Location = new System.Drawing.Point(5, 547);
-			this.epAnnotations.Size = new System.Drawing.Size(1185, 249);
+			this.epAnnotations.Name = "epAnnotations";
+			this.epAnnotations.Size = new System.Drawing.Size(1185, 26);
 			this.epAnnotations.Style.Alignment = System.Drawing.StringAlignment.Center;
 			this.epAnnotations.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
 			this.epAnnotations.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
@@ -760,11 +761,11 @@ namespace VEPROMS
 			this.ctrlAnnotationDetails.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.ctrlAnnotationDetails.Enabled = false;
 			this.ctrlAnnotationDetails.Location = new System.Drawing.Point(0, 26);
-			this.ctrlAnnotationDetails.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+			this.ctrlAnnotationDetails.Margin = new System.Windows.Forms.Padding(2);
 			this.ctrlAnnotationDetails.MyUserInfo = null;
 			this.ctrlAnnotationDetails.Name = "ctrlAnnotationDetails";
 			this.ctrlAnnotationDetails.ProcItem = null;
-			this.ctrlAnnotationDetails.Size = new System.Drawing.Size(1185, 223);
+			this.ctrlAnnotationDetails.Size = new System.Drawing.Size(1185, 0);
 			this.ctrlAnnotationDetails.TabIndex = 15;
 			// 
 			// btnAnnoDetailsPushPin
@@ -798,7 +799,7 @@ namespace VEPROMS
 			this.epProcedures.ExpandOnTitleClick = true;
 			this.epProcedures.Location = new System.Drawing.Point(5, 57);
 			this.epProcedures.Name = "epProcedures";
-			this.epProcedures.Size = new System.Drawing.Size(326, 267);
+			this.epProcedures.Size = new System.Drawing.Size(326, 490);
 			this.epProcedures.Style.Alignment = System.Drawing.StringAlignment.Center;
 			this.epProcedures.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
 			this.epProcedures.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;

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

@@ -41,8 +41,6 @@ namespace VEPROMS.CSLA.Library
 						// if the user has not created a annotation sub-set list saved to AnnotationTypeSelections table.
 						if (dt.Rows.Count < 1)
 						{
-							//dt.Rows.Add(DataPortal.Fetch<AnnotationTypeInfoList>());
-							//DataPortal.Fetch<AnnotationTypeInfoList>();
 							DataRow row;
 							int rowflg = 0;
 							foreach (AnnotationTypeInfo annosel in DataPortal.Fetch<AnnotationTypeInfoList>())
@@ -145,33 +143,8 @@ namespace VEPROMS.CSLA.Library
 				}
 			}
 		}
-		//public static void Update(string UserID, int TypeID, int dltFlg, string Name = "")
-		//{
-		//	using (SqlConnection cn = Database.VEPROMS_SqlConnection)
-		//	{
-		//		using (SqlCommand cm = cn.CreateCommand())
-		//		{
-		//			try
-		//			{
-		//				cm.CommandType = CommandType.StoredProcedure;
-		//				cm.CommandText = "UpdateAnnotationstypeSelections";
-		//				cm.CommandTimeout = Database.DefaultTimeout;
-		//				cm.Parameters.AddWithValue("@UserID", UserID);
-		//				cm.Parameters.AddWithValue("@TypeID", TypeID);
-		//				cm.Parameters.AddWithValue("@dltFlg", dltFlg);
-		//				cm.Parameters.AddWithValue("@Name", Name);
 
-		//				cm.ExecuteNonQuery();
+		public static void Update(DataTable dt, string UserID)
-		//			}
-		//			catch (Exception ex)
-		//			{
-
-		//			}
-		//		}
-		//	}
-			
-		//}
-		public static void Update(DataTable dt)
 		{
 			using (SqlConnection cn = Database.VEPROMS_SqlConnection)
 			{
@@ -186,11 +159,12 @@ namespace VEPROMS.CSLA.Library
 						//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/VEPROMS.sln

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

PROMS/Volian.Controls.Library/StepRTB.cs

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

PROMS/Volian.Controls.Library/vlnTreeView.cs

@@ -573,12 +573,6 @@ namespace Volian.Controls.Library
 		{
 			if (ProcedureCheckedOutTo != null) ProcedureCheckedOutTo(sender, args);
 		}
-		// C2025-027
-		public event vlnTreeViewEvent SelectAnnotations;
-		private void OnSelectAnnotations(object sender, vlnTreeEventArgs args)
-		{
-			if (SelectAnnotations != null) SelectAnnotations(sender, args);
-		}
 		public event vlnTreeViewEvent ExportImportProcedureSets;
 		private void OnExportImportProcedureSets(object sender, vlnTreeEventArgs args)
 		{
@@ -872,7 +866,6 @@ namespace Volian.Controls.Library
 								MenuItem miqp = new MenuItem("Quick Print");
 								//MenuItem mips = new MenuItem("Print Section");
 								MenuItem mia = new MenuItem("Approve");
-								MenuItem misa = new MenuItem("Select Annotations"); //C2025-027
 
 								int k = 0;
 								foreach (string s in pri.MyDocVersion.UnitNames)
@@ -898,16 +891,12 @@ namespace Volian.Controls.Library
 									MenuItem mtc = mitcas.MenuItems.Add(s, new EventHandler(miMultiUnit_Click));
 									mtc.Enabled = procAppl;
 									mtc.Tag = k;
-									MenuItem msa = misa.MenuItems.Add(s, new EventHandler(miMultiUnit_Click));
-									msa.Enabled = procAppl;
-									msa.Tag = k;
 								}
 								cm.MenuItems.Add(micas);
 								cm.MenuItems.Add(mitcas);
 								cm.MenuItems.Add(mip);
 								cm.MenuItems.Add(miqp);
 								//cm.MenuItems.Add(mips);
-								cm.MenuItems.Add(misa);
 								AddShowChangeBarsAfterMenuItem(cm.MenuItems, pri);
 								cm.MenuItems.Add(mia);
 								AddApprovedRevisionsMultiUnit(cm.MenuItems, pri);
@@ -923,7 +912,6 @@ namespace Volian.Controls.Library
 								AddShowChangeBarsAfterMenuItem(cm.MenuItems, pri);
 								cm.MenuItems.Add("Approve", new EventHandler(mi_Click));
 								//_MyLog.WarnFormat("Context Menu 1 before - {0}", GC.GetTotalMemory(true));
-								cm.MenuItems.Add("Select Annotations", new EventHandler(mi_Click)); //C2025-027
 								AddApprovedRevisions(cm.MenuItems, pri);
 								//_MyLog.WarnFormat("Context Menu 1 after - {0}", GC.GetTotalMemory(true));
 							}
@@ -936,7 +924,6 @@ namespace Volian.Controls.Library
 							{
 								MenuItem mip = new MenuItem("Print");
 								MenuItem miqp = new MenuItem("Quick Print");
-								MenuItem misa = new MenuItem("Select Annotations"); //C2025-027
 								int k = 0;
 								foreach (string s in pri.MyDocVersion.UnitNames)
 								{
@@ -945,19 +932,15 @@ namespace Volian.Controls.Library
 									mp.Tag = k;
 									MenuItem mqp = miqp.MenuItems.Add(s, new EventHandler(miMultiUnit_Click));
 									mqp.Tag = k;
-									MenuItem msa = misa.MenuItems.Add(s, new EventHandler(miMultiUnit_Click));
-									msa.Tag = k;
 								}
 								cm.MenuItems.Add(mip);
 								cm.MenuItems.Add(miqp);
-								cm.MenuItems.Add(misa);
 								AddApprovedRevisionsMultiUnit(cm.MenuItems, pri);
 							}
 							else
 							{
 								cm.MenuItems.Add("Print", new EventHandler(mi_Click));
 								cm.MenuItems.Add("Quick Print", new EventHandler(mi_Click));
-								cm.MenuItems.Add("Select Annotations", new EventHandler(mi_Click)); //C2025-027
 								AddApprovedRevisions(cm.MenuItems, pri);
 							}
 						}
@@ -1949,9 +1932,6 @@ namespace Volian.Controls.Library
 				case "Create Time Critical Action Summary":
 					OnCreateTimeCriticalActionSummary(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0, mi.Text, (int)mi.Tag));
 					break;
-				case "Select Annotations": // C2025-027
-					OnSelectAnnotations(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0));
-					break;
 				default:
 					if (mip.Text.StartsWith("Showing Change Bars Starting"))
 						OnSelectDateToStartChangeBars(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0));
@@ -2257,9 +2237,6 @@ namespace Volian.Controls.Library
 					FlexibleMessageBox.Show("You have copied a document that is NOT linked to an Enhanced Document.\n\n" +
 						"You cannot paste a Non-Enhanced Procedure into an Enhanced Procedure Set.", "Cannot Paste Here");
 					break;
-				case "Select Annotations": // C2025-027
-					OnSelectAnnotations(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0));
-					break;
 				//case "Check Out Procedure Set":
 				//  CheckOutDocVersion(SelectedNode as VETreeNode);
 				//  break;