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

Fix to UpdateTransitionText for bugs B2012-071 and B2012-079 One ContentAudit for all transitions Indentify Automatic Transition renumbering with current user

Browse Source 
If the user selects a deleted item from history, a messagebox is displayed Include deleted items in the Change List
Fixed CloseTabItem so that closed DockTab fires events
Added event handler for changes to the procedure content so that updating the Rev Date and Rev Number will refresh the step item change bars
Remove event handler for changes to the procedure content on dispose
Added Section headers for the Annotation portion of the Chronology and Summary reports
This commit is contained in:
Rich
2012-04-04 19:08:56 +00:00
parent 74097dc316
commit b4e85fd3b0
7 changed files with 113 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -426,6 +426,7 @@ namespace Volian.Print.Library
}
}
bool annotationHeader = false;
section = string.Empty;
stepnum = string.Empty;
foreach (AnnotationAuditInfo aai in AnnotationList)
{
@@ -448,6 +449,20 @@ namespace Volian.Print.Library
annotationHeader = true;
}
string[] NewPath = GetNewPath(AuditList, aai.IContentID);
if (NewPath[0] != section)
{
section = NewPath[0];
stepnum = string.Empty;
h = new Phrase();
h.Font = f4;
h.Add(section);
c = new PdfPCell(h);
c.Colspan = cols;
c.HorizontalAlignment = Element.ALIGN_LEFT;
c.PaddingBottom = paddingBottom;
//c.Border = borders;
t.AddCell(c);
}
if (NewPath[1] != stepnum)
{
stepnum = NewPath[1];
@@ -1077,10 +1092,6 @@ namespace Volian.Print.Library
annotationList.Add(firstAAI);
annotationList.Add(lastAAI);
}
else if (lastAAI.ActionWhat == "Changed" && firstAAI.ActionWhat == "Added") // && lastAAI.SearchText == firstAAI.SearchText)
{
annotationList.Add(firstAAI);
}
else if (lastAAI.ActionWhat == "Changed" && firstAAI.ActionWhat == "Added") // && lastAAI.SearchText != firstAAI.SearchText)
{
lastAAI.ActionWhat = firstAAI.ActionWhat;
@@ -1107,9 +1118,43 @@ namespace Volian.Print.Library
lastAAI = aai;
}
if (firstAAI != null)
annotationList.Add(firstAAI);
if (lastAAI != null)
annotationList.Add(lastAAI);
{
if (lastAAI == null)
{
annotationList.Add(firstAAI);
}
else if (lastAAI.ActionWhat == "Deleted" && firstAAI.DTS < MyProc.DTS)
{
annotationList.Add(lastAAI);
}
else if (lastAAI.ActionWhat == "Changed" && firstAAI.ActionWhat != "Added") // && lastAAI.SearchText != firstAAI.SearchText)
{
annotationList.Add(firstAAI);
annotationList.Add(lastAAI);
}
else if (lastAAI.ActionWhat == "Changed" && firstAAI.ActionWhat == "Added") // && lastAAI.SearchText != firstAAI.SearchText)
{
lastAAI.ActionWhat = firstAAI.ActionWhat;
annotationList.Add(lastAAI);
firstAAI = null;
lastAAI = null;
}
else if (lastAAI.ActionWhat == "Restored" && firstAAI.ActionWhat == "Added") // && lastAAI.SearchText != firstAAI.SearchText)
{
lastAAI.ActionWhat = firstAAI.ActionWhat;
annotationList.Add(lastAAI);
firstAAI = null;
lastAAI = null;
}
else if (lastAAI == null && firstAAI.ActionWhat == "Added")
{
annotationList.Add(firstAAI);
}
}
//if (firstAAI != null)
// annotationList.Add(firstAAI);
//if (lastAAI != null)
// annotationList.Add(lastAAI);
#endregion
int cols = 5;
int borders = 0;
@@ -1421,6 +1466,7 @@ namespace Volian.Print.Library
////c.Border = borders;
//t.AddCell(c);
//t.AddCell(BlankCell(cols));
section = string.Empty;
stepnum = string.Empty;
foreach (AnnotationAuditInfo aai in annotationList)
{
@@ -1443,6 +1489,20 @@ namespace Volian.Print.Library
annotationHeader = true;
}
string[] NewPath = GetNewPath(AuditList, aai.IContentID);
if (NewPath[0] != section)
{
section = NewPath[0];
stepnum = string.Empty;
h = new Phrase();
h.Font = f4;
h.Add(section);
c = new PdfPCell(h);
c.Colspan = cols;
c.HorizontalAlignment = Element.ALIGN_LEFT;
c.PaddingBottom = paddingBottom;
//c.Border = borders;
t.AddCell(c);
}
if (NewPath[1] != stepnum)
{
stepnum = NewPath[1];