diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index 690cade4..0849b372 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -5053,8 +5053,8 @@ namespace Volian.Print.Library SectionInfo si = (mySectionInfo != null)? mySectionInfo.GetSectionInfo() : null; int sindx = si.CheckOffHeadingIndex(); //SectionInfo subi = mySubSectionInfo == null ? null : SectionInfo.Get(mySubSectionInfo.ItemID); - SectionInfo subi = mySubSectionInfo == null ? null : mySubSectionInfo.GetSectionInfo(); - int subindx = subi == null ? -1 : subi.CheckOffHeadingIndex(); + SectionInfo subi = (mySubSectionInfo == null)? null : mySubSectionInfo.GetSectionInfo(); + int subindx = (subi == null)? -1 : subi.CheckOffHeadingIndex(); // 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. @@ -5068,13 +5068,19 @@ namespace Volian.Print.Library if (itemInfo.IsStep) 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 { - 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; }