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

Merge pull request 'Development' (#162) from Development into master

Browse Source 
Merging B2023-116, B2023-117, and F2023-143 from development to master after successful testing.
This commit is contained in:
Devin Jankowski 2023-11-29 15:58:44 -05:00
commit 32dffbe56b
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PROMS/Volian.Controls.Library/DisplayHistory.cs
View File

@ -505,6 +505,8 @@ namespace Volian.Controls.Library
//}
#endregion
#region new style
// B2023-117 if DeleteStatus is zero,don't try to get Audit Info List
if (iai.DeleteStatus == 0) continue;
if (deletedItems == null)
deletedItems = tvAudits.Nodes.Add("Deleted Items");
string strR = null;

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

@ -433,7 +433,10 @@ namespace Volian.Print.Library
if (mySize < Height) mySize = Height * MyPageHelper.YMultiplier;
}
float yExtra2 = (SixLinesPerInch - MyItemInfo.MyDocStyle.Layout.FooterLength) ?? 0;
if (KeepStepsOnPage && !MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.StepSectionLayoutData.PaginateOnLowerStepLevel && ySizeIncludingFirst > yWithinMargins)
// B2023-116: Vogtle alarm pagination - sub-steps are separating from their HLS even if there is room for some (not all). If using the AlarmPagination
// flag AND this is a high level flag do not set the 'KeepStepsOnPage' to false, this allows the logic to check where pagination should occur for sub-steps
bool alarmPageKeepHighWithSubs = MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.StepSectionLayoutData.AlarmPagination && MyItemInfo.IsHigh;
if (KeepStepsOnPage && !alarmPageKeepHighWithSubs && !MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.StepSectionLayoutData.PaginateOnLowerStepLevel && ySizeIncludingFirst > yWithinMargins)
KeepStepsOnPage = false;
// B2020-123: Missing section continue message
// B2020-158 Calvert Approved Unit1 EOP-8/Appendix(1)/subsection RIC-2/Step A was printing by itself on bottom of page
@ -566,7 +569,9 @@ namespace Volian.Print.Library
KeepStepsOnPage = false;
}
}
if (KeepStepsOnPage && ySizeIncludingFirst > (yWithinMargins - ySizeBtmCtnMess1 - ySizeBtmEndMess1)) KeepStepsOnPage = false;
// B2023-116: Vogtle alarm pagination - sub-steps are separating from their HLS even if there is room for some (not all). See comment above for setting of
// 'alarmPageKeepHighWithSubs'.
if (KeepStepsOnPage && !alarmPageKeepHighWithSubs && ySizeIncludingFirst > (yWithinMargins - ySizeBtmCtnMess1 - ySizeBtmEndMess1)) KeepStepsOnPage = false;
if (!KeepWithHeader && !KeepStepsOnPage && mySize - SixLinesPerInch + yEndMsg - tableSpaceAvailable <= yPageSizeNextPage) // if the entire step can fit on one page, do a page break
{
// Don't want extra line before step