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

Logic to treat Caution/Note types as being unique so that for example, multiple notes of different types will not get bulleted.

Browse Source
This commit is contained in:
John Jenko 2015-05-13 17:21:49 +00:00
parent 2fe9817a8d
commit eaca5be98f
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3856,10 +3856,17 @@ namespace VEPROMS.CSLA.Library
// If this has a previous, and the tabs of this & previous match
if (tbformat != null && MyPrevious != null && !FormatStepData.AlwaysTab && (!FormatStepData.MixCautionsAndNotes || (tbformat == prevTbFormat)))
{
// used in Ginna's Attachment format
// only create bullets for multiple cautions and notes if they are all exactly the same type
if (!ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.OnlyBulletSameCautionNoteType ||
(MyPrevious != null && MyPrevious.MyContent.Type == MyContent.Type) ||
(NextItem != null && nextItem.MyContent.Type == MyContent.Type))
{
tbformat = tbformat + ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.IdentB;
TabToIdentBAdjustFont();
}
}
else if (FormatStepData.TabData.IsTransition)
return tbformat;
// else if this has a next
@ -3907,6 +3914,13 @@ namespace VEPROMS.CSLA.Library
if (MyPrevious != null && MyContent.Type != MyPrevious.MyContent.Type) return false;
if (NextItem != null && MyContent.Type != NextItem.MyContent.Type) return false;
}
// used in Ginna's Attachment format
// treat cautions and notes as different if they are all NOT exactly the same type
if (ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.OnlyBulletSameCautionNoteType)
{
if (MyPrevious != null && MyPrevious.MyContent.Type != MyContent.Type) return true;
if (NextItem != null && NextItem.MyContent.Type != MyContent.Type) return true;
}
if (!FormatStepData.MixCautionsAndNotes) return false;
if (IsNote && ((NextItem != null && NextItem.IsCaution) || (MyPrevious != null && MyPrevious.IsCaution))) return true;