diff --git a/PROMS/Volian.Print.Library/Pagination.cs b/PROMS/Volian.Print.Library/Pagination.cs index d03a8d11..e08268f8 100644 --- a/PROMS/Volian.Print.Library/Pagination.cs +++ b/PROMS/Volian.Print.Library/Pagination.cs @@ -197,7 +197,8 @@ namespace Volian.Print.Library return 2; // break on this item within a step } // B2018-015 Pagination Issue VCS EOP-15.0 Step 15 - Handle when RNO is exactly aligned with the AER column - else if (!MyPageHelper.ParaBreaks[0].PageBreakOnStep && this.YTopMost >= MyPageHelper.ParaBreaks[0].YTopMost) + // B2018-065 Calvert's continue message was not including the substep number in AOP-1A Attachment 1, added AERandRNO check + else if (!MyPageHelper.ParaBreaks[0].PageBreakOnStep && this.YTopMost >= MyPageHelper.ParaBreaks[0].YTopMost && AERandRNO(this.MyItemInfo,MyPageHelper.ParaBreaks[0].MyItemInfo)) { MyPageHelper.ParaBreaks.RemoveAt(0); reason = AddReason("Partial Step - Case 4"); @@ -642,6 +643,20 @@ namespace Volian.Print.Library //return 2; throw new Exception("PageBreak Logic Missing, vlnParagraph.cs"); } + + // B2018-065 Calvert's continue message was not including the substep number in AOP-1A Attachment 1, added AERandRNO check + private bool AERandRNO(ItemInfo itemInfo1, ItemInfo itemInfo2) + { + bool hasAER = false; + bool hasRNO = false; + if (itemInfo1.IsInRNO) hasRNO |= true; + else + hasAER |=true; + if (itemInfo2.IsInRNO) hasRNO |= true; + else + hasAER |= true; + return hasAER && hasRNO; + } // B2018-058 the the end message height accounting for multi-line end messages private float GetEndMessageHeight(DocStyle docstyle) {