Added code to handle non-date formatted revision dates (eg: DRAFT)
Modified method to populate ContentAuditInfoList used in chronology and summary report Modified method to populate AnnotationAuditInfoList used in chronology and summary report Modified code to use ChangeBarDate when preparing chronology and summary reports
This commit is contained in:
@@ -156,7 +156,12 @@ namespace Volian.Controls.Library
|
||||
if (cfg.Print_RevDate == null || cfg.Print_RevDate == string.Empty)
|
||||
SetRevDate(MyProcedureInfo.DTS);
|
||||
else
|
||||
SetRevDate(DateTime.Parse(cfg.Print_RevDate));
|
||||
{
|
||||
DateTime revDate;
|
||||
if (!DateTime.TryParse(cfg.Print_RevDate, out revDate)) revDate = DateTime.Now;
|
||||
SetRevDate(revDate);
|
||||
//SetRevDate(DateTime.Parse(cfg.Print_RevDate));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -490,15 +495,15 @@ namespace Volian.Controls.Library
|
||||
AnnotationAuditInfoList aail2;
|
||||
if (ApplDisplayMode > 0)
|
||||
{
|
||||
cail2 = ContentAuditInfoList.GetChronologyByUnit(MyProcedureInfo.ItemID, MyProcedureInfo.ItemID, false, ApplDisplayMode);
|
||||
cail3 = ContentAuditInfoList.GetSummaryByUnit(MyProcedureInfo.ItemID, MyProcedureInfo.ItemID, false, ApplDisplayMode);
|
||||
aail2 = AnnotationAuditInfoList.GetChronologyByUnit(MyProcedureInfo.ItemID, MyProcedureInfo.ItemID, ApplDisplayMode);
|
||||
cail2 = ContentAuditInfoList.GetChronologyByUnit(MyProcedureInfo.ItemID, MyProcedureInfo.ItemID, false, ApplDisplayMode, MyProcedureInfo.ChangeBarDate);
|
||||
cail3 = ContentAuditInfoList.GetSummaryByUnit(MyProcedureInfo.ItemID, MyProcedureInfo.ItemID, false, ApplDisplayMode, MyProcedureInfo.ChangeBarDate);
|
||||
aail2 = AnnotationAuditInfoList.GetChronologyByUnit(MyProcedureInfo.ItemID, MyProcedureInfo.ItemID, ApplDisplayMode, MyProcedureInfo.ChangeBarDate);
|
||||
}
|
||||
else
|
||||
{
|
||||
cail2 = ContentAuditInfoList.GetChronology(MyProcedureInfo.ItemID, MyProcedureInfo.ItemID, false);
|
||||
cail3 = ContentAuditInfoList.GetSummary(MyProcedureInfo.ItemID, MyProcedureInfo.ItemID, false);
|
||||
aail2 = AnnotationAuditInfoList.GetChronology(MyProcedureInfo.ItemID, MyProcedureInfo.ItemID);
|
||||
cail2 = ContentAuditInfoList.GetChronology(MyProcedureInfo.ItemID, MyProcedureInfo.ItemID, false, MyProcedureInfo.ChangeBarDate);
|
||||
cail3 = ContentAuditInfoList.GetSummary(MyProcedureInfo.ItemID, MyProcedureInfo.ItemID, false, MyProcedureInfo.ChangeBarDate);
|
||||
aail2 = AnnotationAuditInfoList.GetChronology(MyProcedureInfo.ItemID, MyProcedureInfo.ItemID, MyProcedureInfo.ChangeBarDate);
|
||||
}
|
||||
//Console.WriteLine("WalkProcedure cail2: {0} seconds", TimeSpan.FromTicks(DateTime.Now.Ticks - start.Ticks).TotalSeconds);
|
||||
_ChronologyAuditList = cail2;
|
||||
@@ -551,7 +556,7 @@ namespace Volian.Controls.Library
|
||||
//if (lbChanges.Items.Count > 0)
|
||||
//{
|
||||
//jcb added 20120425 to suppress annotations in report
|
||||
_AnnotationList = AnnotationAuditInfoList.GetChronology(0, 0);
|
||||
_AnnotationList = AnnotationAuditInfoList.GetChronology(0, 0, MyProcedureInfo.ChangeBarDate);
|
||||
//added setting selected slave in order for reports to replace unit number,etc jcb 20101010
|
||||
MyItemInfo.MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave = ApplDisplayMode;
|
||||
OnChronologyPrintRequest(new DisplayHistoryReportEventArgs(Volian.Base.Library.VlnSettings.TemporaryFolder + @"\MyChronology.pdf", MyItemInfo.MyProcedure, _ChronologyAuditList, _AnnotationList));
|
||||
@@ -563,7 +568,7 @@ namespace Volian.Controls.Library
|
||||
//if (lbChanges.Items.Count > 0)
|
||||
//{
|
||||
//jcb added 20120425 to suppress annotations in report
|
||||
_AnnotationList = AnnotationAuditInfoList.GetChronology(0, 0);
|
||||
_AnnotationList = AnnotationAuditInfoList.GetChronology(0, 0, MyProcedureInfo.ChangeBarDate);
|
||||
//added setting selected slave in order for reports to replace unit number,etc jcb 20101010
|
||||
MyItemInfo.MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave = ApplDisplayMode;
|
||||
OnSummaryPrintRequest(new DisplayHistoryReportEventArgs(Volian.Base.Library.VlnSettings.TemporaryFolder + @"\MySummary.pdf", MyItemInfo.MyProcedure, _SummaryAuditList, _AnnotationList));
|
||||
|
Reference in New Issue
Block a user