From 76b5ba1816a5df3cacb4d4156075c12231a10fc0 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 18 Nov 2020 17:19:37 +0000 Subject: [PATCH] =?UTF-8?q?B2020-148=20=E2=80=93=20Calvert=20pagination=20?= =?UTF-8?q?fix.=20keep=20Cautions=20and=20Notes=20with=20substep.=20=20App?= =?UTF-8?q?roved=20Folder,=20Unit=202=20AOPs,=20AOP-3B=20section=20VI,=20s?= =?UTF-8?q?tep=20H.18.f?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PROMS/Volian.Print.Library/Pagination.cs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/PROMS/Volian.Print.Library/Pagination.cs b/PROMS/Volian.Print.Library/Pagination.cs index 36d39108..24b3dbcb 100644 --- a/PROMS/Volian.Print.Library/Pagination.cs +++ b/PROMS/Volian.Print.Library/Pagination.cs @@ -1714,7 +1714,15 @@ namespace Volian.Print.Library && minPara.MyItemInfo.FirstSibling.ItemID == minPara2.MyItemInfo.ItemID) minPara = null; //if (minPara != null) DebugPagination.WriteLine("### 111111 {0}", minPara); //if(minPara2 != null) DebugPagination.WriteLine("### n222222 {0}", minPara2); - return minPara ?? minPara2; + if (minPara != null && minPara.MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvertPagination && + minPara.MyItemInfo.MyPrevious != null && minPara.MyItemInfo.IsCautionOrNotePart && + minPara2 != null && minPara2.MyItemInfo == minPara.MyItemInfo.FirstSibling) + { + minPara = null; // B2020-148 Calvert Approved folder Unit 2 AOP-3B section VI, Step H.18f - keep cautions/Notes with substep 18.f + DebugPagination.WriteLine("B2020-148 {0}", minPara2); + _MyLog.WarnFormat("\r\n+++ Paginagion Change B2020-148 {0}", minPara2); + } + return minPara ?? minPara2; } // B2020-013 premature break in RNO column - Callaway OTO-AC-00002 step 2