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

Browse Source
This commit is contained in:
Kathy Ruffing 2012-11-08 17:05:45 +00:00
parent 3795a3063d
commit daec29dc9a
3 changed files with 19 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1964,55 +1964,22 @@ namespace VEPROMS.CSLA.Library
_ActiveSection = value; _ActiveSection = value;
} }
} }
private bool _DidFirstPageDocStyle = false;
public bool DidFirstPageDocStyle
{
get { return _DidFirstPageDocStyle; }
set
{
if (!_DidFirstPageDocStyle)
{
_DidFirstPageDocStyle = value;
_MyDocStyle = null;
}
}
}
private DocStyle _MyDocStyle; private DocStyle _MyDocStyle;
private DocStyle _MyDocStyleOtherThanFirstPage;
public DocStyle MyDocStyle public DocStyle MyDocStyle
{ {
get get
{ {
ItemInfo prevSection = (ActiveSection != null) ? ActiveSection.MyPrevious : null;
if (_MyDocStyle == null && ActiveSection != null) if (_MyDocStyle == null && ActiveSection != null)
//if ((_MyDocStyle == null && ActiveSection != null) ||
// (!_DidFirstPageDocStyle &&
// _MyDocStyle.IsStepSection &&
// prevSection != null &&
// ((SectionConfig)ActiveSection.MyConfig).Section_Pagination == SectionConfig.SectionPagination.Continuous))
{ {
int typ = (int)ActiveSection.MyContent.Type; int typ = (int)ActiveSection.MyContent.Type;
int subtyp = typ % 10000; int subtyp = typ % 10000;
_MyDocStyle = ActiveFormat.PlantFormat.DocStyles.DocStyleList[subtyp]; _MyDocStyle = ActiveFormat.PlantFormat.DocStyles.DocStyleList[subtyp];
if (((_MyDocStyle.StructureStyle.Where & E_DocStyleUse.UseOnFirstPage) != 0) && _DidFirstPageDocStyle)
{
if (_MyDocStyleOtherThanFirstPage == null)
{
foreach (DocStyle ds in ActiveFormat.PlantFormat.DocStyles.DocStyleList)
{
if ((ds.StructureStyle.Where & E_DocStyleUse.UseOnAllButFirstPage) != 0)
{
_MyDocStyleOtherThanFirstPage = ds;
break;
}
}
}
}
} }
if (_MyDocStyleOtherThanFirstPage == null) return _MyDocStyle;
return _MyDocStyle; }
else set
return _MyDocStyleOtherThanFirstPage; {
_MyDocStyle = value;
} }
} }
private FormatInfo _ActiveFormat = null; private FormatInfo _ActiveFormat = null;

12
PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs
View File

@ -82,6 +82,18 @@ namespace VEPROMS.CSLA.Library
} }
} }
#endregion #endregion
#region IndexOtherThanFirstPage
[Category("Miscellaneous")]
[Description("IndexOtherThanFirstPage")]
private LazyLoad<int?> _IndexOtherThanFirstPage;
public int? IndexOtherThanFirstPage
{
get
{
return LazyLoad(ref _IndexOtherThanFirstPage, "@IndexOtherThanFirstPage");
}
}
#endregion
#region IsStepSection #region IsStepSection
[Category("Miscellaneous")] [Category("Miscellaneous")]
[Description("Is a Step Section")] [Description("Is a Step Section")]

3
PROMS/VEPROMS.CSLA.Library/Format/ENums.cs
View File

@ -163,7 +163,8 @@ namespace VEPROMS.CSLA.Library
}; };
public enum E_DocStyleUse : uint public enum E_DocStyleUse : uint
{ {
UseOnAllPages = 0, UseOnFirstPage = 1, UseOnAllButFirstPage = 2, UseOnLastPage = 4 UseOnAllPages = 0, UseOnFirstPage = 1, UseOnAllButFirstPage = 2
// , UseOnLastPage = 4 This flag does not have supporting code.
}; };
[Flags] [Flags]
// acceptence list for adding Tables, Cautions, Notes, Substeps, Next, Previous and RNO // acceptence list for adding Tables, Cautions, Notes, Substeps, Next, Previous and RNO