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

Changed Section Notes and Cautions headers to include the Section Location

Browse Source
This commit is contained in:
Rich 2016-10-21 15:04:09 +00:00
parent 7660bd750a
commit 1b9d1cf902
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
View File

@ -4287,18 +4287,34 @@ namespace VEPROMS.CSLA.Library
}
// For VC Summer Unit 2 & 3 (vcb formats) include step number in Note & Caution header
if (FormatStepData.TabData.IncludeStepNum && MyHeader != null && MyParent != null && MyParent.CombinedTab != null)
if (FormatStepData.TabData.IncludeStepNum && MyHeader != null && MyParent != null)
{
// if my parent is a paragraph, then don't use the paragraph tab in the header, use the parent of the paragraph:
if (MyParent.IsParagraph)
if (MyParent.CombinedTab != null)
{
MyHeader.Text = MyHeader.Text + ((MyParent == null) ? "" : " Step " + MyParent.MyParent.MyTab.CleanText.TrimEnd(".".ToCharArray()));
MyHeader.CleanText = MyHeader.CleanText + ((MyParent == null) ? "" : " Step " + MyParent.MyParent.MyTab.CleanText.TrimEnd(".".ToCharArray()));
// if my parent is a paragraph, then don't use the paragraph tab in the header, use the parent of the paragraph:
if (MyParent.IsParagraph)
{
MyHeader.Text = MyHeader.Text + ((MyParent == null) ? "" : " Step " + MyParent.MyParent.MyTab.CleanText.TrimEnd(".".ToCharArray()));
MyHeader.CleanText = MyHeader.CleanText + ((MyParent == null) ? "" : " Step " + MyParent.MyParent.MyTab.CleanText.TrimEnd(".".ToCharArray()));
}
else
{
MyHeader.Text = MyHeader.Text + ((MyParent == null) ? "" : " Step " + MyParent.MyTab.CleanText.TrimEnd(".".ToCharArray()));
MyHeader.CleanText = MyHeader.CleanText + ((MyParent == null) ? "" : " Step " + MyParent.MyTab.CleanText.TrimEnd(".".ToCharArray()));
}
}
else
else if (MyParent.IsStepSection && FormatStepData.TabData.IncludeSectionNum)
{
MyHeader.Text = MyHeader.Text + ((MyParent == null) ? "" : " Step " + MyParent.MyTab.CleanText.TrimEnd(".".ToCharArray()));
MyHeader.CleanText = MyHeader.CleanText + ((MyParent == null) ? "" : " Step " + MyParent.MyTab.CleanText.TrimEnd(".".ToCharArray()));
ItemInfo parent = MyParent;
if (parent.IsStepSection)
{
string parentTab = parent.MyTab.CleanText.TrimEnd(".".ToCharArray());
if (parentTab != "")
{
MyHeader.Text = MyHeader.Text + ((MyParent == null) ? "" : " Section " + parentTab);
MyHeader.CleanText = MyHeader.CleanText + ((MyParent == null) ? "" : " Section " + parentTab);
}
}
}
}
return tbformat;