diff --git a/PROMS/Formats/fmtall/VEGP1all.xml b/PROMS/Formats/fmtall/VEGP1all.xml index 2c0dddcf..d28cf81a 100644 Binary files a/PROMS/Formats/fmtall/VEGP1all.xml and b/PROMS/Formats/fmtall/VEGP1all.xml differ diff --git a/PROMS/Formats/fmtall/VEGP2all.xml b/PROMS/Formats/fmtall/VEGP2all.xml index 838b30e2..cfe8ce09 100644 Binary files a/PROMS/Formats/fmtall/VEGP2all.xml and b/PROMS/Formats/fmtall/VEGP2all.xml differ diff --git a/PROMS/VEPROMS User Interface/VEPROMS.gclicx b/PROMS/VEPROMS User Interface/VEPROMS.gclicx new file mode 100644 index 00000000..4d76eff6 --- /dev/null +++ b/PROMS/VEPROMS User Interface/VEPROMS.gclicx @@ -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 diff --git a/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj b/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj index d511f0be..942dcf26 100644 --- a/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj +++ b/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj @@ -139,6 +139,7 @@ + False ..\VEPROMS.CSLA.Library\bin\Debug\VEPROMS.CSLA.Library.dll @@ -427,6 +428,7 @@ VlnWeb.cs + diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index 4d0c494a..0252740d 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -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); diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs index 21a13240..d7a16080 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs @@ -4508,6 +4508,14 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _AllowNoteCautionAdd, "@AllowNoteCautionAdd"); } } + private LazyLoad _ResetSeqNumberingAfterUnnumberedHLS; + public bool ResetSeqNumberingAfterUnnumberedHLS + { + get + { + return LazyLoad(ref _ResetSeqNumberingAfterUnnumberedHLS, "@ResetSeqNumberingAfterUnnumberedHLS"); + } + } } #endregion #region TopOfPage