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

Browse Source
This commit is contained in:
Kathy Ruffing 2011-09-28 11:43:04 +00:00
parent 9f1fcd9ead
commit 5e782cef32
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -551,9 +551,28 @@ namespace VEPROMS.CSLA.Library
case 2: // step case 2: // step
ItemInfo pitem = item; ItemInfo pitem = item;
bool hasDelim = item.ActiveFormat.PlantFormat.FormatData.TransData.StepSubstepDelimeter != null;
List<string> DelimList = null;
if (!hasDelim)
{
DelimList = new List<string>();
SeqTabFmtList seqtabs = item.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.SeqTabFmtList;
foreach (SeqTabFmt seqtab in seqtabs)
{
string delim = seqtab.PrintTabFormat.Replace("{seq}", "");
DelimList.Add(delim.Trim());
}
}
while (!pitem.IsHigh) while (!pitem.IsHigh)
{ {
string thisTab = StepInfo.Get(pitem.ItemID).MyTab.CleanText; string thisTab = StepInfo.Get(pitem.ItemID).MyTab.CleanText;
// remove delimiters of '.' and ')' in tab.
if (!hasDelim)
{
// get list of delimiters to remove from the format:
foreach (string rmvDelim in DelimList) thisTab = thisTab.Replace(rmvDelim, "");
}
if (pitem.IsRNOPart) if (pitem.IsRNOPart)
{ {
if (thisTab == null || thisTab == "") if (thisTab == null || thisTab == "")
@ -569,7 +588,7 @@ namespace VEPROMS.CSLA.Library
if (thisTab != null && thisTab != "") if (thisTab != null && thisTab != "")
{ {
thisTab = thisTab.Trim(" ".ToCharArray()); thisTab = thisTab.Trim(" ".ToCharArray());
if (!thisTab.EndsWith(".") && !thisTab.EndsWith(")")) thisTab = thisTab + "."; if (hasDelim && !thisTab.EndsWith(".") && !thisTab.EndsWith(")")) thisTab = thisTab + ".";
} }
sret = thisTab + sret; sret = thisTab + sret;
} }
@ -580,8 +599,10 @@ namespace VEPROMS.CSLA.Library
if (pitem.IsHigh) if (pitem.IsHigh)
{ {
string hlsTab = StepInfo.Get(pitem.ItemID).MyTab.CleanText; string hlsTab = StepInfo.Get(pitem.ItemID).MyTab.CleanText;
if (!hasDelim)
foreach (string rmvDelim in DelimList) hlsTab = hlsTab.Replace(rmvDelim, "");
hlsTab = hlsTab.Trim(" ".ToCharArray()); hlsTab = hlsTab.Trim(" ".ToCharArray());
if (!hlsTab.EndsWith(".") && !hlsTab.EndsWith(")")) hlsTab = hlsTab + "."; if (hasDelim && !hlsTab.EndsWith(".") && !hlsTab.EndsWith(")")) hlsTab = hlsTab + ".";
sret = hlsTab + sret; sret = hlsTab + sret;
} }
break; break;