From eae4e95c0a03048831c10a055d8d9d04d227fee8 Mon Sep 17 00:00:00 2001 From: Rich Date: Thu, 16 Oct 2014 11:43:51 +0000 Subject: [PATCH] Fixed Step_CheckOffIndex beyond 9 Fixed logic for determining Transition Text --- .../VEPROMS.CSLA.Library/Config/StepConfig.cs | 23 +++++++++++-------- .../Extension/TransitionExt.cs | 2 +- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Config/StepConfig.cs b/PROMS/VEPROMS.CSLA.Library/Config/StepConfig.cs index 6aec251f..9ee9c557 100644 --- a/PROMS/VEPROMS.CSLA.Library/Config/StepConfig.cs +++ b/PROMS/VEPROMS.CSLA.Library/Config/StepConfig.cs @@ -173,15 +173,20 @@ namespace VEPROMS.CSLA.Library // a 0 if found. The dataloader was fixed (6/8/12) to not migrate the // bad character, but this was added, in case there are some other conditions. int tst = 0; - try - { - tst = int.Parse(s); - } - catch (Exception ex) - { - return 0; - } - return int.Parse(s); + if(int.TryParse(s,out tst)) + return tst; + tst = (int) s[0]; + tst -= '0'; + return tst; + //try + //{ + // tst = int.Parse(s); + //} + //catch (Exception ex) + //{ + // return 0; + //} + //return int.Parse(s); } set { diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs index 8c337c05..fbe151ad 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs @@ -738,7 +738,7 @@ namespace VEPROMS.CSLA.Library { // if this section has the DSS_AddDotZeroStdHLS, then we need to account for this when // concatenating text onto the tabs. - bool hasDotZero = (item.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DSS_AddDotZeroStdHLS) == E_DocStructStyle.DSS_AddDotZeroStdHLS; + bool hasDotZero = !item.IsProcedure && (item.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DSS_AddDotZeroStdHLS) == E_DocStructStyle.DSS_AddDotZeroStdHLS; if (item == null) return ""; string sret = ""; switch (item.MyContent.Type / 10000)