Compare commits
No commits in common. "d6f1f5fb0c43fde74747d1dcb42f6e005e9ea2f0" and "e2f9dbf1e2de665d8ca9b5cf1c05f81e8d8cc6cd" have entirely different histories.
d6f1f5fb0c
...
e2f9dbf1e2
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -4223,14 +4223,6 @@ namespace VEPROMS.CSLA.Library
|
|||||||
((IsHigh && FormatStepData.PageBreakOnStep) || (IsRNOPart && MyHLS.FormatStepData.PageBreakOnStep)))
|
((IsHigh && FormatStepData.PageBreakOnStep) || (IsRNOPart && MyHLS.FormatStepData.PageBreakOnStep)))
|
||||||
tbformate = IsRNOPart ? MyHLS.FormatStepData.TabData.RNOIdentEdit : FormatStepData.TabData.IdentEdit;
|
tbformate = IsRNOPart ? MyHLS.FormatStepData.TabData.RNOIdentEdit : FormatStepData.TabData.IdentEdit;
|
||||||
|
|
||||||
//F2023-112 Vogtle Units 3 and 4 Backgrounds
|
|
||||||
// added code to get the tbformate (this is used for the tab displayed in the step editor) for Cautions and Notes background steps
|
|
||||||
// like we do for the high level steps (see the if statement above)
|
|
||||||
// all plants using enhanced backgrounds will benefit from this and is adjustable in the format files
|
|
||||||
if (((ActiveFormat.PlantFormat.FormatData.PurchaseOptions.Value & E_PurchaseOptions.EnhancedBackgrounds) == E_PurchaseOptions.EnhancedBackgrounds) &&
|
|
||||||
((IsCaution || IsNote) && FormatStepData.PageBreakOnStep))
|
|
||||||
tbformate = IsRNOPart ? FormatStepData.TabData.RNOIdentEdit : FormatStepData.TabData.IdentEdit;
|
|
||||||
|
|
||||||
if (ActiveFormat.Name.ToUpper() == "WCNCKL" || ActiveFormat.Name.ToUpper() == "WSTCKL")
|
if (ActiveFormat.Name.ToUpper() == "WCNCKL" || ActiveFormat.Name.ToUpper() == "WSTCKL")
|
||||||
{
|
{
|
||||||
if (!IsNote && !IsCaution) tbformat = FormatStepData.TabData.IdentEdit;
|
if (!IsNote && !IsCaution) tbformat = FormatStepData.TabData.IdentEdit;
|
||||||
@ -4245,23 +4237,15 @@ namespace VEPROMS.CSLA.Library
|
|||||||
{
|
{
|
||||||
string tb = (LinkedOrdinal==null)? "NA" : LinkedOrdinal.ToString();
|
string tb = (LinkedOrdinal==null)? "NA" : LinkedOrdinal.ToString();
|
||||||
tbformat = tbformat.Replace("{LNK C/N Num}", tb);
|
tbformat = tbformat.Replace("{LNK C/N Num}", tb);
|
||||||
if (tbformate != null) tbformate = tbformate.Replace("{LNK C/N Num}", tb);
|
|
||||||
if ((ActiveParent as ItemInfo).FormatStepData.TabData.IdentEdit.Contains("{Section Prefix}") && LinkedTabHasSectionPrefix) // B2019-126 Check the HLS of the source document (ex. EOP step) to see if it includes the section number prefix in its tab
|
if ((ActiveParent as ItemInfo).FormatStepData.TabData.IdentEdit.Contains("{Section Prefix}") && LinkedTabHasSectionPrefix) // B2019-126 Check the HLS of the source document (ex. EOP step) to see if it includes the section number prefix in its tab
|
||||||
{
|
tbformat = tbformat.Replace("{Section Prefix}",""); // B2018-141 remove duplicate section number
|
||||||
tbformat = tbformat.Replace("{Section Prefix}", ""); // B2018-141 remove duplicate section number
|
|
||||||
if (tbformate != null) tbformate = tbformate.Replace("{Section Prefix}", ""); // F2023-112 replace in editor tab
|
|
||||||
}
|
|
||||||
if ((ActiveParent as ItemInfo).LinkedTab != null)
|
if ((ActiveParent as ItemInfo).LinkedTab != null)
|
||||||
{
|
tbformat = tbformat.Replace("{LNK Step Num}", (ActiveParent as ItemInfo).LinkedTab.Trim(" .".ToCharArray())); //(ActiveParent as ItemInfo).Ordinal.ToString());
|
||||||
tbformat = tbformat.Replace("{LNK Step Num}", (ActiveParent as ItemInfo).LinkedTab.Trim(" .".ToCharArray()));
|
|
||||||
if (tbformate != null) tbformate = tbformate.Replace("{LNK Step Num}", (ActiveParent as ItemInfo).LinkedTab.Trim(" .".ToCharArray())); // F2023-112 replace in editor tab
|
|
||||||
}
|
|
||||||
tbformat = tbformat.TrimStart(" ".ToCharArray());
|
tbformat = tbformat.TrimStart(" ".ToCharArray());
|
||||||
if (tbformate != null) tbformate = tbformate.TrimStart(" ".ToCharArray()); // F2023-112 replace in editor tab
|
|
||||||
}
|
}
|
||||||
if (tbformat.Contains("{LNK Step Num}"))
|
if (tbformat.Contains("{LNK Step Num}"))
|
||||||
tbformat = tbformat.Replace("{LNK Step Num}", LinkedTab==null?"NA":LinkedTab.Trim(" .".ToCharArray()).PadLeft(2));//Ordinal.ToString().PadLeft(2));
|
tbformat = tbformat.Replace("{LNK Step Num}", LinkedTab==null?"NA":LinkedTab.Trim(" .".ToCharArray()).PadLeft(2));//Ordinal.ToString().PadLeft(2));
|
||||||
if (tbformate != null && tbformate.Contains("{LNK Step Num}")) // F2023-112 replace in editor tab
|
if (tbformate != null && tbformate.Contains("{LNK Step Num}"))
|
||||||
tbformate = tbformate.Replace("{LNK Step Num}", LinkedTab == null ? "NA" : LinkedTab.Trim(" .".ToCharArray()).PadLeft(2));//Ordinal.ToString());
|
tbformate = tbformate.Replace("{LNK Step Num}", LinkedTab == null ? "NA" : LinkedTab.Trim(" .".ToCharArray()).PadLeft(2));//Ordinal.ToString());
|
||||||
if (tbformate != null && tbformate.Contains("{!Clock}"))
|
if (tbformate != null && tbformate.Contains("{!Clock}"))
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user