From 69f8e3f4fc08585e998a17fbede105157850417f Mon Sep 17 00:00:00 2001 From: John Jenko Date: Fri, 16 May 2025 10:52:37 -0400 Subject: [PATCH] C2025-033 Added a new field and supporting logic to specify if a PageStyle item should be printed for the Child procedure being printed. --- PROMS/Formats/Formats.csproj | 8 ++++++++ PROMS/Formats/fmtall/PROMSDemo1all.xml | Bin 99022 -> 99538 bytes PROMS/Formats/fmtall/PROMSDemo2all.xml | Bin 82446 -> 83234 bytes PROMS/Formats/fmtall/PROMSDemoALRall.xml | Bin 103960 -> 104584 bytes .../DlgPrintProcedure.cs | 7 ++++++- .../VEPROMS.CSLA.Library/Format/PageStyles.cs | 10 ++++++++++ .../Volian.Print.Library/VlnSvgPageHelper.cs | 10 ++++++++++ 7 files changed, 34 insertions(+), 1 deletion(-) 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 c2b19d9228fa8e8a0be577516da8d7367c1d2a36..fdd07f1021a4a0e2cc5d7f6bacf6d1a68a5b6f0d 100644 GIT binary patch delta 433 zcmX@t%66%fZ37qEWFEFVjE0i~xkM-bV>tjAFU=OM(cCeP!Nn8Xz@c@>A) z^cXgPVIp!noh+(DCH@a6$|Aot|)tpR#sp`iX`FaCKz7D((LKiCtKCkTj5&Jr{O zx_qJFL#X>f9)BfNfy6r{jLcglg5a4<7C6qbIZyQ51#txiXNC-*cXJq082lJY8FCqH z8I*t?cf1!kT|kjhWU|1Uoaq;I7}+LYc`C&m%3w5op#Y=sq-QobbQ+=P+$`{X-)sP= C`-Niw delta 337 zcmccA$#$-lZ37n@vk`;IWJfOH$#QHbCfjj|P5uL=_i+SG*5RlDi|ylp$nE1$VOC&J zm~8!2cJc+zJVvw0_FTS`7w}0;F5#A$d?ZzU%4>Fp7^?3;jB0XtW8vX{^qs1rb5tP`$4;>C#|^XxYf&!z@^a-+z T4wG%33QWFsN@KIs%N?@;=R9hI diff --git a/PROMS/Formats/fmtall/PROMSDemo2all.xml b/PROMS/Formats/fmtall/PROMSDemo2all.xml index 952f24c9f58be33751088c0d4777a9c937b254f5..a5d4598ca7619e54d21934896fdc3304dd3bdd36 100644 GIT binary patch delta 423 zcmeBcVO`Y4y5Souqsioh+@h2D*p4w8PTmh>y<$57Wie{ zn>>v}Y;q8n#bg1VI!5Ek{XBt_6IdlCFXEEnRbU8Z$YaQ4C}B`wFr0jl)s)c`Y(5va z)#L{}UCgEo20)vICpYn0Vbx;<)?<#O$A~$U!DzA|ZzQuhn%)@h1V&4s%FM}Ec=MPo zp|VkYYrw7*pS(aoVzL?kJZ3|v%q#wRlQ*%8O`a!khS?Y@)*yHa&Q1_QupNZq?9B=y zVMoOk7@Qe0fF8?XNMZ0}C}qfHuw_sJdU4~Tz{v}w*(NV&RGa+arrG3%D@K#~Zc2e2 et$x!Vhdv_|eF|cHlN;{4O%B+?wmIR}x^w_q|AOEE delta 302 zcmZ3~#oE`xy5Souvk`;IYRF&!6uihSJb51vSg?*i4=88^6=V`v!)O9D zLx1u;fqBd(U{T%4YXn<>ZZQ;k2sRO<8RY6J;R+Ofln5%{N)(xIGC9GKWs{iP(a9_) e{3dTmGMl{Tw$9{^n>>sPlP_-7-CS~aT{-}{a$&jv diff --git a/PROMS/Formats/fmtall/PROMSDemoALRall.xml b/PROMS/Formats/fmtall/PROMSDemoALRall.xml index 3e2a1a240da6e64de5e4cac7a60ba2162dc6f9ad..824969a13c4c041e04be348975d2132d35d95720 100644 GIT binary patch delta 214 zcmbQShOJ{G+XgOSZUu%=hCGH$h7tya>4{;Cl9LsLb6rTP` WpV1D7J|iT326BvS+qn!G`BDMf6f^z+ delta 110 zcmV-!0FnQQu?Co|2CxbflY-6`lRzCFlk60Nlg<-L0X2iY6}P<=0o4+h;7tJt1t9<} z04 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);