From 62a296f9093456267eda601d9538fbaaaa93fff5 Mon Sep 17 00:00:00 2001 From: John Jenko Date: Tue, 2 Dec 2025 10:53:26 -0500 Subject: [PATCH] =?UTF-8?q?F2025-038=20Added=20a=20format=20flag=20to=20no?= =?UTF-8?q?t=20include=20the=20word=20=E2=80=9CSECTION=E2=80=9D=20in=20fro?= =?UTF-8?q?nt=20the=20section=20number=20and=20title=20on=20the=20Continuo?= =?UTF-8?q?us=20Action=20Summary=20that=20is=20generated=20by=20PROMS.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PROMS/Formats/fmtall/BASEall.xml | Bin 91078 -> 91132 bytes PROMS/Formats/fmtall/VEGP2all.xml | Bin 235158 -> 235556 bytes .../Format/PlantFormat.cs | 10 ++++++++++ PROMS/Volian.Print.Library/ContActionSum.cs | 9 ++++++--- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/PROMS/Formats/fmtall/BASEall.xml b/PROMS/Formats/fmtall/BASEall.xml index bfdff426c9a08e9a9ebddb19dab2154aaa7b6dc2..56657cc2a26697f470b093e7a194ae888682551d 100644 GIT binary patch delta 32 ocmX?hob}If)(uuMlYd0Zar!VMG9)piGUPOC$86V*VVunl0NalXc>n+a delta 18 Zcmex!ob}jo)(uuM%>^;r3t||1*a27%2nPTF diff --git a/PROMS/Formats/fmtall/VEGP2all.xml b/PROMS/Formats/fmtall/VEGP2all.xml index 1a9b1c3fecc3d589ac63bbcc93648d39e8ef3836..86043269b01fb8926ac35ca7a14d584254c39498 100644 GIT binary patch delta 300 zcmbQXmT$=hz71t&^_&b4Xv5&lkk63EkjYR2BujzpQifs%M}}k|KNBny3>3))!bFB5 zhDrt(AYB5)3Jjh=^~nr5K-mv06CNMQ&8o1Fucw`EWQ@``|RsUbin zej|K3p{td2~tg)bxp$80DMW S%-Y+`7=f5+dz%@vKmq`{OgxYP delta 31 lcmZ3ofp6Mcz71t&(;rM>6lfN)Xcw_y1Y)M`A{NX72>`*S3K{?a diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs index 4f02807b..87719a04 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs @@ -4341,6 +4341,16 @@ public LeftJustifyList(XmlNodeList xmlNodeList) : base(xmlNodeList) { } return LazyLoad(ref _IncludeSectionNumAndTitle, "@IncludeSectionNumAndTitle"); } } + + //F2025-038 default (in base format) is True. The lable "SECTION" will precede the section number an title + private LazyLoad _IncludeSectionLabel; + public bool IncludeSectionLabel + { + get + { + return LazyLoad(ref _IncludeSectionLabel, "@IncludeSectionLabel"); + } + } // the font and font styles to use for the continuous action summary private VE_Font _Font; public VE_Font Font diff --git a/PROMS/Volian.Print.Library/ContActionSum.cs b/PROMS/Volian.Print.Library/ContActionSum.cs index ec199b56..d7853e03 100644 --- a/PROMS/Volian.Print.Library/ContActionSum.cs +++ b/PROMS/Volian.Print.Library/ContActionSum.cs @@ -49,7 +49,7 @@ namespace Volian.Print.Library { if (myContAct.MyChildren.Count > 0) if (myContAct.MyParagraph.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.AccSectionData.ContinuousActionSummaryData.IncludeSectionNumAndTitle) // only print the section title if it has Continuous Action Steps - AddSectionHeader(myContAct.MyParagraph.MyItemInfo.DisplayNumber, myContAct.MyParagraph.MyItemInfo.FormattedDisplayText); + AddSectionHeader(myContAct.MyParagraph.MyItemInfo.DisplayNumber, myContAct.MyParagraph.MyItemInfo.FormattedDisplayText, myContAct.MyParagraph.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.AccSectionData.ContinuousActionSummaryData.IncludeSectionLabel); foreach (pkParagraph pgh in myContAct.MyChildren) // within each section... { ItemInfo hlsii = GetHLSii(pgh.MyParagraph.MyItemInfo); @@ -175,7 +175,7 @@ namespace Volian.Print.Library WriteCell("DONE", true, true); WriteCell("PAGE", true, false); } - private void AddSectionHeader(string number, string title) + private void AddSectionHeader(string number, string title, bool IncludeSectionLabel) { if (!_FirstSection) { @@ -187,7 +187,10 @@ namespace Volian.Print.Library _FirstSection = false; Advance(2); SetIndent(0, 0); - WriteCell("SECTION " + number, true, false); + if (IncludeSectionLabel) + WriteCell("SECTION " + number, true, false); + else + WriteCell(number, true, false); // F2025-038 don't include the word SECTION before number and title WriteCell(" " + title, false, true); Advance(); }