From 2d9dfb41f8f75b0f084c0e17cf47f0e545140a59 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 11 Dec 2017 14:01:09 +0000 Subject: [PATCH] =?UTF-8?q?B2017-273=20Farley=20-=20Paginate=20on=20the=20?= =?UTF-8?q?parent=20section=20when=20that=20section=20prints=20steps=20and?= =?UTF-8?q?=20has=20sub-section=20B2017-273=20Farley=20-=20When=20that=20s?= =?UTF-8?q?ection=20prints=20steps=20and=20has=20sub-section,=20don?= =?UTF-8?q?=E2=80=99t=20set=20the=20page=20that=20has=20the=20parent=20sec?= =?UTF-8?q?tion=20to=20the=20sub-subsection=E2=80=99s=20pagelist=20(docsty?= =?UTF-8?q?le)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PROMS/Volian.Print.Library/Pagination.cs | 2 ++ PROMS/Volian.Print.Library/vlnParagraph.cs | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/PROMS/Volian.Print.Library/Pagination.cs b/PROMS/Volian.Print.Library/Pagination.cs index 556a3fd6..bf48e99f 100644 --- a/PROMS/Volian.Print.Library/Pagination.cs +++ b/PROMS/Volian.Print.Library/Pagination.cs @@ -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; } diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index 2ea8887a..ee05cbc8 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -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();