From 22be9d94ddad63c6ede43bda2d41f254e0318791 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 9 Sep 2019 15:50:49 +0000 Subject: [PATCH] B2019-130 Added check for when sub step is a different type but at the save level as the previous sub step. --- PROMS/Volian.Print.Library/Pagination.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PROMS/Volian.Print.Library/Pagination.cs b/PROMS/Volian.Print.Library/Pagination.cs index d33de78c..224df297 100644 --- a/PROMS/Volian.Print.Library/Pagination.cs +++ b/PROMS/Volian.Print.Library/Pagination.cs @@ -1580,7 +1580,10 @@ namespace Volian.Print.Library float spaceOnCurrentPage = fullPage - (-yLocation+yStart); // B2019-124 - Pagination - if substep will fit on a blank page but will not fit on the current page // And is not the first substep then break - return (myPara.MyItemInfo.Ordinal > 1 && myPara.YSize > spaceOnCurrentPage && myPara.YSize < fullPage); + // B2019-130 - in Calvert data (FSG-1 Appendix 1 Unit 1 Actions, step E.1.g) the THEN sub step was placed on the next page + // the THEN sub step is at the same level as the bullet items above it (is a bullet item changed to a paragraph) + // We added a check for this via current content type vs previous content type. + return (myPara.MyItemInfo.Ordinal > 1 && myPara.MyItemInfo.MyContent.Type == myPara.MyItemInfo.MyPrevious.MyContent.Type && myPara.YSize > spaceOnCurrentPage && myPara.YSize < fullPage); } private static bool InSameBox(vlnParagraph myPara, vlnParagraph minPara2) {