Merge pull request 'F2024-037 Adjustments made for single column sections of the Vogtle Units 3 & 4, including length of un-numbered HLS, resetting the sub-step numbering when staring under an un-numbered HLS, removed “Two Column” from the section type name Purpose an…' (#273) from Vogtle3&4 into Development

Reviewed-on: #273
This commit is contained in:
2024-03-19 16:23:41 -04:00
6 changed files with 19 additions and 2 deletions

View File

@@ -4440,7 +4440,7 @@ namespace VEPROMS.CSLA.Library
// F2018-025 Westinghouse when a high level step is used as a section number/title,
// adjust the step/substep numbering where the first level substep uses the high level step tabbing format
// and the following sub-substeps tabbing format are "shifted" accordingly (ex should look like ASS-101 Attachment 1 section 4 tabbing)
if (!IsHigh && MyHLS != null && MyHLS.FormatStepData.AppendDotZero)
if (!IsHigh && MyHLS != null && MyHLS.FormatStepData.AppendDotZero)
{
if (localPrintLevel > 1)
{
@@ -4448,7 +4448,13 @@ namespace VEPROMS.CSLA.Library
itmp = (localPrintLevel + PrintBias + OffsetTab) % seqtabs.MaxIndex;
}
}
if (!tbformat.Contains(@"{!C"))
// F2024-037 reset the seq sub-step numbering if the parent is an un-numbered high level step
else if (sd.StepSectionLayoutData.ResetSeqNumberingAfterUnnumberedHLS && IsSequential && MyParent != null && MyParent.IsHigh && MyParent.MyTab.Text.Length == 0)
{
localPrintLevel--; // since parent is a high level step we only need to go back one level
itmp = (localPrintLevel + PrintBias + OffsetTab) % seqtabs.MaxIndex;
}
if (!tbformat.Contains(@"{!C"))
tbformat = seqtabs[itmp].PrintTabFormat; // seqtab in 16bit, i.e. '. or )' etc.
else
tbformat = tbformat.Replace("{seq}", seqtabs[itmp].PrintTabFormat);

View File

@@ -4508,6 +4508,14 @@ namespace VEPROMS.CSLA.Library
return LazyLoad(ref _AllowNoteCautionAdd, "@AllowNoteCautionAdd");
}
}
private LazyLoad<bool> _ResetSeqNumberingAfterUnnumberedHLS;
public bool ResetSeqNumberingAfterUnnumberedHLS
{
get
{
return LazyLoad(ref _ResetSeqNumberingAfterUnnumberedHLS, "@ResetSeqNumberingAfterUnnumberedHLS");
}
}
}
#endregion
#region TopOfPage