Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed problem trying to convert an empty string to a number

Browse Source 
B2013-007 fixed logic to handle “{Proc Num} ({Proc Title}) Step {First Step}” transition when no step number is used.  Needed to append a “)”.
This commit is contained in:
John Jenko 2013-01-17 18:17:53 +00:00
parent 6a325705d7
commit a8d351bfc2
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
View File

@ -1202,7 +1202,7 @@ namespace VEPROMS.CSLA.Library
ProcedureConfig pc = (ProcedureConfig)parent.MyConfig; ProcedureConfig pc = (ProcedureConfig)parent.MyConfig;
int sectstartid = -1; int sectstartid = -1;
string ss = pc == null ? null : pc.SectionStart; 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; else return false;
if (ItemID == sectstartid) return true; if (ItemID == sectstartid) return true;
return false; return false;

5
PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs
View File

@ -719,7 +719,10 @@ namespace VEPROMS.CSLA.Library
else if ((tb._ToItem.IsSection || tb._ToItem.IsProcedure) && ((tb._TransUI & E_TransUI.StepAllowNone) == E_TransUI.StepAllowNone)) else if ((tb._ToItem.IsSection || tb._ToItem.IsProcedure) && ((tb._TransUI & E_TransUI.StepAllowNone) == E_TransUI.StepAllowNone))
{ {
string tmpStr = tb.ToString(); 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; return true;
} }
else else