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

B2021-103: Annotation search with RNO only and No results shows items in results list

Browse Source
This commit is contained in:
Kathy Ruffing 2022-04-25 16:33:45 +00:00
parent f9d436e2ac
commit 5e6a159d32
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1472,18 +1472,7 @@ namespace Volian.Controls.Library
try try
{ {
LastSearchWasAnnotations = false; // B2019-119 only refresh annotation search results if an annotation search was done LastSearchWasAnnotations = false; // B2019-119 only refresh annotation search results if an annotation search was done
if (tabSearchTypes.SelectedTab != tabSearchTypes.Tabs[4]) ClearResults();
{
lbSrchResults.DataSource = null;
lbSrchResults.Items.Clear();
toolTip1.SetToolTip(lbSrchResults, null);
}
else // C2020-033: Incoming Transiiotns
{
lbSrchResultsIncTrans.DataSource = null;
lbSrchResultsIncTrans.Items.Clear();
toolTip1.SetToolTip(lbSrchResultsIncTrans, null);
}
Cursor = Cursors.WaitCursor; Cursor = Cursors.WaitCursor;
SearchResults = null; SearchResults = null;
bool includeRTFformat = false; bool includeRTFformat = false;
@ -1686,6 +1675,23 @@ namespace Volian.Controls.Library
//if (VlnSettings.DebugMode) //if (VlnSettings.DebugMode)
// MessageBox.Show(string.Format("{0} Milliseconds", TimeSpan.FromTicks(DateTime.Now.Ticks - start.Ticks).TotalMilliseconds)); // MessageBox.Show(string.Format("{0} Milliseconds", TimeSpan.FromTicks(DateTime.Now.Ticks - start.Ticks).TotalMilliseconds));
} }
private void ClearResults() // B2021-103 if no results when RNO only, clear results list. (moved from btnSearch_Click)
{
if (tabSearchTypes.SelectedTab != tabSearchTypes.Tabs[4])
{
lbSrchResults.DataSource = null;
lbSrchResults.Items.Clear();
toolTip1.SetToolTip(lbSrchResults, null);
}
else // C2020-033: Incoming Transiiotns
{
lbSrchResultsIncTrans.DataSource = null;
lbSrchResultsIncTrans.Items.Clear();
toolTip1.SetToolTip(lbSrchResultsIncTrans, null);
}
}
// C2019-001: Search in RNO steps only // C2019-001: Search in RNO steps only
private void GetInRNOResults() private void GetInRNOResults()
{ {
@ -1711,6 +1717,7 @@ namespace Volian.Controls.Library
if (SearchResults == null || SearchResults.Count == 0) if (SearchResults == null || SearchResults.Count == 0)
{ {
FlexibleMessageBox.Show("No Matches Found.", "Search"); FlexibleMessageBox.Show("No Matches Found.", "Search");
ClearResults(); // B2021-103 Clear results list if none found.
} }
} }
private void AddMessageForEmptyAnnotations() private void AddMessageForEmptyAnnotations()