From c90633f7951776742fd1a5d52b84e25d84afc811 Mon Sep 17 00:00:00 2001 From: Kathy Date: Fri, 13 Nov 2009 13:39:27 +0000 Subject: [PATCH] --- .../Extension/TransitionExt.cs | 7 +++++++ PROMS/VEPROMS.CSLA.Library/Generated/Item.cs | 2 +- .../Generated/ItemInfo.cs | 6 +++--- .../Generated/ItemInfoList.cs | 20 +++++++++++++++++++ 4 files changed, 31 insertions(+), 4 deletions(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs index 22707f77..dac13498 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs @@ -94,6 +94,13 @@ namespace VEPROMS.CSLA.Library } this.RaiseListChangedEvents = true; } + public string Summarize() + { + StringBuilder sb = new StringBuilder(""); + foreach (TransitionInfo trans in this) + sb.Append("\r\n" + trans.PathFrom); + return sb.ToString(); + } #endregion #region ExternalTransitionsToChildren private class ExternalTransitionsToChildrenCriteria diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/Item.cs b/PROMS/VEPROMS.CSLA.Library/Generated/Item.cs index 3a625627..64eaed61 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/Item.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/Item.cs @@ -98,8 +98,8 @@ namespace VEPROMS.CSLA.Library { foreach (Item tmp in _RefreshItems) { - ItemInfo.Refresh(tmp); if (tmp._MyContent != null) ContentInfo.Refresh(tmp._MyContent); + ItemInfo.Refresh(tmp); } foreach (ItemAnnotation tmp in _RefreshItemAnnotations) { diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/ItemInfo.cs b/PROMS/VEPROMS.CSLA.Library/Generated/ItemInfo.cs index 17d178ec..43be61b2 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/ItemInfo.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/ItemInfo.cs @@ -453,11 +453,11 @@ namespace VEPROMS.CSLA.Library } _MyPrevious = null; // Reset list so that the next line gets a new list if (MyPrevious != null) MyPrevious.RefreshNextItems(); // Update List for new value - if (_ContentID != tmp.ContentID) - { + //if (_ContentID != tmp.ContentID) + //{ if (MyContent != null) MyContent.RefreshContentItems(); // Update List for old value _ContentID = tmp.ContentID; // Update the value - } + //} _MyContent = null; // Reset list so that the next line gets a new list if (MyContent != null) MyContent.RefreshContentItems(); // Update List for new value _DTS = tmp.DTS; diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/ItemInfoList.cs b/PROMS/VEPROMS.CSLA.Library/Generated/ItemInfoList.cs index a3a9e563..a2f5b315 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/ItemInfoList.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/ItemInfoList.cs @@ -37,6 +37,26 @@ namespace VEPROMS.CSLA.Library foreach (ItemInfo tmp in this) { tmp.Changed += new ItemInfoEvent(tmp_Changed); + tmp.Deleted += new ItemInfoEvent(tmp_Deleted); + } + } + private bool _RefreshingList = false; + public bool RefreshingList + { + get { return _RefreshingList; } + set { _RefreshingList = value; } + } + void tmp_Deleted(object sender) + { + ItemInfo ii = sender as ItemInfo; + if (ii != null) + { + IsReadOnly = false; + Remove(ii); + IsReadOnly = true; + RefreshingList = true; + this.OnListChanged(new ListChangedEventArgs(ListChangedType.ItemChanged, 0)); + RefreshingList = false; } } void tmp_Changed(object sender)