diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index 81ffcbc4..b59c79e0 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -4129,6 +4129,17 @@ namespace VEPROMS.CSLA.Library //else // ordinal = 0; } + // B2018-101: The section number was duplicated in the WCNOC step tab. This was fixed for edit, B2017-153, but not for print (see below). The code + // used for that bug fix was duplicated here (with slight modification because the tab did not have the "WCNOC" string, thus using the active + // formats, and also use tbformat rather than tbformate. + if (useLinked) + { + if ((ActiveFormat.Name.ToUpper() == "WCNBCK" || ActiveFormat.Name.ToUpper() == "WCNFSGBCK" || ActiveFormat.Name.ToUpper() == "WCNOFBCK") && tbformat.Contains(LinkedTab[0].ToString() + "{numeric}")) + tbformat = tbformat.Replace(LinkedTab[0].ToString() + "{numeric}", "{numeric}"); + else if ((ActiveFormat.Name.ToUpper() == "WCNBCK" || ActiveFormat.Name.ToUpper() == "WCNFSGBCK" || ActiveFormat.Name.ToUpper() == "WCNOFBCK") && tbformat.Contains(LinkedTab[0].ToString() + ".{numeric}")) + tbformat = tbformat.Replace(LinkedTab[0].ToString() + ".{numeric}", "{numeric}"); + tbformat = tbformat.Replace("{numeric}", LinkedTab.Trim(" .".ToCharArray()).PadLeft(2)); + } string alpha = useLinked?LinkedTab.Trim():AlphabeticalNumbering(ordinal); // 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"))