From f8c047e0c7835d2dcdfb7aca4e46b60c6fc2e8d7 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 4 Aug 2015 17:25:34 +0000 Subject: [PATCH] =?UTF-8?q?Added=20the=20Continuous=20Action=20AND,=20Cont?= =?UTF-8?q?inuous=20Action=20OR,=20and=20Continuous=20Action=20PARAGRAPH?= =?UTF-8?q?=20to=20the=20search=20by=20type=20list.=20=20They=20will=20be?= =?UTF-8?q?=20placed=20under=20their=20parent=20type=20(AND,=20OR,=20and?= =?UTF-8?q?=20Paragraph)=20(B2015-008)=20Fixed=20the=20Global=20Search=20R?= =?UTF-8?q?eport=20bug=20where=20only=20the=20headers=20were=20on=20the=20?= =?UTF-8?q?first=20page=20of=20the=20report=20(B2014-098).=20=20Fixed=20bu?= =?UTF-8?q?g=20were=20printing=20a=20search=20result=20of=20=E2=80=9C(?= =?UTF-8?q?=E2=80=9C=20would=20not=20print.=20(B2013-150)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PROMS/Volian.Controls.Library/DisplaySearch.cs | 3 ++- PROMS/Volian.Print.Library/PDFReport.cs | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.cs b/PROMS/Volian.Controls.Library/DisplaySearch.cs index c0a5f67b..db338ce0 100644 --- a/PROMS/Volian.Controls.Library/DisplaySearch.cs +++ b/PROMS/Volian.Controls.Library/DisplaySearch.cs @@ -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; diff --git a/PROMS/Volian.Print.Library/PDFReport.cs b/PROMS/Volian.Print.Library/PDFReport.cs index 63a76906..dfd291db 100644 --- a/PROMS/Volian.Print.Library/PDFReport.cs +++ b/PROMS/Volian.Print.Library/PDFReport.cs @@ -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; }