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

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

@ -227,6 +227,7 @@ namespace VEPROMS
if (frm.ShowDialog(this) == DialogResult.OK)
{
frm.MyUser.Save();
SetupSecurity();
}
}
}

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

@ -1235,14 +1235,23 @@ namespace Volian.Print.Library
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;

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

@ -1766,7 +1766,10 @@ namespace Volian.Print.Library
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,7 +1785,7 @@ 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;
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);
}
}
@ -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