diff --git a/PROMS/Formats/fmtall/BASEall.xml b/PROMS/Formats/fmtall/BASEall.xml index a5d8dc7d..124a13f7 100644 Binary files a/PROMS/Formats/fmtall/BASEall.xml and b/PROMS/Formats/fmtall/BASEall.xml differ diff --git a/PROMS/Formats/fmtall/BNPP1all.xml b/PROMS/Formats/fmtall/BNPP1all.xml index 1fb4f263..47de1445 100644 Binary files a/PROMS/Formats/fmtall/BNPP1all.xml and b/PROMS/Formats/fmtall/BNPP1all.xml differ diff --git a/PROMS/Formats/fmtall/BNPP2all.xml b/PROMS/Formats/fmtall/BNPP2all.xml index 98f43ba9..11e374ec 100644 Binary files a/PROMS/Formats/fmtall/BNPP2all.xml and b/PROMS/Formats/fmtall/BNPP2all.xml differ diff --git a/PROMS/Formats/fmtall/BNPPalrall.xml b/PROMS/Formats/fmtall/BNPPalrall.xml index 4990ae4c..32e2406e 100644 Binary files a/PROMS/Formats/fmtall/BNPPalrall.xml and b/PROMS/Formats/fmtall/BNPPalrall.xml differ diff --git a/PROMS/Formats/fmtall/BNPPbckall.xml b/PROMS/Formats/fmtall/BNPPbckall.xml index 02efaf4a..c9d01841 100644 Binary files a/PROMS/Formats/fmtall/BNPPbckall.xml and b/PROMS/Formats/fmtall/BNPPbckall.xml differ diff --git a/PROMS/Formats/fmtall/BNPPcklall.xml b/PROMS/Formats/fmtall/BNPPcklall.xml index 1deeea54..b6310c0f 100644 Binary files a/PROMS/Formats/fmtall/BNPPcklall.xml and b/PROMS/Formats/fmtall/BNPPcklall.xml differ diff --git a/PROMS/Formats/fmtall/BNPPdevall.xml b/PROMS/Formats/fmtall/BNPPdevall.xml index fbe0b2a5..b9b4c6fe 100644 Binary files a/PROMS/Formats/fmtall/BNPPdevall.xml and b/PROMS/Formats/fmtall/BNPPdevall.xml differ diff --git a/PROMS/Formats/fmtall/HLPDEVall.xml b/PROMS/Formats/fmtall/HLPDEVall.xml index 050e6121..3779aa7e 100644 Binary files a/PROMS/Formats/fmtall/HLPDEVall.xml and b/PROMS/Formats/fmtall/HLPDEVall.xml differ diff --git a/PROMS/Formats/fmtall/HLPall.xml b/PROMS/Formats/fmtall/HLPall.xml index 66fa276f..bbd8d5c5 100644 Binary files a/PROMS/Formats/fmtall/HLPall.xml and b/PROMS/Formats/fmtall/HLPall.xml differ diff --git a/PROMS/Formats/fmtall/OHLPall.xml b/PROMS/Formats/fmtall/OHLPall.xml index fa385607..1f1a79cb 100644 Binary files a/PROMS/Formats/fmtall/OHLPall.xml and b/PROMS/Formats/fmtall/OHLPall.xml differ diff --git a/PROMS/Formats/fmtall/hlpfsgall.xml b/PROMS/Formats/fmtall/hlpfsgall.xml index 9bd37a92..9dff23d9 100644 Binary files a/PROMS/Formats/fmtall/hlpfsgall.xml and b/PROMS/Formats/fmtall/hlpfsgall.xml differ diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs index 1c06b9dd..4a7c3b70 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs @@ -3726,6 +3726,14 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _SpecialPageBreakFlag, "@SpecialPageBreakFlag"); } } + private LazyLoad _PaginateOnStepThatWillFitOnBlankPage; + public bool PaginateOnStepThatWillFitOnBlankPage + { + get + { + return LazyLoad(ref _PaginateOnStepThatWillFitOnBlankPage, "@PaginateOnStepThatWillFitOnBlankPage"); + } + } private LazyLoad _PaginateOnFirstSubstep; public bool PaginateOnFirstSubstep { diff --git a/PROMS/Volian.Print.Library/Pagination.cs b/PROMS/Volian.Print.Library/Pagination.cs index 224df297..a562b494 100644 --- a/PROMS/Volian.Print.Library/Pagination.cs +++ b/PROMS/Volian.Print.Library/Pagination.cs @@ -1542,8 +1542,8 @@ namespace Volian.Print.Library return myPara; // B2019-103, B2019-114 Break at a step if the step will fit on a page by itself and it will // not fit in the current pagee - if (StepWillFitOnBlankPageButNotOnCurrentPage(myPara, yLocation,yStart,fullPage)) - if (myPara != lastBreak) + if (StepWillFitOnBlankPageButNotOnCurrentPage(myPara, yLocation, yStart, fullPage)) + if (myPara != lastBreak) return myPara; // If this item will not fit on the current page, put a page break @@ -1577,6 +1577,10 @@ namespace Volian.Print.Library } private static bool StepWillFitOnBlankPageButNotOnCurrentPage(vlnParagraph myPara, float yLocation, float yStart,float fullPage) { + // B2019-150 & B2019-151 Pagination Bugs Seen for Summer EOP4.1 Step 10 and + // SAG Step 9. Added format flag to limit when this logic would be used. + if (myPara.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.StepSectionLayoutData.PaginateOnStepThatWillFitOnBlankPage == false) + return false; 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