Compare commits

..

4 Commits

2 changed files with 13 additions and 6 deletions

View File

@@ -4749,13 +4749,20 @@ namespace VEPROMS.CSLA.Library
if (ActiveFormat.MyStepSectionLayoutData.AddContActTagToHighLevelRNOWhenIncludedOnCAS && if (ActiveFormat.MyStepSectionLayoutData.AddContActTagToHighLevelRNOWhenIncludedOnCAS &&
IsInRNO && !MyParent.IsInRNO && FormatStepData.TabData.CASPrintMacro != null) IsInRNO && !MyParent.IsInRNO && FormatStepData.TabData.CASPrintMacro != null)
{ {
StepConfig sc = MyConfig as StepConfig; // B2026-009 needed to make sure parent wasn't a continuous action step type
if (sc != null && sc.Step_CAS == "True") // the ExcludeFromContActSum is set to False for continuous action
// step types and True for all others
StepConfig psc = MyParent.MyConfig as StepConfig;
if (MyParent.FormatStepData.ExcludeFromContActSum && psc != null && psc.Step_CAS != "True")
{ {
if (FormatStepData.TabData.CASPrintMacro != null) StepConfig sc = MyConfig as StepConfig;
_MyTab.Text = FormatStepData.TabData.CASPrintMacro + _MyTab.Text; if (sc != null && sc.Step_CAS == "True")
if (FormatStepData.TabData.CASEditTag != null) {
_MyTab.CleanText = FormatStepData.TabData.CASEditTag + _MyTab.CleanText; if (FormatStepData.TabData.CASPrintMacro != null)
_MyTab.Text = FormatStepData.TabData.CASPrintMacro + _MyTab.Text;
if (FormatStepData.TabData.CASEditTag != null)
_MyTab.CleanText = FormatStepData.TabData.CASEditTag + _MyTab.CleanText;
}
} }
} }
_MyTab.RNOTabWidthAdjust = ((ItemInfo)ActiveParent).FormatStepData.TabData.RNOAdjustTabSize ?? 0; _MyTab.RNOTabWidthAdjust = ((ItemInfo)ActiveParent).FormatStepData.TabData.RNOAdjustTabSize ?? 0;