Compare commits

...

9 Commits

Author SHA1 Message Date
db09db3cd0 Merge pull request 'F2025-011 Format changes are needed to account for ABN procedures.' (#541) from F2025-011 into Development
ready for testing phase
2025-04-28 13:33:44 -04:00
ba8a8b8673 F2025-011 Format changes are needed to account for ABN procedures. 2025-04-28 12:08:10 -04:00
6f354bfeee Merge pull request 'B2025-010 - Adjusted the positioning of the procedure title in the Catawba Deviation Format so that it is centered' (#539) from B2025-010 into Development
Format only change.  Ready for testing
2025-04-11 09:14:38 -04:00
818d764b3d B2025-010 - Adjusted the positioning of the procedure title in the Catawba Deviation Format so that it is centered 2025-04-11 09:11:02 -04:00
689ea71846 Merge pull request 'B2022-031-Add-filtering-for-Proc-and-Section-name-from-Global-Search-2' (#538) from B2022-031-Add-filtering-for-Proc-and-Section-name-from-Global-Search-2 into Development
good for testing phase
2025-04-07 14:05:24 -04:00
66295594e9 B2022-031-Add-filtering-for-Proc-and-Section-name-from-Global-Search-2 2025-04-07 13:46:28 -04:00
042b80b9f4 Merge pull request 'B2022-031-Add-filtering-for-Proc-and-Section-name-from-Global-Search' (#537) from B2022-031-Add-filtering-for-Proc-and-Section-name-from-Global-Search into Development
Good for testing phase
2025-04-07 10:59:46 -04:00
94d2c32025 Merge pull request 'Added the format file used for the pre-tend ACME data which is used when updating the PROMS User Manual' (#536) from ACME_formats into Development
format used internally when working on the PROMS User Manual
2025-04-04 10:40:40 -04:00
64124cc0f7 Added the format file used for the pre-tend ACME data which is used when updating the PROMS User Manual 2025-04-04 10:38:26 -04:00
11 changed files with 32 additions and 2 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -653,6 +653,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);

View File

@@ -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
//

View File

@@ -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;