diff --git a/PROMS/Formats/fmtall/BNPP1all.xml b/PROMS/Formats/fmtall/BNPP1all.xml index eb48226b..7ed93a84 100644 Binary files a/PROMS/Formats/fmtall/BNPP1all.xml and b/PROMS/Formats/fmtall/BNPP1all.xml differ 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 _ColUseParentTab; + public bool ColUseParentTab + { + get + { + return LazyLoad(ref _ColUseParentTab, "@ColUseParentTab"); + } + } private LazyLoad _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 _DefaultText; + public string DefaultText + { + get + { + return LazyLoad(ref _DefaultText, "@DefaultText"); + } + } private LazyLoad _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) {