C2025-027-AnnotationsTypeSelect

PROMS/VEPROMS User Interface/PROMSFixes.Sql

@@ -24135,7 +24135,7 @@ CREATE PROC [dbo].[getAnnotationstypeSelections]
 )
 AS
 BEGIN
-	IF((SELECT TypeID FROM AnnotationTypeSelections WHERE UsrID = @UsrID) > 0)
+	IF((SELECT count(TypeID) FROM AnnotationTypeSelections WHERE UsrID = @UsrID) > 0)
 	BEGIN
 		SELECT [ASTypeID]
 			  ,[TypeID]
@@ -24164,6 +24164,56 @@ BEGIN
 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
+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].[getAnnotationstypeFiltered]
+(
+	@UsrID varchar(50)
+)
+AS
+BEGIN
+	IF((SELECT count(TypeID) FROM AnnotationTypeSelections WHERE UsrID = @UsrID) > 0)
+	BEGIN
+		SELECT [ASTypeID]
+			  ,[TypeID]
+			  ,[UsrID]
+			  ,[Name]
+			  ,[Config]
+			  ,[DTS]
+			  ,[UserID]
+			  ,[IsEPAnnotationType]
+		FROM [dbo].[AnnotationTypeSelections]
+		WHERE UsrID = @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
+
 -- 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]