From 2f06862a79f5eddca76db67ce49000ae1313b2d3 Mon Sep 17 00:00:00 2001 From: Rich Date: Mon, 28 Oct 2019 18:38:43 +0000 Subject: [PATCH] B2019-150 & B2019-151 - Pagination Flag added to limit where new pagination logic would be used. --- PROMS/Formats/fmtall/BASEall.xml | Bin 91578 -> 91668 bytes PROMS/Formats/fmtall/BNPP1all.xml | Bin 173834 -> 173922 bytes PROMS/Formats/fmtall/BNPP2all.xml | Bin 177830 -> 177916 bytes PROMS/Formats/fmtall/BNPPalrall.xml | Bin 168362 -> 162996 bytes PROMS/Formats/fmtall/BNPPbckall.xml | Bin 147600 -> 147688 bytes PROMS/Formats/fmtall/BNPPcklall.xml | Bin 126826 -> 126914 bytes PROMS/Formats/fmtall/BNPPdevall.xml | Bin 42970 -> 43058 bytes PROMS/Formats/fmtall/HLPDEVall.xml | Bin 43508 -> 43596 bytes PROMS/Formats/fmtall/HLPall.xml | Bin 85530 -> 85618 bytes PROMS/Formats/fmtall/OHLPall.xml | Bin 72292 -> 72380 bytes PROMS/Formats/fmtall/hlpfsgall.xml | Bin 106778 -> 106866 bytes .../Format/PlantFormat.cs | 8 ++++++++ PROMS/Volian.Print.Library/Pagination.cs | 8 ++++++-- 13 files changed, 14 insertions(+), 2 deletions(-) diff --git a/PROMS/Formats/fmtall/BASEall.xml b/PROMS/Formats/fmtall/BASEall.xml index a5d8dc7d658ffd7474c1a0c8332088a491bc7f4b..124a13f7c549816a0df7b27d947db6670e737121 100644 GIT binary patch delta 80 zcmdmWnsv$<)(!h&CkyCuOuiSvXBf;-!jQ^Pz!1Wa!H@`Khcjd{Cfxd?}0 zR%UUcAU_lWZ)IZVw8T;J1Fw4Id4?NHJd4E5@ zU*G5X?!4vuzq2ksrm<|))0o3z^YHCq${ULZ+D(R6dB=XJ{EGO}6qzHfYOiWkU8-4a zkkzL2szW8z?zH;3YE|uW#pT(Rwus7Gqgb}7T6ykL&AdNJO9m%DHXR97=};Bfy7~Dp zl*6@}?E20)g*-;N^7H&B|D!0h{N+xO%)so zqKvQ3!=JJ~oQ<2jCkuJx=f(wC&65@!7z$w_hpn*lZVOzpbIO7T6ihk(I<0TcMzILu z{Tq3;I4&jfrp(sx=mPW&Mc^b~%HGctIXL+`;6@R}XH{C{`doPV(3~V%mM^eecjx1*!Qo<<2k!@~c+@0GzjedJH>y#@mmD}S*XBq8&d%r^D^bt) zoM@*C9VrA^*=v&sX+C`)!oFy3I;Alz;=2Vh{%1~jGD_77wSt$dLk%a}q{yK%6dCW| z^}CSG9L|GVAeh)56o6865FgPr?ixNFMCV-0J@4ZFi)WEe9T7kGMlm2nJ!}cXC)hs; z;}7!b!bs{AqygWY%{EDTG6p;S|6WTBeQ^T@WaOQ2^R@)e@YOox=&3sVNPMRYQ#{cF zClA-dl@&>UrB2nv&3!24iBn|aTm9(NqZ@IEc>PfUB5_=NxejJ_Z$+rAHcY z#h`%xtO>^{qg)j!C;!xs8eOszFDX^P9-~54aN!9oV{;GU{HjH2D*A^O@_3t!W^*4Z z+4_Pq_0%rhC+>YjQGVVk#lKG4G!tOp7;dpOUvPzYz@g=E+ynO}q@P23;hwRRL=XAr zuLUjO8tjN>@`W8J*To(1;H{d*>tLOpj+W^heY=M^v7=MQF#09V@s{1(%{hxh=IywP1Z{ z8Xrt2dir1q+N5o4lP+NL_rVA3lWkIiX=@W>T1=Wg7^Uh%lcrXC=3l^F)W+66?Ee2h zbLN{f-}%ltbMX(ug^%JwzwqVTST75(4z`bV(yxPUWC!W3M~t`=Cx7KFykr{<+1Q(G zHOpZR=438<+Sp<3+dcQSmiY-LNB})}*#n7q$p}eee~cBId|(lunv&kGW!+@d&koSy z1~y2~cG|a}zWlV~UV1ju@*r6S=sn1~Xgo-7``7^eHFCxe9_F3=!8O3erE<$V6CQQK!!1W}LhuY6L#|hdEgV6fg;xbnh|##izE608 zdS{$h7Asy>iiI=WLw0U8FvHC}Y6xklT77VfSEk|gBc2v7Ra``Zp@87ET6oO8n5{r2 z+D$OLEMk&W=)n6KBw>>oE-a0jIXwbfu*MDK;bY#9IYzLc%?$ZCT?a;-9_Kn7Geh3# z<6xoV+0kqUPsAMgVLkmj*l6op72v=P9PZG2iHlI%IJ|+gE}-bEW(5qKR8ad0d0~$O zJ2ooe**GyAr^i?hQgRN7@*PesA%DL2LcTWi1Z=7tGPn~7tQyRvhI;_zc08*QF}S1Z9SP3W+(a1mEopqTb@%k2}@w=D1;S3^dq<1az9 z*RX@~Q`V3jqAx8O^>xty;@rpL!5B!u&}!JgpSU&3(`^)T8>^?v&_Uqckre|SfAU0Z zyv22@JqbQg@XHhkp2>q)y!VLPaIcjZj~vRthbCg+L@IP?^COMjAXe2zqsV3qOK;Y=yyhE;eMACy65ScN~5=14AI z;-sNO0O7iE&=Df^h^~ny`Z`q5elnuL1j1@qGX07vr`!2kf+H{ zHO0di$I%1e#4FWsTOF%~Rz(t@;}24g@Ke0IsKW%bjv@O;KHEVm=%-FlpeZ8Ua|SeB z$o^+z3!Q?jY-BBaQ5UTl)Vk1`xz*IM!pf-;lyK2No>2v!sz!gsc&M>D(V>I%|6Y;YD#`DH4vQahJ?3nuY_@kpH_rNCg;KT%3;jb>74B_>Jnq8Ze2}HcdQDwRTdS_w1YdD&$+=!whofC^9)GHby7UG**y64$ znGCRQjTJGxO0TwV0e}c6zS#}?qn)7Q=n1=!(E1`SY*y2nU_#*@bacUT4E4fJY^#S+ zywL(js1(`p=MLDa&K!pI9PjLe5H*GH2Gln^)aJkSLAFvxWA}ZKDbI@czu>9Z+e-SO z)8%6E0qD(KPm%A@6k}ssNJCOd;TsAm2OYa070>RW8eqT8_3Fu8aGhh$NuGpberUpk zMk*bhL$C_vnV#NErOiH8ggsr4RlSsl?)GO{Nte9pbURcjnwtx8iUNFIq*OXfJzq@7 z^#J+&XeW#=u%bmi3ULu1D)F&NdA5ZY$-R@Q^+b@owne6pmSQ-v2a51YA2cEb{WTW?4UwCD6eGNRkN9{Rcp0e2@?H-G%9bGPovLY>FOyl2apG-HBJQ} z1@nf$gb(HEyp%waub47cPOsN|kWOjklEIcyFQp5^eAL5dKA&t5F)pi$E#_cYuOg_>8=eiP| delta 22 ecmaFS$T^{rb3=q`^9I%S4XTXWH>fgMNCNLCDlgbG6d diff --git a/PROMS/Formats/fmtall/BNPPdevall.xml b/PROMS/Formats/fmtall/BNPPdevall.xml index fbe0b2a59935dc92533ad5fae1fd0d47b4857932..b9b4c6feb70a72e76733cb37a9fb096c82e1fb3b 100644 GIT binary patch delta 86 zcmcb0o@vtsrVTcd?g0#m4CxG+40%Ahgdvr|AIJ&@vkDkO7&5@3;XwHuAan!LC14d! TKwctHWi|suf9hs!$@P5zwo4SC delta 14 WcmdmVf$7$HrVTcdo2N+5>jMBamIlE9 diff --git a/PROMS/Formats/fmtall/HLPDEVall.xml b/PROMS/Formats/fmtall/HLPDEVall.xml index 050e6121da5ac5046981c9d9f78bca5b766cfc19..3779aa7e1b53b1f476ba60d5145ec6e3cff0e948 100644 GIT binary patch delta 86 zcmexznd!_GrVT3W?g0#m4CxG+40%Ahgdvr|AIJ&@vkDkO7&5@3;XwHuAan!LC14d! TKwctHWi|suf9hso_J@lAy$=-5 delta 14 WcmX?eh3U&>rVT3Wn`_uFECK*GN(S!$ diff --git a/PROMS/Formats/fmtall/HLPall.xml b/PROMS/Formats/fmtall/HLPall.xml index 66fa276fd10468bbb9610edce97831db4f6c0418..bbd8d5c5a0a0fa54a2d7e08d09d19fc4dc43c6e1 100644 GIT binary patch delta 76 zcmbO=hxOAO)(zW)41*a;7*ZJu7(y5_7!rZ(aE45V93XT9(j^T340#MrKwct{&SnSz Y(&>`}J%lGq2n#fC6575=h%v(&01FcnkN^Mx delta 18 acmew~hjrE*)(zW)n)!sc^9eJiSOWk_$p&Kp diff --git a/PROMS/Formats/fmtall/OHLPall.xml b/PROMS/Formats/fmtall/OHLPall.xml index fa385607479214f3feda341cece5f557f7279229..1f1a79cb577acbe782f6b70040724b0c46c5c831 100644 GIT binary patch delta 70 zcmaE|g=NoHmJLVPjDs0U7*ZJu7(y5_7!rZ(aE45V93XT9(j^T340#MrKwct{&SnSz S(&-GT&GXr|&u3#iDhvRw#S$g} delta 18 acmdn9mF3A6mJLVPnq}Cx%dj&p5C#BE(+0o* diff --git a/PROMS/Formats/fmtall/hlpfsgall.xml b/PROMS/Formats/fmtall/hlpfsgall.xml index 9bd37a92891439bfaefd8efc60b607d1d8540ead..9dff23d9674e72554d5f1d7e986cb6e1c69f636a 100644 GIT binary patch delta 72 zcmbPri0#uMwhd224TBj<7*ZJu7(y5_7!rZ(aE45V93XT9(j^T340#MrKwct{&SnSz U(&>{AP7-duAiDj6D5F<50Pju|ZvX%Q delta 18 acmex#h;7y(whd22n{C9l+lVombprrX0|#aR diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs index 1c06b9dd..4a7c3b70 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs @@ -3726,6 +3726,14 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _SpecialPageBreakFlag, "@SpecialPageBreakFlag"); } } + private LazyLoad _PaginateOnStepThatWillFitOnBlankPage; + public bool PaginateOnStepThatWillFitOnBlankPage + { + get + { + return LazyLoad(ref _PaginateOnStepThatWillFitOnBlankPage, "@PaginateOnStepThatWillFitOnBlankPage"); + } + } private LazyLoad _PaginateOnFirstSubstep; public bool PaginateOnFirstSubstep { diff --git a/PROMS/Volian.Print.Library/Pagination.cs b/PROMS/Volian.Print.Library/Pagination.cs index 224df297..a562b494 100644 --- a/PROMS/Volian.Print.Library/Pagination.cs +++ b/PROMS/Volian.Print.Library/Pagination.cs @@ -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