diff --git a/PROMS/Formats/fmtall/TUECall.xml b/PROMS/Formats/fmtall/TUECall.xml index 65adcb98..77f4410d 100644 Binary files a/PROMS/Formats/fmtall/TUECall.xml and b/PROMS/Formats/fmtall/TUECall.xml differ diff --git a/PROMS/Formats/fmtall/VEGP2all.xml b/PROMS/Formats/fmtall/VEGP2all.xml index 9f3e975c..2ef040f1 100644 Binary files a/PROMS/Formats/fmtall/VEGP2all.xml and b/PROMS/Formats/fmtall/VEGP2all.xml differ diff --git a/PROMS/Formats/genmacall/VEGP2.svg b/PROMS/Formats/genmacall/VEGP2.svg index dcd1c501..730ace1b 100644 Binary files a/PROMS/Formats/genmacall/VEGP2.svg and b/PROMS/Formats/genmacall/VEGP2.svg differ diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index 2a321279..4d0c494a 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -4556,6 +4556,7 @@ namespace VEPROMS.CSLA.Library } bool isAlpha = tbformat.ToUpper().Contains("ALPHA"); int ordinal = Ordinal; + bool trimSeqValue = FormatStepData.TabData.TrimSeqTabValue; // F2024-043 remove space around SEQ tab value bool useLinked = false; // if this is enhanced, and the LinkedTab isn't numeric, flag to use 'LinkedTab' for the tab. if (ActiveSection != null && ActiveSection.IsEnhancedSection) // C2018-003 fixed use of getting the active section { @@ -4587,6 +4588,7 @@ namespace VEPROMS.CSLA.Library tbformat = tbformat.Replace("{numeric}", LinkedTab.Trim(" .".ToCharArray()).PadLeft(2)); } string alpha = useLinked?LinkedTab.Trim():AlphabeticalNumbering(ordinal); + if (trimSeqValue) alpha = alpha.Trim(); // F2024-043 trim white around SEQ tab value (for sub-steps) // B2017-211 Roman High Level steps should be followed by Uppercase alpha substeps - This is being limited to Calvert SAMG Format if (_ActiveFormat.Name =="BGESAM1" &&MyParent != null && MyParent.IsHigh && MyParent.IsStep && MyParent.FormatStepData.TabData.IdentEdit.Contains("ROMAN")) tbformat = tbformat.Replace("{alpha}", alpha); @@ -4629,7 +4631,8 @@ namespace VEPROMS.CSLA.Library tbformat = tbformat.Replace("{numeric}", stpTab); } else - tbformat = tbformat.Replace("{numeric}", trimTabStart ? ordinal.ToString() : FormatStepData.AtLeastTwoDigits ? ordinal.ToString().PadLeft(2, '0') : ordinal.ToString().PadLeft(2)); + // F2024-043 added trimSeqValue to trim white around SEQ tab value (for sub-steps) + tbformat = tbformat.Replace("{numeric}", (trimTabStart || trimSeqValue) ? ordinal.ToString() : FormatStepData.AtLeastTwoDigits ? ordinal.ToString().PadLeft(2, '0') : ordinal.ToString().PadLeft(2)); if (tbformate != null) { if (useLinked) diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs index 2b09e8d5..21a13240 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs @@ -6635,6 +6635,17 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _UseEntireSectionNum, "TabData/@UseEntireSectionNum"); } } + // this will remove white space before/after the tab value + // put in for Vogtal Units 3 & 4 formats for continuous action sub-steps + // they have tab value within parenthesis and for a single digit/letter we don't want the white steps before or after it + private LazyLoad _TrimSeqTabValue; + public bool TrimSeqTabValue + { + get + { + return LazyLoad(ref _TrimSeqTabValue, "TabData/@TrimSeqTabValue"); + } + } } #endregion