From a8d351bfc25b5aff732c8b6f603ccac9ad46dff7 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 17 Jan 2013 18:17:53 +0000 Subject: [PATCH] =?UTF-8?q?Fixed=20problem=20trying=20to=20convert=20an=20?= =?UTF-8?q?empty=20string=20to=20a=20number=20B2013-007=20fixed=20logic=20?= =?UTF-8?q?to=20handle=20=E2=80=9C{Proc=20Num}=20({Proc=20Title})=20Step?= =?UTF-8?q?=20{First=20Step}=E2=80=9D=20transition=20when=20no=20step=20nu?= =?UTF-8?q?mber=20is=20used.=20=20Needed=20to=20append=20a=20=E2=80=9C)?= =?UTF-8?q?=E2=80=9D.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs | 2 +- PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index 330d0c3a..9648bd7c 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -1202,7 +1202,7 @@ namespace VEPROMS.CSLA.Library ProcedureConfig pc = (ProcedureConfig)parent.MyConfig; int sectstartid = -1; string ss = pc == null ? null : pc.SectionStart; - if (ss != null) sectstartid = System.Convert.ToInt32(ss); + if (ss != null && ss != "") sectstartid = System.Convert.ToInt32(ss); else return false; if (ItemID == sectstartid) return true; return false; diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs index 77b79cf8..9ba61f6e 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs @@ -719,7 +719,10 @@ namespace VEPROMS.CSLA.Library else if ((tb._ToItem.IsSection || tb._ToItem.IsProcedure) && ((tb._TransUI & E_TransUI.StepAllowNone) == E_TransUI.StepAllowNone)) { string tmpStr = tb.ToString(); - if (tmpStr.ToUpper().EndsWith(", STEP ")) tb.Remove(tb.Length - 7, 7); // 7 is length of ", Step " + if (tmpStr.ToUpper().EndsWith(", STEP ")) + tb.Remove(tb.Length - 7, 7); // 7 is length of ", Step " + else if (tb.Prefix != null && tb.Prefix.StartsWith(")")) + tb.Append(")"); return true; } else