B2019-150 & B2019-151 - Pagination Flag added to limit where new pagination logic would be used.

This commit is contained in:
Rich 2019-10-28 18:38:43 +00:00
parent caf1fe24f6
commit 2f06862a79
13 changed files with 14 additions and 2 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -3726,6 +3726,14 @@ namespace VEPROMS.CSLA.Library
return LazyLoad(ref _SpecialPageBreakFlag, "@SpecialPageBreakFlag");
}
}
private LazyLoad<bool> _PaginateOnStepThatWillFitOnBlankPage;
public bool PaginateOnStepThatWillFitOnBlankPage
{
get
{
return LazyLoad(ref _PaginateOnStepThatWillFitOnBlankPage, "@PaginateOnStepThatWillFitOnBlankPage");
}
}
private LazyLoad<bool> _PaginateOnFirstSubstep;
public bool PaginateOnFirstSubstep
{

View File

@ -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