Add date range selector to Coffee Purchase Previous Years Comparison report

config/Reports/fypurchase.xml

@@ -2,10 +2,7 @@
 	<reporttitle>Purchase:->Coffee Purchase Previous Years Comparison</reporttitle>
 	<layout type="vertical">
 		<layout type="horizontal">
-			<label>Start Date:</label>
-			<calendar id="startdate" />
-			<label>End Date:</label>
-			<calendar id="enddate" />
+			<daterange id = "dates" initial="23" /><!--Lifetime-->
 			<label>Weight Unit:</label>
 			<sqldrop id="unit" />
 			<stretch />
@@ -18,16 +15,16 @@
 	<program>
 		<![CDATA[
 			this.windowTitle = "Typica - Coffee Purchase Previous Years Comparison";
-			/* Set starting year to the first year on record. */
-			var startDateField = findChildObject(this, 'startdate');
+			/* Set Lifetime range. */
+			var dateSelect = findChildObject(this, 'dates');
 			var query = new QSqlQuery();
-			query.exec("SELECT EXTRACT(YEAR FROM time) FROM purchase WHERE time = (SELECT min(time) FROM purchase)");
+			query.exec("SELECT concat(EXTRACT(YEAR FROM time::date), '-01-01') FROM purchase WHERE time = (SELECT min(time) FROM purchase) UNION SELECT concat(EXTRACT(YEAR FROM 'now'::date), '-12-31')");
 			query.next();
-			startDateField.setDate(query.value(0), 1, 1);
+			var lifetimeStartDate = query.value(0);
+			query.next();
+			var lifetimeEndDate = query.value(0);
+			dateSelect.setLifetimeRange(lifetimeStartDate, lifetimeEndDate);
 			query = query.invalidate();
-			/* Set ending year to the current year. */
-			var endDateField = findChildObject(this, 'enddate');
-			endDateField.setDate(endDateField.year(), 12, 31);
 			/* Enable printing */
 			var view = findChildObject(this, 'report');
 			var printMenu = findChildObject(this, 'print');
@@ -81,7 +78,10 @@
 				var unittotal = 0;
 				var costtotal = 0;
 				var query = new QSqlQuery();
-				for(var i = startDateField.year(); i <= endDateField.year(); i++)
+				var dateRange = dateSelect.currentRange();
+				var startYear = Number(dateRange[0].substr(0, 4));
+				var endYear = Number(dateRange[dateRange.length - 1].substr(0, 4));
+				for(var i = startYear; i <= endYear; i++)
 				{
 					output.writeStartElement("tr");
 					output.writeAttribute("id", "y"+i);
@@ -121,10 +121,7 @@
 			}
 			refresh();
 			/* Update report as needed. */
-			startDateField.dateChanged.connect(function() {
-				refresh();
-			});
-			endDateField.dateChanged.connect(function() {
+			dateSelect.rangeUpdated.connect(function() {
 				refresh();
 			});
 			/* Expand year data */