This commit is contained in:
parent
8680480492
commit
f79bc0cb63
@ -664,7 +664,10 @@ namespace VEPROMS.CSLA.Library
|
|||||||
thisTab = thisTab.Trim(" ".ToCharArray());
|
thisTab = thisTab.Trim(" ".ToCharArray());
|
||||||
if (hasDelim && !thisTab.EndsWith(".") && !thisTab.EndsWith(")")) thisTab = thisTab + ".";
|
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;
|
pitem = pitem.ActiveParent as ItemInfo;
|
||||||
if (pitem == null) break;
|
if (pitem == null) break;
|
||||||
@ -722,7 +725,7 @@ namespace VEPROMS.CSLA.Library
|
|||||||
string tmpStr = tb.ToString();
|
string tmpStr = tb.ToString();
|
||||||
if (tmpStr.ToUpper().EndsWith(", STEP "))
|
if (tmpStr.ToUpper().EndsWith(", STEP "))
|
||||||
tb.Remove(tb.Length - 7, 7); // 7 is length of ", 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(")");
|
tb.Append(")");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user