From cc6f0ed9fdd7c33de4bd0db2c0738b676cb29495 Mon Sep 17 00:00:00 2001
From: Kathy <kruffing@volian.com>
Date: Mon, 27 Sep 2021 15:42:31 +0000
Subject: [PATCH] =?UTF-8?q?F2021-046:=20Cover=20Page=20=E2=80=93=20remove?=
 =?UTF-8?q?=20merge=20page=20num,=20but=20include=20in=20overall=20count?=
 =?UTF-8?q?=20F2021-046:=20BNPP=20Alarm=20Cover=20Page=20=E2=80=93=20remov?=
 =?UTF-8?q?e=20merge=20page=20num,=20but=20include=20in=20overall=20count?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PROMS/Formats/fmtall/BNPPalrall.xml           | Bin 183106 -> 183162 bytes
 .../DlgPrintProcedure.cs                      |   5 +++++
 .../VEPROMS.CSLA.Library/Format/DocStyles.cs  |  12 ++++++++++++
 PROMS/Volian.Print.Library/MergedPdf.cs       |  11 +++++++++--
 4 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/PROMS/Formats/fmtall/BNPPalrall.xml b/PROMS/Formats/fmtall/BNPPalrall.xml
index 35ae1861515acdd2b1ca00d09c3a32e9c67d4744..0787bf76a6e902e865cee73f02ecb320237eb7b2 100644
GIT binary patch
delta 64
zcmX>!jr-R$?uHh|Elf$X)twpg8Oj(^8HyPEfGl4yD;-FtFa$6pGJsfq45bXY(*t)g
Msc)~C&2&m10AdpoD*ylh

delta 24
gcmex0jr-6v?uHh|Elf$XryFcz65GCEHq$A60ET@ENdN!<

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<MergedPdfProc>();
 				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<bool> _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 <page> and <of> 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 <page> and <of> numbers
 						{
 							bool landscape = false;
 							if (LandscapePages != null && LandscapePages.Contains(currentPageNumber - 1)) landscape = true;