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

Browse Source
This commit is contained in:
Kathy Ruffing 2010-10-15 16:36:41 +00:00
parent 043995b4b4
commit 530e41a44f
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -624,18 +624,23 @@ namespace VEPROMS.CSLA.Library
} }
private static bool AddOptionalTranGetSectionHdr(bool textAdded, TransitionBuilder tb, string token, string nonToken) private static bool AddOptionalTranGetSectionHdr(bool textAdded, TransitionBuilder tb, string token, string nonToken)
{ {
// output from 16-bit code looks like section header // If section is not a procedure step section, add it.
// token is passed in for future use, i.e. if text is placed between "?" and "." to // If Procedure going to has only 1 step section, do not add it.
// request other processing. // If procedure going to has more than 1 step section and is NOT same procedure
// and going to default section, do not add it.
// If procedure going to has more than 1 step section and going to non-default section, add it.
// If in same procedure, the section header is put out if not in the same section. // first handle 'to' non-step section. Always add it.
// If in a different procedure, the section header is put out if the 'to' item is not the if (tb._ToItem.IsSection && !tb._ToItem.IsStepSection)return AddTranGetSectionHdr(textAdded, tb, token, nonToken);
// default (or start) section.
if (tb._FromItem.MyProcedure.ItemID == tb._ToItem.MyProcedure.ItemID) // Now, handle case where 'to' procedure only has one step section OR going 'to' the default section of a
{ // different procedure. It is NOT added.
if (TranGetSectionItem(tb._FromItem).ItemID == TranGetSectionItem(tb._ToItem).ItemID) return textAdded ? true : false; int cntsect = 0;
} ItemInfo sect = TranGetSectionItem(tb._ToItem);
else if (TranGetSectionItem(tb._ToItem).IsDefaultSection) return textAdded ? true : false; foreach (ItemInfo ii in tb._ToItem.MyProcedure.Sections) if (ii.IsStepSection) cntsect++;
if (cntsect == 1 || (sect != null && sect.IsDefaultSection && tb._ToItem.IsStep)
|| (tb._ToItem.MyProcedure != tb._FromItem.MyProcedure && sect != null && sect.IsDefaultSection && tb._ToItem.IsSection)
|| tb._ToItem.IsProcedure) return textAdded ? true : false;
return AddTranGetSectionHdr(textAdded, tb, token, nonToken); return AddTranGetSectionHdr(textAdded, tb, token, nonToken);
} }
private static bool AddTranGetSectionHdr(bool textAdded, TransitionBuilder tb, string token, string nonToken) private static bool AddTranGetSectionHdr(bool textAdded, TransitionBuilder tb, string token, string nonToken)