From bb503e62b04bf78159ae48980e03976980d15daf Mon Sep 17 00:00:00 2001 From: Kathy Date: Thu, 8 Feb 2018 13:50:03 +0000 Subject: [PATCH] B2018-021: Supplemental information page not printing when associated with complicated step. C2018-002: Remove checkboxes in supplemental info --- PROMS/Volian.Print.Library/vlnParagraph.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index ee05cbc8..cdfd1e4b 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -2378,7 +2378,8 @@ namespace Volian.Print.Library foreach (ItemInfo iic in pi.MyItems) { if (iic.SupInfos != null && iic.SupInfos.Count > 0) return iic.SupInfos[0].ItemID; - if (supInfoSect.StepSectPageBreaks.Contains(iic.ItemID)) return -2; // B2017-192: -2 flags that a page break within substep was found, return + // B2018-021: added code to be sure that check isn't on current step, i.e. startid != iic.ItemID + if (startid != iic.ItemID && supInfoSect.StepSectPageBreaks.Contains(iic.ItemID)) return -2; // B2017-192: -2 flags that a page break within substep was found, return int id = GetSubThatHasSupInfoItems(iic, startid); if (id == -2) return -1; if (id != -1) return id; @@ -4042,7 +4043,7 @@ namespace Volian.Print.Library } } } - if (co != null) + if (co != null && !MyItemInfo.IsInSupInfo) // C2018-002: don't print checkboxes on supplemental infromation pages. { // if this item's content is empty, and the flag is set to 'notonempty', don't print out the // checkoff - this was added for shearon harris: