diff --git a/PROMS/Volian.Controls.Library/DisplayReports.cs b/PROMS/Volian.Controls.Library/DisplayReports.cs index e128ce90..fee72ae9 100644 --- a/PROMS/Volian.Controls.Library/DisplayReports.cs +++ b/PROMS/Volian.Controls.Library/DisplayReports.cs @@ -742,7 +742,8 @@ namespace Volian.Controls.Library MessageBox.Show("Referenced Object Reports not available in the Demo version.", "PROMS Demo Version"); return ""; } - string roapp = Environment.GetEnvironmentVariable("roapp"); + //string roapp = Environment.GetEnvironmentVariable("roapp"); + string roapp = Volian.Base.Library.ExeInfo.GetROEditorPath(); // get the path to the RO Editor Executable if (roapp == null) { MessageBox.Show("Could not find path to Ro Editor, check 'roapp' environment variable"); @@ -780,6 +781,9 @@ namespace Volian.Controls.Library Cursor = Cursors.WaitCursor; if (cbxSummary.Checked) // RO Summary Report { + //GenerateROList(); + //ROFSTLookup rofstLookup = Mydocversion.DocVersionAssociations[0].MyROFst.ROFSTLookup; + //OnPrintRequest(new DisplayReportsEventArgs("RO Summary Report", "RO Report", rofstLookup, ROList)); } else if (cbxComplete.Checked) // Complete RO Report { @@ -852,12 +856,19 @@ namespace Volian.Controls.Library get { return _CompleteROReport; } set { _CompleteROReport = value; } } - public DisplayReportsEventArgs(string reportTitle, string typesSelected, ICollection myItemInfoList, bool sortByProcedure) + private ROFSTLookup _rofstLookup; + public ROFSTLookup RofstLookup + { + get { return _rofstLookup; } + set { _rofstLookup = value; } + } + public DisplayReportsEventArgs(string reportTitle, string typesSelected, ICollection myItemInfoList,/*ROFSTLookup rolkup,*/ bool sortByProcedure) { _ReportTitle = reportTitle; _TypesSelected = typesSelected; _MyItemInfoList = myItemInfoList; _SortUsageByProcedure = sortByProcedure; + //_rofstLookup = rolkup; } public DisplayReportsEventArgs(string reportTitle, string typesSelected, string roDataFile, bool completeROReport) {