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

Added call to SetupSecurity after closing edit user dialog

Browse Source 
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
This commit is contained in:
Rich 2014-06-03 21:39:37 +00:00
parent eb6a6f40a5
commit d345997474
3 changed files with 45 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
PROMS/VEPROMS User Interface/dlgManageSecurity.cs
View File

@ -227,7 +227,8 @@ namespace VEPROMS
if (frm.ShowDialog(this) == DialogResult.OK) if (frm.ShowDialog(this) == DialogResult.OK)
{ {
frm.MyUser.Save(); frm.MyUser.Save();
} SetupSecurity();
}
} }
} }
private void deleteUserToolStripMenuItem_Click(object sender, EventArgs e) private void deleteUserToolStripMenuItem_Click(object sender, EventArgs e)

35
PROMS/Volian.Print.Library/PDFChronologyReport.cs
View File

@ -1228,22 +1228,31 @@ namespace Volian.Print.Library
ContentAuditInfo caiFirst = null; ContentAuditInfo caiFirst = null;
foreach (ContentAuditInfo cai in auditList1) foreach (ContentAuditInfo cai in auditList1)
{ {
if (caiFirst == null) if (caiFirst == null)
caiFirst = cai; caiFirst = cai;
else else
{ {
if (cai.ContentID == caiFirst.ContentID && cai.Text != caiFirst.Text) if (cai.ContentID == caiFirst.ContentID && cai.Text != caiFirst.Text)
{ {
if (caiFirst.ActionWhat == "Added" && (cai.ActionWhat == "Added" || cai.ActionWhat == "Restored")) if (caiFirst.ActionWhat == "Added" && (cai.ActionWhat == "Added" || cai.ActionWhat == "Restored"))
auditList2.Add(cai); {
else auditList2.Add(cai);
{ caiFirst = null;
auditList2.Add(caiFirst); }
auditList2.Add(cai); else
} {
} auditList2.Add(caiFirst);
caiFirst = null; auditList2.Add(cai);
} caiFirst = null;
}
}
else
{
if(caiFirst.Text != string.Empty)
auditList2.Add(caiFirst);
caiFirst = cai;
}
}
} }
int cols = 5; int cols = 5;
int borders = 0; int borders = 0;

33
PROMS/Volian.Print.Library/vlnParagraph.cs
View File

@ -1758,15 +1758,18 @@ namespace Volian.Print.Library
ChildrenAbove.StepDesignator = null; //reset StepDesignator ChildrenAbove.StepDesignator = null; //reset StepDesignator
if (itemInfo.Cautions != null && !(itemInfo.IsCaution || itemInfo.IsNote)) if (itemInfo.Cautions != null && !(itemInfo.IsCaution || itemInfo.IsNote))
{ {
if (itemInfo.ActiveFormat.MyStepSectionLayoutData.Dev_Format) if (itemInfo.ActiveFormat.MyStepSectionLayoutData.Dev_Format)
{ {
// For deviations, the Cautions are always in the same place. // 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 // 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; float xoffDev = (float)itemInfo.MyDocStyle.Layout.LeftMargin;
yoffLeft = ChildrenLeft.Add(cb, itemInfo.Cautions, xoff, yoff, yoff, rnoLevel, maxRNO, formatInfo); yoffLeft = ChildrenLeft.Add(cb, itemInfo.Cautions, xoff, yoff, yoff, rnoLevel, maxRNO, formatInfo);
} }
else else
yoff = ChildrenAbove.Add(cb, itemInfo.Cautions, 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.Cautions, xoff, yoff, yoff, rnoLevel, maxRNO, formatInfo);
}
} }
if (itemInfo.Notes != null && !(itemInfo.IsCaution || itemInfo.IsNote)) 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 // 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 // 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. // RNO was occurring for FNP - Unit 2/AOP, AOP-4.0.
if (yoffRightParent > yoff) yoff = yoffRightParent; 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); 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. // 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 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; private ItemInfo _MyItemInfo;
public ItemInfo MyItemInfo public ItemInfo MyItemInfo