This commit is contained in:
@@ -452,6 +452,62 @@ namespace VEPROMS.CSLA.Library
|
||||
if (item == null) return "";
|
||||
string sret = "";
|
||||
switch (item.MyContent.Type / 10000)
|
||||
{
|
||||
case 0: //procedure
|
||||
sret = ProcedureInfo.Get(item.ItemID).MyTab.CleanText;
|
||||
break;
|
||||
case 1: // section
|
||||
sret = SectionInfo.Get(item.ItemID).MyTab.CleanText;
|
||||
break;
|
||||
case 2: // step
|
||||
|
||||
ItemInfo pitem = item;
|
||||
while (!pitem.IsHigh)
|
||||
{
|
||||
string thisTab = StepInfo.Get(pitem.ItemID).MyTab.CleanText;
|
||||
if (pitem.IsRNOPart)
|
||||
{
|
||||
//string mytb = sret.Trim(" .)".ToCharArray());
|
||||
if (thisTab == null || thisTab == "")
|
||||
sret = "RNO." + sret;
|
||||
else
|
||||
{
|
||||
thisTab = thisTab.Trim(" ".ToCharArray());
|
||||
sret = "RNO." + thisTab + sret;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
//sret = Tab(item.ActiveParent as ItemInfo) + "." + sret.Trim(" .)".ToCharArray()); //original
|
||||
if (thisTab != null && thisTab != "")
|
||||
{
|
||||
thisTab = thisTab.Trim(" ".ToCharArray());
|
||||
if (!thisTab.EndsWith(".") && !thisTab.EndsWith(")")) thisTab = thisTab + ".";
|
||||
}
|
||||
sret = thisTab + sret;
|
||||
}
|
||||
pitem = pitem.ActiveParent as ItemInfo;
|
||||
if (pitem == null) break;
|
||||
}
|
||||
// add hls tab.
|
||||
if (pitem.IsHigh)
|
||||
{
|
||||
string hlsTab = StepInfo.Get(pitem.ItemID).MyTab.CleanText;
|
||||
hlsTab = hlsTab.Trim(" ".ToCharArray());
|
||||
if (!hlsTab.EndsWith(".") && !hlsTab.EndsWith(")")) hlsTab = hlsTab + ".";
|
||||
sret = hlsTab + sret;
|
||||
}
|
||||
break;
|
||||
}
|
||||
sret = sret.Trim(" .)".ToCharArray());
|
||||
return sret;
|
||||
}
|
||||
private static string RhmTab(ItemInfo item)
|
||||
{
|
||||
if (item == null) return "";
|
||||
if (item.ItemID == 2065) Console.WriteLine("here");
|
||||
string sret = "";
|
||||
switch (item.MyContent.Type / 10000)
|
||||
{
|
||||
case 0: //procedure
|
||||
sret = ProcedureInfo.Get(item.ItemID).MyTab.CleanText;
|
||||
@@ -472,11 +528,23 @@ namespace VEPROMS.CSLA.Library
|
||||
sret = Tab(item.ActiveParent as ItemInfo) + ".RNO." + sret.Trim(" .)".ToCharArray());
|
||||
}
|
||||
else
|
||||
sret = Tab(item.ActiveParent as ItemInfo) + "." + sret.Trim(" .)".ToCharArray());
|
||||
{
|
||||
//sret = Tab(item.ActiveParent as ItemInfo) + "." + sret.Trim(" .)".ToCharArray()); //original
|
||||
string tmp1 = sret.Contains(@")") ? ")" : ".";
|
||||
string tmp2 = sret.Trim(" .)".ToCharArray());
|
||||
string srettmp = Tab(item.ActiveParent as ItemInfo);
|
||||
sret = srettmp + sret.Trim(" ".ToCharArray());
|
||||
if (!sret.EndsWith(".") && !sret.EndsWith(")")) sret = sret + ".";
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
sret = sret.Trim(" ".ToCharArray());
|
||||
if (!sret.EndsWith(".") && !sret.EndsWith(")")) sret = sret + ".";
|
||||
}
|
||||
break;
|
||||
}
|
||||
sret = sret.Trim(" .)".ToCharArray());
|
||||
//sret = sret.Trim(" .)".ToCharArray()); // original
|
||||
return sret;
|
||||
}
|
||||
private static bool AddStepNumber(bool textAdded, TransitionBuilder tb, string token, string nonToken)
|
||||
|
Reference in New Issue
Block a user