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

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

Browse Source 
Reviewed-on: #273
This commit is contained in:
Paul Larsen 2024-03-19 16:23:41 -04:00
commit a5a0d389e2
6 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

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

Binary file not shown.

1
PROMS/VEPROMS User Interface/VEPROMS.gclicx Normal file
View File

@ -0,0 +1 @@
da3d5d14-691f-4908-aa3c-fd3239734232;-8584908724854775808;VkVQUk9NUy5leGU=;ZGEzZDVkMTQtNjkxZi00OTA4LWFhM2MtZmQzMjM5NzM0MjMy,MjQyNzYxODZYWFhYWFhYWDAzNg,Sk9ITi1XSU4xMA,RmFsc2U,ODg0Mw,RmFsc2U,MA,MA,djIwMjQuMQ,,;PxeAWRi6mhDqvUMfJhk9Tniu/8ZnOLQv64hLh05xWM+MPyBs3yYfs3vEn5TLW779QNr1k8F6tV3gOAoLG+JSPZoG3NXmdTe6LJya05W+zWyb0H+jj2ReXN2dNR9fbZNDd3ClAeuzNpsM0pw62aYpOe2Tp6fx9gOFx1/0g8g4/8g

2
PROMS/VEPROMS User Interface/VEPROMS_UI.csproj
View File

@ -140,6 +140,7 @@
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="UIAutomationProvider" />
<Reference Include="VEPROMS.CSLA.Library, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\VEPROMS.CSLA.Library\bin\Debug\VEPROMS.CSLA.Library.dll</HintPath>
@ -428,6 +429,7 @@
<Compile Include="VlnWeb.Designer.cs">
<DependentUpon>VlnWeb.cs</DependentUpon>
</Compile>
<EmbeddedResource Include="VEPROMS.gclicx" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\Separator.png" />

10
PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
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);

8
PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
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