From 5455804e113cc95de71d4bc739b5e66d6e396958 Mon Sep 17 00:00:00 2001 From: Kathy Date: Mon, 29 Jun 2015 13:17:01 +0000 Subject: [PATCH] B2015-087: annotation panel not enabled for folders/doc versions --- .../VEPROMS User Interface/frmVEPROMS.Designer.cs | 2 ++ PROMS/VEPROMS User Interface/frmVEPROMS.cs | 14 ++++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs index d89f42d7..07d01e92 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs @@ -713,6 +713,7 @@ namespace VEPROMS this.epAnnotations.ExpandedChanged += new DevComponents.DotNetBar.ExpandChangeEventHandler(this.epAnnotations_ExpandedChanged); this.epAnnotations.Resize += new System.EventHandler(this.epAnnotations_Resize); this.epAnnotations.ExpandedChanging += new DevComponents.DotNetBar.ExpandChangeEventHandler(this.expandPanelExpandedChanging); + this.epAnnotations.Enabled = false; // // ctrlAnnotationDetails // @@ -727,6 +728,7 @@ namespace VEPROMS this.ctrlAnnotationDetails.Name = "ctrlAnnotationDetails"; this.ctrlAnnotationDetails.Size = new System.Drawing.Size(1185, 0); this.ctrlAnnotationDetails.TabIndex = 15; + this.ctrlAnnotationDetails.Enabled = false; // // btnAnnoDetailsPushPin // diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index 503d8d5d..9e28e9f7 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -2488,6 +2488,9 @@ namespace VEPROMS ctrlAnnotationDetails.CurrentAnnotation = null; ctrlAnnotationDetails.Annotations = null; infotabFoldoutMaint.Visible = infotabRO.Visible = infotabTransition.Visible = infotabTags.Visible = infotabHistory.Visible = infotabApplicability.Visible = false; + ctrlAnnotationDetails.Enabled = false; + epAnnotations.Enabled = false; + epAnnotations.Expanded = false; // When infotabTags is set to InVisible, the matching panel also needs to be set to invisible infotabControlPanelTags.Visible = false; displayTags.MyEditItem = null; @@ -2508,6 +2511,8 @@ namespace VEPROMS //vlnStackTrace.ShowStack("enter tc_ItemSelectedChanged {0}", _CurrentItem); if (args.MyEditItem == null) { + ctrlAnnotationDetails.Enabled = false; + epAnnotations.Enabled = false; infotabTransition.Visible = false; infotabRO.Visible = false; if (args.MyItemInfo.MyDocVersion.DocVersionAssociations != null) @@ -2529,6 +2534,8 @@ namespace VEPROMS } else { + epAnnotations.Enabled = true; + ctrlAnnotationDetails.Enabled = true; if (args.MyEditItem.MyItemInfo.IsSection || args.MyEditItem.MyItemInfo.IsProcedure) { infotabRO.Visible = infotabTransition.Visible = false; @@ -2603,8 +2610,11 @@ namespace VEPROMS displayRO.ROTypeFilter = E_ROValueType.All; // allow all RO types for Word attachments (but fix) } } - ctrlAnnotationDetails.UpdateAnnotationGrid(_CurrentItem); - AnnotationPanelView(); + if (ctrlAnnotationDetails.Enabled && epAnnotations.Enabled) + { + ctrlAnnotationDetails.UpdateAnnotationGrid(_CurrentItem); + AnnotationPanelView(); + } btnPrint.Enabled = (_CurrentItem != null); }