From d345997474ab2c954ef78ca4d55742ab23063eb7 Mon Sep 17 00:00:00 2001 From: Rich Date: Tue, 3 Jun 2014 21:39:37 +0000 Subject: [PATCH] Added call to SetupSecurity after closing edit user dialog Aded code to corect how Summary of Changes report was processing list of changes Added code to account for double line box around high level steps Added code to resolve printing cautions and notes associated with substeps --- .../dlgManageSecurity.cs | 3 +- .../PDFChronologyReport.cs | 35 ++++++++++++------- PROMS/Volian.Print.Library/vlnParagraph.cs | 33 ++++++++++------- 3 files changed, 45 insertions(+), 26 deletions(-) diff --git a/PROMS/VEPROMS User Interface/dlgManageSecurity.cs b/PROMS/VEPROMS User Interface/dlgManageSecurity.cs index 783003e0..2bb50d7f 100644 --- a/PROMS/VEPROMS User Interface/dlgManageSecurity.cs +++ b/PROMS/VEPROMS User Interface/dlgManageSecurity.cs @@ -227,7 +227,8 @@ namespace VEPROMS if (frm.ShowDialog(this) == DialogResult.OK) { frm.MyUser.Save(); - } + SetupSecurity(); + } } } private void deleteUserToolStripMenuItem_Click(object sender, EventArgs e) diff --git a/PROMS/Volian.Print.Library/PDFChronologyReport.cs b/PROMS/Volian.Print.Library/PDFChronologyReport.cs index 23ad9841..27e3f0de 100644 --- a/PROMS/Volian.Print.Library/PDFChronologyReport.cs +++ b/PROMS/Volian.Print.Library/PDFChronologyReport.cs @@ -1228,22 +1228,31 @@ namespace Volian.Print.Library ContentAuditInfo caiFirst = null; foreach (ContentAuditInfo cai in auditList1) { - if (caiFirst == null) + if (caiFirst == null) caiFirst = cai; else { - if (cai.ContentID == caiFirst.ContentID && cai.Text != caiFirst.Text) - { - if (caiFirst.ActionWhat == "Added" && (cai.ActionWhat == "Added" || cai.ActionWhat == "Restored")) - auditList2.Add(cai); - else - { - auditList2.Add(caiFirst); - auditList2.Add(cai); - } - } - caiFirst = null; - } + if (cai.ContentID == caiFirst.ContentID && cai.Text != caiFirst.Text) + { + if (caiFirst.ActionWhat == "Added" && (cai.ActionWhat == "Added" || cai.ActionWhat == "Restored")) + { + auditList2.Add(cai); + caiFirst = null; + } + else + { + auditList2.Add(caiFirst); + auditList2.Add(cai); + caiFirst = null; + } + } + else + { + if(caiFirst.Text != string.Empty) + auditList2.Add(caiFirst); + caiFirst = cai; + } + } } int cols = 5; int borders = 0; diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index da8980d5..543d4a8a 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -1758,15 +1758,18 @@ namespace Volian.Print.Library ChildrenAbove.StepDesignator = null; //reset StepDesignator if (itemInfo.Cautions != null && !(itemInfo.IsCaution || itemInfo.IsNote)) { - if (itemInfo.ActiveFormat.MyStepSectionLayoutData.Dev_Format) - { - // For deviations, the Cautions are always in the same place. - // Fix for Catawba E-1 deviation for step 10. Has note/caution off of a paragraph instead of HLS - float xoffDev = (float)itemInfo.MyDocStyle.Layout.LeftMargin; - yoffLeft = ChildrenLeft.Add(cb, itemInfo.Cautions, xoff, yoff, yoff, rnoLevel, maxRNO, formatInfo); - } - else - yoff = ChildrenAbove.Add(cb, itemInfo.Cautions, xoff, yoff, yoff, rnoLevel, maxRNO, formatInfo); + if (itemInfo.ActiveFormat.MyStepSectionLayoutData.Dev_Format) + { + // For deviations, the Cautions are always in the same place. + // Fix for Catawba E-1 deviation for step 10. Has note/caution off of a paragraph instead of HLS + float xoffDev = (float)itemInfo.MyDocStyle.Layout.LeftMargin; + yoffLeft = ChildrenLeft.Add(cb, itemInfo.Cautions, xoff, yoff, yoff, rnoLevel, maxRNO, formatInfo); + } + else + { + if (yoffRightParent > yoff && ((itemInfo.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DoubleBoxHLS) != E_DocStructStyle.DoubleBoxHLS)) yoff = yoffRightParent; + yoff = ChildrenAbove.Add(cb, itemInfo.Cautions, xoff, yoff, yoff, rnoLevel, maxRNO, formatInfo); + } } if (itemInfo.Notes != null && !(itemInfo.IsCaution || itemInfo.IsNote)) { @@ -1782,8 +1785,8 @@ namespace Volian.Print.Library // Notes/Cautions span the page. If the right (RNO) column is below current yoff, use the // yoff from this. Without this, an overlap of text between the note and the bottom of the // RNO was occurring for FNP - Unit 2/AOP, AOP-4.0. - if (yoffRightParent > yoff) yoff = yoffRightParent; - yoff = ChildrenAbove.Add(cb, itemInfo.Notes, xoff, yoff, yoff, rnoLevel, maxRNO, formatInfo); + if (yoffRightParent > yoff && ((itemInfo.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DoubleBoxHLS) != E_DocStructStyle.DoubleBoxHLS)) yoff = yoffRightParent; + yoff = ChildrenAbove.Add(cb, itemInfo.Notes, xoff, yoff, yoff, rnoLevel, maxRNO, formatInfo); } } // Comanche Peak uses CAUTION2 type to enter a Step Designator, which is placed to the left of the step number. @@ -2876,7 +2879,13 @@ namespace Volian.Print.Library } public float YSize // How big this paragraph is with all of its children { - get { return SmartTemplateAdjust + _YBottomMost - _YTopMost; } + get + { + float ysize = SmartTemplateAdjust + _YBottomMost - _YTopMost; + if (MyItemInfo.IsHigh && MyItemInfo.MyPrevious != null && ((MyItemInfo.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DoubleBoxHLS) == E_DocStructStyle.DoubleBoxHLS)) + ysize += SixLinesPerInch; + return ysize; + } } private ItemInfo _MyItemInfo; public ItemInfo MyItemInfo