diff --git a/PROMS/Volian.Controls.Library/AnnotationDetails.cs b/PROMS/Volian.Controls.Library/AnnotationDetails.cs index 529a8ab7..a6ed00e8 100644 --- a/PROMS/Volian.Controls.Library/AnnotationDetails.cs +++ b/PROMS/Volian.Controls.Library/AnnotationDetails.cs @@ -279,14 +279,14 @@ namespace Volian.Controls.Library { //using (Annotation annotation = CurrentAnnotation.Get()) //{ -// annotation.Delete(); - _AnnotationSearch.LoadingList = true; - Annotation.DeleteAnnotation(CurrentAnnotation); -// annotation.Save(); - _AnnotationSearch.LoadingList = false; - CurrentAnnotation = null; - UpdateAnnotationGrid(); - //_AnnotationSearch.UpdateAnnotationSearchResults(); // update the search results + // annotation.Delete(); + _AnnotationSearch.LoadingList = true; + Annotation.DeleteAnnotation(CurrentAnnotation); + // annotation.Save(); + _AnnotationSearch.LoadingList = false; + CurrentAnnotation = null; + UpdateAnnotationGrid(); + _AnnotationSearch.UpdateAnnotationSearchResults(); // B2019-004: update search results list when an annotation is removed. //} } diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.cs b/PROMS/Volian.Controls.Library/DisplaySearch.cs index 4eb31468..224f851d 100644 --- a/PROMS/Volian.Controls.Library/DisplaySearch.cs +++ b/PROMS/Volian.Controls.Library/DisplaySearch.cs @@ -1056,19 +1056,29 @@ namespace Volian.Controls.Library // } // Console.WriteLine("{0} Populate", DateTime.Now); //} - //public void UpdateAnnotationSearchResults() - //{ - // //AnnotationTypeInfo ati = cbxAnnoTypes.SelectedValue as AnnotationTypeInfo; - // //_LoadingList = true; - // //lbSrchResults.DataSource = ati.AnnotationTypeAnnotations; - // //lbSrchResults.SelectedIndex = -1; - // //LastResultsMouseOverIndex = -1; - // //if (lbSrchResults.Items.Count > 0) - // // btnPrnSrchRslts.Enabled = true; - // //else - // // btnPrnSrchRslts.Enabled = false; - // //_LoadingList = false; - //} + public void UpdateAnnotationSearchResults() + { + // B2019-004: update search results list when an annotation is removed. (before bug fix, code method & code below was commented out) + string unitPrefix = ""; + if (Mydocversion != null) + unitPrefix = Mydocversion.DocVersionConfig.Unit_ProcedureNumber; + if (unitPrefix.EndsWith("#")) + unitPrefix = unitPrefix.Replace("#", ""); + SearchResults = ItemInfoList.GetListFromAnnotationSearch(DVISearchList, TypeSearchList, AnnotationSearchType, cbxTextSearchAnnotation.Text, cbxCaseSensitiveAnnoText.Checked, unitPrefix); + DisplayResults(); + /* + AnnotationTypeInfo ati = cbxAnnoTypes.SelectedValue as AnnotationTypeInfo; + _LoadingList = true; + lbSrchResults.DataSource = ati.AnnotationTypeAnnotations; + lbSrchResults.SelectedIndex = -1; + LastResultsMouseOverIndex = -1; + if (lbSrchResults.Items.Count > 0) + btnPrnSrchRslts.Enabled = true; + else + btnPrnSrchRslts.Enabled = false; + _LoadingList = false; + * */ + } private void lbSrchResults_MouseMove(object sender, MouseEventArgs e) { int ResultsMouseOverIndex = lbSrchResults.IndexFromPoint(e.Location);