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

B2021-106 added check if section/subsection has caution/notes in deciding where the checkoff header is printed.

Browse Source
This commit is contained in:
John Jenko 2021-10-05 13:47:46 +00:00
parent 1f0c2ee4fd
commit 687becbffc
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5053,8 +5053,8 @@ namespace Volian.Print.Library
SectionInfo si = (mySectionInfo != null)? mySectionInfo.GetSectionInfo() : null; SectionInfo si = (mySectionInfo != null)? mySectionInfo.GetSectionInfo() : null;
int sindx = si.CheckOffHeadingIndex(); int sindx = si.CheckOffHeadingIndex();
//SectionInfo subi = mySubSectionInfo == null ? null : SectionInfo.Get(mySubSectionInfo.ItemID); //SectionInfo subi = mySubSectionInfo == null ? null : SectionInfo.Get(mySubSectionInfo.ItemID);
SectionInfo subi = mySubSectionInfo == null ? null : mySubSectionInfo.GetSectionInfo(); SectionInfo subi = (mySubSectionInfo == null)? null : mySubSectionInfo.GetSectionInfo();
int subindx = subi == null ? -1 : subi.CheckOffHeadingIndex(); int subindx = (subi == null)? -1 : subi.CheckOffHeadingIndex();
// if there is no subsections & the main section doesn't use a header OR // if there is no subsections & the main section doesn't use a header OR
// if there is a subsection, & it does not use a header... Return. // if there is a subsection, & it does not use a header... Return.
@ -5068,13 +5068,19 @@ namespace Volian.Print.Library
if (itemInfo.IsStep) if (itemInfo.IsStep)
usePageListCOHdr = true; usePageListCOHdr = true;
// This checks to see if the section is starting at the top of the page.
// If it is, then we want to use PageList to print the checkoff/sighoff header
// else the checkoff/signoff header will be printed across from the section title where ever it is on the page (i.e. section pagination set to continuous)
else if (subi == null) //no subsection else if (subi == null) //no subsection
{ {
if ((yPageStart - YOffset) == yTopMargin) usePageListCOHdr = true; // B2021-106 added check if the section has a note or caution
if ((yPageStart - YOffset) == yTopMargin || mySectionInfo.HasCautionOrNote) usePageListCOHdr = true;
} }
else else // there is a sub-section
{ {
if (mySectionInfo == itemInfo && ((yPageStart - YOffset) == yTopMargin)) usePageListCOHdr = true; // B2021-106 added check if the section has a note or caution
if (mySectionInfo == itemInfo && ((yPageStart - YOffset) == yTopMargin) || mySectionInfo.HasCautionOrNote) usePageListCOHdr = true;
if (!usePageListCOHdr && mySubSectionInfo != itemInfo) return; if (!usePageListCOHdr && mySubSectionInfo != itemInfo) return;
} }