From ba8a8b8673762e7a7fca91d730aeada8e3769151 Mon Sep 17 00:00:00 2001 From: mschill Date: Mon, 28 Apr 2025 12:08:10 -0400 Subject: [PATCH] F2025-011 Format changes are needed to account for ABN procedures. --- PROMS/Formats/fmtall/BASEall.xml | Bin 93418 -> 94236 bytes PROMS/Formats/fmtall/TUECall.xml | Bin 75302 -> 119478 bytes PROMS/Formats/genmacall/tuec.svg | Bin 20576 -> 28778 bytes .../VEPROMS.CSLA.Library/Format/DocStyles.cs | 15 +++++++++++++++ .../Volian.Print.Library/VlnSvgPageHelper.cs | 17 ++++++++++++++++- 5 files changed, 31 insertions(+), 1 deletion(-) diff --git a/PROMS/Formats/fmtall/BASEall.xml b/PROMS/Formats/fmtall/BASEall.xml index acf7b62d08c4ead24a3901b4703a3a87e77612de..0dbdf3b25ba8e1d94139b80c6d361c469d6fad69 100644 GIT binary patch delta 276 zcmaELlXcDm)`l&NPNI_qR&q>sU}l@1B*-Y@8p=@2kjjw4pumvCPzfZR8S)u&84?-t z7?K$>fHDdU0YEa5Asfg_1IiTvX-A;iJTM!iGKWE7`o&O2VZmYsUIs1(PAJr6(4D+c zMSRj+Fo|_(s1(o3!=PwKtmN6su_G3yclYy7fLbO%K8E| jBm-TU&)^F5708AVph!B{PVLDT=jejGzCB2kaYi@*niN6T delta 24 gcmbR9fc4c))`l&NPNIwo(;Y<_g|~M|Fir^v0Ct54I{*Lx diff --git a/PROMS/Formats/fmtall/TUECall.xml b/PROMS/Formats/fmtall/TUECall.xml index c8bce8ef70724b3c55cd5fad116cc3a7ae5e4c1e..56cb9a284a408d9c183e3a6a812d4a0edceae0d6 100644 GIT binary patch delta 3008 zcmcImdrVVj6#q`&C##h|3e-zx8*v0vnk7bE*Ko_TrGukmj=4KTBnwg?I_m+ocDwwb|&As=#=YIG1 zIOo@Xc}a8p3w`Sb2$xtXt72tLVmU0A6^ME$H^)e92`gtSn1`)q)pWavjviKtzQ@Mo zbmm}*R9?*LsAd6uJ+wt|eH}h_M~kl5EUh_@Hh7QKu(ecJN1r8BUQX9_xM+P0PL)!y zWc@hdmI}hrovy(N8B>k*%*yguD%;5Fm3P##jR<8%?VGgvHlC_az}E86fvZVIWqq(# zMu(g2G3b}JVn%9|I)sH_ZDySK%+{!a5Zr7vV|Ho;NTM*+2OwdBYm&a6y}{=_3=*k+nluJ_YZmn6PG@0XwTB(ZAk= zM@z<``<-dTfAC4^$!D?jt(DsLWQo8MIaPZy+Om@Z2NQmmp$S*+DN@g5SqcR+o@7!AS4@hmPA?R5lq>^K%s2)VCk{KTI_b( z#!951th=35=y4ixQ=V>!Dw7H90(#X7GP9b^At~fNi)dvf%Os%F17Pt?TQq)@8H!Q& zBE_W*&Sl(b0*A0&y{||2_6pH>bC(M2*zV_a>BilD6DBst(n|B5X!QH<;(?#@MZ}I! z5UXyr#bE2XX?mqKNvOXb+OZ~ABQ77>3*Z#KU$lTVf8?X>*Dh>3VZ&?NxhQ{h2z<0#Lh1MW*!pSGl;Ad%DK8)*MI^`)I_A;YJXXjG(E4$lIh{F~OQ9t9 zaHT@gA+O=FPfp>1D~q)>FAAsxv&3f5NEERTs8XVRsNyV+^D@c8=} zvE!u7F?|$+rmApj< zR(^dPOvTf4bpb!pMD5`)5FOvA0cJH%5EFlB(&2%lL|%;Ef%|eWK%fQ95_=^mYThqV&SfJ%L`Ju~0l7 zN-$S82D`6B$a5wQ4<=36ul_y4QG7OvKtsff{D)t~Qyiu7%^~or_hk!Is78tf@4Rjh ziM<^_3Z-$M29A)(w!W<>c%5Fm1ttL>1JDIC_&tDBOW>!fnpM!41vmN(Y+hsL*(zA2 zroi{EiGykbX5AXYo5n!=_&|abvc)v;Ih6JNS)xM%z}wVthi@`~CeuUr<#?B~vbZlb zm(n<|Rno4iFX@VD@aNIEOO%#!nijBpIy(5-P_Src$(g}@1~|eS!XTet(1PS$XaUU& zGiiD%?BUZ!SbERGXz|h8$&-FYK~7J8VM2;E{6P#%50|s^NjoTd@Xj0q*)iWcI}tpi zhM&SWr@_em2H2{AA|27HYcy}0O4fP72se*(5l{zTn{s&;x^$ss}{Y`kvyH7=e z3+x=m!Xm8f-8!lrN{U#|4=R$x_eDeEfGl2rG`yw?3-Tu@o1G%A_spo-BZs{_`z=AO z^%L;x08xEYZ+*_x5B}%i87kNnK4j1bkPnyABz8|ET;&;N_;a*IM^65c<=V&@uH{|H Gko_VPr-mSgrSI`bn{n*Q2xnv+(MI!oJ1xE z=<-bdU|cqNf}zIb52-SnZy5G5K{+fyNxsQhdIpmf_OWcfVbaCOUd^D$;LKn!S+GfZ z@;Mid$@|O%CLb{1+q}Un!F}_gCX1-)MrRo1rth<56q@|Nf@QP8-7oBuWg>Mp2RuE; zG`+x`amM6?MQPK#8GlSa=f%jkIqJ251Un}K7;Z1DVq7oBXgd91H>2Zry)BGtjMD>7 fF|L_j(7-rl@|@QJ+dURBeq(0^E1sTziP0SZ61`R) diff --git a/PROMS/Formats/genmacall/tuec.svg b/PROMS/Formats/genmacall/tuec.svg index 2d212c485f682dc41aeb5dc48760b3fabfa13f71..2ea957eb209aa4271b6e430e5c3635fca92a8eaa 100644 GIT binary patch delta 881 zcmcIiO-~bH5PmjGyOee}4a-UhBrR+ZNnGgeT4)cD0Ae(hQf$5XksgRKX_Swe2!upp z!odq!$D4`z1B{V0B*c^P7ofiYub#Y`cyQi#7cidSz+vBgX6BulXXbs5-YY+kluvgJ z{U)wq0F%(sfdnm@CVkL8DhUd7i%RM%M)kpN`lG&baB2Dwm8Qxp88PqgmV%eizLM_hWduusqDyA(Gf*XgrYDnM+`mAi8y`x(5* z_M**(c98;mCYh7IQC3cZex&;I=dUC9Y+s&La`a6d_FaS(&&ndo{-4LF!>mIcgwqtI zbv(;ymuNQHwFQF*C0F&}$*p{er!6r}kyTZQY6(r{C}_{v6|7>3b=|}xJY}3$p+K diff --git a/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs b/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs index 52947440..289b402a 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs @@ -653,6 +653,21 @@ namespace VEPROMS.CSLA.Library } } #endregion + + #region AltMultiUnitWording + [Category("Miscellaneous")] + [Description("Alternate Wording for Printing when MultiUnit")] + + // this will utilize Alternate Wording for Printing when MultiUnit and PrintCommonForZeroUnit is set + private LazyLoad _AltMultiUnitWording; + public string AltMultiUnitWording + { + get + { + return LazyLoad(ref _AltMultiUnitWording, "@AltMultiUnitWording"); + } + } + #endregion IncludeInTOC public override string ToString() { return String.Format("{0:D2} - {1}", Index, Name); diff --git a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs index f15899c6..0ec682e3 100644 --- a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs +++ b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs @@ -1761,6 +1761,16 @@ i = 0; case "[HEADER4]": case "{HEADER5}": case "[HEADER5]": + case "{HEADER6}": + case "[HEADER6]": + case "{HEADER7}": + case "[HEADER7]": + case "{HEADER8}": + case "[HEADER8]": + case "{HEADER9}": + case "[HEADER9]": + case "{HEADER10}": + case "[HEADER10]": case "{BOX1}": case "[BOX1]": case "{BOX2}": @@ -2099,7 +2109,12 @@ i = 0; case "[UNITNUMBER]": string unbr = MySection.MyDocVersion.DocVersionConfig.Unit_Number; if (MySection.ActiveFormat.PlantFormat.FormatData.PrintData.PrintCommonForZeroUnit && unbr == "0") - plstr = "COMMON"; // for Comanche Peak, replace "Unit 0" with "COMMON" + { + if (String.IsNullOrEmpty(MySection.MyDocStyle.AltMultiUnitWording)) + plstr = "COMMON"; // for Comanche Peak, replace "Unit 0" with "COMMON" + else + plstr = MySection.MyDocStyle.AltMultiUnitWording; // for Comanche Peak Abnormal, replace "Unit 0" with "UNIT 1 AND 2" + } else plstr = plstr.Replace(token, unbr); break; -- 2.47.2