diff --git a/PROMS/Formats/Formats.csproj b/PROMS/Formats/Formats.csproj
index 9d8e1803..d20cca04 100644
--- a/PROMS/Formats/Formats.csproj
+++ b/PROMS/Formats/Formats.csproj
@@ -282,6 +282,10 @@
+
+
+
+
@@ -499,6 +503,10 @@
+
+
+
+
diff --git a/PROMS/Formats/fmtall/PROMSDemo1all.xml b/PROMS/Formats/fmtall/PROMSDemo1all.xml
index c2b19d92..fdd07f10 100644
Binary files a/PROMS/Formats/fmtall/PROMSDemo1all.xml and b/PROMS/Formats/fmtall/PROMSDemo1all.xml differ
diff --git a/PROMS/Formats/fmtall/PROMSDemo2all.xml b/PROMS/Formats/fmtall/PROMSDemo2all.xml
index 952f24c9..a5d4598c 100644
Binary files a/PROMS/Formats/fmtall/PROMSDemo2all.xml and b/PROMS/Formats/fmtall/PROMSDemo2all.xml differ
diff --git a/PROMS/Formats/fmtall/PROMSDemoALRall.xml b/PROMS/Formats/fmtall/PROMSDemoALRall.xml
index 3e2a1a24..824969a1 100644
Binary files a/PROMS/Formats/fmtall/PROMSDemoALRall.xml and b/PROMS/Formats/fmtall/PROMSDemoALRall.xml differ
diff --git a/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs b/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs
index c01b1339..f38f9188 100644
--- a/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs
+++ b/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs
@@ -418,7 +418,12 @@ namespace VEPROMS
//txbPDFLocation.Text = _PDFPath;
BuildPDFFileName();
ProcedureConfig pc = _MyProcedure.MyConfig as ProcedureConfig;
- if(SelectedSlave > 0) pc.SelectedSlave = SelectedSlave;
+ // C2025-033 set which Child procedure is being printed used for PageStyle items
+ VlnSvgPageHelper.PrintingChild = SelectedSlave;
+ if (SelectedSlave > 0)
+ {
+ pc.SelectedSlave = SelectedSlave;
+ }
if (pc != null)
{
//C2021-062 use the save rev number for all procedures if set, or just use the rev number in the current procedure config
diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PageStyles.cs b/PROMS/VEPROMS.CSLA.Library/Format/PageStyles.cs
index a1af31b5..a97edf71 100644
--- a/PROMS/VEPROMS.CSLA.Library/Format/PageStyles.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Format/PageStyles.cs
@@ -244,6 +244,16 @@ namespace VEPROMS.CSLA.Library
return LazyLoad(ref _TrimEnding, "@TrimEnding");
}
}
+ // C2025-033 to specify to print pagestyle item for a specific Child procedure
+ private LazyLoad _ChildNum;
+ public int? ChildNum
+ {
+ get
+ {
+ return (LazyLoad(ref _ChildNum, "@ChildNum"));
+ }
+ }
+
#endregion
#region Override ToString
public override string ToString()
diff --git a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs
index 0ec682e3..89efa648 100644
--- a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs
+++ b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs
@@ -252,6 +252,14 @@ namespace Volian.Print.Library
get { return _CountInApplProcs; }
set { _CountInApplProcs = value; }
}
+ // C2025-033 Child (slave) being printed
+ private static int _PrintingChild = 0;
+ public static int PrintingChild
+ {
+ get { return _PrintingChild; }
+ set { _PrintingChild = value; }
+ }
+
//private bool _AddBlankPagesForDuplexPrinting = false;
//public bool AddBlankPagesForDuplexPrinting // Tells us if a the option to add a blank page is turn on (for procedures with duplex foldouts)
//{
@@ -1363,6 +1371,8 @@ i = 0;
foreach (VEPROMS.CSLA.Library.PageItem pageItem in pageStyle.PageItems)
{
if (pageItem.Token == null) continue; // can be null if token is dependent on PSI lookup!
+ // 2024-089 selectively print pagestyle item base on Child Procedure being printed
+ if (PrintingChild > 0 && pageItem.ChildNum > 0 && pageItem.ChildNum != PrintingChild) continue; // C2025-033 item should not be printed for this child
DidHLSText = false; // reset to false for this group of tokens.
//if (pageItem.Token.Contains("HLSTEXT"))
// Console.WriteLine("{0} - PageList Token", pageItem.Token);