Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request 'C2025-027-AnnotationsTypeSelect-2' (#580) from C2025-027-AnnotationsTypeSelect-2 into Development

Browse Source 
good for testing phase
This commit is contained in:
John Jenko
2025-07-30 11:28:55 -04:00
parent 453dce9520 009243b091
commit a3aa9747b8
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
PROMS/VEPROMS User Interface/PROMSFixes.Sql
View File

@@ -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

13
PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs generated
View File

@@ -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;