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

Browse Source
This commit is contained in:
John Jenko
2010-06-24 15:19:46 +00:00
parent af197dbd05
commit f2ab81f97d
2 changed files with 81 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
PROMS/VEPROMS.CSLA.Library/Config/SectionConfig.cs
View File

@@ -278,8 +278,16 @@ namespace VEPROMS.CSLA.Library
//If there is no parent value, then use the volian default
if (s == string.Empty)
{
bool rval = MyFormat.PlantFormat.FormatData.SectData.StepSectionData.StepSectionLayoutData.BreakOnSections;
return (rval)? SectionPagination.Separate : SectionPagination.Continuous;// default to volian default
if (MyFormat != null)
{
bool rval = MyFormat.PlantFormat.FormatData.SectData.StepSectionData.StepSectionLayoutData.BreakOnSections;
return (rval) ? SectionPagination.Separate : SectionPagination.Continuous;// default to volian default
}
else
{
bool rval = MyDefaultFormat.PlantFormat.FormatData.SectData.StepSectionData.StepSectionLayoutData.BreakOnSections;
return (rval) ? SectionPagination.Separate : SectionPagination.Continuous;// default to volian default
}
}
return (SectionPagination)int.Parse(s);
@@ -424,8 +432,16 @@ namespace VEPROMS.CSLA.Library
// If there is no parent value, then use the volian default
if (s == string.Empty)
{
int rval = (int)MyFormat.PlantFormat.FormatData.SectData.StepSectionData.StepSectionLayoutData.PMode;
return (SectionColumnMode)rval;//SectionColumnMode.Two; //SectionColumnMode.Default;// default to volian default
if (MyFormat != null)
{
int rval = (int)MyFormat.PlantFormat.FormatData.SectData.StepSectionData.StepSectionLayoutData.PMode;
return (SectionColumnMode)rval;//SectionColumnMode.Two; //SectionColumnMode.Default;// default to volian default
}
else
{
int rval = (int)MyDefaultFormat.PlantFormat.FormatData.SectData.StepSectionData.StepSectionLayoutData.PMode;
return (SectionColumnMode)rval;
}
}
else
return (SectionColumnMode)int.Parse(s);