diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.cs b/PROMS/Volian.Controls.Library/DisplaySearch.cs index 670c5f51..67e93c48 100644 --- a/PROMS/Volian.Controls.Library/DisplaySearch.cs +++ b/PROMS/Volian.Controls.Library/DisplaySearch.cs @@ -27,7 +27,7 @@ namespace Volian.Controls.Library private string _strSrchText = ""; private List lstCheckedDocVersions = new List(); private List lstCheckedStepTypes = new List(); - + private List lstCheckedStepTypesStr = new List(); private AnnotationDetails _AnnotationDetails = null; ItemInfo _ItemInfo = null; private DisplayTabControl _TabControl; @@ -172,6 +172,7 @@ namespace Volian.Controls.Library DevComponents.AdvTree.Node topnode = new DevComponents.AdvTree.Node(); advTreeStepTypes.Nodes.Clear(); lstCheckedStepTypes.Clear(); + lstCheckedStepTypesStr.Clear(); topnode.Text = "Types"; advTreeStepTypes.Nodes.Add(topnode); @@ -1011,7 +1012,9 @@ namespace Volian.Controls.Library } else { - ReportTitle = "Proms - Search by Type"; + string typstr = null; + foreach (string s in lstCheckedStepTypesStr) typstr = typstr==null?s:typstr + ", " + s; + ReportTitle = "Proms - Search by Type: " + typstr; SearchString = null; SearchResults = ItemInfoList.GetListFromTextSearch(DVISearchList, TypeSearchList, "", cbxBooleanTxtSrch.Checked ? 2 : cbxCaseSensitive.Checked ? 1 : 0, ItemSearchIncludeLinks.Value, includeRTFformat, includeSpecialChars); cmbResultsStyleIndex = 1; //display step locations in results @@ -1221,6 +1224,7 @@ namespace Volian.Controls.Library // do this if either none, or more than one procedure set selected advTreeStepTypes.Nodes.Clear(); lstCheckedStepTypes.Clear(); + lstCheckedStepTypesStr.Clear(); Node newnode = new DevComponents.AdvTree.Node(); newnode.Text = "....select a procedure set for types to appear..."; advTreeStepTypes.Nodes.Add(newnode); @@ -1291,17 +1295,29 @@ namespace Volian.Controls.Library { n.Style = DevComponents.AdvTree.NodeStyles.Apple; if (sd == null) + { lstCheckedStepTypes.Add(0); //use zero to identify attachment search + lstCheckedStepTypesStr.Add("Accessory Sections"); + } else + { lstCheckedStepTypes.Add((int)sd.Index); + lstCheckedStepTypesStr.Add(advTreeStepTypes.SelectedNode.Text); + } } else { n.Style = null; if (sd == null) + { + lstCheckedStepTypesStr.Remove("Accessory Sections"); lstCheckedStepTypes.Remove(0); + } else + { lstCheckedStepTypes.Remove((int)sd.Index); + lstCheckedStepTypesStr.Remove(sd.Type); + } } buildStepTypePannelTitle();