Merge pull request 'F2026-002_Vogtle_Top_Continue_Message' (#684) from F2026-002_Vogtle_Top_Continue_Message into Development
Looks good. Ready for QA.
This commit was merged in pull request #684.
This commit is contained in:
Binary file not shown.
@@ -1148,6 +1148,15 @@ namespace VEPROMS.CSLA.Library
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private LazyLoad<bool> _DontIncludeRNOTabIfHasAERParent;
|
||||||
|
public bool DontIncludeRNOTabIfHasAERParent // F2026-002: Vogtle Units 3&4 Top Continue Message.
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
return LazyLoad(ref _DontIncludeRNOTabIfHasAERParent, "@DontIncludeRNOTabIfHasAERParent");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private LazyLoad<string> _Message;
|
private LazyLoad<string> _Message;
|
||||||
[Category("Continue Msg")]
|
[Category("Continue Msg")]
|
||||||
[DisplayName("Top Continue Msg")]
|
[DisplayName("Top Continue Msg")]
|
||||||
|
|||||||
@@ -2819,6 +2819,9 @@ namespace Volian.Print.Library
|
|||||||
{
|
{
|
||||||
// F2020-023: tab includes parent tab and if caution/note don't use its parent, go up another level
|
// F2020-023: tab includes parent tab and if caution/note don't use its parent, go up another level
|
||||||
string noBullet = MyItemInfo.IsCautionOrNotePart ? MyItemInfo.MyParent.MyParent.CombinedTab : MyItemInfo.MyParent.CombinedTab;
|
string noBullet = MyItemInfo.IsCautionOrNotePart ? MyItemInfo.MyParent.MyParent.CombinedTab : MyItemInfo.MyParent.CombinedTab;
|
||||||
|
// F2026-002 Vogtle Units 3&4, don't include the RNO sub-step tab if the parent is an AER sub-step
|
||||||
|
if (docstyle.Continue.Top.DontIncludeRNOTabIfHasAERParent && MyItemInfo.MyParent.IsRNOPart && !MyItemInfo.MyParent.MyParent.IsRNOPart)
|
||||||
|
noBullet = MyItemInfo.MyParent.MyParent.CombinedTab;
|
||||||
// C2021-024: WCN1 if bullet exists in combined tab, stop right before bullet.
|
// C2021-024: WCN1 if bullet exists in combined tab, stop right before bullet.
|
||||||
// B2021-085 & 087: crash if noBullet was null. Also, if null, see if text in parent. if no text, replace the
|
// B2021-085 & 087: crash if noBullet was null. Also, if null, see if text in parent. if no text, replace the
|
||||||
// "%s." with noBullet (null) which won't put out just a '.' as step number.
|
// "%s." with noBullet (null) which won't put out just a '.' as step number.
|
||||||
|
|||||||
Reference in New Issue
Block a user