From 81d20b26acb5ed9ff884c709321786683f340578 Mon Sep 17 00:00:00 2001 From: Kathy Date: Fri, 26 May 2023 11:26:26 +0000 Subject: [PATCH] B2023-060: Beaver Valley SAMG/Supplemental Information Continuous Sections printing as Separate --- PROMS/VEPROMS.CSLA.Library/Config/SectionConfig.cs | 5 ++++- PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs | 12 ++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Config/SectionConfig.cs b/PROMS/VEPROMS.CSLA.Library/Config/SectionConfig.cs index 072d24dc..2861d52e 100644 --- a/PROMS/VEPROMS.CSLA.Library/Config/SectionConfig.cs +++ b/PROMS/VEPROMS.CSLA.Library/Config/SectionConfig.cs @@ -324,7 +324,10 @@ namespace VEPROMS.CSLA.Library get { // C2018-013 Procedures with Supplemental Information will assume that all sections are printed separately. - if (_SectionInfo != null && _SectionInfo.MyProcedure.ProcHasSupInfoData) return SectionPagination.Separate; + // B2023-060: Pagination - if section uses supplemental information, use the Section's properties/pagination (continuous + // or separate) rather than always setting to separate + if (_SectionInfo != null && _SectionInfo.MyProcedure.ProcHasSupInfoData && _SectionInfo.MyDocStyle != null && !_SectionInfo.MyDocStyle.SupInfoNoPaginOverride) + return SectionPagination.Separate; string s = _Xp["Section", "Pagination"]; //If there is no value to get, then get the parent value (a.k.a. default value). diff --git a/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs b/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs index 7a7e1336..b067a239 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs @@ -171,6 +171,18 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _SupplementalInformation, "@SupplementalInformation"); } } + // B2023-060: Pagination - if section uses supplemental information, use the Section's properties/pagination (continuous or + // separate) rather than always setting to separate + [Category("Miscellaneous")] + [Description("Supports Supplemental Information Pagination")] + private LazyLoad _SupInfoNoPaginOverride; + public bool SupInfoNoPaginOverride + { + get + { + return LazyLoad(ref _SupInfoNoPaginOverride, "@SupInfoNoPaginOverride"); + } + } // F2023-035: WCN - allow for change in left margin for supplemental information pages by // setting a value in the DocStyle for the adjustment. This is used when importing the vlnParagraph page // page & when doing pagelist items