From 60ed4a9e316be616efbd4ac3981966cae9c2aff1 Mon Sep 17 00:00:00 2001 From: Rich Date: Tue, 21 May 2013 14:18:38 +0000 Subject: [PATCH] When rev date in proc config file is not a date, use change bar date Changed casting iteminfo to procedure info to just using procedureinfo object to get pdfnumber for printing pdf --- PROMS/Volian.Controls.Library/DisplayHistory.cs | 2 +- PROMS/Volian.Controls.Library/vlnTreeView.cs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/PROMS/Volian.Controls.Library/DisplayHistory.cs b/PROMS/Volian.Controls.Library/DisplayHistory.cs index cca7d22b..5b3bd673 100644 --- a/PROMS/Volian.Controls.Library/DisplayHistory.cs +++ b/PROMS/Volian.Controls.Library/DisplayHistory.cs @@ -158,7 +158,7 @@ namespace Volian.Controls.Library else { DateTime revDate; - if (!DateTime.TryParse(cfg.Print_RevDate, out revDate)) revDate = DateTime.Now; + if (!DateTime.TryParse(cfg.Print_RevDate, out revDate)) revDate = MyProcedureInfo.ChangeBarDate; // DateTime.Now; SetRevDate(revDate); //SetRevDate(DateTime.Parse(cfg.Print_RevDate)); } diff --git a/PROMS/Volian.Controls.Library/vlnTreeView.cs b/PROMS/Volian.Controls.Library/vlnTreeView.cs index ad597eac..a5ecc500 100644 --- a/PROMS/Volian.Controls.Library/vlnTreeView.cs +++ b/PROMS/Volian.Controls.Library/vlnTreeView.cs @@ -739,7 +739,7 @@ namespace Volian.Controls.Library if (ri.RevisionID < int.Parse(mip.Parent.Tag.ToString())) superceded = true; } - vlnTreeViewPdfArgs args = new vlnTreeViewPdfArgs(Volian.Base.Library.TmpFile.CreateFileName((ItemInfo.Get(ri.ItemID) as ProcedureInfo).PDFNumber), ri.LatestVersion.PDF, superceded ? "Superceded" : ""); + vlnTreeViewPdfArgs args = new vlnTreeViewPdfArgs(Volian.Base.Library.TmpFile.CreateFileName(ProcedureInfo.Get(ri.ItemID).PDFNumber), ri.LatestVersion.PDF, superceded ? "Superceded" : ""); OnViewPDF(sender, args); // System.Diagnostics.Process pp = System.Diagnostics.Process.Start(GetDocPdf(ri, superceded)); } @@ -756,7 +756,7 @@ namespace Volian.Controls.Library } ItemInfo ii = ItemInfo.Get(ri.ItemID); ii.MyDocVersion.DocVersionConfig.SelectedSlave = ri.MyConfig.Applicability_Index; - vlnTreeViewPdfArgs args = new vlnTreeViewPdfArgs(Volian.Base.Library.TmpFile.CreateFileName((ii as ProcedureInfo).PDFNumber), ri.LatestVersion.PDF, superceded ? "Superceded" : ""); + vlnTreeViewPdfArgs args = new vlnTreeViewPdfArgs(Volian.Base.Library.TmpFile.CreateFileName(ProcedureInfo.Get(ri.ItemID).PDFNumber), ri.LatestVersion.PDF, superceded ? "Superceded" : ""); OnViewPDF(sender, args); // System.Diagnostics.Process pp = System.Diagnostics.Process.Start(GetDocPdf(ri, superceded)); } @@ -765,7 +765,7 @@ namespace Volian.Controls.Library MenuItem mi = sender as MenuItem; if (mi == null) return; RevisionInfo ri = mi.Tag as RevisionInfo; - vlnTreeViewPdfArgs args = new vlnTreeViewPdfArgs(Volian.Base.Library.TmpFile.CreateFileName((ItemInfo.Get(ri.ItemID) as ProcedureInfo).PDFNumber + " Summary of Changes"), ri.LatestVersion.SummaryPDF, ""); + vlnTreeViewPdfArgs args = new vlnTreeViewPdfArgs(Volian.Base.Library.TmpFile.CreateFileName(ProcedureInfo.Get(ri.ItemID).PDFNumber + " Summary of Changes"), ri.LatestVersion.SummaryPDF, ""); OnViewPDF(sender, args); // System.Diagnostics.Process pps = System.Diagnostics.Process.Start(GetDocSummaryPdf(ri)); } @@ -776,7 +776,7 @@ namespace Volian.Controls.Library RevisionInfo ri = mi.Tag as RevisionInfo; ItemInfo ii = ItemInfo.Get(ri.ItemID); ii.MyDocVersion.DocVersionConfig.SelectedSlave = ri.MyConfig.Applicability_Index; - vlnTreeViewPdfArgs args = new vlnTreeViewPdfArgs(Volian.Base.Library.TmpFile.CreateFileName((ii as ProcedureInfo).PDFNumber + " Summary of Changes"), ri.LatestVersion.SummaryPDF, ""); + vlnTreeViewPdfArgs args = new vlnTreeViewPdfArgs(Volian.Base.Library.TmpFile.CreateFileName(ProcedureInfo.Get(ri.ItemID).PDFNumber + " Summary of Changes"), ri.LatestVersion.SummaryPDF, ""); OnViewPDF(sender, args); // System.Diagnostics.Process pps = System.Diagnostics.Process.Start(GetDocSummaryPdf(ri)); }