From 89f046e792a1c5f7cfa233bd8f98195481d56f0e Mon Sep 17 00:00:00 2001 From: John Date: Fri, 18 May 2018 19:22:57 +0000 Subject: [PATCH] =?UTF-8?q?Code=20cleanup=20=E2=80=93=20removed=20unused?= =?UTF-8?q?=20format=20setting=20B2018-079=20Calvert=20pagination=20fix.?= =?UTF-8?q?=20Don=E2=80=99t=20need=20to=20count=20phone=20list=20length=20?= =?UTF-8?q?when=20calculating=20space=20on=20the=20page.=20Phone=20list=20?= =?UTF-8?q?is=20printed=20below=20the=20footer=20and=20defined=20page=20le?= =?UTF-8?q?ngth.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PROMS/Formats/fmtall/CWEall.xml | Bin 58234 -> 58188 bytes PROMS/Formats/fmtall/EXESAMall.xml | Bin 72736 -> 72690 bytes PROMS/Formats/fmtall/TVASAMGall.xml | Bin 68372 -> 68326 bytes PROMS/Volian.Print.Library/Pagination.cs | 6 ++++-- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/PROMS/Formats/fmtall/CWEall.xml b/PROMS/Formats/fmtall/CWEall.xml index 34b3c5e83a0243a30ad1bce93a84b85b9ef0d2b7..c7e3885e397fcd2ccde933b8bc766a8af41e7aa0 100644 GIT binary patch delta 14 Wcmex$jQPwl<_!Yeo9(!5ZU6u@p$0Sn delta 44 wcmX?ejQQ6w<_!YevI-0V3`Go?40#MCKvo7rK9H5l-~$vXW+>VGpUd|K042%{XD&8S)rPfUFFLd>|{8!3QW(%uv!?&$GRrhq0I+09?rp A2><{9 diff --git a/PROMS/Formats/fmtall/TVASAMGall.xml b/PROMS/Formats/fmtall/TVASAMGall.xml index 87cbd011d56b04d4adbd8101e25d7704202c09bb..aef76cac69da3582929d57e4b7d6543064534aae 100644 GIT binary patch delta 17 ZcmbO-jpf-?mJLUECU0Qj+r%sK4**3~2UGw6 delta 52 zcmaDhm1W8_mJLUEWEB_!7>XD&8S)rPfUFFLd>|{8!3QW(%uq6UK8yV11U-(;w|IE| F0RWB~4=(@! diff --git a/PROMS/Volian.Print.Library/Pagination.cs b/PROMS/Volian.Print.Library/Pagination.cs index ad923d1e..dc6dc049 100644 --- a/PROMS/Volian.Print.Library/Pagination.cs +++ b/PROMS/Volian.Print.Library/Pagination.cs @@ -152,8 +152,9 @@ namespace Volian.Print.Library // also consider if there is a phone list at the bottom of the page, add the amount of space the phone // list requires onto yEndMsg to make it easier to figure out pagination (include an extra line for the // horizonal line above the phone list. + // B2018-079 - we don't need the phone list length in this case only the length of the end message because the phone list is printed below the footer but the end message is shifted up. if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.PrintPhoneList && MyPageHelper.PhoneListHeight != 0) - yEndMsg += (MyPageHelper.PhoneListHeight - vlnPrintObject.SixLinesPerInch); + yEndMsg += GetBottomContinueMessageSize(MyItemInfo.MyDocStyle);//(MyPageHelper.PhoneListHeight - vlnPrintObject.SixLinesPerInch); // The following code is to fix a pagination issue in SHE. It was decided to not put it into development // because some of the pagination logic may be redesigned. Without this fix, some pages had a page break @@ -888,8 +889,9 @@ namespace Volian.Print.Library break; } // also account for phonelist for locating bottom continue message: + // B2018-079 - we don't need the phone list length in this case only the length of the end message plus a blank line because the phone list is printed below the footer but the end message is shifted up. if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.PrintPhoneList && MyPageHelper.PhoneListHeight != 0) - myBottomMsgSpace += (MyPageHelper.PhoneListHeight - vlnPrintObject.SixLinesPerInch); + myBottomMsgSpace += vlnPrintObject.SixLinesPerInch; //(MyPageHelper.PhoneListHeight - vlnPrintObject.SixLinesPerInch); string myTopMsg = docstyle.Continue.Top.Message; float myTopMsgSpace = ((myTopMsg ?? "") != "") ? 2 * SixLinesPerInch : 0;