From 5b237a893f782cee0e1ad5170edae80740fc3428 Mon Sep 17 00:00:00 2001 From: Kathy Date: Wed, 1 Dec 2021 16:46:04 +0000 Subject: [PATCH] B2021-138 Top continue message missing sub-step tab B2021-138 BNPP1new -Top continue message missing sub-step tab --- PROMS/Formats/fmtall/BNPP1Newall.xml | Bin 194552 -> 194552 bytes PROMS/Volian.Print.Library/vlnParagraph.cs | 16 +++++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/PROMS/Formats/fmtall/BNPP1Newall.xml b/PROMS/Formats/fmtall/BNPP1Newall.xml index b2927be216a167e9d117d7fe8a29fd11792cb37f..2fc207bf3ace532d9b8df33af9f3199136be076c 100644 GIT binary patch delta 80 zcmezIp8Lmp?uHh|ElgKVGMY{Af6F8~UFR*6!gj7xOh&9wk>x-U#_6+anY6aoTwt0d T0~Ov56n2BD+1~Mqsely#MYtby delta 80 zcmezIp8Lmp?uHh|ElgKVG8#_rf6F8~UFR*6!gj7xOh&9wk>x-U#_6+anY6aoTwt0d T0~Ov56n2BD+1~Mqsely#Ld73o diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index ff22195e..38857e42 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -2766,17 +2766,23 @@ namespace Volian.Print.Library myMsg = myMsg.Replace(@"%c", " "); // Top Continue message includes high level step tab and text - // - C2019-005 Put in for Barakah Alarms 1-21-2019 - // - Top continue message set as: "" in the format - // - in this case the Message part will Bold the tab and Underline Bold the high level step text - // if ((docstyle.Continue.Top.HLS ?? 0) == 1) { myMsg = docstyle.Continue.Top.Message; // reset because we did replace strings in code above ItemInfo parentStep = MyItemInfo.MyHLS; // get the high level step myMsg = string.Format(myMsg, parentStep.CombinedTab, parentStep.DisplayTextKeepSpecialChars); } - + // B2021-138: Top continue message for Barakah Single column New (2021) format was incorrect for some lower + // sub-steps. + if ((docstyle.Continue.Top.HLS ?? 0) == 6) + { + myMsg = docstyle.Continue.Top.Message; // reset because we did replace strings in code above + ItemInfo parentStep = MyItemInfo.MyHLS; + string ctab = parentStep.CombinedTab; + if (!MyItemInfo.MyParent.IsHigh) // If lower sub-step, get parent substep tab, skipping caution/note if in one of those + ctab = (MyItemInfo.IsInCautionOrNote) ? MyItemInfo.MyParent.MyParent.CombinedTab : MyItemInfo.MyParent.CombinedTab; + myMsg = string.Format(myMsg, ctab, parentStep.DisplayTextKeepSpecialChars); + } // Calvert Alarms, step description have the alarm number as part of the top continue message // Also, if the break is within the CONDITION/RESPONSE, there are continue messages in both columns at the top // of the table, note that the continue messages WITHIN table are only printed when the