Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Added property UseRNOParentIdent for Braidwood

Browse Source 
Used property UseRNOParentIdent for Braidwood
This commit is contained in:
Rich 2014-01-23 21:21:20 +00:00
parent 1c77c6d9ae
commit 150fa210f7
5 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
View File

@ -2502,7 +2502,11 @@ namespace VEPROMS.CSLA.Library
{ {
string cltext = null; string cltext = null;
int stepType = (int)(MyContent.Type % 10000); 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. string tbformate = null; // need this for background documents, to generate tab for editing.
if (IsParagraph && !IsSequential) if (IsParagraph && !IsSequential)
{ {

8
PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
View File

@ -2703,6 +2703,14 @@ namespace VEPROMS.CSLA.Library
return LazyLoad(ref _RNOWidthAdj, "@RNOWidthAdj"); return LazyLoad(ref _RNOWidthAdj, "@RNOWidthAdj");
} }
} }
private LazyLoad<string> _UseRNOParentIdent;
public string UseRNOParentIdent
{
get
{
return LazyLoad(ref _UseRNOParentIdent, "@UseRNOParentIdent");
}
}
private LazyLoad<string> _BoxLeftAdj; private LazyLoad<string> _BoxLeftAdj;
public string BoxLeftAdj public string BoxLeftAdj
{ {

1
PROMS/fmtxml/FmtFileToXml.cs
View File

@ -736,6 +736,7 @@ public struct StepSectionLayout
//for Braidwood by jcb //for Braidwood by jcb
public string RNOWidthAdj; public string RNOWidthAdj;
public string BoxLeftAdj; public string BoxLeftAdj;
public string UseRNOParentIdent;
//end for Braidwood by jcb //end for Braidwood by jcb
/* Format flags moved to here.... */ /* Format flags moved to here.... */

1
PROMS/fmtxml/PlantSpecific_ByrBwd.cs
View File

@ -80,6 +80,7 @@ namespace fmtxml
fmtdata.StepData[6].ColOverride = "42"; fmtdata.StepData[6].ColOverride = "42";
fmtdata.StepData[7].ColOverride = "42"; fmtdata.StepData[7].ColOverride = "42";
fmtdata.StepData[43].ColOverride = "42"; fmtdata.StepData[43].ColOverride = "42";
fmtdata.SectData.StepSectionData.StpSectLayData.UseRNOParentIdent = "True";
} }
} }
public partial class FmtToXml public partial class FmtToXml

BIN
PROMS/fmtxml/TranslateFMT.XSL
View File

Binary file not shown.