From 150fa210f7d10d4ce0b1390c009d93b318afcd87 Mon Sep 17 00:00:00 2001
From: Rich <rmark@volian.com>
Date: Thu, 23 Jan 2014 21:21:20 +0000
Subject: [PATCH] Added property UseRNOParentIdent for Braidwood Used property
 UseRNOParentIdent for Braidwood

---
 .../VEPROMS.CSLA.Library/Extension/ItemExt.cs |   6 +++++-
 .../Format/PlantFormat.cs                     |   8 ++++++++
 PROMS/fmtxml/FmtFileToXml.cs                  |   1 +
 PROMS/fmtxml/PlantSpecific_ByrBwd.cs          |   1 +
 PROMS/fmtxml/TranslateFMT.XSL                 | Bin 205890 -> 206238 bytes
 5 files changed, 15 insertions(+), 1 deletion(-)

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<string> _UseRNOParentIdent;
+		public string UseRNOParentIdent
+		{
+			get
+			{
+				return LazyLoad(ref _UseRNOParentIdent, "@UseRNOParentIdent");
+			}
+		}
 		private LazyLoad<string> _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 103d673f36bf672de9f23a3b2a32272dc33e0ce1..47c80fe371b9bbebf731a6f644b1a2f3618216d5 100644
GIT binary patch
delta 123
zcmX?ff@j`oo`x-qev-<e48;to3_%Qj4E_uO42cXyKwch034<p?3Y1l|-B*&)P-prB
oMJ6^u429DRH!?|14&c<7zJUX){KM5u)$InZjN1)dnS|~G0F~Jvs{jB1

delta 32
ocmbPtn&;37o`x-qev;Ew+!;l-w@EU}=(OK*W88krjp@ie0L#q`fdBvi