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
diff --git a/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj b/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj
index 14ae24e0..67c8b212 100644
--- a/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj
+++ b/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj
@@ -83,8 +83,7 @@
false
-
- False
+
..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll
diff --git a/PROMS/VEPROMS.CSLA.Library/app.config b/PROMS/VEPROMS.CSLA.Library/app.config
new file mode 100644
index 00000000..4b2e0f1f
--- /dev/null
+++ b/PROMS/VEPROMS.CSLA.Library/app.config
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/PROMS/VEPROMS.CSLA.Library/packages.config b/PROMS/VEPROMS.CSLA.Library/packages.config
new file mode 100644
index 00000000..345cd9c8
--- /dev/null
+++ b/PROMS/VEPROMS.CSLA.Library/packages.config
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj b/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj
index 9c76fbf7..25057d33 100644
--- a/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj
+++ b/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj
@@ -93,8 +93,7 @@
False
-
- False
+
..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll
diff --git a/PROMS/Volian.Print.Library/Volian.Print.Library.csproj b/PROMS/Volian.Print.Library/Volian.Print.Library.csproj
index 12ed5491..aa5ed78d 100644
--- a/PROMS/Volian.Print.Library/Volian.Print.Library.csproj
+++ b/PROMS/Volian.Print.Library/Volian.Print.Library.csproj
@@ -68,8 +68,7 @@
False
-
- False
+
..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll
diff --git a/PROMS/Volian.Print.Library/app.config b/PROMS/Volian.Print.Library/app.config
new file mode 100644
index 00000000..7be68eba
--- /dev/null
+++ b/PROMS/Volian.Print.Library/app.config
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs
index f00363f0..d056d8e7 100644
--- a/PROMS/Volian.Print.Library/vlnParagraph.cs
+++ b/PROMS/Volian.Print.Library/vlnParagraph.cs
@@ -1407,7 +1407,8 @@ namespace Volian.Print.Library
}
}
}
- StepConfig sc = new StepConfig(MyItemInfo as StepInfo);
+ StepInfo si = (StepInfo)MyItemInfo;
+ StepConfig sc = new StepConfig(si.MyContent.Config);
if (sc != null && sc.Step_ImageWidth != 0)
{
Width = sc.Step_ImageWidth;
@@ -4184,7 +4185,8 @@ namespace Volian.Print.Library
{
Width *= (h2 / h1);
}
- StepConfig sc = new StepConfig(MyItemInfo as StepInfo);
+ StepInfo si = (StepInfo)MyItemInfo;
+ StepConfig sc = new StepConfig(si.MyContent.Config);
if (sc != null && sc.Step_ImageWidth != 0)
{
Width = sc.Step_ImageWidth;