diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index e5002603..f50f37dd 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -2599,7 +2599,7 @@ namespace VEPROMS.CSLA.Library font = new VE_Font(hdrFont.Family, (int)hdrFont.Size, es, (float)hdrFont.CPI); } else - font = format.PlantFormat.FormatData.SectData.SectionHeader.Font; + font = format.PlantFormat.FormatData.SectData.SectionHeader.Font; break; case 2: // step types int typindx = type - 20000; // what to do for other types rather than steps @@ -3433,6 +3433,12 @@ namespace VEPROMS.CSLA.Library } protected void SetTabText() { + if (IsSection) // B2016-160 Support transitions to sections + { + _MyTab.Text = DisplayNumber; + _MyTab.CleanText = DisplayNumber; + return; + } string cltext = null; int stepType = (int)(MyContent.Type % 10000); string tbformat; @@ -3470,7 +3476,7 @@ namespace VEPROMS.CSLA.Library string tb = (LinkedOrdinal==null)? "NA" : LinkedOrdinal.ToString(); tbformat = tbformat.Replace("{LNK C/N Num}", tb); if ((ActiveParent as ItemInfo).LinkedTab != null) - tbformat = tbformat.Replace("{LNK Step Num}", (ActiveParent as ItemInfo).LinkedTab.Trim(" .".ToCharArray())); //(ActiveParent as ItemInfo).Ordinal.ToString()); + tbformat = tbformat.Replace("{LNK Step Num}", (ActiveParent as ItemInfo).LinkedTab.Trim(" .".ToCharArray())); //(ActiveParent as ItemInfo).Ordinal.ToString()); tbformat = tbformat.TrimStart(" ".ToCharArray()); } if (tbformat.Contains("{LNK Step Num}")) @@ -6926,9 +6932,12 @@ namespace VEPROMS.CSLA.Library public override void SetupTags() { _TagsSetup = true; - _MyTab = new Tab(AdjustForTextSubFollowsTextStyle(FormatStepData.TabData.Font)); - MyHeader = new MetaTag(FormatStepData.TabData.Font); - MyFooter = new MetaTag(FormatStepData.TabData.Font); + // B2016-160 Support transitions to sections + VE_Font fnt = new VE_Font("Arial", 10, E_Style.None, 10); + if (FormatStepData != null) fnt = FormatStepData.TabData.Font; + _MyTab = new Tab(AdjustForTextSubFollowsTextStyle(fnt)); + MyHeader = new MetaTag(fnt); + MyFooter = new MetaTag(fnt); SetTabText(); } diff --git a/PROMS/Volian.Print.Library/PDFReport.cs b/PROMS/Volian.Print.Library/PDFReport.cs index 1a1f8da7..e7f30f2c 100644 --- a/PROMS/Volian.Print.Library/PDFReport.cs +++ b/PROMS/Volian.Print.Library/PDFReport.cs @@ -832,8 +832,8 @@ namespace Volian.Print.Library DelimList.Add(c.ToString()); } } - - while (!pitem.IsHigh) + // B2016-160 Support transitions to sections + while (!pitem.IsSection && !pitem.IsHigh) { StepInfo stpinfo = StepInfo.Get(pitem.ItemID); string thisTab = stpinfo.MyTab.CleanText; //StepInfo.Get(pitem.ItemID).MyTab.CleanText;