From 683ff2d304e4b0961ac8b706e01ce7e6835c6e63 Mon Sep 17 00:00:00 2001 From: Kathy Date: Wed, 14 Oct 2020 13:24:26 +0000 Subject: [PATCH] C2020-043: Do not remove delimiters for tabs in search reports --- PROMS/Volian.Print.Library/PDFReport.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/PROMS/Volian.Print.Library/PDFReport.cs b/PROMS/Volian.Print.Library/PDFReport.cs index 9d73f32b..08db4313 100644 --- a/PROMS/Volian.Print.Library/PDFReport.cs +++ b/PROMS/Volian.Print.Library/PDFReport.cs @@ -949,9 +949,16 @@ namespace Volian.Print.Library string hlsTab = stpinfo.MyTab.CleanTextNoSymbols; //StepInfo.Get(pitem.ItemID).MyTab.CleanTextNoSymbols; string typeName = stpinfo.FormatStepData.StepEditData.TypeMenu.MenuItem;//stpinfo.FormatStepData.GetPDDisplayName(); //.ToString(); + // C2020-043: don't remove delimiters on tabs if this step's tab has the parent tab included. + bool hasParent = false; + if (IncludesParentToHLS(stpinfo) && !hlsTab.Contains("\u25CF")) + { + hlsTab = hlsTab.Trim(" ".ToCharArray()).TrimEnd(".".ToCharArray()); + hasParent = true; + } if (hlsTab == null || hlsTab == "") hlsTab = "{" + typeName + " " + pitem.Ordinal.ToString() + "}."; - else if (!sret.StartsWith(hlsTab.Trim(" ".ToCharArray()))) + else if (!hasParent && !sret.StartsWith(hlsTab.Trim(" ".ToCharArray()))) { foreach (string rmvDelim in DelimList) hlsTab = hlsTab.Replace(rmvDelim, ""); hlsTab = hlsTab.Trim(" ".ToCharArray());