Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

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

@ -1017,6 +1017,7 @@ namespace VEPROMS.CSLA.Library
if (ms && mn) pTab = pTab.TrimEnd() + "."; if (ms && mn) pTab = pTab.TrimEnd() + ".";
// remove ending '.' (if this is a hls, don't remove the '.') // 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.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(); return pTab + thisTab.Trim();
} }
internal static void SetParentSectionAndDocVersion(ItemInfo itemInfo, IVEDrillDownReadOnly itemParent, SectionInfo sectionInfo, DocVersionInfo docVersionInfo, TransitionLookup tranLookup) 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; } get { return _OffsetTab; }
set { _OffsetTab = value; } 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; private int _PrintLevel = 0;
public int PrintLevel 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 (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. parentTab = parentTab.Replace(".0", ""); // this was added in, remove for substeps.
tbformat = parentTab + (parentTab.EndsWith(".") ? "" : parentTab == "" ? "" : ".") + tbformat.TrimStart(); tbformat = parentTab + (parentTab.EndsWith(".") ? "" : parentTab == "" ? "" : ".") + tbformat.TrimStart();
HasParentTab = true; // F2020-023: tab includes parent tab
} }
else if (IsSequential && ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.SkipNonSeqTabWithPar) else if (IsSequential && ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.SkipNonSeqTabWithPar)
{ {
@ -4182,6 +4191,7 @@ namespace VEPROMS.CSLA.Library
{ {
parentTab = mpar.MyTab.CleanText.Trim(); parentTab = mpar.MyTab.CleanText.Trim();
tbformat = parentTab + (parentTab.EndsWith(".") ? "" : ".") + tbformat.TrimStart(); tbformat = parentTab + (parentTab.EndsWith(".") ? "" : ".") + tbformat.TrimStart();
HasParentTab = true; // F2020-023: tab includes parent tab
//if (_MyLog.IsInfoEnabled) _MyLog.InfoFormat("==>PARTAB: [{0}]", ShortPath + ", " + ItemID.ToString()); //if (_MyLog.IsInfoEnabled) _MyLog.InfoFormat("==>PARTAB: [{0}]", ShortPath + ", " + ItemID.ToString());
} }
} }

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) if (MyItemInfo.MyParent.IsSection && (docstyle.StructureStyle.Style & E_DocStructStyle.BottomSectionContinue) == E_DocStructStyle.BottomSectionContinue)
myMsg = myMsg.Replace(@"%s", MyItemInfo.MyParent.MyTab.CleanText.Trim()); myMsg = myMsg.Replace(@"%s", MyItemInfo.MyParent.MyTab.CleanText.Trim());
else 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) if (myMsg.IndexOf(@"%3d") > -1)
myMsg = myMsg.Replace(@"%3d", MyItemInfo.MyHLS.Ordinal.ToString()); 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)); myMsg = myMsg.Replace(@"%2d", tb.Trim(" .".ToCharArray()).PadLeft(2));
if (myMsg.IndexOf(@"%3d") > -1) if (myMsg.IndexOf(@"%3d") > -1)
myMsg = myMsg.Replace(@"%3d", MyItemInfo.MyHLS.Ordinal.ToString()); 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; return myMsg;
} }
private vlnParagraph TopMostChild private vlnParagraph TopMostChild