Compare commits
26 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 4ef16e7856 | |||
| 1eb3c3e725 | |||
| a89c2d3d22 | |||
| 914837a5a2 | |||
| aa7e0528f8 | |||
| 57bd8d569e | |||
| b49d8871a2 | |||
| b90d419bc5 | |||
| 1f48d498e1 | |||
| da6139c932 | |||
| be744b40a3 | |||
| 780ce657ca | |||
| 464be0f803 | |||
| 58a6cb9a24 | |||
| 9bf7b2ffde | |||
| cde1f28215 | |||
| 99fe567e78 | |||
| 2261c8f0f5 | |||
| f93b16fc52 | |||
| 7c3a43749c | |||
| ecec7b9f1a | |||
| 1aca7335f7 | |||
| ba5aee6640 | |||
| 7a3a07b0da | |||
| 05ab48cdc5 | |||
| fd51c209a3 |
@@ -2148,7 +2148,7 @@ namespace VEPROMS
|
||||
//C2019-036 View Only mode work with Checked Out Procedures
|
||||
// View Only Mode is no longer checked out, so no longer has an OwnerID
|
||||
// This will keep those tabs from auto-closing based on the timer
|
||||
if (!myList.Contains(dti.OwnerID) && dti.MyStepTabPanel.MyStepPanel.VwMode != E_ViewMode.View)
|
||||
if (!myList.Contains(dti.OwnerID) && dti?.MyStepTabPanel?.MyStepPanel?.VwMode != E_ViewMode.View)
|
||||
{
|
||||
MyCloseTabList.PushDTI(dti);
|
||||
}
|
||||
|
||||
@@ -613,7 +613,15 @@ namespace Volian.Controls.Library
|
||||
_In_DSOTabPanel_Enter = false;
|
||||
_MyDisplayTabControl.SelectedDisplayTabItem = MyDisplayTabItem;
|
||||
// B2018-070 Position the text cursor - Activate MS Word Panel
|
||||
_MyEdWord.GotoItem(EDWordLib.WdGoToItem.wdGoToObject, EDWordLib.WdGoToDirection.wdGoToNext, 0, null);
|
||||
try
|
||||
{
|
||||
_MyEdWord.GotoItem(EDWordLib.WdGoToItem.wdGoToObject, EDWordLib.WdGoToDirection.wdGoToNext, 0, null);
|
||||
}
|
||||
catch
|
||||
{
|
||||
//B2026-067 - Do nothing if cannot Position cursor
|
||||
}
|
||||
|
||||
}
|
||||
#endregion
|
||||
#region Public Methods
|
||||
|
||||
@@ -2078,8 +2078,27 @@ namespace Volian.Controls.Library
|
||||
|
||||
if (cbxFndUnLnkROVals.Enabled && cbxFndUnLnkROVals.Checked)
|
||||
{
|
||||
// B2022-031 - added a cbxProcSectSrch to filter out procedure and section titles from global search results.
|
||||
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);
|
||||
string byWordPrefix = string.Empty;
|
||||
string byWordSuffix = string.Empty;
|
||||
|
||||
if (Regex.IsMatch(ROSearchList, @"^[\d\.]")) // starts with a number or '.' decimal pt
|
||||
{
|
||||
byWordPrefix = @"[^0-9a-zA-Z.vbpi:\\-]";
|
||||
}
|
||||
else if (Regex.IsMatch(ROSearchList, @"^[a-zA-Z]")) // starts with a letter
|
||||
{
|
||||
byWordPrefix = @"[^a-zA-Z]";
|
||||
}
|
||||
if (Regex.IsMatch(ROSearchList, @"[\d\.]$")) // ends with a number or decimal
|
||||
{
|
||||
byWordSuffix = @"[^0-9a-zA-Z.vbpi:\\-]";
|
||||
}
|
||||
else if (Regex.IsMatch(ROSearchList, @"[a-zA-Z]$")) // ends with a letter
|
||||
{
|
||||
byWordSuffix = @"[^a-zA-Z]";
|
||||
}
|
||||
|
||||
SearchResults = ItemInfoList.GetListFromTextSearch(DVISearchList, TypeSearchList, ROSearchList, cbxBooleanTxtSrch.Checked ? 2 : cbxCaseSensitive.Checked ? 1 : 0, cbxProcSectSrch.Checked ? 1 : 0, ItemSearchIncludeLinks.Nothing, includeRTFformat, includeSpecialChars, unitPrefix, byWordPrefix, byWordSuffix);
|
||||
cmbResultsStyleIndex = 3; // display step text in results
|
||||
}
|
||||
else
|
||||
@@ -2189,7 +2208,6 @@ namespace Volian.Controls.Library
|
||||
}
|
||||
OnSearchComplete(new DisplaySearchEventArgs(TimeSpan.FromTicks(DateTime.Now.Ticks - start.Ticks)));
|
||||
}
|
||||
|
||||
private void ClearResults() // B2021-103 if no results when RNO only, clear results list. (moved from btnSearch_Click)
|
||||
{
|
||||
if (tabSearchTypes.SelectedTab != tabSearchTypes.Tabs[4])
|
||||
|
||||
Reference in New Issue
Block a user