From c0d0c3d08e52b1f792c75c27093d2b4c7a7aa4f3 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 14 Nov 2012 19:17:58 +0000 Subject: [PATCH] commented out test coding to save for now. use the ordinal step number instead of the step tab if the transition is to a non-numbered step added bool to track if the new transition is to a non-numbered step --- .../Extension/ContentExt.cs | 4 ++++ .../Extension/TransitionExt.cs | 17 ++++++++++++++++- .../VEPROMS.CSLA.Library/Generated/ItemInfo.cs | 6 ++++++ 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ContentExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ContentExt.cs index e9407908..0f3fec01 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ContentExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ContentExt.cs @@ -19,6 +19,10 @@ namespace VEPROMS.CSLA.Library public void FixTransitionText(TransitionInfo tran) { string transText = tran.ResolvePathTo(); + //if (transText == string.Empty) + //{ + // transText = tran.MyItemToID.Ordinal.ToString(); + //} string lookFor = string.Format(@"", tran.TranType, tran.TransitionID); //string lookFor = string.Format(@"", tran.TranType, tran.TransitionID); Match m = Regex.Match(Text, lookFor); diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs index 45d742d8..ded43a6f 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs @@ -409,7 +409,22 @@ namespace VEPROMS.CSLA.Library toItem.ItemID==rangeItem.ItemID && !toItem.IsHigh?toItem.LastSibling:rangeItem); if(_AppendMethods==null) SetupMethods(); - return BuildString(tb); + string retval = BuildString(tb); + if (retval == string.Empty) + { + retval = toItem.Ordinal.ToString(); + if (fromInfo.MyContent.Text.Contains(", IDisposable { + private bool _NewTransToUnNumberedItem = false; + public bool NewTransToUnNumberedItem + { + get { return _NewTransToUnNumberedItem; } + set { _NewTransToUnNumberedItem = value; } + } public event ItemInfoEvent Changed; private void OnChange() {