diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index 844fcb97..a127532f 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -1088,8 +1088,9 @@ namespace VEPROMS void displaySearch1_PrintRequest(object sender, DisplaySearchEventArgs args) { // C2020-002 paper size is now set in the format files - default is Letter, pass this PDFReport + //C2019-013 pass in sorted by information Volian.Print.Library.PDFReport myReport = new Volian.Print.Library.PDFReport(args.ReportTitle, args.TypesSelected, args.MyItemInfoList, - Volian.Base.Library.VlnSettings.TemporaryFolder + @"\searchresults.pdf", args.PaperSize); + Volian.Base.Library.VlnSettings.TemporaryFolder + @"\searchresults.pdf", args.PaperSize, args.SortedBy); if (args.SearchString != null) myReport.SearchString = args.SearchString; if (!args.ReportTitle.Contains("Annotation")) diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.cs b/PROMS/Volian.Controls.Library/DisplaySearch.cs index cbe092c6..ff888370 100644 --- a/PROMS/Volian.Controls.Library/DisplaySearch.cs +++ b/PROMS/Volian.Controls.Library/DisplaySearch.cs @@ -2391,7 +2391,10 @@ namespace Volian.Controls.Library } private void btnPrnSrchRslts_Click(object sender, EventArgs e) { - OnPrintRequest(new DisplaySearchEventArgs(ReportTitle, TypesSelected, SearchString, lbSrchResults.DataSource as ICollection)); + string sortedBy = ""; + if (cbSorted.Checked) + sortedBy = string.Format("Sorted By: {0}", cmbResultsStyle.Text); //C2019-013 pass in sorted by information + OnPrintRequest(new DisplaySearchEventArgs(ReportTitle, TypesSelected, SearchString, lbSrchResults.DataSource as ICollection,sortedBy)); } private void panSearchButtons_Resize(object sender, EventArgs e) { @@ -2444,6 +2447,12 @@ namespace Volian.Controls.Library get { return _TypesSelected; } set { _TypesSelected = value; } } + private string _SortedBy = null; + public string SortedBy // C2019-013 pass in sorted by information to print report + { + get { return _SortedBy; } + set { _SortedBy = value; } + } private ICollection _MyItemInfoList; public ICollection MyItemInfoList { @@ -2467,12 +2476,13 @@ namespace Volian.Controls.Library { HowLong = howLong; } - public DisplaySearchEventArgs(string reportTitle, string typesSelected, string searchString, ICollection myItemInfoList) + public DisplaySearchEventArgs(string reportTitle, string typesSelected, string searchString, ICollection myItemInfoList, string sortedBy) { _ReportTitle = reportTitle; _TypesSelected = typesSelected; _MyItemInfoList = myItemInfoList; _SearchString = searchString; + _SortedBy = sortedBy; // C2019-013 pass in sorted by information foreach (ItemInfo tmpII in myItemInfoList) if (tmpII != null && tmpII.ActiveFormat != null) {