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

F2020-009: Change Order of Cautions/Notes. Note that this is check in for release note from 2/28/2020 (was missed during initial checking).

Browse Source
This commit is contained in:
Kathy Ruffing 2020-03-02 15:31:57 +00:00
parent 2cd061747e
commit b5af00b940
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4791,6 +4791,19 @@ namespace VEPROMS.CSLA.Library
} }
else if (FormatStepData.TabData.IsTransition) else if (FormatStepData.TabData.IsTransition)
return tbformat; return tbformat;
// F2020-009: Farley Reorder of cautions/notes - single notes were getting a bullet
else if (ActiveFormat != null && ActiveFormat.Name.ToUpper().StartsWith("FNP"))
{
if (tbformat != null && nextItem != null && !FormatStepData.AlwaysTab &&
(!FormatStepData.MixCautionsAndNotes &&
(FormatStepData.TabData.UsePreviousStyle && !nextStepData.TabData.UsePreviousStyle && tbformat == nextTbFormat) ||
((prevTbFormat != tbformat && (nextItem.MyContent.Type == MyContent.Type)))))
{
tbformat = tbformat + ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.IdentB;
if (TabToIdentBAdjustFont())
_MyTab.RemovedStyleUnderline = true;
}
}
// else if this has a next // else if this has a next
else if (tbformat != null && nextItem != null && !FormatStepData.AlwaysTab && else if (tbformat != null && nextItem != null && !FormatStepData.AlwaysTab &&
(!FormatStepData.MixCautionsAndNotes || (!FormatStepData.MixCautionsAndNotes ||