diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index a17c7a11..657c89d9 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -2502,7 +2502,11 @@ namespace VEPROMS.CSLA.Library { string cltext = null; int stepType = (int)(MyContent.Type % 10000); - string tbformat = IsInRNO ? FormatStepData.TabData.RNOIdentPrint == "" ? this.MyParent.FormatStepData.TabData.RNOIdentPrint : FormatStepData.TabData.RNOIdentPrint : FormatStepData.TabData.IdentPrint; + string tbformat; + if((ActiveFormat.MyStepSectionLayoutData.UseRNOParentIdent ?? "") != "" && bool.Parse(ActiveFormat.MyStepSectionLayoutData.UseRNOParentIdent)) + tbformat = IsInRNO ? FormatStepData.TabData.RNOIdentPrint == "" ? this.MyParent.FormatStepData.TabData.RNOIdentPrint : FormatStepData.TabData.RNOIdentPrint : FormatStepData.TabData.IdentPrint; + else + tbformat = IsInRNO ? FormatStepData.TabData.RNOIdentPrint : FormatStepData.TabData.IdentPrint; string tbformate = null; // need this for background documents, to generate tab for editing. if (IsParagraph && !IsSequential) { diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs index 81e95af7..e90f9510 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs @@ -2703,6 +2703,14 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _RNOWidthAdj, "@RNOWidthAdj"); } } + private LazyLoad _UseRNOParentIdent; + public string UseRNOParentIdent + { + get + { + return LazyLoad(ref _UseRNOParentIdent, "@UseRNOParentIdent"); + } + } private LazyLoad _BoxLeftAdj; public string BoxLeftAdj { diff --git a/PROMS/fmtxml/FmtFileToXml.cs b/PROMS/fmtxml/FmtFileToXml.cs index beb8b284..6dc73d15 100644 --- a/PROMS/fmtxml/FmtFileToXml.cs +++ b/PROMS/fmtxml/FmtFileToXml.cs @@ -736,6 +736,7 @@ public struct StepSectionLayout //for Braidwood by jcb public string RNOWidthAdj; public string BoxLeftAdj; + public string UseRNOParentIdent; //end for Braidwood by jcb /* Format flags moved to here.... */ diff --git a/PROMS/fmtxml/PlantSpecific_ByrBwd.cs b/PROMS/fmtxml/PlantSpecific_ByrBwd.cs index a3d229dc..8dae03a5 100644 --- a/PROMS/fmtxml/PlantSpecific_ByrBwd.cs +++ b/PROMS/fmtxml/PlantSpecific_ByrBwd.cs @@ -80,6 +80,7 @@ namespace fmtxml fmtdata.StepData[6].ColOverride = "42"; fmtdata.StepData[7].ColOverride = "42"; fmtdata.StepData[43].ColOverride = "42"; + fmtdata.SectData.StepSectionData.StpSectLayData.UseRNOParentIdent = "True"; } } public partial class FmtToXml diff --git a/PROMS/fmtxml/TranslateFMT.XSL b/PROMS/fmtxml/TranslateFMT.XSL index 103d673f..47c80fe3 100644 Binary files a/PROMS/fmtxml/TranslateFMT.XSL and b/PROMS/fmtxml/TranslateFMT.XSL differ