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

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

@@ -1017,6 +1017,7 @@ namespace VEPROMS.CSLA.Library
if (ms && mn) pTab = pTab.TrimEnd() + ".";
// remove ending '.' (if this is a hls, don't remove the '.')
if (!itemInfo.IsHigh && thisTab.EndsWith(".")) thisTab = thisTab.Substring(0, thisTab.Length - 1);
if (itemInfo.HasParentTab) return thisTab.Trim(); // F2020-023: if tab includes parent tab already, don't concatenate it
return pTab + thisTab.Trim();
}
internal static void SetParentSectionAndDocVersion(ItemInfo itemInfo, IVEDrillDownReadOnly itemParent, SectionInfo sectionInfo, DocVersionInfo docVersionInfo, TransitionLookup tranLookup)
@@ -1106,6 +1107,13 @@ namespace VEPROMS.CSLA.Library
get { return _OffsetTab; }
set { _OffsetTab = value; }
}
// F2020-023: tab includes parent tab
private bool _HasParentTab = false;
public bool HasParentTab
{
get { return _HasParentTab; }
set { _HasParentTab = value; }
}
private int _PrintLevel = 0;
public int PrintLevel
{
@@ -4165,6 +4173,7 @@ namespace VEPROMS.CSLA.Library
(myparent.IsStepPart && myparent.FormatStepData.AppendDotZero)) // F2018-022 Added step type flag to append a ".0" to the end of the high level step - put in for Westinghouse single column format (wst1), B2018-119 only do this for steps
parentTab = parentTab.Replace(".0", ""); // this was added in, remove for substeps.
tbformat = parentTab + (parentTab.EndsWith(".") ? "" : parentTab == "" ? "" : ".") + tbformat.TrimStart();
HasParentTab = true; // F2020-023: tab includes parent tab
}
else if (IsSequential && ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.SkipNonSeqTabWithPar)
{
@@ -4182,6 +4191,7 @@ namespace VEPROMS.CSLA.Library
{
parentTab = mpar.MyTab.CleanText.Trim();
tbformat = parentTab + (parentTab.EndsWith(".") ? "" : ".") + tbformat.TrimStart();
HasParentTab = true; // F2020-023: tab includes parent tab
//if (_MyLog.IsInfoEnabled) _MyLog.InfoFormat("==>PARTAB: [{0}]", ShortPath + ", " + ItemID.ToString());
}
}