B2017-206 Fixed issue where only a sequential substep could be added to a Note or Caution instead of any substep type, for formats that support substeps off of (inside) Notes and Cautions.

This commit is contained in:
John Jenko 2017-09-13 15:29:24 +00:00
parent bf2fa66a4a
commit 6bf778d79b

View File

@ -633,7 +633,7 @@ namespace VEPROMS.CSLA.Library
// if equation type && in single column mode, put out the rnomenu list, and skip the AER items
bool singleColEq = (topType.Type.ToUpper().Contains("EQUATION") && _CurItemInfo.ColumnMode == 0);
// B2017-004 if a Table type && in single column mode or in a Note or Caution, don't list the AER Table option
bool singleColTable = (_CurItemInfo.IsTable && _CurItemInfo.ColumnMode == 0) || _CurItemInfo.IsInCautionOrNote;
bool singleColTable = (_CurItemInfo.IsTable && ( _CurItemInfo.ColumnMode == 0 || _CurItemInfo.IsInCautionOrNote)); // B2017-206 added parens so substeps types can be listed
if ((singleColEq ||_CurItemInfo.IsInRNO || _CurItemInfo.IsCaution || _CurItemInfo.IsNote) && topType.StepEditData.TypeMenu.RnoMenuItem != null && topType.StepEditData.TypeMenu.RnoMenuItem != "")
sds.Add(new StepDataRetval(topType.StepEditData.TypeMenu.RnoMenuItem, Convert.ToInt32(topType.Index)));
else if (!singleColEq && !singleColTable)