diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index f4fbb286..9288b1f5 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -2818,7 +2818,11 @@ namespace VEPROMS.CSLA.Library string alpha = AlphabeticalNumbering(ordinal); tbformat = tbformat.Replace("{alpha}", alpha.ToLower()); tbformat = tbformat.Replace("{alphaWpar}", alpha.ToLower()); - tbformat = tbformat.Replace("{ALPHA}", alpha); + if (ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert && tbformat.Contains("{ALPHA}") && alpha.Length > 1) + tbformat = tbformat.Replace("{ALPHA}. ", alpha+"."); // if double chars, remove one of the space for BGE + else + tbformat = tbformat.Replace("{ALPHA}", alpha); + tbformat = tbformat.Replace("{ALPHAWpar}", alpha); if (tbformat.ToUpper().Contains("ROMAN")) { @@ -3299,11 +3303,14 @@ namespace VEPROMS.CSLA.Library private string AlphabeticalNumbering(int number) { string retval = string.Empty; - // originally the code would do double alpha as 'aa', 'ab', 'ac'. This was changed to do 'aa', - // 'bb', 'cc'. The Westinghouse work required this and 16bit was tested and it worked the - // same way as the Westinghouse requirement. The original code to do 'aa', 'ab' was left here, - // commented out, in case a future plant needs it and then should tie it to a format flag. - // Changed logic to support unlimited cases ('aa','aaa','aaaa', etc.) + // BGE requires tabs to be 'AA', 'AB', 'AC'... 'BA', 'BB', 'BC', etc. + if (ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert) + { + if (number > 26) retval += Letter((number - 1) / 26); + retval += Letter(1 + ((number - 1) % 26)); + return retval; + } + // Westinghouse and 16bit had 'AA', 'BB', etc. Logic supports unlimited cases ('aa','aaa','aaaa', etc.) retval = retval.PadRight(1 + ((number-1)/26), Letter(1 + ((number - 1) % 26))[0]); return retval; } diff --git a/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs b/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs index c7527ace..bc944c3b 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs @@ -611,6 +611,19 @@ namespace VEPROMS.CSLA.Library } } #endregion + #region MarginR BGE + private LazyLoad _MarginR; + [Category("Continue Msg")] + [DisplayName("Margin for bottom msg RNO Column (if in both columns)")] + [Description("Margin for bottom msg RNO Column (if in both columns)")] + public float? MarginR + { + get + { + return LazyLoad(ref _MarginR, "@MarginR"); + } + } + #endregion #region Location [Category("Continue Msg")] [Description("Bottom Continue Location")]