From 7e2d6ca97796ae6690f434bfdd98f11bdb5e2919 Mon Sep 17 00:00:00 2001 From: Kathy Date: Mon, 27 Jun 2016 13:18:00 +0000 Subject: [PATCH] C2014-006: for BGE alarms, transition to window should have window with HLS text Fix B2015-211 (pagination flag to fix step text from overlapping bottom continue message) --- PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs | 8 +++++++- PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs | 8 ++++++++ PROMS/Volian.Print.Library/Pagination.cs | 2 ++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs index 79b925c6..ceeb04f7 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs @@ -1133,7 +1133,13 @@ namespace VEPROMS.CSLA.Library ItemInfo secitm = TranGetSectionItem(tb._ToItem); 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 // by ', Step'. This should output as 'Procedure step xyz' rather than 'Procedure steps, step xyz' diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs index 776894d2..576ea3f0 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs @@ -768,6 +768,14 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _SpecialCaseCalvertAlarm, "@SpecialCaseCalvertAlarm"); } } + private LazyLoad _SpecialCaseCalvertPagination; + public bool SpecialCaseCalvertPagination + { + get + { + return LazyLoad(ref _SpecialCaseCalvertPagination, "@SpecialCaseCalvertPagination"); + } + } private LazyLoad _WCNTraining; public bool WCNTraining { diff --git a/PROMS/Volian.Print.Library/Pagination.cs b/PROMS/Volian.Print.Library/Pagination.cs index e842ed16..28ea64f4 100644 --- a/PROMS/Volian.Print.Library/Pagination.cs +++ b/PROMS/Volian.Print.Library/Pagination.cs @@ -1194,6 +1194,8 @@ namespace Volian.Print.Library yAddForBtmMsg = myBottomMsgSpace; else 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; if (!IsIP3Format) {