Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed bug where results would not position to found RO

Browse Source
This commit is contained in:
John Jenko
2009-09-01 13:05:51 +00:00
parent 9d2d8a25c4
commit 1e68d76923
2 changed files with 113 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
PROMS/Volian.Controls.Library/DisplaySearch.cs
View File

@@ -14,7 +14,7 @@ namespace Volian.Controls.Library
public partial class DisplaySearch : UserControl
{
#region Properties
private string _strSrchText = "";
private List<DocVersionInfo> lstCheckedDocVersions = new List<DocVersionInfo>();
private List<int> lstCheckedStepTypes = new List<int>();
@@ -623,9 +623,9 @@ namespace Volian.Controls.Library
_OpenDocFromSearch = true;
DisplayTabItem dti = _TabControl.OpenItem(_ItemInfo); // open the corresponding procedure text
if (dti.MyDSOTabPanel != null)
dti.MyDSOTabPanel.SearchString = this.cbxTextSearchText.Text;
dti.MyDSOTabPanel.SearchString = _strSrchText; // this.cbxTextSearchText.Text;
if (dti.MyStepTabPanel != null)
dti.MyStepTabPanel.SearchString = this.cbxTextSearchText.Text;
dti.MyStepTabPanel.SearchString = _strSrchText; // this.cbxTextSearchText.Text;
_OpenDocFromSearch = false;
}
}
@@ -675,6 +675,7 @@ namespace Volian.Controls.Library
#region Search
private string[] BuildSearchString()
{
_strSrchText = ""; // used when jumping to a section from the results window
// the search query needs '<DocVerID>,...<DocVerID>','<StepTypeID>,...,<StepTypeID>','<TextToSearch>'
string[] strRtnStr = { "", "", "" };
// append list of document versions to search
@@ -706,7 +707,9 @@ namespace Volian.Controls.Library
if (tabSearchTypes.SelectedTab == tabSearchTypes.Tabs[0])
{ // Text Search
strRtnStr[2] += ConvertSpecialChars(cbxTextSearchText.Text);//string.Format("{0}", cbxTextSearchText.Text); // append text to search
_strSrchText = ConvertSpecialChars(cbxTextSearchText.Text);//string.Format("{0}", cbxTextSearchText.Text);
strRtnStr[2] += _strSrchText; // append text to search
//strRtnStr[2] += ConvertSpecialChars(cbxTextSearchText.Text);//string.Format("{0}", cbxTextSearchText.Text); // append text to search
}
else if (tabSearchTypes.SelectedTab == tabSearchTypes.Tabs[1])
{ // Annotation Search
@@ -721,7 +724,9 @@ namespace Volian.Controls.Library
if (cbxFndUnLnkROVals.Enabled && cbxFndUnLnkROVals.Checked)
{
ch = (ROFSTLookup.rochild)cmboTreeROs.SelectedNode.Tag;
strRtnStr[2] += string.Format("{0}", ch.value); // append RO Value text to search
_strSrchText = string.Format("{0}", ch.value);
strRtnStr[2] += _strSrchText; // append RO Value text to search
//strRtnStr[2] += string.Format("{0}", ch.value); // append RO Value text to search
}
else
{