diff --git a/PROMS/Formats/fmtall/BASEall.xml b/PROMS/Formats/fmtall/BASEall.xml index 54405046..2d2705fe 100644 Binary files a/PROMS/Formats/fmtall/BASEall.xml and b/PROMS/Formats/fmtall/BASEall.xml differ diff --git a/PROMS/Formats/fmtall/VEGP1all.xml b/PROMS/Formats/fmtall/VEGP1all.xml index 8a5958a0..8eb46134 100644 Binary files a/PROMS/Formats/fmtall/VEGP1all.xml and b/PROMS/Formats/fmtall/VEGP1all.xml differ diff --git a/PROMS/Formats/fmtall/VEGP2all.xml b/PROMS/Formats/fmtall/VEGP2all.xml index e62fa617..74585b7f 100644 Binary files a/PROMS/Formats/fmtall/VEGP2all.xml and b/PROMS/Formats/fmtall/VEGP2all.xml differ diff --git a/PROMS/Formats/fmtall/VEGPAlrall.xml b/PROMS/Formats/fmtall/VEGPAlrall.xml index 74e29ab1..e0144098 100644 Binary files a/PROMS/Formats/fmtall/VEGPAlrall.xml and b/PROMS/Formats/fmtall/VEGPAlrall.xml differ diff --git a/PROMS/Formats/fmtall/VEGPBckStpsall.xml b/PROMS/Formats/fmtall/VEGPBckStpsall.xml index 6e484f1f..0df3fb9c 100644 Binary files a/PROMS/Formats/fmtall/VEGPBckStpsall.xml and b/PROMS/Formats/fmtall/VEGPBckStpsall.xml differ diff --git a/PROMS/Formats/fmtall/VEGPBckall.xml b/PROMS/Formats/fmtall/VEGPBckall.xml index e7e36a2a..d421a96d 100644 Binary files a/PROMS/Formats/fmtall/VEGPBckall.xml and b/PROMS/Formats/fmtall/VEGPBckall.xml differ diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs index aa178018..483a321a 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs @@ -1545,6 +1545,9 @@ namespace VEPROMS.CSLA.Library { //if (tb._FromItem.MyContent.InList(5322)) Console.WriteLine("Here"); string str1 = TranGetSectionNumber(tb._ToItem); + // F2024-008 added flag to title case the section number in transitions + if (tb._FormatData.TransData.Cap1stCharTransSectionNumber) + str1 = CapFirstLetterOnly(str1, 0); if(!tb._ToItem.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert) return str1; List FromSections = GetSections(tb._FromItem.ActiveSection); List ToSections = GetSections(tb._ToItem.ActiveSection); @@ -1615,6 +1618,9 @@ namespace VEPROMS.CSLA.Library sectionTitle = (tb._FormatData.TransData.CapsTransitionsSection ? sectionTitle.ToUpper().Replace(@"\U", @"\u") : tb._FormatData.TransData.Cap1stCharTransSection ? CapFirstLetterOnly(sectionTitle, 0) : sectionTitle); + // F2024-008 Added flag to surround the section title with parenthesis in transitions + if (tb._FormatData.TransData.ParensAroundSectionTitle) + sectionTitle = string.Format("({0})", sectionTitle); // B2017-236 Replace embedded returns with spaces and trim the spaces from the end of the section title. return TrimSectionTitle(sectionTitle); } diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs index 250a4367..2b09e8d5 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs @@ -7103,6 +7103,7 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Cap1stCharTrans, "@Cap1stCharTrans"); } } + // Title Case section title private LazyLoad _Cap1stCharTransSection; public bool Cap1stCharTransSection { @@ -7111,6 +7112,24 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Cap1stCharTransSection, "@Cap1stCharTransSection"); } } + // Title Case section number + private LazyLoad _Cap1stCharTransSectionNumber; + public bool Cap1stCharTransSectionNumber + { + get + { + return LazyLoad(ref _Cap1stCharTransSectionNumber, "@Cap1stCharTransSectionNumber"); + } + } + // Parens around section title + private LazyLoad _ParensAroundSectionTitle; + public bool ParensAroundSectionTitle + { + get + { + return LazyLoad(ref _ParensAroundSectionTitle, "@ParensAroundSectionTitle"); + } + } private LazyLoad _UseTransitionModifier; public bool UseTransitionModifier {