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,9 +97,7 @@ namespace VEPROMS
         // Save selected list to DB.
         private void btnUpdate_Click(object sender, EventArgs e)
         {
-            DataTable dt2 = coverToTable();
+            saveChanges();
-            VEPROMS.CSLA.Library.AnnotationstypeSelections.Update(dt2, UserID);
-            this.Close();
         }
         public class AnnotataionItem
         {
@@ -151,11 +153,31 @@ namespace VEPROMS
             {
                 lstSelected.Items.Add(new AnnotataionItem(lstSelectedRow["Name"].ToString(), (int)lstSelectedRow["TypeID"]));
             }
+            btnUpdate.Enabled = false;
         }
 
         private void btnCancel_Click_1(object sender, EventArgs e)
         {
-            this.Close();
+            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()
@@ -170,6 +192,12 @@ namespace VEPROMS
             }
             return dt;
         }
+        private void saveChanges()
+        {
+            DataTable dt2 = coverToTable();
+            VEPROMS.CSLA.Library.AnnotationstypeSelections.Update(dt2, UserID);
+            btnUpdate.Enabled = false;
+        }
     }
 }
 

PROMS/VEPROMS User Interface/PROMSFixes.Sql

@@ -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 UserID = @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
@@ -24325,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/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;