diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs index 7c7d727a..d8069cb6 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs @@ -598,7 +598,7 @@ namespace VEPROMS.CSLA.Library // add hls tab. if (pitem.IsHigh) { - string hlsTab = StepInfo.Get(pitem.ItemID).MyTab.CleanText; + string hlsTab = StepInfo.Get(pitem.ItemID).MyTab.CleanTextNoSymbols; if (!hasDelim) foreach (string rmvDelim in DelimList) hlsTab = hlsTab.Replace(rmvDelim, ""); hlsTab = hlsTab.Trim(" ".ToCharArray()); @@ -610,6 +610,7 @@ namespace VEPROMS.CSLA.Library sret = sret.Trim(" .)".ToCharArray()); return sret; } + private static bool AddStepNumber(TransitionBuilder tb) { // If we're on a step put out the step number. @@ -620,7 +621,8 @@ namespace VEPROMS.CSLA.Library { // check for transition that goes to a procedure step section with title of 'Procedure steps' followed // by ', Step'. This should output as 'Procedure step xyz' rather than 'Procedure steps, step xyz' - if (!tb._TransFormat.Contains("{Last Step}") && tb.Prefix != null && tb.Prefix.ToUpper().Contains(", STEP") && tb.ToString().ToUpper().EndsWith("PROCEDURE STEPS")) + // TODO: NEED TO USE A FORMAT VARIABLE TO CONTROL THE FOLLOWING + if (tb._ToItem.ActiveFormat.Name.StartsWith("HLP") && !tb._TransFormat.Contains("{Last Step}") && tb.Prefix != null && tb.Prefix.ToUpper().Contains(", STEP") && tb.ToString().ToUpper().EndsWith("PROCEDURE STEPS")) { tb.Remove(tb.Length - 15, 15); // remove "procedure steps" tb.Append("procedure Step"); diff --git a/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs b/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs index 16183966..64338d48 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs @@ -356,6 +356,19 @@ namespace VEPROMS.CSLA.Library { public Top(XmlNode xmlNode) : base(xmlNode) { } public Top() : base() { } + #region Font + private VE_Font _Font; + [Category("Font")] + [DisplayName("Font")] + [Description("Font")] + public VE_Font Font + { + get + { + return (_Font == null) ? _Font = new VE_Font(XmlNode) : _Font; + } + } + #endregion #region Margin private LazyLoad _Margin; [Category("Continue Msg")] @@ -403,6 +416,19 @@ namespace VEPROMS.CSLA.Library { public Bottom(XmlNode xmlNode) : base(xmlNode) { } public Bottom() : base() { } + #region Font + private VE_Font _Font; + [Category("Font")] + [DisplayName("Font")] + [Description("Font")] + public VE_Font Font + { + get + { + return (_Font == null) ? _Font = new VE_Font(XmlNode) : _Font; + } + } + #endregion #region Margin private LazyLoad _Margin; [Category("Continue Msg")] diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs index 6de6c30e..7fc97509 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs @@ -86,6 +86,7 @@ namespace VEPROMS.CSLA.Library { if (_WindowsFont == null) { + //FontStyle style = (Family == "Cornet")?FontStyle.Italic : FontStyle.Regular; FontStyle style = FontStyle.Regular; if (Style != E_Style.None) { @@ -2833,6 +2834,14 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _OnlySingleColumn, "@OnlySingleColumn"); } } + private LazyLoad _NullBox; + public bool NullBox + { + get + { + return LazyLoad(ref _NullBox, "@NullBox"); + } + } } #endregion #region TopOfPage @@ -3369,14 +3378,49 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Inactive, "@Inactive"); } } - private LazyLoad _StepTypeColOverride; - public string StepTypeColOverride - { - get - { + //private LazyLoad _StepTypeColOverride; + //public string StepTypeColOverride + //{ + // get + // { + // return LazyLoad(ref _StepTypeColOverride, "@StepTypeColOverride"); + // } + //} + private LazyLoad _StepTypeColOverride; + public float? StepTypeColOverride + { + get + { return LazyLoad(ref _StepTypeColOverride, "@StepTypeColOverride"); - } + } + } + private LazyLoad _StepTypeColOverrideEdit; + + public float? StepTypeColOverrideEdit + { + get + { + return LazyLoad(ref _StepTypeColOverrideEdit, "@StepTypeColOverrideEdit"); + } + } + private LazyLoad _StepTypeWidthOverride; + + public float? StepTypeWidthOverride + { + get + { + return LazyLoad(ref _StepTypeWidthOverride, "@StepTypeWidthOverride"); + } + } + private LazyLoad _StepTypeWidthOverrideEdit; + + public float? StepTypeWidthOverrideEdit + { + get + { + return LazyLoad(ref _StepTypeWidthOverrideEdit, "@StepTypeWidthOverrideEdit"); + } } private LazyLoad _Sep; public string Sep