diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ContentExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ContentExt.cs index 3e731211..1baae9a1 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ContentExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ContentExt.cs @@ -378,10 +378,17 @@ namespace VEPROMS.CSLA.Library get { return _NewValue; } set { _NewValue = value; } } - public StaticContentInfoEventArgs(string oldValue, string newValue) + string _Type; + public string Type + { + get { return _Type; } + set { _Type = value; } + } + public StaticContentInfoEventArgs(string oldValue, string newValue, string type) { _OldValue = oldValue; _NewValue = newValue; + _Type = type; } } public partial class ContentInfo @@ -400,8 +407,9 @@ namespace VEPROMS.CSLA.Library if (id == ContentID) return true; return false; } - public void FixTransitionText(TransitionInfo tran, TransitionLookup tranLookup) + public void FixTransitionText(TransitionInfo tran, TransitionLookup tranLookup, ItemInfo ii) { + if (ii.InList(4706)) Console.WriteLine("jcb"); //string transText = tran.ResolvePathTo(); //string lookFor = string.Format(@"", tran.TranType, tran.TransitionID); ////string lookFor = string.Format(@"", tran.TranType, tran.TransitionID); @@ -441,7 +449,7 @@ namespace VEPROMS.CSLA.Library if (gg != newvalue) { _Text = Text.Substring(0, myIndex) + newvalue + Text.Substring(myIndex + myLength); - OnStaticContentInfoChange(this, new StaticContentInfoEventArgs(gg, newvalue)); + OnStaticContentInfoChange(ii, new StaticContentInfoEventArgs(gg, newvalue,"TX")); break; // Text has been processed } } @@ -500,9 +508,9 @@ namespace VEPROMS.CSLA.Library } } } - public void FixTransitionText(TransitionInfo tran) + public void FixTransitionText(TransitionInfo tran, ItemInfo ii) { - FixTransitionText(tran, null); + FixTransitionText(tran, null, ii); //string transText = tran.ResolvePathTo(tranLookup); //string lookFor = string.Format(@"", tran.TranType, tran.TransitionID); ////string lookFor = string.Format(@"", tran.TranType, tran.TransitionID); @@ -526,7 +534,7 @@ namespace VEPROMS.CSLA.Library // } //} } - public void FixContentText(RoUsageInfo rousg, string value, int rotype, ROFstInfo origROFstInfo) // string newvalue) + public void FixContentText(RoUsageInfo rousg, string value, int rotype, ROFstInfo origROFstInfo, ItemInfo ii) // string newvalue) { string newvalue = value; newvalue = newvalue.Replace("{", @"\{").Replace("}", @"\}"); @@ -551,7 +559,8 @@ namespace VEPROMS.CSLA.Library if ((gg.Replace(@"\'b0", @"\'B0") != newvalue.Replace(@"\'b0", @"\'B0"))) { _Text = Text.Substring(0, myIndex) + newvalue + _Text.Substring(myIndex + myLength); - break; // Text has been processed + OnStaticContentInfoChange(ii, new StaticContentInfoEventArgs(gg, newvalue, "RO")); + break; // Text has been processed } } }