B2017-273 Farley - Paginate on the parent section when that section prints steps and has sub-section

B2017-273 Farley - When that section prints steps and has sub-section, don’t set the page that has the parent section to the sub-subsection’s pagelist (docstyle)
This commit is contained in:
John Jenko 2017-12-11 14:01:09 +00:00
parent a14b859da3
commit 2d9dfb41f8
2 changed files with 4 additions and 1 deletions

View File

@ -70,6 +70,8 @@ namespace Volian.Print.Library
// its own page. This occurred in BGE/OI3 set/OI-7 procedure/10.0 Attachments.
if (!(MyParent.MyItemInfo as SectionInfo).IsSeparatePagination()) return 1;
if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.WCNTraining && (MyItemInfo as SectionInfo).IsSeparatePagination()) return 1;
// B2017-273 added a check for Farley format, we don't want the subsection pagelist infor to appear on the parent section page - works with ToPDF() logic - (section has steps and a sub-section ex: FNP-2-EEP-0 Attachment 4)
if (MyItemInfo.ActiveFormat.Name.ToUpper().StartsWith("FNP") && (MyItemInfo as SectionInfo).IsSeparatePagination()) return 1;
if (MyItemInfo.MyPrevious != null) // add if statement to fix Westinghouse print issue 3-21-2014
return 1;
}

View File

@ -1538,7 +1538,8 @@ namespace Volian.Print.Library
// don't do the following for the WCN training format:
// if parent was continuous & this is separate, don't reset document style to subsection (next page) type
// this was putting incorrect pagelist item on parent section's page. This occurred in BGE/OI3 set/OI-7 procedure/10.0 Attachments.
if (!MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.WCNTraining && (MyParent.MyItemInfo as SectionInfo).IsSeparatePagination() || !(MyItemInfo as SectionInfo).IsSeparatePagination())
// B2017-273 added a check for Farley format, we don't want the subsection pagelist infor to appear on the parent section page - works with Paginate() logic - (section has steps and a sub-section ex: FNP-2-EEP-0 Attachment 4)
if (!MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.WCNTraining && !MyItemInfo.ActiveFormat.Name.ToUpper().StartsWith("FNP") && (MyParent.MyItemInfo as SectionInfo).IsSeparatePagination() || !(MyItemInfo as SectionInfo).IsSeparatePagination())
{
MyPageHelper.MySection = MyItemInfo as SectionInfo;
MyPageHelper.ResetSvg();