C2025-027-AnnotationsTypeSelect-2

good for the testing phase

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'
@@ -24145,10 +24145,7 @@ AS
 		(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
-	AND
-	AnnotationTypeSelections.ASTypeID IS NULL
+    WHERE TypeID NOT IN (SELECT TypeID FROM  AnnotationTypeSelections WHERE UserID = @UserID)  
 GO
 
 -- C2025-027 Annotation Type Filtering

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;

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");