From a2ec9162be30387264d0c7bf6469e6b2f83b2b9c Mon Sep 17 00:00:00 2001 From: John Jenko Date: Tue, 16 Jan 2024 15:20:39 -0500 Subject: [PATCH] F2023-112 Continuation of the initial check-in for the Vogtle Units 3 & 4 Background Document formats. Also tweaked TOC page num position in all VEGP formats. --- PROMS/Formats/fmtall/VEGP1all.xml | Bin 176608 -> 176660 bytes PROMS/Formats/fmtall/VEGP2all.xml | Bin 212554 -> 212606 bytes PROMS/Formats/fmtall/VEGPAlrall.xml | Bin 207898 -> 207950 bytes PROMS/Formats/fmtall/VEGPBckStpsall.xml | Bin 57728 -> 56562 bytes PROMS/Formats/fmtall/VEGPBckall.xml | Bin 89436 -> 88292 bytes .../VEPROMS.CSLA.Library/Extension/ItemExt.cs | 22 +++++++++++++++--- 6 files changed, 19 insertions(+), 3 deletions(-) diff --git a/PROMS/Formats/fmtall/VEGP1all.xml b/PROMS/Formats/fmtall/VEGP1all.xml index b90414e0d81dba8dace559bc30a94d3a74c26396..79e4128c958ec7d5d64e06207452396e2e1181d2 100644 GIT binary patch delta 217 zcmaFxm}|-tt_^$K)fE^N7(y8G8PXV>83Gs*8PXY28T=SZ8FCpM8FCmhf&4rMTLz`+ zA1j%pr+=8v$TxjKG*iyx1Y4Hra&s6tngcwx2Y4_FESny{$K*0y;4`Db_IVjhWvtU1 z*qL;;|MO$I$2NU}29wJ4eUq3Zwm1A{G>Jo1TE#kDAeu>L`?`3h9u8EgC7h`ID%R}^ R6-*o$q7Va=+L`ug0RW}gM5_P* delta 126 zcmbR8gzLd$t_^$KrwgoS56kpFAcl7PtUVML`AA8-$7y0{{en BEwumu diff --git a/PROMS/Formats/fmtall/VEGP2all.xml b/PROMS/Formats/fmtall/VEGP2all.xml index 3016f4efce0197598c6ee92c8a9645b39ae41382..7aec1f8dd58d63ae80866701032da9692be032be 100644 GIT binary patch delta 299 zcmX^0hv(lPo(*zV>Iw`B3?U5p3~3C`3;_&@4CxH141Nry47m)B3^@#$Kz<&BErZf@ z!+(s*(+^x?6qvr?8Dr6OhdxHW$s9})&3CM}-?3ucwsLyHW5%5A2R1SNV4Z&FDwE6f z32zvMwr_aPNh967{ z(;HZs*`^B|V^WwV%Pg|JppoehGhB@j+jfUnOq-au&*^7c!wVPQ#j-tb5z{k-S(CWo ea&m0j?;K%jV1)}n%y`GV{lpcfUwml7Tp<9q40zc9 delta 262 zcmezOhv(EEo(*zVlM@VOrce06STlXY8AiV5A6DCcSTUYkIlaJ@DQ9~@HPbED=?Tvn z<)#Z7fEWn!hgnnsYn7~wcDMtnGW&8MGd&%OrT*3Ul|pqzuUniv0bi* zDNYbBwTor@qD4&45Za(>w*%GAV1+9~GC^g#z)_|KtWpx&`7ScO5W=PlEcK3gd(t~5 GnE(JOlWNrf diff --git a/PROMS/Formats/fmtall/VEGPAlrall.xml b/PROMS/Formats/fmtall/VEGPAlrall.xml index 4e929c4b99276740f98492f15ca6d28fcec853c5..d1d306e4265ef3063c0439e647064a422e329ffa 100644 GIT binary patch delta 212 zcmbPrgXi20o(&tU)fE^N7(y8G8PXV>83Gs*8PXY28T=SZ8FCpM8FCmhf&4rMTLz`+ ziN#FP(*s%=S*ABkVC0(Ku%EGD`i4eEj%F8|b{8AQ?JhPW!IXm{lf<%Jz>H}R+jN6cCYJ4d6PR>>M&ng99jM4@yUaqS LC(M{C=d=O<>Xt~A delta 117 zcmX?igJ;$ao(&tUo1a*>Ke1-q{=}N8#%THjMJBcB4mnH`+Yjtun!`H1A(u&EdsGRN z2miL)OfOicCvY+8P1oaO>e%kk#iYlDMbL$9d%!}bC(J;p2Vnh5)8p1KNi6qU&D010 Dy`L;M diff --git a/PROMS/Formats/fmtall/VEGPBckStpsall.xml b/PROMS/Formats/fmtall/VEGPBckStpsall.xml index f24011a682b5b7fd98fd853967efe53fdf051f53..6e484f1f96a400473c157100b6b58434d5674291 100644 GIT binary patch delta 328 zcmZoT%=~F5^9Bd?$pS(glP>VoD=-u=lroesC@`b|>0BVJ1hR`5Qi0+*42cZMK$ZeS zIYT~BEQO&M$j$_+P6et1vGRaqF;Gqcs1hWX2V{fHDglduX!r;N+%HRjmpkXet3ihGnyz z<~!EO2V6BK=NXGk4sev2Jj>?O<`M%Yc5awEKqj_NwVoUhrZV}1ugK;*=6o!Z)AVIF z3)tLanf%FGVRAyE%A`bz$r<`mo8uCt7&o^$tq}k_s>DEGa)P!LT0_U0K!*RgLF+3}1UCW0m#B@O^CGLEzW diff --git a/PROMS/Formats/fmtall/VEGPBckall.xml b/PROMS/Formats/fmtall/VEGPBckall.xml index c0bb1ab403d268a95719f854008522589472a5cf..bfdc972780c80a8915e9582eb164c8126fb9a108 100644 GIT binary patch delta 282 zcmcb!i}lGy)(z*pCm$%{nOyLjqh5ibfT5J3gh7EJ1xV)tVI`1V#E=RU&tXVpNCvVL z7|I#)fnq5P#Xxo@P<1L$9f*|&B#VJ^3P6=0xjY~nWL61S3?!ccR9ghrqri{`WaWc( zmVm_-7?PyG8bMa10i}w7l8ImgbQyFfANPLD7%_Q&fIN_VxK(zuNYIw#$p`M`Oy^T( zJO*NHcTiz0Vcl+^$M}G4dR+h`*JOc@E}J=y%!eLf3V z{TTciLO?2bVJaXZNNU(a7(5tU8T>%1q^lWX7z!8?8HyNcfh>rbFnMG>;RrqaFm*67 zBz3Hg41NqQAd@E_nWhAD6|+A>5LhfFRBm#}VyVq@e77V|-tZ%D^1h8nfOO90cbjao d(F96ZCqLM%usueVaScD3R0z-ZUrvm#L;>rxYbO8z diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index d27ac719..04c00975 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -4223,6 +4223,14 @@ namespace VEPROMS.CSLA.Library ((IsHigh && FormatStepData.PageBreakOnStep) || (IsRNOPart && MyHLS.FormatStepData.PageBreakOnStep))) tbformate = IsRNOPart ? MyHLS.FormatStepData.TabData.RNOIdentEdit : FormatStepData.TabData.IdentEdit; + //F2023-112 Vogtle Units 3 and 4 Backgrounds + // added code to get the tbformate (this is used for the tab displayed in the step editor) for Cautions and Notes background steps + // like we do for the high level steps (see the if statement above) + // all plants using enhanced backgrounds will benefit from this and is adjustable in the format files + if (((ActiveFormat.PlantFormat.FormatData.PurchaseOptions.Value & E_PurchaseOptions.EnhancedBackgrounds) == E_PurchaseOptions.EnhancedBackgrounds) && + ((IsCaution || IsNote) && FormatStepData.PageBreakOnStep)) + tbformate = IsRNOPart ? FormatStepData.TabData.RNOIdentEdit : FormatStepData.TabData.IdentEdit; + if (ActiveFormat.Name.ToUpper() == "WCNCKL" || ActiveFormat.Name.ToUpper() == "WSTCKL") { if (!IsNote && !IsCaution) tbformat = FormatStepData.TabData.IdentEdit; @@ -4237,15 +4245,23 @@ namespace VEPROMS.CSLA.Library { string tb = (LinkedOrdinal==null)? "NA" : LinkedOrdinal.ToString(); tbformat = tbformat.Replace("{LNK C/N Num}", tb); + if (tbformate != null) tbformate = tbformate.Replace("{LNK C/N Num}", tb); if ((ActiveParent as ItemInfo).FormatStepData.TabData.IdentEdit.Contains("{Section Prefix}") && LinkedTabHasSectionPrefix) // B2019-126 Check the HLS of the source document (ex. EOP step) to see if it includes the section number prefix in its tab - tbformat = tbformat.Replace("{Section Prefix}",""); // B2018-141 remove duplicate section number + { + tbformat = tbformat.Replace("{Section Prefix}", ""); // B2018-141 remove duplicate section number + if (tbformate != null) tbformate = tbformate.Replace("{Section Prefix}", ""); // F2023-112 replace in editor tab + } if ((ActiveParent as ItemInfo).LinkedTab != null) - tbformat = tbformat.Replace("{LNK Step Num}", (ActiveParent as ItemInfo).LinkedTab.Trim(" .".ToCharArray())); //(ActiveParent as ItemInfo).Ordinal.ToString()); + { + tbformat = tbformat.Replace("{LNK Step Num}", (ActiveParent as ItemInfo).LinkedTab.Trim(" .".ToCharArray())); + if (tbformate != null) tbformate = tbformate.Replace("{LNK Step Num}", (ActiveParent as ItemInfo).LinkedTab.Trim(" .".ToCharArray())); // F2023-112 replace in editor tab + } tbformat = tbformat.TrimStart(" ".ToCharArray()); + if (tbformate != null) tbformate = tbformate.TrimStart(" ".ToCharArray()); // F2023-112 replace in editor tab } if (tbformat.Contains("{LNK Step Num}")) tbformat = tbformat.Replace("{LNK Step Num}", LinkedTab==null?"NA":LinkedTab.Trim(" .".ToCharArray()).PadLeft(2));//Ordinal.ToString().PadLeft(2)); - if (tbformate != null && tbformate.Contains("{LNK Step Num}")) + if (tbformate != null && tbformate.Contains("{LNK Step Num}")) // F2023-112 replace in editor tab tbformate = tbformate.Replace("{LNK Step Num}", LinkedTab == null ? "NA" : LinkedTab.Trim(" .".ToCharArray()).PadLeft(2));//Ordinal.ToString()); if (tbformate != null && tbformate.Contains("{!Clock}")) {