B2015-087: annotation panel not enabled for folders/doc versions

This commit is contained in:
Kathy Ruffing 2015-06-29 13:17:01 +00:00
parent 791549a700
commit 5455804e11
2 changed files with 14 additions and 2 deletions

View File

@ -713,6 +713,7 @@ namespace VEPROMS
this.epAnnotations.ExpandedChanged += new DevComponents.DotNetBar.ExpandChangeEventHandler(this.epAnnotations_ExpandedChanged); this.epAnnotations.ExpandedChanged += new DevComponents.DotNetBar.ExpandChangeEventHandler(this.epAnnotations_ExpandedChanged);
this.epAnnotations.Resize += new System.EventHandler(this.epAnnotations_Resize); this.epAnnotations.Resize += new System.EventHandler(this.epAnnotations_Resize);
this.epAnnotations.ExpandedChanging += new DevComponents.DotNetBar.ExpandChangeEventHandler(this.expandPanelExpandedChanging); this.epAnnotations.ExpandedChanging += new DevComponents.DotNetBar.ExpandChangeEventHandler(this.expandPanelExpandedChanging);
this.epAnnotations.Enabled = false;
// //
// ctrlAnnotationDetails // ctrlAnnotationDetails
// //
@ -727,6 +728,7 @@ namespace VEPROMS
this.ctrlAnnotationDetails.Name = "ctrlAnnotationDetails"; this.ctrlAnnotationDetails.Name = "ctrlAnnotationDetails";
this.ctrlAnnotationDetails.Size = new System.Drawing.Size(1185, 0); this.ctrlAnnotationDetails.Size = new System.Drawing.Size(1185, 0);
this.ctrlAnnotationDetails.TabIndex = 15; this.ctrlAnnotationDetails.TabIndex = 15;
this.ctrlAnnotationDetails.Enabled = false;
// //
// btnAnnoDetailsPushPin // btnAnnoDetailsPushPin
// //

View File

@ -2488,6 +2488,9 @@ namespace VEPROMS
ctrlAnnotationDetails.CurrentAnnotation = null; ctrlAnnotationDetails.CurrentAnnotation = null;
ctrlAnnotationDetails.Annotations = null; ctrlAnnotationDetails.Annotations = null;
infotabFoldoutMaint.Visible = infotabRO.Visible = infotabTransition.Visible = infotabTags.Visible = infotabHistory.Visible = infotabApplicability.Visible = false; 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 // When infotabTags is set to InVisible, the matching panel also needs to be set to invisible
infotabControlPanelTags.Visible = false; infotabControlPanelTags.Visible = false;
displayTags.MyEditItem = null; displayTags.MyEditItem = null;
@ -2508,6 +2511,8 @@ namespace VEPROMS
//vlnStackTrace.ShowStack("enter tc_ItemSelectedChanged {0}", _CurrentItem); //vlnStackTrace.ShowStack("enter tc_ItemSelectedChanged {0}", _CurrentItem);
if (args.MyEditItem == null) if (args.MyEditItem == null)
{ {
ctrlAnnotationDetails.Enabled = false;
epAnnotations.Enabled = false;
infotabTransition.Visible = false; infotabTransition.Visible = false;
infotabRO.Visible = false; infotabRO.Visible = false;
if (args.MyItemInfo.MyDocVersion.DocVersionAssociations != null) if (args.MyItemInfo.MyDocVersion.DocVersionAssociations != null)
@ -2529,6 +2534,8 @@ namespace VEPROMS
} }
else else
{ {
epAnnotations.Enabled = true;
ctrlAnnotationDetails.Enabled = true;
if (args.MyEditItem.MyItemInfo.IsSection || args.MyEditItem.MyItemInfo.IsProcedure) if (args.MyEditItem.MyItemInfo.IsSection || args.MyEditItem.MyItemInfo.IsProcedure)
{ {
infotabRO.Visible = infotabTransition.Visible = false; 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) displayRO.ROTypeFilter = E_ROValueType.All; // allow all RO types for Word attachments (but fix)
} }
} }
ctrlAnnotationDetails.UpdateAnnotationGrid(_CurrentItem); if (ctrlAnnotationDetails.Enabled && epAnnotations.Enabled)
AnnotationPanelView(); {
ctrlAnnotationDetails.UpdateAnnotationGrid(_CurrentItem);
AnnotationPanelView();
}
btnPrint.Enabled = (_CurrentItem != null); btnPrint.Enabled = (_CurrentItem != null);
} }