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

F2020-023: Include substep levels in top & bottom continue message

Browse Source 
F2020-023: Include substep levels in top & bottom continue message (don’t duplicate parent tab)
This commit is contained in:
Kathy Ruffing
2020-09-30 13:22:51 +00:00
parent d2c52f9999
commit 8ede560ac6
3 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
PROMS/Volian.Print.Library/vlnParagraph.cs
View File

@@ -2701,7 +2701,13 @@ namespace Volian.Print.Library
if (MyItemInfo.MyParent.IsSection && (docstyle.StructureStyle.Style & E_DocStructStyle.BottomSectionContinue) == E_DocStructStyle.BottomSectionContinue)
myMsg = myMsg.Replace(@"%s", MyItemInfo.MyParent.MyTab.CleanText.Trim());
else
myMsg = myMsg.Replace(@"%s", MyItemInfo.MyParent.CombinedTab);
{
// F2020-023: tab includes parent tab and if caution/note don't use its parent, go up another level
if (MyItemInfo.IsCautionOrNotePart)
myMsg = myMsg.Replace(@"%s", MyItemInfo.MyParent.MyParent.CombinedTab);
else
myMsg = myMsg.Replace(@"%s", MyItemInfo.MyParent.CombinedTab);
}
}
if (myMsg.IndexOf(@"%3d") > -1)
myMsg = myMsg.Replace(@"%3d", MyItemInfo.MyHLS.Ordinal.ToString());
@@ -2998,6 +3004,19 @@ namespace Volian.Print.Library
myMsg = myMsg.Replace(@"%2d", tb.Trim(" .".ToCharArray()).PadLeft(2));
if (myMsg.IndexOf(@"%3d") > -1)
myMsg = myMsg.Replace(@"%3d", MyItemInfo.MyHLS.Ordinal.ToString());
// F2020-023: tab includes parent tab and if caution/note don't use its parent, go up another level
if (myMsg.IndexOf(@"%s") > -1) // %s was added for F2020-023
{
string tmp = tb.Trim();
if (!MyItemInfo.MyParent.IsHigh)
{
if (MyItemInfo.IsCautionOrNotePart)
tmp = MyItemInfo.MyParent.MyParent.CombinedTab.Trim();
else
tmp = MyItemInfo.MyParent.CombinedTab.Trim();
}
myMsg = myMsg.Replace(@"%s", tmp);
}
return myMsg;
}
private vlnParagraph TopMostChild