Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

B2022-129: Barakah - New section type for meta section support, tabbing (location & numbering) & INITIAL header location

Browse Source
This commit is contained in:
Kathy Ruffing 2022-10-18 15:38:17 +00:00
parent 29348661fb
commit 146b7dd053
3 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
View File

@ -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;

12
PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs
View File

@ -385,6 +385,18 @@ namespace VEPROMS.CSLA.Library
}
}
#endregion
#region AdjSectTitleLoc
[Category("Miscellaneous")]
[Description("Adjust Section Title Location")]
private LazyLoad<bool> _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")]

19
PROMS/Volian.Print.Library/vlnParagraph.cs
View File

@ -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