Compare commits

..

15 Commits

Author SHA1 Message Date
81a23305ba SQL optimization to used AnnotationTypeSelections Index 2025-07-31 10:48:39 -04:00
4001abff02 Merge pull request 'C2025-027-AnnotationsTypeSelect-3' (#581) from C2025-027-AnnotationsTypeSelect-3 into Development
good for testing phase
2025-07-31 08:49:37 -04:00
25bfbeb8d6 C2025-027-AnnotationsTypeSelect-3 2025-07-30 23:05:11 -04:00
a3aa9747b8 Merge pull request 'C2025-027-AnnotationsTypeSelect-2' (#580) from C2025-027-AnnotationsTypeSelect-2 into Development
good for testing phase
2025-07-30 11:28:55 -04:00
009243b091 C2025-027-AnnotationsTypeSelect-2 2025-07-30 11:18:33 -04:00
e31e0b6680 C2025-027-AnnotationsTypeSelect-2 2025-07-30 10:58:58 -04:00
449bb2522b C2025-027-AnnotationsTypeSelect-2 2025-07-30 10:25:07 -04:00
453dce9520 Merge pull request 'C2025-027-AnnotationsTypeSelect' (#574) from C2025-027-AnnotationsTypeSelect into Development
good for the testing phase
2025-07-30 08:23:06 -04:00
655592186b C2025-027-AnnotationsTypeSelect 2025-07-29 22:54:44 -04:00
1588dabcbe Merge pull request 'C2025-044 Update PROMS Fixes to be SQL 2016 compatible' (#579) from C2025-044 into Development
good for testing phase
2025-07-29 15:18:37 -04:00
09d3995e6c C2025-044 Update PROMS Fixes to be SQL 2016 compatible 2025-07-29 15:12:51 -04:00
db20385a6d Merge pull request 'DEV_Proj_File_Dependency_Update' (#578) from DEV_Proj_File_Dependency_Update into Development
Good to use. - no testing required this update is for developers only.
2025-07-29 10:06:11 -04:00
d701935ddf DEV_Proj_File_Dependency_Update
Visual Studio 2022 changed the default build order --- this will alow rebuild all in VS2022
2025-07-29 09:21:51 -04:00
94f0795247 Merge pull request 'B2025-039 Needed to include the Blue color to the RTF color table for formats that use a proportional font.' (#577) from B2025-039_PropFontColorRplWrds into Development
Looks Good.

Ready for QA Testing.
2025-07-28 16:14:29 -04:00
4def73d738 B2025-039 Needed to include the Blue color to the RTF color table for formats that use a proportional font. 2025-07-28 16:06:55 -04:00
8 changed files with 48 additions and 69 deletions

View File

@@ -95,7 +95,6 @@ namespace VEPROMS
{ {
DataTable dt2 = coverToTable(); DataTable dt2 = coverToTable();
VEPROMS.CSLA.Library.AnnotationstypeSelections.Update(dt2, UserID); VEPROMS.CSLA.Library.AnnotationstypeSelections.Update(dt2, UserID);
this.Close();
} }
public class AnnotataionItem public class AnnotataionItem
{ {

View File

@@ -24024,7 +24024,7 @@ Begin -- Rofst Tables
CONSTRAINT [PK_EPFormats] PRIMARY KEY CLUSTERED CONSTRAINT [PK_EPFormats] PRIMARY KEY CLUSTERED
( (
[FormatID] ASC [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] ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
IF (@@Error = 0) PRINT 'Table Creation: [EPFormats] Succeeded' IF (@@Error = 0) PRINT 'Table Creation: [EPFormats] Succeeded'
@@ -24116,7 +24116,7 @@ CREATE UNIQUE INDEX [idx_AnnotationTypeSelections_UserIDTypeID] ON [dbo].[Annota
[TypeID] ASC [TypeID] ASC
) )
INCLUDE (ASTypeID) INCLUDE (ASTypeID)
WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON, OPTIMIZE_FOR_SEQUENTIAL_KEY = OFF) ON [PRIMARY] WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
GO GO
-- C2025-027 Annotation Type Filtering -- C2025-027 Annotation Type Filtering
@@ -24136,19 +24136,18 @@ CREATE PROCEDURE [dbo].[getAnnotationSelectListTypes]
WITH EXECUTE AS OWNER WITH EXECUTE AS OWNER
AS AS
SELECT 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
LEFT OUTER JOIN AnnotationTypeSelections ON AnnotationTypeSelections.TypeID = AnnotationTypes.TypeID LEFT OUTER JOIN AnnotationTypeSelections ATS
WHERE AnnotationTypeSelections.UserID = @UserID ON ATS.TypeID = AT.TypeID AND ATS.UserID = @UserID
AND WHERE ATS.ASTypeID IS NULL
AnnotationTypeSelections.ASTypeID IS NULL
GO GO
-- C2025-027 Annotation Type Filtering -- C2025-027 Annotation Type Filtering
@@ -24328,8 +24327,8 @@ BEGIN TRY -- Try Block
DECLARE @RevDate varchar(255) DECLARE @RevDate varchar(255)
DECLARE @RevDescription 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 Select cast(@RevDate as datetime) RevDate, @RevDescription RevDescription
PRINT 'SQL Code Revision ' + @RevDate + ' - ' + @RevDescription PRINT 'SQL Code Revision ' + @RevDate + ' - ' + @RevDescription

View File

@@ -123,7 +123,7 @@ namespace VEPROMS
this.btnUpdate.Name = "btnUpdate"; this.btnUpdate.Name = "btnUpdate";
this.btnUpdate.Size = new System.Drawing.Size(100, 35); this.btnUpdate.Size = new System.Drawing.Size(100, 35);
this.btnUpdate.TabIndex = 8; this.btnUpdate.TabIndex = 8;
this.btnUpdate.Text = "Update"; this.btnUpdate.Text = "Save";
this.btnUpdate.UseVisualStyleBackColor = true; this.btnUpdate.UseVisualStyleBackColor = true;
this.btnUpdate.Click += new System.EventHandler(this.btnUpdate_Click); this.btnUpdate.Click += new System.EventHandler(this.btnUpdate_Click);
// //
@@ -158,7 +158,7 @@ namespace VEPROMS
this.btnCancel.Name = "btnCancel"; this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(100, 35); this.btnCancel.Size = new System.Drawing.Size(100, 35);
this.btnCancel.TabIndex = 9; this.btnCancel.TabIndex = 9;
this.btnCancel.Text = "Close"; this.btnCancel.Text = "Cancel";
this.btnCancel.UseVisualStyleBackColor = true; this.btnCancel.UseVisualStyleBackColor = true;
this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click_1); this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click_1);
// //

View File

@@ -30,7 +30,7 @@ namespace VEPROMS
{ {
this.components = new System.ComponentModel.Container(); this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmSysOptions)); 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.btnOK = new DevComponents.DotNetBar.ButtonX();
this.gpSystemColor = new DevComponents.DotNetBar.Controls.GroupPanel(); this.gpSystemColor = new DevComponents.DotNetBar.Controls.GroupPanel();
this.cbRibonBlack = new DevComponents.DotNetBar.Controls.CheckBoxX(); this.cbRibonBlack = new DevComponents.DotNetBar.Controls.CheckBoxX();
@@ -103,23 +103,23 @@ namespace VEPROMS
this.gpTransRangeColor.SuspendLayout(); this.gpTransRangeColor.SuspendLayout();
this.gpPropPageStyle.SuspendLayout(); this.gpPropPageStyle.SuspendLayout();
this.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 // btnOK
// //
this.btnOK.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; 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.Margin = new System.Windows.Forms.Padding(2);
this.btnOK.Name = "btnOK"; this.btnOK.Name = "btnOK";
this.btnOK.Size = new System.Drawing.Size(56, 19); 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.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.gpAnnoTypeFilter.TabIndex = 13; this.gpAnnoTypeFilter.TabIndex = 13;
this.gpAnnoTypeFilter.Text = "Select Annotation Types"; this.gpAnnoTypeFilter.Text = "Filter Annotation Types";
// //
// gpVisioPath // gpVisioPath
// //
@@ -1305,7 +1305,7 @@ namespace VEPROMS
this.cbShwAnnoFilter.Size = new System.Drawing.Size(91, 23); this.cbShwAnnoFilter.Size = new System.Drawing.Size(91, 23);
this.cbShwAnnoFilter.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.cbShwAnnoFilter.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.cbShwAnnoFilter.TabIndex = 0; this.cbShwAnnoFilter.TabIndex = 0;
this.cbShwAnnoFilter.Text = "Select"; this.cbShwAnnoFilter.Text = "Open";
this.cbShwAnnoFilter.Click += new System.EventHandler(this.cbShwAnnoFilter_Click); this.cbShwAnnoFilter.Click += new System.EventHandler(this.cbShwAnnoFilter_Click);
// //
// frmSysOptions // frmSysOptions
@@ -1313,14 +1313,14 @@ namespace VEPROMS
this.AcceptButton = this.btnOK; this.AcceptButton = this.btnOK;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.btnCancel; //this.CancelButton = this.btnCancel;
this.ClientSize = new System.Drawing.Size(699, 620); this.ClientSize = new System.Drawing.Size(699, 620);
this.ControlBox = false; this.ControlBox = false;
this.Controls.Add(this.btnReset); this.Controls.Add(this.btnReset);
this.Controls.Add(this.tcSysOpts); this.Controls.Add(this.tcSysOpts);
this.Controls.Add(this.panButtons); this.Controls.Add(this.panButtons);
this.Controls.Add(this.btnOK); this.Controls.Add(this.btnOK);
this.Controls.Add(this.btnCancel); //this.Controls.Add(this.btnCancel);
this.DoubleBuffered = true; this.DoubleBuffered = true;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Margin = new System.Windows.Forms.Padding(2); this.Margin = new System.Windows.Forms.Padding(2);
@@ -1352,7 +1352,7 @@ namespace VEPROMS
#endregion #endregion
private DevComponents.DotNetBar.ButtonX btnCancel; //private DevComponents.DotNetBar.ButtonX btnCancel;
private DevComponents.DotNetBar.ButtonX btnOK; private DevComponents.DotNetBar.ButtonX btnOK;
private DevComponents.DotNetBar.Controls.GroupPanel gpSystemColor; private DevComponents.DotNetBar.Controls.GroupPanel gpSystemColor;
private DevComponents.DotNetBar.Controls.CheckBoxX cbRibonBlack; private DevComponents.DotNetBar.Controls.CheckBoxX cbRibonBlack;

View File

@@ -721,10 +721,11 @@ namespace VEPROMS
this.epAnnotations.Dock = System.Windows.Forms.DockStyle.Bottom; this.epAnnotations.Dock = System.Windows.Forms.DockStyle.Bottom;
this.epAnnotations.Enabled = false; this.epAnnotations.Enabled = false;
this.epAnnotations.Expanded = 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.ExpandOnTitleClick = true;
this.epAnnotations.Location = new System.Drawing.Point(5, 324); this.epAnnotations.Location = new System.Drawing.Point(5, 547);
this.epAnnotations.Size = new System.Drawing.Size(1185, 249); this.epAnnotations.Name = "epAnnotations";
this.epAnnotations.Size = new System.Drawing.Size(1185, 26);
this.epAnnotations.Style.Alignment = System.Drawing.StringAlignment.Center; this.epAnnotations.Style.Alignment = System.Drawing.StringAlignment.Center;
this.epAnnotations.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.epAnnotations.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
this.epAnnotations.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; 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.Dock = System.Windows.Forms.DockStyle.Fill;
this.ctrlAnnotationDetails.Enabled = false; this.ctrlAnnotationDetails.Enabled = false;
this.ctrlAnnotationDetails.Location = new System.Drawing.Point(0, 26); 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.MyUserInfo = null;
this.ctrlAnnotationDetails.Name = "ctrlAnnotationDetails"; this.ctrlAnnotationDetails.Name = "ctrlAnnotationDetails";
this.ctrlAnnotationDetails.ProcItem = null; 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; this.ctrlAnnotationDetails.TabIndex = 15;
// //
// btnAnnoDetailsPushPin // btnAnnoDetailsPushPin
@@ -798,7 +799,7 @@ namespace VEPROMS
this.epProcedures.ExpandOnTitleClick = true; this.epProcedures.ExpandOnTitleClick = true;
this.epProcedures.Location = new System.Drawing.Point(5, 57); this.epProcedures.Location = new System.Drawing.Point(5, 57);
this.epProcedures.Name = "epProcedures"; 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.Alignment = System.Drawing.StringAlignment.Center;
this.epProcedures.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.epProcedures.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
this.epProcedures.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; this.epProcedures.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;

View File

@@ -38,6 +38,9 @@ EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Baseline", "..\Baseline\Baseline.csproj", "{8B29E0DE-B6C9-4041-8817-319FDE3123C4}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Baseline", "..\Baseline\Baseline.csproj", "{8B29E0DE-B6C9-4041-8817-319FDE3123C4}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RoAccessToSql", "..\RoAccessToSql\RoAccessToSql.csproj", "{1EC96BDA-01E7-4153-A95D-6A4A36FA278E}" 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 EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution

View File

@@ -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 + @"}}"; selectedRtfSB.Append(@"{\rtf1\ansi\ansicpg1252\deff0\deflang1033{\fonttbl{\f0\fnil\fcharset2 " + myFont.FontFamily.Name + @";}"); //}\f0\fs" + this.Font.SizeInPoints * 2 + @" " + myDisplayTextElement.Text + @"}}";
if (!isFixed) 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 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(@"{\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"); selectedRtfSB.Append("\r\n");

View File

@@ -573,12 +573,6 @@ namespace Volian.Controls.Library
{ {
if (ProcedureCheckedOutTo != null) ProcedureCheckedOutTo(sender, args); 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; public event vlnTreeViewEvent ExportImportProcedureSets;
private void OnExportImportProcedureSets(object sender, vlnTreeEventArgs args) private void OnExportImportProcedureSets(object sender, vlnTreeEventArgs args)
{ {
@@ -872,7 +866,6 @@ namespace Volian.Controls.Library
MenuItem miqp = new MenuItem("Quick Print"); MenuItem miqp = new MenuItem("Quick Print");
//MenuItem mips = new MenuItem("Print Section"); //MenuItem mips = new MenuItem("Print Section");
MenuItem mia = new MenuItem("Approve"); MenuItem mia = new MenuItem("Approve");
MenuItem misa = new MenuItem("Select Annotations"); //C2025-027
int k = 0; int k = 0;
foreach (string s in pri.MyDocVersion.UnitNames) 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)); MenuItem mtc = mitcas.MenuItems.Add(s, new EventHandler(miMultiUnit_Click));
mtc.Enabled = procAppl; mtc.Enabled = procAppl;
mtc.Tag = k; 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(micas);
cm.MenuItems.Add(mitcas); cm.MenuItems.Add(mitcas);
cm.MenuItems.Add(mip); cm.MenuItems.Add(mip);
cm.MenuItems.Add(miqp); cm.MenuItems.Add(miqp);
//cm.MenuItems.Add(mips); //cm.MenuItems.Add(mips);
cm.MenuItems.Add(misa);
AddShowChangeBarsAfterMenuItem(cm.MenuItems, pri); AddShowChangeBarsAfterMenuItem(cm.MenuItems, pri);
cm.MenuItems.Add(mia); cm.MenuItems.Add(mia);
AddApprovedRevisionsMultiUnit(cm.MenuItems, pri); AddApprovedRevisionsMultiUnit(cm.MenuItems, pri);
@@ -923,7 +912,6 @@ namespace Volian.Controls.Library
AddShowChangeBarsAfterMenuItem(cm.MenuItems, pri); AddShowChangeBarsAfterMenuItem(cm.MenuItems, pri);
cm.MenuItems.Add("Approve", new EventHandler(mi_Click)); cm.MenuItems.Add("Approve", new EventHandler(mi_Click));
//_MyLog.WarnFormat("Context Menu 1 before - {0}", GC.GetTotalMemory(true)); //_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); AddApprovedRevisions(cm.MenuItems, pri);
//_MyLog.WarnFormat("Context Menu 1 after - {0}", GC.GetTotalMemory(true)); //_MyLog.WarnFormat("Context Menu 1 after - {0}", GC.GetTotalMemory(true));
} }
@@ -936,7 +924,6 @@ namespace Volian.Controls.Library
{ {
MenuItem mip = new MenuItem("Print"); MenuItem mip = new MenuItem("Print");
MenuItem miqp = new MenuItem("Quick Print"); MenuItem miqp = new MenuItem("Quick Print");
MenuItem misa = new MenuItem("Select Annotations"); //C2025-027
int k = 0; int k = 0;
foreach (string s in pri.MyDocVersion.UnitNames) foreach (string s in pri.MyDocVersion.UnitNames)
{ {
@@ -945,19 +932,15 @@ namespace Volian.Controls.Library
mp.Tag = k; mp.Tag = k;
MenuItem mqp = miqp.MenuItems.Add(s, new EventHandler(miMultiUnit_Click)); MenuItem mqp = miqp.MenuItems.Add(s, new EventHandler(miMultiUnit_Click));
mqp.Tag = k; mqp.Tag = k;
MenuItem msa = misa.MenuItems.Add(s, new EventHandler(miMultiUnit_Click));
msa.Tag = k;
} }
cm.MenuItems.Add(mip); cm.MenuItems.Add(mip);
cm.MenuItems.Add(miqp); cm.MenuItems.Add(miqp);
cm.MenuItems.Add(misa);
AddApprovedRevisionsMultiUnit(cm.MenuItems, pri); AddApprovedRevisionsMultiUnit(cm.MenuItems, pri);
} }
else else
{ {
cm.MenuItems.Add("Print", new EventHandler(mi_Click)); cm.MenuItems.Add("Print", new EventHandler(mi_Click));
cm.MenuItems.Add("Quick 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); AddApprovedRevisions(cm.MenuItems, pri);
} }
} }
@@ -1949,9 +1932,6 @@ namespace Volian.Controls.Library
case "Create Time Critical Action Summary": case "Create Time Critical Action Summary":
OnCreateTimeCriticalActionSummary(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0, mi.Text, (int)mi.Tag)); OnCreateTimeCriticalActionSummary(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0, mi.Text, (int)mi.Tag));
break; break;
case "Select Annotations": // C2025-027
OnSelectAnnotations(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0));
break;
default: default:
if (mip.Text.StartsWith("Showing Change Bars Starting")) if (mip.Text.StartsWith("Showing Change Bars Starting"))
OnSelectDateToStartChangeBars(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0)); 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" + 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"); "You cannot paste a Non-Enhanced Procedure into an Enhanced Procedure Set.", "Cannot Paste Here");
break; break;
case "Select Annotations": // C2025-027
OnSelectAnnotations(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0));
break;
//case "Check Out Procedure Set": //case "Check Out Procedure Set":
// CheckOutDocVersion(SelectedNode as VETreeNode); // CheckOutDocVersion(SelectedNode as VETreeNode);
// break; // break;