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

Calvert Alarms: 2 consecutive Notes with Warning after did not print correctly.

Browse Source
This commit is contained in:
Kathy Ruffing
2014-08-18 13:32:57 +00:00
parent 0ac3d3291f
commit c24d6b94ea
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3251,7 +3251,12 @@ namespace VEPROMS.CSLA.Library
prevTbFormat = MyPrevious.IsInRNO ? prevStepData.TabData.RNOIdentPrint : prevStepData.TabData.IdentPrint;
prevTbFormat = ReplaceStepToken(prevTbFormat);
}
if (NextItem != null)
bool specialCalvertAlarm = false;
if (ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm)
{
if (GetNextItem() != null && MyContent.Type != GetNextItem().MyContent.Type) specialCalvertAlarm = true;
}
if (NextItem != null && !specialCalvertAlarm)
{
nextStepData = NextItem.FormatStepData;
// tried to duplicate functionality from 16-bit code.
@@ -3361,8 +3366,8 @@ namespace VEPROMS.CSLA.Library
// tabbing correctly.
if (ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm)
{
if (MyPrevious != null && MyContent.Type != MyPrevious.MyContent.Type) return true;
if (GetNextItem() != null && MyContent.Type != GetNextItem().MyContent.Type) return true;
if (MyPrevious != null && MyContent.Type != MyPrevious.MyContent.Type) return false;
if (GetNextItem() != null && MyContent.Type != GetNextItem().MyContent.Type) return false;
}
if (!FormatStepData.MixCautionsAndNotes) return false;