Compare commits
23 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 914837a5a2 | |||
| aa7e0528f8 | |||
| 57bd8d569e | |||
| b49d8871a2 | |||
| b90d419bc5 | |||
| 1f48d498e1 | |||
| be744b40a3 | |||
| 780ce657ca | |||
| 464be0f803 | |||
| 58a6cb9a24 | |||
| 9bf7b2ffde | |||
| cde1f28215 | |||
| db198cb7d0 | |||
| 99fe567e78 | |||
| 2261c8f0f5 | |||
| f93b16fc52 | |||
| 7c3a43749c | |||
| ecec7b9f1a | |||
| 1aca7335f7 | |||
| ba5aee6640 | |||
| 7a3a07b0da | |||
| 05ab48cdc5 | |||
| fd51c209a3 |
@@ -262,8 +262,10 @@ namespace VEPROMS.CSLA.Library
|
|||||||
if (dvi.DocVersionAssociations[0].MyROFst.ROFstID != newfstid)
|
if (dvi.DocVersionAssociations[0].MyROFst.ROFstID != newfstid)
|
||||||
{
|
{
|
||||||
dv.DocVersionAssociations[0].MyROFst = localROFst.GetJustROFst();
|
dv.DocVersionAssociations[0].MyROFst = localROFst.GetJustROFst();
|
||||||
SetAssociationLastCompleted(dv, DateTime.Now.ToString());
|
|
||||||
}
|
}
|
||||||
|
// B2026-066 moved this out of if statement above
|
||||||
|
// - was not resetting the datetime and thus not disabling the Update RO Values button and menu item
|
||||||
|
SetAssociationLastCompleted(dv, DateTime.Now.ToString());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2078,8 +2078,9 @@ namespace Volian.Controls.Library
|
|||||||
|
|
||||||
if (cbxFndUnLnkROVals.Enabled && cbxFndUnLnkROVals.Checked)
|
if (cbxFndUnLnkROVals.Enabled && cbxFndUnLnkROVals.Checked)
|
||||||
{
|
{
|
||||||
// B2022-031 - added a cbxProcSectSrch to filter out procedure and section titles from global search results.
|
string ROSearchList2 = exactsearch(ROSearchList); // B2026-053 match exact string
|
||||||
SearchResults = ItemInfoList.GetListFromTextSearch(DVISearchList, TypeSearchList, ROSearchList, cbxBooleanTxtSrch.Checked ? 2 : cbxCaseSensitive.Checked ? 1 : 0, cbxProcSectSrch.Checked ? 1 : 0, ItemSearchIncludeLinks.Nothing, includeRTFformat, includeSpecialChars, unitPrefix, string.Empty, string.Empty);
|
// B2022-031 - added a exactsearch to filter out procedure and section titles from global search results.
|
||||||
|
SearchResults = ItemInfoList.GetListFromTextSearch(DVISearchList, TypeSearchList, ROSearchList2, cbxBooleanTxtSrch.Checked ? 2 : cbxCaseSensitive.Checked ? 1 : 0, cbxProcSectSrch.Checked ? 1 : 0, ItemSearchIncludeLinks.Nothing, includeRTFformat, includeSpecialChars, unitPrefix, string.Empty, string.Empty);
|
||||||
cmbResultsStyleIndex = 3; // display step text in results
|
cmbResultsStyleIndex = 3; // display step text in results
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -2190,6 +2191,25 @@ namespace Volian.Controls.Library
|
|||||||
OnSearchComplete(new DisplaySearchEventArgs(TimeSpan.FromTicks(DateTime.Now.Ticks - start.Ticks)));
|
OnSearchComplete(new DisplaySearchEventArgs(TimeSpan.FromTicks(DateTime.Now.Ticks - start.Ticks)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private string exactsearch(string SearchString) // B2026-053
|
||||||
|
{
|
||||||
|
StringBuilder ss = new StringBuilder();
|
||||||
|
int sl = SearchString.Length;
|
||||||
|
int LstIdxSp = SearchString.LastIndexOf(' ');
|
||||||
|
if (sl == LstIdxSp + 1) // B2026-053 if ' ' the last char.
|
||||||
|
{
|
||||||
|
ss.Append(' ');
|
||||||
|
ss.Append(SearchString); // B2026-053 add a space prefix to make the search exact if the end of the searchString is a space.
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
ss.Append(' ');
|
||||||
|
ss.Append(SearchString); // B2026-053 Exact match add spaces before and after searchString.
|
||||||
|
ss.Append(' ');
|
||||||
|
}
|
||||||
|
return ss.ToString();
|
||||||
|
}
|
||||||
|
|
||||||
private void ClearResults() // B2021-103 if no results when RNO only, clear results list. (moved from btnSearch_Click)
|
private void ClearResults() // B2021-103 if no results when RNO only, clear results list. (moved from btnSearch_Click)
|
||||||
{
|
{
|
||||||
if (tabSearchTypes.SelectedTab != tabSearchTypes.Tabs[4])
|
if (tabSearchTypes.SelectedTab != tabSearchTypes.Tabs[4])
|
||||||
|
|||||||
Reference in New Issue
Block a user