From 1b9d1cf902566c22f4a462c8164c33dc68739caa Mon Sep 17 00:00:00 2001 From: Rich Date: Fri, 21 Oct 2016 15:04:09 +0000 Subject: [PATCH] Changed Section Notes and Cautions headers to include the Section Location --- .../VEPROMS.CSLA.Library/Extension/ItemExt.cs | 32 ++++++++++++++----- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index ba7d4d35..89dee9f1 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -4287,18 +4287,34 @@ namespace VEPROMS.CSLA.Library } // For VC Summer Unit 2 & 3 (vcb formats) include step number in Note & Caution header - if (FormatStepData.TabData.IncludeStepNum && MyHeader != null && MyParent != null && MyParent.CombinedTab != null) + if (FormatStepData.TabData.IncludeStepNum && MyHeader != null && MyParent != null) { - // if my parent is a paragraph, then don't use the paragraph tab in the header, use the parent of the paragraph: - if (MyParent.IsParagraph) + if (MyParent.CombinedTab != null) { - MyHeader.Text = MyHeader.Text + ((MyParent == null) ? "" : " Step " + MyParent.MyParent.MyTab.CleanText.TrimEnd(".".ToCharArray())); - MyHeader.CleanText = MyHeader.CleanText + ((MyParent == null) ? "" : " Step " + MyParent.MyParent.MyTab.CleanText.TrimEnd(".".ToCharArray())); + // if my parent is a paragraph, then don't use the paragraph tab in the header, use the parent of the paragraph: + if (MyParent.IsParagraph) + { + MyHeader.Text = MyHeader.Text + ((MyParent == null) ? "" : " Step " + MyParent.MyParent.MyTab.CleanText.TrimEnd(".".ToCharArray())); + MyHeader.CleanText = MyHeader.CleanText + ((MyParent == null) ? "" : " Step " + MyParent.MyParent.MyTab.CleanText.TrimEnd(".".ToCharArray())); + } + else + { + MyHeader.Text = MyHeader.Text + ((MyParent == null) ? "" : " Step " + MyParent.MyTab.CleanText.TrimEnd(".".ToCharArray())); + MyHeader.CleanText = MyHeader.CleanText + ((MyParent == null) ? "" : " Step " + MyParent.MyTab.CleanText.TrimEnd(".".ToCharArray())); + } } - else + else if (MyParent.IsStepSection && FormatStepData.TabData.IncludeSectionNum) { - MyHeader.Text = MyHeader.Text + ((MyParent == null) ? "" : " Step " + MyParent.MyTab.CleanText.TrimEnd(".".ToCharArray())); - MyHeader.CleanText = MyHeader.CleanText + ((MyParent == null) ? "" : " Step " + MyParent.MyTab.CleanText.TrimEnd(".".ToCharArray())); + ItemInfo parent = MyParent; + if (parent.IsStepSection) + { + string parentTab = parent.MyTab.CleanText.TrimEnd(".".ToCharArray()); + if (parentTab != "") + { + MyHeader.Text = MyHeader.Text + ((MyParent == null) ? "" : " Section " + parentTab); + MyHeader.CleanText = MyHeader.CleanText + ((MyParent == null) ? "" : " Section " + parentTab); + } + } } } return tbformat;