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

Step Level should include an extra count for AND and OR Step Types to reduce the likelyhood of pagination splitting an OR or an AND type step.

Browse Source
This commit is contained in:
Rich 2014-05-14 17:58:49 +00:00
parent a95f7bb59a
commit 0091be08da
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -800,8 +800,9 @@ namespace VEPROMS.CSLA.Library
// formats that have it.
if (item.IsExactType("And") || item.IsExactType("Or") || item.IsExactType("ImplicitOr"))
level++;
if (parent != null && (parent.IsExactType("And") || parent.IsExactType("Or")))
level++;
//if (item.ParentAndOr)
// level++;
level += item.ParentAndOrCount;
// First substep, this is where it uses the orphan logic from above.
if (!item.IsRNOPart && !item.IsHigh && item.MyPrevious == null)
@ -841,7 +842,26 @@ namespace VEPROMS.CSLA.Library
}
return level;
}
private bool ParentAndOr
{
get
{
ItemInfo parent = ActiveParent as ItemInfo;
if (parent == null) return false;
if (parent.IsExactType("And") || parent.IsExactType("Or")) return true;
return parent.ParentAndOr;
}
}
private int ParentAndOrCount
{
get
{
ItemInfo parent = ActiveParent as ItemInfo;
if (parent == null) return 0;
if (parent.IsExactType("And") || parent.IsExactType("Or")) return 1 + parent.ParentAndOrCount;
return parent.ParentAndOrCount;
}
}
/// <summary>
/// Count all levels, including substeps within RNOs. Ignore RNOs that are to the right of
/// the AER, but count those that are below higher level RNOs.