From 9c0b6a315cba5a41cf1d321eefe3109619f7469f Mon Sep 17 00:00:00 2001 From: John Date: Tue, 14 Mar 2023 13:26:22 +0000 Subject: [PATCH] B2023-034 encapsulated pagination logic added for Beaver Valley AOP format with a format flag so that it does not adversely affect Calver or other plant procedures. --- PROMS/Volian.Print.Library/Pagination.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/PROMS/Volian.Print.Library/Pagination.cs b/PROMS/Volian.Print.Library/Pagination.cs index 5517e578..1b80db15 100644 --- a/PROMS/Volian.Print.Library/Pagination.cs +++ b/PROMS/Volian.Print.Library/Pagination.cs @@ -448,7 +448,9 @@ namespace Volian.Print.Library // without this logic, the first step is printed at the same y-location as if it was on the previous page bool sepPaginationForSubSection = false; // B2023-033: don't do the sub-section check that was done for Beaver Valley (F2023-015) for Calvert - if (!MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert) + // B2023-034 The fix for B2023-033 didn't fix a Calvert sub-section that uses their Valve List. + // Added a format file for use in Beaver Valley AOP format, since this logic was put in for them. + if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.UseOnFirstForSeparatePaginationOnSubSect) { if (MyItemInfo.IsHigh && MyItemInfo.MyPrevious == null && MyItemInfo.MyActiveSection.IsSubsection) { @@ -457,7 +459,7 @@ namespace Volian.Print.Library } } if (!ManualPageBreak && ((mySize + yEndMsg <= yWithinMargins + yExtra) || // Don't Paginate if there is enough room, will fit on page - (mySize <= yWithinMargins + yExtra && SpecialCaseForRobinson())) && !sepPaginationForSubSection) + (mySize <= yWithinMargins + yExtra && SpecialCaseForRobinson())) && !sepPaginationForSubSection) //if (!ManualPageBreak && mySize + yEndMsg <= yWithinMargins + SixLinesPerInch) // Don't Paginate if there is enough room, will fit on page { // ooooo ooooo ooooo .oooooo..o o8o oooo oooo .o88o. o8o .