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

Added logic to handle the “, step” prefix in Point Beach’s transition number 6 (index 5)

Browse Source
This commit is contained in:
John Jenko 2014-03-14 16:58:09 +00:00
parent 0bfa619d99
commit ac8a99dd84
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -470,6 +470,14 @@ namespace VEPROMS.CSLA.Library
_Results.Append(Prefix); _Results.Append(Prefix);
_Prefix = null; _Prefix = null;
} }
else if (_TranType == 5 && Prefix != null)
{
if (!HasText && Prefix.StartsWith(", "))
_Results.Append(Prefix.TrimStart(", ".ToCharArray()));
else
_Results.Append(Prefix);
_Prefix = null;
}
// If the prefix contains an open paren, we want to add the open paren regardless // If the prefix contains an open paren, we want to add the open paren regardless
// of whether there already is text in the resulting string. // of whether there already is text in the resulting string.
else if (!HasText && Prefix != null && Prefix.Contains("(")) else if (!HasText && Prefix != null && Prefix.Contains("("))
@ -861,7 +869,8 @@ namespace VEPROMS.CSLA.Library
tb.Remove(tb.Length - 7, 7); // 7 is length of ", Step " tb.Remove(tb.Length - 7, 7); // 7 is length of ", Step "
tb.AppendPrefix(); tb.AppendPrefix();
} }
else if (tb._TranType == 4 && tb._ToItem.MoreThanOneStepSection()) //else if (tb._TranType == 4 && tb._ToItem.MoreThanOneStepSection())
else if (tb._TranType == 4 && tb._ToItem.MoreThanOneStepSection() || tb._TranType == 5)
{ {
tb.AppendPrefix(); tb.AppendPrefix();
} }
@ -949,6 +958,11 @@ namespace VEPROMS.CSLA.Library
if (tb._ToItem.MyProcedure.ItemID != tb._FromItem.MyProcedure.ItemID && sect != null && if (tb._ToItem.MyProcedure.ItemID != tb._FromItem.MyProcedure.ItemID && sect != null &&
sect.IsDefaultSection) return false; // tb.TextAdded; sect.IsDefaultSection) return false; // tb.TextAdded;
// if in same procedure and same section do not add it.
if (tb._ToItem.MyProcedure.ItemID == tb._FromItem.MyProcedure.ItemID &&
sect == TranGetSectionItem(tb._FromItem))
return false;
// If a 'thru' range, only put out the section if it's to a different section // If a 'thru' range, only put out the section if it's to a different section
// that is not the default section. // that is not the default section.
if (((tb._TransUI & E_TransUI.StepLast) == E_TransUI.StepLast) && ((tb._TransUI & E_TransUI.SectMenuStep) == E_TransUI.SectMenuStep)) if (((tb._TransUI & E_TransUI.StepLast) == E_TransUI.StepLast) && ((tb._TransUI & E_TransUI.SectMenuStep) == E_TransUI.SectMenuStep))