Add last purchase data to AUCO report

config/Reports/auco.xml

@@ -65,7 +65,7 @@
                 output.writeStartElement("thead");
                 output.writeStartElement("tr");
                 output.writeStartElement("th");
-                output.writeAttribute("colspan", "3");
+                output.writeAttribute("colspan", "5");
                 output.writeCharacters("Regular Coffees");
                 output.writeEndElement();
                 output.writeEndElement();
@@ -73,6 +73,8 @@
                 output.writeTextElement("th", "Origin");
                 output.writeTextElement("th", "Avg. Rate");
                 output.writeTextElement("th", "Avg. Cost");
+				output.writeTextElement("th", "Last Cost");
+				output.writeTextElement("th", "Last Purchase Date");
                 output.writeEndElement();
                 output.writeEndElement();
                 output.writeStartElement("tbody");
@@ -81,29 +83,32 @@
 				if(unitBox.currentIndex == 0) {
 					conversion = 2.2;
 				}
-                switch(sortBox.currentIndex)
-                {
-                    case 0:
-						query.prepare("SELECT DISTINCT origin, (avg(rate)/:conversion)::numeric(10,2) AS rate, (SELECT avg(cost)*:conversion2 FROM purchase WHERE item IN (SELECT id FROM regular_coffees WHERE origin = coffee_history.origin))::numeric(10,2) AS cost FROM coffee_history WHERE id IN (SELECT id FROM regular_coffees) GROUP BY origin ORDER BY origin ASC");
-                        break;
-                    case 1:
-						query.prepare("SELECT DISTINCT origin, (avg(rate)/:conversion)::numeric(10,2) AS rate, (SELECT avg(cost)*:conversion2 FROM purchase WHERE item IN (SELECT id FROM regular_coffees WHERE origin = coffee_history.origin))::numeric(10,2) AS cost FROM coffee_history WHERE id IN (SELECT id FROM regular_coffees) GROUP BY origin ORDER BY origin DESC");
-                        break;
-                    case 2:
-						query.prepare("SELECT DISTINCT origin, (avg(rate)/:conversion)::numeric(10,2) AS rate, (SELECT avg(cost)*:conversion2 FROM purchase WHERE item IN (SELECT id FROM regular_coffees WHERE origin = coffee_history.origin))::numeric(10,2) AS cost FROM coffee_history WHERE id IN (SELECT id FROM regular_coffees) GROUP BY origin ORDER BY rate ASC");
-                        break;
-                    case 3:
-						query.prepare("SELECT DISTINCT origin, (avg(rate)/:conversion)::numeric(10,2) AS rate, (SELECT avg(cost)*:conversion2 FROM purchase WHERE item IN (SELECT id FROM regular_coffees WHERE origin = coffee_history.origin))::numeric(10,2) AS cost FROM coffee_history WHERE id IN (SELECT id FROM regular_coffees) GROUP BY origin ORDER BY rate DESC");
-                        break;
-                    case 4:
-						query.prepare("SELECT DISTINCT origin, (avg(rate)/:conversion)::numeric(10,2) AS rate, (SELECT avg(cost)*:conversion2 FROM purchase WHERE item IN (SELECT id FROM regular_coffees WHERE origin = coffee_history.origin))::numeric(10,2) AS cost FROM coffee_history WHERE id IN (SELECT id FROM regular_coffees) GROUP BY origin ORDER BY cost ASC");
-                        break;
-                    case 5:
-						query.prepare("SELECT DISTINCT origin, (avg(rate)/:conversion)::numeric(10,2) AS rate, (SELECT avg(cost)*:conversion2 FROM purchase WHERE item IN (SELECT id FROM regular_coffees WHERE origin = coffee_history.origin))::numeric(10,2) AS cost FROM coffee_history WHERE id IN (SELECT id FROM regular_coffees) GROUP BY origin ORDER BY cost DESC");
-                        break;
-                }
+				var orderClause;
+				switch(sortBox.currentIndex)
+				{
+					case 0:
+						orderClause = "origin ASC";
+						break;
+					case 1:
+						orderClause = "origin DESC";
+						break;
+					case 2:
+						orderClause = "rate ASC";
+						break;
+					case 3:
+						orderClause = "rate DESC";
+						break;
+					case 4:
+						orderClause = "cost ASC";
+						break;
+					case 5:
+						orderClause = "cost DESC";
+						break;
+				}
+				query.prepare("SELECT DISTINCT origin, (avg(rate)/:conversion)::numeric(10,2) AS rate, (SELECT avg(cost)*:conversion2 FROM purchase WHERE item IN (SELECT id FROM regular_coffees WHERE origin = coffee_history.origin))::numeric(10,2) AS cost, (SELECT avg(cost)*:conversion3 FROM purchase WHERE item IN (SELECT id FROM regular_coffees WHERE origin = coffee_history.origin) AND time = (SELECT max(time) FROM purchase WHERE item IN (SELECT id FROM regular_coffees WHERE origin = coffee_history.origin))), (SELECT max(time)::date FROM purchase WHERE item IN (SELECT id FROM regular_coffees WHERE origin = coffee_history.origin)) FROM coffee_history WHERE id IN (SELECT id FROM regular_coffees) GROUP BY origin ORDER BY " + orderClause);
 				query.bind(":conversion", conversion);
 				query.bind(":conversion2", conversion);
+				query.bind(":conversion3", conversion);
 				query.exec();
                 while(query.next())
                 {
@@ -111,37 +116,20 @@
                     output.writeTextElement("td", query.value(0));
                     output.writeTextElement("td", query.value(1));
                     output.writeTextElement("td", query.value(2));
+					output.writeTextElement("td", query.value(3));
+					output.writeTextElement("td", query.value(4));
                     output.writeEndElement();
                 }
                 output.writeStartElement("tr");
                 output.writeStartElement("th");
-                output.writeAttribute("colspan", "3");
+                output.writeAttribute("colspan", "5");
                 output.writeCharacters("Decaffeinated Coffees");
                 output.writeEndElement();
                 output.writeEndElement();
-                switch(sortBox.currentIndex)
-                {
-                    case 0:
-						query.prepare("SELECT DISTINCT origin, (avg(rate)/:conversion)::numeric(10,2) AS rate, (SELECT avg(cost)*:conversion2 FROM purchase WHERE item IN (SELECT id FROM decaf_coffees WHERE origin = coffee_history.origin))::numeric(10,2) AS cost FROM coffee_history WHERE id IN (SELECT id FROM decaf_coffees) GROUP BY origin ORDER BY origin ASC");
-                        break;
-                    case 1:
-						query.prepare("SELECT DISTINCT origin, (avg(rate)/:conversion)::numeric(10,2) AS rate, (SELECT avg(cost)*:conversion2 FROM purchase WHERE item IN (SELECT id FROM decaf_coffees WHERE origin = coffee_history.origin))::numeric(10,2) AS cost FROM coffee_history WHERE id IN (SELECT id FROM decaf_coffees) GROUP BY origin ORDER BY origin DESC");
-                        break;
-                    case 2:
-						query.prepare("SELECT DISTINCT origin, (avg(rate)/:conversion)::numeric(10,2) AS rate, (SELECT avg(cost)*:conversion2 FROM purchase WHERE item IN (SELECT id FROM decaf_coffees WHERE origin = coffee_history.origin))::numeric(10,2) AS cost FROM coffee_history WHERE id IN (SELECT id FROM decaf_coffees) GROUP BY origin ORDER BY rate ASC");
-                        break;
-                    case 3:
-						query.prepare("SELECT DISTINCT origin, (avg(rate)/:conversion)::numeric(10,2) AS rate, (SELECT avg(cost)*:conversion2 FROM purchase WHERE item IN (SELECT id FROM decaf_coffees WHERE origin = coffee_history.origin))::numeric(10,2) AS cost FROM coffee_history WHERE id IN (SELECT id FROM decaf_coffees) GROUP BY origin ORDER BY rate DESC");
-                        break;
-                    case 4:
-						query.prepare("SELECT DISTINCT origin, (avg(rate)/:conversion)::numeric(10,2) AS rate, (SELECT avg(cost)*:conversion2 FROM purchase WHERE item IN (SELECT id FROM decaf_coffees WHERE origin = coffee_history.origin))::numeric(10,2) AS cost FROM coffee_history WHERE id IN (SELECT id FROM decaf_coffees) GROUP BY origin ORDER BY cost ASC");
-                        break;
-                    case 5:
-						query.prepare("SELECT DISTINCT origin, (avg(rate)/:conversion)::numeric(10,2) AS rate, (SELECT avg(cost)*:conversion2 FROM purchase WHERE item IN (SELECT id FROM decaf_coffees WHERE origin = coffee_history.origin))::numeric(10,2) AS cost FROM coffee_history WHERE id IN (SELECT id FROM decaf_coffees) GROUP BY origin ORDER BY cost DESC");
-                        break;
-                }
+				query.prepare("SELECT DISTINCT origin, (avg(rate)/:conversion)::numeric(10,2) AS rate, (SELECT avg(cost)*:conversion2 FROM purchase WHERE item IN (SELECT id FROM decaf_coffees WHERE origin = coffee_history.origin))::numeric(10,2) AS cost, (SELECT avg(cost)*:conversion3 FROM purchase WHERE item IN (SELECT id FROM decaf_coffees WHERE origin = coffee_history.origin) AND time = (SELECT max(time) FROM purchase WHERE item IN (SELECT id FROM decaf_coffees WHERE origin = coffee_history.origin))), (SELECT max(time)::date FROM purchase WHERE item IN (SELECT id FROM decaf_coffees WHERE origin = coffee_history.origin)) FROM coffee_history WHERE id IN (SELECT id FROM decaf_coffees) GROUP BY origin ORDER BY " + orderClause);
 				query.bind(":conversion", conversion);
 				query.bind(":conversion2", conversion);
+				query.bind(":conversion3", conversion);
 				query.exec();
                 while(query.next())
                 {
@@ -149,6 +137,8 @@
                     output.writeTextElement("td", query.value(0));
                     output.writeTextElement("td", query.value(1));
                     output.writeTextElement("td", query.value(2));
+					output.writeTextElement("td", query.value(3));
+					output.writeTextElement("td", query.value(4));
                     output.writeEndElement();
                 }
 				query = query.invalidate();