From 8899967a8e6f62ffca9159a52459db5e2869a774 Mon Sep 17 00:00:00 2001
From: Kathy <kruffing@volian.com>
Date: Thu, 15 Jul 2021 13:07:48 +0000
Subject: [PATCH] =?UTF-8?q?F2019-069:=20Hold=20Point=20designator=20for=20?=
 =?UTF-8?q?Barakah=20(add=20Step=E2=80=99s=20DefaultText=20attribute)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PROMS/Formats/fmtall/BNPP1all.xml             | Bin 192284 -> 192350 bytes
 .../Extension/DisplayText.cs                  |   7 +++++++
 .../Format/PlantFormat.cs                     |  18 ++++++++++++++++++
 PROMS/Volian.Controls.Library/RTBItem.cs      |   6 +++++-
 PROMS/Volian.Print.Library/vlnParagraph.cs    |   9 +++++++++
 5 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/PROMS/Formats/fmtall/BNPP1all.xml b/PROMS/Formats/fmtall/BNPP1all.xml
index eb48226bf1f78d8581faff0599131b867db6c62a..7ed93a84b7849377d76809205000fc539bb18e99 100644
GIT binary patch
delta 157
zcmbPpkNe&|?uIRlL06;|7+e@q8PXUM8A=&)7)lsIfV>JIZOfoEJ^Cu6q^vVTK2Rc*
zp%^F;08~~4r1QWE6B&}GJDy__<xFHq1`2vI<W1&hlb!Cck5Oj2f(Mhx<aO*q)4%Lw
zG-Fm`P?)~)D5ET+?)3M!8N;XDU^Lhsbd`~XaXQy$MyJUR4jk=V*BQ5SU1t)K001g(
BEOr0@

delta 55
zcmV-70LcH|-V2=G3xKo%Qq-4b-T|za@WKHkmyiVlFt`5I0R#b;)~*2#mcap@lR!WS
NhfLQ2w@lXp5*W`?7kB^w

diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs b/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs
index 659bc75b..db575955 100644
--- a/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs
@@ -111,6 +111,7 @@ namespace VEPROMS.CSLA.Library
 		private bool PrintingSmartTemplate = false;
 		public string StartText;
 		public string OriginalText;		// compare for save to see if change for links.
+		public bool AddedDefaultTextFromFmt = false;
 		private FormatInfo _MyFormat;
 		#endregion
 		#region Constructors
@@ -218,6 +219,12 @@ namespace VEPROMS.CSLA.Library
 				text = text.Replace(@"\u9586?", @"\\");
 			}
 			_MyStaticItemInfo = _MyItemInfo;
+			// F2019-069:  Add format variable to allow format to specify Default Text for a step.  Implemented for Barakah's 'Hold Point'
+			if (_MyItemInfo.MyContent.Text == "" && _MyItemInfo.FormatStepData.DefaultText != null && _MyItemInfo.FormatStepData.DefaultText != "")
+			{
+				text= _MyItemInfo.FormatStepData.DefaultText;
+				AddedDefaultTextFromFmt = true;
+			}
 			text = CreateRtf(colorLinks, text, tableShouldBeOutlined, wordsShouldBeReplaced, numbersShouldBeFormated, tableHasBorder, ROsShouldBeAdjusted, underlineAfterDashSpace, epMode);
 			_MyStaticItemInfo = null;
 			StartText = text;
diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
index 81629204..a28b968f 100644
--- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
@@ -4821,6 +4821,15 @@ namespace VEPROMS.CSLA.Library
 				return LazyLoad(ref _AppendDotZero, "@AppendDotZero");
 			}
 		}
+		// F2019-069: Barakah Hold Point - set xoffset to parent's tab
+		private LazyLoad<bool> _ColUseParentTab;
+		public bool ColUseParentTab
+		{
+			get
+			{
+				return LazyLoad(ref _ColUseParentTab, "@ColUseParentTab");
+			}
+		}
 		private LazyLoad<float?> _ColOverride;
 		public float? ColOverride
 		{
@@ -4889,6 +4898,15 @@ namespace VEPROMS.CSLA.Library
 				return LazyLoad(ref _Suffix, "@Suffix");
 			} 
 		}
+		// F2019-069: Barakah Hold Point - allow for default text (for Barakah it is 'Hold Point')
+		private LazyLoad<string> _DefaultText;
+		public string DefaultText
+		{
+			get
+			{
+				return LazyLoad(ref _DefaultText, "@DefaultText");
+			}
+		}
 		private LazyLoad<string> _UnderlineTheseChar;
 		public string UnderlineTheseChar
 		{ 
diff --git a/PROMS/Volian.Controls.Library/RTBItem.cs b/PROMS/Volian.Controls.Library/RTBItem.cs
index 0e95860d..18fecee9 100644
--- a/PROMS/Volian.Controls.Library/RTBItem.cs
+++ b/PROMS/Volian.Controls.Library/RTBItem.cs
@@ -777,7 +777,11 @@ namespace Volian.Controls.Library
 			if (MyStepRTB.ReadOnly) return;
 			if (!MyStepRTB.ActiveMode) return;
 			if (MyStepRTB.IsExperimenting) return;
-			if (MyStepRTB.MyItemInfo.MyContent.Number != null && !MyStepRTB.IsDirty && MyStepRTB.Text.Contains("(Resolved Transition Text)") == false) return;
+
+			// F2019 - 069: Hold Point designator for Barakah, allow for using Default Text from format
+  			if (MyStepRTB.MyItemInfo.MyContent.Number != null && (!MyStepRTB.IsDirty && !MyStepRTB.OrigDisplayText.AddedDefaultTextFromFmt) && MyStepRTB.Text.Contains("(Resolved Transition Text)") == false) return;
+			MyStepRTB.OrigDisplayText.AddedDefaultTextFromFmt = false;
+
 			bool hasChangeBar = MyStepRTB.MyItemInfo.HasChangeBar; 
 			bool success = MyStepRTB.OrigDisplayText.Save((RichTextBox)MyStepRTB);
 			if (success)
diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs
index 451fd820..22c8a711 100644
--- a/PROMS/Volian.Print.Library/vlnParagraph.cs
+++ b/PROMS/Volian.Print.Library/vlnParagraph.cs
@@ -5805,6 +5805,15 @@ namespace Volian.Print.Library
 				Width = (float)itemInfo.MyDocStyle.Layout.PageWidth - XOffset - (sitabloc / 2);
 				return;
 			}
+			// F2019-069: Hold Point designator for Barakah, use parent's tab for xoffset
+			if (itemInfo.IsStep && itemInfo.FormatStepData.ColUseParentTab && (myTab == null || myTab.Text == ""))
+			{
+				if (MyParent != null)
+				{
+					XOffset = (MyParent.MyTab == null || MyParent.MyTab.Text == null || MyParent.MyTab.Text.Trim() == "") ? MyParent.XOffset : MyParent.MyTab.XOffset;
+					return;
+				}
+			}
 			float tabWidth = (myTab == null) ? 0 : myTab.Width;
 			if (itemInfo.IsStepSection)
 			{