From 71f7aaa018d556d9eca80fc5e162c42b890df3fa Mon Sep 17 00:00:00 2001 From: Kathy Date: Tue, 19 Jul 2011 16:47:42 +0000 Subject: [PATCH] --- PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs | 4 +++- PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs | 7 ++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index 0dd4455e..1954b402 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -2080,12 +2080,14 @@ namespace VEPROMS.CSLA.Library cltext = cltext == null ? tbformat.Replace("{!C0}", "") : cltext.Replace("{!C0}", ""); cltext = cltext + " "; } + // "{Null}" was introduced so that inheritance in format files could differentiate between an // empty string, and null. And also, so that if a tab was null but it's parent had text in the // tab, don't inherit the parent's tab, use a null. - if ((FormatStepData.Sep != null && FormatStepData.Sep !="{Null}")&& MyPrevious != null) + if ((FormatStepData.Sep != null && FormatStepData.Sep !="{Null}")&& MyPrevious != null && FormatStepData.StepLayoutData.EveryNLines != 99) { if (_MyHeader == null) _MyHeader = new MetaTag(FormatStepData.TabData.Font); + _MyHeader.Text = FormatStepData.Sep; _MyHeader.CleanText = StripRtfFormatting(_MyHeader.Text); _MyHeader.Justify = ContentAlignment.MiddleCenter; diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs index d4ee94be..0ec6df79 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs @@ -494,7 +494,6 @@ namespace VEPROMS.CSLA.Library parenstr); lretstr.Append(tb._FormatData.TransData.DelimiterForTransitionTitle); } - // LATER: if (DoSectionTransitions && GetSTepNO(TSeq1)) TransitionCat(AddCommaStep", Step")); tb.ReplaceToken(lretstr.ToString()); return (lretstr.Length != 0); } @@ -715,6 +714,12 @@ namespace VEPROMS.CSLA.Library private static bool AddTranGetSectionNumber(TransitionBuilder tb) { if (tb._TranType == 1 && tb._ToItem.ActiveSection.ItemID == tb._FromItem.ActiveSection.ItemID) return false; + if (tb._TranType == 0 && (tb._ToItem.IsSection || tb._ToItem.IsProcedure) && ((tb._TransUI & E_TransUI.StepAllowNone) == E_TransUI.StepAllowNone)) + { + string tmpStr = tb.ToString(); + if (tmpStr.ToUpper().EndsWith(", STEP ")) tb.Remove(tb.Length - 7, 7); // 7 is length of ", Step " + return true; + } string retstr = TranGetSectionNumber(tb._ToItem); tb.AppendPrefix(); tb.ReplaceToken(retstr);