diff --git a/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs b/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs index 3d1c1573..82412622 100644 --- a/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs +++ b/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs @@ -308,7 +308,7 @@ namespace VEPROMS { foreach (ProcedureInfo pi in args.MyItems) pi.IsSelected = _MyApproval.ProcedureExists(pi); - PDFConsistencyCheckReport rpt = new PDFConsistencyCheckReport(args.ReportName, args.MyItems); + PDFConsistencyCheckReport rpt = new PDFConsistencyCheckReport(args.ReportName, args.MyItems, args.MyDocVersion); //B2020-020 needed to pass in DocVersion to get paper size from format rpt.BuildReport(); } private void SetupComboBoxes() @@ -533,12 +533,12 @@ namespace VEPROMS UpdateClbMore(); _DoingConsistencyCheck = false; btnCheckMore.Enabled = false; - btnOkay.Enabled = !swtbtCascade.Value; // C2018-008 only disable if we automatically selected procedures (cascade during consistancy check) + btnOkay.Enabled = !swtbtCascade.Value; // C2018-008 only disable if we automatically selected procedures (cascade during consistency check) } private void btnReportMore_Click(object sender, EventArgs e) { - OnConsistencyPrintRequest(new ConsistencyReportArgs(Volian.Base.Library.VlnSettings.TemporaryFolder + @"\MyConsistency.pdf", _MyItemInfoList)); + OnConsistencyPrintRequest(new ConsistencyReportArgs(Volian.Base.Library.VlnSettings.TemporaryFolder + @"\MyConsistency.pdf", _MyItemInfoList, _MyDocVersion)); //B2020-020 needed to pass in DocVersion to get paper size from format } private void fgProcs_AfterEdit(object sender, C1.Win.C1FlexGrid.RowColEventArgs e) @@ -1358,10 +1358,17 @@ namespace VEPROMS get { return _MyItems; } set { _MyItems = value; } } - public ConsistencyReportArgs(string reportName, ItemInfoList myItems) + private DocVersionInfo _MyDocVersion; + public DocVersionInfo MyDocVersion + { + get { return _MyDocVersion; } + set { _MyDocVersion = value; } + } + public ConsistencyReportArgs(string reportName, ItemInfoList myItems, DocVersionInfo myDocVerion) { _ReportName = reportName; _MyItems = myItems; + _MyDocVersion = myDocVerion; //B2020-020 needed to pass in DocVersion to get paper size from format } } } diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index 5328e0e2..4d2bb708 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -740,7 +740,7 @@ namespace VEPROMS if (dvi == null) return; this.Cursor = Cursors.WaitCursor; ItemInfoList iil = ItemInfoList.GetAllInconsistencies(dvi.VersionID); - Volian.Print.Library.PDFConsistencyCheckReport rpt = new Volian.Print.Library.PDFConsistencyCheckReport(Volian.Base.Library.VlnSettings.TemporaryFolder + @"\AllInconsistencies.pdf", iil); + Volian.Print.Library.PDFConsistencyCheckReport rpt = new Volian.Print.Library.PDFConsistencyCheckReport(Volian.Base.Library.VlnSettings.TemporaryFolder + @"\AllInconsistencies.pdf", iil, dvi); //B2020-020 needed to pass in DocVersion to get paper size from format rpt.BuildAllReport(dvi); this.Cursor = Cursors.Default; } diff --git a/PROMS/Volian.Print.Library/PDFConsistencyCheckReport.cs b/PROMS/Volian.Print.Library/PDFConsistencyCheckReport.cs index e04b344d..fbebf098 100644 --- a/PROMS/Volian.Print.Library/PDFConsistencyCheckReport.cs +++ b/PROMS/Volian.Print.Library/PDFConsistencyCheckReport.cs @@ -30,10 +30,11 @@ namespace Volian.Print.Library get { return _MyItemInfoList; } set { _MyItemInfoList = value; } } - public PDFConsistencyCheckReport(string fileName, ItemInfoList myItemInfoList) + public PDFConsistencyCheckReport(string fileName, ItemInfoList myItemInfoList, DocVersionInfo myDocVersion) { _FileName = fileName; _MyItemInfoList = myItemInfoList; + _MyDocVersion = myDocVersion; //B2020-020 needed to pass in DocVersion to get paper size from format } public void BuildReport() {