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

Browse Source
This commit is contained in:
Kathy Ruffing
2013-05-09 12:23:53 +00:00
parent 060baa1cf2
commit 8984f3bcd4
9 changed files with 75 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1232,7 +1232,7 @@ namespace VEPROMS.CSLA.Library
#endregion
public int FoldoutIndex()
{
if ((ActiveSection.MyDocStyle.StructureStyle.Style ?? 0 & E_DocStructStyle.UseSectionFoldout) != 0) return 0;
if (ActiveFormat.PlantFormat.FormatData.PrintData.SectionLevelFoldouts && (ActiveSection.MyDocStyle.StructureStyle.Style ?? 0 & E_DocStructStyle.UseSectionFoldout) != 0) return 0;
// now check for floating foldouts. If there is a floating foldout, also find which one it uses.
// This is data off of the ?
if (ActiveFormat.PlantFormat.FormatData.PrintData.AlternateFloatingFoldout && ActiveSection.IsDefaultSection)
@@ -2395,7 +2395,7 @@ namespace VEPROMS.CSLA.Library
_MyTab.Text = "";
_MyTab.CleanText = "";
return;
}
}
int stepType = (int)(MyContent.Type % 10000);
string tbformat = IsInRNO ? FormatStepData.TabData.RNOIdentPrint : FormatStepData.TabData.IdentPrint;
if (ActiveFormat.Name.ToUpper() == "WCNCKL" || ActiveFormat.Name.ToUpper() == "WSTCKL")
@@ -2545,7 +2545,7 @@ namespace VEPROMS.CSLA.Library
string roman = RomanNumbering(ordinal);
tbformat = tbformat.Replace("{roman}", roman.ToLower());
tbformat = tbformat.Replace("{ROMAN}", roman);
tbformat = tbformat.Replace("{numeric}", trimTabStart ? ordinal.ToString() : ordinal.ToString().PadLeft(2));
tbformat = tbformat.Replace("{numeric}", trimTabStart ? ordinal.ToString() : FormatStepData.AtLeastTwoDigits ? ordinal.ToString().PadLeft(2,'0') : ordinal.ToString().PadLeft(2));
tbformat = tbformat.Replace("{numericWpar}", ordinal.ToString());
if (tbformat.Contains("{asterisk}"))
{
@@ -2713,9 +2713,14 @@ namespace VEPROMS.CSLA.Library
{
if (ii.DisplayNumber != null && ii.DisplayNumber != "")
{
SectionConfig sc = ii.MyConfig as SectionConfig;
if (sc != null && sc.SubSection_AutoIndent == "Y")
countlev++;
SectionInfo si = SectionInfo.Get(ii.ItemID);
if (si != null)
{
SectionConfig sc = new SectionConfig(si);
//SectionConfig sc = ii.MyConfig as SectionConfig;
if (sc != null && sc.SubSection_AutoIndent == "Y")
countlev++;
}
}
ii = ii.MyParent;
}