Merge pull request 'C2023-024 Fix Duplicate Print Issue' (#192) from C2023-024B into Development

Merging into Development after successful code review.

PROMS/Formats/Formats.csproj

@@ -301,6 +301,7 @@
     <Content Include="fmtall\SHESAMall.xml" />
     <Content Include="fmtall\SHESSDall.xml" />
     <Content Include="fmtall\SHESSD_00all.xml" />
+    <Content Include="fmtall\VEGPBckall.xml" />
     <Content Include="fmtall\VEGP1all.xml" />
     <Content Include="fmtall\VEGP2all.xml" />
     <Content Include="fmtall\VEGPAlrall.xml" />
@@ -376,7 +377,7 @@
     <Content Include="fmtall\wst1all.xml" />
     <Content Include="fmtall\wst2all.xml" />
     <Content Include="fmtall\wstalrall.xml" />
-    <Content Include="fmtall\VEGPBckall.xml" />
+    <Content Include="fmtall\VEGPBckStpsall.xml" />
     <Content Include="fmtall\wstbckall.xml" />
     <Content Include="fmtall\wstcklall.xml" />
     <Content Include="fmtall\wstdcsall.xml" />
@@ -512,6 +513,7 @@
     <Content Include="genmacall\shesam.svg" />
     <Content Include="genmacall\shessd.svg" />
     <Content Include="genmacall\VEGPBck.svg" />
+    <Content Include="genmacall\VEGPBckStps.svg" />
     <Content Include="genmacall\VEGP1.svg" />
     <Content Include="genmacall\VEGP2.svg" />
     <Content Include="genmacall\VEGPAlr.svg" />

PROMS/VEPROMS User Interface/DlgPrintProcedure.cs

@@ -1091,6 +1091,11 @@ namespace VEPROMS
 			DoCreatePDF();
 		}
 
+		public void QPCreatePDF()
+		{
+			DoCreatePDF();
+		}
+
 		private void DoCreatePDF()
 		{
 			if (_AllProcedures)

PROMS/VEPROMS User Interface/frmVEPROMS.cs

@@ -512,6 +512,7 @@ namespace VEPROMS
 			ItemInfo.ItemDeleted += new ItemInfoEvent(RefreshDisplayHistory);
 
 			tv.PrintProcedure += new vlnTreeViewEvent(tv_PrintProcedure);
+			tv.QPrintProcedure += new vlnTreeViewEvent(tv_QPrintProcedure);
 			tv.PrintAllProcedures += new vlnTreeViewEvent(tv_PrintAllProcedures);
 			tv.ApproveProcedure += new vlnTreeViewEvent(tv_ApproveProcedure);
 			tv.ApproveAllProcedures += new vlnTreeViewEvent(tv_ApproveAllProcedures);
@@ -1151,7 +1152,41 @@ namespace VEPROMS
 
 			pi.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
 		}
-		
+
+		void tv_QPrintProcedure(object sender, vlnTreeEventArgs args)  // Quick Print
+		{
+			try
+			{
+				ProcedureInfo pi = (args.Node as VETreeNode).VEObject as ProcedureInfo;
+				if (pi == null) return;
+
+				tc.SaveCurrentEditItem(pi);
+
+				pi.MyDocVersion.DocVersionConfig.SelectedSlave = args.UnitIndex;
+
+				using (DlgPrintProcedure prnDlg = new DlgPrintProcedure(pi))
+				{
+					prnDlg.SelectedSlave = args.UnitIndex;
+					prnDlg.MySessionInfo = MySessionInfo;
+					prnDlg.SetupForProcedure();  // Setup filename
+					prnDlg.QPCreatePDF();  // Create Print report
+
+					pi.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
+				}
+			}
+            catch(Exception ex)
+            {
+				StringBuilder sb = new StringBuilder();
+
+				sb.AppendLine("Could not create PDF Print");
+				sb.AppendLine();
+				MessageBox.Show(sb.ToString(), "Error when creating PDF Print", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+
+				_MyLog.Warn("Failed to create PDF print", ex);
+			}
+
+		}
+
 		void tv_CreateContinuousActionSummary(object sender, vlnTreeEventArgs args)
 		{
 			DialogResult dr = System.Windows.Forms.DialogResult.Yes;

PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs

@@ -4104,7 +4104,7 @@ namespace VEPROMS.CSLA.Library
 					ItemInfo srcItem = ItemInfo.Get(eds[0].ItemID);
 					if (srcItem == null) return null;
 
-					if (srcItem.IsHigh) return srcItem.Ordinal; 
+					if (srcItem.IsHigh || srcItem.IsSection || srcItem.IsProcedure) return srcItem.Ordinal; 
 					// B2018-118: the LinkedOrdinal count must take into account cautions versus notes types:
 					ItemInfo hls = srcItem.MyHLS;
 					bool enIsCaution = this.IsCaution;

PROMS/VEPROMS.CSLA.Library/Format/ENums.cs

@@ -171,7 +171,8 @@ namespace VEPROMS.CSLA.Library
 		DSS_PageListAddSectCont = 0x400000000,   // for this section, add the top continue message when doing the ATTACHTITLECONT pagelist token (Calvert/Landscape word docs)
 		DSS_WordContentLandscaped = 0x800000000,	// for this section, the word content is landscaped.
 		DSS_ChklstEditSize = 0x100000000,	// Westinghouse checklist - edit window size 
-		DSS_SameXOffSubsections = 0x2000000000,	// print subsections at same offset as section & preceeding subsections,start HLS xoff at section text (not number)
+		DSS_SameXOffSubsections = 0x2000000000, // print subsections at same offset as section & preceeding subsections,start HLS xoff at section text (not number)
+		DSS_PageListBkgndStpContMsg = 0x4000000000, // Background Step Number printed via Pagelist with "{CM:(Cont)}" which will print "(cont)" next to step number if it's continued to the next page - (VEGPBckStp) F2023-112
 	};
 	public enum E_DocStyleUse : uint
 	{

PROMS/Volian.Controls.Library/vlnTreeView.cs

@@ -501,6 +501,11 @@ namespace Volian.Controls.Library
 		{
 			if (PrintProcedure != null) PrintProcedure(sender, args);
 		}
+		public event vlnTreeViewEvent QPrintProcedure;
+		private void OnQPrintProcedure(object sender, vlnTreeEventArgs args)
+		{
+			if (QPrintProcedure != null) QPrintProcedure(sender, args);
+		}
 		public event vlnTreeViewEvent PrintAllProcedures;
 		private void OnPrintAllProcedures(object sender, vlnTreeEventArgs args)
 		{
@@ -831,6 +836,7 @@ namespace Volian.Controls.Library
 								MenuItem micas = new MenuItem("Create Continuous Action Summary");
 								MenuItem mitcas = new MenuItem("Create Time Critical Action Summary"); //F2022-024 added menu option
 								MenuItem mip = new MenuItem("Print");
+								MenuItem miqp = new MenuItem("Quick Print");
 								MenuItem mia = new MenuItem("Approve");
 								int k = 0;
 								foreach (string s in pri.MyDocVersion.UnitNames)
@@ -841,6 +847,9 @@ namespace Volian.Controls.Library
 									MenuItem mp = mip.MenuItems.Add(s, new EventHandler(miMultiUnit_Click));
 									mp.Enabled = procAppl;
 									mp.Tag = k;
+									MenuItem mqp = miqp.MenuItems.Add(s, new EventHandler(miMultiUnit_Click));
+									mqp.Enabled = procAppl;
+									mqp.Tag = k;
 									MenuItem ma = mia.MenuItems.Add(s, new EventHandler(miMultiUnit_Click));
 									ma.Enabled = procAppl;
 									ma.Tag = k;
@@ -853,7 +862,8 @@ namespace Volian.Controls.Library
 								}
 								cm.MenuItems.Add(micas);
 								cm.MenuItems.Add(mitcas);
-								cm.MenuItems.Add(mip);
+								cm.MenuItems.Add(mip); 
+								cm.MenuItems.Add(miqp);
 								AddShowChangeBarsAfterMenuItem(cm.MenuItems, pri);
 								cm.MenuItems.Add(mia);
 								AddApprovedRevisionsMultiUnit(cm.MenuItems, pri);
@@ -863,6 +873,8 @@ namespace Volian.Controls.Library
 								cm.MenuItems.Add("Create Continuous Action Summary", new EventHandler(mi_Click));
 								cm.MenuItems.Add("Create Time Critical Action Summary", new EventHandler(mi_Click));
 								cm.MenuItems.Add("Print", new EventHandler(mi_Click));
+								cm.MenuItems.Add("Quick Print", new EventHandler(mi_Click));
+								//MenuItem miqp = new MenuItem("Print");
 								AddShowChangeBarsAfterMenuItem(cm.MenuItems, pri);
 								cm.MenuItems.Add("Approve", new EventHandler(mi_Click));
 								//_MyLog.WarnFormat("Context Menu 1 before - {0}", GC.GetTotalMemory(true));
@@ -877,19 +889,24 @@ namespace Volian.Controls.Library
 							if (pri.MyDocVersion.MultiUnitCount > 1)
 							{
 								MenuItem mip = new MenuItem("Print");
+								MenuItem miqp = new MenuItem("Quick Print");
 								int k = 0;
 								foreach (string s in pri.MyDocVersion.UnitNames)
 								{
 									k++;
 									MenuItem mp = mip.MenuItems.Add(s, new EventHandler(miMultiUnit_Click));
 									mp.Tag = k;
+									MenuItem mqp = miqp.MenuItems.Add(s, new EventHandler(miMultiUnit_Click));
+									mqp.Tag = k;
 								}
 								cm.MenuItems.Add(mip);
+								cm.MenuItems.Add(miqp);
 								AddApprovedRevisionsMultiUnit(cm.MenuItems, pri);
 							}
 							else
 							{
 								cm.MenuItems.Add("Print", new EventHandler(mi_Click));
+								cm.MenuItems.Add("Quick Print", new EventHandler(mi_Click));
 								AddApprovedRevisions(cm.MenuItems, pri);
 							}
 						}
@@ -1727,6 +1744,9 @@ namespace Volian.Controls.Library
 				case "Print":
 					OnPrintProcedure(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0, mi.Text, (int)mi.Tag));
 					break;
+				case "Quick Print":
+					OnQPrintProcedure(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0, mi.Text, (int)mi.Tag));
+					break;
 				case "Print All Procedures for":
 					OnPrintAllProcedures(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0,mi.Text,(int)mi.Tag));
 					break;
@@ -1967,6 +1987,9 @@ namespace Volian.Controls.Library
 				case "Print":
 					OnPrintProcedure(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0));
 					break;
+				case "Quick Print":
+					OnQPrintProcedure(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0));
+					break;
 				case "Print All Procedures":
 					OnPrintAllProcedures(this, new vlnTreeEventArgs(SelectedNode as VETreeNode, null, 0));
 					break;

PROMS/Volian.Print.Library/vlnParagraph.cs

@@ -1912,7 +1912,11 @@ namespace Volian.Print.Library
 					float bcm_yLocation = TableBottom == -1 ? yLocation: Math.Min(TableBottom,yLocation);
 					DoBottomContinueMsg(cb, yBottomMargin, bcm_yLocation, docstyle, doThreeContinues);
 					MyPromsPrinter.NewPage();
-					if (MyItemInfo.IsStep && (MyItemInfo.ActiveSection != null && ((MyItemInfo.ActiveSection.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DSS_PageListSpBckgrnd) == E_DocStructStyle.DSS_PageListSpBckgrnd))) // C2018-003 fixed use of getting the active section
+					// C2018-003 fixed use of getting the active section
+					// F2023-112 Vogtle Units 3 & 4 background document format DSS_PageListBkgndStpContMsg to print continue message next to step number
+					if (MyItemInfo.IsStep && (MyItemInfo.ActiveSection != null && 
+						((MyItemInfo.ActiveSection.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DSS_PageListSpBckgrnd) == E_DocStructStyle.DSS_PageListSpBckgrnd) ||
+						((MyItemInfo.ActiveSection.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DSS_PageListBkgndStpContMsg) == E_DocStructStyle.DSS_PageListBkgndStpContMsg))) 
 					{
 						// check if parent (can be HLS, Caution or Note) has the UseOldTemplate.  If so,
 						// flag that a continue message should be printed as part of a pagelist header (if pagelist