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

FNP: Fix AOP One column transitions that had extraneous (HLS.0) text

Browse Source
This commit is contained in:
Kathy Ruffing 2013-12-04 17:31:35 +00:00
parent 1095b60df3
commit ab6eab8b69
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -636,6 +636,9 @@ namespace VEPROMS.CSLA.Library
}
private static string Tab(ItemInfo item, bool doStep)
{
// 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;
if (item == null) return "";
string sret = "";
switch (item.MyContent.Type / 10000)
@ -687,6 +690,7 @@ namespace VEPROMS.CSLA.Library
{
thisTab = thisTab.Trim(" ".ToCharArray());
if (hasDelim && !thisTab.EndsWith(".") && !thisTab.EndsWith(")")) thisTab = thisTab + ".";
if (hasDotZero && thisTab.EndsWith(".0.")) thisTab = thisTab.Substring(0, thisTab.Length - 2);
}
// RHM 20130326 2039 - I added the logic to limit the addition of the section tab to
// the existing tab if it starts the same.
@ -711,7 +715,13 @@ namespace VEPROMS.CSLA.Library
foreach (string rmvDelim in DelimList) hlsTab = hlsTab.Replace(rmvDelim, "");
hlsTab = hlsTab.Trim(" ".ToCharArray());
if (hasDelim && !hlsTab.EndsWith(".") && !hlsTab.EndsWith(")")) hlsTab = hlsTab + ".";
sret = hlsTab + sret;
if (hasDotZero)
{
if (hlsTab.EndsWith(".0.")) hlsTab = hlsTab.Substring(0, hlsTab.Length - 2);
if (sret == "" || !sret.StartsWith(hlsTab)) sret = hlsTab + sret;
}
else
sret = hlsTab + sret;
}
}
break;
@ -906,6 +916,9 @@ namespace VEPROMS.CSLA.Library
retstr = retstr.Insert(indx, @"\u160?");
}
}
// *** DO NOT DELETE - to fix a problem where the word ,step was appearing twice when there was no
// section tab.
//if (retstr!=null&&retstr!="") tb.AppendPrefix();
tb.AppendPrefix();
tb.ReplaceToken(retstr);
return (retstr != null && retstr != "");