From 4ae5fdf980db8256ae87c8bb559c4d0720a75917 Mon Sep 17 00:00:00 2001
From: Kathy <kruffing@volian.com>
Date: Tue, 14 Jun 2016 13:52:50 +0000
Subject: [PATCH] VC Summer Unit 2 & 3 Single column format

---
 PROMS/Formats/fmtall/vcb1all.xml              | Bin 0 -> 68670 bytes
 PROMS/Formats/genmacall/vcb1.svg              | Bin 0 -> 10162 bytes
 .../VEPROMS.CSLA.Library/Extension/ItemExt.cs |  19 +++++++++++++++---
 PROMS/VEPROMS.CSLA.Library/Format/ENums.cs    |   1 +
 .../Format/PlantFormat.cs                     |  16 +++++++++++++++
 PROMS/Volian.Print.Library/vlnParagraph.cs    |   5 ++++-
 6 files changed, 37 insertions(+), 4 deletions(-)
 create mode 100644 PROMS/Formats/fmtall/vcb1all.xml
 create mode 100644 PROMS/Formats/genmacall/vcb1.svg

diff --git a/PROMS/Formats/fmtall/vcb1all.xml b/PROMS/Formats/fmtall/vcb1all.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a83b11694cbf384fb0356337b3eac7792a00a1b9
GIT binary patch
literal 68670
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

literal 0
HcmV?d00001

diff --git a/PROMS/Formats/genmacall/vcb1.svg b/PROMS/Formats/genmacall/vcb1.svg
new file mode 100644
index 0000000000000000000000000000000000000000..90c11683bdc3d11454f4a1e2f95834520aa5e89a
GIT binary patch
literal 10162
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

literal 0
HcmV?d00001

diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
index f9299e27..85381384 100644
--- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
@@ -838,7 +838,10 @@ namespace VEPROMS.CSLA.Library
 			int profileDepth = ProfileTimer.Push(">>>> itemInfo.MyTab.CleanText.Trim");
 			string thisTab = itemInfo.MyTab.CleanText.Trim();
 			ProfileTimer.Pop(profileDepth);
-			if (thisTab != null && thisTab != "" && !char.IsLetterOrDigit(thisTab[0])) return pTab;
+			//The following will include '(x)' where 'x' is stepnumber for VC Summer Unit 2 & 3 (vcb) Note & Caution tabs
+			bool vcbHeaderCheck = itemInfo.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.StepSectionPrintData.CombinedTabIncludeParenTabs &&
+				thisTab != null && thisTab != "" && thisTab.Length > 1 && char.IsLetterOrDigit(thisTab[1]);
+			if (thisTab != null && thisTab != "" && !char.IsLetterOrDigit(thisTab[0]) && !vcbHeaderCheck) return pTab;
 			if (itemInfo.FormatStepData.NumberWithLevel) pTab = itemInfo.MyHLS.MyTab.CleanText.Trim();
 			// if the parent tab ends with a alphanumeric and this tab is alphanumeric, add a '.' to separate them 
 			bool ms = pTab != "" && char.IsLetterOrDigit(pTab.TrimEnd()[pTab.Length - 1]); // parent tab ends with alphanumeric
@@ -3490,11 +3493,15 @@ namespace VEPROMS.CSLA.Library
 			bool doMeta = false;
 			if (sd.StepSectionLayoutData.TieTabToLevel && ActiveFormat.PlantFormat.FormatData.SectData.UseMetaSections)
 			{
+				// the DSS_SameXOFfSubsections was added for VC Summer Unit 2 & 3 (vcb format) so that all subsections are indented
+				// the same amount and this is also used for determining level for sequential tabbing, i.e. what seqfmt item to use for
+				// sequential level.
+				bool scttablev = ((MyDocStyle.StructureStyle.Style & E_DocStructStyle.DSS_SameXOffSubsections) == E_DocStructStyle.DSS_SameXOffSubsections);
 				if (sd.StepSectionLayoutData.ShowSectionTitles
 				&& !MyDocStyle.CancelSectTitle
 				&& !(MyDocStyle.SpecialStepsFoldout && MyDocStyle.UseColSByLevel))
-					localPrintLevel = PrintLevel + ((ActiveFormat.PlantFormat.FormatData.Express && IsSequential) ? 0 : CurrentSectionLevel());
-				if (!ActiveFormat.PlantFormat.FormatData.Express) doMeta = true;
+					localPrintLevel = PrintLevel + (((ActiveFormat.PlantFormat.FormatData.Express && IsSequential) || scttablev) ? 0 : CurrentSectionLevel());
+				if (!ActiveFormat.PlantFormat.FormatData.Express && !scttablev) doMeta = true;
 			}
 			if (sd.StepSectionLayoutData.TieTabToLevel && ActiveFormat.PlantFormat.FormatData.SectData.CountSubSectionsForLevel)
 				if (SectionLevel() > 1)
@@ -4096,6 +4103,12 @@ namespace VEPROMS.CSLA.Library
 					}
 
 				}
+				// For VS Summer Unit 2 & 3 (vcb formats) include step number in Note & Caution header
+				if (FormatStepData.TabData.IncludeStepNum && MyHeader != null && MyParent != null && MyParent.CombinedTab != null)
+				{
+					MyHeader.Text = MyHeader.Text + ((MyParent == null) ? "" : " Step " + MyParent.CombinedTab.TrimEnd(".".ToCharArray()));
+					MyHeader.CleanText = MyHeader.CleanText + ((MyParent == null) ? "" : " Step " + MyParent.CombinedTab.TrimEnd(".".ToCharArray()));
+				}
 				return tbformat;
 			}
 
diff --git a/PROMS/VEPROMS.CSLA.Library/Format/ENums.cs b/PROMS/VEPROMS.CSLA.Library/Format/ENums.cs
index 8bbae5c5..1d82d2db 100644
--- a/PROMS/VEPROMS.CSLA.Library/Format/ENums.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Format/ENums.cs
@@ -171,6 +171,7 @@ namespace VEPROMS.CSLA.Library
 		DSS_PageListAddSectCont = 0x400000000,   // for this section, add the top continue message when doing the ATTACHTITLECONT pagelist token (Calvert/Landscape word docs)
 		DSS_WordContentLandscaped = 0x800000000,	// for this section, the word content is landscaped.
 		DSS_ChklstEditSize = 0x100000000,	// Westinghouse checklist - edit window size 
+		DSS_SameXOffSubsections = 0x2000000000,	// print subsections at same offset as section & preceeding subsections,start HLS xoff at section text (not number)
 	};
 	public enum E_DocStyleUse : uint
 	{
diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
index 6074664a..e9b098cd 100644
--- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
@@ -3608,6 +3608,14 @@ namespace VEPROMS.CSLA.Library
 				return LazyLoad(ref _LimitWidToPageWid, "@LimitWidToPageWid");
 			}
 		}
+		private LazyLoad<bool> _CombinedTabIncludeParenTabs;
+		public bool CombinedTabIncludeParenTabs
+		{
+			get
+			{
+				return LazyLoad(ref _CombinedTabIncludeParenTabs, "@CombinedTabIncludeParenTabs");
+			}
+		}
 		private VE_Font _ModifiedTextStyle;
 		public VE_Font ModifiedTextStyle
 		{
@@ -5220,6 +5228,14 @@ namespace VEPROMS.CSLA.Library
 				return LazyLoad(ref _NoTabAlign, "TabData/@NoTabAlign");
 			}
 		}
+		private LazyLoad<bool> _IncludeStepNum;
+		public bool IncludeStepNum
+		{
+			get
+			{
+				return LazyLoad(ref _IncludeStepNum, "TabData/@IncludeStepNum");
+			}
+		}
 		private LazyLoad<string> _Justify;
 		public string Justify
 		{
diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs
index bc49b591..49fcefe2 100644
--- a/PROMS/Volian.Print.Library/vlnParagraph.cs
+++ b/PROMS/Volian.Print.Library/vlnParagraph.cs
@@ -2967,6 +2967,8 @@ namespace Volian.Print.Library
 									offset += xMetaAdj;
 									itemInfo.MyTab.Text = itemInfo.MyTab.Text.TrimEnd(" ".ToCharArray());
 									itemInfo.MyTab.CleanText = itemInfo.MyTab.CleanText.TrimEnd(" ".ToCharArray());
+									if (((itemInfo.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DSS_SameXOffSubsections) == E_DocStructStyle.DSS_SameXOffSubsections)) 
+										offset += (float)formatInfo.PlantFormat.FormatData.SectData.SectionNumber.Pos;
 								}
 							}
 						}
@@ -4933,7 +4935,8 @@ namespace Volian.Print.Library
 			}
 			if (itemInfo.IsHigh)
 			{
-				if (formatInfo.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm)
+				if (formatInfo.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm || 
+					((itemInfo.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DSS_SameXOffSubsections) == E_DocStructStyle.DSS_SameXOffSubsections)) 
 				{
 					// the HLS in the template prints the tab/step on the right edge of page. Don't
 					// do the other calculations to relocate it.