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

C2014-006: for BGE alarms, transition to window should have window with HLS text

Browse Source 
Fix B2015-211 (pagination flag to fix step text from overlapping bottom continue message)
This commit is contained in:
Kathy Ruffing 2016-06-27 13:18:00 +00:00
parent 4906031916
commit 7e2d6ca977
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1133,7 +1133,13 @@ namespace VEPROMS.CSLA.Library
ItemInfo secitm = TranGetSectionItem(tb._ToItem); ItemInfo secitm = TranGetSectionItem(tb._ToItem);
if ((!((tb._TransUI & E_TransUI.StepAllowNone) == E_TransUI.StepAllowNone)) || tb._ToItem.MyContent.Type > 20000) if ((!((tb._TransUI & E_TransUI.StepAllowNone) == E_TransUI.StepAllowNone)) || tb._ToItem.MyContent.Type > 20000)
{ {
if (tb.HasText) if (tb._FormatData.PrintData.SpecialCaseCalvertAlarm && tb._ToItem.IsHigh && tb._ToItem.FormatStepData.StepEditData.TypeMenu.MenuItem.ToUpper().Contains("WINDOW"))
{
//use text rather than tab: (BGE Alarm window transitions - C2014-006)
tb.ReplaceToken(Tab(tb._ToItem, true) + ' ' + tb._ToItem.DisplayText);
return true;
}
else if (tb.HasText)
{ {
// check for transition that goes to a procedure step section with title of 'Procedure steps' followed // 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' // by ', Step'. This should output as 'Procedure step xyz' rather than 'Procedure steps, step xyz'

8
PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
View File

@ -768,6 +768,14 @@ namespace VEPROMS.CSLA.Library
return LazyLoad(ref _SpecialCaseCalvertAlarm, "@SpecialCaseCalvertAlarm"); return LazyLoad(ref _SpecialCaseCalvertAlarm, "@SpecialCaseCalvertAlarm");
} }
} }
private LazyLoad<bool> _SpecialCaseCalvertPagination;
public bool SpecialCaseCalvertPagination
{
get
{
return LazyLoad(ref _SpecialCaseCalvertPagination, "@SpecialCaseCalvertPagination");
}
}
private LazyLoad<bool> _WCNTraining; private LazyLoad<bool> _WCNTraining;
public bool WCNTraining public bool WCNTraining
{ {

2
PROMS/Volian.Print.Library/Pagination.cs
View File

@ -1194,6 +1194,8 @@ namespace Volian.Print.Library
yAddForBtmMsg = myBottomMsgSpace; yAddForBtmMsg = myBottomMsgSpace;
else else
yAddForBtmMsg = 0; yAddForBtmMsg = 0;
// The following was added to fix B2015-211: step text was overlapping bottom continue message
if (myPara.MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvertPagination) yAddForBtmMsg = -myBottomMsgSpace;
spaceOnPage += yAddForBtmMsg; spaceOnPage += yAddForBtmMsg;
if (!IsIP3Format) if (!IsIP3Format)
{ {