diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index 21595bd2..13d6d224 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -4057,7 +4057,7 @@ namespace VEPROMS.CSLA.Library if (eds != null && eds.Count == 1 && eds[0].Type == 0) { ItemInfo srcItem = ItemInfo.Get(eds[0].ItemID); - if (srcItem != null) // B2018-097 handle a null reference + if (srcItem != null && ((srcItem.ActiveParent as ItemInfo) != null) && ((srcItem.ActiveParent) as ItemInfo).IsStep) // B2018-097 handle a null reference return ((srcItem.ActiveParent as ItemInfo).FormatStepData.TabData.IdentEdit.Contains("{Section Prefix}") && FormatStepData.TabData.IdentEdit.Contains("{Section Prefix}")); } return false; @@ -4878,6 +4878,8 @@ namespace VEPROMS.CSLA.Library level++; if (MyDocStyle != null && (MyDocStyle.StructureStyle.Style & E_DocStructStyle.DSS_SkipTwoStepLevels) == E_DocStructStyle.DSS_SkipTwoStepLevels && level == 0) level += 2; + // B2022-129: don't indent HLS when flag is on (Barakah - single column step attachment with meta sect) + if (MyDocStyle != null && (MyDocStyle.AdjSectTitleLoc)) level--; if (level < 0) level = 0; ProfileTimer.Pop(profileDepth); return level; diff --git a/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs b/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs index f1229b63..3e6bb315 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs @@ -385,6 +385,18 @@ namespace VEPROMS.CSLA.Library } } #endregion + #region AdjSectTitleLoc + [Category("Miscellaneous")] + [Description("Adjust Section Title Location")] + private LazyLoad _AdjSectTitleLoc; + public bool AdjSectTitleLoc // B2022-129: don't indent HLS when flag is on (Barakah - single column step attachment with meta sect) + { + get + { + return LazyLoad(ref _AdjSectTitleLoc, "@AdjSectTitleLoc"); + } + } + #endregion #region ShowAlarmPointWindowInfo [Category("Miscellaneous")] [Description("Show Alarm Point Table Info in Step Editor")] diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index c7a8b452..fc54c3db 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -5158,9 +5158,11 @@ namespace Volian.Print.Library // otherwise, use pagelist logic. bool usePageListCOHdr = false; - if (itemInfo.IsStep) + // B2022-129: Barakah - Adjust the INITIAL header location, i.e. make it a pagelist item + if (itemInfo.IsStep || itemInfo.MyDocStyle.AdjSectTitleLoc) + { usePageListCOHdr = true; - + } // This checks to see if the section is starting at the top of the page. // If it is, then we want to use PageList to print the checkoff/sighoff header // else the checkoff/signoff header will be printed across from the section title where ever it is on the page (i.e. section pagination set to continuous) @@ -6193,8 +6195,17 @@ namespace Volian.Print.Library if (myTab != null) { myTab.Rtf = myTab.Rtf.Replace(myTab.Text, myTab.Text.TrimStart(" ".ToCharArray())); - myTab.XOffset = MyParent.XOffset; - XOffset = myTab.XOffset + MyTab.Width; + // B2022-129: don't indent HLS when flag is on (Barakah - single column step attachment with meta sect) + if (itemInfo.MyDocStyle.AdjSectTitleLoc) + { + myTab.XOffset = MyParent.MyTab.XOffset; + XOffset = MyParent.XOffset; + } + else + { + myTab.XOffset = MyParent.XOffset; + XOffset = myTab.XOffset + MyTab.Width; + } } else XOffset = MyParent.XOffset; // unnumbered hls