diff --git a/PROMS/Volian.Print.Library/Pagination.cs b/PROMS/Volian.Print.Library/Pagination.cs index 08b19a32..f4a4d016 100644 --- a/PROMS/Volian.Print.Library/Pagination.cs +++ b/PROMS/Volian.Print.Library/Pagination.cs @@ -1289,6 +1289,8 @@ namespace Volian.Print.Library } onNewPage = true; float yTopNew = Math.Min(paraBreak.YTopMost, paraBreak.YVeryTop) - YTopMost; + // B2020-120: for calvert alarms, consider the size of the condition response text/lines + if (paraBreak.HasCalvertMacro) yTopNew += (accountForCalvertAlarmConditionResponseFooter - SixLinesPerInch); // B2017-161: unnecessary PageBreak for background documents: use the 'usedPageBreakOnStepList' flag when using the PageBreakOnStepList, don't adjust space on page to account // for continue message, if there is not one. bool usedPageBreakOnStepList = false; @@ -1650,6 +1652,8 @@ namespace Volian.Print.Library // B2020-099 was breaking on last sub-step of previous RNO - Calvert Approved Procedures; Abnormal Procedures – Unit 2; AOP-2A; Section VII; Step 11.RNO.11.1.c private vlnParagraph HasSecondRNOThatWillFit(float yStart, float yLowerLimit, float yUpperLimit, StepLevelList myList, int stepLevel, float yTop) { + // B2020-120: for calvert alarms/condition response table, don't run code for second rno + if (this.ChildrenAbove != null && this.ChildrenAbove.Count > 0) if (HasCalvertMacro) return this; // note: "this" is the myPara from where this method is called if (!MyItemInfo.IsInRNO || MyItemInfo.GetMaxRNOLevels <= 1) // GetMaxRNOLevels will get the greatest (lowest) RNO level in the step return this; // does not have second (more than one) RNO - break at the myPara