From 411445901e5190b29e6935f0693f7e96af15c5e7 Mon Sep 17 00:00:00 2001 From: Kathy Ruffing Date: Wed, 19 Jul 2023 10:24:27 -0400 Subject: [PATCH 1/2] F2023-098: Vogtle 3/4 Alarm - add proc applicability. Code change also --- PROMS/Formats/fmtall/VEGPAlrall.xml | Bin 90184 -> 90218 bytes .../Extension/DocVersionExt.cs | 6 ++++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/PROMS/Formats/fmtall/VEGPAlrall.xml b/PROMS/Formats/fmtall/VEGPAlrall.xml index 48150cbb4aeafa0f3dff43ef364be32cfca114e2..f6d4d4b8c40315d8eb5e466aec7d1653cd1612e0 100644 GIT binary patch delta 42 wcmX?cfc4b@)(v?q!U_xu3;_&94EYSn42}#1K$tUG&_TMnie-Bh3*)(H01{mcG5`Po delta 23 fcmaELfc3-y)(v?q(_h#!@-@$6**=ej@k}%TftCr- diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/DocVersionExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/DocVersionExt.cs index b9c96d5c..d4cf5397 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/DocVersionExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/DocVersionExt.cs @@ -528,9 +528,11 @@ namespace VEPROMS.CSLA.Library string mstr = (MyConfig as DocVersionConfig).Unit_ProcedureNumber; string[] units = mstr.Split(",".ToCharArray()); string[] fromdata = fromunitdes.Split(",".ToCharArray()); - // SelectedSlave is > 0 if a unit has been selected, for example from print or approve. It represents that index into the list of units. - if (DocVersionConfig.SelectedSlave > 0) + // F2023-098: depending on where this is called from & how data is set, the DocVersionConfig.SelectedSlave may be 0, but the + // procInfoSelectedChildToPrint will always have the correct value, i.e. 0 if not printing & the selected slave from the print selection. + // Check for procInfoSelectedChildToPrint > 0 also: + if (DocVersionConfig.SelectedSlave > 0 || procInfoSelectedChildToPrint > 0) { prefix = units[0].Replace("#", ""); if (str.ToUpper().IndexOf(@" -1) return prefix + Regex.Replace(str, @"\<[uU]-[a-zA-Z]+\>", fromunitdes); From 71a4350259996a89f51a69a1ab3e972c6d7ba7d6 Mon Sep 17 00:00:00 2001 From: Chris Glavan Date: Wed, 19 Jul 2023 14:27:46 -0400 Subject: [PATCH 2/2] Fixing merge conflict --- PROMS/Formats/fmtall/VEGPAlrall.xml | Bin 90218 -> 104212 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/PROMS/Formats/fmtall/VEGPAlrall.xml b/PROMS/Formats/fmtall/VEGPAlrall.xml index f6d4d4b8c40315d8eb5e466aec7d1653cd1612e0..280f6fbddc17f054ff4cf318a33fbb131e95a21a 100644 GIT binary patch delta 4928 zcmeHKUr1YL6hC+QCoxHLbCc$xRe zoZtD*_xqi5@@UPpkTzdhG~(uGw&k?Z#hFgPC`{vzVghT-ooDSLerLkOBc zg457S-^~!iVe2T)nniSq0d!P5_?JrT5b$923)tk`*O-DS7={U$1_m(!GvuqAfx#ra z!PfDC7}TLeAjD9(6waBwWpFZk@;JC)ag~TSnvHkRQZC-ij)I@5s@-_Zt3P)<6A`vl zmGhI?QSf86rVIxZt8aA~%B&W4e&GmE$b0tZD`X2kn`Gm)R~%Dnj(}-id@ic?JDdyfz2<0u)d=x{k8*!o5wS2jD?3_I4 z;;iyPCnw3jCO9`QQ8kx9Ri))85l+Al?px8?W5dm*ns3&f+}oTyZ{d7cf2CUv)pG%y z|9%RGK2M_a_ZsY9Ny_J~+yFja@hOYPug>Hb4BJtD(H7A8t(M7L~0X@+Avr7Gm&@(rCJAo_b4}(xQ0tjt9Sb zSSL&MTpylUYoSO2u|}m=`C;o1-7}u-^)zQJCF(~#)SD#gPQx$)<21%ea9A1RX0pTG zG_7Q1KfSmIrKJHmWa0YpxljDns`(Tf?s+^hYTJo_1fyJb;9u)DepHwC7(TfmaHS(l zsUnNf7_B``QDh?*0=Q^#Ym$(lcCIxm4b`oJDz+(tq9ou{RgDIUw6rCtqbjIk8y(cx zHVHul+@>X?(jTiMOr#x51&aI>(V+EapH{p3ZjEQeb^cyTq0^oq9j^Q+#(yl(h?KyU zYlpLVbrUw{s|~D(TZH zT=?j2QjNo?IjhC-1Zj+HC+T*P-*)ZD?C%6h5y_ZrU#2xoOgmq<3+hb&{>g+OCFmP1X-q+q78{GnG-YttnO4+0|^e zMaD!B@yF~uE>}vGQjjr`u{m%uakTF5&IPf@MW#D-{ z=z0aR623e=0>YGgf-P}!g?`p(&2}< z?L~asQ}Lf|Dd6q;I)M#7{cJ-NUWNqp;wjHAOB7C#+AO>dll0BtRnJy@SZl>#r7W~8 z%SMYr3d?v0UL6OTDLo=>Q_S^*1VOWyu6L18^s3KWW zoj9$IQzT2@Q9Ls3!n2Yczcw0KEB>i>;-V{NN`$St49FjnQp`TNzlZt~*teI1TX+eJq2y3DMFSX?Yv#E0;PdAmLX(~!le zyxZ|a9{~M}^Mm-av3B!(svyocwBXU{nvHXd4)_VPAG4m33cho|)=B?MtWB))-bF$c zqIVjX@DX|Ynr$Z`Lipf2GtPQ;I1Z8fS?b_%c#9kvrAm#dpO3Q_@EdAYE}xg!N%Faz zW!Z{z?@JiltHY$jjkz!DaMrPna8}IgWszhPo(oiC(&Mg;z#v%|hbY8o9Qt91iaJD* zD4GlrPobpKy!k=fKmlmywz76nvYf$+;g9J=hkHvzG|d!DfTC6%Vjf(t=HzB3oYc}c zmgsxP(FA!KClN8>>@W=Rj~Z z)_i@fmVLx<_J=seeB0EudiIrS-OuW9@}3TF-wdnitt|P;t?g=FM=mY=k<|p~S||)T zFO)(C(Wp}-N#7ofTy&_5l}yIfn>)*QrPPI2SPh0(g6e|A!gymP#7_^YW*zh4;U5o( z@P#y!H+kQf?a$4CHIK60;2d3ybvay*xd{N0jVR) A