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

Beefed up the logic that determines if we need to strip the “S” from the end of the CAUTIOS or NOTES tab.

Browse Source
This commit is contained in:
John Jenko 2016-05-27 18:24:08 +00:00
parent 65ba080983
commit 0166b06209
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1575,7 +1575,10 @@ namespace VEPROMS.CSLA.Library
return includeOnCAS;
}
}
public bool IsSameType(ItemInfo cmpItmInfo)
{
return (((int)MyContent.Type) % 10000) == (((int)cmpItmInfo.MyContent.Type) % 10000);
}
public bool IsCautionOrNotePart
{
get
@ -4044,8 +4047,8 @@ namespace VEPROMS.CSLA.Library
// if there is only step in the group or we have a change in step type (caution/note) when there is
// use of the MixCautionsAndNotes format flag - no bullet is used, if more that one replace the tab
// with a bullet. Also, if only one in group and tab text ends with 'S', remove it:
bool mixCandN = MixCautionNotesDiffType();
if ((MyPrevious == null && (nextItem == null || specialCalvertAlarm)) || mixCandN || FormatStepData.SeparateBox)
bool mixCandN = MixCautionNotesDiffType();
if (((MyPrevious == null || !this.IsSameType(MyPrevious)) && ((nextItem == null || !this.IsSameType(nextItem)) || specialCalvertAlarm)) || mixCandN || FormatStepData.SeparateBox)
{
if (_MyHeader.CleanText.ToUpper().EndsWith("S"))
{