F2025-011 Format changes are needed to account for ABN procedures.

Adjustments to PSI location and Abnormal Procedure Steps Sections

PROMS/VEPROMS User Interface/PROMSFixes.Sql

@@ -1492,6 +1492,7 @@ GO
 				@SearchString		Search string criteria
 				@SearchStringx		Alternate search string criteria
 				@StepTypeList		Comma delimited list of of step types used to filter search results (pass '' or null to include all step type sections)
+				@ProcSectSrch		Flag used to indicate if Procedure and Section titles should appear in the global search results. 0 = include 1 = remove
 				
  Examples:		select Text from vefn_SiblingAndChildrenItemsNewByWord('194','','%[^a-z]red[^a-z]%', '%[^a-z]red[^a-z]%','');
 				select Text from vefn_SiblingAndChildrenItemsNewByWord('194','','%[^a-zA-Z]step 25[^0-9a-zA-Z.vbpi:\\-]%','%[^a-zA-Z]step 25[^0-9a-zA-Z.vbpi:\\-]%','');
@@ -15703,6 +15704,7 @@ GO
 				@UnitPrefix					Specified Unit Prefix if any
 				@ByWordPrefix				Word Prefix for the specified search string criteria
 				@ByWordSuffix				Word Suffix for the specified search string criteria
+				@ProcSectSrch		Flag used to indicate if Procedure and Section titles should appear in the global search results. 0 = include 1 = remove
 				
 				
  Examples:		exec vesp_SearchItemAndChildrenNewByWord  '194','','red',0,0,0,0,'','[^a-z]','[^a-z]';

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

@@ -6986,6 +6986,7 @@ namespace VEPROMS.CSLA.Library
 				get { return _CaseSensitive; }
 				set { _CaseSensitive = value; }
 			}
+				// B2022-031 - added a ProcSectSrch to filter out procedure and section titles from global search results.
 			private int _ProcSectSrch;
 			public int ProcSectSrch
 			{

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

@@ -547,6 +547,17 @@ namespace VEPROMS.CSLA.Library
 				return LazyLoad(ref _AdjSectTitleLoc, "@AdjSectTitleLoc");
 			}
 		}
+
+		// this will add additional spacing between the Section Numbers and Titles
+		private LazyLoad<float?> _SectTitleOffsetOverride;
+		public float? SectTitleOffsetOverride
+		{
+			get
+			{
+				return LazyLoad(ref _SectTitleOffsetOverride, "@SectTitleOffsetOverride");
+			}
+		}
+
 		#endregion AdjSectTitleLoc
 
 		#region ShowAlarmPointWindowInfo
@@ -653,6 +664,21 @@ namespace VEPROMS.CSLA.Library
 			}
 		}
 		#endregion
+
+		#region AltMultiUnitWording
+		[Category("Miscellaneous")]
+		[Description("Alternate Wording for Printing when MultiUnit")]
+
+		// this will utilize Alternate Wording for Printing when MultiUnit and PrintCommonForZeroUnit is set
+		private LazyLoad<string> _AltMultiUnitWording;
+		public string AltMultiUnitWording
+		{
+			get
+			{
+				return LazyLoad(ref _AltMultiUnitWording, "@AltMultiUnitWording");
+			}
+		}
+		#endregion IncludeInTOC
 		public override string ToString()
 		{
 			return String.Format("{0:D2} - {1}", Index, Name);

PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs

@@ -400,7 +400,7 @@ namespace Volian.Controls.Library
 			this.superTooltip1.SetSuperTooltip(this.cbxProcSectSrch, new DevComponents.DotNetBar.SuperTooltipInfo("Search RO and Transition Text", "", "When this box is checked, Search will include matches found in RO and Transition " +
             "text as well as regular text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
 			this.cbxProcSectSrch.TabIndex = 5;
-			this.cbxProcSectSrch.Text = "Ignore Procedure and Section titles";
+			this.cbxProcSectSrch.Text = "Ignore Procedure and Section Titles";
 			// 
 			// cbxCaseSensitive
 			// 

PROMS/Volian.Controls.Library/DisplaySearch.cs

@@ -2057,6 +2057,7 @@ namespace Volian.Controls.Library
 							ReportTitle = "Step Element Report"; //"Proms - Search by Type: " + typstr;
 							TypesSelected = "Filtered By:  " + typstr;
 							SearchString = null;
+								// B2022-031 - added a cbxProcSectSrch to filter out procedure and section titles from global search results.
 							SearchResults = ItemInfoList.GetListFromTextSearch(DVISearchList, TypeSearchList, string.Empty, cbxBooleanTxtSrch.Checked ? 2 : cbxCaseSensitive.Checked ? 1 : 0, cbxProcSectSrch.Checked ? 1 : 0, ItemSearchIncludeLinks.Value, includeRTFformat, includeSpecialChars, unitPrefix, string.Empty, string.Empty);
 							cmbResultsStyleIndex = 1;  //display step locations in results
 						}
@@ -2103,6 +2104,7 @@ namespace Volian.Controls.Library
 						SearchString = TextSearchString;
 						//TypesSelected = (typstr != null) ? "Searched Step Types: " + typstr : "Searched All Step Types";
 						//TypesSelected = "Searched Step Types: " + ((typstr != null) ? typstr : "All Step Types");
+							// B2022-031 - added a cbxProcSectSrch to filter out procedure and section titles from global search results.
 						SearchResults = ItemInfoList.GetListFromTextSearch(DVISearchList, TypeSearchList, TextSearchString /*.Replace(@"\",@"\u9586?")*/, cbxBooleanTxtSrch.Checked ? 2 : cbxCaseSensitive.Checked ? 1 : 0, cbxProcSectSrch.Checked ? 1 : 0, cbxIncROTextSrch.Checked ? ItemSearchIncludeLinks.Value : ItemSearchIncludeLinks.Nothing, includeRTFformat, includeSpecialChars, unitPrefix, byWordPrefix, byWordSuffix);
 
 						cmbResultsStyleIndex = 3;  // display step text in results
@@ -2145,6 +2147,7 @@ namespace Volian.Controls.Library
 
 					if (cbxFndUnLnkROVals.Enabled && cbxFndUnLnkROVals.Checked)
 					{
+						// B2022-031 - added a cbxProcSectSrch to filter out procedure and section titles from global search results.
 						SearchResults = ItemInfoList.GetListFromTextSearch(DVISearchList, TypeSearchList, ROSearchList, cbxBooleanTxtSrch.Checked ? 2 : cbxCaseSensitive.Checked ? 1 : 0, cbxProcSectSrch.Checked ? 1 : 0, ItemSearchIncludeLinks.Nothing, includeRTFformat, includeSpecialChars, unitPrefix, string.Empty, string.Empty);
 						cmbResultsStyleIndex = 3;  // display step text in results
 					}

PROMS/Volian.Print.Library/VlnSvgPageHelper.cs

@@ -1761,6 +1761,16 @@ i = 0;
 				case "[HEADER4]":
 				case "{HEADER5}":
 				case "[HEADER5]":
+				case "{HEADER6}":
+				case "[HEADER6]":
+				case "{HEADER7}":
+				case "[HEADER7]":
+				case "{HEADER8}":
+				case "[HEADER8]":
+				case "{HEADER9}":
+				case "[HEADER9]":
+				case "{HEADER10}":
+				case "[HEADER10]":
 				case "{BOX1}":
 				case "[BOX1]":
 				case "{BOX2}":
@@ -2099,7 +2109,12 @@ i = 0;
 				case "[UNITNUMBER]":
 					string unbr = MySection.MyDocVersion.DocVersionConfig.Unit_Number;
 					if (MySection.ActiveFormat.PlantFormat.FormatData.PrintData.PrintCommonForZeroUnit && unbr == "0")
-						plstr = "COMMON"; // for Comanche Peak, replace "Unit 0" with "COMMON"
+					{ 
+						if (String.IsNullOrEmpty(MySection.MyDocStyle.AltMultiUnitWording))
+							plstr = "COMMON"; // for Comanche Peak, replace "Unit 0" with "COMMON"
+						else
+							plstr = MySection.MyDocStyle.AltMultiUnitWording; // for Comanche Peak Abnormal, replace "Unit 0" with "UNIT 1 AND 2"
+					}
 					else
 						plstr = plstr.Replace(token, unbr);
 					break;

PROMS/Volian.Print.Library/vlnParagraph.cs

@@ -6199,6 +6199,12 @@ namespace Volian.Print.Library
 							XOffset += (float)formatInfo.PlantFormat.FormatData.SectData.MetaSectionList[level].SecTitlePositionAdj;
 							XOffset -= xMetaAdj;
 						}
+
+						if (itemInfo.MyDocStyle.SectTitleOffsetOverride != null)
+                        {
+							XOffset += (float)itemInfo.MyDocStyle.SectTitleOffsetOverride;
+						}
+
 					}
 				}
 				else if (formatInfo.PlantFormat.FormatData.SectData.SectionHeader.Just == "PSCenter")