Add unit selection to green coffees used for roasted coffees report

config/Reports/greenforroasted.xml

@@ -3,6 +3,8 @@
     <layout type="vertical">
         <layout type="horizontal">
             <daterange id="dates" initial="19" /><!-- Year to Date -->
+            <label>Weight Unit:</label>
+            <sqldrop id="unit" />
             <stretch />
         </layout>
         <webview id="report" />
@@ -32,10 +34,24 @@
             dateSelect.setLifetimeRange(lifetimeStartDate, lifetimeEndDate);
             dateQuery = dateQuery.invalidate();
             dateSelect.rangeUpdated.connect(refresh);
+            var unitBox = findChildObject(this, 'unit');
+            unitBox.addItem(TTR("greenforroasted", "Kg"));
+            unitBox.addItem(TTR("greenforroasted", "Lb"));
+            unitBox.currentIndex = QSettings.value("script/report_unit", 1);
+            unitBox['currentIndexChanged(int)'].connect(function() {
+                QSettings.setValue("script/report_unit", unitBox.currentIndex);
+                refresh();
+            });
             function refresh() {
                 var dateRange = dateSelect.currentRange();
                 var startDate = dateRange[0];
                 var endDate = dateRange[dateRange.length - 1];
+                var conversion = 1;
+                var unitText = TTR("greensales", "Lb");
+                if(unitBox.currentIndex == 0) {
+                    conversion = 2.2;
+                    unitText = TTR("greensales", "Kg");
+                }
                 var buffer = new QBuffer;
                 buffer.open(3);
                 var output = new XmlWriter(buffer);
@@ -50,11 +66,13 @@
                 output.writeTextElement("h1", TTR("greenforroasted", "Green Coffees Used for Roasted Coffees ") + startDate + "-" + endDate);
                 output.writeStartElement("ul");
                 var query = new QSqlQuery();
-                query.prepare("WITH q AS (SELECT roasted_id, unroasted_id, (SELECT name FROM items WHERE id = roasted_id) AS rname, generate_subscripts(unroasted_id, 1) AS s, sum(roasted_quantity) AS rq, min(time)::date, max(time)::date FROM roasting_log WHERE time >= :sd1 AND time < :ed1 ::date + interval '1 day' GROUP BY roasted_id, unroasted_id) SELECT q.*, (SELECT name FROM items WHERE id = unroasted_id[q.s]) || ' (' || unroasted_id[q.s] || ')' AS gname, (SELECT SUM(unroasted_quantity[q.s]) AS gq FROM roasting_log WHERE roasted_id = q.roasted_id AND unroasted_id = q.unroasted_id AND time >= :sd2 AND time < :ed2 ::date + interval '1 day') FROM q ORDER BY q.rname ASC, min ASC");
+                query.prepare("WITH q AS (SELECT roasted_id, unroasted_id, (SELECT name FROM items WHERE id = roasted_id) AS rname, generate_subscripts(unroasted_id, 1) AS s, sum(roasted_quantity)/:c1 AS rq, min(time)::date, max(time)::date FROM roasting_log WHERE time >= :sd1 AND time < :ed1 ::date + interval '1 day' GROUP BY roasted_id, unroasted_id) SELECT q.*, (SELECT name FROM items WHERE id = unroasted_id[q.s]) || ' (' || unroasted_id[q.s] || ')' AS gname, (SELECT SUM(unroasted_quantity[q.s])/:c2 AS gq FROM roasting_log WHERE roasted_id = q.roasted_id AND unroasted_id = q.unroasted_id AND time >= :sd2 AND time < :ed2 ::date + interval '1 day') FROM q ORDER BY q.rname ASC, min ASC");
                 query.bind(":sd1", startDate);
                 query.bind(":sd2", startDate);
                 query.bind(":ed1", endDate);
                 query.bind(":ed2", endDate);
+                query.bind(":c1", conversion);
+                query.bind(":c2", conversion);
                 query.exec();
                 var prevRid = -1;
                 var prevGid = "";
@@ -69,18 +87,18 @@
                         }
                         output.writeTextElement("li", query.value(2) + " (" + query.value(0) + ")");
                         output.writeStartElement("ul");
-                        output.writeTextElement("li", query.value(4) + " pounds roasted between " + query.value(5) + " and " + query.value(6) + " with:");
+                        output.writeTextElement("li", query.value(4) + " " + unitText + " roasted between " + query.value(5) + " and " + query.value(6) + " with:");
                         output.writeStartElement("ul");
-                        output.writeTextElement("li", query.value(8) + " pounds of " + query.value(7));
+                        output.writeTextElement("li", query.value(8) + " " + unitText + " of " + query.value(7));
                     }
                     else { // Same roasted item
                         if(query.value(1) != prevGid) { // New set of greens
                             output.writeEndElement(); //ul
-                            output.writeTextElement("li", query.value(4) + " pounds roasted between " + query.value(5) + " and " + query.value(6) + " with:");
+                            output.writeTextElement("li", query.value(4) + " " + unitText + " roasted between " + query.value(5) + " and " + query.value(6) + " with:");
                             output.writeStartElement("ul");
-                            output.writeTextElement("li", query.value(8) + " pounds of " + query.value(7));
+                            output.writeTextElement("li", query.value(8) + " " + unitText + " of " + query.value(7));
                         } else { // Same set of greens
-                            output.writeTextElement("li", query.value(8) + " pounds of " + query.value(7));
+                            output.writeTextElement("li", query.value(8) + " " + unitText + " of " + query.value(7));
                         }
                     }
                     prevRid = query.value(0);