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

Added the Continuous Action AND, Continuous Action OR, and Continuous Action PARAGRAPH to the search by type list. They will be placed under their parent type (AND, OR, and Paragraph) (B2015-008)

Browse Source 
Fixed the Global Search Report bug where only the headers were on the first page of the report (B2014-098).  Fixed bug were printing a search result of “(“ would not print. (B2013-150)
This commit is contained in:
John Jenko 2015-08-04 17:25:34 +00:00
parent a5615f9ea7
commit f8c047e0c7
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -407,7 +407,8 @@ namespace Volian.Controls.Library
// Group by High Level Steps, Substeps, Cautions, Notes, Figures, Tables
while (!parentName.Equals("Base") && !parentName.Equals("Substep") && !parentName.Equals("High") &&
!parentName.Equals("Caution") && !parentName.Equals("Note") && !parentName.Equals("Table") &&
!parentName.Equals("Figure") && !parentName.Equals("Title"))
!parentName.Equals("Figure") && !parentName.Equals("Title") &&
!parentName.Equals("And") && !parentName.Equals("Or") && !parentName.Equals("Paragraph"))
{
StepData tmpsd = (StepData)parnode.Tag;
parentName = tmpsd.ParentType;

4
PROMS/Volian.Print.Library/PDFReport.cs
View File

@ -426,7 +426,7 @@ namespace Volian.Print.Library
datatable.AddCell(cell);
BuildSearchResultsProcSetList();
datatable.HeaderRows = 3 + (ProcSetList.Count == 1 ? 1 : 0);
datatable.HeaderRows = 4 + (ProcSetList.Count == 1 ? 1 : 0);
int splitAt = FindSpitLevel(); // find the split level of the common path - for all procedure sets that use these library documents
Color subHeaderColor = new Color(0xD0, 0xF0, 0xD0);
@ -543,6 +543,8 @@ namespace Volian.Print.Library
_RegexSearchString = _RegexSearchString + "$";
_RegexSearchString = _RegexSearchString.Replace("[", @"\[");
_RegexSearchString = _RegexSearchString.Replace("]", @"\]");
_RegexSearchString = _RegexSearchString.Replace("(", @"\(");
_RegexSearchString = _RegexSearchString.Replace(")", @"\)");
}
return _RegexSearchString;
}