From 06013afc8bf0d21cb75e781ecbd22642c72dd05e Mon Sep 17 00:00:00 2001 From: John Jenko Date: Mon, 5 Feb 2024 15:43:54 -0500 Subject: [PATCH] F2024-008 - Updated transition definitions to title case section numbers, section titles, and procedure titles. Also surround section titles with parenthesis. --- PROMS/Formats/fmtall/BASEall.xml | Bin 101204 -> 101344 bytes PROMS/Formats/fmtall/VEGP1all.xml | Bin 182208 -> 183426 bytes PROMS/Formats/fmtall/VEGP2all.xml | Bin 219214 -> 220392 bytes PROMS/Formats/fmtall/VEGPAlrall.xml | Bin 208380 -> 209558 bytes PROMS/Formats/fmtall/VEGPBckStpsall.xml | Bin 56562 -> 55634 bytes PROMS/Formats/fmtall/VEGPBckall.xml | Bin 94898 -> 96116 bytes .../Extension/TransitionExt.cs | 6 ++++++ .../Format/PlantFormat.cs | 19 ++++++++++++++++++ 8 files changed, 25 insertions(+) diff --git a/PROMS/Formats/fmtall/BASEall.xml b/PROMS/Formats/fmtall/BASEall.xml index 544050467953d5b7d1c021e96bb46d9012093cb6..2d2705fe4b3de4fd01ccfe1e693fea03e713960e 100644 GIT binary patch delta 85 zcmV-b0IL7gmImOL27t5yazmFcLIDPsNJ9Y_liXYym(W516qm3=0R*>rLjnE)m%xMp r1`~1sWdLpfa{xgAasY1tbpUPvWRw46DU%@E43}s~0Tj2EMFGA=@7o-O delta 30 mcmaDbo$bmrwuUW?Mb4A#*tQ>XX8gxEIVXi@JD(flC078)$qW1d diff --git a/PROMS/Formats/fmtall/VEGP1all.xml b/PROMS/Formats/fmtall/VEGP1all.xml index 8a5958a0d267166638ab095523f0ba83108e306e..8eb46134d960b85355e7c9a3f3afc7d334655a61 100644 GIT binary patch delta 645 zcmX@m&)qbWyI~7s+SBO@M;JM#XFX-yH#x$BZ@SqtMx*IzXBY(p6B!B^iWx!}iWm|Z z@_?+&$^MqIvd%zW0fQlsU&7$bkOAZsA=FG}R1;RmBhL`bkjjt@)S1bUKmFlTMq&KM zO<%ZxNq+J%3jyIGpgxcr9D%mwGn4|^DU*L2NKU?IDlmQBbw;7-4bK>rKt2(e{@^*I z+GIX&w&~ZNF%c02D0&8d?BkRWrB&9aIGN5?p+`>~ltW z3bapr!KgUB;yGi&WIJ}D>5rZ>s!Vop<(Pis8KcN_r5B7Q(I7WeGX#J=lni8t0Nqf+ zkOOoR#C_Eal(~Jn%L_&!n%V;NqUrRm=Zt=EFK)l^jFE#8#N7_`u@U3cb4&u$o1QT$ TKoXhLOGX(mYkSg5#<+U`9R;FI delta 120 zcmZpg$$g-oyI~7s+SADjjx5vjo-*#6eqs|7-*l^Ij7E%Ulh@mdPk->7QDpk7w~Tz# z8s6QE7Y4Yeo*n>3PSY{K*auY}*gK0g6rjXT&xA(Q`&2unw@HAG#S?rn9_b OlmPLztGr{3y9WUFFEL^O diff --git a/PROMS/Formats/fmtall/VEGP2all.xml b/PROMS/Formats/fmtall/VEGP2all.xml index e62fa61721ea8babb6b3718ddd9e42bc5db6e93f..74585b7ff3e6e62fc24a351ba729a4dce7de990d 100644 GIT binary patch delta 584 zcmX@Nf%nBu-i9rVpKec=uw>?&c8Aeu@-aOD)uZroj#hK-&A6v*M##_wb z2(%@ip%iFO%4BzK&FMX78HJ`d-C-1&E_R<$Z2EyUj6BoZ?l3A%K48W%{mdOkj_ENV z;=mn7HA{O2J%(VQo05U9R$%a8NCBEv%b){f2LnY?fj&}TsAh0u$OMXmd*9mee|?l3K@1^`wcj^_XX delta 49 zcmV-10M7sDxed;+4S=)(^4pi_Ap;JU+yOF|;+p{;mn`1_6qm5$0Tz?MI1Gm%;Q_ZG H;R48eKL-`s diff --git a/PROMS/Formats/fmtall/VEGPAlrall.xml b/PROMS/Formats/fmtall/VEGPAlrall.xml index 74e29ab11bab5ee78e07b72e1239924cc57a3a80..e0144098ba1ea0600474526b94ea651d3cfc56af 100644 GIT binary patch delta 601 zcmex!n`hcno`x-q2VPGum^F!qN~SLxy68 z5(a0644{G{h7cf5WXPMoQG;1n7LNjk;>nEM@&r^U>PXw#GAMx!EoDdrvJ@Bsz}BQP zX91X`BQPzq$HFa!hTlYtJ&1d8MVbz}nBInxJOk}AP%c$pvckc(|^5X hj5&CvL*u{m;CMl5|@7S0T!3Ao&gMp?(hM( I?(hPrL0cggnE(I) diff --git a/PROMS/Formats/fmtall/VEGPBckStpsall.xml b/PROMS/Formats/fmtall/VEGPBckStpsall.xml index 6e484f1f96a400473c157100b6b58434d5674291..0df3fb9cfaef6ba3920b528afbbf21855dc865ae 100644 GIT binary patch delta 600 zcma)2Pbfoi9RF&X#ad=>Z<{^5Bo0h592ACxXsyQe)z~CuvwtWNxk~DD-Fs7>v70!# zI}1k_cL&8$4!(P`9Q^Co@9+2X{rvg8T$=9AO=k-#_8c}e>eUc){r*n+9L*%tG$m+_ zVw9p$icp$QVao8jLX#Ay8GesY9LZUSJxWWIWklu^frp&4YKF1vltEH*z^qF4F}}?k z{TZ5I_OMauRy)12p|C<-2FEBZGIQ!f0na&SLrMSJD*H&|R%-eKF(r5r@(GR^TIu8_AEtFL=p6;!dAz*S@67T)u_YY~f_b5=^>#7>MVFzR z3b-mra7Suuf}D7n<~T(P>XE;UE&1vgw4hHDAQpNU-{OjK!YpTuvB$4{zWgq>#zhp0 Ujr>D49B{7dqF6d#JQgkfcj1$z(f|Me delta 986 zcmbu8OG_J36vxky`e=|C5~+kLnNg~SY8xGVEEG{UE=05mxbzuoz(#9gH^FZF0^)z; zLUAS!x4stQ)};#wIluFm;~mHUeaF`18vgYbD(x^$ zFAmpT2>x{zY0|*e15NRDg(NIZqRPC)Bq33mrW~O>C8ONODNj%nl{ohazWw1dEi*Ek z`$9iZbT2Zdd)e?{L@mZjx=ab;BBMK0sl$coQv%pd=?G>&A(nDJ&<xHvTn#BWjz2ZvY$q!cW zP3qv8oG_bXvdT(<$quW8CKq_KO;%cIVQJ5x#}Ler%8(3nsse)tLkiHWS_T~;I~XXE z3Ur79Lp6gN&~rs#@4&?;&tD}^f$qDj6ek~9nJ`%{M+oQ+A+Vc1*n`|8HaTyVNi@g> z)eHe(pCtp?A>bg+0lEm{x@rbWT&|v~z~BcAv0S)mw6W>#D$~i=R{Ej%GA@i`vC2wD mnAm2ARSJxg;}#2mg8>{<9FrdyuuPt`S^}8xbh delta 91 zcmezJj&;*h)(xAMPZo$}nY?THzUecP8Tlr+tuSIto1ADQIeE)!p~-x!_<+(po0qNC rVw}9smJ2ATGPy2_V>91+Hpa<$CR~$MHYk7%@Yx^(qBj?8U^xx|7b+yi diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs index aa178018..483a321a 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs @@ -1545,6 +1545,9 @@ namespace VEPROMS.CSLA.Library { //if (tb._FromItem.MyContent.InList(5322)) Console.WriteLine("Here"); string str1 = TranGetSectionNumber(tb._ToItem); + // F2024-008 added flag to title case the section number in transitions + if (tb._FormatData.TransData.Cap1stCharTransSectionNumber) + str1 = CapFirstLetterOnly(str1, 0); if(!tb._ToItem.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert) return str1; List FromSections = GetSections(tb._FromItem.ActiveSection); List ToSections = GetSections(tb._ToItem.ActiveSection); @@ -1615,6 +1618,9 @@ namespace VEPROMS.CSLA.Library sectionTitle = (tb._FormatData.TransData.CapsTransitionsSection ? sectionTitle.ToUpper().Replace(@"\U", @"\u") : tb._FormatData.TransData.Cap1stCharTransSection ? CapFirstLetterOnly(sectionTitle, 0) : sectionTitle); + // F2024-008 Added flag to surround the section title with parenthesis in transitions + if (tb._FormatData.TransData.ParensAroundSectionTitle) + sectionTitle = string.Format("({0})", sectionTitle); // B2017-236 Replace embedded returns with spaces and trim the spaces from the end of the section title. return TrimSectionTitle(sectionTitle); } diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs index 250a4367..2b09e8d5 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs @@ -7103,6 +7103,7 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Cap1stCharTrans, "@Cap1stCharTrans"); } } + // Title Case section title private LazyLoad _Cap1stCharTransSection; public bool Cap1stCharTransSection { @@ -7111,6 +7112,24 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Cap1stCharTransSection, "@Cap1stCharTransSection"); } } + // Title Case section number + private LazyLoad _Cap1stCharTransSectionNumber; + public bool Cap1stCharTransSectionNumber + { + get + { + return LazyLoad(ref _Cap1stCharTransSectionNumber, "@Cap1stCharTransSectionNumber"); + } + } + // Parens around section title + private LazyLoad _ParensAroundSectionTitle; + public bool ParensAroundSectionTitle + { + get + { + return LazyLoad(ref _ParensAroundSectionTitle, "@ParensAroundSectionTitle"); + } + } private LazyLoad _UseTransitionModifier; public bool UseTransitionModifier { -- 2.47.2