diff --git a/PROMS/DataLoader/TransitionFixer.cs b/PROMS/DataLoader/TransitionFixer.cs index 589916c6..0c30f8b2 100644 --- a/PROMS/DataLoader/TransitionFixer.cs +++ b/PROMS/DataLoader/TransitionFixer.cs @@ -108,6 +108,8 @@ namespace DataLoader { Console.WriteLine("{0} {1}", ex.GetType().Name, ex.Message); } + // Added for transitions to un-numbered steps + if (tran.NewTransToUnNumberedItem) item.NewTransToUnNumberedItem = true; } } if (updatedText.EndsWith(" ")) updatedText = updatedText.Substring(0, updatedText.Length - 1); @@ -129,12 +131,14 @@ namespace DataLoader c.Save(); } } + // Added for transitions to un-numbered steps if (item.NewTransToUnNumberedItem) { using (Item itm = item.Get()) { ItemAnnotation ia = itm.ItemAnnotations.Add(VerificationRequiredType); ia.SearchText = "Transition to un-numbered step"; + ia.UserID = "Migration"; itm.Save(); } } @@ -166,10 +170,9 @@ namespace DataLoader } } Status = "Done comparing"; - } + // Added for transitions to un-numbered steps private AnnotationType _VerificationRequiredType; // Using this to flag table to grid conversions - public AnnotationType VerificationRequiredType { get diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index de8eae4e..abd64819 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -297,6 +297,12 @@ namespace VEPROMS.CSLA.Library #region ItemInfo public partial class ItemInfo:IVEDrillDownReadOnly { + private bool _NewTransToUnNumberedItem = false; + public bool NewTransToUnNumberedItem + { + get { return _NewTransToUnNumberedItem; } + set { _NewTransToUnNumberedItem = value; } + } // put in for debugging //public static int CacheCountPrimaryKey //{ get { return _CacheByPrimaryKey.Count; } } diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs index ded43a6f..5f605e0c 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs @@ -10,6 +10,12 @@ namespace VEPROMS.CSLA.Library { public partial class TransitionInfo { + private bool _NewTransToUnNumberedItem = false; + public bool NewTransToUnNumberedItem + { + get { return _NewTransToUnNumberedItem; } + set { _NewTransToUnNumberedItem = value; } + } public string PathTo { get @@ -37,7 +43,10 @@ namespace VEPROMS.CSLA.Library //Console.WriteLine("TranType = {0}", TranType); //Console.WriteLine("MyItemToID = {0}", MyItemToID); //Console.WriteLine("MyItemRangeID = {0}", MyItemRangeID); - return ResolvePathTo(item.ActiveFormat, item, TranType, MyItemToID, MyItemRangeID); + string retval = ResolvePathTo(item.ActiveFormat, item, TranType, MyItemToID, MyItemRangeID); + if (item.NewTransToUnNumberedItem) + NewTransToUnNumberedItem = true; + return retval; } } #region AffectedTransitons @@ -410,10 +419,10 @@ namespace VEPROMS.CSLA.Library if(_AppendMethods==null) SetupMethods(); string retval = BuildString(tb); + // Added for transitions to un-numbered steps 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() {