Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Merge pull request 'F2026-001 Added the ability to prefix a Continuous Action sub-step tab with its parent tab.' (#682) from F2026-001_Add_Parent_Tab_To_CAS_Step into Development

Browse Source 
Looks good. Ready for QA.
This commit was merged in pull request #682.
This commit is contained in:
Matthew Schill
2026-01-14 16:07:02 -05:00
parent 9bb13f6d88 30f56d1f9b
commit 4273d72b9d
4 changed files with 47 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
PROMS/Formats/fmtall/BASEall.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/VEGP2all.xml
View File

Binary file not shown.

10
PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
View File

@@ -4351,6 +4351,16 @@ public LeftJustifyList(XmlNodeList xmlNodeList) : base(xmlNodeList) { }
return LazyLoad(ref _IncludeSectionLabel, "@IncludeSectionLabel");
}
}
//F2026-001 default (in base format) is False. Put in for Vogtle Units 3 & 4.
// this will add the parent sub-step tab if the parent is not identified as a continueous action step
private LazyLoad<bool> _AddParentTabToSubStepTab;
public bool AddParentTabToSubStepTab
{
get
{
return LazyLoad(ref _AddParentTabToSubStepTab, "@AddParentTabToSubStepTab");
}
}
// the font and font styles to use for the continuous action summary
private VE_Font _Font;
public VE_Font Font

39
PROMS/Volian.Print.Library/ContActionSum.cs
View File

@@ -47,6 +47,7 @@ namespace Volian.Print.Library
AddHeader(doingTimeCriticalSummary); // F2022-024 pass flag when creating a Time Critical Action Summary report
foreach (pkParagraph myContAct in myContActSteps)
{
bool addParentTab = myContAct.MyParagraph.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.AccSectionData.ContinuousActionSummaryData.AddParentTabToSubStepTab; // F2026-001 prefix Continuous Action sub-step with parent tab
if (myContAct.MyChildren.Count > 0)
if (myContAct.MyParagraph.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.AccSectionData.ContinuousActionSummaryData.IncludeSectionNumAndTitle) // only print the section title if it has Continuous Action Steps
AddSectionHeader(myContAct.MyParagraph.MyItemInfo.DisplayNumber, myContAct.MyParagraph.MyItemInfo.FormattedDisplayText, myContAct.MyParagraph.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.AccSectionData.ContinuousActionSummaryData.IncludeSectionLabel);
@@ -79,8 +80,27 @@ namespace Volian.Print.Library
}
else if (!pgh.MyParagraph.MyItemInfo.IsHigh) // if the high level step was not included, adjust the tab for a sub-step/RNO
{
string tabPre = (_FirstLine) ? hlsii.MyTab.Text.Trim() + " " : "";
if (!_FirstLine)
string tabPre = "";
StringBuilder sbTabPre = new StringBuilder();
ItemInfo prevItemInfo = pgh.MyParagraph.MyItemInfo.MyParent;
// F2026-001 The while loop below will build a sub-step prefix of the continuous action sub-step
// if the format flag (AddParentTabToSubStepTab) is set - the base format has this set to false
// it will not add the parent tab
// - if the parent is a continuous action step or sub-step as that information would be redundant
// - if the current is a RNO step type and the Parent is NOT a RNO step type
if (prevItemInfo.IncludeOnContActSum || !addParentTab) prevItemInfo = null;
while (prevItemInfo != null && !prevItemInfo.IsHigh && !prevItemInfo.IncludeOnContActSum)
{
sbTabPre.Insert(0, prevItemInfo.MyTab.CleanText.Trim());
if ((prevItemInfo.IsInRNO && !prevItemInfo.MyParent.IsInRNO) || prevItemInfo.MyParent.IncludeOnContActSum)
prevItemInfo = null;
else
prevItemInfo = prevItemInfo.MyParent;
}
if (_FirstLine) // the first of a CAS on the report include the High Level Step tab
sbTabPre.Insert(0, (hlsii != null) ? hlsii.MyTab.Text.Trim() + " " : "");
tabPre = sbTabPre.ToString();
if (!_FirstLine) // if not the first line we indent the size of high level step tab
preTabLen = GetTextWidth(hlsii.MyTab.Text.Trim() + " ") / 72f;
if (pgh.MyParagraph.MyItemInfo.IsInRNO)
{
@@ -103,10 +123,13 @@ namespace Volian.Print.Library
private void AddChildren(pkParagraph pgh, int level)
{
StringBuilder sbPreTab = new StringBuilder();
bool addParentTab = pgh.MyParagraph.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.AccSectionData.ContinuousActionSummaryData.AddParentTabToSubStepTab; // F2026-001 flag to add parent tab to CAS sub-step
if (pgh.MyChildren.Count > 0)
level++;
foreach (pkParagraph cpgh in pgh.MyChildren)
{
sbPreTab.Clear();
if (cpgh.MyCautionsAndNotes.Count > 0)
AddNotesOrCautions(cpgh,level);
string stpTab = cpgh.MyParagraph.MyItemInfo.MyTab.CleanText.Trim() + (cpgh.MyParagraph.MyItemInfo.IsInRNO ? "[R] ": " ");
@@ -114,6 +137,18 @@ namespace Volian.Print.Library
{
stpTab = string.Format("{0} ", cpgh.MyParagraph.MyParent.MyTab.Text.Trim()) + " " + stpTab;
}
ItemInfo prevItmInfo = cpgh.MyParagraph.MyItemInfo.MyParent;
// F2026-001 the while loop below will add the sub-step's parent tab if applicable
if (prevItmInfo.IncludeOnContActSum || !addParentTab) prevItmInfo = null; // don't try to add parent tab
while (prevItmInfo != null && !prevItmInfo.IsHigh)
{
sbPreTab.Insert(0, prevItmInfo.MyTab.CleanText.Trim());
if ((prevItmInfo.IsInRNO && !prevItmInfo.MyParent.IsInRNO) || prevItmInfo.MyParent.IncludeOnContActSum)
prevItmInfo = null;
else
prevItmInfo = prevItmInfo.MyParent;
}
stpTab = sbPreTab.ToString() + stpTab;
AddContinuousAction(stpTab, GetContActStepText(cpgh.MyParagraph.MyItemInfo), "", (cpgh.MyParagraph.MyItemInfo.PageNumber + 1).ToString(),level,0);
AddChildren(cpgh, level);
}