From f51573672f0f25ea2febe142d2204a4dd886ddab Mon Sep 17 00:00:00 2001
From: Kathy <kruffing@volian.com>
Date: Wed, 16 Apr 2014 15:18:33 +0000
Subject: [PATCH] =?UTF-8?q?For=20Calvert:=20remove=20a=20tab=20space=20if?=
 =?UTF-8?q?=20double=20alphanumeric=20so=20tab=20doesn=E2=80=99t=20overwri?=
 =?UTF-8?q?te=20box=20line;=20tabs=20should=20be=20=E2=80=98AA=E2=80=99,?=
 =?UTF-8?q?=20=E2=80=98AB=E2=80=99=20rather=20than=20=E2=80=98AA=E2=80=99,?=
 =?UTF-8?q?=20=E2=80=98BB=E2=80=99=20Added=20Bottom=20continue=20message?=
 =?UTF-8?q?=20margin=20for=20RNO=20column?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../VEPROMS.CSLA.Library/Extension/ItemExt.cs | 19 +++++++++++++------
 .../VEPROMS.CSLA.Library/Format/DocStyles.cs  | 13 +++++++++++++
 2 files changed, 26 insertions(+), 6 deletions(-)

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<float?> _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")]