PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs

@@ -44,12 +44,8 @@ using System.Runtime.InteropServices;
 //      Revision DHH (day - no leading zero, two digit hour - military time
 //
 // ********* REMEMBER TO CHECK THE AssemblyConfiguration SETTING (ABOVE) ********
-[assembly: AssemblyVersion("2.1.2403.413")]
+[assembly: AssemblyVersion("2.1.2402.2213")]
-[assembly: AssemblyFileVersion("2.1.2403.413")]
+[assembly: AssemblyFileVersion("2.1.2402.2213")]
-
-
-
-
 
 
 

PROMS/VEPROMS User Interface/VEPROMS.gclicx

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

PROMS/VEPROMS User Interface/VEPROMS_UI.csproj

@@ -139,7 +139,6 @@
     <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,7 +427,6 @@
     <Compile Include="VlnWeb.Designer.cs">
       <DependentUpon>VlnWeb.cs</DependentUpon>
     </Compile>
-    <EmbeddedResource Include="VEPROMS.gclicx" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Resources\Separator.png" />

PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs

@@ -2932,19 +2932,7 @@ namespace VEPROMS.CSLA.Library
 				string str = MyContent.Text;
 				// B2022-035: resolve unit specific designators 
 				if (str.ToUpper().Contains(@"<U")) str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(this.MyDocVersion, str);
-				return ConvertToDisplayText(str, false, " "); // B2024-013 added " " to replace hard returns with a space instead of semi-colon
+				return ConvertToDisplayText(str, false);
-			}
-		}
-		// B2024-013 added for Vogtle Units 3 & 4, used with {TOPSECTIONTITLE} pagelist item
-		//           this will format the text and keep the hard return command
-		public string FormattedDisplayTextKeepHardReturn
-		{
-			get
-			{
-				string str = MyContent.Text;
-				// B2022-035: resolve unit specific designators 
-				if (str.ToUpper().Contains(@"<U")) str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(this.MyDocVersion, str);
-				return ConvertToDisplayText(str, false, ""); // pass in empty string for hard retun char will keep hard return
 			}
 		}
 		// Used in Comanche Peak EOP and Flex formats for step designators. Will allow a hard return to be used that that caution type.
@@ -3121,12 +3109,7 @@ namespace VEPROMS.CSLA.Library
 			return ConvertToDisplayText(txt, true);
 		}
 
-		// B2024-013  This allos us to control "what with" or "whether to" replace hard returns
+		public static string ConvertToDisplayText(string txt, bool stripRTF)
-		//            Semi-colons where printing on auto table of contents for section titles with hard returns
-		//            added HardReturnChar string to parameter. The default is to use the semi-colon, for auto table of contents 
-		//            we replace it with a space, for Vogtle Unit 3 & 4 we retain the hard return when printing the section
-
-		public static string ConvertToDisplayText(string txt, bool stripRTF, string HardReturnChar = ";")
 		{
 			string retval = txt;
 
@@ -3137,12 +3120,9 @@ namespace VEPROMS.CSLA.Library
 				retval = ReplaceSpecialCharacters(retval);
 				retval = retval.Replace("\u2011", "-");
 				retval = retval.Replace("\u2572", @"\"); // replace backslash symbol with a backslash
-				if (HardReturnChar != "") // B2024-013 if a null string don't replace the hard return
+				retval = Regex.Replace(retval, @"\\line ?", ";"); // better handing of hard returns - replace with semi-colon for use on tree view
-				{
+				retval = retval.Replace("\r\n", ";");
-					retval = Regex.Replace(retval, @"\\line ?", HardReturnChar); // better handing of hard returns - replace with semi-colon for use on tree view
+				retval = retval.Replace("\n", ";"); //added for consistency checking with approved version
-					retval = retval.Replace("\r\n", HardReturnChar);
-					retval = retval.Replace("\n", HardReturnChar); //added for consistency checking with approved version
-				}
 			}
 
 			return retval;
@@ -4440,7 +4420,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,13 +4428,7 @@ namespace VEPROMS.CSLA.Library
 						itmp = (localPrintLevel + PrintBias + OffsetTab) % seqtabs.MaxIndex;
 					}
 				}
-				// F2024-037 reset the seq sub-step numbering if the parent is an un-numbered high level step
+					if (!tbformat.Contains(@"{!C"))
-				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);
@@ -4562,7 +4536,6 @@ namespace VEPROMS.CSLA.Library
 			}
 			bool isAlpha = tbformat.ToUpper().Contains("ALPHA");
 			int ordinal = Ordinal;
-			bool trimSeqValue = FormatStepData.TabData.TrimSeqTabValue; // F2024-043 remove space around SEQ tab value
 			bool useLinked = false;		// if this is enhanced, and the LinkedTab isn't numeric, flag to use 'LinkedTab' for the tab.
 			if (ActiveSection != null && ActiveSection.IsEnhancedSection) // C2018-003 fixed use of getting the active section
 			{
@@ -4594,7 +4567,6 @@ namespace VEPROMS.CSLA.Library
 				tbformat = tbformat.Replace("{numeric}", LinkedTab.Trim(" .".ToCharArray()).PadLeft(2));
 			}
 			string alpha = useLinked?LinkedTab.Trim():AlphabeticalNumbering(ordinal);
-			if (trimSeqValue) alpha = alpha.Trim(); // F2024-043 trim white around SEQ tab value (for sub-steps)
 			// B2017-211 Roman High Level steps should be followed by Uppercase alpha substeps - This is being limited to Calvert SAMG Format
 			if (_ActiveFormat.Name =="BGESAM1" &&MyParent != null && MyParent.IsHigh && MyParent.IsStep && MyParent.FormatStepData.TabData.IdentEdit.Contains("ROMAN"))
 				tbformat = tbformat.Replace("{alpha}", alpha);
@@ -4637,8 +4609,7 @@ namespace VEPROMS.CSLA.Library
 				tbformat = tbformat.Replace("{numeric}", stpTab);
 			}
 			else
-				// F2024-043  added trimSeqValue to trim white around SEQ tab value (for sub-steps)
+				tbformat = tbformat.Replace("{numeric}", trimTabStart ? ordinal.ToString() : FormatStepData.AtLeastTwoDigits ? ordinal.ToString().PadLeft(2, '0') : ordinal.ToString().PadLeft(2));
-				tbformat = tbformat.Replace("{numeric}", (trimTabStart || trimSeqValue) ? ordinal.ToString() : FormatStepData.AtLeastTwoDigits ? ordinal.ToString().PadLeft(2, '0') : ordinal.ToString().PadLeft(2));
 			if (tbformate != null)
 			{
 				if (useLinked)

PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs

@@ -4508,14 +4508,6 @@ 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
@@ -6643,17 +6635,6 @@ namespace VEPROMS.CSLA.Library
 				return LazyLoad(ref _UseEntireSectionNum, "TabData/@UseEntireSectionNum");
 			}
 		}
-		// this will remove white space before/after the tab value
-		// put in for Vogtal Units 3 & 4 formats for continuous action sub-steps
-		// they have tab value within parenthesis and for a single digit/letter we don't want the white steps before or after it
-		private LazyLoad<bool> _TrimSeqTabValue;
-		public bool TrimSeqTabValue
-		{
-			get
-			{
-				return LazyLoad(ref _TrimSeqTabValue, "TabData/@TrimSeqTabValue");
-			}
-		}
 
 	}
 	#endregion

PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj

@@ -83,7 +83,8 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Csla">
+    <Reference Include="Csla, Version=2.1.4.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll</HintPath>
     </Reference>
     <Reference Include="DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL">

PROMS/VEPROMS.CSLA.Library/app.config

@@ -1,23 +0,0 @@
-<?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>

PROMS/VEPROMS.CSLA.Library/packages.config

@@ -1,26 +0,0 @@
-<?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>

PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj

@@ -93,7 +93,8 @@
     <Reference Include="C1.Win.C1SpellChecker.2, Version=2.0.20162.188, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
-    <Reference Include="Csla">
+    <Reference Include="Csla, Version=2.1.4.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll</HintPath>
     </Reference>
     <Reference Include="DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL">

PROMS/Volian.Print.Library/VlnSvgPageHelper.cs

@@ -2023,17 +2023,15 @@ i = 0;
 					break;
 				case "{TOPSECTIONTITLE}":              // This will print the top level section title
 				case "[TOPSECTIONTITLE]":
-					// get top most section:  put in for Vogtle Units 3 & 4 formats
+					// get top most section:
 					{
 						ItemInfo top = section;
 						while (top.MyParent != null && !top.MyParent.IsProcedure)
 						{
 							top = top.MyParent;
 						}
-						// B2024-013  changed to use the FormattedDisplayTextKeepHardReturn instead of display text for the section title
-						//            this gives us to use the hard return that the user placed in the section title
 						if (top.IsSection)
-							plstr = SplitTitle(svgGroup, pageItem, top.FormattedDisplayTextKeepHardReturn, section.ActiveFormat.PlantFormat.FormatData.SectData.SectionTitleLength, token, plstr, section.ActiveFormat.PlantFormat.FormatData.SectData.SectionNumberAndTitleLength);
+							plstr = SplitTitle(svgGroup, pageItem, top.DisplayText, section.ActiveFormat.PlantFormat.FormatData.SectData.SectionTitleLength, token, plstr, section.ActiveFormat.PlantFormat.FormatData.SectData.SectionNumberAndTitleLength);
 						else
 							plstr = plstr.Replace(token, string.Empty);
 					}

PROMS/Volian.Print.Library/Volian.Print.Library.csproj

@@ -68,7 +68,8 @@
     <Reference Include="C1.Win.C1FlexGrid.2, Version=2.0.20162.188, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
-    <Reference Include="Csla">
+    <Reference Include="Csla, Version=2.1.4.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll</HintPath>
     </Reference>
     <Reference Include="FlexableMessageBox">

PROMS/Volian.Print.Library/app.config

@@ -1,15 +0,0 @@
-<?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>

PROMS/Volian.Print.Library/vlnParagraph.cs

@@ -1407,8 +1407,7 @@ namespace Volian.Print.Library
 								}
 							}
 						}
-						StepInfo si = (StepInfo)MyItemInfo;						
+						StepConfig sc = new StepConfig(MyItemInfo as StepInfo);
-						StepConfig sc = new StepConfig(si.MyContent.Config);
 						if (sc != null && sc.Step_ImageWidth != 0)
 						{
 							Width = sc.Step_ImageWidth;
@@ -2832,7 +2831,7 @@ namespace Volian.Print.Library
 				// B2023-115 Top continue message for Vogtle Alarms: 1st version done on 12/6/23.  Changes to logic as per request
 				//	from engineering done on 12/12/23.  See comment below for logic for 12/12/23 (history of this file has previous
 				//	logic)
-				if (((docstyle.Continue.Top.HLS ?? 0) == 4) || ((docstyle.Continue.Top.HLS ?? 0) == 7))
+				if ((docstyle.Continue.Top.HLS ?? 0) == 4)
 				{
 					// Vogtle Alarms: Their alarms are set up differently than standard procedures - the HLS in Vogtle
 					//	alarms is a section in other procedures.  The top continue message is shown when a break occurs:
@@ -2843,13 +2842,6 @@ namespace Volian.Print.Library
 					//		if it is a sequential substep, such as “5.  (continued)”.  If it is NOT a sequential substep, then only
 					//		the word “(continued)” will appear.
 					//	•	If a page break occurs between high level steps, such as before “Causes:”, then no continued message is needed.
-
-					// F2024-027 & F2024-028
-					// Vogtle Units 3&4 needed similar top continue messages in the Local Alarms attachments as they have for the MCR Alarm point pages
-					// with the exception that when High Level Step (grouping text) is split and continued to the next page, the top continue message 
-					// needs to be the HLS text with "(continued)" appended to it.
-					// Added a TOP.HLS value of 7 to allow for this minor difference and is set in the docstyle for that section
-
 					bool doMessage = true;
 					if (MyItemInfo.IsHigh) doMessage = false;				// at high, don't do message
 					if (MyItemInfo.MyParent.IsHigh) doMessage = false;		// at first level, don't do message
@@ -2864,11 +2856,6 @@ namespace Volian.Print.Library
 						// if sequential, add on step number, otherwise just put out message:
 						myMsg = !cur.IsSequential ? myMsg : cur.CombinedTab + ". " + myMsg;
 					}
-					// F2024-027 & F2024-028 added else if to check of the case where we want to use the High Level Step text in the top continue message
-					else if (((docstyle.Continue.Top.HLS ?? 0) == 7) && MyItemInfo.MyParent != null && MyItemInfo.MyParent.IsHigh)
-					{
-						myMsg = MyItemInfo.MyParent.DisplayText + " " + myMsg;
-					}
 					else // if not doing message, clear it & set yPageStart back to what it was before handling message		
 					{
 						myMsg = "";
@@ -4185,8 +4172,7 @@ namespace Volian.Print.Library
 							{
 								Width *= (h2 / h1);
 							}
-							StepInfo si = (StepInfo)MyItemInfo;
+							StepConfig sc = new StepConfig(MyItemInfo as StepInfo);
-							StepConfig sc = new StepConfig(si.MyContent.Config);
 							if (sc != null && sc.Step_ImageWidth != 0)
 							{
 								Width = sc.Step_ImageWidth;