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

C2019-013 put sorted by information on the Search Results report

Browse Source
This commit is contained in:
John Jenko 2020-06-25 15:13:21 +00:00
parent 10445a7fd3
commit 0078020e60
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1088,8 +1088,9 @@ namespace VEPROMS
void displaySearch1_PrintRequest(object sender, DisplaySearchEventArgs args) void displaySearch1_PrintRequest(object sender, DisplaySearchEventArgs args)
{ {
// C2020-002 paper size is now set in the format files - default is Letter, pass this PDFReport // 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.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) if (args.SearchString != null)
myReport.SearchString = args.SearchString; myReport.SearchString = args.SearchString;
if (!args.ReportTitle.Contains("Annotation")) if (!args.ReportTitle.Contains("Annotation"))

14
PROMS/Volian.Controls.Library/DisplaySearch.cs
View File

@ -2391,7 +2391,10 @@ namespace Volian.Controls.Library
} }
private void btnPrnSrchRslts_Click(object sender, EventArgs e) private void btnPrnSrchRslts_Click(object sender, EventArgs e)
{ {
OnPrintRequest(new DisplaySearchEventArgs(ReportTitle, TypesSelected, SearchString, lbSrchResults.DataSource as ICollection<ItemInfo>)); 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<ItemInfo>,sortedBy));
} }
private void panSearchButtons_Resize(object sender, EventArgs e) private void panSearchButtons_Resize(object sender, EventArgs e)
{ {
@ -2444,6 +2447,12 @@ namespace Volian.Controls.Library
get { return _TypesSelected; } get { return _TypesSelected; }
set { _TypesSelected = value; } 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<ItemInfo> _MyItemInfoList; private ICollection<ItemInfo> _MyItemInfoList;
public ICollection<ItemInfo> MyItemInfoList public ICollection<ItemInfo> MyItemInfoList
{ {
@ -2467,12 +2476,13 @@ namespace Volian.Controls.Library
{ {
HowLong = howLong; HowLong = howLong;
} }
public DisplaySearchEventArgs(string reportTitle, string typesSelected, string searchString, ICollection<ItemInfo> myItemInfoList) public DisplaySearchEventArgs(string reportTitle, string typesSelected, string searchString, ICollection<ItemInfo> myItemInfoList, string sortedBy)
{ {
_ReportTitle = reportTitle; _ReportTitle = reportTitle;
_TypesSelected = typesSelected; _TypesSelected = typesSelected;
_MyItemInfoList = myItemInfoList; _MyItemInfoList = myItemInfoList;
_SearchString = searchString; _SearchString = searchString;
_SortedBy = sortedBy; // C2019-013 pass in sorted by information
foreach (ItemInfo tmpII in myItemInfoList) foreach (ItemInfo tmpII in myItemInfoList)
if (tmpII != null && tmpII.ActiveFormat != null) if (tmpII != null && tmpII.ActiveFormat != null)
{ {