From c4457c0397777cfcbfda2357e1297ce88150f632 Mon Sep 17 00:00:00 2001 From: Kathy Date: Mon, 23 Nov 2009 16:11:18 +0000 Subject: [PATCH] --- .../Extension/TransitionExt.cs | 29 +++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs index dac13498..345b628e 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs @@ -365,6 +365,27 @@ namespace VEPROMS.CSLA.Library if (tb._FromItem.MyProcedure.ItemID == tb._ToItem.MyProcedure.ItemID) return textAdded ? true : false; return AddTransitionProcTitle(textAdded, tb, token, nonToken); } + private static string Tab(ItemInfo item) + { + if (item == null) return ""; + string sret = ""; + switch (item.MyContent.Type / 10000) + { + case 0: //procedure + sret = ProcedureInfo.Get(item.ItemID).MyTab.CleanText; + break; + case 1: // section + sret = SectionInfo.Get(item.ItemID).MyTab.CleanText; + break; + case 2: // step + sret = StepInfo.Get(item.ItemID).MyTab.CleanText; + if (!item.IsHigh) + sret = Tab(item.ActiveParent as ItemInfo) + "." + sret.Trim(" .)".ToCharArray()); + break; + } + sret = sret.Trim(" .)".ToCharArray()); + return sret; + } private static bool AddStepNumber(bool textAdded, TransitionBuilder tb, string token, string nonToken) { // If we're on a step put out the step number. @@ -376,7 +397,9 @@ namespace VEPROMS.CSLA.Library if (tb._ToItem.PreviousID == null && tb._ToItem.ItemPartCount == 0 && tb._ToItem.ItemDocVersionCount == 0) Append(tb, "?", true); else - Append(tb, tb._ToItem.Ordinal.ToString(), true); + Append(tb, Tab(tb._ToItem), true); + //Append(tb, tb._ToItem.Ordinal.ToString(), true); + //Append(tb, tb._ToItem.MyTab.CleanText, true); textAdded = true; } return textAdded; @@ -387,7 +410,9 @@ namespace VEPROMS.CSLA.Library if (tb._RangeItem.PreviousID == null && tb._RangeItem.ItemPartCount == 0 && tb._RangeItem.ItemDocVersionCount == 0) Append(tb, "?", true); else - Append(tb, tb._RangeItem.Ordinal.ToString(), true); + Append(tb, Tab(tb._RangeItem), true); + //Append(tb, tb._RangeItem.Ordinal.ToString(), true); + //Append(tb, tb._RangeItem.MyTab.CleanText, true); textAdded = true; return textAdded; }