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

Browse Source
This commit is contained in:
Kathy Ruffing 2011-07-19 16:47:42 +00:00
parent 7b177a88f6
commit 71f7aaa018
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
View File

@ -2080,12 +2080,14 @@ namespace VEPROMS.CSLA.Library
cltext = cltext == null ? tbformat.Replace("{!C0}", "") : cltext.Replace("{!C0}", ""); cltext = cltext == null ? tbformat.Replace("{!C0}", "") : cltext.Replace("{!C0}", "");
cltext = cltext + " "; cltext = cltext + " ";
} }
// "{Null}" was introduced so that inheritance in format files could differentiate between an // "{Null}" was introduced so that inheritance in format files could differentiate between an
// empty string, and null. And also, so that if a tab was null but it's parent had text in the // empty string, and null. And also, so that if a tab was null but it's parent had text in the
// tab, don't inherit the parent's tab, use a null. // tab, don't inherit the parent's tab, use a null.
if ((FormatStepData.Sep != null && FormatStepData.Sep !="{Null}")&& MyPrevious != null) if ((FormatStepData.Sep != null && FormatStepData.Sep !="{Null}")&& MyPrevious != null && FormatStepData.StepLayoutData.EveryNLines != 99)
{ {
if (_MyHeader == null) _MyHeader = new MetaTag(FormatStepData.TabData.Font); if (_MyHeader == null) _MyHeader = new MetaTag(FormatStepData.TabData.Font);
_MyHeader.Text = FormatStepData.Sep; _MyHeader.Text = FormatStepData.Sep;
_MyHeader.CleanText = StripRtfFormatting(_MyHeader.Text); _MyHeader.CleanText = StripRtfFormatting(_MyHeader.Text);
_MyHeader.Justify = ContentAlignment.MiddleCenter; _MyHeader.Justify = ContentAlignment.MiddleCenter;

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

@ -494,7 +494,6 @@ namespace VEPROMS.CSLA.Library
parenstr); parenstr);
lretstr.Append(tb._FormatData.TransData.DelimiterForTransitionTitle); lretstr.Append(tb._FormatData.TransData.DelimiterForTransitionTitle);
} }
// LATER: if (DoSectionTransitions && GetSTepNO(TSeq1)) TransitionCat(AddCommaStep", Step"));
tb.ReplaceToken(lretstr.ToString()); tb.ReplaceToken(lretstr.ToString());
return (lretstr.Length != 0); return (lretstr.Length != 0);
} }
@ -715,6 +714,12 @@ namespace VEPROMS.CSLA.Library
private static bool AddTranGetSectionNumber(TransitionBuilder tb) private static bool AddTranGetSectionNumber(TransitionBuilder tb)
{ {
if (tb._TranType == 1 && tb._ToItem.ActiveSection.ItemID == tb._FromItem.ActiveSection.ItemID) return false; if (tb._TranType == 1 && tb._ToItem.ActiveSection.ItemID == tb._FromItem.ActiveSection.ItemID) return false;
if (tb._TranType == 0 && (tb._ToItem.IsSection || tb._ToItem.IsProcedure) && ((tb._TransUI & E_TransUI.StepAllowNone) == E_TransUI.StepAllowNone))
{
string tmpStr = tb.ToString();
if (tmpStr.ToUpper().EndsWith(", STEP ")) tb.Remove(tb.Length - 7, 7); // 7 is length of ", Step "
return true;
}
string retstr = TranGetSectionNumber(tb._ToItem); string retstr = TranGetSectionNumber(tb._ToItem);
tb.AppendPrefix(); tb.AppendPrefix();
tb.ReplaceToken(retstr); tb.ReplaceToken(retstr);