From 8e2b1797385cc2cb07ad1876f30bb941a506f404 Mon Sep 17 00:00:00 2001 From: Rich Date: Tue, 21 Feb 2012 16:05:00 +0000 Subject: [PATCH] Restore Kathy's code that I stepped on with my update --- .../Config/SectionConfig.cs | 44 ++++++++++--------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Config/SectionConfig.cs b/PROMS/VEPROMS.CSLA.Library/Config/SectionConfig.cs index 8454e6e6..548a9da5 100644 --- a/PROMS/VEPROMS.CSLA.Library/Config/SectionConfig.cs +++ b/PROMS/VEPROMS.CSLA.Library/Config/SectionConfig.cs @@ -43,6 +43,12 @@ namespace VEPROMS.CSLA.Library //} private Section _Section; private SectionInfo _SectionInfo; + private static int _SectionConfigUnique = 0; + private static int SectionConfigUnique + { get { return ++_SectionConfigUnique; } } + private int _MySectionConfigUnique = SectionConfigUnique; + public int MySectionConfigUnique // Absolutely Unique ID - Info + { get { return _MySectionConfigUnique; } } public SectionConfig(Section section) { @@ -279,20 +285,20 @@ namespace VEPROMS.CSLA.Library if (s == string.Empty) s = _Xp.ParentValue("Section", "Pagination"); // get the parent value //If there is no parent value, then use the volian default - if (s == string.Empty) - { - if (MyFormat != null) - { - bool rval = MyFormat.MyStepSectionLayoutData.BreakOnSections; - return (rval) ? SectionPagination.Separate : SectionPagination.Continuous;// default to volian default - } - else - { - bool rval = MyDefaultFormat.MyStepSectionLayoutData.BreakOnSections; - return (rval) ? SectionPagination.Separate : SectionPagination.Continuous;// default to volian default - } - } - + //if (s == string.Empty) + //{ + // if (MyFormat != null) + // { + // bool rval = MyFormat.MyStepSectionLayoutData.BreakOnSections; + // return (rval) ? SectionPagination.Separate : SectionPagination.Continuous;// default to volian default + // } + // else + // { + // bool rval = MyDefaultFormat.MyStepSectionLayoutData.BreakOnSections; + // return (rval) ? SectionPagination.Separate : SectionPagination.Continuous;// default to volian default + // } + //} + if (s == string.Empty) return SectionPagination.Continuous; return (SectionPagination)int.Parse(s); } set @@ -304,7 +310,7 @@ namespace VEPROMS.CSLA.Library if (parval.Equals(string.Empty)) // if the parent value is empty, then use the volian default { - bool rval = MyFormat.MyStepSectionLayoutData.BreakOnSections; + bool rval = _Section.MySectionInfo.ActiveFormat.MyStepSectionLayoutData.BreakOnSections; parval = (rval) ? ((int)(SectionPagination.Separate)).ToString() : ((int)(SectionPagination.Continuous)).ToString(); //parval = ((int)(SectionPagination.Default)).ToString(); } @@ -319,7 +325,6 @@ namespace VEPROMS.CSLA.Library } [Category("View Settings")] //PROPGRID: Hide Include in Background/Deviation - [Browsable(false)] [DisplayName("Include in Background/Deviation")] [RefreshProperties(RefreshProperties.All)] [Description("Section LinkEnhanced")] @@ -337,7 +342,6 @@ namespace VEPROMS.CSLA.Library } [Category("General")] //PROPGRID: Hide Include On Table Of Contents - [Browsable(false)] [DisplayName("Include On Table Of Contents")] [RefreshProperties(RefreshProperties.All)] [Description("Section TOC")] @@ -345,7 +349,8 @@ namespace VEPROMS.CSLA.Library { get { - return _Xp["Section", "TOC"]; + string tmp = _Xp["Section", "TOC"]; + return tmp == null || tmp == "" ? "N" : tmp; } set { @@ -355,7 +360,6 @@ namespace VEPROMS.CSLA.Library } [Category("Section")] //PROPGRID: Hide AutoGen - [Browsable(false)] [DisplayName("Section AutoGen")] [RefreshProperties(RefreshProperties.All)] [Description("Section AutoGen")] @@ -373,7 +377,6 @@ namespace VEPROMS.CSLA.Library } [Category("Section")] //PROPGRID: Hide Subsection PH - [Browsable(false)] [DisplayName("Section PrintHdr")] [RefreshProperties(RefreshProperties.All)] [Description("Section PrintHdr")] @@ -627,6 +630,7 @@ namespace VEPROMS.CSLA.Library } [Category("Format")] [DisplayName("Checkoff Header Selection")] + [RefreshProperties(RefreshProperties.All)] [Description("Checkoff Header Selection")] public int Section_CheckoffHeaderSelection {