Merge pull request 'Development' (#275 ) from Development into master

Merging F2024-037 and CSLA updates into master after successful testing.
Merge pull request 'Fixing CSLA references' (#274 ) from GeneralDebugging into Development
2024-03-20 16:07:27 -04:00 · 2024-03-20 14:12:13 -04:00 · 2024-03-20 14:11:56 -04:00 · 2024-03-19 16:23:41 -04:00 · 2024-03-19 15:30:57 -04:00 · 2024-03-19 12:01:54 -04:00
13 changed files with 90 additions and 10 deletions
--- a/PROMS/Formats/fmtall/VEGP1all.xml
+++ b/PROMS/Formats/fmtall/VEGP1all.xml
--- a/PROMS/Formats/fmtall/VEGP2all.xml
+++ b/PROMS/Formats/fmtall/VEGP2all.xml
--- a/Interface/VEPROMS.gclicx
+++ b/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
--- a/Interface/VEPROMS_UI.csproj
+++ b/Interface/VEPROMS_UI.csproj
@ -139,6 +139,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>
@ -427,6 +428,7 @@
    <Compile Include="VlnWeb.Designer.cs">
      <DependentUpon>VlnWeb.cs</DependentUpon>
    </Compile>
+    <EmbeddedResource Include="VEPROMS.gclicx" />
  </ItemGroup>
  <ItemGroup>
    <None Include="Resources\Separator.png" />
--- 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);
--- 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<bool> _ResetSeqNumberingAfterUnnumberedHLS;
+		public bool ResetSeqNumberingAfterUnnumberedHLS
+		{
+			get
+			{
+				return LazyLoad(ref _ResetSeqNumberingAfterUnnumberedHLS, "@ResetSeqNumberingAfterUnnumberedHLS");
+			}
+		}
 	}
 	#endregion
 	#region TopOfPage
--- a/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj
+++ b/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj
@ -83,8 +83,7 @@
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="Csla, Version=2.1.4.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="Csla">
      <HintPath>..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll</HintPath>
    </Reference>
    <Reference Include="DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL">
--- a/PROMS/VEPROMS.CSLA.Library/app.config
+++ b/PROMS/VEPROMS.CSLA.Library/app.config
@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.Serialization.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.DependencyInjection" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
--- a/PROMS/VEPROMS.CSLA.Library/packages.config
+++ b/PROMS/VEPROMS.CSLA.Library/packages.config
@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.Bcl.AsyncInterfaces" version="5.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.Configuration" version="5.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.Configuration.Abstractions" version="5.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.Configuration.Binder" version="5.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.DependencyInjection" version="5.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="5.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.Primitives" version="5.0.0" targetFramework="net462" />
+  <package id="System.Buffers" version="4.5.1" targetFramework="net462" />
+  <package id="System.ComponentModel" version="4.3.0" targetFramework="net462" />
+  <package id="System.ComponentModel.Annotations" version="4.7.0" targetFramework="net462" />
+  <package id="System.ComponentModel.Primitives" version="4.3.0" targetFramework="net462" />
+  <package id="System.Data.Common" version="4.3.0" targetFramework="net462" />
+  <package id="System.Memory" version="4.5.4" targetFramework="net462" />
+  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net462" />
+  <package id="System.Reflection" version="4.3.0" targetFramework="net462" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="5.0.0" targetFramework="net462" />
+  <package id="System.Runtime.Serialization.Formatters" version="4.3.0" targetFramework="net462" />
+  <package id="System.Runtime.Serialization.Primitives" version="4.3.0" targetFramework="net462" />
+  <package id="System.Runtime.Serialization.Xml" version="4.3.0" targetFramework="net462" />
+  <package id="System.Security.Principal" version="4.3.0" targetFramework="net462" />
+  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net462" />
+  <package id="System.Threading.ThreadPool" version="4.3.0" targetFramework="net462" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
+</packages>
--- a/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj
+++ b/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj
@ -93,8 +93,7 @@
    <Reference Include="C1.Win.C1SpellChecker.2, Version=2.0.20162.188, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
    </Reference>
-    <Reference Include="Csla, Version=2.1.4.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="Csla">
      <HintPath>..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll</HintPath>
    </Reference>
    <Reference Include="DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL">
--- a/PROMS/Volian.Print.Library/Volian.Print.Library.csproj
+++ b/PROMS/Volian.Print.Library/Volian.Print.Library.csproj
@ -68,8 +68,7 @@
    <Reference Include="C1.Win.C1FlexGrid.2, Version=2.0.20162.188, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
    </Reference>
-    <Reference Include="Csla, Version=2.1.4.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="Csla">
      <HintPath>..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll</HintPath>
    </Reference>
    <Reference Include="FlexableMessageBox">
--- a/PROMS/Volian.Print.Library/app.config
+++ b/PROMS/Volian.Print.Library/app.config
@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.Serialization.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
--- 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;
Author	SHA1	Message	Date
Devin Jankowski	ba69bb0772	Merge pull request 'Development' (#275 ) from Development into master Merging F2024-037 and CSLA updates into master after successful testing.	2024-03-20 16:07:27 -04:00
John Jenko	3c632d4abc	Merge pull request 'Fixing CSLA references' (#274 ) from GeneralDebugging into Development fixing build errors	2024-03-20 14:12:13 -04:00
John Jenko	ccb2bab805	Fixing CSLA references	2024-03-20 14:11:56 -04:00
Paul Larsen	a5a0d389e2	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	2024-03-19 16:23:41 -04:00
John Jenko	97dbfad875	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 and Symptoms Step Editor	2024-03-19 15:30:57 -04:00
Chris Glavan	51ef1d127d	Merge pull request 'CSLA_version_upgrade' (#272 ) from CSLA_version_upgrade into Development Merging into Development. NOTE Developers will need to update their 3rd Party Library repository to ensure that they have the latest CSLA version. Review the Git documentation in Confluence for instructions on cloning the repository.	2024-03-19 12:01:54 -04:00
Chris Glavan	31301c4717	~Added CSLA v3.8.4 library	2024-03-19 11:21:21 -04:00
Chris Glavan	b01a9edc1e	~Upgraded CSLA library to v3.0.5	2024-03-18 11:42:04 -04:00
				`@ -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`