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

B2019-121 Pagination was breaking on the last bulleted substep of a note, then mistakenly putting the bottom continue message on top of the note box. Logic now does a better job in keeping substeps within notes and caution together and thus placing the continue message in the correct location.

Browse Source
This commit is contained in:
John Jenko 2019-08-30 19:39:20 +00:00
parent 6e06cbdf88
commit 24c06d710a
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1306,6 +1306,21 @@ namespace VEPROMS.CSLA.Library
return retval.ToString(); return retval.ToString();
} }
} }
// B2019-121 tell us if the step item in part of a caution or note type
public bool HasAncestorCautionOrNote
{
get
{
ItemInfo item = this.ActiveParent as ItemInfo;
while (item is ItemInfo && !item.IsHigh)
{
if (item.IsInCautionOrNote)
return true;
item = item.ActiveParent as ItemInfo;
}
return false;
}
}
private static int CalcStepLevel(ItemInfo item) private static int CalcStepLevel(ItemInfo item)
{ {
if (item == null) return 0; if (item == null) return 0;
@ -1344,6 +1359,8 @@ namespace VEPROMS.CSLA.Library
{ {
if (item.Cautions != null || item.Notes != null) if (item.Cautions != null || item.Notes != null)
level += 2; level += 2;
else if (item.HasAncestorCautionOrNote) // B2019-121 step part is in a caution or note
level += 3;
} }
// Paginate before first caution, not between cautions. // Paginate before first caution, not between cautions.
else if (item.IsCautionPart) else if (item.IsCautionPart)