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

Added SetHeader method to ItemInfo class for VCSummer data

Browse Source 
Added code to handle Tab formatting of Caution and Note steps for VCSummer data
Added code to support hard new lines in Procedure title for VCSummer data
Added code to properly display transition for non Procedure step section to Procedure step for VCSummer data
This commit is contained in:
Rich 2013-07-03 03:38:01 +00:00
parent dedb3ac1ff
commit 2160e20c16
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -324,6 +324,14 @@ namespace VEPROMS.CSLA.Library
#region ItemInfo
public partial class ItemInfo:IVEDrillDownReadOnly
{
public void SetHeader(VE_Font myFont, string myText)
{
_MyHeader = new MetaTag(myFont);
_TagsSetup = true;
_MyHeader.CleanText = myText;
_MyHeader.Text = myText;
_MyHeader.Justify = ContentAlignment.MiddleCenter;
}
public void MoveItem(IVEDrillDownReadOnly pInfo, int index)
{
using (ItemInfoList movedItems = ItemInfoList.GetMoveItem(ItemID, index))
@ -2856,8 +2864,20 @@ namespace VEPROMS.CSLA.Library
{
if (MyPrevious != null)
{
if(tbformat == prevTbFormat)
_MyHeader = null;
if (tbformat == prevTbFormat)
{
if (MyPrevious.FormatStepData.TabData.IsTransition)
{
if (tbformat != nextTbFormat)
{
tbformat = "";
_MyHeader = null;
return tbformat;
}
}
else
_MyHeader = null;
}
}
tbformat = ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.IdentB;
TabToIdentBAdjustFont();
@ -2872,6 +2892,8 @@ namespace VEPROMS.CSLA.Library
tbformat = tbformat + ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.IdentB;
TabToIdentBAdjustFont();
}
else if (FormatStepData.TabData.IsTransition)
return tbformat;
// else if this has a next
else if (tbformat != null && NextItem != null && !FormatStepData.AlwaysTab &&
(!FormatStepData.MixCautionsAndNotes ||

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

@ -596,6 +596,7 @@ namespace VEPROMS.CSLA.Library
return true; // (tb.TextAdded = true);
}
string parenstr = tb._ToItem.MyProcedure.MyContent.Text;
parenstr = parenstr.Replace("\\LINE ", " ").Replace("\r\n", " ");
StringBuilder lretstr = new StringBuilder();
// LATER: For an else - Do I need to strip underlining here? See promsnt\lib\edit\gettran.c
if (parenstr != "<NO TITLE>" || tb._FormatData.ProcData.PrintNoTitle)
@ -714,7 +715,7 @@ namespace VEPROMS.CSLA.Library
// check for transition that goes to a procedure step section with title of 'Procedure steps' followed
// by ', Step'. This should output as 'Procedure step xyz' rather than 'Procedure steps, step xyz'
// TODO: NEED TO USE A FORMAT VARIABLE TO CONTROL THE FOLLOWING
if (tb._ToItem.ActiveFormat.Name.StartsWith("OHLP") && !tb._TransFormat.Contains("{Last Step}") && tb.Prefix != null && tb.Prefix.ToUpper().Contains(", STEP") && tb.ToString().ToUpper().EndsWith("PROCEDURE STEPS"))
if ((tb._FormatData.TransData.AdjustStepTransitionText || tb._ToItem.ActiveFormat.Name.StartsWith("OHLP")) && !tb._TransFormat.Contains("{Last Step}") && tb.Prefix != null && tb.Prefix.ToUpper().Contains(", STEP") && tb.ToString().ToUpper().EndsWith("PROCEDURE STEPS"))
{
tb.Remove(tb.Length - 15, 15); // remove "procedure steps"
tb.Append("procedure Step");