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

B2018-104: Top continue message printed when step was just starting and sub-sub-steps break at less ideal location.

Browse Source
This commit is contained in:
Kathy Ruffing 2018-07-16 16:06:36 +00:00
parent 5438908754
commit 4cc99a1d6c
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1378,7 +1378,8 @@ namespace VEPROMS.CSLA.Library
{
ItemInfo parent = ActiveParent as ItemInfo;
if (parent == null) return false;
if (parent.IsExactType("And") || parent.IsExactType("Or")) return true;
// B2018-104: Make the following check consistent with what is in CalcStepLevel (added ImplicitOr)
if (parent.IsExactType("And") || parent.IsExactType("Or") || parent.IsExactType("ImplicitOr")) return true;
return parent.ParentAndOr;
}
}
@ -1388,7 +1389,8 @@ namespace VEPROMS.CSLA.Library
{
ItemInfo parent = ActiveParent as ItemInfo;
if (parent == null) return 0;
if (parent.IsExactType("And") || parent.IsExactType("Or")) return 1 + parent.ParentAndOrCount;
// B2018-104: Make the following check consistent with what is in CalcStepLevel (added ImplicitOr)
if (parent.IsExactType("And") || parent.IsExactType("Or") || parent.IsExactType("ImplicitOr")) return 1 + parent.ParentAndOrCount;
return parent.ParentAndOrCount;
}
}

6
PROMS/Volian.Print.Library/Pagination.cs
View File

@ -1452,7 +1452,8 @@ namespace Volian.Print.Library
{
// The following lines were added for Comanche Peak ECA-TP-11-001A.SProcedure Steps.S17 (Printed as Step 12)
if (spaceOnPage > 0 && myPara.YSize > fullPage && myPara.ChildrenRight != null && myPara.ChildrenRight.Count > 0
&& myPara.ChildrenRight[0].YSize <= fullPage && myPara.ChildrenRight[0].YSize > spaceOnPage)
&& myPara.ChildrenRight[0].YSize <= fullPage && myPara.ChildrenRight[0].YSize > spaceOnPage
&& !myPara.MyItemInfo.IsHigh) // B2018-104: don't return if my parent is a high level - a top continue message was printing
{
//_MyLog.WarnFormat("\r\nMyParaBreak {0},{1},{2},{3},{4}", myPara, myPara.YSize, yUpperLimit, myPara.ChildrenRight[0].YSize, spaceOnPage);
if (myPara != lastBreak)
@ -1462,7 +1463,8 @@ namespace Volian.Print.Library
vlnParagraph myParent = myPara.MyParent;
spaceOnPage = yAddForBtmMsg + yUpperLimit + myPara.YTop + yLocation - myParent.YTop;
if (spaceOnPage > 0 && myParent != lastBreak && myParent.YSize > fullPage && myParent.ChildrenRight != null && myParent.ChildrenRight.Count > 0
&& myParent.ChildrenRight[0].YSize <= fullPage && myParent.ChildrenRight[0].YSize > spaceOnPage)
&& myParent.ChildrenRight[0].YSize <= fullPage && myParent.ChildrenRight[0].YSize > spaceOnPage
&& !myParent.MyItemInfo.IsHigh) // B2018-104: don't return if my parent is a high level - a top continue message was printing
{
//_MyLog.WarnFormat("\r\nMyParentBreak {0},{1},{2},{3},{4}", myParent, myParent.YSize, yUpperLimit, myParent.ChildrenRight[0].YSize, spaceOnPage);
if (myParent != lastBreak)