diff --git a/PROMS/Formats/fmtall/BASEall.xml b/PROMS/Formats/fmtall/BASEall.xml index bfdff426..56657cc2 100644 Binary files a/PROMS/Formats/fmtall/BASEall.xml and b/PROMS/Formats/fmtall/BASEall.xml differ diff --git a/PROMS/Formats/fmtall/VEGP2all.xml b/PROMS/Formats/fmtall/VEGP2all.xml index 1a9b1c3f..86043269 100644 Binary files a/PROMS/Formats/fmtall/VEGP2all.xml and b/PROMS/Formats/fmtall/VEGP2all.xml differ 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(); }