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

B2018-021: Supplemental information page not printing when associated with complicated step.

Browse Source 
C2018-002: Remove checkboxes in supplemental info
This commit is contained in:
Kathy Ruffing 2018-02-08 13:50:03 +00:00
parent 7123b2d59e
commit bb503e62b0
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
PROMS/Volian.Print.Library/vlnParagraph.cs
View File

@ -2378,7 +2378,8 @@ namespace Volian.Print.Library
foreach (ItemInfo iic in pi.MyItems) foreach (ItemInfo iic in pi.MyItems)
{ {
if (iic.SupInfos != null && iic.SupInfos.Count > 0) return iic.SupInfos[0].ItemID; if (iic.SupInfos != null && iic.SupInfos.Count > 0) return iic.SupInfos[0].ItemID;
if (supInfoSect.StepSectPageBreaks.Contains(iic.ItemID)) return -2; // B2017-192: -2 flags that a page break within substep was found, return // B2018-021: added code to be sure that check isn't on current step, i.e. startid != iic.ItemID
if (startid != iic.ItemID && supInfoSect.StepSectPageBreaks.Contains(iic.ItemID)) return -2; // B2017-192: -2 flags that a page break within substep was found, return
int id = GetSubThatHasSupInfoItems(iic, startid); int id = GetSubThatHasSupInfoItems(iic, startid);
if (id == -2) return -1; if (id == -2) return -1;
if (id != -1) return id; if (id != -1) return id;
@ -4042,7 +4043,7 @@ namespace Volian.Print.Library
} }
} }
} }
if (co != null) if (co != null && !MyItemInfo.IsInSupInfo) // C2018-002: don't print checkboxes on supplemental infromation pages.
{ {
// if this item's content is empty, and the flag is set to 'notonempty', don't print out the // if this item's content is empty, and the flag is set to 'notonempty', don't print out the
// checkoff - this was added for shearon harris: // checkoff - this was added for shearon harris: