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

B2020-020 Needed to pass in the DocVersionInfo to the Consistency Check report so that we can get the paper size.

Browse Source
This commit is contained in:
John Jenko 2020-02-17 16:28:30 +00:00
parent 885153e305
commit 96354e6374
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
PROMS/VEPROMS User Interface/dlgApproveProcedure.cs
View File

@ -308,7 +308,7 @@ namespace VEPROMS
{ {
foreach (ProcedureInfo pi in args.MyItems) foreach (ProcedureInfo pi in args.MyItems)
pi.IsSelected = _MyApproval.ProcedureExists(pi); 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(); rpt.BuildReport();
} }
private void SetupComboBoxes() private void SetupComboBoxes()
@ -533,12 +533,12 @@ namespace VEPROMS
UpdateClbMore(); UpdateClbMore();
_DoingConsistencyCheck = false; _DoingConsistencyCheck = false;
btnCheckMore.Enabled = 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) 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) private void fgProcs_AfterEdit(object sender, C1.Win.C1FlexGrid.RowColEventArgs e)
@ -1358,10 +1358,17 @@ namespace VEPROMS
get { return _MyItems; } get { return _MyItems; }
set { _MyItems = value; } 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; _ReportName = reportName;
_MyItems = myItems; _MyItems = myItems;
_MyDocVersion = myDocVerion; //B2020-020 needed to pass in DocVersion to get paper size from format
} }
} }
} }

2
PROMS/VEPROMS User Interface/frmVEPROMS.cs
View File

@ -740,7 +740,7 @@ namespace VEPROMS
if (dvi == null) return; if (dvi == null) return;
this.Cursor = Cursors.WaitCursor; this.Cursor = Cursors.WaitCursor;
ItemInfoList iil = ItemInfoList.GetAllInconsistencies(dvi.VersionID); 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); rpt.BuildAllReport(dvi);
this.Cursor = Cursors.Default; this.Cursor = Cursors.Default;
} }

3
PROMS/Volian.Print.Library/PDFConsistencyCheckReport.cs
View File

@ -30,10 +30,11 @@ namespace Volian.Print.Library
get { return _MyItemInfoList; } get { return _MyItemInfoList; }
set { _MyItemInfoList = value; } set { _MyItemInfoList = value; }
} }
public PDFConsistencyCheckReport(string fileName, ItemInfoList myItemInfoList) public PDFConsistencyCheckReport(string fileName, ItemInfoList myItemInfoList, DocVersionInfo myDocVersion)
{ {
_FileName = fileName; _FileName = fileName;
_MyItemInfoList = myItemInfoList; _MyItemInfoList = myItemInfoList;
_MyDocVersion = myDocVersion; //B2020-020 needed to pass in DocVersion to get paper size from format
} }
public void BuildReport() public void BuildReport()
{ {