diff --git a/PROMS/Formats/fmtall/BNPPalrall.xml b/PROMS/Formats/fmtall/BNPPalrall.xml index 35ae1861..0787bf76 100644 Binary files a/PROMS/Formats/fmtall/BNPPalrall.xml and b/PROMS/Formats/fmtall/BNPPalrall.xml differ diff --git a/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs b/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs index 74038b3d..a5d450b2 100644 --- a/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs +++ b/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs @@ -842,6 +842,11 @@ namespace VEPROMS // pdf name from printing has the path, remove it. string pdfname = locpdfname.Substring(locpdfname.LastIndexOf(@"\") + 1); MergedPdfProc mpp = new MergedPdfProc(myProc.DisplayText, pdfname); + // F2021-046: flag if cover page section doesn't print page number on first page of merged pdf: + if (myProc.Sections != null) + { + foreach (ItemInfo ii in myProc.Sections) if (ii.MyDocStyle != null && ii.MyDocStyle.CoverNoMergedPageNum) mpp.FirstPageNoPageNum = true; + } if (_MergedPfd.MergedPdfs == null) _MergedPfd.MergedPdfs = new List(); mpp.PageCount = PromsPrinter.ProcPageCount; _MergedPfd.MergedPdfs.Add(mpp); diff --git a/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs b/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs index b7ad6149..52832fa5 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs @@ -361,6 +361,18 @@ namespace VEPROMS.CSLA.Library } } #endregion + #region CoverNoMergedPageNum + [Category("Miscellaneous")] + [Description("Cover Page Do Not Show Page Count")] + private LazyLoad _CoverNoMergedPageNum; // F2021-046: flag if cover page section doesn't print page number on first page of merged pdf: + public bool CoverNoMergedPageNum + { + get + { + return LazyLoad(ref _CoverNoMergedPageNum, "@CoverNoMergedPageNum"); + } + } + #endregion #region AlignHLSTabWithSect [Category("Miscellaneous")] [Description("Align HLS Tab With Sect")] diff --git a/PROMS/Volian.Print.Library/MergedPdf.cs b/PROMS/Volian.Print.Library/MergedPdf.cs index 5c39110b..e990b243 100644 --- a/PROMS/Volian.Print.Library/MergedPdf.cs +++ b/PROMS/Volian.Print.Library/MergedPdf.cs @@ -32,6 +32,12 @@ namespace Volian.Print.Library get { return _PdfFileName; } set { _PdfFileName = value; } } + private bool _FirstPageNoPageNum = false; + public bool FirstPageNoPageNum + { + get { return _FirstPageNoPageNum; } + set { _FirstPageNoPageNum = value; } + } public MergedPdfProc(string title, string pfname) { _Title = title; @@ -140,8 +146,9 @@ namespace Volian.Print.Library mergedPageNumber += 1; doc.SetPageSize(paperSize); doc.NewPage(); - PdfImportedPage page = writer.GetImportedPage(reader, currentPageNumber); // gets a page that is 'ready' to be written to combined pdf - if (doPageNum) // get the string & fill in with and numbers + PdfImportedPage page = writer.GetImportedPage(reader, currentPageNumber); // gets a page that is 'ready' to be written to combined pdf + // F2021-046: flag if cover page section doesn't print page number on first page of merged pdf: + if (doPageNum && (!(mpp.FirstPageNoPageNum && currentPageNumber == 1))) // get the string & fill in with and numbers { bool landscape = false; if (LandscapePages != null && LandscapePages.Contains(currentPageNumber - 1)) landscape = true;