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

Merge pull request 'F2024-049 F2024-050 Generic EOP Format updates' (#289) from F2024-049_050_ERGFormat into Development

Browse Source 
Reviewed-on: #289
This commit is contained in:
Paul Larsen
2024-04-04 16:12:00 -04:00
parent 6e37911462 776d9891d9
commit ce8497e61f
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
PROMS/Formats/fmtall/GENall.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/VEGP2all.xml
View File

Binary file not shown.

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

@@ -4452,9 +4452,10 @@ namespace VEPROMS.CSLA.Library
}
}
// 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)
// F2024-049 changed to specify the level via the format file (Generic EOP and Vogtle 3&4)
else if (sd.StepSectionLayoutData.ResetSeqNumberingAfterUnnumberedHLS != null && 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
localPrintLevel = (int)sd.StepSectionLayoutData.ResetSeqNumberingAfterUnnumberedHLS;
itmp = (localPrintLevel + PrintBias + OffsetTab) % seqtabs.MaxIndex;
}
if (!tbformat.Contains(@"{!C"))

5
PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
View File

@@ -4508,8 +4508,9 @@ namespace VEPROMS.CSLA.Library
return LazyLoad(ref _AllowNoteCautionAdd, "@AllowNoteCautionAdd");
}
}
private LazyLoad<bool> _ResetSeqNumberingAfterUnnumberedHLS;
public bool ResetSeqNumberingAfterUnnumberedHLS
// F2024-049 changed to specify the sub-step level via the format file (Generic EOP and Vogtle 3&4)
private LazyLoad<int?> _ResetSeqNumberingAfterUnnumberedHLS;
public int? ResetSeqNumberingAfterUnnumberedHLS
{
get
{