This commit is contained in:
parent
4366a473bf
commit
c8d47d9c64
@ -27,7 +27,7 @@ namespace Volian.Controls.Library
|
|||||||
private string _strSrchText = "";
|
private string _strSrchText = "";
|
||||||
private List<DocVersionInfo> lstCheckedDocVersions = new List<DocVersionInfo>();
|
private List<DocVersionInfo> lstCheckedDocVersions = new List<DocVersionInfo>();
|
||||||
private List<int> lstCheckedStepTypes = new List<int>();
|
private List<int> lstCheckedStepTypes = new List<int>();
|
||||||
|
private List<string> lstCheckedStepTypesStr = new List<string>();
|
||||||
private AnnotationDetails _AnnotationDetails = null;
|
private AnnotationDetails _AnnotationDetails = null;
|
||||||
ItemInfo _ItemInfo = null;
|
ItemInfo _ItemInfo = null;
|
||||||
private DisplayTabControl _TabControl;
|
private DisplayTabControl _TabControl;
|
||||||
@ -172,6 +172,7 @@ namespace Volian.Controls.Library
|
|||||||
DevComponents.AdvTree.Node topnode = new DevComponents.AdvTree.Node();
|
DevComponents.AdvTree.Node topnode = new DevComponents.AdvTree.Node();
|
||||||
advTreeStepTypes.Nodes.Clear();
|
advTreeStepTypes.Nodes.Clear();
|
||||||
lstCheckedStepTypes.Clear();
|
lstCheckedStepTypes.Clear();
|
||||||
|
lstCheckedStepTypesStr.Clear();
|
||||||
topnode.Text = "Types";
|
topnode.Text = "Types";
|
||||||
advTreeStepTypes.Nodes.Add(topnode);
|
advTreeStepTypes.Nodes.Add(topnode);
|
||||||
|
|
||||||
@ -1011,7 +1012,9 @@ namespace Volian.Controls.Library
|
|||||||
}
|
}
|
||||||
else
|
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;
|
SearchString = null;
|
||||||
SearchResults = ItemInfoList.GetListFromTextSearch(DVISearchList, TypeSearchList, "", cbxBooleanTxtSrch.Checked ? 2 : cbxCaseSensitive.Checked ? 1 : 0, ItemSearchIncludeLinks.Value, includeRTFformat, includeSpecialChars);
|
SearchResults = ItemInfoList.GetListFromTextSearch(DVISearchList, TypeSearchList, "", cbxBooleanTxtSrch.Checked ? 2 : cbxCaseSensitive.Checked ? 1 : 0, ItemSearchIncludeLinks.Value, includeRTFformat, includeSpecialChars);
|
||||||
cmbResultsStyleIndex = 1; //display step locations in results
|
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
|
// do this if either none, or more than one procedure set selected
|
||||||
advTreeStepTypes.Nodes.Clear();
|
advTreeStepTypes.Nodes.Clear();
|
||||||
lstCheckedStepTypes.Clear();
|
lstCheckedStepTypes.Clear();
|
||||||
|
lstCheckedStepTypesStr.Clear();
|
||||||
Node newnode = new DevComponents.AdvTree.Node();
|
Node newnode = new DevComponents.AdvTree.Node();
|
||||||
newnode.Text = "....select a procedure set for types to appear...";
|
newnode.Text = "....select a procedure set for types to appear...";
|
||||||
advTreeStepTypes.Nodes.Add(newnode);
|
advTreeStepTypes.Nodes.Add(newnode);
|
||||||
@ -1291,17 +1295,29 @@ namespace Volian.Controls.Library
|
|||||||
{
|
{
|
||||||
n.Style = DevComponents.AdvTree.NodeStyles.Apple;
|
n.Style = DevComponents.AdvTree.NodeStyles.Apple;
|
||||||
if (sd == null)
|
if (sd == null)
|
||||||
|
{
|
||||||
lstCheckedStepTypes.Add(0); //use zero to identify attachment search
|
lstCheckedStepTypes.Add(0); //use zero to identify attachment search
|
||||||
|
lstCheckedStepTypesStr.Add("Accessory Sections");
|
||||||
|
}
|
||||||
else
|
else
|
||||||
|
{
|
||||||
lstCheckedStepTypes.Add((int)sd.Index);
|
lstCheckedStepTypes.Add((int)sd.Index);
|
||||||
|
lstCheckedStepTypesStr.Add(advTreeStepTypes.SelectedNode.Text);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
n.Style = null;
|
n.Style = null;
|
||||||
if (sd == null)
|
if (sd == null)
|
||||||
|
{
|
||||||
|
lstCheckedStepTypesStr.Remove("Accessory Sections");
|
||||||
lstCheckedStepTypes.Remove(0);
|
lstCheckedStepTypes.Remove(0);
|
||||||
|
}
|
||||||
else
|
else
|
||||||
|
{
|
||||||
lstCheckedStepTypes.Remove((int)sd.Index);
|
lstCheckedStepTypes.Remove((int)sd.Index);
|
||||||
|
lstCheckedStepTypesStr.Remove(sd.Type);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
buildStepTypePannelTitle();
|
buildStepTypePannelTitle();
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user