Merge pull request 'F2025-011 Format changes are needed to account for ABN procedures.' (#541) from F2025-011 into Development
ready for testing phase
This commit is contained in:
commit
db09db3cd0
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -653,6 +653,21 @@ namespace VEPROMS.CSLA.Library
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endregion
|
#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()
|
public override string ToString()
|
||||||
{
|
{
|
||||||
return String.Format("{0:D2} - {1}", Index, Name);
|
return String.Format("{0:D2} - {1}", Index, Name);
|
||||||
|
@ -1761,6 +1761,16 @@ i = 0;
|
|||||||
case "[HEADER4]":
|
case "[HEADER4]":
|
||||||
case "{HEADER5}":
|
case "{HEADER5}":
|
||||||
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 "[BOX1]":
|
case "[BOX1]":
|
||||||
case "{BOX2}":
|
case "{BOX2}":
|
||||||
@ -2099,7 +2109,12 @@ i = 0;
|
|||||||
case "[UNITNUMBER]":
|
case "[UNITNUMBER]":
|
||||||
string unbr = MySection.MyDocVersion.DocVersionConfig.Unit_Number;
|
string unbr = MySection.MyDocVersion.DocVersionConfig.Unit_Number;
|
||||||
if (MySection.ActiveFormat.PlantFormat.FormatData.PrintData.PrintCommonForZeroUnit && unbr == "0")
|
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
|
else
|
||||||
plstr = plstr.Replace(token, unbr);
|
plstr = plstr.Replace(token, unbr);
|
||||||
break;
|
break;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user