diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs index 0d40aaef..ff56396b 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs @@ -664,7 +664,10 @@ namespace VEPROMS.CSLA.Library thisTab = thisTab.Trim(" ".ToCharArray()); if (hasDelim && !thisTab.EndsWith(".") && !thisTab.EndsWith(")")) thisTab = thisTab + "."; } - sret = thisTab + sret; + // RHM 20130326 2039 - I added the logic to limit the addition of the section tab to + // the existing tab if it starts the same. + // Westinghouse/System Procs/WRS-101/Add6/4.2.7 Transition to 4.2.5 + if(sret == "" || !sret.StartsWith(thisTab)) sret = thisTab + sret; } pitem = pitem.ActiveParent as ItemInfo; if (pitem == null) break; @@ -722,7 +725,7 @@ namespace VEPROMS.CSLA.Library string tmpStr = tb.ToString(); if (tmpStr.ToUpper().EndsWith(", STEP ")) tb.Remove(tb.Length - 7, 7); // 7 is length of ", Step " - else if (tb.Prefix != null && tb.Prefix.StartsWith(")")) + else if (tb.Prefix != null && tb.Prefix.StartsWith(")") && (tb.ToString().IndexOf("(")>-1)) tb.Append(")"); return true; } diff --git a/PROMS/fmtxml/WST1all.xml b/PROMS/fmtxml/WST1all.xml index 096b0dda..9b60087a 100644 Binary files a/PROMS/fmtxml/WST1all.xml and b/PROMS/fmtxml/WST1all.xml differ diff --git a/PROMS/fmtxml/WST2all.xml b/PROMS/fmtxml/WST2all.xml index d2b6ac6f..eb62d122 100644 Binary files a/PROMS/fmtxml/WST2all.xml and b/PROMS/fmtxml/WST2all.xml differ diff --git a/PROMS/fmtxml/WSTALRall.xml b/PROMS/fmtxml/WSTALRall.xml index 05836de4..aecc3545 100644 Binary files a/PROMS/fmtxml/WSTALRall.xml and b/PROMS/fmtxml/WSTALRall.xml differ diff --git a/PROMS/fmtxml/WSTBCKall.xml b/PROMS/fmtxml/WSTBCKall.xml index 12c87acc..5e150463 100644 Binary files a/PROMS/fmtxml/WSTBCKall.xml and b/PROMS/fmtxml/WSTBCKall.xml differ