From 406ec0f036a46a2c401b80f673817ff8ef68c052 Mon Sep 17 00:00:00 2001
From: Rich <rmark@volian.com>
Date: Tue, 13 Oct 2015 13:56:32 +0000
Subject: [PATCH] Added Format Flag to account for Sub-sections levels in the
 Sequential Numbering B2015-162 Bug was able to be fixed with data. 
 Attachment 7 and 8 in Shared AOP 79 were incorrectly set to print Number and
 Title.

---
 PROMS/Formats/fmtall/wst1all.xml              | Bin 93210 -> 93274 bytes
 .../VEPROMS.CSLA.Library/Extension/ItemExt.cs |  19 ++++++++++++++++++
 .../Format/PlantFormat.cs                     |   8 ++++++++
 PROMS/Volian.Print.Library/Pagination.cs      |   6 +++++-
 4 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/PROMS/Formats/fmtall/wst1all.xml b/PROMS/Formats/fmtall/wst1all.xml
index b1b9240864a33a656e50f4a8c6d5e81afe0d6e93..171e75b0b4cec3cf603558f403c44a5334e60fd4 100644
GIT binary patch
delta 66
zcmbPrgZ0)8)(uKFlLPEov`ZQC7)ls|8A=(FfMhB|GLV<akPj3sW^e=2MGQVb(J~;;
OX%@8EE@;EZX#fCqZ4iV2

delta 18
acmcb0gLT#o)(uKF%}F-flWZ7&=mP*z$Oqd1

diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
index 78aaae9b..36e7d791 100644
--- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
@@ -3336,6 +3336,9 @@ namespace VEPROMS.CSLA.Library
 					localPrintLevel = PrintLevel + ((ActiveFormat.PlantFormat.FormatData.Express && IsSequential) ? 0 : CurrentSectionLevel());
 				if (!ActiveFormat.PlantFormat.FormatData.Express) doMeta = true;
 			}
+			if(sd.StepSectionLayoutData.TieTabToLevel && ActiveFormat.PlantFormat.FormatData.SectData.CountSubSectionsForLevel)
+				if (SectionLevel() > 1)
+					localPrintLevel += 1;
 			SeqTabFmtList seqtabs = ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.SeqTabFmtList;
 			// Start with basic cases of alpha/numeric/seq:
 			// If we have metasections AND...
@@ -3626,6 +3629,17 @@ namespace VEPROMS.CSLA.Library
 			_MyTab.Text = tbformat;
 			_MyTab.CleanText = cltext != null ? cltext : tbformat;
 		}
+		private int SectionLevel()
+		{
+			int level = 0;
+			ItemInfo ii = this;
+			while (!ii.IsProcedure)
+			{
+				if (ii.IsSection) level++;
+				ii = ii.ActiveParent as ItemInfo;
+			}
+			return level;
+		}
 		private bool InCaution()
 		{
 			// walk up until procedure level and if finding a caution type, return true, otherwise false.
@@ -6353,6 +6367,11 @@ namespace VEPROMS.CSLA.Library
 	[Serializable()]
 	public partial class StepInfo : ItemInfo
 	{
+		#region StepConfig
+		private StepConfig _StepConfig;
+		public StepConfig StepConfig
+		{ get { return (_StepConfig != null ? _StepConfig : _StepConfig = new StepConfig(this)); } }
+		#endregion
 		#region Tab
 		public override void SetupTags()
 		{
diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
index b5869528..f59d1c33 100644
--- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
@@ -1893,6 +1893,14 @@ namespace VEPROMS.CSLA.Library
 				return LazyLoad(ref _UseMetaSections, "@UseMetaSections");
 			}
 		}
+		private LazyLoad<bool> _CountSubSectionsForLevel;
+		public bool CountSubSectionsForLevel
+		{
+			get
+			{
+				return LazyLoad(ref _CountSubSectionsForLevel, "@CountSubSectionsForLevel");
+			}
+		}
 		private LazyLoad<bool> _PrintPhoneList;
 		public bool PrintPhoneList
 		{
diff --git a/PROMS/Volian.Print.Library/Pagination.cs b/PROMS/Volian.Print.Library/Pagination.cs
index 94c08290..b2fa4c76 100644
--- a/PROMS/Volian.Print.Library/Pagination.cs
+++ b/PROMS/Volian.Print.Library/Pagination.cs
@@ -437,9 +437,13 @@ namespace Volian.Print.Library
 			}
 			// TODO - yEndMsg - compressed size?
 
-			// ySize7LPI includes a blank line after the step which we don't want to include in the page break test.
+				// ySize7LPI includes a blank line after the step which we don't want to include in the page break test.
 			else if (!KeepStepsOnPage && MyItemInfo.ActiveFormat.MyStepSectionLayoutData.CompressSteps 
 				&& (mySize7LPI - SixLinesPerInch + yEndMsg - tableSpaceAvailable) < (yPageSizeNextPage * SixLinesPerInch / _SevenLinesPerInch))// RHM20150525 - Table Scrunch
+				// if this is the first step, then the step has to fit in the space that remains on the page
+				// otherwise it needs to fit on a blank page
+				// This was originally (10/12/2015) added for Farley Shared AOP 79 but was found to be unnecessary
+				//&& (mySize7LPI - SixLinesPerInch + yEndMsg - tableSpaceAvailable) < ((MyItemInfo.MyPrevious == null ? yWithinMargins : yPageSizeNextPage) * SixLinesPerInch / _SevenLinesPerInch))// RHM20150525 - Table Scrunch
 			{
 				//   ooooooooo ooooo        ooooooooo.   ooooo 
 				//  d"""""""8' `888'        `888   `Y88. `888'