From c2fef5fafe1a3294732f48211cb24f090c779957 Mon Sep 17 00:00:00 2001 From: Rich Date: Thu, 11 Aug 2011 21:21:49 +0000 Subject: [PATCH] Fixed Summary of Changes Report to show original text --- PROMS/Volian.Print.Library/PDFChronologyReport.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/PROMS/Volian.Print.Library/PDFChronologyReport.cs b/PROMS/Volian.Print.Library/PDFChronologyReport.cs index f26b54f0..6f36e5ff 100644 --- a/PROMS/Volian.Print.Library/PDFChronologyReport.cs +++ b/PROMS/Volian.Print.Library/PDFChronologyReport.cs @@ -892,6 +892,7 @@ namespace Volian.Print.Library { if (firstCAI.DTS > MyProc.DTS) lastCAI.ActionWhat = firstCAI.ActionWhat; + auditList.Add(firstCAI); auditList.Add(lastCAI); firstCAI = null; lastCAI = null; @@ -899,7 +900,7 @@ namespace Volian.Print.Library } else if (firstCAI.ActionWhat == "Added" && lastCAI.ActionWhat == "Deleted" && firstCAI.DTS == lastCAI.DTS) { - auditList.Add(lastCAI); + //auditList.Add(lastCAI); firstCAI = null; lastCAI = null; } @@ -925,6 +926,7 @@ namespace Volian.Print.Library { if (firstCAI.DTS > MyProc.DTS) lastCAI.ActionWhat = firstCAI.ActionWhat; + auditList.Add(firstCAI); auditList.Add(lastCAI); firstCAI = null; lastCAI = null; @@ -932,7 +934,7 @@ namespace Volian.Print.Library } else if (firstCAI.ActionWhat == "Added" && lastCAI.ActionWhat == "Deleted" && firstCAI.DTS == lastCAI.DTS) { - auditList.Add(lastCAI); + //auditList.Add(lastCAI); firstCAI = null; lastCAI = null; } @@ -1120,7 +1122,7 @@ namespace Volian.Print.Library h = new Phrase(); h.Font = f3; // h.Add(cai.ActionWhen > MyProc.DTS ? cai.ActionWhat : "Original"); - string actionWhat = cai.ActionWhat; //(cai.ActionWhat == "Added" && cai.DTS <= MyProc.DTS) ? "Original" : cai.ActionWhat != "Changed" ? cai.ActionWhat : cai.DTS <= maxDTS ? "Restored" : cai.DTS > MyProc.DTS ? cai.ActionWhat : "Original"; + string actionWhat = (cai.ActionWhat == "Added" && cai.DTS <= MyProc.DTS) ? "Original" : cai.ActionWhat; //(cai.ActionWhat == "Added" && cai.DTS <= MyProc.DTS) ? "Original" : cai.ActionWhat != "Changed" ? cai.ActionWhat : cai.DTS <= maxDTS ? "Restored" : cai.DTS > MyProc.DTS ? cai.ActionWhat : "Original"; if (actionWhat == "Deleted" || actionWhat == "Restored") h.Add(actionWhat + "\r\n" + cai.ActionWhen.ToString()); else