From b5af00b9408b41c7435af3a5ce0e7026da3b688f Mon Sep 17 00:00:00 2001 From: Kathy Date: Mon, 2 Mar 2020 15:31:57 +0000 Subject: [PATCH] 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). --- PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index c1b3fafb..648453bf 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -4791,6 +4791,19 @@ namespace VEPROMS.CSLA.Library } else if (FormatStepData.TabData.IsTransition) 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 (tbformat != null && nextItem != null && !FormatStepData.AlwaysTab && (!FormatStepData.MixCautionsAndNotes ||