From 449bb2522b565a1491df840dee8fcd40a857141f Mon Sep 17 00:00:00 2001 From: Paul Larsen Date: Wed, 30 Jul 2025 10:25:07 -0400 Subject: [PATCH 1/3] C2025-027-AnnotationsTypeSelect-2 --- PROMS/VEPROMS User Interface/PROMSFixes.Sql | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/PROMS/VEPROMS User Interface/PROMSFixes.Sql b/PROMS/VEPROMS User Interface/PROMSFixes.Sql index b1408657..3a210aeb 100644 --- a/PROMS/VEPROMS User Interface/PROMSFixes.Sql +++ b/PROMS/VEPROMS User Interface/PROMSFixes.Sql @@ -24136,19 +24136,19 @@ CREATE PROCEDURE [dbo].[getAnnotationSelectListTypes] WITH EXECUTE AS OWNER AS SELECT - [TypeID], - [Name], - [Config], + ATS.[TypeID], + AT.[Name], + AT.[Config], [DTS], - [UserID], - [LastChanged], + ATS.[UserID], + ATS.[LastChanged], (SELECT COUNT(*) FROM [Annotations] WHERE [Annotations].[TypeID]= [TypeID]) [AnnotationCount], [IsEPAnnotationType] - FROM [AnnotationTypes] --A - LEFT OUTER JOIN AnnotationTypeSelections ON AnnotationTypeSelections.TypeID = AnnotationTypes.TypeID - WHERE AnnotationTypeSelections.UserID = @UserID + FROM [AnnotationTypes] AT + LEFT OUTER JOIN AnnotationTypeSelections ATS ON ATS.TypeID = AT.TypeID + WHERE ATS.UserID = @UserID AND - AnnotationTypeSelections.ASTypeID IS NULL + ATS.ASTypeID IS NULL GO -- C2025-027 Annotation Type Filtering From e31e0b6680949897125f448edf5a96052c173a7e Mon Sep 17 00:00:00 2001 From: Paul Larsen Date: Wed, 30 Jul 2025 10:58:58 -0400 Subject: [PATCH 2/3] C2025-027-AnnotationsTypeSelect-2 --- PROMS/VEPROMS User Interface/PROMSFixes.Sql | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/PROMS/VEPROMS User Interface/PROMSFixes.Sql b/PROMS/VEPROMS User Interface/PROMSFixes.Sql index 3a210aeb..3ca37132 100644 --- a/PROMS/VEPROMS User Interface/PROMSFixes.Sql +++ b/PROMS/VEPROMS User Interface/PROMSFixes.Sql @@ -24136,19 +24136,16 @@ CREATE PROCEDURE [dbo].[getAnnotationSelectListTypes] WITH EXECUTE AS OWNER AS SELECT - ATS.[TypeID], - AT.[Name], - AT.[Config], + [TypeID], + [Name], + [Config], [DTS], - ATS.[UserID], - ATS.[LastChanged], + [UserID], + [LastChanged], (SELECT COUNT(*) FROM [Annotations] WHERE [Annotations].[TypeID]= [TypeID]) [AnnotationCount], [IsEPAnnotationType] - FROM [AnnotationTypes] AT - LEFT OUTER JOIN AnnotationTypeSelections ATS ON ATS.TypeID = AT.TypeID - WHERE ATS.UserID = @UserID - AND - ATS.ASTypeID IS NULL + FROM [AnnotationTypes] --A + WHERE TypeID NOT IN (SELECT TypeID FROM AnnotationTypeSelections WHERE UserID = @UserID) GO -- C2025-027 Annotation Type Filtering From 009243b0912625be6c400645db26e85d5cc01ada Mon Sep 17 00:00:00 2001 From: Paul Larsen Date: Wed, 30 Jul 2025 11:18:33 -0400 Subject: [PATCH 3/3] C2025-027-AnnotationsTypeSelect-2 --- PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs index 18e3b2bf..e2f0b575 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs +++ b/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.Size = new System.Drawing.Size(1185, 249); + this.epAnnotations.Location = new System.Drawing.Point(5, 547); + 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;