Merge branch 'release-1.7'

README

@@ -6,7 +6,7 @@ Project web site: http://www.randomfield.com/programs/typica/
 
 Typica is free software released under the MIT license as follows:
 
-Copyright 2007-2015 Neal Evan Wilson
+Copyright 2007-2016 Neal Evan Wilson
 
 Permission is hereby granteed, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

config/Reports/auco.xml

@@ -2,45 +2,64 @@
 	<reporttitle>Production:->Average Use and Cost by Origin</reporttitle>
     <layout type="vertical">
         <layout type="horizontal">
+            <daterange id="dates" initial="23" /><!-- Lifetime -->
             <label>Sort Order:</label>
             <sqldrop id="sort" />
-			<label>Weight Unit:</label>
-			<sqldrop id="unit" />
+            <label>Weight Unit:</label>
+            <sqldrop id="unit" />
             <stretch />
         </layout>
         <webview id="report" />
     </layout>
     <menu name="File">
-        <item id="print" shortcut="Ctrl+P">Print</item>
+        <item id="print" shortcut="Ctrl+P">Print...</item>
     </menu>
     <program>
         <![CDATA[
-            this.windowTitle = "Typica - Average Use and Cost by Origin";
+            this.windowTitle = TTR("useandcostreport", "Typica - Average Use and Cost by Origin");
             var report = findChildObject(this, 'report');
             var printMenu = findChildObject(this, 'print');
             printMenu.triggered.connect(function() {
                 report.print();
             });
             var sortBox = findChildObject(this, 'sort');
-            sortBox.addItem("Origin A-Z");
-            sortBox.addItem("Origin Z-A");
-            sortBox.addItem("Avg. Rate Ascending");
-            sortBox.addItem("Avg. Rate Descending");
-            sortBox.addItem("Avg. Cost Ascending");
-            sortBox.addItem("Avg. Cost Descending");
+            sortBox.addItem(TTR("useandcostreport","Origin A-Z"));
+            sortBox.addItem(TTR("useandcostreport", "Origin Z-A"));
+            sortBox.addItem(TTR("useandcostreport", "Avg. Rate Ascending"));
+            sortBox.addItem(TTR("useandcostreport", "Avg. Rate Descending"));
+            sortBox.addItem(TTR("useandcostreport", "Avg. Cost Ascending"));
+            sortBox.addItem(TTR("useandcostreport", "Avg. Cost Descending"));
             sortBox.currentIndex = QSettings.value("auco_sort", 0);
-			var unitBox = findChildObject(this, 'unit');
-			unitBox.addItem("Kg");
-			unitBox.addItem("Lb");
-			unitBox.currentIndex = QSettings.value("script/report_unit", 1);
-			unitBox['currentIndexChanged(int)'].connect(function() {
-				QSettings.setValue("script/report_unit", unitBox.currentIndex);
-				refresh();
-			});
-			var rowData = new Array();
-			var rowIndex;
+            var unitBox = findChildObject(this, 'unit');
+            unitBox.addItem(TTR("useandcostreport", "Kg"));
+            unitBox.addItem(TTR("useandcostreport", "Lb"));
+            unitBox.currentIndex = QSettings.value("script/report_unit", 1);
+            unitBox['currentIndexChanged(int)'].connect(function() {
+                QSettings.setValue("script/report_unit", unitBox.currentIndex);
+                refresh();
+            });
+            var dateSelect = findChildObject(this, 'dates');
+            var dateQuery = new QSqlQuery;
+            dateQuery.exec("SELECT time::date FROM transactions WHERE time = (SELECT min(time) FROM transactions) OR time = (SELECT max(time) FROM transactions) ORDER BY time ASC");
+            dateQuery.next();
+            var lifetimeStartDate = dateQuery.value(0);
+            var lifetimeEndDate;
+            if(dateQuery.next()) {
+                lifetimeEndDate = dateQuery.value(0);
+            } else {
+                lifetimeEndDate = lifetimeStartDate;
+            }
+            dateSelect.setLifetimeRange(lifetimeStartDate, lifetimeEndDate);
+            dateQuery = dateQuery.invalidate();
+            dateSelect.rangeUpdated.connect(refresh);
+            var rowData = new Array();
+            var rowIndex;
             function refresh() {
-				rowIndex = 0;
+                rowData.length = 0;
+                var dateRange = dateSelect.currentRange();
+                var startDate = dateRange[0];
+                var endDate = dateRange[dateRange.length - 1];
+                rowIndex = 0;
                 var buffer = new QBuffer;
                 buffer.open(3);
                 var output = new XmlWriter(buffer);
@@ -49,133 +68,136 @@
                 output.writeStartElement("html");
                 output.writeAttribute("xmlns", "http://www.w3.org/1999/xhtml");
                 output.writeStartElement("head");
-                output.writeTextElement("title", "Recent Use and Cost by Origin");
+                output.writeTextElement("title", TTR("useandcostreport", "Recent Use and Cost by Origin"));
                 output.writeEndElement();
                 output.writeStartElement("body");
-                output.writeTextElement("h1", "Average Use and Cost by Origin");
-				switch(unitBox.currentIndex)
-				{
-					case 0:
-						output.writeTextElement("p", "This is a report of average rate of use in kilograms per day and cost of unroasted coffee.");
-						break;
-					case 1:
-						output.writeTextElement("p", "This is a report of average rate of use in pounds per day and cost of unroasted coffee.");
-						break;
-				}
+                output.writeTextElement("h1", TTR("useandcostreport", "Average Use and Cost by Origin ") + startDate + " - " + endDate);
+                switch(unitBox.currentIndex)
+                {
+                    case 0:
+                        output.writeTextElement("p", TTR("useandcostreport", "This is a report of average rate of use in kilograms per day and cost of unroasted coffee."));
+                            break;
+                    case 1:
+                        output.writeTextElement("p", TTR("useandcostreport", "This is a report of average rate of use in pounds per day and cost of unroasted coffee."));
+                    break;
+                }
                 output.writeStartElement("table");
                 output.writeAttribute("rules", "groups");
                 output.writeAttribute("cellpadding", "3px");
                 output.writeStartElement("thead");
                 output.writeStartElement("tr");
                 output.writeStartElement("th");
-                output.writeAttribute("colspan", "8");
-                output.writeCharacters("Regular Coffees");
+                output.writeAttribute("colspan", "9");
+                output.writeCharacters(TTR("useandcostreport", "Regular Coffees"));
                 output.writeEndElement();
                 output.writeEndElement();
                 output.writeStartElement("tr");
-                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.writeTextElement("th", "Bag Size (min)");
-				output.writeTextElement("th", "Bag Size (max)");
-				output.writeTextElement("th", "Bag Size (mean)");
+                output.writeTextElement("th", TTR("useandcostreport", "Origin"));
+                output.writeTextElement("th", TTR("useandcostreport", "Avg. Rate"));
+                output.writeTextElement("th", TTR("useandcostreport", "Avg. Cost"));
+                output.writeTextElement("th", TTR("useandcostreport", "Last Cost"));
+                output.writeTextElement("th", TTR("useandcostreport", "Last Purchase Date"));
+                output.writeTextElement("th", TTR("useandcostreport", "Bag Size (min)"));
+                output.writeTextElement("th", TTR("useandcostreport", "Bag Size (max)"));
+                output.writeTextElement("th", TTR("useandcostreport", "Bag Size (mean)"));
+                output.writeTextElement("th", TTR("useandcostreport", "Purchases"));
                 output.writeEndElement();
                 output.writeEndElement();
                 output.writeStartElement("tbody");
                 var query = new QSqlQuery();
-				var conversion = 1;
-				if(unitBox.currentIndex == 0) {
-					conversion = 2.2;
-				}
-				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)), (SELECT min(conversion)/:conversion4 FROM lb_bag_conversion WHERE item IN (SELECT id FROM regular_coffees WHERE origin = coffee_history.origin))::numeric(10,2) AS minbag, (SELECT max(conversion)/:conversion5 FROM lb_bag_conversion WHERE item IN (SELECT id FROM regular_coffees WHERE origin = coffee_history.origin))::numeric(10,2) AS maxbag, (SELECT avg(conversion)/:conversion6 FROM lb_bag_conversion WHERE item IN (SELECT id FROM regular_coffees WHERE origin = coffee_history.origin))::numeric(10,2) AS meanbag 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.bind(":conversion4", conversion);
-				query.bind(":conversion5", conversion);
-				query.bind(":conversion6", conversion);
-				query.exec();
+                var conversion = 1;
+                if(unitBox.currentIndex == 0) {
+                    conversion = 2.2;
+                }
+                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("WITH q AS (SELECT id, origin, rate/:c1 AS rate, (SELECT cost*:c2 FROM purchase WHERE item = id) AS cost, (SELECT min(time) FROM purchase WHERE item = id) AS purchase_time, (SELECT conversion/:c3 FROM lb_bag_conversion WHERE item = id) AS bag_weight FROM coffee_history WHERE id IN (SELECT id FROM regular_coffees) AND id IN (SELECT item FROM transactions WHERE time >= :startDate AND time < :endDate::date + interval '1 day')) SELECT DISTINCT origin, avg(rate)::numeric(10,2) AS rate, avg(cost)::numeric(10,2) AS cost, (SELECT (cost*:c4)::numeric(10,2) FROM purchase WHERE item = max(q.id)) AS last_cost, max(purchase_time)::date AS last_purchase, min(bag_weight)::numeric(10,2) AS min_weight, max(bag_weight)::numeric(10,2) AS max_weight, avg(bag_weight)::numeric(10,2) AS mean_weight, count(1) AS n FROM q GROUP BY origin ORDER BY " + orderClause);
+                query.bind(":c1", conversion);
+                query.bind(":c2", conversion);
+                query.bind(":c3", conversion);
+                query.bind(":c4", conversion);
+                query.bind(":startDate", startDate);
+                query.bind(":endDate", endDate);
+                query.exec();
                 while(query.next())
                 {
                     output.writeStartElement("tr");
-					output.writeAttribute("id", "r" + rowIndex);
-					output.writeStartElement("td");
-					output.writeStartElement("a");
-					output.writeAttribute("href", "typica://script/r" + rowIndex);
-					rowIndex++;
-					rowData.push(query.value(0));
-					output.writeCharacters(query.value(0));
-					output.writeEndElement();
-					output.writeEndElement();
+                    output.writeAttribute("id", "r" + rowIndex);
+                    output.writeStartElement("td");
+                    output.writeStartElement("a");
+                    output.writeAttribute("href", "typica://script/r" + rowIndex);
+                    rowIndex++;
+                    rowData.push(query.value(0));
+                    output.writeCharacters(query.value(0));
+                    output.writeEndElement();
+                    output.writeEndElement();
                     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.writeTextElement("td", query.value(5));
-					output.writeTextElement("td", query.value(6));
-					output.writeTextElement("td", query.value(7));
+                    output.writeTextElement("td", query.value(3));
+                    output.writeTextElement("td", query.value(4));
+                    output.writeTextElement("td", query.value(5));
+                    output.writeTextElement("td", query.value(6));
+                    output.writeTextElement("td", query.value(7));
+                    output.writeTextElement("td", query.value(8));
                     output.writeEndElement();
                 }
                 output.writeStartElement("tr");
                 output.writeStartElement("th");
-                output.writeAttribute("colspan", "8");
-                output.writeCharacters("Decaffeinated Coffees");
+                output.writeAttribute("colspan", "9");
+                output.writeCharacters(TTR("useandcostreport", "Decaffeinated Coffees"));
                 output.writeEndElement();
                 output.writeEndElement();
-				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)), (SELECT min(conversion)/:conversion4 FROM lb_bag_conversion WHERE item IN (SELECT id FROM decaf_coffees WHERE origin = coffee_history.origin))::numeric(10,2) AS minbag, (SELECT max(conversion)/:conversion5 FROM lb_bag_conversion WHERE item IN (SELECT id FROM decaf_coffees WHERE origin = coffee_history.origin))::numeric(10,2) AS maxbag, (SELECT avg(conversion)/:conversion6 FROM lb_bag_conversion WHERE item IN (SELECT id FROM decaf_coffees WHERE origin = coffee_history.origin))::numeric(10,2) AS meanbag 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.bind(":conversion4", conversion);
-				query.bind(":conversion5", conversion);
-				query.bind(":conversion6", conversion);
-				query.exec();
+                query.prepare("WITH q AS (SELECT id, origin, rate/:c1 AS rate, (SELECT cost*:c2 FROM purchase WHERE item = id) AS cost, (SELECT min(time) FROM purchase WHERE item = id) AS purchase_time, (SELECT conversion/:c3 FROM lb_bag_conversion WHERE item = id) AS bag_weight FROM coffee_history WHERE id IN (SELECT id FROM decaf_coffees) AND id IN (SELECT item FROM transactions WHERE time >= :startDate AND time < :endDate::date + interval '1 day')) SELECT DISTINCT origin, avg(rate)::numeric(10,2) AS rate, avg(cost)::numeric(10,2) AS cost, (SELECT (cost*:c4)::numeric(10,2) FROM purchase WHERE item = max(q.id)) AS last_cost, max(purchase_time)::date AS last_purchase, min(bag_weight)::numeric(10,2) AS min_weight, max(bag_weight)::numeric(10,2) AS max_weight, avg(bag_weight)::numeric(10,2) AS mean_weight, count(1) AS n FROM q GROUP BY origin ORDER BY " + orderClause);
+                query.bind(":c1", conversion);
+                query.bind(":c2", conversion);
+                query.bind(":c3", conversion);
+                query.bind(":c4", conversion);
+                query.bind(":startDate", startDate);
+                query.bind(":endDate", endDate);
+                query.exec();
                 while(query.next())
                 {
                     output.writeStartElement("tr");
-					output.writeAttribute("id", "d" + rowIndex);
-					output.writeStartElement("td");
-					output.writeStartElement("a");
-					output.writeAttribute("href", "typica://script/d" + rowIndex);
-					rowIndex++;
-					rowData.push(query.value(0));
-					output.writeCharacters(query.value(0));
-					output.writeEndElement();
-					output.writeEndElement();
+                    output.writeAttribute("id", "d" + rowIndex);
+                    output.writeStartElement("td");
+                    output.writeStartElement("a");
+                    output.writeAttribute("href", "typica://script/d" + rowIndex);
+                    rowIndex++;
+                    rowData.push(query.value(0));
+                    output.writeCharacters(query.value(0));
+                    output.writeEndElement();
+                    output.writeEndElement();
                     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.writeTextElement("td", query.value(5));
-					output.writeTextElement("td", query.value(6));
-					output.writeTextElement("td", query.value(7));
+                    output.writeTextElement("td", query.value(3));
+                    output.writeTextElement("td", query.value(4));
+                    output.writeTextElement("td", query.value(5));
+                    output.writeTextElement("td", query.value(6));
+                    output.writeTextElement("td", query.value(7));
+                    output.writeTextElement("td", query.value(8));
                     output.writeEndElement();
                 }
-				query = query.invalidate();
+                query = query.invalidate();
                 output.writeEndElement();
                 output.writeEndElement();
                 output.writeEndElement();
@@ -189,39 +211,60 @@
                 QSettings.setValue("auco_sort", sortBox.currentIndex);
                 refresh();
             });
-			report.scriptLinkClicked.connect(function(url) {
-				var element = new WebElement(report.findFirstElement("#" + url));
-				var regular = url[0] == 'r';
-				var index = url.slice(1, url.length);
-				var tableref;
-				if(regular) {
-					tableref = "regular_coffees";
-				} else {
-					tableref = "decaf_coffees";
-				}
-				var origin = rowData[Number(url.slice(1, url.length))];
-				var details = '<tr><td /><td colspan="6"><table><tr><th>Id</th><th>Name</th><th>Rate</th><th>Inventory</th><th>First Use</th><th>Last Use</th></tr>';
-				var query = new QSqlQuery();
-				query.prepare("SELECT id, name, (rate/:conversion1)::numeric(12,3), (stock/:conversion2)::numeric(12,3), (SELECT min(time)::date FROM use WHERE item = id) AS first_use, (SELECT max(time)::date FROM use WHERE item = id) AS last_use FROM coffee_history WHERE origin = :origin AND id IN (SELECT id FROM " + tableref + ") ORDER BY first_use DESC");
-				var conversion = 1;
-				if(unitBox.currentIndex == 0) {
-					conversion = 2.2;
-				}
-				query.bind(":conversion1", conversion);
-				query.bind(":conversion2", conversion);
-				query.bind(":origin", origin);
-				query.exec();
-				while(query.next()) {
-					details += "<tr>";
-					for(var i = 0; i < 6; i++) {
-						details += "<td>" + query.value(i) + "</td>";
-					}
-					details += "</tr>";
-				}
-				query = query.invalidate();
-				details += "</table></td></tr>";
-				element.appendOutside(details);
-			});
+            report.scriptLinkClicked.connect(function(url) {
+                if(url[0] == 'i') {
+                    url = url.slice(1, url.length);
+                    var itemReport = createReport("itemtransactions.xml");
+                    var sIB = findChildObject(itemReport, 'item');
+                    sIB.currentIndex = sIB.findData(url);
+                    return;
+                }
+                var element = new WebElement(report.findFirstElement("#" + url));
+                var regular = url[0] == 'r';
+                var index = url.slice(1, url.length);
+                var tableref;
+                if(regular) {
+                    tableref = "regular_coffees";
+                } else {
+                    tableref = "decaf_coffees";
+                }
+                var origin = rowData[Number(url.slice(1, url.length))];
+                var details = '<tr><td /><td colspan="6"><table><tr><th>' +
+                                    TTR("useandcostreport", "Id") + '</th><th>' +
+                                    TTR("useandcostreport", "Name") + '</th><th>' +
+                                    TTR("useandcostreport", "Rate") + '</th><th>' +
+                                    TTR("useandcostreport", "Cost") + '</th><th>' +
+                                    TTR("useandcostreport", "Inventory") + '</th><th>' +
+                                    TTR("useandcostreport", "First Use") + '</th><th>' +
+                                    TTR("useandcostreport", "Last Use") + '</th></tr>';
+                var query = new QSqlQuery();
+                query.prepare("SELECT id, name, (rate/:conversion1)::numeric(12,3), (SELECT (cost*:conversion2)::numeric(12,2) FROM purchase WHERE item = id), (stock/:conversion3)::numeric(12,3), (SELECT min(time)::date FROM use WHERE item = id) AS first_use, (SELECT max(time)::date FROM use WHERE item = id) AS last_use FROM coffee_history WHERE origin = :origin AND id IN (SELECT id FROM " + tableref + ") AND id IN (SELECT item FROM transactions WHERE time >= :startDate AND time < :endDate::date + interval '1 day') ORDER BY first_use DESC");
+                var conversion = 1;
+                if(unitBox.currentIndex == 0) {
+                    conversion = 2.2;
+                }
+                var dateRange = dateSelect.currentRange();
+                var startDate = dateRange[0];
+                var endDate = dateRange[dateRange.length - 1];
+                query.bind(":conversion1", conversion);
+                query.bind(":conversion2", conversion);
+                query.bind(":conversion3", conversion);
+                query.bind(":origin", origin);
+                query.bind(":startDate", startDate);
+                query.bind(":endDate", endDate);
+                query.exec();
+                while(query.next()) {
+                    details += "<tr>";
+                    details += '<td><a href="typica://script/i' + query.value(0) + '">' + query.value(0) + "</a></td>";
+                    for(var i = 1; i < 7; i++) {
+                        details += "<td>" + query.value(i) + "</td>";
+                    }
+                    details += "</tr>";
+                }
+                query = query.invalidate();
+                details += "</table></td></tr>";
+                element.appendOutside(details);
+            });
         ]]>
     </program>
 </window>

config/Reports/chart.xml

@@ -2,42 +2,64 @@
 	<reporttitle>Production:->Previous Year Production Comparison</reporttitle>
     <layout type="vertical">
         <layout type="horizontal">
-			<daterange id="dates" initial="19" /><!-- Current Year to Date -->
-            <label>Days to Average</label>
+            <label>Batch Type:</label>
+            <sqldrop id="batchtype" />
+            <label>Approval:</label>
+            <sqldrop id="approval" />
+            <daterange id="dates" initial="19" /><!-- Current Year to Date -->
+            <label>Days to Average:</label>
             <line validator="integer" id="days">7</line>
-			<label>Weight Unit:</label>
-			<sqldrop id="unit" />
+            <label>Weight Unit:</label>
+            <sqldrop id="unit" />
             <stretch />
         </layout>
         <webview id="report" />
     </layout>
     <menu name="File">
-        <item id="print" shortcut="Ctrl+P">Print</item>
+        <item id="print" shortcut="Ctrl+P">Print...</item>
     </menu>
     <program>
         <![CDATA[
-            this.windowTitle = "Typica - Previous Year Production Comparison";
-			var dateSelect = findChildObject(this, 'dates');
-			dateSelect.removeIndex(23); // Remove Lifetime range
+            this.windowTitle = TTR("pytdprodcomp", "Typica - Previous Year Production Comparison");
+            var dateSelect = findChildObject(this, 'dates');
+            dateSelect.removeIndex(23); // Remove Lifetime range
             var view = findChildObject(this, 'report');
             var printMenu = findChildObject(this, 'print');
             printMenu.triggered.connect(function() {
                 view.print();
             });
             var avgField = findChildObject(this, 'days');
-			var unitBox = findChildObject(this, 'unit');
-			unitBox.addItem("Kg");
-			unitBox.addItem("Lb");
-			unitBox.currentIndex = QSettings.value("script/report_unit", 1);
-			unitBox['currentIndexChanged(int)'].connect(function() {
-				QSettings.setValue("script/report_unit", unitBox.currentIndex);
-				refresh();
-			});
+            var unitBox = findChildObject(this, 'unit');
+            unitBox.addItem(TTR("pytdprodcomp", "Kg"));
+            unitBox.addItem(TTR("pytdprodcomp", "Lb"));
+            unitBox.currentIndex = QSettings.value("script/report_unit", 1);
+            unitBox['currentIndexChanged(int)'].connect(function() {
+                QSettings.setValue("script/report_unit", unitBox.currentIndex);
+                refresh();
+            });
+            var batchType = findChildObject(this, 'batchtype');
+            batchType.addItem(TTR("pytdprodcomp", "Any"));
+            batchType.addItem(TTR("pytdprodcomp", "Production Roasts"));
+            batchType.addItem(TTR("pytdprodcomp", "Sample Roasts"));
+            batchType.currentIndex = QSettings.value("script/batchtypefilter", 1);
+            batchType['currentIndexChanged(int)'].connect(function() {
+                QSettings.setValue("script/batchtypefilter", batchType.currentIndex);
+                refresh();
+            });
+            var approval = findChildObject(this, 'approval');
+            approval.addItem(TTR("pytdprodcomp", "Any"));
+            approval.addItem(TTR("pytdprodcomp", "Approved"));
+            approval.addItem(TTR("pytdprodcomp", "Not Approved"));
+            approval.currentIndex = QSettings.value("script/approvalfilter", 1);
+            approval['currentIndexChanged(int)'].connect(function() {
+                QSettings.setValue("script/approvalfilter", approval.currentIndex);
+                refresh();
+            });
             function refresh() {
-				var conversion = 1;
-				if(unitBox.currentIndex == 0) {
-					conversion = 2.2;
-				}
+                var conversion = 1;
+                if(unitBox.currentIndex == 0) {
+                    conversion = 2.2;
+                }
                 var buffer = new QBuffer;
                 buffer.open(3);
                 var output = new XmlWriter(buffer);
@@ -46,11 +68,11 @@
                 output.writeStartElement("html");
                 output.writeAttribute("xmlns", "http://www.w3.org/1999/xhtml");
                 output.writeStartElement("head");
-                output.writeTextElement("title", "Previous Year Production Comparison");
+                output.writeTextElement("title", TTR("pytdprodcomp", "Previous Year Production Comparison"));
                 output.writeEndElement();
                 output.writeStartElement("body");
-                output.writeTextElement("h1", "Previous Year Production Comparison");
-                output.writeTextElement("p", "This report provides an itemized and overall comparison of roasted coffee production for the dates specified with those dates in the previous year. A chart of this data along with percent change and rolling average of the percent change is also produced.");
+                output.writeTextElement("h1", TTR("pytdprodcomp", "Previous Year Production Comparison"));
+                output.writeTextElement("p", TTR("pytdprodcomp", "This report provides an itemized and overall comparison of roasted coffee production for the dates specified with those dates in the previous year. A chart of this data along with percent change and rolling average of the percent change is also produced."));
                 output.writeStartElement("table");
                 output.writeAttribute("style", "page-break-after:auto;");
                 output.writeAttribute("rules", "groups");
@@ -58,34 +80,58 @@
                 output.writeStartElement("thead");
                 output.writeStartElement("tr");
                 output.writeTextElement("th", "Coffee");
-				switch(unitBox.currentIndex) {
-					case 0:
-						output.writeTextElement("th", "Previous (Kg)");
-						output.writeTextElement("th", "Current (Kg)");
-						output.writeTextElement("th", "Change (Kg)");
-						break;
-					case 1:
-						output.writeTextElement("th", "Previous (Lb)");
-						output.writeTextElement("th", "Current (Lb)");
-						output.writeTextElement("th", "Change (Lb)");
-						break;
-				}
+                switch(unitBox.currentIndex) {
+                    case 0:
+                        output.writeTextElement("th", TTR("pytdprodcomp", "Previous (Kg)"));
+                        output.writeTextElement("th", TTR("pytdprodcomp", "Current (Kg)"));
+                        output.writeTextElement("th", TTR("pytdprodcomp", "Change (Kg)"));
+                        break;
+                    case 1:
+                        output.writeTextElement("th", TTR("pytdprodcomp", "Previous (Lb)"));
+                        output.writeTextElement("th", TTR("pytdprodcomp", "Current (Lb)"));
+                        output.writeTextElement("th", TTR("pytdprodcomp", "Change (Lb)"));
+                        break;
+                }
                 output.writeEndElement();
                 output.writeEndElement();
                 output.writeStartElement("tbody");
                 var query = new QSqlQuery();
                 query.exec("START TRANSACTION");
-				var dateRange = dateSelect.currentRange();
-				var curStartDate = "'"+dateRange[0]+"'";
-				var curEndDate = "'"+dateRange[dateRange.length - 1]+"'";
+                var dateRange = dateSelect.currentRange();
+                var curStartDate = "'"+dateRange[0]+"'";
+                var curEndDate = "'"+dateRange[dateRange.length - 1]+"'";
                 query.exec("SELECT "+curStartDate+"::date - interval '1 year', "+curEndDate+"::date - interval '1 year' + interval '1 day', "+curEndDate+"::date + interval '1 day'");
-				query.next();
+                query.next();
                 curEndDate = "'"+query.value(2)+"'";
                 var prevStartDate = "'"+query.value(0)+"'";
                 var prevEndDate = "'"+query.value(1)+"'";
-                var q = "CREATE TEMPORARY TABLE previous ON COMMIT DROP AS SELECT roasted_id, sum(roasted_quantity) AS p FROM roasting_log WHERE time > "+prevStartDate+" AND time < "+prevEndDate+" AND roasted_id IS NOT NULL GROUP BY roasted_id";
+                var transaction_filter;
+                var approval_filter;
+                switch(batchType.currentIndex) {
+                    case 0:
+                        transaction_filter = "";
+                        break;
+                    case 1:
+                        transaction_filter = " AND transaction_type = 'ROAST'";
+                        break;
+                    case 2:
+                        transaction_filter = " AND transaction_type = 'SAMPLEROAST'";
+                        break;
+                }
+                switch(approval.currentIndex) {
+                    case 0:
+                        approval_filter = "";
+                        break;
+                    case 1:
+                        approval_filter = " AND approval = true";
+                        break;
+                    case 2:
+                        approval_filter = " AND approval = false";
+                        break;
+                }
+                var q = "CREATE TEMPORARY TABLE previous ON COMMIT DROP AS SELECT roasted_id, sum(roasted_quantity) AS p FROM roasting_log WHERE time > "+prevStartDate+" AND time < "+prevEndDate+" AND roasted_id IS NOT NULL" + transaction_filter + approval_filter + " GROUP BY roasted_id";
                 query.exec(q);
-                q = "CREATE TEMPORARY TABLE current ON COMMIT DROP AS SELECT roasted_id, sum(roasted_quantity) AS c FROM roasting_log WHERE time > "+curStartDate+" AND time < "+curEndDate+" AND roasted_id IS NOT NULL GROUP BY roasted_id";
+                q = "CREATE TEMPORARY TABLE current ON COMMIT DROP AS SELECT roasted_id, sum(roasted_quantity) AS c FROM roasting_log WHERE time > "+curStartDate+" AND time < "+curEndDate+" AND roasted_id IS NOT NULL" + transaction_filter + approval_filter + " GROUP BY roasted_id";
                 query.exec(q);
                 query.exec("INSERT INTO previous SELECT roasted_id, 0 FROM current WHERE roasted_id NOT IN (SELECT roasted_id FROM previous)");
                 query.exec("INSERT INTO current SELECT roasted_id, 0 FROM previous WHERE roasted_id NOT IN (SELECT roasted_id FROM current)");
@@ -95,24 +141,24 @@
                 {
                     output.writeStartElement("tr");
                     output.writeTextElement("td", query.value(0));
-					output.writeTextElement("td", (query.value(1) / conversion).toFixed(2));
-					output.writeTextElement("td", (query.value(2) / conversion).toFixed(2));
-					output.writeTextElement("td", (query.value(3) / conversion).toFixed(2));
+                    output.writeTextElement("td", (query.value(1) / conversion).toFixed(2));
+                    output.writeTextElement("td", (query.value(2) / conversion).toFixed(2));
+                    output.writeTextElement("td", (query.value(3) / conversion).toFixed(2));
                     output.writeEndElement();
                 }
                 output.writeEndElement();
                 output.writeStartElement("tfoot");
-                output.writeTextElement("th", "Totals");
+                output.writeTextElement("th", TTR("pytdprodcomp", "Totals"));
                 query.exec("SELECT sum(p), sum(c), sum(c-p) FROM comp");
                 query.next();
-				output.writeTextElement("td", (query.value(0) / conversion).toFixed(2));
-				output.writeTextElement("td", (query.value(1) / conversion).toFixed(2));
-				output.writeTextElement("td", (query.value(2) / conversion).toFixed(2));
+                output.writeTextElement("td", (query.value(0) / conversion).toFixed(2));
+                output.writeTextElement("td", (query.value(1) / conversion).toFixed(2));
+                output.writeTextElement("td", (query.value(2) / conversion).toFixed(2));
                 output.writeEndElement();
                 query.exec("ABORT");
                 output.writeEndElement();
-				output.writeStartElement("p");
-				output.writeAttribute("style", "page-break-inside: avoid");
+                output.writeStartElement("p");
+                output.writeAttribute("style", "page-break-inside: avoid");
                 output.writeStartElement("svg");
                 output.writeAttribute("xmlns", "http://www.w3.org/2000/svg");
                 output.writeAttribute("width", "7.5in");
@@ -158,21 +204,21 @@
                     query.exec(q);
                     query.next();
                     dates[i] = query.value(0);
-                    q = "SELECT sum(roasted_quantity) FROM roasting_log WHERE time > "+curStartDate+" AND time < '"+dates[i]+"'";
+                    q = "SELECT sum(roasted_quantity) FROM roasting_log WHERE time > "+curStartDate+" AND time < '"+dates[i]+"'" + transaction_filter + approval_filter;
                     query.exec(q);
                     if(query.next())
                     {
-                        curpounds[i] = query.value(0);
+                        curpounds[i] = Number(query.value(0));
                     }
                     else
                     {
                         curpounds[i] = 0;
                     }
-                    q = "SELECT sum(roasted_quantity) FROM roasting_log WHERE time > "+curStartDate+"::date - '1 year'::interval AND time < '"+dates[i]+"'::date - '1 year'::interval";
+                    q = "SELECT sum(roasted_quantity) FROM roasting_log WHERE time > "+curStartDate+"::date - '1 year'::interval AND time < '"+dates[i]+"'::date - '1 year'::interval" + transaction_filter + approval_filter;
                     query.exec(q);
                     if(query.next())
                     {
-                        prevpounds[i] = query.value(0);
+                        prevpounds[i] = Number(query.value(0));
                     }
                     else
                     {
@@ -204,23 +250,23 @@
                         avgchange[i] = sum / parseInt(avgField.text);
                     }
                 }
-				// Calculate the domain of the primary y axis.
+                // Calculate the domain of the primary y axis.
                 var maxy1 = 0;
-				var increment = 100; // Starting increment is 100 Lb.
-				if(unitBox.currentIndex == 0) {
-					increment = 110; // Starting increment is 50 Kg if Kg is requested.
-				}
+                    var increment = 100; // Starting increment is 100 Lb.
+                    if(unitBox.currentIndex == 0) {
+                        increment = 110; // Starting increment is 50 Kg if Kg is requested.
+                    }
                 while(maxy1 < Math.max(curpounds[days - 1], prevpounds[days - 1]))
                 {
-					maxy1 += increment;
+                    maxy1 += increment;
+                }
+                // Calculate the number of grid lines and loosen spacing if there are too many.
+                var divisions = maxy1 / increment;
+                while(divisions > 10) {
+                    increment *= 2;
+                    divisions = maxy1 / increment;
                 }
-				// Calculate the number of grid lines and loosen spacing if there are too many.
-				var divisions = maxy1 / increment;
-				while(divisions > 10) {
-					increment *= 2;
-					divisions = maxy1 / increment;
-				}
-				// Draw y axis grid lines.
+                // Draw y axis grid lines.
                 var pos = 0;
                 while(pos <= maxy1)
                 {
@@ -231,7 +277,7 @@
                     output.writeAttribute("y2", (450/maxy1)*pos);
                     output.writeAttribute("style", "stroke:rgb(0,0,0);stroke-width:1;");
                     output.writeEndElement();
-					pos += increment;
+                    pos += increment;
                 }
                 var n = Math.min.apply(Math, change);
                 var m = Math.max.apply(Math, change);
@@ -334,19 +380,24 @@
                     output.writeAttribute("x", "0");
                     output.writeAttribute("y", -((450/maxy1)*i)+5);
                     output.writeAttribute("font-size", "12");
-					switch(unitBox.currentIndex) {
-						case 0:
-							output.writeCharacters((i / 2.2).toFixed(0));
-							break;
-						case 1:
-						default:
-							output.writeCharacters(i);
-							break;
-					}
+                    switch(unitBox.currentIndex) {
+                        case 0:
+                            output.writeCharacters((i / 2.2).toFixed(0));
+                            break;
+                        case 1:
+                        default:
+                            output.writeCharacters(i);
+                            break;
+                    }
                     output.writeEndElement();
                     i += increment;
                 }
                 i = miny2;
+                var stepSize = 0.1;
+                while((maxy2 - miny2) / stepSize > 20)
+                {
+                    stepSize += 0.05;
+                }
                 while(i <= maxy2)
                 {
                     output.writeStartElement("text");
@@ -355,7 +406,7 @@
                     output.writeAttribute("font-size", "12");
                     output.writeCharacters(Number(i*100).toFixed(0)+"%");
                     output.writeEndElement();
-                    i += 0.1;
+                    i += stepSize;
                 }
                 i = 0;
                 while(i <= days-1)
@@ -373,40 +424,40 @@
                     switch(parts[1])
                     {
                         case '01':
-                            ds = "January ";
+                            ds = TTR("pytdprodcomp", "January ");
                             break;
                         case '02':
-                            ds = "February ";
+                            ds = TTR("pytdprodcomp", "February ");
                             break;
                         case '03':
-                            ds = "March ";
+                            ds = TTR("pytdprodcomp", "March ");
                             break;
                         case '04':
-                            ds = "April ";
+                            ds = TTR("pytdprodcomp", "April ");
                             break;
                         case '05':
-                            ds = "May ";
+                            ds = TTR("pytdprodcomp", "May ");
                             break;
                         case '06':
-                            ds = "June ";
+                            ds = TTR("pytdprodcomp", "June ");
                             break;
                         case '07':
-                            ds = "July ";
+                            ds = TTR("pytdprodcomp", "July ");
                             break;
                         case '08':
-                            ds = "August ";
+                            ds = TTR("pytdprodcomp", "August ");
                             break;
                         case '09':
-                            ds = "September ";
+                            ds = TTR("pytdprodcomp", "September ");
                             break;
                         case '10':
-                            ds = "October ";
+                            ds = TTR("pytdprodcomp", "October ");
                             break;
                         case '11':
-                            ds = "November ";
+                            ds = TTR("pytdprodcomp", "November ");
                             break;
                         case '12':
-                            ds = "December ";
+                            ds = TTR("pytdprodcomp", "December ");
                             break;
                     }
                     ds = ds + Number(parts[2]);
@@ -422,7 +473,7 @@
                         i = days - 1;
                     }
                 }
-				query = query.invalidate();
+                query = query.invalidate();
                 output.writeStartElement("rect");
                 output.writeAttribute("fill", "rgb(0,0,0)");
                 output.writeAttribute("x", "45");
@@ -434,14 +485,14 @@
                 output.writeAttribute("x", "75");
                 output.writeAttribute("y", "120");
                 output.writeAttribute("font-size", "12");
-				switch(unitBox.currentIndex) {
-					case 0:
-						output.writeCharacters("Previous Year Kg");
-						break;
-					case 1:
-						output.writeCharacters("Previous Year Lb");
-						break;
-				}
+                switch(unitBox.currentIndex) {
+                    case 0:
+                        output.writeCharacters(TTR("pytdprodcomp", "Previous Year Kg"));
+                        break;
+                    case 1:
+                        output.writeCharacters(TTR("pytdprodcomp", "Previous Year Lb"));
+                        break;
+                }
                 output.writeEndElement();
                 output.writeStartElement("rect");
                 output.writeAttribute("fill", "rgb(255,0,0)");
@@ -454,14 +505,14 @@
                 output.writeAttribute("x", "225");
                 output.writeAttribute("y", "120");
                 output.writeAttribute("font-size", "12");
-				switch(unitBox.currentIndex) {
-					case 0:
-						output.writeCharacters("Current Year Kg");
-						break;
-					case 1:
-						output.writeCharacters("Current Year Lb");
-						break;
-				}
+                switch(unitBox.currentIndex) {
+                    case 0:
+                        output.writeCharacters(TTR("pytdprodcomp", "Current Year Kg"));
+                        break;
+                    case 1:
+                        output.writeCharacters(TTR("pytdprodcomp", "Current Year Lb"));
+                        break;
+                }
                 output.writeEndElement();
                 output.writeStartElement("rect");
                 output.writeAttribute("fill", "rgb(0,255,0)");
@@ -474,7 +525,7 @@
                 output.writeAttribute("x", "375");
                 output.writeAttribute("y", "120");
                 output.writeAttribute("font-size", "12");
-                output.writeCharacters("% Change");
+                output.writeCharacters(TTR("pytdprodcomp", "% Change"));
                 output.writeEndElement();
                 output.writeStartElement("rect");
                 output.writeAttribute("fill", "rgb(0,0,255)");
@@ -487,24 +538,24 @@
                 output.writeAttribute("x", "525");
                 output.writeAttribute("y", "120");
                 output.writeAttribute("font-size", "12");
-                output.writeCharacters("Average % Change");
+                output.writeCharacters(TTR("pytdprodcomp", "Average % Change"));
+                output.writeEndElement();
                 output.writeEndElement();
                 output.writeEndElement();
                 output.writeEndElement();
                 output.writeEndElement();
                 output.writeEndElement();
-				output.writeEndElement();
                 output.writeEndDocument();
                 view.setContent(buffer);
                 buffer.close();
             }
             refresh();
-			dateSelect.rangeUpdated.connect(function() {
-				refresh();
-			});
-			avgField.editingFinished.connect(function() {
-				refresh();
-			});
+            dateSelect.rangeUpdated.connect(function() {
+                refresh();
+            });
+            avgField.editingFinished.connect(function() {
+                refresh();
+            });
         ]]>
     </program>
 </window>

config/Reports/cogr.xml

@@ -1,151 +1,172 @@
 <window id="greencost">
-	<reporttitle>Production:->Cost of Green Coffee for Roasted Coffee</reporttitle>
-	<layout type="vertical">
-		<webview id="report" />
-	</layout>
-	<menu name="File">
-		<item id="print" shortcut="Ctrl+P">Print</item>
-	</menu>
-	<program>
-		<![CDATA[
-			this.windowTitle = "Typica - Cost of Green Coffee for Roasted Coffee";
-			var report = findChildObject(this, 'report');
-			var printMenu = findChildObject(this, 'print');
-			printMenu.triggered.connect(function() {
-				report.print();
-			});
-			function refresh() {
-				var buffer = new QBuffer;
-				buffer.open(3);
-				var output = new XmlWriter(buffer);
-				output.writeStartDocument("1.0");
-				output.writeDTD('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg.dtd">');
+    <reporttitle>Production:->Cost of Green Coffee for Roasted Coffee</reporttitle>	<layout type="vertical">
+        <layout type="horizontal">
+            <label>Weight Unit:</label>
+            <sqldrop id="unit" />
+            <stretch />
+        </layout>
+        <webview id="report" />
+    </layout>
+    <menu name="File">
+        <item id="print" shortcut="Ctrl+P">Print...</item>
+    </menu>
+    <program>
+        <![CDATA[
+            this.windowTitle = TTR("greencost", "Typica - Cost of Green Coffee for Roasted Coffee");
+            var report = findChildObject(this, 'report');
+            var printMenu = findChildObject(this, 'print');
+            printMenu.triggered.connect(function() {
+                report.print();
+            });
+            var unitBox = findChildObject(this, 'unit');
+            unitBox.addItem(TTR("greencost", "Kg"));
+            unitBox.addItem(TTR("greencost", "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 conversion = 1;
+                if(unitBox.currentIndex == 0) {
+                    conversion = 2.2;
+                }
+                var buffer = new QBuffer;
+                buffer.open(3);
+                var output = new XmlWriter(buffer);
+                output.writeStartDocument("1.0");
+                output.writeDTD('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg.dtd">');
                 output.writeStartElement("html");
                 output.writeAttribute("xmlns", "http://www.w3.org/1999/xhtml");
                 output.writeStartElement("head");
-                output.writeTextElement("title", "Cost of Green Coffee for Roasted Coffee");
+                output.writeTextElement("title", TTR("greencost", "Cost of Green Coffee for Roasted Coffee"));
                 output.writeEndElement();
                 output.writeStartElement("body");
-                output.writeTextElement("h1", "Cost of Green Coffee for Roasted Coffee");
-				var query = new QSqlQuery();
-				query.exec("SELECT item, (SELECT name FROM items WHERE id = item) AS name FROM current_items ORDER BY name");
-				var roastedItems = new Array();
-				var roastedNames = new Array();
-				while(query.next()) {
-					roastedItems.push(query.value(0));
-					roastedNames.push(query.value(1));
-				}
-				var recipes = new Array();
-				var recipeQuantities = new Array();
-				query.prepare("SELECT unroasted_id, unroasted_quantity FROM roasting_log WHERE roasted_id = :item AND time = (SELECT max(time) FROM roasting_log WHERE roasted_id = :item2)");
-				for(var i = 0; i < roastedItems.length; i++) {
-					query.bind("item", roastedItems[i]);
-					query.bind("item2", roastedItems[i]);
-					query.exec();
-					if(query.next()) {
-						recipes.push(query.value(0));
-						recipeQuantities.push(query.value(1));
-					} else {
-						recipes.push("{-1}");
-						recipeQuantities.push("{-1}");
-					}
-				}
-				query.prepare("SELECT min(unroasted_total_quantity / roasted_quantity), max(unroasted_total_quantity / roasted_quantity), avg(unroasted_total_quantity / roasted_quantity) FROM roasting_log WHERE roasted_id = :ri AND unroasted_id = :gi AND unroasted_total_quantity > 0 AND roasted_quantity > 0 AND approval = true");
-				var mins = new Array();
-				var maxes = new Array();
-				var means = new Array();
-				for(var i = 0; i < roastedItems.length; i++) {
-					if(recipes[i] == "{-1}") {
-						mins.push("undefined");
-						maxes.push("undefined");
-						means.push("undefined");
-					} else {
-						query.bind(":ri", Number(roastedItems[i]));
-						query.bind(":gi", recipes[i]);
-						query.exec();
-						if(query.next()) {
-							mins.push(query.value(0));
-							maxes.push(query.value(1));
-							means.push(query.value(2));
-						} else {
-							print("Error 2");
-						}
-					}
-				}
-				var proportionalCosts = new Array();
-				query.prepare("SELECT cost * :proportion FROM purchase WHERE item = :id");
-				for(var i = 0; i < roastedItems.length; i++) {
-					if(recipes[i] == "{-1}") {
-						proportionalCosts.push("undefined");
-					} else {
-						greens = sqlToArray(recipes[i]);
-						weights = sqlToArray(recipeQuantities[i]);
-						proportions = new Array();
-						quantitySum = weights.reduce(function(p, c) {
-							return p + c;
-						});
-						for(var j = 0; j < weights.length; j++) {
-							proportions.push(weights[j]/quantitySum);
-						}
-						partialSum = 0;
-						for(var j = 0; j < greens.length; j++) {
-							query.bind(":proportion", proportions[j]);
-							query.bind(":id", greens[j]);
-							query.exec();
-							if(query.next()) {
-								partialSum += query.value(0);
-							} else {
-								print("Error 3");
-							}
-						}
-						proportionalCosts.push(partialSum);
-					}
-				}
-				query = query.invalidate();
-				var minCosts = new Array();
-				var maxCosts = new Array();
-				var meanCosts = new Array();
-				for(var i = 0; i < roastedItems.length; i++) {
-					if(recipes[i] == "{-1}") {
-						minCosts.push("undefined");
-						maxCosts.push("undefined");
-						meanCosts.push("undefined");
-					} else {
-						minCosts.push(proportionalCosts[i] * mins[i]);
-						maxCosts.push(proportionalCosts[i] * maxes[i]);
-						meanCosts.push(proportionalCosts[i] * means[i]);
-					}
-				}
-				output.writeStartElement("table");
-				output.writeAttribute("rules", "groups");
-				output.writeAttribute("cellpadding", "3px");
-				output.writeStartElement("thead");
-				output.writeStartElement("tr");
-				output.writeTextElement("th", "Coffee");
-				output.writeTextElement("th", "Minimum Cost");
-				output.writeTextElement("th", "Maximum Cost");
-				output.writeTextElement("th", "Mean Cost");
-				output.writeEndElement();
-				output.writeEndElement();
-				output.writeStartElement("tbody");
-				for(var i = 0; i < roastedItems.length; i++) {
-					output.writeStartElement("tr");
-					output.writeTextElement("td", roastedNames[i]);
-					output.writeTextElement("td", Number(minCosts[i]).toFixed(2));
-					output.writeTextElement("td", Number(maxCosts[i]).toFixed(2));
-					output.writeTextElement("td", Number(meanCosts[i]).toFixed(2));
-					output.writeEndElement();
-				}
-				output.writeEndElement();
-				output.writeEndElement();
-				output.writeEndElement();
-				output.writeEndElement();
-				output.writeEndDocument();
-				report.setContent(buffer);
-				buffer.close();
-			};
-			refresh();
-		]]>
-	</program>
+                var unit = (unitBox.currentIndex == 0 ? TTR("greencost", "Kg") : 
+                    TTR("greencost", "Lb"));
+                output.writeTextElement("h1", TTR("greencost", "Cost of Green Coffee for Roasted Coffee"));
+                output.writeTextElement("p", TTR("greencost", "Cost of green coffee per ") +
+                    unit + TTR("greencost", " of roasted coffee"));
+                var query = new QSqlQuery();
+                query.exec("SELECT item, (SELECT name FROM items WHERE id = item) AS name FROM current_items ORDER BY name");
+                var roastedItems = new Array();
+                var roastedNames = new Array();
+                while(query.next()) {
+                    roastedItems.push(query.value(0));
+                    roastedNames.push(query.value(1));
+                }
+                var recipes = new Array();
+                var recipeQuantities = new Array();
+                query.prepare("SELECT unroasted_id, unroasted_quantity FROM roasting_log WHERE roasted_id = :item AND time = (SELECT max(time) FROM roasting_log WHERE roasted_id = :item2)");
+                for(var i = 0; i < roastedItems.length; i++) {
+                    query.bind("item", roastedItems[i]);
+                    query.bind("item2", roastedItems[i]);
+                    query.exec();
+                    if(query.next()) {
+                        recipes.push(query.value(0));
+                        recipeQuantities.push(query.value(1));
+                    } else {
+                        recipes.push("{-1}");
+                        recipeQuantities.push("{-1}");
+                    }
+                }
+                query.prepare("SELECT min(unroasted_total_quantity / roasted_quantity), max(unroasted_total_quantity / roasted_quantity), avg(unroasted_total_quantity / roasted_quantity) FROM roasting_log WHERE roasted_id = :ri AND unroasted_id = :gi AND unroasted_total_quantity > 0 AND roasted_quantity > 0 AND approval = true");
+                var mins = new Array();
+                var maxes = new Array();
+                var means = new Array();
+                for(var i = 0; i < roastedItems.length; i++) {
+                    if(recipes[i] == "{-1}") {
+                        mins.push("undefined");
+                        maxes.push("undefined");
+                        means.push("undefined");
+                    } else {
+                        query.bind(":ri", Number(roastedItems[i]));
+                        query.bind(":gi", recipes[i]);
+                        query.exec();
+                        if(query.next()) {
+                            mins.push(query.value(0));
+                            maxes.push(query.value(1));
+                            means.push(query.value(2));
+                        } else {
+                            print("Error 2");
+                        }
+                    }
+                }
+                var proportionalCosts = new Array();
+                query.prepare("SELECT cost * :proportion * :conversion FROM purchase WHERE item = :id");
+                for(var i = 0; i < roastedItems.length; i++) {
+                    if(recipes[i] == "{-1}") {
+                        proportionalCosts.push("undefined");
+                    } else {
+                        greens = sqlToArray(recipes[i]);
+                        weights = sqlToArray(recipeQuantities[i]);
+                        proportions = new Array();
+                        quantitySum = weights.reduce(function(p, c) {
+                            return Number(p) + Number(c);
+                        });
+                        for(var j = 0; j < weights.length; j++) {
+                            proportions.push(weights[j]/quantitySum);
+                        }
+                        partialSum = 0;
+                        for(var j = 0; j < greens.length; j++) {
+                            query.bind(":proportion", proportions[j]);
+                            query.bind(":id", greens[j]);
+                            query.bind(":conversion", conversion);
+                            query.exec();
+                            if(query.next()) {
+                                partialSum += Number(query.value(0));
+                            } else {
+                                print("Error 3");
+                            }
+                        }
+                        proportionalCosts.push(partialSum);
+                    }
+                }
+                query = query.invalidate();
+                var minCosts = new Array();
+                var maxCosts = new Array();
+                var meanCosts = new Array();
+                for(var i = 0; i < roastedItems.length; i++) {
+                    if(recipes[i] == "{-1}") {
+                        minCosts.push("undefined");
+                        maxCosts.push("undefined");
+                        meanCosts.push("undefined");
+                    } else {
+                        minCosts.push(proportionalCosts[i] * mins[i]);
+                        maxCosts.push(proportionalCosts[i] * maxes[i]);
+                        meanCosts.push(proportionalCosts[i] * means[i]);
+                    }
+                }
+                output.writeStartElement("table");
+                output.writeAttribute("rules", "groups");
+                output.writeAttribute("cellpadding", "3px");
+                output.writeStartElement("thead");
+                output.writeStartElement("tr");
+                output.writeTextElement("th", TTR("greencost", "Coffee"));
+                output.writeTextElement("th", TTR("greencost", "Minimum Cost"));
+                output.writeTextElement("th", TTR("greencost", "Maximum Cost"));
+                output.writeTextElement("th", TTR("greencost", "Mean Cost"));
+                output.writeEndElement();
+                output.writeEndElement();
+                output.writeStartElement("tbody");
+                for(var i = 0; i < roastedItems.length; i++) {
+                    output.writeStartElement("tr");
+                    output.writeTextElement("td", roastedNames[i]);
+                    output.writeTextElement("td", Number(minCosts[i]).toFixed(2));
+                    output.writeTextElement("td", Number(maxCosts[i]).toFixed(2));
+                    output.writeTextElement("td", Number(meanCosts[i]).toFixed(2));
+                    output.writeEndElement();
+                }
+                output.writeEndElement();
+                output.writeEndElement();
+                output.writeEndElement();
+                output.writeEndElement();
+                output.writeEndDocument();
+                report.setContent(buffer);
+                buffer.close();
+            };
+            refresh();
+        ]]>
+    </program>
 </window>
 

config/Reports/dailyproductiondetail.xml

@@ -49,14 +49,14 @@
 				output.writeStartElement("html");
 				output.writeAttribute("xmlns", "http://www.w3.org/1999/xhtml");
 				output.writeStartElement("head");
-				output.writeTextElement("title", "Daily Production Report");
+				output.writeTextElement("title", TTR("dailyproduction", "Daily Production Report"));
 				output.writeEndElement();
 				output.writeStartElement("body");
 				var dateString = "" + dateField.year() + "-" + dateField.month() + "-" + dateField.day();
-				output.writeTextElement("h1", "Daily Production Report: " + dateString);
-				output.writeTextElement("h2", "Batches Roasted");
+				output.writeTextElement("h1", TTR("dailyproduction", "Daily Production Report: ") + dateString);
+				output.writeTextElement("h2", TTR("dailyproduction", "Batches Roasted"));
 				var query = new QSqlQuery();
-				var q = "SELECT time, machine, (SELECT name FROM machine WHERE id = machine), (SELECT name FROM items WHERE id = roasted_id), unroasted_id, unroasted_quantity, unroasted_total_quantity, roasted_id, roasted_quantity, annotation, duration, files FROM roasting_log WHERE time > '" + dateString + "' AND time < ('" + dateString + "'::date + integer '1') ORDER BY time";
+				var q = "SELECT time, machine, (SELECT name FROM machine WHERE id = machine), (SELECT name FROM items WHERE id = roasted_id), unroasted_id, unroasted_quantity, unroasted_total_quantity, roasted_id, roasted_quantity, annotation, duration, files, (SELECT loss FROM roasting_specification WHERE item = roasted_id AND time = (SELECT max(time) FROM roasting_specification WHERE time <= roasting_log.time AND item = roasted_id)), (SELECT tolerance FROM roasting_specification WHERE item = roasted_id AND time = (SELECT max(time) FROM roasting_specification WHERE time <= roasting_log.time AND item = roasted_id)), (SELECT notes FROM roasting_specification WHERE item = roasted_id AND time = (SELECT max(time) FROM roasting_specification WHERE time <= roasting_log.time AND item = roasted_id)), approval FROM roasting_log WHERE time > '" + dateString + "' AND time < ('" + dateString + "'::date + integer '1') ORDER BY time";
 				query.exec(q);
 				var times = new Array();
 				var machines = new Array();
@@ -65,34 +65,36 @@
 				output.writeAttribute("cellpadding", "3px");
 				output.writeStartElement("thead");
 				output.writeStartElement("tr");
-				output.writeTextElement("th", "Time");
-				output.writeTextElement("th", "Machine");
-				output.writeTextElement("th", "Batch ID");
+                                output.writeAttribute("valign", "bottom");
+				output.writeTextElement("th", TTR("dailyproduction", "Time"));
+				output.writeTextElement("th", TTR("dailyproduction", "Machine"));
+				output.writeTextElement("th", TTR("dailyproduction", "Batch ID"));
 				switch(unitBox.currentIndex)
 				{
 					case 0:
-						output.writeTextElement("th", "Green Weights (Kg)");
+						output.writeTextElement("th", TTR("dailyproduction", "Green Weights (Kg)"));
 						break;
 					case 1:
-						output.writeTextElement("th", "Green Weights (Lb)");
+						output.writeTextElement("th", TTR("dailyproduction", "Green Weights (Lb)"));
 						break;
 				}
 				output.writeTextElement("th", "Green Coffees");
 				switch(unitBox.currentIndex)
 				{
 					case 0:
-						output.writeTextElement("th", "Roasted Weight (Kg)");
+						output.writeTextElement("th", TTR("dailyproduction", "Roasted Weight (Kg)"));
 						break;
 					case 1:
-						output.writeTextElement("th", "Roasted Weight (Lb)");
+						output.writeTextElement("th", TTR("dailyproduction", "Roasted Weight (Lb)"));
 						break;
 				}
-				output.writeTextElement("th", "Roasted Coffee");
-				output.writeTextElement("th", "% Weight Loss");
-				output.writeTextElement("th", "Duration");
+				output.writeTextElement("th", TTR("dailyproduction", "Roasted Coffee"));
+				output.writeTextElement("th", TTR("dailyproduction", "% Weight Loss"));
+				output.writeTextElement("th", TTR("dailyproduction", "Duration"));
 				output.writeEndElement();
 				output.writeEndElement();
 				output.writeStartElement("tbody");
+                                output.writeAttribute("valign", "top");
 				while(query.next())
 				{
 					times.push(query.value(0));
@@ -164,11 +166,45 @@
 							output.writeCDATA(query.value(8));
 							break;
 					}
-					output.writeTextElement("td", query.value(3) + " (" + query.value(7) + ")");
+                                        output.writeStartElement("td");
+                                        output.writeStartElement("span");
+                                        if(query.value(15) == "false") {
+                                            output.writeAttribute("style", "color:#FF0000");
+                                        }
+                                        output.writeCharacters(query.value(3) + " (" + query.value(7) + ")");
+                                        output.writeEndElement();
+                                        output.writeEndElement();
 					if(Number(query.value(6)) > 0) {
 						var loss = (Number(query.value(6)) - Number(query.value(8)))/Number(query.value(6));
+                                                var lossMin;
+                                                var lossMax;
+                                                var lossColor;
+                                                var useLoss;
+                                                if(query.value(12) > 0) {
+                                                    useLoss = true;
+                                                    lossMin = Number(query.value(12)) - Number(query.value(13));
+                                                    lossMax = Number(query.value(12)) + Number(query.value(13));
+                                                    if(loss >= lossMin && loss <= lossMax) {
+                                                        lossColor = '#00FF00';
+                                                    } else {
+                                                        lossColor = '#FF0000';
+                                                    }
+                                                } else {
+                                                    lossColor = '#000000';
+                                                    useLoss = false;
+                                                }
 						loss *= 100;
-						output.writeTextElement("td", loss.toFixed(2)+"%");
+                                                var lossSpec = Number(query.value(12)) * 100;
+                                                var lossTol = Number(query.value(13)) * 100;
+                                                output.writeStartElement("td");
+                                                output.writeStartElement("span");
+                                                output.writeAttribute("style", "color:"+lossColor);
+                                                if(useLoss) {
+                                                    output.writeAttribute("title", lossSpec.toFixed(2) + "+/-" + lossTol.toFixed(2) + "%");
+                                                }
+                                                output.writeCharacters(loss.toFixed(2) + "%");
+                                                output.writeEndElement();
+                                                output.writeEndElement();
 					} else {
 						output.writeTextElement("td", "Undefined");
 					}
@@ -180,7 +216,13 @@
 						output.writeEmptyElement("td");
 						output.writeStartElement("td");
 						output.writeAttribute("colspan", "8");
-						output.writeTextElement("em", query.value(9));
+                                                var noteArray = query.value(9).split("\n");
+                                                for(var i = 0; i < noteArray.length; i++) {
+                                                    output.writeStartElement("p");
+                                                    output.writeAttribute("style", "margin-top: 0; margin-bottom: 0");
+                                                    output.writeCharacters(noteArray[i]);
+                                                    output.writeEndElement();
+                                                }
 						output.writeEndElement();
 						output.writeEndElement();
 					}
@@ -188,8 +230,8 @@
 					var annotations = annotationFromRecord(files[0]);
 					output.writeStartElement("tr");
 					output.writeStartElement("td");
-					output.writeAttribute("colspan", "9");
-					output.writeTextElement("strong", "Profile Summary");
+					output.writeAttribute("colspan", "5");
+					output.writeTextElement("strong", TTR("dailyproduction", "Profile Summary"));
 					var buffer2 = new QBuffer("<points>"+annotations+"</points>");
 					buffer2.open(1);
 					var colQuery = new XQuery;
@@ -198,12 +240,12 @@
 					var result = colQuery.exec();
 					buffer2.close();
 					var seriesHeaders = new Array();
-					seriesHeaders.push("Time");
+					seriesHeaders.push(TTR("dailyproduction", "Time"));
 					var records = result.split(";");
 					for(var i = 0; i < records.length - 1; i++) {
 						seriesHeaders.push(records[i].replace(/^\s+|\s+$/g,""));
 					}
-					seriesHeaders.push("Note");
+					seriesHeaders.push(TTR("dailyproduction", "Note"));
 					output.writeStartElement("table");
 					output.writeStartElement("thead");
 					output.writeStartElement("tr");
@@ -265,6 +307,19 @@
 					output.writeEndElement();
 					output.writeEndElement();	
 					output.writeEndElement();
+                                        output.writeStartElement("td");
+                                        output.writeAttribute("colspan", "4");
+                                        if(query.value(14)) {
+                                            output.writeTextElement("strong", "Roast Specification Notes");
+                                            var specArray = query.value(14).split("\n");
+                                            for(var i = 0; i < noteArray.length; i++) {
+                                                output.writeStartElement("p");
+                                                output.writeAttribute("style", "margin-top: 0; margin-bottom: 0");
+                                                output.writeCharacters(specArray[i]);
+                                                output.writeEndElement();
+                                            }                                            
+                                        }
+                                        output.writeEndElement();
 					output.writeEndElement();
 				}
 				output.writeEndElement();
@@ -273,7 +328,7 @@
 				output.writeEmptyElement("td");
 				output.writeEmptyElement("td");
 				output.writeStartElement("td");
-				output.writeTextElement("strong", "Totals:");
+				output.writeTextElement("strong", TTR("dailyproduction", "Totals:"));
 				output.writeEndElement();
 				q = "SELECT sum(unroasted_total_quantity), sum(roasted_quantity), sum(duration) FROM roasting_log WHERE time > '" + dateString + "' AND time < ('" + dateString + "'::date + integer '1')";
 				query.exec(q);
@@ -303,17 +358,17 @@
 				output.writeEndElement();
 				output.writeEndElement(); //tfoot
 				output.writeEndElement(); //table
-				output.writeTextElement("h2", "Inventory");
+				output.writeTextElement("h2", TTR("dailyproduction", "Inventory"));
 				output.writeStartElement("table");
 				output.writeAttribute("rules", "groups");
 				output.writeAttribute("cellpadding", "3px");
 				output.writeStartElement("thead");
 				output.writeStartElement("tr");
-				output.writeTextElement("th", "Green Coffee");
-				output.writeTextElement("th", "Starting Inventory");
-				output.writeTextElement("th", "Ending Inventory");
-				output.writeTextElement("th", "Change");
-				output.writeTextElement("th", "Availability");
+				output.writeTextElement("th", TTR("dailyproduction", "Green Coffee"));
+				output.writeTextElement("th", TTR("dailyproduction", "Starting Inventory"));
+				output.writeTextElement("th", TTR("dailyproduction", "Ending Inventory"));
+				output.writeTextElement("th", TTR("dailyproduction", "Change"));
+				output.writeTextElement("th", TTR("dailyproduction", "Availability"));
 				output.writeEndElement();
 				output.writeEndElement();
 				output.writeStartElement("tbody");

config/Reports/fypurchase.xml

@@ -14,11 +14,11 @@
 	</menu>
 	<program>
 		<![CDATA[
-			this.windowTitle = "Typica - Coffee Purchase Previous Years Comparison";
+			this.windowTitle = TTR("fypurchase", "Typica - Coffee Purchase Previous Years Comparison");
 			/* Set Lifetime range. */
 			var dateSelect = findChildObject(this, 'dates');
 			var query = new QSqlQuery();
-			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.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') ORDER BY concat ASC");
 			query.next();
 			var lifetimeStartDate = query.value(0);
 			query.next();
@@ -33,8 +33,8 @@
 			});
 			/* Add units to unit selector and enable functionality */
 			var unitBox = findChildObject(this, 'unit');
-			unitBox.addItem("Kg");
-			unitBox.addItem("Lb");
+			unitBox.addItem(TTR("fypurchase", "Kg"));
+			unitBox.addItem(TTR("fypurchase", "Lb"));
 			unitBox.currentIndex = QSettings.value("script/report_unit", 1);
 			unitBox['currentIndexChanged(int)'].connect(function() {
 				QSettings.setValue("script/report_unit", unitBox.currentIndex);
@@ -50,10 +50,10 @@
                 output.writeStartElement("html");
                 output.writeAttribute("xmlns", "http://www.w3.org/1999/xhtml");
                 output.writeStartElement("head");
-				output.writeTextElement("title", "Coffee Purchase Previous Years Comparison");
+				output.writeTextElement("title", TTR("fypurchase", "Coffee Purchase Previous Years Comparison"));
 				output.writeEndElement();
 				output.writeStartElement("body");
-				output.writeTextElement("h1", "Coffee Purchase Previous Years Comparison");
+				output.writeTextElement("h1", TTR("fypurchase", "Coffee Purchase Previous Years Comparison"));
 				output.writeStartElement("table");
 				output.writeAttribute("style", "page-break-after: auto; text-align: left");
 				output.writeAttribute("rules", "groups");
@@ -61,16 +61,24 @@
 				output.writeStartElement("thead");
 				output.writeStartElement("tr");
 				output.writeEmptyElement("th");
-				output.writeTextElement("th", "Sacks Purchased");
+				output.writeTextElement("th", TTR("fypurchase", "Sacks Purchased"));
 				switch(unitBox.currentIndex) {
 					case 0:
-						output.writeTextElement("th", "Kilos Purchased");
+						output.writeTextElement("th", TTR("fypurchase", "Kg Purchased"));
 						break;
 					case 1:
-						output.writeTextElement("th", "Pounds Purchased");
+						output.writeTextElement("th", TTR("fypurchase", "Lb Purchased"));
 						break;
 				}
-				output.writeTextElement("th", "Cost");
+				output.writeTextElement("th", TTR("fypurchase", "Cost"));
+                                switch(unitBox.currentIndex) {
+                                    case 0:
+                                        output.writeTextElement("th", TTR("fypurchase", "Cost per Kg"));
+                                        break;
+                                    case 1:
+                                        output.writeTextElement("th", TTR("fypurchase", "Cost per Lb"));
+                                        break;
+                                }
 				output.writeEndElement(); //tr
 				output.writeEndElement(); //thead
 				output.writeStartElement("tbody");
@@ -102,13 +110,14 @@
 					sacktotal += Number(query.value(0));
 					unittotal += Number(query.value(1));
 					costtotal += Number(query.value(2));
+                                        output.writeTextElement("td", (Number(query.value(2))/Number(query.value(1))).toFixed(2));
 					output.writeEndElement(); //tr
 				}
 				query = query.invalidate();
 				output.writeEndElement(); //tbody
 				output.writeStartElement("tfoot");
-				output.writeTextElement("th", "Totals:");
-				output.writeTextElement("td", sacktotal);
+				output.writeTextElement("th", TTR("fypurchase", "Totals:"));
+				output.writeTextElement("td", sacktotal.toFixed(2));
 				output.writeTextElement("td", unittotal.toFixed(2));
 				output.writeTextElement("td", costtotal.toFixed(2));
 				output.writeEndElement(); //tfoot
@@ -131,7 +140,10 @@
 					expandedYears.push(url);
 					var element = new WebElement(view.findFirstElement("#" + url));
 					var year = url.slice(1,url.length);
-					var details = '<tr><td /><td colspan="3"><table><tr><th>Id</th><th>Invoice</th><th>Vendor</th><th>Cost</th></tr>';
+					var details = '<tr><td /><td colspan="3"><table><tr><th>Id</th><th>' + TTR("fypurchase", "Invoice") +
+                                        '</th><th>' + TTR("fypurchase", "Vendor") +
+                                        '</th><th>' + TTR("fypurchase", "Cost") +
+                                        '</th></tr>';
 					q = "SELECT id, invoice, vendor, (SELECT sum(cost) FROM invoice_items WHERE invoice_id = id) FROM invoices WHERE time >= '" + year + "-01-01' AND time <= '" + year + "-12-31'";
 					var query = new QSqlQuery();
 					query.exec(q);

config/Reports/greensales.xml

@@ -14,7 +14,7 @@
 	</menu>
 	<program>
 		<![CDATA[
-			this.windowTitle = "Typica - Green Coffee Sales";
+			this.windowTitle = TTR("greensales", "Typica - Green Coffee Sales");
 			var dateSelect = findChildObject(this, 'dates');
 			var dateQuery = new QSqlQuery();
 			dateQuery.exec("SELECT time::date FROM sale WHERE time = (SELECT min(time) FROM sale) OR time = (SELECT max(time) FROM sale) ORDER BY time ASC");
@@ -29,8 +29,8 @@
 			dateSelect.setLifetimeRange(lifetimeStartDate, lifetimeEndDate);
 			dateQuery = dateQuery.invalidate();
 			var unitBox = findChildObject(this, 'unit');
-			unitBox.addItem("Kg");
-			unitBox.addItem("Lb");
+			unitBox.addItem(TTR("greensales", "Kg"));
+			unitBox.addItem(TTR("greensales", "Lb"));
 			unitBox.currentIndex = QSettings.value("script/report_unit", 1);
 			unitBox['currentIndexChanged(int)'].connect(function() {
 				QSettings.setValue("script/report_unit", unitBox.currentIndex);
@@ -46,24 +46,23 @@
 				var buffer = new QBuffer;
 				buffer.open(3);
 				var output = new XmlWriter(buffer);
-				var output = new XmlWriter(buffer);
 				output.writeStartDocument("1.0");
 				output.writeDTD('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg.dtd">');
 				output.writeStartElement("html");
 				output.writeAttribute("xmlns", "http://www.w3.org/1999/xhtml");
 				output.writeStartElement("head");
-				output.writeTextElement("title", "Green Coffee Sales");
+				output.writeTextElement("title", TTR("greensales", "Green Coffee Sales"));
 				output.writeEndElement();
 				output.writeStartElement("body");
 				var dateRange = dateSelect.currentRange();
 				var startDate = dateRange[0];
 				var endDate = dateRange[dateRange.length - 1];
-				output.writeTextElement("h1", "Green Coffee Sales: " + startDate + " - " + endDate);
+				output.writeTextElement("h1", TTR("greensales", "Green Coffee Sales: ") + startDate + " - " + endDate);
 				var conversion = 1;
-				var unitText = 'Lb';
+				var unitText = TTR("greensales", "Lb");
 				if(unitBox.currentIndex == 0) {
 					conversion = 2.2;
-					unitText = 'Kg';
+					unitText = TTR("greensales", "Kg");
 				}
 				var query = new QSqlQuery();
 				query.prepare("SELECT item, (SELECT name FROM coffees WHERE id = item) AS name, (SELECT origin FROM coffees WHERE id = item) AS origin, (SELECT reference FROM coffees WHERE id = item) AS reference, (SUM(quantity)/:conversion)::numeric(12,3) FROM sale WHERE time < :ed ::date + interval '1 day' AND time >= :sd GROUP BY item ORDER BY name ASC");
@@ -76,11 +75,11 @@
 				output.writeAttribute("cellpadding", "3px");
 				output.writeStartElement("thead");
 				output.writeStartElement("tr");
-				output.writeTextElement("th", "ID"); // 0
-				output.writeTextElement("th", "Coffee"); // 1
-				output.writeTextElement("th", "Origin"); // 2
-				output.writeTextElement("th", "Reference"); // 3
-				output.writeTextElement("th", "Quantity"); // 4
+				output.writeTextElement("th", TTR("greensales", "ID")); // 0
+				output.writeTextElement("th", TTR("greensales", "Coffee")); // 1
+				output.writeTextElement("th", TTR("greensales", "Origin")); // 2
+				output.writeTextElement("th", TTR("greensales", "Reference")); // 3
+				output.writeTextElement("th", TTR("greensales", "Quantity")); // 4
 				output.writeEndElement();
 				output.writeEndElement();
 				output.writeStartElement("tbody");
@@ -96,6 +95,22 @@
 					output.writeEndElement();
 				}
 				output.writeEndElement();
+                                output.writeStartElement("tfoot");
+                                query.prepare("SELECT (sum(quantity)/:conversion)::numeric(12,3) FROM sale WHERE time < :ed ::date + interval '1 day' AND time >= :sd");
+                                query.bind(":conversion", conversion);
+                                query.bind(":ed", endDate);
+                                query.bind(":sd", startDate);
+                                query.exec();
+                                if(query.next()) {
+                                    output.writeStartElement("tr");
+                                    output.writeEmptyElement("td");
+                                    output.writeEmptyElement("td");
+                                    output.writeEmptyElement("td");
+                                    output.writeTextElement("th", TTR("greensales", "Total:"));
+                                    output.writeTextElement("td", query.value(0));
+                                    output.writeEndElement();
+                                }
+                                output.writeEndElement();
 				output.writeEndElement();
 				output.writeEndElement();
 				output.writeEndElement();

config/Reports/historyreport.xml

@@ -0,0 +1,320 @@
+<window id="batchreport">
+    <reporttitle>Production:->Batch Log</reporttitle>
+    <layout type="vertical">
+        <layout type="horizontal">
+            <daterange id="dates" initial="6" /><!-- Last 7 Days -->
+            <label>Batch Type: </label>
+            <sqldrop id="batchtype" />
+            <label>Approval: </label>
+            <sqldrop id="approval" />
+            <label>Search: </label>
+            <line id="search" />
+            <label>Weight Unit:</label>
+            <sqldrop id="unit" />
+            <stretch />
+        </layout>
+        <webview id="report" />
+    </layout>
+    <menu name="File">
+        <item id="print" shortcut="Ctrl+P">Print...</item>
+    </menu>
+    <program>
+        <![CDATA[
+            this.setWindowTitle(TTR("batchreport", "Typica - Batch Log"));
+            var dateSelect = findChildObject(this, 'dates');
+            var dateQuery = new QSqlQuery();
+            dateQuery.exec("SELECT time::date FROM roasting_log WHERE time = (SELECT min(time) FROM roasting_log) OR time = (SELECT max(time) FROM roasting_log) ORDER BY time ASC");
+            dateQuery.next();
+            var lifetimeStartDate = dateQuery.value(0);
+            var lifetimeEndDate;
+            if(dateQuery.next()) {
+                lifetimeEndDate = dateQuery.value(0);
+            } else {
+                lifetimeEndDate = lifetimeStartDate;
+            }
+            dateSelect.setLifetimeRange(lifetimeStartDate, lifetimeEndDate);
+            dateQuery = dateQuery.invalidate();
+            dateSelect.currentIndex = QSettings.value("script/history/dateIndex", 6);
+            dateSelect.rangeUpdated.connect(function() {
+                if(dateSelect.currentIndex != 24) {
+                    QSettings.setValue("script/history/dateIndex", dateSelect.currentIndex);
+                }
+                refresh();
+            });
+            var unitBox = findChildObject(this, 'unit');
+            unitBox.addItem(TTR("batchreport", "Kg"));
+            unitBox.addItem(TTR("batchreport", "Lb"));
+            unitBox.currentIndex = QSettings.value("script/history_unit", 1);
+            unitBox['currentIndexChanged(int)'].connect(function() {
+                QSettings.setValue("script/history_unit", unitBox.currentIndex);
+                refresh();
+            });
+            var batchType = findChildObject(this, 'batchtype');
+            batchType.addItem(TTR("batchreport", "Any"));
+            batchType.addItem(TTR("batchreport", "Production Roasts"));
+            batchType.addItem(TTR("batchreport", "Sample Roasts"));
+            batchType.currentIndex = QSettings.value("script/history/batchtypefilter", 1);
+            batchType['currentIndexChanged(int)'].connect(function() {
+                QSettings.setValue("script/history/batchtypefilter", batchType.currentIndex);
+                refresh();
+            });
+            var approval = findChildObject(this, 'approval');
+            approval.addItem(TTR("batchreport", "Any"));
+            approval.addItem(TTR("batchreport", "Approved"));
+            approval.addItem(TTR("batchreport", "Not Approved"));
+            approval.currentIndex = QSettings.value("script/history/approvalfilter", 1);
+            approval['currentIndexChanged(int)'].connect(function() {
+                QSettings.setValue("script/history/approvalfilter", approval.currentIndex);
+                refresh();
+            });
+            var search = findChildObject(this, 'search');
+            search.editingFinished.connect(function() {
+                refresh();
+            });
+            var view = findChildObject(this, 'report');
+            var printMenu = findChildObject(this, 'print');
+            printMenu.triggered.connect(function() {
+                view.print();
+            });
+            view.scriptLinkClicked.connect(function(url) {
+                var arg = decodeURI(url.slice(2, url.length));
+                var key = arg.split("@");
+                var details = createWindow("batchDetails");
+                var fakeTable = new Object;
+                fakeTable.holding = new Array(7);
+                fakeTable.data = function(r, c) {
+                    return this.holding[c];
+                };
+                var conversion = 1;
+                if(unitBox.currentIndex == 0) {
+                    conversion = 2.2;
+                }
+                var query = new QSqlQuery();
+                var q = "SELECT time, machine, (SELECT name FROM items WHERE id = roasted_id) AS name, unroasted_total_quantity / " + conversion + " AS green, roasted_quantity  / " + conversion + " AS roasted, CASE WHEN unroasted_total_quantity = 0 THEN NULL ELSE ((unroasted_total_quantity - roasted_quantity) / unroasted_total_quantity * 100::numeric)::numeric(12,2) END AS weight_loss, duration, annotation FROM roasting_log WHERE machine = :machine AND time = :time";
+                query.prepare(q);
+                query.bind(":machine", key[0]);
+                query.bind(":time", key[1]);
+                query.exec();
+                query.next();
+                for(var i = 0; i < 8; i++) {
+                    fakeTable.holding[i] = query.value(i);
+                }
+                fakeTable.holding[0] = key[1];
+                query = query.invalidate();
+                details.loadData(fakeTable, 0);
+            });
+            var refresh = function() {
+                var dateRange = dateSelect.currentRange();
+                var startDate = dateRange[0];
+                var endDate = dateRange[dateRange.length - 1];
+                var conversion = 1;
+                if(unitBox.currentIndex == 0) {
+                    conversion = 2.2;
+                }
+                var approvalClause = "";
+                switch(approval.currentIndex) {
+                    case 1:
+                        approvalClause = " AND approval = true";
+                        break;
+                    case 2:
+                        approvalClause = " AND approval = false";
+                        break;
+                }
+                var batchClause = "";
+                switch(batchType.currentIndex) {
+                    case 1:
+                        batchClause = " AND transaction_type = 'ROAST'";
+                        break;
+                    case 2:
+                        batchClause = " AND transaction_type = 'SAMPLEROAST'";
+                        break;
+                }
+                var searchClause = "";
+                if(search.text.length > 0) {
+                    searchClause = " WHERE (person ~* :p1 OR rname ~* :p2 OR mname ~* :p3 OR greens ~* :p4 OR annotation ~* :p5 OR array_to_string(files, ',') ~* :p6)";
+                }
+                var q = "WITH qq AS (SELECT roasting_log.time, array_to_string(files, ','), person, (SELECT name || ' (' || id || ')' FROM items WHERE id = roasted_id) AS rname, duration, (SELECT name FROM machine WHERE id = machine) AS mname, array_to_string(ARRAY(SELECT name || ' (' || id || ')' FROM items WHERE id IN (SELECT unnest(unroasted_id))), ',') AS greens, (unroasted_total_quantity/:c1)::numeric(12,2), (roasted_quantity/:c2)::numeric(12,2), loss, annotation, approval, spec_loss::numeric(12,2) || '±' || spec_tolerance::numeric(12,2) AS lspec, notes, loss_match, machine || '@' || roasting_log.time AS link, files FROM roasting_log, LATERAL (SELECT CASE WHEN (unroasted_total_quantity = 0) THEN NULL ELSE (((unroasted_total_quantity - roasted_quantity)/unroasted_total_quantity)*100)::numeric(12,2) END AS loss) lc, LATERAL (WITH q AS (SELECT (SELECT min(time) - interval '10 years' FROM roasting_log) AS time, NULL::numeric AS loss, NULL::numeric AS tolerance, NULL::text AS notes) SELECT time, (loss*100)::numeric(12,2) AS spec_loss, (tolerance*100)::numeric(12,2) AS spec_tolerance, notes FROM roasting_specification WHERE item = roasted_id AND time = (SELECT max(time) FROM roasting_specification WHERE time <= roasting_log.time AND item = roasted_id) UNION (SELECT * FROM q) ORDER BY time DESC LIMIT 1) spec, LATERAL (SELECT loss >= spec_loss - spec_tolerance AND loss <= spec_loss + spec_tolerance AS loss_match) m WHERE roasting_log.time >= :sd AND roasting_log.time < :ed::date + interval '1 day'" + approvalClause + batchClause + ") SELECT * FROM qq" + searchClause + " ORDER BY time DESC";
+                var query = new QSqlQuery();
+                query.prepare(q);
+                query.bind(":c1", conversion);
+                query.bind(":c2", conversion);
+                query.bind(":sd", startDate);
+                query.bind(":ed", endDate);
+                if(searchClause.length > 0) {
+                    var pattern = ".*" + search.text + ".*";
+                    query.bind(":p1", pattern);
+                    query.bind(":p2", pattern);
+                    query.bind(":p3", pattern);
+                    query.bind(":p4", pattern);
+                    query.bind(":p5", pattern);
+                    query.bind(":p6", pattern);
+                }
+                query.exec();
+                var buffer = new QBuffer;
+                buffer.open(3);
+                var output = new XmlWriter(buffer);
+                output.writeStartDocument("1.0");
+                output.writeDTD('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg.dtd">');
+                output.writeStartElement("html");
+                output.writeAttribute("xmlns", "http://www.w3.org/1999/xhtml");
+                output.writeStartElement("head");
+                output.writeTextElement("title", TTR("batchreport", "Batch Log"));
+                output.writeEndElement();
+                output.writeStartElement("body");
+                output.writeStartElement("table");
+                output.writeAttribute("style", "page-break-after: auto; text-align: left");
+                output.writeAttribute("rules", "groups");
+                output.writeAttribute("cellpadding", "3px");
+                output.writeStartElement("thead");
+                output.writeStartElement("tr");
+                output.writeAttribute("valign", "bottom");
+                output.writeTextElement("th", TTR("batchreport", "Time"));
+                output.writeTextElement("th", TTR("batchreport", "File Numbers"));
+                output.writeTextElement("th", TTR("batchreport", "Operator"));
+                output.writeTextElement("th", TTR("batchreport", "Roasted Coffee"));
+                output.writeEndElement();
+                output.writeStartElement("tr");
+                output.writeAttribute("valign", "bottom");
+                output.writeEmptyElement("td");
+                output.writeTextElement("th", TTR("batchreport", "Duration"));
+                output.writeTextElement("th", TTR("batchreport", "Machine"));
+                output.writeTextElement("th", TTR("batchreport", "Green Coffees"));
+                output.writeEndElement();
+                output.writeStartElement("tr");
+                output.writeAttribute("valign", "bottom");
+                output.writeEmptyElement("td");
+                output.writeTextElement("th", TTR("batchreport", "Green Weight"));
+                output.writeTextElement("th", TTR("batchreport", "Roasted Weight"));
+                output.writeTextElement("th", TTR("batchreport", "% Weight Loss"));
+                output.writeEndElement();
+                output.writeStartElement("tr");
+                output.writeAttribute("valign", "bottom");
+                output.writeEmptyElement("td");
+                output.writeStartElement("th");
+                output.writeAttribute("colspan", "2");
+                output.writeCharacters(TTR("batchreport", "Batch Notes"));
+                output.writeEndElement();
+                output.writeTextElement("th", TTR("batchreport", "Specification Notes"));
+                output.writeEndElement();
+                output.writeEndElement();
+                output.writeStartElement("tbody");
+                while(query.next()) {
+                    output.writeStartElement("tr");
+                    output.writeAttribute("valign", "top");
+                    output.writeStartElement("td");
+                    output.writeStartElement("a");
+                    output.writeAttribute("href", "typica://script/b/" + query.value(15));
+                    output.writeCharacters(query.value(0).replace("T", " "));
+                    output.writeEndElement();
+                    output.writeEndElement();
+                    output.writeStartElement("td");
+                    output.writeStartElement("a");
+                    output.writeAttribute("href", "typica://script/b/" + query.value(15));
+                    output.writeCharacters(query.value(1));
+                    output.writeEndElement();
+                    output.writeEndElement();
+                    output.writeTextElement("td", query.value(2));
+                    output.writeStartElement("td");
+                    output.writeStartElement("span");
+                    if(query.value(11) == "false") {
+                        output.writeAttribute("style", "color:#FF0000");
+                    }
+                    output.writeCharacters(query.value(3));
+                    output.writeEndElement();
+                    output.writeEndElement();
+                    output.writeEndElement();
+                    output.writeStartElement("tr");
+                    output.writeAttribute("valign", "top");
+                    output.writeEmptyElement("td");
+                    output.writeTextElement("td", query.value(4));
+                    output.writeTextElement("td", query.value(5));
+                    output.writeTextElement("td", query.value(6));
+                    output.writeEndElement();
+                    output.writeStartElement("tr");
+                    output.writeAttribute("valign", "top");
+                    output.writeEmptyElement("td");
+                    output.writeTextElement("td", query.value(7));
+                    output.writeTextElement("td", query.value(8));
+                    output.writeStartElement("td");
+                    output.writeStartElement("span");
+                    if(query.value(14) == "false" && query.value(12).length > 0) {
+                        output.writeAttribute("style", "color:#FF0000");
+                    } else if (query.value(14) === "true") {
+                        output.writeAttribute("style", "color:#00FF00");
+                    }
+                    output.writeAttribute("title", query.value(12));
+                    output.writeCharacters(query.value(9));
+                    output.writeEndElement();
+                    output.writeEndElement();
+                    output.writeEndElement();
+                    output.writeStartElement("tr");
+                    output.writeAttribute("valign", "top");
+                    output.writeEmptyElement("td");
+                    output.writeStartElement("td");
+                    output.writeAttribute("colspan", "2");
+                    output.writeAttribute("style", "max-width: 400px");
+                    var noteArray = query.value(10).split("\n");
+                    for(var i = 0; i < noteArray.length; i++) {
+                        output.writeStartElement("p");
+                        output.writeAttribute("style", "margin-top: 0; margin-bottom: 0");
+                        output.writeCharacters(noteArray[i]);
+                        output.writeEndElement();
+                    }
+                    output.writeEndElement();
+                    output.writeStartElement("td");
+                    output.writeAttribute("style", "max-width: 400px");
+                    var specArray = query.value(13).split("\n");
+                    for(var i = 0; i < specArray.length; i++) {
+                        output.writeStartElement("p", specArray[i]);
+                        output.writeAttribute("style", "margin-top: 0; margin-bottom: 0");
+                        output.writeCharacters(specArray[i]);
+                        output.writeEndElement();
+                    }
+                    output.writeEndElement();
+                    output.writeEndElement();
+                }
+                output.writeEndElement();
+                output.writeStartElement("tfoot");
+                output.writeStartElement("tr");
+                output.writeAttribute("valign", "bottom");
+                output.writeTextElement("th", TTR("batchreport", "Total Batches"));
+                output.writeTextElement("th", TTR("batchreport", "Total Duration"));
+                output.writeTextElement("th", TTR("batchreport", "Total Green Weight"));
+                output.writeTextElement("th", TTR("batchreport", "Total Roasted Weight"));
+                output.writeEndElement();
+                output.writeStartElement("tr");
+                output.writeAttribute("valign", "top");
+                q = "WITH qq AS (SELECT roasting_log.time, array_to_string(files, ','), person, (SELECT name || ' (' || id || ')' FROM items WHERE id = roasted_id) AS rname, duration, (SELECT name FROM machine WHERE id = machine) AS mname, array_to_string(ARRAY(SELECT name || ' (' || id || ')' FROM items WHERE id IN (SELECT unnest(unroasted_id))), ',') AS greens, (unroasted_total_quantity/:c1)::numeric(12,2) AS uq, (roasted_quantity/:c2)::numeric(12,2) AS rq, annotation, approval, files FROM roasting_log WHERE roasting_log.time >= :sd AND roasting_log.time < :ed::date + interval '1 day'" + approvalClause + batchClause + ") SELECT count(1), sum(duration), sum(uq), sum(rq) FROM qq" + searchClause;
+                var query = new QSqlQuery();
+                query.prepare(q);
+                query.bind(":c1", conversion);
+                query.bind(":c2", conversion);
+                query.bind(":sd", startDate);
+                query.bind(":ed", endDate);
+                if(searchClause.length > 0) {
+                    var pattern = ".*" + search.text + ".*";
+                    query.bind(":p1", pattern);
+                    query.bind(":p2", pattern);
+                    query.bind(":p3", pattern);
+                    query.bind(":p4", pattern);
+                    query.bind(":p5", pattern);
+                    query.bind(":p6", pattern);
+                }
+                query.exec();
+                query.next();
+                for(var i = 0; i < 4; i++) {
+                    output.writeTextElement("td", query.value(i));
+                }
+                output.writeEndElement();
+                output.writeEndElement();
+                query = query.invalidate();
+                output.writeEndElement();
+                output.writeEndElement();
+                output.writeEndDocument();
+                view.setContent(buffer);
+                buffer.close();
+            };
+            refresh();
+        ]]>
+    </program>
+</window>

config/Reports/invchange.xml

@@ -14,7 +14,7 @@
 	</menu>
 	<program>
 		<![CDATA[
-			this.windowTitle = "Typica - Inventory Change Summary";
+			this.windowTitle = TTR("invchange", "Typica - Inventory Change Summary");
 			var dateSelect = findChildObject(this, 'dates');
 			var dateQuery = new QSqlQuery();
 			dateQuery.exec("SELECT time::date FROM transactions WHERE time = (SELECT min(time) FROM transactions) OR time = (SELECT max(time) FROM transactions) ORDER BY time ASC");
@@ -29,8 +29,8 @@
 			dateSelect.setLifetimeRange(lifetimeStartDate, lifetimeEndDate);
 			dateQuery = dateQuery.invalidate();
 			var unitBox = findChildObject(this, 'unit');
-			unitBox.addItem("Kg");
-			unitBox.addItem("Lb");
+			unitBox.addItem(TTR("invchange", "Kg"));
+			unitBox.addItem(TTR("invchange", "Lb"));
 			unitBox.currentIndex = QSettings.value("script/report_unit", 1);
 			unitBox['currentIndexChanged(int)'].connect(function() {
 				QSettings.setValue("script/report_unit", unitBox.currentIndex);
@@ -50,23 +50,23 @@
 				output.writeStartElement("html");
 				output.writeAttribute("xmlns", "http://www.w3.org/1999/xhtml");
 				output.writeStartElement("head");
-				output.writeTextElement("title", "Inventory Change Summary");
+				output.writeTextElement("title", TTR("invchange", "Inventory Change Summary"));
 				output.writeEndElement();
 				output.writeStartElement("body");
 				var dateRange = dateSelect.currentRange();
 				var startDate = dateRange[0];
 				var endDate = dateRange[dateRange.length - 1];
-				output.writeTextElement("h1", "Inventory Change Summary: " + startDate + " – " + endDate);
+				output.writeTextElement("h1", TTR("invchange", "Inventory Change Summary: ") + startDate + " – " + endDate);
 				var conversion = 1;
 				if(unitBox.currentIndex == 0) {
 					conversion = 2.2;
 				}
-				var unitText = "Lb";
+				var unitText = TTR("invchange", "Lb");
 				if(unitBox.currentIndex == 0) {
-					unitText = "Kg";
+					unitText = TTR("invchange", "Kg");
 				}
 				var query = new QSqlQuery();
-					var q = "WITH q AS (SELECT id, name, reference, COALESCE((SELECT balance FROM item_history(id) WHERE time = (SELECT max(time) FROM item_history(id) WHERE time < :sd1)), 0)/:c1 AS starting_balance, COALESCE((SELECT sum(quantity) FROM purchase WHERE item = id AND time >= :sd2 AND time < :ed1 ::date + interval '1 day'), 0)/:c2 AS purchase, COALESCE((SELECT sum(quantity) FROM use WHERE item = id AND time >= :sd3 AND time < :ed2 ::date + interval '1 day'), 0)/:c3 AS use, COALESCE((SELECT sum(quantity) FROM sale WHERE item = id AND time >= :sd4 AND time < :ed3 ::date + interval '1 day'), 0)/:c4 AS sale, (SElECT balance FROM item_history(id) WHERE time = (SELECT max(time) FROM item_history(id) WHERE time < :ed4 ::date + interval '1 day'))/:c5 AS quantity, (SELECT sum(cost * quantity) / sum(quantity) FROM purchase WHERE item = id) AS unit_cost FROM coffees WHERE id IN (SELECT item FROM purchase WHERE time >= :sd6 AND time < :ed5 ::date + interval '1 day') OR id IN (SELECT id FROM items WHERE (SELECT balance FROM item_history(id) WHERE time = (SELECT max(time) FROM item_history(id) WHERE time < :ed6 ::date + interval '1 day')) > 0) OR id IN (SELECT DISTINCT item FROM all_transactions WHERE time > :sd7 AND time < :ed7 ::date + interval '1 day')) SELECT *, (starting_balance + purchase - use - sale - quantity)/:c7 AS adjustment, starting_balance * unit_cost * :c8 AS starting_cost, purchase * unit_cost * :c9 AS purchase_cost, use * unit_cost * :c10 AS use_cost, sale * unit_cost * :c11 AS sale_cost, quantity * unit_cost * :c12 AS quantity_cost, (starting_balance + purchase - use - sale - quantity) * unit_cost * :c13 AS adjustment_cost, (SELECT sum(quantity)/:c6 FROM purchase WHERE item = id) AS total_purchase FROM q ORDER BY name";
+					var q = "WITH q AS (SELECT id, name, reference, COALESCE((SELECT balance FROM item_history(id) WHERE time = (SELECT max(time) FROM item_history(id) WHERE time < :sd1)), 0)/:c1 AS starting_balance, COALESCE((SELECT sum(quantity) FROM purchase WHERE item = id AND time >= :sd2 AND time < :ed1 ::date + interval '1 day'), 0)/:c2 AS purchase, COALESCE((SELECT sum(quantity) FROM use WHERE item = id AND time >= :sd3 AND time < :ed2 ::date + interval '1 day'), 0)/:c3 AS use, COALESCE((SELECT sum(quantity) FROM sale WHERE item = id AND time >= :sd4 AND time < :ed3 ::date + interval '1 day'), 0)/:c4 AS sale, (SElECT balance FROM item_history(id) WHERE time = (SELECT max(time) FROM item_history(id) WHERE time < :ed4 ::date + interval '1 day'))/:c5 AS quantity, (SELECT sum(cost * quantity) / sum(quantity) FROM purchase WHERE item = id) AS unit_cost FROM coffees WHERE id IN (SELECT item FROM purchase WHERE time >= :sd6 AND time < :ed5 ::date + interval '1 day') OR id IN (SELECT id FROM items WHERE (SELECT balance FROM item_history(id) WHERE time = (SELECT max(time) FROM item_history(id) WHERE time < :ed6 ::date + interval '1 day')) > 0) OR id IN (SELECT DISTINCT item FROM all_transactions WHERE time > :sd7 AND time < :ed7 ::date + interval '1 day')) SELECT *, (starting_balance + purchase - use - sale - quantity) AS adjustment, starting_balance * unit_cost * :c8 AS starting_cost, purchase * unit_cost * :c9 AS purchase_cost, use * unit_cost * :c10 AS use_cost, sale * unit_cost * :c11 AS sale_cost, quantity * unit_cost * :c12 AS quantity_cost, (starting_balance + purchase - use - sale - quantity) * unit_cost * :c13 AS adjustment_cost, (SELECT sum(quantity)/:c6 FROM purchase WHERE item = id) AS total_purchase FROM q ORDER BY name";
 				query.prepare(q);
 				query.bind(":sd1", startDate);
 				query.bind(":sd2", startDate);
@@ -87,7 +87,6 @@
 				query.bind(":c4", conversion);
 				query.bind(":c5", conversion);
 				query.bind(":c6", conversion);
-				query.bind(":c7", conversion);
 				query.bind(":c8", conversion);
 				query.bind(":c9", conversion);
 				query.bind(":c10", conversion);
@@ -100,21 +99,21 @@
 				output.writeAttribute("cellpadding", "3px");
 				output.writeStartElement("thead");
 				output.writeStartElement("tr");
-				output.writeTextElement("th", "ID"); // 0
-				output.writeTextElement("th", "Coffee"); // 1
-				output.writeTextElement("th", "Reference"); // 2
-				output.writeTextElement("th", "Starting (" + unitText + ")"); // 3
-				output.writeTextElement("th", "Cost"); // 10
-				output.writeTextElement("th", "Purchase (" + unitText + ")"); // 4
-				output.writeTextElement("th", "Cost"); // 11
-				output.writeTextElement("th", "Use (" + unitText + ")"); // 5
-				output.writeTextElement("th", "Cost"); // 12
-				output.writeTextElement("th", "Sale (" + unitText + ")"); // 6
-				output.writeTextElement("th", "Cost"); // 13
-				output.writeTextElement("th", "Adjustment (" + unitText + ")"); // 9
-				output.writeTextElement("th", "Cost"); // 15
-				output.writeTextElement("th", "Ending (" + unitText + ")"); // 7
-				output.writeTextElement("th", "Cost"); // 14
+				output.writeTextElement("th", TTR("invchange", "ID")); // 0
+				output.writeTextElement("th", TTR("invchange", "Coffee")); // 1
+				output.writeTextElement("th", TTR("invchange", "Reference")); // 2
+				output.writeTextElement("th", TTR("invchange", "Starting (") + unitText + ")"); // 3
+				output.writeTextElement("th", TTR("invchange", "Cost")); // 10
+				output.writeTextElement("th", TTR("invchange", "Purchase (") + unitText + ")"); // 4
+				output.writeTextElement("th", TTR("invchange", "Cost")); // 11
+				output.writeTextElement("th", TTR("invchange", "Use (") + unitText + ")"); // 5
+				output.writeTextElement("th", TTR("invchange", "Cost")); // 12
+				output.writeTextElement("th", TTR("invchange", "Sale (") + unitText + ")"); // 6
+				output.writeTextElement("th", TTR("invchange", "Cost")); // 13
+				output.writeTextElement("th", TTR("invchange", "Adjustment (") + unitText + ")"); // 9
+				output.writeTextElement("th", TTR("invchange", "Cost")); // 15
+				output.writeTextElement("th", TTR("invchange", "Ending (") + unitText + ")"); // 7
+				output.writeTextElement("th", TTR("invchange", "Cost")); // 14
 				output.writeEndElement();
 				output.writeEndElement();
 				output.writeStartElement("tbody");
@@ -190,7 +189,7 @@
 				output.writeStartElement("tr");
 				output.writeTextElement("td", "");
 				output.writeTextElement("td", "");
-				output.writeTextElement("th", "Total:");
+				output.writeTextElement("th", TTR("invchange", "Total:"));
 				output.writeTextElement("td", sum3.toFixed(2));
 				output.writeTextElement("td", sum10.toFixed(2));
 				output.writeTextElement("td", sum4.toFixed(2));

config/Reports/inventory.xml

@@ -15,31 +15,31 @@
     </menu>
     <program>
         <![CDATA[
-            this.windowTitle = "Typica - Current Inventory and Availability Projection";
+            this.windowTitle = TTR("inventoryreport", "Typica - Current Inventory and Availability Projection");
             var report = findChildObject(this, 'report');
             var printMenu = findChildObject(this, 'print');
             printMenu.triggered.connect(function() {
                 report.print();
             });
             var sortBox = findChildObject(this, 'sort');
-            sortBox.addItem("Coffee A-Z");
-            sortBox.addItem("Coffee Z-A");
-            sortBox.addItem("Stock Ascending");
-            sortBox.addItem("Stock Descending");
-            sortBox.addItem("Sacks Ascending");
-            sortBox.addItem("Sacks Descending");
-            sortBox.addItem("Unit Cost Ascending");
-            sortBox.addItem("Unit Cost Descending");
-            sortBox.addItem("Stock Cost Ascending");
-            sortBox.addItem("Stock Cost Descending");
-            sortBox.addItem("Use Rate Ascending");
-            sortBox.addItem("Use Rate Descending");
-            sortBox.addItem("Availability Shortest-Longest");
-            sortBox.addItem("Availability Longest-Shortest");
+            sortBox.addItem(TTR("inventoryreport", "Coffee A-Z"));
+            sortBox.addItem(TTR("inventoryreport", "Coffee Z-A"));
+            sortBox.addItem(TTR("inventoryreport", "Stock Ascending"));
+            sortBox.addItem(TTR("inventoryreport", "Stock Descending"));
+            sortBox.addItem(TTR("inventoryreport", "Sacks Ascending"));
+            sortBox.addItem(TTR("inventoryreport", "Sacks Descending"));
+            sortBox.addItem(TTR("inventoryreport", "Unit Cost Ascending"));
+            sortBox.addItem(TTR("inventoryreport", "Unit Cost Descending"));
+            sortBox.addItem(TTR("inventoryreport", "Stock Cost Ascending"));
+            sortBox.addItem(TTR("inventoryreport", "Stock Cost Descending"));
+            sortBox.addItem(TTR("inventoryreport", "Use Rate Ascending"));
+            sortBox.addItem(TTR("inventoryreport", "Use Rate Descending"));
+            sortBox.addItem(TTR("inventoryreport", "Availability Shortest-Longest"));
+            sortBox.addItem(TTR("inventoryreport", "Availability Longest-Shortest"));
             sortBox.currentIndex = QSettings.value("inventory_sort", 0);
 			var unitBox = findChildObject(this, 'unit');
-			unitBox.addItem("Kg");
-			unitBox.addItem("Lb");
+			unitBox.addItem(TTR("inventoryreport", "Kg"));
+			unitBox.addItem(TTR("inventoryreport", "Lb"));
 			unitBox.currentIndex = QSettings.value("script/report_unit", 1);
             function refresh() {
                 var buffer = new QBuffer;
@@ -50,31 +50,31 @@
                 output.writeStartElement("html");
                 output.writeAttribute("xmlns", "http://www.w3.org/1999/xhtml");
                 output.writeStartElement("head");
-                output.writeTextElement("title", "Current Inventory and Availability Projection");
+                output.writeTextElement("title", TTR("inventoryreport", "Current Inventory and Availability Projection"));
                 output.writeEndElement();
                 output.writeStartElement("body");
-                output.writeTextElement("h1", "Current Inventory and Availability Projection");
-                output.writeTextElement("p", "This is a report showing how much of each coffee is available, the cost of that coffee, the daily rate of use for that coffee, and the date the coffee will be gone if use continues at the current rate.");
+                output.writeTextElement("h1", TTR("inventoryreport", "Current Inventory and Availability Projection"));
+                output.writeTextElement("p", TTR("inventoryreport", "This is a report showing how much of each coffee is available, the cost of that coffee, the daily rate of use for that coffee, and the date the coffee will be gone if use continues at the current rate."));
                 output.writeStartElement("table");
                 output.writeAttribute("rules", "groups");
                 output.writeAttribute("cellpadding", "3px");
                 output.writeStartElement("thead");
                 output.writeStartElement("tr");
-                output.writeTextElement("th", "Coffee");
+                output.writeTextElement("th", TTR("inventoryreport", "Coffee"));
 				switch(unitBox.currentIndex)
 				{
 					case 0:
-						output.writeTextElement("th", "Stock (Kg)");
+						output.writeTextElement("th", TTR("inventoryreport", "Stock (Kg)"));
 						break;
 					case 1:
-						output.writeTextElement("th", "Stock (Lb)");
+						output.writeTextElement("th", TTR("inventoryreport", "Stock (Lb)"));
 						break;
 				}
-                output.writeTextElement("th", "Sacks");
-                output.writeTextElement("th", "Unit Cost");
-                output.writeTextElement("th", "Stock Cost");
-                output.writeTextElement("th", "Use Rate");
-                output.writeTextElement("th", "Availability");
+                output.writeTextElement("th", TTR("inventoryreport", "Sacks"));
+                output.writeTextElement("th", TTR("inventoryreport", "Unit Cost"));
+                output.writeTextElement("th", TTR("inventoryreport", "Stock Cost"));
+                output.writeTextElement("th", TTR("inventoryreport", "Use Rate"));
+                output.writeTextElement("th", TTR("inventoryreport", "Availability"));
                 output.writeEndElement();
                 output.writeEndElement();
                 output.writeStartElement("tbody");
@@ -155,7 +155,7 @@
                 output.writeEndElement();
                 output.writeStartElement("tfoot");
                 output.writeStartElement("tr");
-                output.writeTextElement("th", "Totals");
+                output.writeTextElement("th", TTR("inventoryreport", "Totals"));
                 query.prepare("SELECT (sum(quantity) / :conversion)::numeric(12,2), sum(quantity * (SELECT cost FROM purchase WHERE item = id))::numeric(12,2) FROM items WHERE quantity > 0");
 				switch(unitBox.currentIndex)
 				{
@@ -175,7 +175,7 @@
                 output.writeTextElement("td", "");
                 output.writeTextElement("td", "");
                 query = query.invalidate();
-				output.writeEndElement();
+                output.writeEndElement();
                 output.writeEndElement();
                 output.writeEndElement();
                 output.writeEndElement();

config/Reports/invoices.xml

@@ -0,0 +1,156 @@
+<window id="invoicereport">
+    <reporttitle>Purchase:->Invoices</reporttitle>
+    <layout type="vertical">
+        <layout type="horizontal">
+            <daterange id="dates" initial="23" /><!-- Lifetime -->
+            <label>Vendor: </label>
+            <sqldrop id="vendor" />
+            <label>Search: </label>
+            <line id="search" />
+            <stretch />
+        </layout>
+        <webview id="report" />
+    </layout>
+    <menu name="File">
+        <item id="print" shortcut="Ctrl+P">Print...</item>
+    </menu>
+    <program>
+        <![CDATA[
+            var vendor = findChildObject(this, "vendor");
+            vendor.addItem(TTR("invoicereport", "Any"));
+            var query = new QSqlQuery();
+            query.exec("SELECT DISTINCT vendor FROM invoices");
+            while(query.next()) {
+                vendor.addItem(query.value(0));
+            }
+            vendor['currentIndexChanged(int)'].connect(refresh);
+            var dateSelect = findChildObject(this, 'dates');
+            query.exec("SELECT time::date FROM invoices WHERE time = (SELECT min(time) FROM invoices) OR time = (SELECT max(time) FROM invoices) ORDER BY time ASC");
+            query.next();
+            var lifetimeStartDate = query.value(0);
+            var lifetimeEndDate;
+            if(query.next()) {
+                lifetimeEndDate = query.value(0);
+            } else {
+                lifetimeEndDate = lifetimeStartDate;
+            }
+            dateSelect.setLifetimeRange(lifetimeStartDate, lifetimeEndDate);
+            dateSelect.rangeUpdated.connect(refresh);
+            query = query.invalidate();
+            var search = findChildObject(this, "search");
+            search.editingFinished.connect(refresh);
+            var view = findChildObject(this, "report");
+            view.scriptLinkClicked.connect(function(url) {
+                var info = createWindow("invoiceinfo");
+                info.setInvoiceID(url);
+                var invquery = new QSqlQuery();
+                invquery.exec("SELECT time, invoice, vendor FROM invoices WHERE id = " + url);
+                invquery.next();
+                var timefield = findChildObject(info, 'date');
+                timefield.text = invquery.value(0);
+                var vendorfield = findChildObject(info, 'vendor');
+                vendorfield.text = invquery.value(2);
+                var invoicefield = findChildObject(info, 'invoice');
+                invoicefield.text = invquery.value(1);
+                var itemtable = findChildObject(info, 'itemtable');
+                itemtable.setQuery("SELECT record_type, item_id, description, (SELECT reference FROM items WHERE id = item_id) AS reference, (SELECT cost FROM purchase WHERE item = item_id) AS unit_cost, (SELECT quantity FROM purchase WHERE item = item_id) AS quantity, ((SELECT quantity FROM purchase WHERE item = item_id)/(SELECT conversion FROM lb_bag_conversion WHERE item = item_id))::numeric(12,2) AS sacks, cost FROM invoice_items WHERE invoice_id = " + url + " AND record_type = 'PURCHASE' UNION SELECT record_type, NULL, description, NULL, NULL, NULL, NULL, cost FROM invoice_items WHERE invoice_id = " + url + " AND record_type = 'FEE' ORDER BY item_id");
+                invquery = invquery.invalidate();
+            });
+            function refresh() {
+                var dateRange = dateSelect.currentRange();
+                var startDate = dateRange[0];
+                var endDate = dateRange[dateRange.length - 1];
+                var buffer = new QBuffer;
+                buffer.open(3);
+                var output = new XmlWriter(buffer);
+                output.writeStartDocument("1.0");
+                output.writeDTD('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg.dtd">');
+                output.writeStartElement("html");
+                output.writeAttribute("xmlns", "http://www.w3.org/1999/xhtml");
+                output.writeStartElement("head");
+                output.writeTextElement("title", TTR("invoicereport", "Invoices"));
+                output.writeEndElement();
+                output.writeStartElement("body");
+                output.writeTextElement("h1", TTR("invoicereport", "Invoices ") + startDate + " - " + endDate);
+                output.writeStartElement("table");
+                output.writeAttribute("style", "page-break-after: auto; text-align: left");
+                output.writeAttribute("rules", "groups");
+                output.writeAttribute("cellpadding", "3px");
+                output.writeStartElement("thead");
+                output.writeStartElement("tr");
+                output.writeTextElement("th", TTR("invoicereport", "Date"));
+                output.writeTextElement("th", TTR("invoicereport", "Vendor"));
+                output.writeTextElement("th", TTR("invoicereport", "Invoice"));
+                output.writeTextElement("th", TTR("invoicereport", "Cost"));
+                output.writeEndElement();
+                output.writeEndElement();
+                output.writeStartElement("tbody");
+                var query = new QSqlQuery();
+                var vendorclause = "";
+                if(vendor.currentIndex > 0) {
+                    vendorclause = " AND vendor = :vendor";
+                }
+                var searchclause = "";
+                if(search.text.length > 0)
+                {
+                    searchclause = " AND id IN (SELECT invoice_id FROM invoice_items WHERE item_id IN (SELECT item FROM certifications WHERE certification ~* :p1 UNION SELECT id FROM coffees WHERE origin ~* :p2 UNION SELECT id FROM items WHERE name ~* :p3 UNION SELECT id FROM coffees WHERE reference ~* :p4 UNION SELECT id FROM coffees WHERE region ~* :p5 UNION SELECT id FROM coffees WHERE producer ~* :p6 UNION SELECT id FROM coffees WHERE grade ~* :p7 UNION SELECT id FROM coffees WHERE milling ~* :p8 UNION SELECT id FROM coffees WHERE drying ~* :p9 UNION SELECT id FROM decaf_coffees WHERE decaf_method ~* :p10) OR description ~* :p11 UNION SELECT id FROM invoices WHERE invoice ~* :p12 UNION SELECT id FROM invoices WHERE vendor ~* :p13)";
+                }
+                query.prepare("SELECT id, time::date, vendor, invoice, (SELECT sum(cost) FROM invoice_items WHERE invoice_id = id)::numeric(12,2) AS cost FROM invoices WHERE time >= :sd AND time < :ed::date + interval '1 day'" + vendorclause + searchclause + " ORDER BY time DESC");
+                query.bind(":sd", startDate);
+                query.bind(":ed", endDate);
+                if(vendorclause.length > 0) {
+                    query.bind(":vendor", vendor.currentText);
+                }
+                if(searchclause.length > 0)
+                {
+                    var pattern = ".*" + search.text + ".*";
+                    query.bind(":p1", pattern);
+                    query.bind(":p2", pattern);
+                    query.bind(":p3", pattern);
+                    query.bind(":p4", pattern);
+                    query.bind(":p5", pattern);
+                    query.bind(":p6", pattern);
+                    query.bind(":p7", pattern);
+                    query.bind(":p8", pattern);
+                    query.bind(":p9", pattern);
+                    query.bind(":p10", pattern);
+                    query.bind(":p11", pattern);
+                    query.bind(":p12", pattern);
+                    query.bind(":p13", pattern);
+                }
+                query.exec();
+                var cost_sum = 0;
+                while(query.next()) {
+                    output.writeStartElement("tr");
+                    output.writeStartElement("td");
+                    output.writeStartElement("a");
+                    output.writeAttribute("href", "typica://script/" + query.value(0));
+                    output.writeCharacters(query.value(1));
+                    output.writeEndElement();
+                    output.writeEndElement();
+                    for(var i = 2; i <= 4; i++) {
+                        output.writeTextElement("td", query.value(i));
+                    }
+                    output.writeEndElement();
+                    cost_sum += Number(query.value(4));
+                }
+                query = query.invalidate();
+                output.writeEndElement();
+                output.writeStartElement("tfoot");
+                output.writeStartElement("tr");
+                output.writeEmptyElement("td");
+                output.writeEmptyElement("td");
+                output.writeTextElement("th", TTR("invoicereport", "Total:"));
+                output.writeTextElement("td", Number(cost_sum).toFixed(2));
+                output.writeEndElement();
+                output.writeEndElement();
+                output.writeEndElement();
+                output.writeEndElement();
+                output.writeEndElement();
+                output.writeEndDocument();
+                view.setContent(buffer);
+                buffer.close();
+            }
+            refresh();
+        ]]>
+    </program>

config/Reports/itemtransactions.xml

@@ -18,11 +18,11 @@
 	</menu>
 	<program>
 		<![CDATA[
-			this.windowTitle = "Typica - Item Transactions";
+			this.windowTitle = TTR("item_transactions", "Typica - Item Transactions");
 			var itemBox = findChildObject(this, 'item');
 			var unitBox = findChildObject(this, 'unit');
-			unitBox.addItem("Kg");
-			unitBox.addItem("Lb");
+			unitBox.addItem(TTR("item_transactions", "Kg"));
+			unitBox.addItem(TTR("item_transactions", "Lb"));
 			unitBox.currentIndex = QSettings.value("script/report_unit", 1);
 			unitBox['currentIndexChanged(int)'].connect(function() {
 				QSettings.setValue("script/report_unit", unitBox.currentIndex);
@@ -45,7 +45,7 @@
 				output.writeStartElement("html");
 				output.writeAttribute("xmlns", "http://www.w3.org/1999/xhtml");
 				output.writeStartElement("head");
-				output.writeTextElement("title", "Item Transactions");
+				output.writeTextElement("title", TTR("item_transactions", "Item Transactions"));
 				output.writeStartElement("script");
 				var scriptFile = new QFile(QSettings.value("config") + "/Scripts/d3.min.js");
 				scriptFile.open(1);
@@ -64,7 +64,7 @@
 				
 				output.writeEndElement();
 				output.writeStartElement("body");
-				output.writeTextElement("h1", "Item Transactions:");
+				output.writeTextElement("h1", TTR("item_transactions", "Item Transactions:"));
 				output.writeStartElement("table");
 				output.writeStartElement("tr");
 				output.writeStartElement("td");
@@ -77,11 +77,11 @@
 				query.exec();
 				if(query.next()) {
 					output.writeStartElement("td");
-					output.writeTextElement("strong", "Reference: ");
+					output.writeTextElement("strong", TTR("item_transactions", "Reference: "));
 					output.writeTextElement("span", query.value(0));
 					output.writeEndElement(); // td
 					output.writeStartElement("td");
-					output.writeTextElement("strong", "Category: ");
+					output.writeTextElement("strong", TTR("item_transactions", "Category: "));
 					output.writeTextElement("span", query.value(1));
 					output.writeEndElement(); //td
 					output.writeEndElement(); //tr
@@ -91,29 +91,29 @@
 					if(query.next()) {
 						output.writeStartElement("tr");
 						output.writeStartElement("td");
-						output.writeTextElement("strong", "Origin: ");
+						output.writeTextElement("strong", TTR("item_transactions", "Origin: "));
 						output.writeTextElement("span", query.value(0));
 						output.writeEndElement(); // td
 						output.writeStartElement("td");
-						output.writeTextElement("strong", "Region: ");
+						output.writeTextElement("strong", TTR("item_transactions", "Region: "));
 						output.writeTextElement("span", query.value(1));
 						output.writeEndElement(); // td
 						output.writeStartElement("td");
-						output.writeTextElement("strong", "Producer: ");
+						output.writeTextElement("strong", TTR("item_transactions", "Producer: "));
 						output.writeTextElement("span", query.value(2));
 						output.writeEndElement(); // td
 						output.writeEndElement(); // tr
 						output.writeStartElement("tr");
 						output.writeStartElement("td");
-						output.writeTextElement("strong", "Grade: ");
+						output.writeTextElement("strong", TTR("item_transactions", "Grade: "));
 						output.writeTextElement("span", query.value(3));
 						output.writeEndElement(); // td
 						output.writeStartElement("td");
-						output.writeTextElement("strong", "Milling: ");
+						output.writeTextElement("strong", TTR("item_transactions", "Milling: "));
 						output.writeTextElement("span", query.value(4));
 						output.writeEndElement(); // td
 						output.writeStartElement("td");
-						output.writeTextElement("strong", "Drying: ");
+						output.writeTextElement("strong", TTR("item_transactions", "Drying: "));
 						output.writeTextElement("span", query.value(5));
 						output.writeEndElement(); // td
 						output.writeEndElement(); // tr
@@ -124,7 +124,7 @@
 							output.writeStartElement("tr");
 							output.writeStartElement("td");
 							output.writeAttribute("colspan", "3");
-							output.writeTextElement("strong", "Decaffeination Method: ");
+							output.writeTextElement("strong", TTR("item_transactions", "Decaffeination Method: "));
 							output.writeTextElement("span", query.value(0));
 							output.writeEndElement(); // td
 							output.writeEndElement(); // tr
@@ -176,7 +176,7 @@
 					scriptFile.close();
 					output.writeEndElement();
 					
-					query.prepare("SELECT time::date, type, quantity / :c1, balance / :c2, (SELECT files FROM roasting_log WHERE roasting_log.time = item_history.time AND item = ANY(unroasted_id)), (SELECT invoice_id FROM invoice_items WHERE item = item_id AND item_history.type = 'PURCHASE'), (SELECT vendor || ' ' || invoice FROM invoices WHERE id = (SELECT invoice_id FROM invoice_items WHERE item = item_id AND item_history.type = 'PURCHASE')), (SELECT name FROM items WHERE id = (SELECT roasted_id FROM roasting_log WHERE roasting_log.time = item_history.time AND item = ANY(unroasted_id))) FROM item_history(:item)");
+					query.prepare("SELECT time::date, type, quantity / :c1, balance / :c2, (SELECT files FROM roasting_log WHERE roasting_log.time = item_history.time AND item = ANY(unroasted_id)), (SELECT invoice_id FROM invoice_items WHERE item = item_id AND item_history.type = 'PURCHASE'), (SELECT vendor || ' ' || invoice FROM invoices WHERE id = (SELECT invoice_id FROM invoice_items WHERE item = item_id AND item_history.type = 'PURCHASE')), (SELECT name FROM items WHERE id = (SELECT roasted_id FROM roasting_log WHERE roasting_log.time = item_history.time AND item = ANY(unroasted_id))), customer, reason FROM item_history(:item)");
 					switch(unitBox.currentIndex)
 					{
 						case 0:
@@ -192,39 +192,41 @@
 					query.exec();
 					output.writeStartElement("table");
 					output.writeStartElement("tr");
-					output.writeTextElement("th", "Date");
-					output.writeTextElement("th", "Type");
-					output.writeTextElement("th", "Quantity");
-					output.writeTextElement("th", "Balance");
-					output.writeTextElement("th", "Record");
+					output.writeTextElement("th", TTR("item_transactions", "Date"));
+					output.writeTextElement("th", TTR("item_transactions", "Type"));
+					output.writeTextElement("th", TTR("item_transactions", "Quantity"));
+					output.writeTextElement("th", TTR("item_transactions", "Balance"));
+					output.writeTextElement("th", TTR("item_transactions", "Record"));
 					output.writeEndElement(); // tr
 					var prev_balance = "0";
 					var prev_prec = 0;
 					var cur_prec = 0;
+                                        var max_prec = 3;
 					while(query.next()) {
 						output.writeStartElement("tr");
 						output.writeAttribute("class", query.value(1));
 						output.writeTextElement("td", query.value(0));
 						output.writeTextElement("td", query.value(1));
+                                                var split = prev_balance.split('.');
+                                                if(split.length > 1) {
+                                                    prev_prec = split[1].length;
+                                                } else {
+                                                    prev_prec = 0;
+                                                }
+                                                split = query.value(2).split('.');
+                                                if(split.length > 1) {
+                                                    cur_prec = split[1].length;
+                                                } else {
+                                                    cur_prec = 0;
+                                                }
+                                                var prec = prev_prec > cur_prec ? prev_prec : cur_prec;
+                                                var prec = (prec > max_prec ? max_prec : prec);
 						if(query.value(1) == "INVENTORY") {
-							var split = prev_balance.split('.');
-							if(split.length > 1) {
-								prev_prec = split[1].length;
-							} else {
-								prev_prec = 0;
-							}
-							split = query.value(2).split('.');
-							if(split.length > 1) {
-								cur_prec = split[1].length;
-							} else {
-								cur_prec = 0;
-							}
-							var prec = prev_prec > cur_prec ? prev_prec : cur_prec;
-							output.writeTextElement("td", (Number(query.value(2)) - Number(prev_balance)).toFixed(prec));
+                                                    output.writeTextElement("td", (Number(query.value(2)) - Number(prev_balance)).toFixed(prec));
 						} else {
-							output.writeTextElement("td", query.value(2));
+                                                    output.writeTextElement("td", (Number(query.value(2)).toFixed(prec)));
 						}
-						output.writeTextElement("td", query.value(3));
+						output.writeTextElement("td", (Number(query.value(3)).toFixed(prec)));
 						prev_balance = query.value(3);
 						if(query.value(1) == "PURCHASE") {
 							output.writeStartElement("td");
@@ -240,6 +242,10 @@
 							output.writeCDATA(query.value(7) + " " + query.value(4));
 							output.writeEndElement();
 							output.writeEndElement();
+                                                } else if(query.value(1) == "LOSS") {
+                                                    output.writeTextElement("td", query.value(9));
+                                                } else if(query.value(1) == "SALE") {
+                                                    output.writeTextElement("td", query.value(8));
 						} else {
 							output.writeTextElement("td", "");
 						}

config/Reports/monthcompare.xml

@@ -13,20 +13,20 @@
     </menu>
     <program>
         <![CDATA[
-            this.windowTitle = "Typica - Previous Year Production Comparison By Month";
+            this.windowTitle = TTR("pytdprodcomp", "Typica - Previous Year Production Comparison By Month");
             var view = findChildObject(this, 'report');
             var printMenu = findChildObject(this, 'print');
             printMenu.triggered.connect(function() {
                 view.print();
             });
-			var unitBox = findChildObject(this, 'unit');
-			unitBox.addItem("Kg");
-			unitBox.addItem("Lb");
-			unitBox.currentIndex = QSettings.value("script/report_unit", 1);
-			unitBox['currentIndexChanged(int)'].connect(function() {
-				QSettings.setValue("script/report_unit", unitBox.currentIndex);
-				refresh();
-			});
+            var unitBox = findChildObject(this, 'unit');
+            unitBox.addItem(TTR("pytdprodcomp", "Kg"));
+            unitBox.addItem(TTR("pytdprodcomp", "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 buffer = new QBuffer;
                 buffer.open(3);
@@ -36,120 +36,131 @@
                 output.writeStartElement("html");
                 output.writeAttribute("xmlns", "http://www.w3.org/1999/xhtml");
                 output.writeStartElement("head");
-                output.writeTextElement("title", "Previous Year Production Comparison By Month");
+                output.writeTextElement("title", TTR("pytdprodcomp", "Previous Year Production Comparison By Month"));
                 output.writeEndElement();
                 output.writeStartElement("body");
-                output.writeTextElement("h1", "Previous Year Production Comparison By Month");
-				switch(unitBox.currentIndex)
-				{
-					case 0:
-						output.writeTextElement("p", "This report compares total roasted coffee production in kilograms with the previous year on a monthly basis.");
-						break;
-					case 1:
-						output.writeTextElement("p", "This report compares total roasted coffee production in pounds with the previous year on a monthly basis.");
-						break;
-				}
+                output.writeTextElement("h1", TTR("pytdprodcomp", "Previous Year Production Comparison By Month"));
+                switch(unitBox.currentIndex)
+                {
+                    case 0:
+                        output.writeTextElement("p", TTR("pytdprodcomp", "This report compares total roasted coffee production in kilograms with the previous year on a monthly basis."));
+                        break;
+                    case 1:
+                        output.writeTextElement("p", TTR("pytdprodcomp", "This report compares total roasted coffee production in pounds with the previous year on a monthly basis."));
+                        break;
+                }
                 output.writeStartElement("table");
                 output.writeAttribute("style", "page-break-after:auto;");
                 output.writeAttribute("rules", "groups");
                 output.writeAttribute("cellpadding", "3px");
                 output.writeStartElement("thead");
                 output.writeStartElement("tr");
-                output.writeTextElement("th", "Month");
-				var query = new QSqlQuery();
-				query.exec("SELECT EXTRACT(YEAR FROM 'now'::date) AS current_year");
-				query.next();
-				var current_year = query.value(0);
+                output.writeTextElement("th", TTR("pytdprodcomp", "Month"));
+                var query = new QSqlQuery();
+                query.exec("SELECT EXTRACT(YEAR FROM 'now'::date) AS current_year");
+                query.next();
+                var current_year = query.value(0);
                 output.writeTextElement("th", current_year-1);
                 output.writeTextElement("th", current_year);
                 output.writeTextElement("th", "Change");
                 output.writeEndElement();
                 output.writeEndElement();
                 output.writeStartElement("tbody");
-				var month_names = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"];
-				var current_data = new Array();
-				var previous_data = new Array();
-				for(var i = 0; i < 12; i++) {
-					var q = "SELECT SUM(roasted_quantity) FROM roasting_log WHERE roasted_id IS NOT NULL AND time > '"
-					q += current_year;
-					q += "-";
-					q += 1+i;
-					q += "-01' AND time < '";
-					if(i == 11) {
-						q += 1+current_year;
-					} else {
-						q += current_year;
-					}
-					q += "-";
-					if(i == 11) {
-						q += "01"
-					} else {
-						q += 2+i;
-					}
-					q += "-01'";
-					query.exec(q);
-					query.next();
-					current_data.push(query.value(0));
-				}
-				for(var i = 0; i < 12; i++) {
-					var q = "SELECT SUM(roasted_quantity) FROM roasting_log WHERE roasted_id IS NOT NULL AND time > '"
-					q += current_year-1;
-					q += "-";
-					q += 1+i;
-					q += "-01' AND time < '";
-					if(i == 11) {
-						q += current_year;
-					} else {
-						q += current_year-1;
-					}
-					q += "-";
-					if(i == 11) {
-						q += "01"
-					} else {
-						q += 2+i;
-					}
-					q += "-01'";
-					query.exec(q);
-					query.next();
-					previous_data.push(query.value(0));
-				}
-				query = query.invalidate();
-				for(var i = 0; i < 12; i++) {
-					output.writeStartElement("tr");
-					output.writeTextElement("td", month_names[i]);
-					switch(unitBox.currentIndex)
-					{
-						case 0:
-							output.writeTextElement("td", Number(previous_data[i] / 2.2).toFixed(2));
-							output.writeTextElement("td", Number(current_data[i] / 2.2).toFixed(2));
-							output.writeTextElement("td", Number((current_data[i] - previous_data[i]) / 2.2).toFixed(2));
-							break;
-						case 1:
-							output.writeTextElement("td", Number(previous_data[i]).toFixed(2));
-							output.writeTextElement("td", Number(current_data[i]).toFixed(2));
-							output.writeTextElement("td", Number(current_data[i]-previous_data[i]).toFixed(2));
-							break;
-					}
-					output.writeEndElement();
-				}
+                var month_names = [TTR("pytdprodcomp", "January"),
+                    TTR("pytdprodcomp", "February"),
+                    TTR("pytdprodcomp", "March"),
+                    TTR("pytdprodcomp", "April"),
+                    TTR("pytdprodcomp", "May"),
+                    TTR("pytdprodcomp", "June"),
+                    TTR("pytdprodcomp", "July"),
+                    TTR("pytdprodcomp", "August"),
+                    TTR("pytdprodcomp", "September"),
+                    TTR("pytdprodcomp", "October"),
+                    TTR("pytdprodcomp", "November"),
+                    TTR("pytdprodcomp", "December")];
+                var current_data = new Array();
+                var previous_data = new Array();
+                for(var i = 0; i < 12; i++) {
+                    var q = "SELECT SUM(roasted_quantity) FROM roasting_log WHERE roasted_id IS NOT NULL AND time > '"
+                    q += current_year;
+                    q += "-";
+                    q += 1+i;
+                    q += "-01' AND time < '";
+                    if(i == 11) {
+                        q += 1+current_year;
+                    } else {
+                        q += current_year;
+                    }
+                    q += "-";
+                    if(i == 11) {
+                        q += "01"
+                    } else {
+                        q += 2+i;
+                    }
+                    q += "-01'";
+                    query.exec(q);
+                    query.next();
+                    current_data.push(query.value(0));
+                }
+                for(var i = 0; i < 12; i++) {
+                    var q = "SELECT SUM(roasted_quantity) FROM roasting_log WHERE roasted_id IS NOT NULL AND time > '"
+                    q += current_year-1;
+                    q += "-";
+                    q += 1+i;
+                    q += "-01' AND time < '";
+                    if(i == 11) {
+                        q += current_year;
+                    } else {
+                        q += current_year-1;
+                    }
+                    q += "-";
+                    if(i == 11) {
+                        q += "01"
+                    } else {
+                        q += 2+i;
+                    }
+                    q += "-01'";
+                    query.exec(q);
+                    query.next();
+                    previous_data.push(query.value(0));
+                }
+                query = query.invalidate();
+                for(var i = 0; i < 12; i++) {
+                    output.writeStartElement("tr");
+                    output.writeTextElement("td", month_names[i]);
+                    switch(unitBox.currentIndex)
+                    {
+                        case 0:
+                            output.writeTextElement("td", Number(previous_data[i] / 2.2).toFixed(2));
+                            output.writeTextElement("td", Number(current_data[i] / 2.2).toFixed(2));
+                            output.writeTextElement("td", Number((current_data[i] - previous_data[i]) / 2.2).toFixed(2));
+                            break;
+                        case 1:
+                            output.writeTextElement("td", Number(previous_data[i]).toFixed(2));
+                            output.writeTextElement("td", Number(current_data[i]).toFixed(2));
+                            output.writeTextElement("td", Number(current_data[i]-previous_data[i]).toFixed(2));
+                            break;
+                    }
+                    output.writeEndElement();
+                }
                 output.writeEndElement();
                 output.writeStartElement("tfoot");
-                output.writeTextElement("th", "Totals");
-				var current_total = current_data.reduce(function(a,b) {return Number(a) + Number(b);}, 0);
-				var previous_total = previous_data.reduce(function(a,b) {return Number(a) + Number(b);}, 0);
-				switch(unitBox.currentIndex)
-				{
-					case 0:
-						output.writeTextElement("td", (previous_total/2.2).toFixed(2));
+                output.writeTextElement("th", TTR("pytdprodcomp", "Totals"));
+                var current_total = current_data.reduce(function(a,b) {return Number(a) + Number(b);}, 0);
+                var previous_total = previous_data.reduce(function(a,b) {return Number(a) + Number(b);}, 0);
+                switch(unitBox.currentIndex)
+                {
+                    case 0:
+                        output.writeTextElement("td", (previous_total/2.2).toFixed(2));
 						output.writeTextElement("td", (current_total/2.2).toFixed(2));
-						output.writeTextElement("td", ((current_total-previous_total)/2.2).toFixed(2));
-						break;
-					case 1:
-						output.writeTextElement("td", previous_total.toFixed(2));
-						output.writeTextElement("td", current_total.toFixed(2));
-						output.writeTextElement("td", (current_total-previous_total).toFixed(2));
-						break;
-				}
+                        output.writeTextElement("td", ((current_total-previous_total)/2.2).toFixed(2));
+                        break;
+                    case 1:
+                        output.writeTextElement("td", previous_total.toFixed(2));
+                        output.writeTextElement("td", current_total.toFixed(2));
+                        output.writeTextElement("td", (current_total-previous_total).toFixed(2));
+                        break;
+                }
                 output.writeEndElement();
                 output.writeEndElement();
                 output.writeEndElement();

config/Reports/productionsummary.xml

@@ -0,0 +1,186 @@
+<window id="dailyproduction">
+    <reporttitle>Production:->Production Summary</reporttitle>
+    <layout type="vertical">
+        <layout type="horizontal">
+            <label>Batch Type: </label>
+            <sqldrop id="batchtype" />
+            <label>Approval: </label>
+            <sqldrop id="approval" />
+            <daterange id="dates" initial="9" /><!-- Current Month to Date-->
+            <label>Weight Unit:</label>
+            <sqldrop id="unit" />
+            <stretch />
+        </layout>
+        <webview id="report" />
+    </layout>
+    <menu name="File">
+        <item id="print" shortcut="Ctrl+P">Print</item>
+    </menu>
+    <program>
+        <![CDATA[
+            this.windowTitle = TTR("dailyproduction", "Typica - Production Summary");
+            var dateSelect = findChildObject(this, 'dates');
+            var dateQuery = new QSqlQuery();
+            dateQuery.exec("SELECT time::date FROM roasting_log WHERE time = (SELECT min(time) FROM roasting_log) OR time = (SELECT max(time) FROM roasting_log) ORDER BY time ASC");
+            dateQuery.next();
+            var lifetimeStartDate = dateQuery.value(0);
+            var lifetimeEndDate;
+            if(dateQuery.next()) {
+                lifetimeEndDate = dateQuery.value(0);
+            } else {
+                lifetimeEndDate = lifetimeStartDate;
+            }
+            dateSelect.setLifetimeRange(lifetimeStartDate, lifetimeEndDate);
+            dateQuery = dateQuery.invalidate();
+            var unitBox = findChildObject(this, 'unit');
+            unitBox.addItem(TTR("dailyproduction", "Kg"));
+            unitBox.addItem(TTR("dailyproduction", "Lb"));
+            unitBox.currentIndex = QSettings.value("script/report_unit", 1);
+            unitBox['currentIndexChanged(int)'].connect(function() {
+                QSettings.setValue("script/report_unit", unitBox.currentIndex);
+                refresh();
+            });
+            var batchType = findChildObject(this, 'batchtype');
+            batchType.addItem(TTR("dailyproduction", "Any"));
+            batchType.addItem(TTR("dailyproduction", "Production Roasts"));
+            batchType.addItem(TTR("dailyproduction", "Sample Roasts"));
+            batchType.currentIndex = QSettings.value("script/batchtypefilter", 1);
+            batchType['currentIndexChanged(int)'].connect(function() {
+                QSettings.setValue("script/batchtypefilter", batchType.currentIndex);
+                refresh();
+            });
+            var approval = findChildObject(this, 'approval');
+            approval.addItem(TTR("dailyproduction", "Any"));
+            approval.addItem(TTR("dailyproduction", "Approved"));
+            approval.addItem(TTR("dailyproduction", "Not Approved"));
+            approval.currentIndex = QSettings.value("script/approvalfilter", 1);
+            approval['currentIndexChanged(int)'].connect(function() {
+                QSettings.setValue("script/approvalfilter", approval.currentIndex);
+                refresh();
+            });
+            var view = findChildObject(this, 'report');
+            var printMenu = findChildObject(this, 'print');
+            printMenu.triggered.connect(function() {
+                view.print();
+            });
+            function refresh() {
+                var buffer = new QBuffer;
+                buffer.open(3);
+                var output = new XmlWriter(buffer);
+                output.writeStartDocument("1.0");
+                output.writeDTD('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg.dtd">');
+                output.writeStartElement("html");
+                output.writeAttribute("xmlns", "http://www.w3.org/1999/xhtml");
+                output.writeStartElement("head");
+                output.writeTextElement("title", TTR("dailyproduction", "Production Summary"));
+                output.writeEndElement();
+                output.writeStartElement("body");
+                var dateRange = dateSelect.currentRange();
+                var startDate = dateRange[0];
+                var endDate = dateRange[dateRange.length - 1];
+                output.writeTextElement("h1", TTR("dailyproduction", "Production Summary: ") + startDate + " - " + endDate);
+                var conversion = 1;
+                var unitText = TTR("dailyproduction", "Lb");
+                if(unitBox.currentIndex == 0) {
+                    conversion = 2.2;
+                    unitText = TTR("dailyproduction", "Kg");
+                }
+                var transaction_filter;
+                var approval_filter;
+                switch(batchType.currentIndex) {
+                    case 0:
+                        transaction_filter = "";
+                        break;
+                    case 1:
+                        transaction_filter = " AND transaction_type = 'ROAST'";
+                        break;
+                    case 2:
+                        transaction_filter = " AND transaction_type = 'SAMPLEROAST'";
+                        break;
+                }
+                switch(approval.currentIndex) {
+                    case 0:
+                        approval_filter = "";
+                        break;
+                    case 1:
+                        approval_filter = " AND approval = true";
+                        break;
+                    case 2:
+                        approval_filter = " AND approval = false";
+                        break;
+                }
+                var query = new QSqlQuery();
+                query.prepare("SELECT count(1), sum(unroasted_total_quantity) / :c1, sum(roasted_quantity) / :c2 FROM roasting_log WHERE time >= :sd AND time < :ed ::date + interval '1 day'" + transaction_filter + approval_filter);
+                query.bind(":c1", conversion);
+                query.bind(":c2", conversion);
+                query.bind(":sd", startDate);
+                query.bind(":ed", endDate);
+                query.exec();
+                query.next();
+                var batchesRoasted = query.value(0);
+                var unroastedSum = query.value(1);
+                var roastedSum = query.value(2);
+                output.writeTextElement("p", "" + roastedSum + " " + unitText + TTR("dailyproduction", " roasted from ") +
+                unroastedSum + " " + unitText + TTR("dailyproduction", " green in ") +
+                batchesRoasted + TTR("dailyproduction", " batches."));
+                query.prepare("SELECT time::date AS date, count(1), sum(unroasted_total_quantity) / :c1, sum(roasted_quantity) / :c2 FROM roasting_log WHERE time >= :sd AND time < :ed ::date + interval '1 day'" + transaction_filter + approval_filter + " GROUP BY date ORDER BY date ASC");
+                query.bind(":c1", conversion);
+                query.bind(":c2", conversion);
+                query.bind(":sd", startDate);
+                query.bind(":ed", endDate);
+                query.exec();
+                output.writeStartElement("table");
+                output.writeAttribute("rules", "groups");
+                output.writeAttribute("cellpadding", "3px");
+                output.writeStartElement("thead");
+                output.writeStartElement("tr");
+                output.writeTextElement("th", TTR("dailyproduction", "Date"));
+                output.writeTextElement("th", TTR("dailyproduction", "Batches"));
+                output.writeTextElement("th", TTR("dailyproduction", "Unroasted (") + unitText + ")");
+                output.writeTextElement("th", TTR("dailyproduction", "Roasted (") + unitText + ")");
+                output.writeEndElement();
+                output.writeEndElement();
+                output.writeStartElement("tbody");
+                while(query.next()) {
+                    output.writeStartElement("tr");
+                    output.writeStartElement("td");
+                    output.writeStartElement("a");
+                    output.writeAttribute("href", "typica://script/d" + query.value(0));
+                    output.writeCDATA(query.value(0));
+                    output.writeEndElement();
+                    output.writeEndElement();
+                    output.writeTextElement("td", query.value(1));
+                    output.writeTextElement("td", query.value(2));
+                    output.writeTextElement("td", query.value(3));
+                    output.writeEndElement();
+                }
+                output.writeEndElement();
+                output.writeStartElement("tfoot");
+                output.writeStartElement("tr");
+                output.writeStartElement("td");
+                output.writeTextElement("strong", TTR("dailyproduction", "Totals:"));
+                output.writeEndElement();
+                output.writeTextElement("td", batchesRoasted);
+                output.writeTextElement("td", unroastedSum);
+                output.writeTextElement("td", roastedSum);
+                output.writeEndElement();
+                output.writeEndElement();
+                output.writeEndElement();
+                output.writeEndElement();
+                output.writeEndElement();
+                output.writeEndDocument();
+                view.setContent(buffer);
+                buffer.close();
+                query = query.invalidate();
+            }
+            refresh();
+            dateSelect.rangeUpdated.connect(refresh);
+            view.scriptLinkClicked.connect(function(url) {
+                var arg = url.slice(1, url.length).split("-");
+                var details = createReport("dailyproductiondetail.xml");
+                var selector = findChildObject(details, "reportdate");
+                selector.setDate(arg[0], arg[1], arg[2]);
+            });
+        ]]>
+    </program>
+</window>

config/Reports/reminders.xml

@@ -0,0 +1,186 @@
+<window id="remindersreport">
+	<reporttitle>Production:->Reminders</reporttitle>
+    <layout type="vertical">
+        <webview id="report" />
+    </layout>
+    <menu name="File">
+        <item id="print" shortcut="Ctrl+P">Print</item>
+    </menu>
+    <program>
+        <![CDATA[
+            var window = this;
+            this.windowTitle = TTR("remindersreport", "Typica - Reminders");
+            var report = findChildObject(this, 'report');
+            var printMenu = findChildObject(this, 'print');
+            printMenu.triggered.connect(function() {
+                report.print();
+            });
+            var e = new Array();
+            function populateReminderData() {
+                e = new Array();
+                var query = new QSqlQuery;
+                query.exec("SELECT id, reminder FROM reminders");
+                while(query.next())
+                {
+                    var reminder = JSON.parse(query.value(1));
+                    reminder.dbid = query.value(0);
+                    var start_time = "" + reminder.start_year + "-" + reminder.start_month + "-" + reminder.start_day + " " + reminder.start_time;
+                    if(reminder.condition == "PRODUCTIONWEIGHT")
+                    {
+                        var convert = 1;
+                        var unittext = TTR("remindersreport", " Lb");
+                        if(reminder.unit == "KG")
+                        {
+                            convert = 2.2;
+                            unittext = TTR("remindersreport", " Kg");
+                        }
+                        var dq = new QSqlQuery;
+                        dq.prepare("SELECT sum(roasted_quantity)/:conversion FROM roasting_log WHERE time > :since");
+                        dq.bind(":conversion", convert);
+                        dq.bind(":since", start_time);
+                        dq.exec();
+                        dq.next();
+                        var proportion;
+                        var remain;
+                        if(reminder.value == 0 || (reminder.value < Number(dq.value(0))))
+                        {
+                            proportion = 1;
+                        }
+                        else
+                        {
+                            proportion = Number(dq.value(0)) / reminder.value;
+                        }
+                        remain = (reminder.value - Number(dq.value(0))).toFixed(0);
+                        reminder.completion = proportion;
+                        reminder.detail = remain + unittext;
+                        dq = dq.invalidate();
+                    }
+                    else if(reminder.condition == "DAYS")
+                    {
+                        var dq = new QSqlQuery;
+                        dq.prepare("SELECT 'now'::date - :since::date");
+                        dq.bind(":since", start_time);
+                        dq.exec();
+                        dq.next();
+                        var proportion;
+                        var remain;
+                        if(reminder.value == 0 || (reminder.value < Number(dq.value(0))))
+                        {
+                            proportion = 1;
+                        }
+                        else
+                        {
+                            proportion = Number(dq.value(0)) / reminder.value;
+                        }
+                        remain = reminder.value - Number(dq.value(0));
+                        reminder.completion = proportion;
+                        reminder.detail = remain + TTR("remindersreport", " Days");
+                        dq = dq.invalidate();
+                    }
+                    else if(reminder.condition == "PRODUCTIONBATCHES")
+                    {
+                        var dq = new QSqlQuery;
+                        dq.prepare("SELECT count(1) FROM roasting_log WHERE time > :since");
+                        dq.bind(":since", start_time);
+                        dq.exec();
+                        dq.next();
+                        var proportion;
+                        var remain;
+                        if(reminder.value == 0 || (reminder.value < Number(dq.value(0))))
+                        {
+                            proportion = 1;
+                        }
+                        else
+                        {
+                            proportion = Number(dq.value(0)) / reminder.value;
+                        }
+                        remain = reminder.value - Number(dq.value(0));
+                        reminder.completion = proportion;
+                        reminder.detail = remain + TTR("remindersreport", " Batches");
+                        dq = dq.invalidate();
+                    }
+                    else if(reminder.condition == "PRODUCTIONHOURS")
+                    {
+                        var dq = new QSqlQuery;
+                        dq.prepare("SELECT extract(epoch FROM (SELECT sum(duration) FROM roasting_log WHERE time > :since) / 3600)");
+                        dq.bind(":since", start_time);
+                        dq.exec();
+                        dq.next();
+                        var proportion;
+                        var remain;
+                        if(reminder.value == 0 || (reminder.value < Number(dq.value(0))))
+                        {
+                            proportion = 1;
+                        }
+                        else
+                        {
+                            proportion = Number(dq.value(0)) / reminder.value;
+                        }
+                        remain = reminder.value - Number(dq.value(0));
+                        reminder.completion = proportion;
+                        reminder.detail = remain.toFixed(1) + TTR("remindersreport", " Hours");
+                        dq = dq.invalidate();
+                    }
+                    e[reminder.dbid] = reminder;
+                }
+                query = query.invalidate();
+            }
+            function refresh() {
+                populateReminderData();
+                var passedData = e.filter(function(n){return n.hasOwnProperty("completion")}).sort(function(a,b){return b.completion-a.completion});
+                var buffer = new QBuffer;
+                buffer.open(3);
+                var output = new XmlWriter(buffer);
+                output.writeStartDocument("1.0");
+                output.writeDTD('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg.dtd">');
+                output.writeStartElement("html");
+                output.writeAttribute("xmlns", "http://www.w3.org/1999/xhtml");
+                output.writeStartElement("head");
+                output.writeTextElement("title", TTR("remindersreport", "Reminders"));
+                output.writeEndElement();
+                output.writeStartElement("body");
+                output.writeTextElement("h1", TTR("remindersreport", "Reminders"));
+                output.writeStartElement("a");
+                output.writeAttribute("href", "typica://script/0");
+                output.writeStartElement("div");
+                output.writeAttribute("class", "reminder");
+                output.writeStartElement("div");
+                output.writeAttribute("class", "nocolor");
+                output.writeEndElement();
+                output.writeStartElement("span");
+                output.writeAttribute("class", "title");
+                output.writeCDATA(TTR("remindersreport", "New Reminder"));
+                output.writeEndElement();
+                output.writeEndElement();
+                output.writeEndElement();
+                output.writeTextElement("script", "e = " + JSON.stringify(passedData));
+                var styleFile = new QFile(QSettings.value("config") + "/Scripts/reminders.css");
+                styleFile.open(1);
+                output.writeTextElement("style", styleFile.readToString());
+                styleFile.close();
+                output.writeStartElement("script");
+                scriptFile = new QFile(QSettings.value("config") + "/Scripts/reminders.js");
+                scriptFile.open(1);
+                output.writeCDATA(scriptFile.readToString());
+                scriptFile.close();
+                output.writeEndElement();
+                output.writeEndElement();
+                output.writeEndDocument();
+                report.setContent(buffer);
+                buffer.close();
+            }
+            refresh();
+            var doRefresh = function() {
+                refresh();
+            }
+            report.scriptLinkClicked.connect(function(url) {
+                var reminder = createWindow("editreminder");
+                if(url != "0")
+                {
+                    reminder.loadData(e[url]);
+                }
+                reminder.setRefreshFunction(doRefresh);
+            });
+        ]]>
+    </program>
+</window>

config/Reports/rwacp.xml

@@ -1,11 +1,17 @@
 <window id="productionreport">
-	<reporttitle>Production:->Recent Average Weekly Coffee Production</reporttitle>
+	<reporttitle>Production:->Recent Average Coffee Production</reporttitle>
     <layout type="vertical">
         <layout type="horizontal">
             <label>Sort Order:</label>
             <sqldrop id="sort" />
-			<label>Weight Unit:</label>
-			<sqldrop id="unit" />
+            <label>Weight Unit:</label>
+            <sqldrop id="unit" />
+            <label>Batch Type: </label>
+            <sqldrop id="batchtype" />
+            <label>Days to Average: </label>
+            <line id="days" />
+            <label>Days to Scale: </label>
+            <line id="scale" />
             <stretch />
         </layout>
         <webview id="report" />
@@ -15,22 +21,50 @@
     </menu>
     <program>
         <![CDATA[
-            this.windowTitle = "Typica - Recent Average Weekly Coffee Production";
+            this.windowTitle = TTR("productionreport", "Typica - Recent Average Coffee Production");
             var report = findChildObject(this, 'report');
             var printMenu = findChildObject(this, 'print');
             printMenu.triggered.connect(function() {
                 report.print();
             });
             var sortBox = findChildObject(this, 'sort');
-            sortBox.addItem("Roasted Coffee A-Z");
-            sortBox.addItem("Roasted Coffee Z-A");
-            sortBox.addItem("Weekly Use Ascending");
-            sortBox.addItem("Weekly Use Descending");
+            sortBox.addItem(TTR("productionreport", "Roasted Coffee A-Z"));
+            sortBox.addItem(TTR("productionreport", "Roasted Coffee Z-A"));
+            sortBox.addItem(TTR("productionreport", "Weekly Use Ascending"));
+            sortBox.addItem(TTR("productionreport", "Weekly Use Descending"));
             sortBox.currentIndex = QSettings.value("rwacp_sort", 3);
-			var unitBox = findChildObject(this, 'unit');
-			unitBox.addItem("Kg");
-			unitBox.addItem("Lb");
-			unitBox.currentIndex = QSettings.value("script/report_unit", 1);
+            var unitBox = findChildObject(this, 'unit');
+            unitBox.addItem(TTR("productionreport", "Kg"));
+            unitBox.addItem(TTR("productionreport", "Lb"));
+            unitBox.currentIndex = QSettings.value("script/report_unit", 1);
+            var batchType = findChildObject(this, 'batchtype');
+            batchType.addItem(TTR("productionreport", "Any"));
+            batchType.addItem(TTR("productionreport", "Production Roasts"));
+            batchType.addItem(TTR("productionreport", "Sample Roasts"));
+            batchType.currentIndex = QSettings.value("script/racpreport/batchtypefilter", 1);
+            batchType['currentIndexChanged(int)'].connect(function() {
+                QSettings.setValue("script/racpreport/batchtypefilter",
+                                   batchType.currentIndex);
+                refresh();
+            });
+            var daysBox = findChildObject(this, 'days');
+            daysBox.text = QSettings.value("script/racpreport/days", "28");
+            daysBox.editingFinished.connect(function() {
+                if(Number(daysBox.text) < 1) {
+                    daysBox.text = QSettings.value("script/racpreport/days");
+                }
+                QSettings.setValue("script/racpreport/days", daysBox.text);
+                refresh();
+            });
+            var scaleBox = findChildObject(this, 'scale');
+            scaleBox.text = QSettings.value("script/racpreport/scale", "7");
+            scaleBox.editingFinished.connect(function() {
+                if(Number(scaleBox.text) < 1) {
+                    scaleBox.text = QSettings.value("script/racpreport/scale");
+                }
+                QSettings.setValue("script/racpreport/scale", scaleBox.text);
+                refresh();
+            });
             function refresh() {
                 var buffer = new QBuffer;
                 buffer.open(3);
@@ -40,56 +74,70 @@
                 output.writeStartElement("html");
                 output.writeAttribute("xmlns", "http://www.w3.org/1999/xhtml");
                 output.writeStartElement("head");
-                output.writeTextElement("title", "Recent Average Weekly Coffee Production");
+                output.writeTextElement("title", TTR("productionreport", "Recent Average Coffee Production"));
                 output.writeEndElement();
                 output.writeStartElement("body");
-                output.writeTextElement("h1", "Recent Average Weekly Coffee Production");
-				switch(unitBox.currentIndex)
-				{
-					case 0:
-						output.writeTextElement("p", "This is a report of average weekly coffee production in kilograms over the past 28 days.");
-						break;
-					case 1:
-						output.writeTextElement("p", "This is a report of average weekly coffee production in pounds over the past 28 days.");
-						break;
-				}
+                output.writeTextElement("h1", TTR("productionreport", "Recent Average Coffee Production"));
+                switch(unitBox.currentIndex)
+                {
+                    case 0:
+                        output.writeTextElement("p", TTR("productionreport", "This is a report of average coffee production per ") + scaleBox.text + 
+                        TTR("productionreport", " days in kilograms over the past ") + daysBox.text +
+                        TTR("productionreport", " days."));
+                        break;
+                    case 1:
+                        output.writeTextElement("p", TTR("productionreport", "This is a report of average coffee production per ") + scaleBox.text +
+                        TTR("productionreport", " days in pounds over the past ") + daysBox.text +
+                        TTR("productionreport", " days."));
+                        break;
+                }
                 output.writeStartElement("table");
                 output.writeAttribute("rules", "groups");
                 output.writeAttribute("cellpadding", "3px");
                 output.writeStartElement("thead");
                 output.writeStartElement("tr");
-                output.writeTextElement("th", "Roasted Coffee");
-                output.writeTextElement("th", "Weekly Use");
+                output.writeTextElement("th", TTR("productionreport", "Roasted Coffee"));
+                output.writeTextElement("th", TTR("productionreport", "Weekly Use"));
                 output.writeEndElement();
                 output.writeEndElement();
                 output.writeStartElement("tbody");
-				var q = "SELECT (SELECT name FROM items WHERE id = roasted_id) AS name, ((sum(roasted_quantity) / 4) / :conversion)::numeric(18,2) AS weekly FROM roasting_log WHERE time > current_date - integer '28' AND roasted_quantity > 0 GROUP BY roasted_id ORDER BY "
+                var batchClause = "";
+                switch(batchType.currentIndex) {
+                    case 1:
+                        batchClause = " AND transaction_type = 'ROAST'";
+                        break;
+                    case 2:
+                        batchClause = " AND transaction_type = 'SAMPLEROAST'";
+                        break;
+                }
+                var q = "SELECT (SELECT name FROM items WHERE id = roasted_id) AS name, ((sum(roasted_quantity) / :scale) / :conversion)::numeric(18,2) AS weekly FROM roasting_log WHERE time > current_date - integer '" + daysBox.text + "' AND roasted_quantity > 0 " + batchClause + " GROUP BY roasted_id ORDER BY "
                 switch(sortBox.currentIndex)
                 {
                     case 0:
-						q += "name ASC";
+                        q += "name ASC";
                         break;
                     case 1:
-						q += "name DESC";
-						break;
+                        q += "name DESC";
+                        break;
                     case 2:
-						q += "weekly ASC";
-						break;
+                        q += "weekly ASC";
+                        break;
                     case 3:
-						q += "weekly DESC";
-						break;
+                        q += "weekly DESC";
+                        break;
+                }
+                var query = new QSqlQuery();
+                query.prepare(q);
+                switch(unitBox.currentIndex)
+                {
+                    case 0:
+                        query.bind(":conversion", 2.2);
+                        break;
+                    case 1:
+                        query.bind(":conversion", 1);
+                        break;
                 }
-				var query = new QSqlQuery();
-				query.prepare(q);
-				switch(unitBox.currentIndex)
-				{
-					case 0:
-						query.bind(":conversion", 2.2);
-						break;
-					case 1:
-						query.bind(":conversion", 1);
-						break;
-				}
+                query.bind(":scale", Number(daysBox.text)/Number(scaleBox.text));
                 query.exec();
                 while(query.next())
                 {
@@ -100,22 +148,23 @@
                 }
                 output.writeEndElement();
                 output.writeStartElement("tfoot")
-                output.writeTextElement("th", "Total");
-                query.prepare("SELECT (sum(roasted_quantity) / 4 / :conversion)::numeric(18,2) FROM roasting_log WHERE time > current_date - integer '28' AND roasted_quantity > 0");
+                output.writeTextElement("th", TTR("productionreport", "Total:"));
+                query.prepare("SELECT ((sum(roasted_quantity) / :scale) / :conversion)::numeric(18,2) FROM roasting_log WHERE time > current_date - integer '" + daysBox.text + "' AND roasted_quantity > 0 " + batchClause);
                 switch(unitBox.currentIndex)
-				{
-					case 0:
-						query.bind(":conversion", 2.2);
-						break;
-					case 1:
-						query.bind(":conversion", 1);
-						break;
-				}
-				query.exec();
-				query.next();
+                {
+                    case 0:
+                        query.bind(":conversion", 2.2);
+                        break;
+                    case 1:
+                        query.bind(":conversion", 1);
+                        break;
+                }
+                query.bind(":scale", Number(daysBox.text)/Number(scaleBox.text));
+                query.exec();
+                query.next();
                 output.writeTextElement("td", query.value(0));
                 query = query.invalidate();
-				output.writeEndElement();
+                output.writeEndElement();
                 output.writeEndElement();
                 output.writeEndElement();
                 output.writeEndElement();
@@ -128,10 +177,10 @@
                 QSettings.setValue("rwacp_sort", sortBox.currentIndex);
                 refresh();
             });
-			unitBox['currentIndexChanged(int)'].connect(function() {
-				QSettings.setValue("script/report_unit", unitBox.currentIndex);
-				refresh();
-			});
+            unitBox['currentIndexChanged(int)'].connect(function() {
+                QSettings.setValue("script/report_unit", unitBox.currentIndex);
+                refresh();
+            });
         ]]>
     </program>
 </window>

config/Scripts/reminders.css

@@ -0,0 +1,68 @@
+body{
+    background-color: #EDE3C0;
+}
+.reminder{
+    background-color: #EEEEEE;
+    display: block;
+    margin-left: 10px;
+    margin-right: 10px;
+    margin-top: 10px;
+    max-width: 300px;
+    padding-right: 5px;
+    padding-bottom: 5px;
+}
+.green{
+    width: 150px;
+    background-color: #00FF00;
+    height: 10px;
+    display: block;
+}
+.yellow{
+    width: 150px;
+    background-color: #FFFF00;
+    height: 10px;
+    display: block;
+}
+.orange{
+    width: 150px;
+    background-color: #FFA500;
+    height: 10px;
+    display: block;
+}
+.red{
+    width: 150px;
+    background-color: #FF0000;
+    height: 10px;
+    display: block;
+}
+.nocolor{
+    height: 10px;
+    display: block;
+}
+a{
+    text-decoration: none;
+    color: #000000;
+    display: block;
+    max-width: 300px;
+}
+.reminder span{
+    margin-left: 5px;
+    display: block;
+}
+.progress{
+    float: left;
+    color: #708090;
+    font-size: 80%
+}
+.detail{
+    float: right;
+    color: #708090;
+    font-size: 80%
+}
+.clearfix{
+    clear: both;
+}
+.title{
+    margin-bottom: 5px;
+    margin-top: 3px;
+}

config/Scripts/reminders.js

@@ -0,0 +1,23 @@
+e.forEach(function(item) {
+    var element = document.createElement("a");
+    element.href="typica://script/" + item.dbid
+    var colordiv;
+    if(item.completion >= 1)
+    {
+        colordiv = '<div class="red"></div>';
+    }
+    else
+    {
+        colordiv = '<div class="orange"></div>';
+    }
+    if(item.completion < 0.6)
+    {
+        colordiv = '<div class="yellow"></div>';
+    }
+    if(item.completion < 0.3)
+    {
+        colordiv = '<div class="green"></div>';
+    }
+    element.innerHTML = '<div class="reminder">' + colordiv + '<span class="title">' + item.title + '</span><span class="progress">' + Math.floor(item.completion * 100) + '%</span><span class="detail">' + item.detail + '</span><div class="clearfix"></div></div>';
+    document.body.appendChild(element);
+})

config/Windows/batchdetails.xml

@@ -1,178 +0,0 @@
-<window id="batchDetails">
-    <layout type="vertical">
-        <layout type="horizontal">
-            <label>Time:</label>
-            <line editable="false" id="time" />
-        </layout>
-        <layout type="horizontal">
-            <label>Name:</label>
-            <line editable="false" id="name" />
-        </layout>
-        <layout type="horizontal">
-            <label>Green:</label>
-            <line editable="false" id="green" />
-        </layout>
-        <layout type="horizontal">
-            <label>Roasted:</label>
-            <line editable="false" id="roasted" />
-        </layout>
-        <layout type="horizontal">
-            <label>Duration:</label>
-            <line editable="false" id="duration" />
-        </layout>
-        <layout type="horizontal">
-            <label>Approval:</label>
-            <line editable="false" id="approval" />
-        </layout>
-        <layout type="horizontal">
-            <label>Files:</label>
-			<line id="files" />
-		</layout>
-        <layout type="vertical">
-            <button type="push" id="target" name="Load profile as target" />
-            <button type="push" id="view" name="View profile" />
-            <button type="push" id="compare" name="Compare profile" />
-        </layout>
-    </layout>
-    <program>
-        <![CDATA[
-			var widget = this;
-			var target = findChildObject(this, 'target');
-			var batchTime = findChildObject(this, 'time');
-			var filesfield = findChildObject(this, 'files');
-            var compare = findChildObject(this, 'compare');
-			if(typeof(navigationwindow.loggingWindow) == "undefined")
-			{
-				compare.enabled = false;
-				target.enabled = false;
-			}
-            compare.clicked.connect(function() {
-                files = filesfield.text;
-                files = files.replace("{", "(");
-                files = files.replace("}", ")");
-                var q = "SELECT file, name FROM files WHERE id IN ";
-                q = q + files;
-                q = q + " AND type = 'profile'";
-                query = new QSqlQuery();
-                query.exec(q);
-                query.next();
-                var buffer = new QBuffer(query.value(0));
-                var pname = query.value(1);
-                query = query.invalidate();
-                var startSeries = Number(QSettings.value('cseries', 3));
-                var nextSeries = startSeries + 2;
-                QSettings.setValue('cseries', nextSeries);
-                var input = new XMLInput(buffer, startSeries);
-                var graph = findChildObject(navigationwindow.loggingWindow, 'graph');
-                input.measure.connect(graph.newMeasurement);
-                input.input();
-            });
-			target.clicked.connect(function() {
-				files = filesfield.text;
-				files = files.replace("{", "(");
-				files = files.replace("}", ")");
-				var q = "SELECT file, name FROM files WHERE id IN ";
-				q = q + files;
-				q = q + " AND type = 'profile'";
-				query = new QSqlQuery();
-				query.exec(q);
-				query.next();
-				var targetseries = -1;
-				var buffer = new QBuffer(query.value(0));
-				var pname = query.value(1);
-                query = query.invalidate();
-				var input = new XMLInput(buffer, 1);
-				var graph = findChildObject(navigationwindow.loggingWindow, 'graph');
-				var log = findChildObject(navigationwindow.loggingWindow, 'log');
-				log.clear();
-				graph.clear();
-				input.newTemperatureColumn.connect(log.setHeaderData);
-				input.newTemperatureColumn.connect(function(col, text) {
-					if(text == navigationwindow.loggingWindow.targetcolumnname)
-					{
-						targetseries = col;
-					}
-				});
-				input.newAnnotationColumn.connect(log.setHeaderData);
-				input.measure.connect(graph.newMeasurement);
-				input.measure.connect(log.newMeasurement);
-				input.measure.connect(function(data, series) {
-					if(series == targetseries)
-					{
-						targetDetector.newMeasurement(data);
-					}
-				});
-				var lc;
-				input.lastColumn.connect(function(c) {
-					lc = c;
-					QSettings.setValue("liveColumn", c + 1);
-					navigationwindow.loggingWindow.postLoadColumnSetup(c);
-				});
-				input.annotation.connect(log.newAnnotation);
-				input.annotation.connect(function(note, tcol, ncol) {
-					for(var i = tcol; i < ncol; i++) {
-						log.newAnnotation(note, i, ncol);
-					}
-				});
-				navigationwindow.loggingWindow.windowTitle = "Typica - " + pname;
-				navigationwindow.loggingWindow.raise();
-				navigationwindow.loggingWindow.activateWindow();
-				input.input();
-				log.newAnnotation("End", 1, lc);
-			});
-			var viewbutton = findChildObject(this, 'view');
-			viewbutton.clicked.connect(function() {
-				files = filesfield.text;
-				files = files.replace("{", "(");
-				files = files.replace("}", ")");
-				var q = "SELECT file, name FROM files WHERE id IN ";
-				q = q + files;
-				q = q + " AND type = 'profile'";
-				query = new QSqlQuery();
-				query.exec(q);
-				if(query.next()) {
-					var viewer = createWindow('offline');
-					var buffer = new QBuffer(query.value(0));
-					var pname = query.value(1);
-					query = query.invalidate();
-					var input = new XMLInput(buffer, 1);
-					var graph = findChildObject(viewer, 'graph');
-					var log = findChildObject(viewer, 'log');
-					input.newTemperatureColumn.connect(log.setHeaderData);
-					input.newTemperatureColumn.connect(function(column) {
-						viewer.saveTemperatureColumns.push(column);
-					});
-					input.newAnnotationColumn.connect(log.setHeaderData);
-					input.newAnnotationColumn.connect(function(column) {
-						viewer.saveAnnotationColumns.push(column);
-					});
-					input.measure.connect(graph.newMeasurement);
-					input.measure.connect(log.newMeasurement);
-					input.annotation.connect(log.newAnnotation);
-					var lc;
-					input.lastColumn.connect(function(c) {
-						lc = c;
-						if(c < 3)
-						{
-							log.setHeaderData(3, "");
-						}
-					});
-					input.annotation.connect(function(note, tcol, ncol) {
-						for(var i = tcol; i < ncol; i++) {
-							log.newAnnotation(note, i, ncol);
-						}
-					});
-					viewer.windowTitle = "Typica - " + pname;
-					viewer.raise();
-					viewer.activateWindow();
-					input.input();
-					log.newAnnotation("End", 1, lc);
-				}
-				else {
-					print("Query returned no results");
-				}
-				query = query.invalidate();
-            });
-        ]]>
-    </program>
-</window>

config/Windows/batchdetailsnew.xml

@@ -2,45 +2,59 @@
     <layout type="vertical">
         <layout type="horizontal">
             <button type="push" id="target" name="Load profile as target" />
-			<button type="push" id="viewprofile" name="View profile" />
-			<button type="push" id="compare" name="Compare profile" />
-			<button type="push" id="edit" name="Edit" />
+            <button type="push" id="viewprofile" name="View profile" />
+            <button type="push" id="compare" name="Compare profile" />
+            <button type="push" id="edit" name="Edit" />
         </layout>
         <webview id="view" />
     </layout>
 	<menu name="File">
-		<item id="save" shortcut="Ctrl+S">Save…</item>
+            <item id="save" shortcut="Ctrl+S">Save...</item>
+            <item id="print" shortcut="Ctrl+P">Print...</item>
 	</menu>
     <program>
         <![CDATA[
-			var window = this;
-			dataView = findChildObject(this, 'view');
-			var fileID;
-			var target = findChildObject(this, 'target');
-			var compare = findChildObject(this, 'compare');
-			var edit = findChildObject(this, 'edit');
-			edit.enabled = false;
-			if(typeof(Windows.loggingWindow) == "undefined") {
-				compare.enabled = false;
-				target.enabled = false;
-			}
-			var tableReference;
-			var rowReference;
-			var batchTime;
-			var machine;
-			var approval;
-			var annotation;
-			edit.clicked.connect(function() {
-				var editWindow = createWindow("editBatchDetails");
-				editWindow.loadData(window, tableReference, rowReference, batchTime, machine, approval, annotation);
-			});
-			compare.clicked.connect(function() {
-				var query = new QSqlQuery;
-				query.prepare("SELECT file, name FROM files WHERE id = :id");
-				query.bind(":id", Number(fileID));
-				query.exec();
-				query.next();
-				var buffer = new QBuffer(query.value(0));
+            var window = this;
+            var unit = QSettings.value("script/history_unit", 1);
+            var conversion = 1;
+            if(unit == 0)
+            {
+                conversion = 2.2;
+            }
+            var unitText = (unit == 0 ? TTR("batchDetails", "Kg") :
+                           TTR("batchDetails", "Lb"));
+            dataView = findChildObject(this, 'view');
+            var printMenu = findChildObject(this, 'print');
+            printMenu.triggered.connect(function() {
+                dataView.print();
+            });
+            var fileID;
+            var target = findChildObject(this, 'target');
+            var compare = findChildObject(this, 'compare');
+            var edit = findChildObject(this, 'edit');
+            edit.enabled = false;
+            if(typeof(Windows.loggingWindow) == "undefined") {
+                compare.enabled = false;
+                target.enabled = false;
+            }
+            var tableReference;
+            var rowReference;
+            var batchTime;
+            var machine;
+            var approval;
+            var annotation;
+            var roastWeight;
+            edit.clicked.connect(function() {
+                var editWindow = createWindow("editBatchDetails");
+                editWindow.loadData(window, tableReference, rowReference, batchTime, machine, approval, annotation, roastWeight, unit);
+            });
+            compare.clicked.connect(function() {
+                var query = new QSqlQuery;
+                query.prepare("SELECT file, name FROM files WHERE id = :id");
+                query.bind(":id", Number(fileID));
+                query.exec();
+                query.next();
+                var buffer = new QBuffer(query.value(0));
                 var pname = query.value(1);
                 query = query.invalidate();
                 var startSeries = Number(QSettings.value('cseries', 3));
@@ -50,300 +64,297 @@
                 var graph = findChildObject(Windows.loggingWindow, 'graph');
                 input.measure.connect(graph.newMeasurement);
                 input.input();
-				query = query.invalidate();
-			});
-			target.clicked.connect(function() {
-				var query = new QSqlQuery;
-				query.prepare("SELECT file, name FROM files WHERE id = :id");
-				query.bind(":id", Number(fileID));
-				query.exec();
-				query.next();
-				var buffer = new QBuffer(query.value(0));
-				var pname = query.value(1);
                 query = query.invalidate();
-				var input = new XMLInput(buffer, 1);
-				var graph = findChildObject(Windows.loggingWindow, 'graph');
-				var log = findChildObject(Windows.loggingWindow, 'log');
-				log.clear();
-				graph.clear();
-				input.newTemperatureColumn.connect(log.setHeaderData);
-				input.newTemperatureColumn.connect(function(col, text) {
-					if(text == Windows.loggingWindow.targetcolumnname)
-					{
-						targetseries = col;
-					}
-				});
-				input.newAnnotationColumn.connect(log.setHeaderData);
-				input.measure.connect(graph.newMeasurement);
-				input.measure.connect(log.newMeasurement);
-				input.measure.connect(function(data, series) {
-					if(series == targetseries)
-					{
-						targetDetector.newMeasurement(data);
-					}
-				});
-				var lc;
-				input.lastColumn.connect(function(c) {
-					lc = c;
-					QSettings.setValue("liveColumn", c + 1);
-					Windows.loggingWindow.postLoadColumnSetup(c);
-				});
-				input.annotation.connect(log.newAnnotation);
-				input.annotation.connect(function(note, tcol, ncol) {
-					for(var i = tcol; i < ncol; i++) {
-						log.newAnnotation(note, i, ncol);
-					}
-				});
-				Windows.loggingWindow.windowTitle = "Typica - " + pname;
-				Windows.loggingWindow.raise();
-				Windows.loggingWindow.activateWindow();
-				input.input();
-				log.newAnnotation("End", 1, lc);
-				query = query.invalidate();
-			});
-			var viewbutton = findChildObject(this, 'viewprofile');
-			viewbutton.clicked.connect(function() {
-				var query = new QSqlQuery;
-				query.prepare("SELECT file, name FROM files WHERE id = :id");
-				query.bind(":id", Number(fileID));
-				query.exec();
-				if(query.next()) {
-					var viewer = createWindow('offline');
-					var buffer = new QBuffer(query.value(0));
-					var pname = query.value(1);
-					query = query.invalidate();
-					var input = new XMLInput(buffer, 1);
-					var graph = findChildObject(viewer, 'graph');
-					var log = findChildObject(viewer, 'log');
-					input.newTemperatureColumn.connect(log.setHeaderData);
-					input.newTemperatureColumn.connect(function(column) {
-						viewer.saveTemperatureColumns.push(column);
-					});
-					input.newAnnotationColumn.connect(log.setHeaderData);
-					input.newAnnotationColumn.connect(function(column) {
-						viewer.saveAnnotationColumns.push(column);
-					});
-					input.measure.connect(graph.newMeasurement);
-					input.measure.connect(log.newMeasurement);
-					input.annotation.connect(log.newAnnotation);
-					var lc;
-					input.lastColumn.connect(function(c) {
-						lc = c;
-						if(c < 3)
-						{
-							log.setHeaderData(3, "");
-						}
-					});
-					input.annotation.connect(function(note, tcol, ncol) {
-						for(var i = tcol; i < ncol; i++) {
-							log.newAnnotation(note, i, ncol);
-						}
-					});
-					viewer.windowTitle = "Typica - " + pname;
-					viewer.raise();
-					viewer.activateWindow();
-					graph.updatesEnabled = false;
-					log.updatesEnabled = false;
-					input.input();
-					log.updatesEnabled = true;
-					graph.updatesEnabled = true;
-					log.newAnnotation("End", 1, lc);
-				}
-				else {
-					print("Query returned no results");
-				}
-				query = query.invalidate();
-			});
-			window.loadData = function(table, row) {
-				tableReference = table;
-				rowReference = row;
-				var buffer = new QBuffer;
-				buffer.open(3);
-				var output = new XmlWriter(buffer);
-				output.writeStartDocument("1.0");
-				output.writeDTD('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg.dtd">');
-				output.writeStartElement("html");
-				output.writeAttribute("xmlns", "http://www.w3.org/1999/xhtml");
-				output.writeStartElement("head");
-				output.writeTextElement("title", "Batch Details");
-				output.writeEndElement();
-				output.writeStartElement("body");
-				output.writeStartElement("div");
-				output.writeAttribute("style", "float: left; padding-right: 10px");
-				output.writeStartElement("p");
-				output.writeTextElement("strong", "Roasted Coffee: ");
-				output.writeTextElement("span", table.data(row, 2));
-				output.writeEndElement();
-				output.writeEndElement();
-				output.writeStartElement("div");
-				output.writeAttribute("style", "float: left");
-				output.writeStartElement("p");
-				output.writeTextElement("strong", "Roasted On: ");
-				batchTime = table.data(row, 0);
-				output.writeTextElement("span", batchTime);
-				output.writeEndElement();
-				output.writeStartElement("p");
-				output.writeTextElement("strong", "Batch Duration: ");
-				output.writeTextElement("span", table.data(row, 6));
-				output.writeEndElement();
-				output.writeEndElement();
-				output.writeStartElement("div");
-				output.writeAttribute("style", "clear: both");
-				output.writeEndElement();
-				output.writeStartElement("table");
-				output.writeStartElement("thead");
-				output.writeStartElement("tr");
-				output.writeTextElement("th", "Green Coffee");
-				output.writeTextElement("th", "Weight (lb)");
-				output.writeEndElement();
-				output.writeEndElement();
-				output.writeStartElement("tbody");
-				var query = new QSqlQuery();
-				query.prepare("SELECT unroasted_id, unroasted_quantity, approval, files, annotation FROM roasting_log WHERE time = :time AND machine = :machine");
-				query.bind(":time", batchTime);
-				machine = table.data(row, 1);
-				query.bind(":machine", machine);
-				query.exec();
-				query.next();
-				approval = query.value(2);
-				annotation = query.value(4);
-				var items = sqlToArray(query.value(0));
-				var quantities = sqlToArray(query.value(1));
-				var nameQuery = new QSqlQuery();
-				nameQuery.prepare("SELECT name FROM items WHERE id = :id");
-				for(var i = 0; i < items.length; i++) {
-					output.writeStartElement("tr");
-					nameQuery.bind(":id", items[i]);
-					nameQuery.exec();
-					nameQuery.next();
-					output.writeTextElement("td", nameQuery.value(0) + " (" + items[i] + ")");
-					output.writeStartElement("td");
-					output.writeAttribute("align", "center");
-					output.writeCharacters(quantities[i]);
-					output.writeEndElement();
-					output.writeEndElement();
-				}
-				nameQuery = nameQuery.invalidate();
-				output.writeEndElement();
-				output.writeStartElement("tfoot");
-				output.writeStartElement("tr");
-				output.writeStartElement("td");
-				output.writeAttribute("align", "right");
-				output.writeTextElement("strong", "Green Total:");
-				output.writeEndElement();
-				output.writeStartElement("td");
-				output.writeAttribute("align", "center");
-				output.writeCharacters(table.data(row, 3));
-				output.writeEndElement();
-				output.writeEndElement();
-				output.writeStartElement("tr");
-				output.writeStartElement("td");
-				output.writeAttribute("align", "right");
-				output.writeTextElement("strong", "Roasted Weight:");
-				output.writeEndElement();
-				output.writeStartElement("td");
-				output.writeAttribute("align", "center");
-				output.writeCharacters(table.data(row, 4));
-				output.writeEndElement();
-				output.writeEndElement();
-				output.writeStartElement("tr");
-				output.writeStartElement("td");
-				output.writeAttribute("align", "right");
-				output.writeTextElement("strong", "Weight Loss:");
-				output.writeEndElement();
-				output.writeStartElement("td");
-				output.writeAttribute("align", "center");
-				output.writeCharacters(table.data(row, 5));
-				output.writeCharacters("%");
-				output.writeEndElement();
-				output.writeEndElement();
-				output.writeEndElement();
-				output.writeEndElement();
-				output.writeStartElement("p");
-				output.writeTextElement("strong", "Approved: ");
-				output.writeCharacters(approval);
-				output.writeEndElement();
-				output.writeStartElement("p");
-				output.writeTextElement("strong", "Files: ");
-				output.writeCharacters(query.value(3));
-				output.writeEndElement();
-				output.writeStartElement("p");
-				output.writeTextElement("strong", "Annotations:");
-				var files = sqlToArray(query.value(3));
-				var annotations = annotationFromRecord(files[0]);
-				fileID = files[0];
-				var buffer2 = new QBuffer("<points>"+annotations+"</points>");
-				buffer2.open(1);
-				var colQuery = new XQuery;
-				colQuery.bind("profile", buffer2);
-				colQuery.setQuery('for $i in doc($profile)//tuple[1]/temperature/@series return (string($i), ";")');
-				var result = colQuery.exec();
-				buffer2.close();
-				var seriesHeaders = new Array();
-				seriesHeaders.push("Time");
-				var records = result.split(";");
-				for(var i = 0; i < records.length - 1; i++) {
-					seriesHeaders.push(records[i].replace(/^\s+|\s+$/g,""));
-				}
-				seriesHeaders.push("Note");
-				output.writeStartElement("table");
-				output.writeStartElement("thead");
-				output.writeStartElement("tr");
-				for(var i = 0; i < seriesHeaders.length; i++) {
-					output.writeTextElement("th", seriesHeaders[i]);
-				}
-				output.writeEndElement();
-				output.writeEndElement();
-				buffer2.open(1);
-				var rq = 'for $t in doc($profile) //tuple return (string($t/time), ";", ';
-				for(var i = 0; i < seriesHeaders.length - 2; i++) {
-					rq = rq + 'string($t/temperature[' + Number(i+1) + ']), ";", ';
-				}
-				rq = rq + 'string($t/annotation), "~")';
-				colQuery.setQuery(rq);
-				var annotationData = colQuery.exec();
-				colQuery = colQuery.invalidate();
-				buffer2.close();
-				output.writeStartElement("tbody");
-				var annotationRecords = annotationData.split("~");
-				for(var i = 0; i < annotationRecords.length - 1; i++) {
-					output.writeStartElement("tr");
-					var annotationRow = annotationRecords[i].split(";");
-					for(var j = 0; j < annotationRow.length; j++) {
-						output.writeStartElement("td");
-						output.writeAttribute("style", "border-left: 1px solid #000000");
-						if(j > 0) {
-							output.writeAttribute("align", "center");
-						}
-						if(j > 0 && j < annotationRow.length - 1) {
-							output.writeCharacters(Number(annotationRow[j].replace(/^\s+|\s+$/g,"")).toFixed(2));
-						}
-						else {
-							output.writeCharacters(annotationRow[j].replace(/^\s+|\s+$/g,""));
-						}
-						output.writeEndElement();
-					}
-					output.writeEndElement();
-				}
-				output.writeEndElement();
-				output.writeEndElement();
-				output.writeCharacters(annotation);
-				output.writeEndElement();
-				output.writeEndElement();
-				output.writeEndElement();
-				output.writeEndDocument();
-				dataView.setContent(buffer);
-				buffer.close();
-				query = query.invalidate();
-				edit.enabled = true;
-			};
-			var saveMenu = findChildObject(this, 'save');
-			saveMenu.triggered.connect(function() {
-				var filename = QFileDialog.getSaveFileName(window, "Save Log As…", QSettings.value("script/lastDir", "") + "/");
-				if(filename != "") {
-					saveFileFromDatabase(fileID, filename);
-				}
-			});
+            });
+            target.clicked.connect(function() {
+                var query = new QSqlQuery;
+                query.prepare("SELECT file, name FROM files WHERE id = :id");
+                query.bind(":id", Number(fileID));
+                query.exec();
+                query.next();
+                var buffer = new QBuffer(query.value(0));
+                var pname = query.value(1);
+                query = query.invalidate();
+                var input = new XMLInput(buffer, 1);
+                var graph = findChildObject(Windows.loggingWindow, 'graph');
+                var log = findChildObject(Windows.loggingWindow, 'log');
+                log.clear();
+                graph.clear();
+                input.newTemperatureColumn.connect(log.setHeaderData);
+                input.newTemperatureColumn.connect(function(col, text) {
+                    if(text == Windows.loggingWindow.targetcolumnname) {
+                        targetseries = col;
+                    }
+                });
+                input.newAnnotationColumn.connect(log.setHeaderData);
+                input.measure.connect(graph.newMeasurement);
+                input.measure.connect(log.newMeasurement);
+                input.measure.connect(function(data, series) {
+                    if(series == targetseries) {
+                        targetDetector.newMeasurement(data);
+                    }
+                });
+                var lc;
+                input.lastColumn.connect(function(c) {
+                    lc = c;
+                    QSettings.setValue("liveColumn", c + 1);
+                    Windows.loggingWindow.postLoadColumnSetup(c);
+                });
+                input.annotation.connect(log.newAnnotation);
+                input.annotation.connect(function(note, tcol, ncol) {
+                    for(var i = tcol; i < ncol; i++) {
+                        log.newAnnotation(note, i, ncol);
+                    }
+                });
+                Windows.loggingWindow.windowTitle = "Typica - " + pname;
+                Windows.loggingWindow.raise();
+                Windows.loggingWindow.activateWindow();
+                input.input();
+                log.newAnnotation(TTR("batchDetails", "End"), 1, lc);
+                query = query.invalidate();
+            });
+            var viewbutton = findChildObject(this, 'viewprofile');
+            viewbutton.clicked.connect(function() {
+                var query = new QSqlQuery;
+                query.prepare("SELECT file, name FROM files WHERE id = :id");
+                query.bind(":id", Number(fileID));
+                query.exec();
+                if(query.next()) {
+                    var viewer = createWindow('offline');
+                    var buffer = new QBuffer(query.value(0));
+                    var pname = query.value(1);
+                    query = query.invalidate();
+                    var input = new XMLInput(buffer, 1);
+                    var graph = findChildObject(viewer, 'graph');
+                    var log = findChildObject(viewer, 'log');
+                    input.newTemperatureColumn.connect(log.setHeaderData);
+                    input.newTemperatureColumn.connect(function(column) {
+                        viewer.saveTemperatureColumns.push(column);
+                    });
+                    input.newAnnotationColumn.connect(log.setHeaderData);
+                    input.newAnnotationColumn.connect(function(column) {
+                        viewer.saveAnnotationColumns.push(column);
+                    });
+                    input.measure.connect(graph.newMeasurement);
+                    input.measure.connect(log.newMeasurement);
+                    input.annotation.connect(log.newAnnotation);
+                    var lc;
+                    input.lastColumn.connect(function(c) {
+                        lc = c;
+                        if(c < 3) {
+                            log.setHeaderData(3, "");
+                        }
+                    });
+                    input.annotation.connect(function(note, tcol, ncol) {
+                        for(var i = tcol; i < ncol; i++) {
+                            log.newAnnotation(note, i, ncol);
+                        }
+                    });
+                    viewer.windowTitle = "Typica - " + pname;
+                    viewer.raise();
+                    viewer.activateWindow();
+                    graph.updatesEnabled = false;
+                    log.updatesEnabled = false;
+                    input.input();
+                    log.updatesEnabled = true;
+                    graph.updatesEnabled = true;
+                    log.newAnnotation("End", 1, lc);
+                }
+                query = query.invalidate();
+            });
+            window.loadData = function(table, row) {
+                tableReference = table;
+                rowReference = row;
+                var buffer = new QBuffer;
+                buffer.open(3);
+                var output = new XmlWriter(buffer);
+                output.writeStartDocument("1.0");
+                output.writeDTD('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg.dtd">');
+                output.writeStartElement("html");
+                output.writeAttribute("xmlns", "http://www.w3.org/1999/xhtml");
+                output.writeStartElement("head");
+                output.writeTextElement("title", TTR("batchDetails", "Batch Details"));
+                output.writeEndElement();
+                output.writeStartElement("body");
+                output.writeStartElement("div");
+                output.writeAttribute("style", "float: left; padding-right: 10px");
+                output.writeStartElement("p");
+                output.writeTextElement("strong", TTR("batchDetails", "Roasted Coffee: "));
+                output.writeTextElement("span", table.data(row, 2));
+                output.writeEndElement();
+                output.writeEndElement();
+                output.writeStartElement("div");
+                output.writeAttribute("style", "float: left");
+                output.writeStartElement("p");
+                output.writeTextElement("strong", TTR("batchDetails", "Roasted On: "));
+                batchTime = table.data(row, 0);
+                output.writeTextElement("span", batchTime);
+                output.writeEndElement();
+                output.writeStartElement("p");
+                output.writeTextElement("strong", TTR("batchDetails", "Batch Duration: "));
+                output.writeTextElement("span", table.data(row, 6));
+                output.writeEndElement();
+                output.writeEndElement();
+                output.writeStartElement("div");
+                output.writeAttribute("style", "clear: both");
+                output.writeEndElement();
+                output.writeStartElement("table");
+                output.writeStartElement("thead");
+                output.writeStartElement("tr");
+                output.writeTextElement("th", TTR("batchDetails", "Green Coffee"));
+                output.writeTextElement("th", TTR("batchDetails", "Weight (") + unitText + ")");
+                output.writeEndElement();
+                output.writeEndElement();
+                output.writeStartElement("tbody");
+                var query = new QSqlQuery();
+                query.prepare("SELECT unroasted_id, unroasted_quantity, approval, files, annotation, (unroasted_total_quantity/:c1)::numeric(12,3), (roasted_quantity/:c2)::numeric(12,3) FROM roasting_log WHERE time = :time AND machine = :machine");
+                query.bind(":time", batchTime);
+                query.bind(":c1", conversion);
+                query.bind(":c2", conversion);
+                machine = table.data(row, 1);
+                query.bind(":machine", machine);
+                query.exec();
+                query.next();
+                approval = query.value(2);
+                annotation = query.value(4);
+                var items = sqlToArray(query.value(0));
+                var quantities = sqlToArray(query.value(1));
+                var nameQuery = new QSqlQuery();
+                nameQuery.prepare("SELECT name FROM items WHERE id = :id");
+                for(var i = 0; i < items.length; i++) {
+                    output.writeStartElement("tr");
+                    nameQuery.bind(":id", items[i]);
+                    nameQuery.exec();
+                    nameQuery.next();
+                    output.writeTextElement("td", nameQuery.value(0) + " (" + items[i] + ")");
+                    output.writeStartElement("td");
+                    output.writeAttribute("align", "center");
+                    output.writeCharacters((Number(quantities[i])/conversion).toFixed(3));
+                    output.writeEndElement();
+                    output.writeEndElement();
+                }
+                nameQuery = nameQuery.invalidate();
+                output.writeEndElement();
+                output.writeStartElement("tfoot");
+                output.writeStartElement("tr");
+                output.writeStartElement("td");
+                output.writeAttribute("align", "right");
+                output.writeTextElement("strong", TTR("batchDetails", "Green Total:"));
+                output.writeEndElement();
+                output.writeStartElement("td");
+                output.writeAttribute("align", "center");
+                output.writeCharacters(query.value(5));
+                output.writeEndElement();
+                output.writeEndElement();
+                output.writeStartElement("tr");
+                output.writeStartElement("td");
+                output.writeAttribute("align", "right");
+                output.writeTextElement("strong", TTR("batchDetails", "Roasted Weight:"));
+                output.writeEndElement();
+                output.writeStartElement("td");
+                output.writeAttribute("align", "center");
+                output.writeCharacters(query.value(6));
+                roastWeight = query.value(6);
+                output.writeEndElement();
+                output.writeEndElement();
+                output.writeStartElement("tr");
+                output.writeStartElement("td");
+                output.writeAttribute("align", "right");
+                output.writeTextElement("strong", TTR("batchDetails", "Weight Loss:"));
+                output.writeEndElement();
+                output.writeStartElement("td");
+                output.writeAttribute("align", "center");
+                output.writeCharacters(table.data(row, 5));
+                output.writeCharacters("%");
+                output.writeEndElement();
+                output.writeEndElement();
+                output.writeEndElement();
+                output.writeEndElement();
+                output.writeStartElement("p");
+                output.writeTextElement("strong", TTR("batchDetails", "Approved: "));
+                output.writeCharacters(approval);
+                output.writeEndElement();
+                output.writeStartElement("p");
+                output.writeTextElement("strong", TTR("batchDetails", "Files: "));
+                output.writeCharacters(query.value(3));
+                output.writeEndElement();
+                output.writeStartElement("p");
+                output.writeTextElement("strong", TTR("batchDetails", "Annotations:"));
+                var files = sqlToArray(query.value(3));
+                var annotations = annotationFromRecord(files[0]);
+                fileID = files[0];
+                var buffer2 = new QBuffer("<points>"+annotations+"</points>");
+                buffer2.open(1);
+                var colQuery = new XQuery;
+                colQuery.bind("profile", buffer2);
+                colQuery.setQuery('for $i in doc($profile)//tuple[1]/temperature/@series return (string($i), ";")');
+                var result = colQuery.exec();
+                buffer2.close();
+                var seriesHeaders = new Array();
+                seriesHeaders.push(TTR("batchDetails", "Time"));
+                var records = result.split(";");
+                for(var i = 0; i < records.length - 1; i++) {
+                    seriesHeaders.push(records[i].replace(/^\s+|\s+$/g,""));
+                }
+                seriesHeaders.push(TTR("batchDetails", "Note"));
+                output.writeStartElement("table");
+                output.writeStartElement("thead");
+                output.writeStartElement("tr");
+                for(var i = 0; i < seriesHeaders.length; i++) {
+                        output.writeTextElement("th", seriesHeaders[i]);
+                }
+                output.writeEndElement();
+                output.writeEndElement();
+                buffer2.open(1);
+                var rq = 'for $t in doc($profile) //tuple return (string($t/time), ";", ';
+                for(var i = 0; i < seriesHeaders.length - 2; i++) {
+                        rq = rq + 'string($t/temperature[' + Number(i+1) + ']), ";", ';
+                }
+                rq = rq + 'string($t/annotation), "~")';
+                colQuery.setQuery(rq);
+                var annotationData = colQuery.exec();
+                colQuery = colQuery.invalidate();
+                buffer2.close();
+                output.writeStartElement("tbody");
+                var annotationRecords = annotationData.split("~");
+                for(var i = 0; i < annotationRecords.length - 1; i++) {
+                    output.writeStartElement("tr");
+                    var annotationRow = annotationRecords[i].split(";");
+                    for(var j = 0; j < annotationRow.length; j++) {
+                        output.writeStartElement("td");
+                        output.writeAttribute("style", "border-left: 1px solid #000000");
+                        if(j > 0) {
+                            output.writeAttribute("align", "center");
+                        }
+                        if(j > 0 && j < annotationRow.length - 1) {
+                            output.writeCharacters(Number(annotationRow[j].replace(/^\s+|\s+$/g,"")).toFixed(2));
+                        }
+                        else {
+                            output.writeCharacters(annotationRow[j].replace(/^\s+|\s+$/g,""));
+                        }
+                        output.writeEndElement();
+                    }
+                    output.writeEndElement();
+                }
+                output.writeEndElement();
+                output.writeEndElement();
+                output.writeCharacters(annotation);
+                output.writeEndElement();
+                output.writeEndElement();
+                output.writeEndElement();
+                output.writeEndDocument();
+                dataView.setContent(buffer);
+                buffer.close();
+                query = query.invalidate();
+                edit.enabled = true;
+            };
+            var saveMenu = findChildObject(this, 'save');
+            saveMenu.triggered.connect(function() {
+                var filename = QFileDialog.getSaveFileName(window, TTR("batchDetails", "Save Log As..."), QSettings.value("script/lastDir", "") + "/");
+                if(filename != "") {
+                    saveFileFromDatabase(fileID, filename);
+                }
+            });
         ]]>
     </program>
 </window>

config/Windows/editbatchdetails.xml

@@ -1,47 +1,63 @@
 <window id="editBatchDetails">
     <layout type="vertical">
-		<button type="check" name="Approved" id="approval" />
-		<layout type="horizontal">
-			<label>Annotation</label>
-			<textarea id="annotation" />
-		</layout>
-		<button type="push" id="submit" name="Submit" />
-	</layout>
+        <layout type="horizontal">
+            <label>Roasted Weight: </label>
+            <line id="roasted" validator="numeric" />
+            <line id="roastunit" writable="false" />
+        </layout>
+        <button type="check" name="Approved" id="approval" />
+        <layout type="horizontal">
+            <label>Annotation</label>
+            <textarea id="annotation" />
+        </layout>
+        <button type="push" id="submit" name="Submit" />
+    </layout>
     <program>
         <![CDATA[
-			var window = this;
-			var approvalButton = findChildObject(this, 'approval');
-			var annotationField = findChildObject(this, 'annotation');
-			var parentWindow;
-			var tableReference;
-			var rowReference;
-			var timeKey;
-			var machineKey;
-			var submit = findChildObject(this, 'submit');
-			submit.enabled = false;
-			this.loadData = function(parent, table, row, time, machine, approval, annotation) {
-				parentWindow = parent;
-				tableReference = table;
-				rowReference = row;
-				if(approval == "true") {
-					approvalButton.checked = true;
-				}
-				annotationField.plainText = annotation;
-				timeKey = time;
-				machineKey = machine;
-				submit.enabled = true;
-			};
-			submit.clicked.connect(function() {
-				var query = new QSqlQuery;
-				query.prepare("UPDATE roasting_log SET approval = :approval, annotation = :annotation WHERE time = :time AND machine = :machine");
-				query.bind("approval", approvalButton.checked);
-				query.bind("annotation", annotationField.plainText);
-				query.bind("time", timeKey);
-				query.bind("machine", machineKey);
-				query.exec();
-				parentWindow.loadData(tableReference, rowReference);
-				window.close();
-			});
+            var window = this;
+            var approvalButton = findChildObject(this, 'approval');
+            var annotationField = findChildObject(this, 'annotation');
+            var parentWindow;
+            var tableReference;
+            var rowReference;
+            var timeKey;
+            var machineKey;
+            var submit = findChildObject(this, 'submit');
+            submit.enabled = false;
+            var roastedEdit = findChildObject(this, 'roasted');
+            var unitEdit = findChildObject(this, 'roastunit');
+            var conversion = 1;
+            this.loadData = function(parent, table, row, time, machine, approval, annotation, roastWeight, unit) {
+                parentWindow = parent;
+                tableReference = table;
+                rowReference = row;
+                if(approval == "true") {
+                    approvalButton.checked = true;
+                }
+                annotationField.plainText = annotation;
+                timeKey = time;
+                machineKey = machine;
+                submit.enabled = true;
+                roastedEdit.text = roastWeight;
+                if(unit == 0) {
+                    unitEdit.text = TTR("editBatchDetails", "Kg");
+                    conversion = 2.2;
+                } else {
+                    unitEdit.text = TTR("editBatchDetails", "Lb");
+                }
+            };
+            submit.clicked.connect(function() {
+                var query = new QSqlQuery;
+                query.prepare("UPDATE roasting_log SET roasted_quantity = :roasted, approval = :approval, annotation = :annotation WHERE time = :time AND machine = :machine");
+                query.bind(":approval", approvalButton.checked);
+                query.bind(":annotation", annotationField.plainText);
+                query.bind(":roasted", Number(roastedEdit.text)/conversion);
+                query.bind(":time", timeKey);
+                query.bind(":machine", Number(machineKey));
+                query.exec();
+                parentWindow.loadData(tableReference, rowReference);
+                window.close();
+            });
         ]]>
     </program>
 </window>

config/Windows/editfee.xml

@@ -15,22 +15,24 @@
 	<program>
 		<![CDATA[
 			window = this;
+                        var invoiceID = 0;
 			this.windowTitle = 'Typica - Fee Detail';
 			var descField = findChildObject(this, 'description');
 			var costField = findChildObject(this, 'cost');
 			this.dataSet = function() {
 				descField.text = window.rowData[2];
-				costField.text = window.rowData[4];
+				costField.text = window.rowData[7];
+                                invoiceID = window.invoiceID;
 			};
 			button = findChildObject(this, 'submit');
 			button.clicked.connect(function() {
 				var query = new QSqlQuery();
-				query.prepare("UPDATE invoice_items SET description = :name, cost = :cost WHERE invoice_id = :id AND record_type = 'FEE' AND item_id = NULL AND description = :oldname AND cost = :oldcost");
+				query.prepare("UPDATE invoice_items SET description = :name, cost = :cost WHERE invoice_id = :id AND record_type = 'FEE' AND description = :oldname AND cost = :oldcost");
 				query.bind(":name", descField.text);
 				query.bind(":cost", Number(costField.text));
-				query.bind(":id", Number(window.rowData[1]);
+				query.bind(":id", Number(invoiceID));
 				query.bind(":oldname", window.rowData[2]);
-				query.bind(":oldcost", window.rowData[4]);
+				query.bind(":oldcost", window.rowData[7]);
 				query.exec();
 				query = query.invalidate();
 				window.close();

config/Windows/editreminder.xml

@@ -0,0 +1,210 @@
+<window id="editreminder">
+    <layout type="vertical">
+        <layout type="horizontal">
+            <label>Name:</label>
+            <line id="name" />
+        </layout>
+        <label>Description:</label>
+        <textarea id="description" />
+        <layout type="horizontal">
+            <label>Since:</label>
+            <calendar time="true" id="since" />
+            <button name="Now" id="now" type="push" />
+        </layout>
+        <layout type="horizontal">
+            <label>Condition:</label>
+            <sqldrop id="condition" />
+        </layout>
+        <layout type="stack" id="conditionvars">
+            <page>
+                <layout type="horizontal">
+                    <line id="productionweight" validator="numeric" />
+                    <sqldrop id="productionunit" />
+                </layout>
+            </page>
+            <page>
+                <layout type="horizontal">
+                    <line id="days" validator="numeric" />
+                </layout>
+            </page>
+            <page>
+                <layout type="horizontal">
+                    <line id="batches" validator="numeric" />
+                </layout>
+            </page>
+            <page>
+                <layout type="horizontal">
+                    <line id="roastingtime" validator="numeric" />
+                </layout>
+            </page>
+        </layout>
+        <layout type="horizontal">
+            <button name="Delete" id="delete" type="push" />
+            <button name="Save" id="save" type="push" />
+        </layout>
+    </layout>
+    <program>
+        <![CDATA[
+            var window = this;
+            window.setRefreshFunction = function(callback) {
+                window.refreshCallback = callback;
+            }
+            window.currentReminder = new Object();
+            this.windowTitle = TTR("editreminder", "Typica - Edit Reminder");
+            var unitBox = findChildObject(this, 'productionunit');
+            unitBox.addItem(TTR("editreminder", "Kg"));
+            unitBox.addItem(TTR("editreminder", "Lb"));
+            unitBox.currentIndex = QSettings.value("script/report_unit", 1);
+            var condition = findChildObject(this, 'condition');
+            condition.addItem(TTR("editreminder", "Roasted Coffee Production"));
+            condition.addItem(TTR("editreminder", "Days"));
+            condition.addItem(TTR("editreminder", "Batches Roasted"));
+            condition.addItem(TTR("editreminder", "Hours of Roasting Time"));
+            var conditionpage = findChildObject(this, 'conditionvars');
+            condition['currentIndexChanged(int)'].connect(function(c) {
+                conditionpage.setCurrentIndex(c);
+            });
+            var namefield = findChildObject(this, 'name');
+            var descfield = findChildObject(this, 'description');
+            var sincefield = findChildObject(this, 'since');
+            var prodweight = findChildObject(this, 'productionweight');
+            var daysfield = findChildObject(this, 'days');
+            var batchesfield = findChildObject(this, 'batches');
+            var hoursfield = findChildObject(this, 'roastingtime');
+            var time = new QTime();
+            var nowButton = findChildObject(this, 'now');
+            nowButton.clicked.connect(function() {
+                sincefield.setToCurrentTime();
+            });
+            var deleteButton = findChildObject(this, 'delete');
+            deleteButton.enabled = false;
+            deleteButton.clicked.connect(function() {
+                var query = new QSqlQuery;
+                query.prepare("DELETE FROM reminders WHERE id = :id");
+                query.bind("id", window.currentReminder.dbid);
+                query.exec();
+                query = query.invalidate();
+                window.refreshCallback();
+                window.close();
+            });
+            var saveButton = findChildObject(this, 'save');
+            saveButton.clicked.connect(function() {
+                r = new Object();
+                r.title = namefield.text;
+                r.description = descfield.plainText;
+                r.start_year = sincefield.year();
+                r.start_month = sincefield.month();
+                r.start_day = sincefield.day();
+                r.start_time = sincefield.time.toString("hh:mm:ss");
+                switch(condition.currentIndex)
+                {
+                    case 0:
+                        r.condition = "PRODUCTIONWEIGHT";
+                        r.value = Number(prodweight.text);
+                        if(unitBox.currentIndex == 0)
+                        {
+                            r.unit = "KG";
+                        }
+                        else
+                        {
+                            r.unit = "LB";
+                        }
+                        break;
+                    case 1:
+                        r.condition = "DAYS";
+                        r.value = daysfield.text;
+                        break;
+                    case 2:
+                        r.condition = "PRODUCTIONBATCHES";
+                        r.value = batchesfield.text;
+                        break;
+                    case 3:
+                        r.condition = "PRODUCTIONHOURS";
+                        r.value = hoursfield.text;
+                        break;
+                }
+                var query = new QSqlQuery;
+                if(window.currentReminder.hasOwnProperty("dbid"))
+                {
+                    query.prepare("UPDATE reminders SET reminder = :reminder WHERE id = :id");
+                    query.bind("reminder", JSON.stringify(r));
+                    query.bind("id", window.currentReminder.dbid);
+                }
+                else
+                {
+                    query.prepare("INSERT INTO reminders (id, reminder) VALUES(default, :reminder)");
+                    query.bind("reminder", JSON.stringify(r));
+                }
+                query.exec();
+                query = query.invalidate();
+                window.refreshCallback();
+                window.close();
+            });
+            window.loadData = function(reminder) {
+                window.currentReminder = reminder;
+                deleteButton.enabled = reminder.hasOwnProperty("dbid");
+                if(reminder.hasOwnProperty("title"))
+                {
+                    namefield.text = reminder.title;
+                }
+                if(reminder.hasOwnProperty("description"))
+                {
+                    descfield.plainText = reminder.description;
+                }
+                if(reminder.hasOwnProperty("start_year") &&
+                   reminder.hasOwnProperty("start_month") &&
+                   reminder.hasOwnProperty("start_day"))
+                {
+                    sincefield.setDate(reminder.start_year, reminder.start_month, reminder.start_day);
+                }
+                if(reminder.hasOwnProperty("start_time"))
+                {
+                    sincefield.time = time.fromString(reminder.start_time, "hh:mm:ss");
+                }
+                if(reminder.hasOwnProperty("condition"))
+                {
+                    if(reminder.condition == "PRODUCTIONWEIGHT")
+                    {
+                        condition.setCurrentIndex(0);
+                        if(reminder.hasOwnProperty("value"))
+                        {
+                            prodweight.text = reminder.value;
+                        }
+                        if(reminder.unit == "KG")
+                        {
+                            unitBox.setCurrentIndex(0);
+                        }
+                        else
+                        {
+                            unitBox.setCurrentIndex(1);
+                        }
+                    }
+                    else if(reminder.condition == "DAYS")
+                    {
+                        condition.setCurrentIndex(1);
+                        if(reminder.hasOwnProperty("value"))
+                        {
+                            daysfield.text = reminder.value;
+                        }
+                    }
+                    else if(reminder.condition == "PRODUCTIONBATCHES")
+                    {
+                        condition.setCurrentIndex(2);
+                        if(reminder.hasOwnProperty("value"))
+                        {
+                            batchesfield.text = reminder.value;
+                        }
+                    }
+                    else if(reminder.condition == "PRODUCTIONHOURS")
+                    {
+                        condition.setCurrentIndex(3);
+                        if(reminder.hasOwnProperty("value"))
+                        {
+                            hoursfield.text = reminder.value;
+                        }
+                    }
+                }
+            }
+        ]]>
+    </program>
+</window>

config/Windows/export.xml

@@ -72,7 +72,7 @@
             var titleField = findChildObject(window, 'title');
             var subTitleField = findChildObject(window, 'subtitle');
             exportButton.clicked.connect(function() {
-                var filename = QFileDialog.getSaveFileName(window, "Export XHTML+SVG As...", QSettings.value("script/lastDir", "") + "/");
+                var filename = QFileDialog.getSaveFileName(window, TTR("exportWindow", "Export XHTML+SVG As..."), QSettings.value("script/lastDir", "") + "/");
                 if(filename != "")
                 {
                     window.log.clearOutputColumns();
@@ -284,11 +284,11 @@ print("Column headers output");
                     output.writeAttribute("transform", "rotate(-90 40,150)");
                     if(log.displayUnits() == 10143)
                     {
-                        output.writeCDATA("Temperature (°C)");
+                        output.writeCDATA(TTR("exportWindow", "Temperature (°C)"));
                     }
                     else
                     {
-                        output.writeCDATA("Temperature (°F)");
+                        output.writeCDATA(TTR("exportWindow", "Temperature (°F)"));
                     }
                     output.writeEndElement();
                     output.writeStartElement("text");
@@ -679,7 +679,7 @@ print("Column headers output");
                     if(lossField.text != "")
                     {
                         output.writeStartElement("p");
-                        output.writeCDATA("Weight loss: ");
+                        output.writeCDATA(TTR("exportWindow", "Weight loss: "));
                         output.writeCDATA(lossField.text);
                         if(tolField.text != "")
                         {
@@ -691,10 +691,10 @@ print("Column headers output");
                         output.writeStartElement("table");
                         output.writeStartElement("tr");
                         output.writeStartElement("th");
-                        output.writeCDATA("Roasted");
+                        output.writeCDATA(TTR("exportWindow", "Roasted"));
                         output.writeEndElement();
                         output.writeStartElement("th");
-                        output.writeCDATA("Green");
+                        output.writeCDATA(TTR("exportWindow", "Green"));
                         output.writeEndElement();
                         output.writeEndElement();
                         var green;

config/Windows/externalroaster.xml

@@ -1,276 +0,0 @@
-<window id="basicWindow">
-    <layout type="vertical">
-        <splitter type = "vertical" id = "main">
-            <splitter type = "horizontal" id = "indicators">
-                <decoration name="Bean Temperature" type="vertical">
-                    <lcdtemperature id = "beans" />
-                </decoration>
-                <decoration name="Air Temperature" type="vertical">
-                    <lcdtemperature id = "environment" />
-                </decoration>
-                <decoration name="Batch Timer" type="vertical">
-                    <lcdtimer format="mm:ss" id="batch" />
-                </decoration>
-            </splitter>
-            <widget id="widget">
-                <layout type="horizontal">
-                    <button name="Start Batch" type="push" id="startbutton" />
-                    <button name="Stop Batch" type="annotation" id="stopbutton" series="1" column="3" annotation="End" />
-                    <spinbox id="manometer" series="1" column="3" min="0" max="10" step="0.1" decimals="1" />
-                    <button name="New Sample" type="annotation" id="sample" series="1" column="3" annotation="Sample %1" />
-                </layout>
-            </widget>
-            <splitter type="horizontal" id="logsplit">
-                <measurementtable id="log">
-                    <column>Time</column>
-                    <column>Bean</column>
-                    <column>Air</column>
-                    <column>Note</column>
-                    <column>.</column>
-                    <column>.</column>
-                    <column>.</column>
-                </measurementtable>
-                <graph id="graph" />
-            </splitter>
-        </splitter>
-    </layout>
-    <menu name="File">
-        <item id="open" shortcut="Ctrl+O">Open…</item>
-        <item id="save" shortcut="Ctrl+S">Save…</item>
-        <item id="export">Export CSV…</item>
-        <item id="quit" shortcut="Ctrl+Q">Quit</item>
-    </menu>
-    <menu name="Batch">
-        <item id="new" shortcut="Ctrl+N">New Batch…</item>
-    </menu>
-    <menu name="Log">
-        <item id="clear" shortcut="Ctrl+L">Clear Log</item>
-        <separator />
-        <item id="ms">Millisecond View</item>
-        <item id="1s">1 Second View</item>
-        <item id="5s">5 Second View</item>
-        <item id="10s">10 Second View</item>
-        <item id="15s">15 Second View</item>
-        <item id="30s">30 Second View</item>
-        <item id="1m">1 Minute View</item>
-        <separator />
-        <item id="manual" shortcut="Ctrl+E">Manual Entry</item>
-    </menu>
-    <program>
-        lc = 1;
-        this.restoreSizeAndPosition('window');
-        var vsplit = findChildObject(this, 'main');
-        vsplit.restoreState("script/mainSplitter");
-        var isplit = findChildObject(this, 'indicators');
-        isplit.restoreState("script/instrumentSplitter");
-        var lsplit = findChildObject(this, 'logsplit');
-        lsplit.restoreState("script/logSplitter");
-        var log = findChildObject(this, 'log');
-        this.show();
-        log.restoreState("script/log", 7);
-        var window = this;
-        this.aboutToClose.connect(function() {
-            window.saveSizeAndPosition("window");
-            vsplit.saveState("script/mainSplitter");
-            isplit.saveState("script/instrumentSplitter");
-            lsplit.saveState("script/logSplitter");
-            log.saveState("script/log", 7);
-            loggingWindow = undefined;
-        });
-        vsplit.restoreState("script/mainSplitter");
-        isplit.restoreState("script/instrumentSplitter");
-        lsplit.restoreState("script/logSplitter");
-        var device = new DAQ('Dev1');
-        var bchannel = device.newChannel(DAQ.Fahrenheit, DAQ.TypeJ);
-        var achannel = device.newChannel(DAQ.Fahrenheit, DAQ.TypeJ);
-        device.setClockRate(2.0);
-        device.start();
-        beanDisplay = findChildObject(this, 'beans');
-        envDisplay = findChildObject(this, 'environment');
-        bchannel.newData.connect(beanDisplay.setValue);
-        achannel.newData.connect(envDisplay.setValue);
-        var epoch = new QTime;
-        epoch = epoch.currentTime;
-        var boffset = new MeasurementTimeOffset(epoch);
-        var aoffset = new MeasurementTimeOffset(epoch);
-        badapt = new MeasurementAdapter(1);
-        aadapt = new MeasurementAdapter(2);
-        bzero = new ZeroEmitter(1);
-        azero = new ZeroEmitter(2);
-        bchannel.newData.connect(boffset.newMeasurement);
-        achannel.newData.connect(aoffset.newMeasurement);
-        boffset.measurement.connect(badapt.newMeasurement);
-        aoffset.measurement.connect(aadapt.newMeasurement);
-        bchannel.newData.connect(bzero.newMeasurement);
-        achannel.newData.connect(azero.newMeasurement);
-        var graph = findChildObject(this, 'graph');
-        bzero.measurement.connect(log.newMeasurement);
-        bzero.measurement.connect(graph.newMeasurement);
-        azero.measurement.connect(log.newMeasurement);
-        azero.measurement.connect(graph.newMeasurement);
-        var timer = findChildObject(this, 'batch');
-        timer.autoReset = true;
-        var start = findChildObject(this, 'startbutton');
-        start.clicked.connect(function() {
-            var epoch = new QTime();
-            epoch = epoch.currentTime();
-            timer.startTimer();
-            boffset.setZeroTime(epoch);
-            aoffset.setZeroTime(epoch);
-            bzero.emitZero();
-            azero.emitZero();
-            aadapt.measurement.connect(log.newMeasurement);
-            aadapt.measurement.connect(graph.newMeasurement);
-            badapt.measurement.connect(log.newMeasurement);
-            badapt.measurement.connect(graph.newMeasurement);
-            if(typeof(currentBatchInfo) == 'undefined') { } else {
-                var query = new QSqlQuery();
-                query.exec("SELECT now()::timestamp without time zone");
-                query.next();
-                var result = query.value(0);
-                var timefield = findChildObject(currentBatchInfo, 'time');
-                timefield.text = result.replace('T', ' ');
-            }
-        });
-        start.setFocus();
-        var spin = findChildObject(this, 'manometer');
-        spin.annotation.connect(log.newAnnotation);
-        var stop = findChildObject(this, 'stopbutton');
-        stop.annotation.connect(log.newAnnotation);
-        stop.clicked.connect(timer.stopTimer);
-        stop.clicked.connect(function() {
-            badapt.measurement.disconnect(log.newMeasurement);
-            badapt.measurement.disconnect(graph.newMeasurement);
-            aadapt.measurement.disconnect(log.newMeasurement);
-            aadapt.measurement.disconnect(graph.newMeasurement);
-            spin.resetChange();
-            if(typeof(currentBatchInfo) == 'undefined') { } else {
-                var duration = log.lastTime(lc);
-                var durfield = findChildObject(currentBatchInfo, 'duration');
-                durfield.text = duration;
-                log.clearOutputColumns();
-                log.addOutputTemperatureColumn(lc);
-                log.addOutputTemperatureColumn(lc + 1);
-                log.addOutputAnnotationColumn(lc + 2);
-                var filename = log.saveTemporary();
-                currentBatchInfo.tempData = filename;
-                currentBatchInfo.raise();
-                currentBatchInfo.activateWindow();
-            }
-        });
-        var sample = findChildObject(this, 'sample');
-        sample.annotation.connect(log.newAnnotation);
-        var openMenu = findChildObject(this, 'open');
-        var window = this;
-        openMenu.triggered.connect(function() {
-            var filename = QFileDialog.getOpenFileName(window, 'Open Log…', QSettings.value('script/lastDir', '') + '/');
-            if(filename != '') {
-                var file = new QFile(filename);
-                var input = new XMLInput(file, 1);
-                input.newTemperatureColumn.connect(log.setHeaderData);
-                input.newAnnotationColumn.connect(log.setHeaderData);
-                input.measure.connect(graph.newMeasurement);
-                input.measure.connect(log.newMeasurement);
-                input.annotation.connect(log.newAnnotation);
-                input.lastColumn.connect(function(c) {
-                    lc = c + 1;
-                    badapt.setColumn(c + 1);
-                    aadapt.setColumn(c + 2);
-                    bzero.setColumn(c + 1);
-                    azero.setColumn(c + 2);
-                    stop.setTemperatureColumn(c + 1);
-                    stop.setAnnotationColumn(c + 3);
-                    sample.setTemperatureColumn(c + 1);
-                    sample.setAnnotationColumn(c + 3);
-                    spin.setTemperatureColumn(c + 1);
-                    spin.setAnnotationColumn(c + 3);
-                    log.setHeaderData(c + 1, "Bean");
-                    log.setHeaderData(c + 2, "Air");
-                    log.setHeaderData(c + 3, "Note");
-                });
-                input.input();
-                window.windowTitle = 'Typica - ' + baseName(filename);
-                QSettings.setValue("script/lastDir", dir(filename));
-            }
-        });
-        var quitMenu = findChildObject(this, 'quit');
-        quitMenu.triggered.connect(function() {
-            window.close();
-            Application.quit();
-        });
-        var saveMenu = findChildObject(this, 'save');
-        saveMenu.triggered.connect(function() {
-            var filename = QFileDialog.getSaveFileName(window, "Save Log As…", QSettings.value("script/lastDir", "") + "/");
-            if(filename != "") {
-                var file = new QFile(filename);
-                log.clearOutputColumns();
-                log.addOutputTemperatureColumn(lc);
-                log.addOutputTemperatureColumn(lc + 1);
-                log.addOutputAnnotationColumn(lc + 2);
-                log.saveXML(file);
-                QSettings.setValue("script/lastDir", dir(filename));
-            }
-        });
-        var exportMenu = findChildObject(this, 'export');
-        exportMenu.triggered.connect(function() {
-            var filename = QFileDialog.getSaveFileName(window, "Export CSV As…", QSettings.value("script/lastDir", "") + "/");
-            if(filename != "") {
-                var file = new QFile(filename);
-                log.clearOutputColumns();
-                log.addOutputTemperatureColumn(lc);
-                log.addOutputTemperatureColumn(lc + 1);
-                log.addOutputAnnotationColumn(lc + 2);
-                log.saveCSV(file);
-                QSettings.setValue("script/lastDir", dir(filename));
-            }
-        });
-        var clear = findChildObject(this, 'clear');
-        clear.triggered.connect(log.clear);
-        clear.triggered.connect(graph.clear);
-        clear.triggered.connect(function() {
-            window.windowTitle = "Typica";
-            log.setHeaderData(0, "Time");
-            log.setHeaderData(1, "Bean");
-            log.setHeaderData(2, "Air");
-            log.setHeaderData(3, "Note");
-            log.setHeaderData(4, "");
-            log.setHeaderData(5, "");
-            log.setHeaderData(6, "");
-            lc = 1;
-            badapt.setColumn(1);
-            aadapt.setColumn(2);
-            bzero.setColumn(1);
-            azero.setColumn(2);
-            stop.setTemperatureColumn(1);
-            stop.setAnnotationColumn(3);
-            sample.setTemperatureColumn(1);
-            sample.setAnnotationColumn(3);
-            spin.setTemperatureColumn(1);
-            spin.setAnnotationColumn(3);
-        });
-        var v1 = findChildObject(this, 'ms');
-        v1.triggered.connect(log.LOD_ms);
-        var v2 = findChildObject(this, '1s');
-        v2.triggered.connect(log.LOD_1s);
-        var v3 = findChildObject(this, '5s');
-        v3.triggered.connect(log.LOD_5s);
-        var v4 = findChildObject(this, '10s');
-        v4.triggered.connect(log.LOD_10s);
-        var v5 = findChildObject(this, '15s');
-        v5.triggered.connect(log.LOD_15s);
-        var v6 = findChildObject(this, '30s');
-        v6.triggered.connect(log.LOD_30s);
-        var v7 = findChildObject(this, '1m');
-        v7.triggered.connect(log.LOD_1m);
-        var manual = findChildObject(this, 'manual');
-        manual.triggered.connect(function() {
-            var entry = new LogEditWindow();
-            entry.show();
-        });
-        var newMenu = findChildObject(this, 'new');
-        newMenu.triggered.connect(function() {
-            var bwindow = createWindow("batchWindow");
-            bwindow.windowTitle = "Typica - New Batch";
-        });
-    </program>
-</window>

config/Windows/greeninventory.xml

@@ -1,109 +1,96 @@
 <window id="inventory">
     <layout type="vertical">
+        <layout type="horizontal">
+            <label>Transaction type: </label>
+            <sqldrop id="transactiontype" />
+            <stretch />
+        </layout>
         <layout type="horizontal">
             <sqldrop data="0" display="1" showdata="true" id="item">
                 <query><![CDATA[SELECT id, name FROM coffees WHERE quantity <> 0 ORDER BY name ASC]]></query>
             </sqldrop>
             <line id="quantity" />
             <sqldrop id="units" />
+            <layout type="stack" id="optional">
+                <page />
+                <page>    
+                    <layout type="horizontal">
+                        <label id="reasonlabel">Reason: </label>
+                        <line id="reason" />
+                    </layout>
+                </page>
+            </layout>
+        </layout>
+        <layout type="horizontal">
             <button type="push" name="Update" id="update" />
+            <stretch />
         </layout>
         <textarea id="current" />
     </layout>
     <program>
         <![CDATA[
-			var units = findChildObject(this, 'units');
-			units.addItem("bag");
-			units.addItem("lb");
-			units.addItem("kg");
-			var items = findChildObject(this, 'item');
-			var status = findChildObject(this, 'current');
-			var q = "SELECT quantity FROM items WHERE id = ";
-			q = q + items.currentData();
-			query = new QSqlQuery();
-			query.exec(q);
-			query.next();
-			var text = items.currentText;
-			text = text + " Current inventory: ";
-			text = text + query.value(0);
-			text = text + " pounds ("
-			text = text + Number(query.value(0)) / 2.2;
-			text = text + " Kg (";
-			q = "SELECT ";
-			q = q + query.value(0);
-			q = q + " / (SELECT conversion FROM lb_bag_conversion WHERE item = ";
-			q = q + items.currentData();
-			q = q + ")";
-			query.exec(q);
-			query.next();
-			text = text + query.value(0);
-			text = text + " bags)";
-            query = query.invalidate();
-			status.plainText = text;
-			var button = findChildObject(this, 'update');
-			var value = findChildObject(this, 'quantity');
-			button.clicked.connect(function() {
-				q = "INSERT INTO inventory (time, item, quantity) VALUES ('now', ";
-				q = q + items.currentData();
-				q = q + ", ";
-				if(units.currentText == "lb") {
-					q = q + value.text;
-				} else if (units.currentText == "kg") {
-					q = q + (value.text * 2.2);
-				}
-				else {
-					q = q + value.text;
-					q = q + " * (SELECT conversion FROM lb_bag_conversion WHERE item = ";
-					q = q + items.currentData();
-					q = q + ")";
-				}
-				q = q + ")";
+            var types = findChildObject(this, 'transactiontype');
+            types.addItem(TTR("inventory", "inventory"));
+            types.addItem(TTR("inventory", "loss"));
+            var optionalDisplay = findChildObject(this, 'optional');
+            var units = findChildObject(this, 'units');
+            units.addItem(TTR("inventory", "bag"));
+            units.addItem(TTR("inventory", "Lb"));
+            units.addItem(TTR("inventory", "Kg"));
+            var items = findChildObject(this, 'item');
+            var status = findChildObject(this, 'current');
+            function updateStatus() {
                 query = new QSqlQuery();
-				query.exec(q);
-				text = items.currentText;
-				q = "SELECT quantity FROM items WHERE id = ";
-				q = q + items.currentData();
-				query.exec(q);
-				query.next();
-				text = text + " Current inventory: ";
-				text = text + query.value(0);
-				text = text + " pounds (";
-				q = "SELECT ";
-				q = q + query.value(0);
-				q = q + " / (SELECT conversion FROM lb_bag_conversion WHERE item = ";
-				q = q + items.currentData();
-				q = q + ")";
-				query.exec(q);
-				query.next();
-				text = text + query.value(0);
-				text = text + " bags)";
-				status.plainText = text;
+                query.prepare("SELECT quantity, (quantity / 2.2)::numeric(12,3), (quantity / (SELECT conversion FROM lb_bag_conversion WHERE item = :id1))::numeric(12,2) FROM items WHERE id = :id2");
+                query.bind(":id1", items.currentData());
+                query.bind(":id2", items.currentData());
+                query.exec();
+                query.next();
+                var text = items.currentText;
+                text += " Current inventory: ";
+                text += query.value(0);
+                text += TTR("inventory", " Lb (");
+                text += query.value(1);
+                text += TTR("inventory", " Kg), ");
+                text += query.value(2);
+                text += (query.value(2) == "1" ? TTR("inventory", " bag") :
+                    TTR("inventory", " bags"));
                 query = query.invalidate();
-			});
-			items['currentIndexChanged(int)'].connect(function() {
-				q = "SELECT quantity FROM items WHERE id = ";
-				q = q + items.currentData();
+                status.plainText = text;
+            }
+            var button = findChildObject(this, 'update');
+            var value = findChildObject(this, 'quantity');
+            var reason = findChildObject(this, 'reason');
+            var reasonlabel = findChildObject(this, 'reasonlabel');
+            button.clicked.connect(function() {
+                q = "INSERT INTO ";
+                q += (types.currentIndex == 0 ?
+                    "inventory (time, item, quantity)" :
+                    "loss (time, item, quantity, reason)");
+                q += " VALUES ('now', ";
+                q = q + items.currentData();
+                q = q + ", ";
+                if(units.currentText == TTR("inventory", "Lb")) {
+                    q = q + value.text;
+                } else if (units.currentText == TTR("inventory", "Kg")) {
+                    q = q + (value.text * 2.2);
+                }
+                else {
+                    q = q + value.text;
+                    q = q + " * (SELECT conversion FROM lb_bag_conversion WHERE item = ";
+                    q = q + items.currentData();
+                    q = q + ")";
+                }
+                q += (types.currentIndex == 0 ?
+                    ")" :
+                    ", '" + reason.text + "')");
                 query = new QSqlQuery();
-				query.exec(q);
-				query.next();
-				var text = items.currentText;
-				text = text + " Current inventory: ";
-				text = text + query.value(0);
-				text = text + " pounds ";
-				text = text + Number(query.value(0)) / 2.2;
-				text = text + " Kg (";
-				q = "SELECT ";
-				q = q + query.value(0);
-				q = q + " / (SELECT conversion FROM lb_bag_conversion WHERE item = ";
-				q = q + items.currentData();
-				q = q + ")";
-				query.exec(q);
-				query.next();
-				text = text + query.value(0);
-				text = text + " bags)";
-				status.plainText = text;
-                query = query.invalidate();
-			});
+                query.exec(q);
+                updateStatus();
+            });
+            items['currentIndexChanged(int)'].connect(updateStatus);
+            types['currentIndexChanged(int)'].connect(optionalDisplay.setCurrentIndex);
+            updateStatus();
         ]]>
     </program>
 </window>

config/Windows/greensales.xml

@@ -21,13 +21,13 @@
 	<program>
 		<![CDATA[
 			var window = this;
-			this.windowTitle = 'Typica - Enter Green Coffee Sales';
+			this.windowTitle = TTR("greensales", "Typica - Enter Green Coffee Sales");
 			var unitBox = findChildObject(this, 'units');
 			unitBox.addItem("g");
 			unitBox.addItem("Kg");
 			unitBox.addItem("oz");
-			unitBox.addItem("lb");
-			unitBox.currentIndex = (QSettings.value("script/greensales_unit", unitBox.findText("lb")));
+			unitBox.addItem("Lb");
+			unitBox.currentIndex = (QSettings.value("script/greensales_unit", unitBox.findText("Lb")));
 			unitBox['currentIndexChanged(int)'].connect(function() {
 				QSettings.setValue("script/greensales_unit", unitBox.currentIndex);
 			});

config/Windows/history.xml

@@ -1,47 +0,0 @@
-<window id="history">
-    <layout type="vertical">
-		<layout type="horizontal">
-			<daterange id="dates" initial="6" /><!-- Last 7 Days -->
-			<stretch />
-		</layout>
-        <sqlview id="table" />
-    </layout>
-    <program>
-        <![CDATA[
-			var dateSelect = findChildObject(this, 'dates');
-			var dateQuery = new QSqlQuery();
-			dateQuery.exec("SELECT time::date FROM roasting_log WHERE time = (SELECT min(time) FROM roasting_log) OR time = (SELECT max(time) FROM roasting_log) ORDER BY time ASC");
-			dateQuery.next();
-			var lifetimeStartDate = dateQuery.value(0);
-			var lifetimeEndDate;
-			if(dateQuery.next()) {
-				lifetimeEndDate = dateQuery.value(0);
-			} else {
-				lifetimeEndDate = lifetimeStartDate;
-			}
-			dateSelect.setLifetimeRange(lifetimeStartDate, lifetimeEndDate);
-			dateQuery.invalidate();
-			dateSelect.currentIndex = QSettings.value("script/history/dateIndex", 6);
-			var table = findChildObject(this, 'table');
-			table.openEntryRow.connect(function(arg) {
-				var details = createWindow("batchDetails");
-				details.loadData(table, arg);
-			});
-			function refresh() {
-				var dateRange = dateSelect.currentRange();
-				var startDate = "'"+dateRange[0]+"'";
-				var endDate = "'"+dateRange[dateRange.length - 1]+"'";
-				var q = "SELECT time, machine, (SELECT name FROM items WHERE id = roasted_id) AS name, unroasted_total_quantity AS green, roasted_quantity AS roasted, CASE WHEN unroasted_total_quantity = 0 THEN NULL ELSE ((unroasted_total_quantity - roasted_quantity) / unroasted_total_quantity * 100::numeric)::numeric(12,2) END AS weight_loss, duration, annotation FROM roasting_log WHERE time >= " + startDate + "::date AND time < " + endDate + "::date + interval '1 day' ORDER BY time DESC";
-				table.setQuery(q);
-				table.hideColumn(1);
-			}
-			dateSelect.rangeUpdated.connect(function() {
-				if(dateSelect.currentIndex != 24) { // Custom date range
-					QSettings.setValue("script/history/dateIndex", dateSelect.currentIndex);
-				}
-				refresh();
-			});
-			refresh();
-        ]]>
-    </program>
-</window>

config/Windows/importprofiles.xml

@@ -10,7 +10,7 @@
         var box = findChildObject(this, 'roasted');
         var win = this;
         button.clicked.connect(function() {
-            var filename = QFileDialog.getOpenFileName(win, 'Open Log…', QSettings.value('script/lastDir', '') + '/');
+            var filename = QFileDialog.getOpenFileName(win, TTR("importTargets", "Open Log..."), QSettings.value('script/lastDir', '') + '/');
             if(filename != '') {
                 QSettings.setValue("script/lastDir", dir(filename));
                 var q = "INSERT INTO files (id, name, type, note, file) VALUES(default, :name, 'profile', NULL, :data) RETURNING id";

config/Windows/invoiceinfo.xml

@@ -14,10 +14,12 @@
 	<program>
 		<![CDATA[
 			var window = this;
+                        var invoiceID = 0;
 			var table = findChildObject(this, 'itemtable');
 			this.setInvoiceID = function(arg) {
 				window.invoiceID = arg;
-				window.windowTitle = "Typica - Invoice Details " + arg;
+                                invoiceID = arg;
+				window.windowTitle = TTR("invoiceinfo", "Typica - Invoice Details ") + arg;
 			};
 			button = findChildObject(this, 'edit');
 			button.clicked.connect(function() {
@@ -43,6 +45,7 @@
 					for(var i = 0; i < 8; i++) {
 						feeWindow.rowData[i] = table.data(arg, i);
 					}
+                                        feeWindow.invoiceID = invoiceID;
 					feeWindow.dataSet();
 				}
 			});

config/Windows/invoicelist.xml

@@ -1,28 +0,0 @@
-<window id="invoicelist">
-	<layout type="vertical">
-		<sqlview id="table" />
-	</layout>
-	<program>
-		<![CDATA[
-			this.windowTitle = "Typica - Invoice List";
-			var table = findChildObject(this, 'table');
-			table.setQuery("SELECT id, time, invoice, vendor, (SELECT sum(cost) FROM invoice_items WHERE invoice_id = id) AS cost FROM invoices ORDER BY time DESC");
-			table.openEntry.connect(function(arg) {
-				var info = createWindow("invoiceinfo");
-				info.setInvoiceID(arg);
-				var query = new QSqlQuery();
-				query.exec("SELECT time, invoice, vendor FROM invoices WHERE id = " + arg);
-				query.next();
-				var timefield = findChildObject(info, 'date');
-				timefield.text = query.value(0);
-				var vendorfield = findChildObject(info, 'vendor');
-				vendorfield.text = query.value(2);
-				var invoicefield = findChildObject(info, 'invoice');
-				invoicefield.text = query.value(1);
-				var itemtable = findChildObject(info, 'itemtable');
-				itemtable.setQuery("SELECT record_type, item_id, description, (SELECT reference FROM items WHERE id = item_id) AS reference, (SELECT cost FROM purchase WHERE item = item_id) AS unit_cost, (SELECT quantity FROM purchase WHERE item = item_id) AS quantity, ((SELECT quantity FROM purchase WHERE item = item_id)/(SELECT conversion FROM lb_bag_conversion WHERE item = item_id))::numeric(12,2) AS sacks, cost FROM invoice_items WHERE invoice_id = " + arg + " AND record_type = 'PURCHASE' UNION SELECT record_type, NULL, description, NULL, NULL, NULL, NULL, cost FROM invoice_items WHERE invoice_id = " + arg + " AND record_type = 'FEE' ORDER BY item_id");
-				query = query.invalidate();
-			});
-		]]>
-	</program>
-</window>

config/Windows/navigation.xml

@@ -1,114 +1,100 @@
 <window id="navwindow">
-	<layout type="grid">
-		<row>
-			<column>
-				<button name="Configure Roasters" id="configure" type="push" />
-			</column>
-		</row>
-		<row>
-			<column>
-				<sqldrop id="machineselector" />
-			</column>
-			<column>
-				<button name="Roast Coffee" id="roast" type="push" />
-			</column>
-		</row>
-		<row>
-			<column>
-				<button name="Purchase Green Coffee" id="green" type="push" />
-			</column>
-		</row>
-		<row>
-			<column>
-				<button name="Manage Roasted Coffee Items" id="newroasted" type="push" />
-			</column>
-		</row>
-		<row>
-			<column>
-				<button name="Update Inventory" id="inventory" type="push" />
-			</column>
-		</row>
-		<row>
-			<column>
-				<button name="Batch Log" id="history" type="push" />
-			</column>
-		</row>
-		<row>
-			<column>
-				<button name="New Cupping Session" id="createcupping"
-type="push" />
-			</column>
-		</row>
-		<row>
-			<column>
-				<button name="Join Cupping Session" id="joincupping" type="push"
-/>
-			</column>
-		</row>
-		<row>
-			<column>
-				<button name="Summarize Cupping Session" id="sumcupping"
-type="push" />
-			</column>
-		</row>
-		<row>
-			<column>
-				<button name="View Target Roast Profiles" id="profilehistory"
-					type="push" />
-			</column>
-		</row>
-		<row>
-			<column>
-				<button name="Import Target Roast Profiles" id="target"
-type="push" />
-			</column>
-		</row>
-		<row>
-			<column>
-				<button name="Invoice List" id="invoicelist" type="push" />
-			</column>
-		</row>
-		<row>
-			<column>
-				<button name="Enter Green Coffee Sales" id="greensales" type="push" />
-			</column>
-		</row>
-	</layout>
+    <layout type="grid">
+        <row>
+            <column>
+                <button name="Configure Roasters" id="configure" type="push" />
+            </column>
+        </row>
+        <row>
+            <column>
+                <sqldrop id="machineselector" />
+            </column>
+            <column>
+                <button name="Roast Coffee" id="roast" type="push" />
+            </column>
+        </row>
+        <row>
+            <column>
+                <button name="Purchase Green Coffee" id="green" type="push" />
+            </column>
+        </row>
+        <row>
+            <column>
+                <button name="Manage Roasted Coffee Items" id="newroasted" type="push" />
+            </column>
+        </row>
+        <row>
+            <column>
+                <button name="Edit Roasting Specification" id="roastspec" type="push" />
+            </column>
+        </row>
+        <row>
+            <column>
+                <button name="Update Inventory" id="inventory" type="push" />
+            </column>
+        </row>
+        <row>
+            <column>
+                <button name="New Cupping Session" id="createcupping" type="push" />
+            </column>
+        </row>
+        <row>
+            <column>
+                <button name="Join Cupping Session" id="joincupping" type="push" />
+            </column>
+        </row>
+        <row>
+            <column>
+                <button name="Summarize Cupping Session" id="sumcupping" type="push" />
+            </column>
+        </row>
+        <row>
+            <column>
+                <button name="View Target Roast Profiles" id="profilehistory" type="push" />
+            </column>
+        </row>
+        <row>
+            <column>
+                <button name="Import Target Roast Profiles" id="target" type="push" />
+            </column>
+        </row>
+        <row>
+            <column>
+                <button name="Enter Green Coffee Sales" id="greensales" type="push" />
+            </column>
+        </row>
+    </layout>
     <menu name="Reports" type="reports" src="Reports" />
-	<menu name="Database">
-		<item id="resetconnection">Forget Connection Details</item>
-	</menu>
+    <menu name="Database">
+        <item id="resetconnection">Forget Connection Details</item>
+    </menu>
     <program>
-		var window = this;
-		var navigationwindow = window;
-		window.loggingWindow = undefined;
-		var roasterlist = findChildObject(this, 'machineselector');
-		var model = new DeviceTreeModel;
-		roasterlist.setModel(model);
-		roasterlist.currentIndex = QSettings.value("machineSelection", 0);
-		roasterlist['currentIndexChanged(int)'].connect(function() {
-			QSettings.setValue("machineSelection", roasterlist.currentIndex);
-		});
-		var resetdbconnection = findChildObject(this, 'resetconnection');
-		resetdbconnection.triggered.connect(function() {
-			QSettings.setValue("database/exists", false);
-			QSettings.setValue("database/hostname", "");
-			QSettings.setValue("database/dbname", "");
-			QSettings.setValue("database/user", "");
-			QSettings.setValue("database/password", "");
-		});
-		var profilehistory = findChildObject(this, 'profilehistory');
-		profilehistory.clicked.connect(function() {
-			createWindow("profilehistory");
-		});
-		var greensalesbutton = findChildObject(this, 'greensales');
-		greensalesbutton.clicked.connect(function() {
-			createWindow("greensales");
-		});
-		var invoicesbutton = findChildObject(this, 'invoicelist');
-		invoicesbutton.clicked.connect(function() {
-			createWindow("invoicelist");
-		});
+        var window = this;
+        var navigationwindow = window;
+        window.loggingWindow = undefined;
+        var roasterlist = findChildObject(this, 'machineselector');
+        var model = new DeviceTreeModel;
+        roasterlist.setModel(model);
+        roasterlist.currentIndex = QSettings.value("machineSelection", 0);
+        roasterlist['currentIndexChanged(int)'].connect(function() {
+            QSettings.setValue("machineSelection", roasterlist.currentIndex);
+        });
+        var resetdbconnection = findChildObject(this, 'resetconnection');
+        resetdbconnection.triggered.connect(function() {
+            QSettings.setValue("database/exists", false);
+            QSettings.setValue("database/hostname", "");
+            QSettings.setValue("database/dbname", "");
+            QSettings.setValue("database/user", "");
+            QSettings.setValue("database/password", "");
+        });
+        var profilehistory = findChildObject(this, 'profilehistory');
+        profilehistory.clicked.connect(function() {
+                createWindow("profilehistory");
+        });
+        var greensalesbutton = findChildObject(this, 'greensales');
+        greensalesbutton.clicked.connect(function() {
+                createWindow("greensales");
+        });
         var sumcup = findChildObject(this, 'sumcupping');
         sumcup.clicked.connect(function() {
             var sessionlist = createWindow("finsessionlist");
@@ -136,10 +122,9 @@ type="push" />
             var invwin = createWindow("inventory");
             invwin.windowTitle = "Typica - Inventory";
         });
-        var history = findChildObject(this, 'history');
-        history.clicked.connect(function() {
-            var histwindow = createWindow("history");
-            histwindow.windowTitle = "Typica - Batch Log";
+        var roastspecbutton = findChildObject(this, 'roastspec');
+        roastspecbutton.clicked.connect(function() {
+            var specwindow = createWindow("roastspec");
         });
         var gbutton = findChildObject(this, 'green');
         gbutton.clicked.connect(function() {
@@ -161,82 +146,81 @@ type="push" />
             {
                 window.loggingWindow = createWindow("basicWindow");
                 window.loggingWindow.windowTitle = "Typica [*]";
-				window.loggingWindow.navigationWindow = window;
+                window.loggingWindow.navigationWindow = window;
             }
             else
             {
-				print(window.loggingWindow);
                 window.loggingWindow.raise();
                 window.loggingWindow.activateWindow();
             }
         });
-		var configurebutton = findChildObject(this, 'configure');
-		configurebutton.clicked.connect(function() {
-			var confwindow = new SettingsWindow;
-			confwindow.show();
-		});
+        var configurebutton = findChildObject(this, 'configure');
+        configurebutton.clicked.connect(function() {
+            var confwindow = new SettingsWindow;
+            confwindow.show();
+        });
         <![CDATA[
-		var DBCreateBase = function() {
-			var query = new QSqlQuery();
-            query.exec("CREATE TABLE IF NOT EXISTS certifications (item bigint NOT NULL, certification text NOT NULL)");
-            query.exec("CREATE TABLE IF NOT EXISTS cupping_samples (session bigint NOT NULL, sample text NOT NULL, position bigint NOT NULL, type text NOT NULL, \"time\" timestamp without time zone, machine bigint, point text, item bigint)");
-            query.exec("CREATE TABLE cupping_sessions (id bigserial NOT NULL, event text, name text NOT NULL, \"time\" timestamp without time zone NOT NULL, blind boolean NOT NULL, open boolean NOT NULL, note text)");
-            query.exec("CREATE TABLE IF NOT EXISTS cuppingforms (session bigint NOT NULL, sample text NOT NULL, position bigint NOT NULL, grader text, finalscore numeric, notes text, serialization text)");
-            query.exec("CREATE TABLE IF NOT EXISTS cuppingform_t1 (aroma numeric, flavor numeric, aftertaste numeric, acidity numeric, body numeric, uniformity numeric, balance numeric, cleancup numeric, sweetness numeric, overall numeric, total numeric) INHERITS (cuppingforms)");
-            query.exec("CREATE TABLE IF NOT EXISTS invoices (id bigserial PRIMARY KEY NOT NULL, invoice text, vendor text NOT NULL, \"time\" timestamp without time zone NOT NULL)");
-            query.exec("CREATE TABLE IF NOT EXISTS invoice_items (invoice_id bigint NOT NULL, record_type text NOT NULL, item_id bigint, description text NOT NULL, cost numeric NOT NULL)");
-			query.exec("CREATE TABLE IF NOT EXISTS transactions (\"time\" timestamp without time zone NOT NULL, item bigint NOT NULL)");
-			query.exec("CREATE TABLE IF NOT EXISTS inventory (quantity numeric NOT NULL) INHERITS (transactions)");
-			query.exec("CREATE TABLE IF NOT EXISTS loss (quantity numeric NOT NULL, reason text) INHERITS (transactions)");
-			query.exec("CREATE TABLE IF NOT EXISTS make (quantity numeric NOT NULL) INHERITS (transactions)");
-			query.exec("CREATE TABLE IF NOT EXISTS purchase (quantity numeric NOT NULL, cost numeric NOT NULL, vendor text NOT NULL) INHERITS (transactions)");
-			query.exec("CREATE TABLE IF NOT EXISTS sale (quantity numeric NOT NULL, customer text) INHERITS (transactions)");
-			query.exec("CREATE TABLE IF NOT EXISTS use (quantity numeric NOT NULL) INHERITS (transactions)");
-			query.exec("CREATE VIEW all_transactions AS ((((SELECT purchase.\"time\", purchase.item, purchase.quantity, purchase.cost, purchase.vendor, NULL::unknown AS reason, NULL::unknown AS customer, 'PURCHASE' AS type FROM purchase UNION SELECT use.\"time\", use.item, use.quantity, NULL::unknown AS cost, NULL::unknown AS vendor, NULL::unknown AS reason, NULL::unknown AS customer, 'USE' AS type FROM use) UNION SELECT inventory.\"time\", inventory.item, inventory.quantity, NULL::unknown AS cost, NULL::unknown AS vendor, NULL::unknown AS reason, NULL::unknown AS customer, 'INVENTORY' AS type FROM inventory) UNION SELECT loss.\"time\", loss.item, loss.quantity, NULL::unknown AS cost, NULL::unknown AS vendor, loss.reason, NULL::unknown AS customer, 'LOSS' AS type FROM loss) UNION SELECT make.\"time\", make.item, make.quantity, NULL::unknown AS cost, NULL::unknown AS vendor, NULL::unknown AS reason, NULL::unknown AS customer, 'MAKE' AS type FROM make) UNION SELECT sale.\"time\", sale.item, sale.quantity, NULL::unknown AS cost, NULL::unknown AS vendor, NULL::unknown AS reason, sale.customer, 'SALE' AS type FROM sale");
-			query.exec("CREATE FUNCTION time_range(bigint) RETURNS integer AS $$ BEGIN IF (SELECT quantity FROM items WHERE id = $1) > 0 THEN RETURN (SELECT current_date - min(time)::date + 1 FROM use WHERE item = $1); ELSE RETURN (SELECT max(time)::date - min(time)::date + 1 FROM use WHERE item = $1); END IF; END; $$ LANGUAGE plpgsql STRICT");
-			query.exec("CREATE TABLE IF NOT EXISTS items(id bigint NOT NULL, name text NOT NULL, reference text, unit text NOT NULL, quantity numeric DEFAULT 0, category text)");
-			query.exec("CREATE SEQUENCE items_id_seq INCREMENT BY 1 NO MAXVALUE NO MINVALUE CACHE 1");
-			query.exec("CREATE TABLE IF NOT EXISTS coffees(origin text NOT NULL, region text, producer text, grade text, milling text, drying text) INHERITS (items)");
-			query.exec("CREATE VIEW coffee_history AS SELECT coffees.id, coffees.name, coffees.origin, coffees.quantity AS stock, (SELECT sum(use.quantity) AS sum FROM use WHERE (use.item = coffees.id)) AS used, time_range(coffees.id) AS \"interval\", ((SELECT (sum(use.quantity) / (time_range(use.item))::numeric) FROM use WHERE (use.item = coffees.id) GROUP BY use.item))::numeric(10,2) AS rate, (SELECT (('now'::text)::date + ((coffees.quantity / (SELECT (sum(use.quantity) / (time_range(use.item))::numeric) FROM use WHERE (use.item = coffees.id) GROUP BY use.item)))::integer)) AS \"out\" FROM coffees WHERE (coffees.id IN (SELECT use.item FROM use)) ORDER BY coffees.origin");
-			query.exec("CREATE TABLE IF NOT EXISTS current_items (item bigint NOT NULL)");
-			query.exec("CREATE TABLE IF NOT EXISTS decaf_coffees (decaf_method text NOT NULL) INHERITS (coffees)");
-			query.exec("CREATE TABLE IF NOT EXISTS files (id bigint NOT NULL, name text NOT NULL, type text NOT NULL, note text, file bytea NOT NULL)");
-			query.exec("CREATE TABLE IF NOT EXISTS item_files(\"time\" timestamp without time zone NOT NULL, item bigint NOT NULL, files bigint[] NOT NULL)");
-			query.exec("CREATE TYPE item_transaction_with_balance AS (\"time\" timestamp without time zone, item bigint, quantity numeric, cost numeric, vendor text, reason text, customer text, type text, balance numeric)");
-			query.exec("CREATE TABLE IF NOT EXISTS lb_bag_conversion (item bigint NOT NULL, conversion numeric NOT NULL)");
-			query.exec("CREATE TABLE IF NOT EXISTS machine (id bigint NOT NULL, name text NOT NULL)");
-			query.exec("CREATE VIEW regular_coffees AS SELECT coffees.id, coffees.name, coffees.reference, coffees.unit, coffees.quantity, coffees.category, coffees.origin, coffees.region, coffees.producer, coffees.grade, coffees.milling, coffees.drying FROM coffees WHERE (NOT (coffees.id IN (SELECT decaf_coffees.id FROM decaf_coffees)))");
-			query.exec("CREATE TABLE IF NOT EXISTS roasting_log (\"time\" timestamp without time zone NOT NULL, unroasted_id bigint[], unroasted_quantity numeric[], unroasted_total_quantity numeric, roasted_id bigint, roasted_quantity numeric, transaction_type text NOT NULL, annotation text, machine bigint NOT NULL, duration interval, approval boolean, humidity numeric, barometric numeric, indoor_air numeric, outdoor_air numeric, files bigint[])");
-			query.exec("CREATE VIEW short_log AS SELECT roasting_log.\"time\", (SELECT items.name FROM items WHERE (items.id = roasting_log.roasted_id)) AS name, roasting_log.unroasted_total_quantity, roasting_log.roasted_quantity, ((((roasting_log.unroasted_total_quantity - roasting_log.roasted_quantity) / roasting_log.unroasted_total_quantity) * (100)::numeric))::numeric(12,2) AS weight_loss, roasting_log.duration FROM roasting_log ORDER BY roasting_log.\"time\"");
-			query.exec("CREATE FUNCTION add_inventory() RETURNS trigger AS $$ BEGIN UPDATE items SET quantity = quantity + NEW.quantity WHERE id = NEW.item; RETURN NEW; END; $$ LANGUAGE plpgsql");
-			query.exec("CREATE FUNCTION bags_in_stock(bigint) RETURNS numeric AS $_$SELECT quantity / (SELECT conversion FROM lb_bag_conversion WHERE item = id) FROM items WHERE id = $1;$_$ LANGUAGE sql IMMUTABLE STRICT");
-			query.exec("CREATE FUNCTION log_use() RETURNS trigger AS $$ DECLARE i integer := array_lower(NEW.unroasted_id, 1); u integer := array_upper(NEW.unroasted_id, 1); BEGIN WHILE i <= u LOOP INSERT INTO use VALUES(NEW.time, NEW.unroasted_id[i], NEW.unroasted_quantity[i]); i := i + 1; END LOOP; RETURN NEW; END; $$ LANGUAGE plpgsql");
-			query.exec("CREATE FUNCTION replace_inventory() RETURNS trigger AS $$ BEGIN UPDATE items SET quantity = NEW.quantity WHERE id = NEW.item; RETURN NEW; END; $$ LANGUAGE plpgsql");
-			query.exec("CREATE FUNCTION subtract_inventory() RETURNS trigger AS $$ BEGIN UPDATE items SET quantity = quantity - NEW.quantity WHERE id = NEW.item; RETURN NEW; END; $$ LANGUAGE plpgsql");
-			query.exec("CREATE SEQUENCE files_id_seq START WITH 1 INCREMENT BY 1 NO MAXVALUE NO MINVALUE CACHE 1");
-			query.exec("ALTER TABLE files ALTER COLUMN id SET DEFAULT nextval('files_id_seq'::regclass)");
-			query.exec("ALTER TABLE items ALTER COLUMN id SET DEFAULT nextval('items_id_seq'::regclass)");
-			query.exec("ALTER TABLE ONLY files ADD CONSTRAINT file_pkey PRIMARY KEY (id)");
-			query.exec("ALTER TABLE ONLY items ADD CONSTRAINT items_pkey PRIMARY KEY (id)");
-			query.exec("ALTER TABLE ONLY lb_bag_conversion ADD CONSTRAINT lb_bag_conversion_item_key UNIQUE (item)");
-			query.exec("ALTER TABLE ONLY roasting_log ADD CONSTRAINT roasting_log_pkey PRIMARY KEY (\"time\", machine)");
-			query.exec("CREATE INDEX itemcategories ON items USING btree (category)");
-			query.exec("CREATE INDEX itemnames ON items USING btree (name)");
-			query.exec("CREATE INDEX roasting_log_index ON roasting_log USING btree (\"time\")");
-			query.exec("CREATE INDEX transactionitems ON transactions USING btree (item)");
-			query.exec("CREATE INDEX transactiontimes ON transactions USING btree (\"time\")");
-			query.exec("CREATE TRIGGER add_inventory_trigger AFTER INSERT ON purchase FOR EACH ROW EXECUTE PROCEDURE add_inventory()");
-			query.exec("CREATE TRIGGER add_inventory_trigger AFTER INSERT ON make FOR EACH ROW EXECUTE PROCEDURE add_inventory()");
-			query.exec("CREATE TRIGGER log_use_trigger AFTER INSERT ON roasting_log FOR EACH ROW EXECUTE PROCEDURE log_use()");
-			query.exec("CREATE TRIGGER replace_inventory_trigger AFTER INSERT ON inventory FOR EACH ROW EXECUTE PROCEDURE replace_inventory()");
-			query.exec("CREATE TRIGGER subtract_inventory_trigger AFTER INSERT ON loss FOR EACH ROW EXECUTE PROCEDURE subtract_inventory()");
-			query.exec("CREATE TRIGGER subtract_inventory_trigger AFTER INSERT ON sale FOR EACH ROW EXECUTE PROCEDURE subtract_inventory()");
-			query.exec("CREATE TRIGGER subtract_inventory_trigger AFTER INSERT ON use FOR EACH ROW EXECUTE PROCEDURE subtract_inventory()");
-			query.exec("ALTER TABLE ONLY item_files ADD CONSTRAINT item_files_item_fkey FOREIGN KEY (item) REFERENCES items(id)");
-			query.exec("ALTER TABLE ONLY transactions ADD CONSTRAINT transactions_item_fkey FOREIGN KEY (item) REFERENCES items(id)");
-			query.exec("INSERT INTO TypicaFeatures (feature, enabled, version) VALUES('base-features', TRUE, 1)");
-			query = query.invalidate();
-		};
+            var DBCreateBase = function() {
+                var query = new QSqlQuery();
+                query.exec("CREATE TABLE IF NOT EXISTS certifications (item bigint NOT NULL, certification text NOT NULL)");
+                query.exec("CREATE TABLE IF NOT EXISTS cupping_samples (session bigint NOT NULL, sample text NOT NULL, position bigint NOT NULL, type text NOT NULL, \"time\" timestamp without time zone, machine bigint, point text, item bigint)");
+                query.exec("CREATE TABLE cupping_sessions (id bigserial NOT NULL, event text, name text NOT NULL, \"time\" timestamp without time zone NOT NULL, blind boolean NOT NULL, open boolean NOT NULL, note text)");
+                query.exec("CREATE TABLE IF NOT EXISTS cuppingforms (session bigint NOT NULL, sample text NOT NULL, position bigint NOT NULL, grader text, finalscore numeric, notes text, serialization text)");
+                query.exec("CREATE TABLE IF NOT EXISTS cuppingform_t1 (aroma numeric, flavor numeric, aftertaste numeric, acidity numeric, body numeric, uniformity numeric, balance numeric, cleancup numeric, sweetness numeric, overall numeric, total numeric) INHERITS (cuppingforms)");
+                query.exec("CREATE TABLE IF NOT EXISTS invoices (id bigserial PRIMARY KEY NOT NULL, invoice text, vendor text NOT NULL, \"time\" timestamp without time zone NOT NULL)");
+                query.exec("CREATE TABLE IF NOT EXISTS invoice_items (invoice_id bigint NOT NULL, record_type text NOT NULL, item_id bigint, description text NOT NULL, cost numeric NOT NULL)");
+                query.exec("CREATE TABLE IF NOT EXISTS transactions (\"time\" timestamp without time zone NOT NULL, item bigint NOT NULL)");
+                query.exec("CREATE TABLE IF NOT EXISTS inventory (quantity numeric NOT NULL) INHERITS (transactions)");
+                query.exec("CREATE TABLE IF NOT EXISTS loss (quantity numeric NOT NULL, reason text) INHERITS (transactions)");
+                query.exec("CREATE TABLE IF NOT EXISTS make (quantity numeric NOT NULL) INHERITS (transactions)");
+                query.exec("CREATE TABLE IF NOT EXISTS purchase (quantity numeric NOT NULL, cost numeric NOT NULL, vendor text NOT NULL) INHERITS (transactions)");
+                query.exec("CREATE TABLE IF NOT EXISTS sale (quantity numeric NOT NULL, customer text) INHERITS (transactions)");
+                query.exec("CREATE TABLE IF NOT EXISTS use (quantity numeric NOT NULL) INHERITS (transactions)");
+                query.exec("CREATE VIEW all_transactions AS ((((SELECT purchase.\"time\", purchase.item, purchase.quantity, purchase.cost, purchase.vendor, NULL::unknown AS reason, NULL::unknown AS customer, 'PURCHASE' AS type FROM purchase UNION SELECT use.\"time\", use.item, use.quantity, NULL::unknown AS cost, NULL::unknown AS vendor, NULL::unknown AS reason, NULL::unknown AS customer, 'USE' AS type FROM use) UNION SELECT inventory.\"time\", inventory.item, inventory.quantity, NULL::unknown AS cost, NULL::unknown AS vendor, NULL::unknown AS reason, NULL::unknown AS customer, 'INVENTORY' AS type FROM inventory) UNION SELECT loss.\"time\", loss.item, loss.quantity, NULL::unknown AS cost, NULL::unknown AS vendor, loss.reason, NULL::unknown AS customer, 'LOSS' AS type FROM loss) UNION SELECT make.\"time\", make.item, make.quantity, NULL::unknown AS cost, NULL::unknown AS vendor, NULL::unknown AS reason, NULL::unknown AS customer, 'MAKE' AS type FROM make) UNION SELECT sale.\"time\", sale.item, sale.quantity, NULL::unknown AS cost, NULL::unknown AS vendor, NULL::unknown AS reason, sale.customer, 'SALE' AS type FROM sale");
+                query.exec("CREATE FUNCTION time_range(bigint) RETURNS integer AS $$ BEGIN IF (SELECT quantity FROM items WHERE id = $1) > 0 THEN RETURN (SELECT current_date - min(time)::date + 1 FROM use WHERE item = $1); ELSE RETURN (SELECT max(time)::date - min(time)::date + 1 FROM use WHERE item = $1); END IF; END; $$ LANGUAGE plpgsql STRICT");
+                query.exec("CREATE TABLE IF NOT EXISTS items(id bigint NOT NULL, name text NOT NULL, reference text, unit text NOT NULL, quantity numeric DEFAULT 0, category text)");
+                query.exec("CREATE SEQUENCE items_id_seq INCREMENT BY 1 NO MAXVALUE NO MINVALUE CACHE 1");
+                query.exec("CREATE TABLE IF NOT EXISTS coffees(origin text NOT NULL, region text, producer text, grade text, milling text, drying text) INHERITS (items)");
+                query.exec("CREATE VIEW coffee_history AS SELECT coffees.id, coffees.name, coffees.origin, coffees.quantity AS stock, (SELECT sum(use.quantity) AS sum FROM use WHERE (use.item = coffees.id)) AS used, time_range(coffees.id) AS \"interval\", ((SELECT (sum(use.quantity) / (time_range(use.item))::numeric) FROM use WHERE (use.item = coffees.id) GROUP BY use.item))::numeric(10,2) AS rate, (SELECT (('now'::text)::date + ((coffees.quantity / (SELECT (sum(use.quantity) / (time_range(use.item))::numeric) FROM use WHERE (use.item = coffees.id) GROUP BY use.item)))::integer)) AS \"out\" FROM coffees WHERE (coffees.id IN (SELECT use.item FROM use)) ORDER BY coffees.origin");
+                query.exec("CREATE TABLE IF NOT EXISTS current_items (item bigint NOT NULL)");
+                query.exec("CREATE TABLE IF NOT EXISTS decaf_coffees (decaf_method text NOT NULL) INHERITS (coffees)");
+                query.exec("CREATE TABLE IF NOT EXISTS files (id bigint NOT NULL, name text NOT NULL, type text NOT NULL, note text, file bytea NOT NULL)");
+                query.exec("CREATE TABLE IF NOT EXISTS item_files(\"time\" timestamp without time zone NOT NULL, item bigint NOT NULL, files bigint[] NOT NULL)");
+                query.exec("CREATE TYPE item_transaction_with_balance AS (\"time\" timestamp without time zone, item bigint, quantity numeric, cost numeric, vendor text, reason text, customer text, type text, balance numeric)");
+                query.exec("CREATE TABLE IF NOT EXISTS lb_bag_conversion (item bigint NOT NULL, conversion numeric NOT NULL)");
+                query.exec("CREATE TABLE IF NOT EXISTS machine (id bigint NOT NULL, name text NOT NULL)");
+                query.exec("CREATE VIEW regular_coffees AS SELECT coffees.id, coffees.name, coffees.reference, coffees.unit, coffees.quantity, coffees.category, coffees.origin, coffees.region, coffees.producer, coffees.grade, coffees.milling, coffees.drying FROM coffees WHERE (NOT (coffees.id IN (SELECT decaf_coffees.id FROM decaf_coffees)))");
+                query.exec("CREATE TABLE IF NOT EXISTS roasting_log (\"time\" timestamp without time zone NOT NULL, unroasted_id bigint[], unroasted_quantity numeric[], unroasted_total_quantity numeric, roasted_id bigint, roasted_quantity numeric, transaction_type text NOT NULL, annotation text, machine bigint NOT NULL, duration interval, approval boolean, humidity numeric, barometric numeric, indoor_air numeric, outdoor_air numeric, files bigint[])");
+                query.exec("CREATE VIEW short_log AS SELECT roasting_log.\"time\", (SELECT items.name FROM items WHERE (items.id = roasting_log.roasted_id)) AS name, roasting_log.unroasted_total_quantity, roasting_log.roasted_quantity, ((((roasting_log.unroasted_total_quantity - roasting_log.roasted_quantity) / roasting_log.unroasted_total_quantity) * (100)::numeric))::numeric(12,2) AS weight_loss, roasting_log.duration FROM roasting_log ORDER BY roasting_log.\"time\"");
+                query.exec("CREATE FUNCTION add_inventory() RETURNS trigger AS $$ BEGIN UPDATE items SET quantity = quantity + NEW.quantity WHERE id = NEW.item; RETURN NEW; END; $$ LANGUAGE plpgsql");
+                query.exec("CREATE FUNCTION bags_in_stock(bigint) RETURNS numeric AS $_$SELECT quantity / (SELECT conversion FROM lb_bag_conversion WHERE item = id) FROM items WHERE id = $1;$_$ LANGUAGE sql IMMUTABLE STRICT");
+                query.exec("CREATE FUNCTION log_use() RETURNS trigger AS $$ DECLARE i integer := array_lower(NEW.unroasted_id, 1); u integer := array_upper(NEW.unroasted_id, 1); BEGIN WHILE i <= u LOOP INSERT INTO use VALUES(NEW.time, NEW.unroasted_id[i], NEW.unroasted_quantity[i]); i := i + 1; END LOOP; RETURN NEW; END; $$ LANGUAGE plpgsql");
+                query.exec("CREATE FUNCTION replace_inventory() RETURNS trigger AS $$ BEGIN UPDATE items SET quantity = NEW.quantity WHERE id = NEW.item; RETURN NEW; END; $$ LANGUAGE plpgsql");
+                query.exec("CREATE FUNCTION subtract_inventory() RETURNS trigger AS $$ BEGIN UPDATE items SET quantity = quantity - NEW.quantity WHERE id = NEW.item; RETURN NEW; END; $$ LANGUAGE plpgsql");
+                query.exec("CREATE SEQUENCE files_id_seq START WITH 1 INCREMENT BY 1 NO MAXVALUE NO MINVALUE CACHE 1");
+                query.exec("ALTER TABLE files ALTER COLUMN id SET DEFAULT nextval('files_id_seq'::regclass)");
+                query.exec("ALTER TABLE items ALTER COLUMN id SET DEFAULT nextval('items_id_seq'::regclass)");
+                query.exec("ALTER TABLE ONLY files ADD CONSTRAINT file_pkey PRIMARY KEY (id)");
+                query.exec("ALTER TABLE ONLY items ADD CONSTRAINT items_pkey PRIMARY KEY (id)");
+                query.exec("ALTER TABLE ONLY lb_bag_conversion ADD CONSTRAINT lb_bag_conversion_item_key UNIQUE (item)");
+                query.exec("ALTER TABLE ONLY roasting_log ADD CONSTRAINT roasting_log_pkey PRIMARY KEY (\"time\", machine)");
+                query.exec("CREATE INDEX itemcategories ON items USING btree (category)");
+                query.exec("CREATE INDEX itemnames ON items USING btree (name)");
+                query.exec("CREATE INDEX roasting_log_index ON roasting_log USING btree (\"time\")");
+                query.exec("CREATE INDEX transactionitems ON transactions USING btree (item)");
+                query.exec("CREATE INDEX transactiontimes ON transactions USING btree (\"time\")");
+                query.exec("CREATE TRIGGER add_inventory_trigger AFTER INSERT ON purchase FOR EACH ROW EXECUTE PROCEDURE add_inventory()");
+                query.exec("CREATE TRIGGER add_inventory_trigger AFTER INSERT ON make FOR EACH ROW EXECUTE PROCEDURE add_inventory()");
+                query.exec("CREATE TRIGGER log_use_trigger AFTER INSERT ON roasting_log FOR EACH ROW EXECUTE PROCEDURE log_use()");
+                query.exec("CREATE TRIGGER replace_inventory_trigger AFTER INSERT ON inventory FOR EACH ROW EXECUTE PROCEDURE replace_inventory()");
+                query.exec("CREATE TRIGGER subtract_inventory_trigger AFTER INSERT ON loss FOR EACH ROW EXECUTE PROCEDURE subtract_inventory()");
+                query.exec("CREATE TRIGGER subtract_inventory_trigger AFTER INSERT ON sale FOR EACH ROW EXECUTE PROCEDURE subtract_inventory()");
+                query.exec("CREATE TRIGGER subtract_inventory_trigger AFTER INSERT ON use FOR EACH ROW EXECUTE PROCEDURE subtract_inventory()");
+                query.exec("ALTER TABLE ONLY item_files ADD CONSTRAINT item_files_item_fkey FOREIGN KEY (item) REFERENCES items(id)");
+                query.exec("ALTER TABLE ONLY transactions ADD CONSTRAINT transactions_item_fkey FOREIGN KEY (item) REFERENCES items(id)");
+                query.exec("INSERT INTO TypicaFeatures (feature, enabled, version) VALUES('base-features', TRUE, 1)");
+                query = query.invalidate();
+            };
 		
 		/* Some changes to the database are required for sample roasting features in
 		   Typica 1.6 and later. */
@@ -293,7 +277,19 @@ type="push" />
 			query.exec("CREATE OR REPLACE FUNCTION log_use() RETURNS trigger AS $$ DECLARE i integer := array_lower(NEW.unroasted_id, 1); u integer := array_upper(NEW.unroasted_id, 1); BEGIN IF NEW.transaction_type = 'ROAST' THEN WHILE i <= u LOOP INSERT INTO use (time, item, quantity) VALUES(NEW.time, NEW.unroasted_id[i], NEW.unroasted_quantity[i]); i := i + 1; END LOOP; END IF; RETURN NEW; END; $$ LANGUAGE plpgsql");
 			query.exec("UPDATE TypicaFeatures SET version = 4 WHERE feature = 'base-features'");
 		};
-		
+                var DBUpdateReminders = function() {
+                    var query = new QSqlQuery;
+                    query.exec("CREATE TABLE IF NOT EXISTS reminders (id bigserial PRIMARY KEY NOT NULL, reminder text NOT NULL)");
+                    query.exec("UPDATE TypicaFeatures SET version = 5 WHERE feature = 'base-features'");
+                    query = query.invalidate();
+                };
+		var DBUpdateSpecification = function() {
+                    var query = new QSqlQuery;
+                    query.exec("CREATE TABLE IF NOT EXISTS roasting_specification (\"time\" timestamp without time zone NOT NULL, item bigint NOT NULL, loss numeric, tolerance numeric, notes text)");
+                    query.exec("UPDATE TypicaFeatures SET version = 6 WHERE feature = 'base-features'");
+                    query = query.invalidate();
+                };
+                
 		query = new QSqlQuery();
 		/* A table keeps track of database versioning information. This table is created
 		   if required. */
@@ -304,23 +300,31 @@ type="push" />
 		query.exec("SELECT feature, enabled, version FROM TypicaFeatures WHERE feature = 'base-features'");
 		if(query.next())
 		{
-			if(query.value(2) < 1)
-			{
-				DBCreateBase();
-			}
-			if(query.value(2) < 2)
-			{
-				DBUpdateMultiUser();
-				DBUpdateHistory();
-			}
-			if(query.value(2) < 3)
-			{
-				DBUpdateNotifications();
-			}
-			if(query.value(2) < 4)
-			{
-				DBUpdateTriggers();
-			}
+                    if(query.value(2) < 1)
+                    {
+                            DBCreateBase();
+                    }
+                    if(query.value(2) < 2)
+                    {
+                            DBUpdateMultiUser();
+                            DBUpdateHistory();
+                    }
+                    if(query.value(2) < 3)
+                    {
+                            DBUpdateNotifications();
+                    }
+                    if(query.value(2) < 4)
+                    {
+                            DBUpdateTriggers();
+                    }
+                    if(query.value(2) < 5)
+                    {
+                        DBUpdateReminders();
+                    }
+                    if(query.value(2) < 6)
+                    {
+                        DBUpdateSpecification();
+                    }
 		}
 		else
 		{

config/Windows/newbatch.xml

@@ -1,142 +1,269 @@
 <window id="batchWindow">
     <menu name="Batch">
-        <item id="new" shortcut="Ctrl+N">New Batch…</item>
+        <item id="new" shortcut="Ctrl+N">New Batch...</item>
     </menu>
-	<layout type="horizontal">
-    <layout type="vertical">
-        <layout type="horizontal">
-			<label>Machine:</label>
-			<line id="machine" writable="false" />
-			<label>Unit:</label>
-			<sqldrop id="unit" />
-            <stretch />
+    <layout type="horizontal">
+        <layout type="vertical">
+            <layout type="horizontal">
+                <label>Machine:</label>
+                <line id="machine" writable="false" />
+                <label>Unit:</label>
+                <sqldrop id="unit" />
+                <stretch />
+            </layout>
+            <layout type="horizontal">
+                <label>Roasted Coffee:</label>
+                <sqldrop data="0" display="1" showdata="true" id="roasted">
+                    <null />
+                    <query>SELECT id, name FROM items WHERE category = 'Coffee: Roasted' AND id IN (SELECT item FROM current_items) ORDER BY name</query>
+                </sqldrop>
+                <stretch />
+            </layout>
+            <label>Green Coffee:</label>
+            <sqltablearray columns="3" id="greens">
+                <column name="Coffee" delegate="sql" showdata="true" null="true" nulltext="Delete" nulldata="delete" data="0" display="1">SELECT id, name FROM coffees WHERE quantity &lt;&gt; 0 ORDER BY name</column>
+                <column name="Weight" delegate="numeric" />
+                <column name="Remaining" />
+            </sqltablearray>
+            <layout type="horizontal">
+                <label>Green Weight:</label>
+                <line id="green" writable="false">0.0</line>
+            </layout>
+            <layout type="horizontal">
+                <button name="Load Profile" type="push" id="load" />
+                <button name="No Profile" type="push" id="noprofile" />
+            </layout>
+            <layout type="horizontal">
+                <label>Time:</label>
+                <line id="time" writable="false" />
+                <label>Duration:</label>
+                <line id="duration" writable="false" />
+            </layout>
+            <layout type="horizontal">
+                <label>Roasted Weight:</label>
+                <line id="roast" validator="numeric">0.0</line>
+                <label>Weight Loss:</label>
+                <line id="wloss" writable="false" />
+                <button type="check" id="approval" name="Approved" />
+            </layout>
+            <layout type="horizontal">
+                <label>Annotation:</label>
+                <textarea id="annotation" />
+            </layout>
+            <layout type="horizontal">
+                <button name="Submit" id="submit" type="push" />
+                <button name="Save log as target profile" type="check" id="target" />
+            </layout>
         </layout>
-        <layout type="horizontal">
-            <label>Roasted Coffee:</label>
-            <sqldrop data="0" display="1" showdata="true" id="roasted">
-                <null />
-                <query>SELECT id, name FROM items WHERE category = 'Coffee: Roasted' AND id IN (SELECT item FROM current_items) ORDER BY name</query>
-            </sqldrop>
+        <layout type="vertical">
+            <label>Connected Scales</label>
+            <layout type="vertical" id="scales" />
+            <label>Expected Weight Loss</label>
+            <line id="lossspec" writable="false" />
+            <label>Expected Roasted Weight</label>
+            <layout type="horizontal">
+                <label>Min:</label>
+                <line id="minroastweight" writable="false" />
+            </layout>
+            <layout type="horizontal">
+                <label>Expected:</label>
+                <line id="expectedroastweight" writable="false" />
+            </layout>
+            <layout type="horizontal">
+                <label>Max:</label>
+                <line id="maxroastweight" writable="false" />
+            </layout>
+            <label>Specification Details</label>
+            <textarea id="specnotes" />
             <stretch />
         </layout>
-        <label>Green Coffee:</label>
-        <sqltablearray columns="2" id="greens">
-            <column name="Coffee" delegate="sql" showdata="true" null="true" nulltext="Delete" nulldata="delete" data="0" display="1">SELECT id, name FROM coffees WHERE quantity &lt;&gt; 0 ORDER BY name</column>
-            <column name="Weight" delegate="numeric" />
-        </sqltablearray>
-        <layout type="horizontal">
-            <label>Green Weight:</label>
-            <line id="green" writable="false">0.0</line>
-        </layout>
-        <layout type="horizontal">
-            <button name="Load Profile" type="push" id="load" />
-            <button name="No Profile" type="push" id="noprofile" />
-        </layout>
-        <layout type="horizontal">
-            <label>Time:</label>
-            <line id="time" writable="false" />
-            <label>Duration:</label>
-            <line id="duration" writable="false" />
-        </layout>
-        <layout type="horizontal">
-            <label>Roasted Weight:</label>
-            <line id="roast" validator="numeric" />
-            <label>Weight Loss:</label>
-            <line id="wloss" writable="false" />
-            <button type="check" id="approval" name="Approved" />
-        </layout>
-        <layout type="horizontal">
-            <label>Annotation:</label>
-            <textarea id="annotation" />
-        </layout>
-        <layout type="horizontal">
-            <button name="Submit" id="submit" type="push" />
-            <button name="Save log as target profile" type="check" id="target" />
-        </layout>
     </layout>
-	<layout type="vertical">
-		<label>Connected Scales</label>
-		<layout type="vertical" id="scales" />
-		<stretch />
-	</layout>
-	</layout>
     <program>
         <![CDATA[
-			var unitBox = findChildObject(this, 'unit');
-			unitBox.addItem("g");
-			unitBox.addItem("Kg");
-			unitBox.addItem("oz");
-			unitBox.addItem("lb");
-			unitBox.currentIndex = (QSettings.value("script/batch_unit", unitBox.findText("lb")));
-			var machine = findChildObject(this, "machine");
-			machine.setText(selectedRoasterName + " (" + selectedRoasterID + ")");
-			var newMenu = findChildObject(this, 'new');
-			newMenu.triggered.connect(function() {
-				var bwindow = createWindow("batchWindow");
-				bwindow.windowTitle = "Typica - [*]New Batch";
-			});
-			var batch = this;
-			var table = findChildObject(this, 'greens');
-			var green = findChildObject(this, 'green');
-			var model = table.model();
+            var unitBox = findChildObject(this, 'unit');
+            unitBox.addItem("g");
+            unitBox.addItem("Kg");
+            unitBox.addItem("oz");
+            unitBox.addItem("lb");
+            unitBox.currentIndex = (QSettings.value("script/batch_unit", unitBox.findText("lb")));
+            unitBox['currentIndexChanged(int)'].connect(function() {
+                QSettings.setValue("script/batch_unit", unitBox.currentIndex);
+            });
+            var machine = findChildObject(this, "machine");
+            machine.setText(selectedRoasterName + " (" + selectedRoasterID + ")");
+            var newMenu = findChildObject(this, 'new');
+            newMenu.triggered.connect(function() {
+                var bwindow = createWindow("batchWindow");
+                bwindow.windowTitle = "Typica - [*]New Batch";
+            });
+            var batch = this;
+            var table = findChildObject(this, 'greens');
+            var green = findChildObject(this, 'green');
+            var model = table.model();
             var lossField = findChildObject(this, 'wloss');
             lossField.maximumWidth = 80;
             var roasted = findChildObject(this, 'roasted');
             var roastwt = findChildObject(this, 'roast');
             roastwt.maximumWidth = 80;
-			var scalesLayout = findChildObject(this, 'scales');
-			scalesLayout.spacing = 10;
-			if(navigationwindow.loggingWindow.scales.length > 0) {
-				for(var i = 0; i < navigationwindow.loggingWindow.scales.length; i++) {
-					var scale = navigationwindow.loggingWindow.scales[i];
-					var label = new DragLabel();
-					var weighButton = new QPushButton();
-					weighButton.text = "Weigh";
-					weighButton.clicked.connect(scale.weigh);
-					label.updateMeasurement = function(m, u) {
-						switch(unitBox.currentIndex) {
-							case 0:
-								this.text = Units.convertWeight(m, u, Units.Gram).toFixed(1);
-								break;
-							case 1:
-								this.text = Units.convertWeight(m, u, Units.Kilogram).toFixed(4);
-								break;
-							case 2:
-								this.text = Units.convertWeight(m, u, Units.Ounce).toFixed(3);
-								break;
-							case 3:
-								this.text = Units.convertWeight(m, u, Units.Pound).toFixed(4);
-								break;
-						}
-					};
-					scalesLayout.addWidget(label);
-					scalesLayout.addWidget(weighButton);
-					scale.newMeasurement.connect(function(m, u) {
-						label.updateMeasurement(m, u);
-					});
-					scale.weigh();
-					unitBox['currentIndexChanged(int)'].connect(scale.weigh);
-				}
-			}
-			model.dataChanged.connect(function() {
-				var deleteRow = -1;
-				/* The combo box delegate updates user data before display data
-				   and this code is executed before the model update is fully
-				   complete. Rather than rely on this behavior continuing, we
-				   check that the display value has also been updated and defer
-				   row removal until both updates are complete.
-				*/
-				while((deleteRow = table.findData("delete", 0)) > -1) {
-					if(table.data(deleteRow, 0, 0) == "Delete") {
-						table.removeRow(table.findData("delete", 0));
-					} else {
-						break;
-					}
-				}
-				green.text = table.columnSum(1, 0);
-				table.resizeColumnToContents(0);
+            var scalesLayout = findChildObject(this, 'scales');
+            scalesLayout.spacing = 10;
+            if(navigationwindow.loggingWindow.scales.length > 0) {
+                for(var i = 0; i < navigationwindow.loggingWindow.scales.length; i++) {
+                    var scale = navigationwindow.loggingWindow.scales[i];
+                    var label = new DragLabel();
+                    var weighButton = new QPushButton();
+                    weighButton.text = "Weigh";
+                    weighButton.clicked.connect(scale.weigh);
+                    label.updateMeasurement = function(m, u) {
+                        switch(unitBox.currentIndex) {
+                            case 0:
+                                this.text = Units.convertWeight(m, u, Units.Gram).toFixed(1);
+                                break;
+                            case 1:
+                                this.text = Units.convertWeight(m, u, Units.Kilogram).toFixed(4);
+                                break;
+                            case 2:
+                                this.text = Units.convertWeight(m, u, Units.Ounce).toFixed(3);
+                                break;
+                            case 3:
+                                this.text = Units.convertWeight(m, u, Units.Pound).toFixed(4);
+                                break;
+                        }
+                    };
+                    scalesLayout.addWidget(label);
+                    scalesLayout.addWidget(weighButton);
+                    scale.newMeasurement.connect(function(m, u) {
+                        label.updateMeasurement(m, u);
+                    });
+                    scale.weigh();
+                    unitBox['currentIndexChanged(int)'].connect(scale.weigh);
+                }
+            }
+            var remainingStock = new Array();
+            var query = new QSqlQuery();
+            query.exec("SELECT id, quantity, (SELECT conversion FROM lb_bag_conversion WHERE item = id) FROM coffees WHERE quantity <> 0");
+            while(query.next()) {
+                remainingStock.push({id: query.value(0),
+                                     quantity: query.value(1),
+                                     conversion: query.value(2)});
+            }
+            query = query.invalidate();
+            var convertToPounds = function(w, u) {
+                switch(u) {
+                    case "g":
+                        return w * 0.0022;
+                    case "oz":
+                        return w * 0.0625;
+                    case "Kg":
+                        return w * 2.2;
+                }
+                return w;
+            };
+            var convertFromPounds = function(w, u) {
+                switch(u) {
+                    case "g":
+                        return w / 0.0022;
+                    case "oz":
+                        return w / 0.0625;
+                    case "Kg":
+                        return w / 2.2;
+                }
+                return w;
+            };
+            var specnotes = findChildObject(this, 'specnotes');
+            specnotes.readOnly = true;
+            var lossspec = findChildObject(this, 'lossspec');
+            var minfield = findChildObject(this, 'minroastweight');
+            var midfield = findChildObject(this, 'expectedroastweight');
+            var maxfield = findChildObject(this, 'maxroastweight');
+            var minloss = 0;
+            var maxloss = 0;
+            var expectloss = 0;
+            var updateGreenTable = function() {
+                var deleteRow = -1;
+                /* The combo box delegate updates user data before display data
+                and this code is executed before the model update is fully
+                complete. Rather than rely on this behavior continuing, we
+                check that the display value has also been updated and defer
+                row removal until both updates are complete.
+                */
+                while((deleteRow = table.findData("delete", 0)) > -1) {
+                    if(table.data(deleteRow, 0, 0) == "Delete") {
+                        table.removeRow(table.findData("delete", 0));
+                    } else {
+                        break;
+                    }
+                }
+                green.text = table.columnSum(1, 0);
+                table.resizeColumnToContents(0);
+                var gid = 0;
+                var r = 0;
+                while(gid >= 0)
+                {
+                    gid = Number(table.data(r, 0, 32));
+                    if(isNaN(gid))
+                    {
+                        gid = -1;
+                        break;
+                    }
+                    var bagConversion = 1;
+                    for(var i = 0; i < remainingStock.length; i++)
+                    {
+                        if(gid == Number(remainingStock[i].id))
+                        {
+                            var displayValue = Number(remainingStock[i].quantity);
+                            bagConversion = Number(remainingStock[i].conversion);
+                            if(!isNaN(Number(table.data(r, 1, 0))))
+                            {
+                                var change = Number(table.data(r, 1, 0));
+                                switch(unitBox.currentIndex)
+                                {
+                                    case 0:
+                                        change = convertToPounds(change, "g");
+                                        break;
+                                    case 1:
+                                        change = convertToPounds(change, "Kg");
+                                        break;
+                                    case 2:
+                                        change = convertToPounds(change, "oz");
+                                        break;
+                                }
+                                displayValue -= change;
+                            }
+                            var bagCount = (displayValue / bagConversion).toFixed(2);
+                            switch(unitBox.currentIndex)
+                            {
+                                case 0:
+                                    displayValue = convertFromPounds(displayValue, "g");
+                                    break;
+                                case 1:
+                                    displayValue = convertFromPounds(displayValue, "Kg");
+                                    break;
+                                case 2:
+                                    displayValue = convertFromPounds(displayValue, "oz");
+                                    break;
+                            }
+                            displayValue = "" + Number(displayValue).toFixed(3) + " (" + Number(bagCount).toFixed(3) + " bags)";
+                            if(table.data(r, 2, 0) != displayValue)
+                            {
+                                table.setData(r, 2, displayValue, 0);
+                                table.setData(r, 2, displayValue, 2);
+                                table.resizeColumnToContents(2);
+                            }
+                        }
+                    }
+                    r++;
+                }
                 if(parseFloat(green.text) > 0)
                 {
+                    var expectedLossDesc = "";
+                    if(lossspec.text.length > 0) {
+                        if(minloss != expectloss) {
+                            minfield.text = (-(parseFloat(green.text)) * (maxloss - 1)).toFixed(2);
+                            maxfield.text = (-(parseFloat(green.text)) * (minloss - 1)).toFixed(2);
+                        }
+                        midfield.text = (-(parseFloat(green.text)) * (expectloss - 1)).toFixed(2);
+                    }
                     if(parseFloat(roastwt.text) > 0)
                     {
                         lossField.text = (((parseFloat(green.text) - parseFloat(roastwt.text)) / parseFloat(green.text)) * 100).toFixed(2) + "%";
@@ -146,7 +273,9 @@
                         lossField.text = "100%";
                     }
                 }
-			});
+            };
+            model.dataChanged.connect(updateGreenTable);
+            unitBox['currentIndexChanged(int)'].connect(updateGreenTable);
             roastwt.textChanged.connect(function() {
                 if(parseFloat(green.text) > 0)
                 {
@@ -160,21 +289,10 @@
                     }
                 }
             });
-			var convertToPounds = function(w, u) {
-				switch(u) {
-					case "g":
-						return w * 0.0022;
-					case "oz":
-						return w * 0.0625;
-					case "Kg":
-						return w * 2.2;
-				}
-				return w;
-			};
             var profilebutton = findChildObject(this, 'load');
             profilebutton.setEnabled(false);
             roasted['currentIndexChanged(int)'].connect(function() {
-				table.clear();
+                table.clear();
                 var query = new QSqlQuery();
                 var q = "SELECT EXISTS(SELECT 1 FROM item_files WHERE item = ";
                 q = q + roasted.currentData();
@@ -234,152 +352,243 @@
                         }
                     }
                 }
+                query.prepare("SELECT loss, tolerance, notes FROM roasting_specification WHERE item = :id1 AND time = (SELECT max(time) FROM roasting_specification WHERE item = :id2)");
+                query.bind(":id1", roasted.currentData());
+                query.bind(":id2", roasted.currentData());
+                query.exec();
+                var lossSpecDescription = "";
+                if(query.next()) {
+                    if(query.value(0).length > 0) {
+                        lossSpecDescription += (Number(query.value(0)) * 100).toFixed(2);
+                        minloss = Number(query.value(0));
+                        maxloss = Number(query.value(0));
+                        expectloss = Number(query.value(0));
+                    }
+                    if(query.value(1).length > 0) {
+                        lossSpecDescription += " +/- " + (Number(query.value(1)) * 100).toFixed(2);
+                        minloss -= Number(query.value(1));
+                        maxloss += Number(query.value(1));
+                    }
+                    if(lossSpecDescription.length > 0) {
+                        lossSpecDescription += "%";
+                    }
+                    lossspec.text = lossSpecDescription;
+                    specnotes.plainText = query.value(2);
+                } else {
+                    lossspec.text = "";
+                    specnotes.plainText = "";
+                }
+                roastestimate.text = "";
+                query = query.invalidate();
+            });
+            var validateCapacity = function() {
+                if(checkCapacity == "true") {
+                    if(convertToPounds(parseFloat(green.text), unitBox.currentText) > poundsCapacity) {
+                        return false;
+                    }
+                }
+                return true;
+            }
+            profilebutton.clicked.connect(function() {
+                var proceed = false;
+                if(validateCapacity()) {
+                    proceed = true;
+                } else {
+                    proceed = displayWarning(TTR("batchWindow", "Suspicious Input"),
+                    TTR("batchWindow", "Entered green coffee weight exceeds maximum batch size. Continue?"));
+                }
+                if(proceed) {
+                    doLoadProfile();
+                }
             });
-			profilebutton.clicked.connect(function() {
-				batch.windowModified = true;
-				currentBatchInfo = batch;
-				query = new QSqlQuery();
+            var doLoadProfile = function() {
+                batch.windowModified = true;
+                currentBatchInfo = batch;
+                query = new QSqlQuery();
                 var q = "SELECT files FROM item_files WHERE item = :item AND time = (SELECT max(time) FROM item_files WHERE item = :again)";
-				query.prepare(q);
+                query.prepare(q);
                 query.bind(":item", Number(roasted.currentData()));
                 query.bind(":again", Number(roasted.currentData()));
-				query.exec();
-				var graph;
-				var log;
-				if(query.next())
-				{
-					var files = query.value(0);
-					files = files.replace("{", "(");
-					files = files.replace("}", ")");
-					q = "SELECT file, name FROM files WHERE id IN ";
-					q = q + files;
-					q = q + " AND type = 'profile'";
-					query.exec(q);
-					if(query.next())
-					{
-						var targetseries = -1;
-						var buffer = new QBuffer(query.value(0));
-						var pname = query.value(1);
-						var input = new XMLInput(buffer, 1);
-						graph = findChildObject(navigationwindow.loggingWindow, 'graph');
-						log = findChildObject(navigationwindow.loggingWindow, 'log');
-						log.clear();
-						graph.clear();
-						input.newTemperatureColumn.connect(log.setHeaderData);
-						input.newTemperatureColumn.connect(function(col, text) {
-							if(text == navigationwindow.loggingWindow.targetcolumnname)
-							{
-								targetseries = col;
-							}
-						});
-						input.newAnnotationColumn.connect(log.setHeaderData);
-						input.measure.connect(graph.newMeasurement);
-						input.measure.connect(log.newMeasurement);
-						input.measure.connect(function(data, series) {
-							if(series == targetseries)
-							{
-								targetDetector.newMeasurement(data);
-							}
-						});
-						var lc;
-						input.lastColumn.connect(function(c) {
-							lc = c;
-							QSettings.setValue("liveColumn", c + 1);
-							navigationwindow.loggingWindow.postLoadColumnSetup(c)
-						});
-						input.annotation.connect(function(note, tcol, ncol) {
-							for(var i = tcol; i < ncol; i++) {
-								log.newAnnotation(note, i, ncol);
-							}
-						});
-					}
-				}
+                query.exec();
+                var graph;
+                var log;
+                if(query.next())
+                {
+                    var files = query.value(0);
+                    files = files.replace("{", "(");
+                    files = files.replace("}", ")");
+                    q = "SELECT file, name FROM files WHERE id IN ";
+                    q = q + files;
+                    q = q + " AND type = 'profile'";
+                    query.exec(q);
+                    if(query.next())
+                    {
+                        var targetseries = -1;
+                        var buffer = new QBuffer(query.value(0));
+                        var pname = query.value(1);
+                        var input = new XMLInput(buffer, 1);
+                        graph = findChildObject(navigationwindow.loggingWindow, 'graph');
+                        log = findChildObject(navigationwindow.loggingWindow, 'log');
+                        log.clear();
+                        graph.clear();
+                        input.newTemperatureColumn.connect(log.setHeaderData);
+                        input.newTemperatureColumn.connect(function(col, text) {
+                            if(text == navigationwindow.loggingWindow.targetcolumnname)
+                            {
+                                targetseries = col;
+                            }
+                        });
+                        input.newAnnotationColumn.connect(log.setHeaderData);
+                        input.measure.connect(graph.newMeasurement);
+                        input.measure.connect(log.newMeasurement);
+                        input.measure.connect(function(data, series) {
+                            if(series == targetseries)
+                            {
+                                targetDetector.newMeasurement(data);
+                            }
+                        });
+                        var lc;
+                        input.lastColumn.connect(function(c) {
+                            lc = c;
+                            QSettings.setValue("liveColumn", c + 1);
+                            navigationwindow.loggingWindow.postLoadColumnSetup(c)
+                        });
+                        input.annotation.connect(function(note, tcol, ncol) {
+                            for(var i = tcol; i < ncol; i++) {
+                                log.newAnnotation(note, i, ncol);
+                            }
+                        });
+                    }
+                }
                 query = query.invalidate();
-				navigationwindow.loggingWindow.windowTitle = "Typica - [*]" + pname;
-				navigationwindow.loggingWindow.raise();
-				navigationwindow.loggingWindow.activateWindow();
-				graph.updatesEnabled = false;
-				log.updatesEnabled = false;
-				input.input();
-				log.updatesEnabled = true;
-				graph.updatesEnabled = true;
-				log.newAnnotation("End", 1, lc);
-			});
-			var noprofilebutton = findChildObject(this, 'noprofile');
-			noprofilebutton.clicked.connect(function() {
-				batch.windowModified = true;
-				currentBatchInfo = batch;
-				navigationwindow.loggingWindow.raise();
-				navigationwindow.loggingWindow.activateWindow();
-			});
-			var submitbutton = findChildObject(this, 'submit');
-			var timefield = findChildObject(this, 'time');
-			var notes = findChildObject(this, 'annotation');
-			var duration = findChildObject(this, 'duration');
-			var approval = findChildObject(this, 'approval');
-			approval.checked = true;
-			var target = findChildObject(this, 'target');
-			submitbutton.clicked.connect(function() {
-				checkQuery = new QSqlQuery();
-				checkQuery.exec("SELECT 1 FROM machine WHERE id = " + selectedRoasterID);
-				if(!checkQuery.next())
-				{
-					checkQuery.prepare("INSERT INTO machine (id, name) VALUES(:id, :name)");
-					checkQuery.bind(":id", selectedRoasterID);
-					checkQuery.bind(":name", selectedRoasterName);
-					checkQuery.exec();
-				}
-				checkQuery = checkQuery.invalidate();
-				var q = "INSERT INTO files (id, name, type, note, file) VALUES(default, :name, 'profile', NULL, :data) RETURNING id";
-				query = new QSqlQuery();
-				query.prepare(q);
-				query.bind(":name", timefield.text + " " + roasted.currentText);
-				query.bindFileData(":data", batch.tempData);
-				query.exec();
-				query.next();
-				var fileno = query.value(0);
-				var file = new QFile(batch.tempData);
-				file.remove();
-				var q2 = "INSERT INTO roasting_log (time, unroasted_id, unroasted_quantity, unroasted_total_quantity, roasted_id, roasted_quantity, transaction_type, annotation, machine, duration, approval, humidity, barometric, indoor_air, outdoor_air, files) VALUES(:time, ";
-				q2 = q2 + table.columnArray(0, 32);
-				q2 = q2 + ", ";
-				for(var i = 0; table.data(i, 1, 0).value != ""; i++)
-				{
-					table.setData(i, 1, convertToPounds(parseFloat(table.data(i, 1, 0)), unitBox.currentText) ,32)
-				}
-				q2 = q2 + table.columnArray(1, 32);
-				q2 = q2 + ", ";
-				q2 = q2 + convertToPounds(parseFloat(green.text), unitBox.currentText);
-				q2 = q2 + ", ";
-				q2 = q2 + roasted.currentData();
-				q2 = q2 + ", ";
-				q2 = q2 + convertToPounds(parseFloat(roastwt.text), unitBox.currentText);
-				q2 = q2 + ", 'ROAST', :annotation, ";
-				q2 = q2 + selectedRoasterID;
-				q2 = q2 + ", :duration, :approval, NULL, NULL, NULL, NULL, '{";
-				q2 = q2 + fileno;
-				q2 = q2 + "}')";
-				query2 = new QSqlQuery();
-				query2.prepare(q2);
-				query2.bind(":time", timefield.text);
-				query2.bind(":annotation", notes.plainText);
-				query2.bind(":duration", duration.text);
-				query2.bind(":approval", approval.checked);
-				query2.exec();
+                navigationwindow.loggingWindow.windowTitle = "Typica - [*]" + pname;
+                navigationwindow.loggingWindow.raise();
+                navigationwindow.loggingWindow.activateWindow();
+                graph.updatesEnabled = false;
+                log.updatesEnabled = false;
+                input.input();
+                log.updatesEnabled = true;
+                graph.updatesEnabled = true;
+                log.newAnnotation(TTR("batchWindow", "End"), 1, lc);
+            }
+            var noprofilebutton = findChildObject(this, 'noprofile');
+            noprofilebutton.clicked.connect(function() {
+                var proceed = false;
+                if(validateCapacity()) {
+                    proceed = true;
+                } else {
+                    proceed = displayWarning(TTR("batchWindow", "Suspicious Input"),
+                    TTR("batchWindow", "Entered green coffee weight exceeds maximum batch size. Continue?"));
+                }
+                if(proceed) {
+                    doNoProfile();
+                }
+            });
+            var doNoProfile = function() {
+                batch.windowModified = true;
+                currentBatchInfo = batch;
+                navigationwindow.loggingWindow.raise();
+                navigationwindow.loggingWindow.activateWindow();
+            }
+            var submitbutton = findChildObject(this, 'submit');
+            var timefield = findChildObject(this, 'time');
+            var notes = findChildObject(this, 'annotation');
+            var duration = findChildObject(this, 'duration');
+            var approval = findChildObject(this, 'approval');
+            approval.checked = true;
+            var target = findChildObject(this, 'target');
+            var checkSubmitEnable = function () {
+                if(roasted.currentIndex > 0) {
+                    if(timefield.text.length > 0) {
+                        if(duration.text.length > 0) {
+                            if(batch.tempData.length > 0) {
+                                if(green.text.length > 0) {
+                                    return true;
+                                }
+                            }
+                        }
+                    }
+                }
+                return false;
+            }
+            submitbutton.clicked.connect(function() {
+                var proceed = false;
+                if(validateCapacity()) {
+                    proceed = true;
+                } else {
+                    proceed = displayWarning(TTR("batchWindow", "Suspicious Input"),
+                    TTR("batchWindow", "Entered green coffee weight exceeds maximum batch size. Continue?"));
+                }
+                if(proceed) {
+                    if(checkSubmitEnable()) {
+                        doSubmit();
+                    } else {
+                        displayError(TTR("batchWindow", "Incomplete Input"),
+                        TTR("batchWindow", "Some required information is not available. Please check inputs and try again."));
+                    }
+                }
+            });
+            var doSubmit = function() {
+                checkQuery = new QSqlQuery();
+                checkQuery.exec("SELECT 1 FROM machine WHERE id = " + selectedRoasterID);
+                if(!checkQuery.next())
+                {
+                    checkQuery.prepare("INSERT INTO machine (id, name) VALUES(:id, :name)");
+                    checkQuery.bind(":id", selectedRoasterID);
+                    checkQuery.bind(":name", selectedRoasterName);
+                    checkQuery.exec();
+                }
+                checkQuery = checkQuery.invalidate();
+                var q = "INSERT INTO files (id, name, type, note, file) VALUES(default, :name, 'profile', NULL, :data) RETURNING id";
+                query = new QSqlQuery();
+                query.prepare(q);
+                query.bind(":name", timefield.text + " " + roasted.currentText);
+                query.bindFileData(":data", batch.tempData);
+                query.exec();
+                query.next();
+                var fileno = query.value(0);
+                var file = new QFile(batch.tempData);
+                file.remove();
+                var q2 = "INSERT INTO roasting_log (time, unroasted_id, unroasted_quantity, unroasted_total_quantity, roasted_id, roasted_quantity, transaction_type, annotation, machine, duration, approval, humidity, barometric, indoor_air, outdoor_air, files) VALUES(:time, ";
+                q2 = q2 + table.columnArray(0, 32);
+                q2 = q2 + ", ";
+                for(var i = 0; table.data(i, 1, 0).value != ""; i++)
+                {
+                    table.setData(i, 1, convertToPounds(parseFloat(table.data(i, 1, 0)), unitBox.currentText) ,32)
+                }
+                q2 = q2 + table.columnArray(1, 32);
+                q2 = q2 + ", ";
+                q2 = q2 + convertToPounds(parseFloat(green.text), unitBox.currentText);
+                q2 = q2 + ", ";
+                q2 = q2 + roasted.currentData();
+                q2 = q2 + ", ";
+                q2 = q2 + convertToPounds(parseFloat(roastwt.text), unitBox.currentText);
+                q2 = q2 + ", 'ROAST', :annotation, ";
+                q2 = q2 + selectedRoasterID;
+                q2 = q2 + ", :duration, :approval, NULL, NULL, NULL, NULL, '{";
+                q2 = q2 + fileno;
+                q2 = q2 + "}')";
+                query2 = new QSqlQuery();
+                query2.prepare(q2);
+                query2.bind(":time", timefield.text);
+                query2.bind(":annotation", notes.plainText);
+                query2.bind(":duration", duration.text);
+                query2.bind(":approval", approval.checked);
+                query2.exec();
                 query2 = query2.invalidate();
-				if(target.checked) {
-					var q3 = "INSERT INTO item_files (time, item, files) VALUES(:time, :item, '{";
-					q3 = q3 + fileno;
-					q3 = q3 + "}')";
-					query.prepare(q3);
-					query.bind(":time", timefield.text);
-					query.bind(":item", roasted.currentData());
-					query.exec();
-				}
+                if(target.checked) {
+                    var q3 = "INSERT INTO item_files (time, item, files) VALUES(:time, :item, '{";
+                    q3 = q3 + fileno;
+                    q3 = q3 + "}')";
+                    query.prepare(q3);
+                    query.bind(":time", timefield.text);
+                    query.bind(":item", roasted.currentData());
+                    query.exec();
+                }
                 query = query.invalidate();
-				batch.windowModified = false;
-				batch.close();
-			});
+                batch.windowModified = false;
+                batch.close();
+            }
         ]]>
     </program>
 </window>

config/Windows/newsamplebatch.xml

@@ -98,7 +98,7 @@
 					var scale = navigationwindow.loggingWindow.scales[i];
 					var label = new DragLabel();
 					var weighButton = new QPushButton();
-					weighButton.text = "Weigh";
+					weighButton.text = TTR("sampleRoastingBatch", "Weigh");
 					weighButton.clicked.connect(scale.weigh);
 					label.updateMeasurement = function(m, u) {
 						switch(GunitBox.currentIndex) {
@@ -127,7 +127,7 @@
 			}
 			var submit = findChildObject(this, 'submit');
 			submit.setEnabled(false);
-			this.windowTitle = "Typica - New Sample Roasting Batch";
+			this.windowTitle = TTR("sampleRoastingBatch", "Typica - New Sample Roasting Batch");
 			var newMenu = findChildObject(this, 'new');
 			newMenu.triggered.connect(function() {
 				createWindow("sampleRoastingBatch");
@@ -179,7 +179,27 @@
 			stop.clicked.connect(function() {
 				submit.setEnabled(true);
 			});
-			roastButton.clicked.connect(function() {
+                        var validateCapacity = function() {
+                            if(checkCapacity == "true") {
+                                if(convertToPounds(parseFloat(green.text), GunitBox.currentText) > poundsCapacity) {
+                                    return false;
+                                }
+                            }
+                            return true;
+                        }
+                        roastButton.clicked.connect(function() {
+                            var proceed = false;
+                            if(validateCapacity()) {
+                                proceed = true;
+                            } else {
+                                proceed = displayWarning(TTR("sampleRoastingBatch", "Suspicious Input"),
+                                TTR("sampleRoastingBatch", "Entered green coffee weight exceeds maximum batch size. Continue?"));
+                            }
+                            if(proceed) {
+                                doRoast();
+                            }
+                        });
+                        var doRoast = function() {
 				var lc = 1;
 				currentBatchInfo = batch;
 				query = new QSqlQuery();
@@ -232,17 +252,17 @@
 						input.input();
 						graph.updatesEnabled = true;
 						log.updatesEnabled = true;
-						log.newAnnotation("End", 1, lc);
+						log.newAnnotation(TTR("sampleRoastingBatch", "End"), 1, lc);
 					}
 				}
 				query = query.invalidate();
-				var t = "Typica - Sample Roasting: [*]" + name.text;
+				var t = TTR("sampleRoastingBatch", "Typica - Sample Roasting: [*]") + name.text;
 				if(profileName.currentText != '')
 				{
 					t = t + ", " + profileName.currentText;
 				}
 				navigationwindow.loggingWindow.windowTitle = t;
-			});
+			};
 			var notes = findChildObject(this, 'annotation');
 			var machine = findChildObject(this, 'machine');
 			var duration = findChildObject(this, 'duration');
@@ -250,7 +270,19 @@
 			var vendor = findChildObject(this, 'vendor');
 			var attributes = findChildObject(this, 'attributes');
 			var target = findChildObject(this, 'target');
-			submit.clicked.connect(function() {
+                        submit.clicked.connect(function() {
+                            var proceed = false;
+                            if(validateCapacity()) {
+                                proceed = true;
+                            } else {
+                                proceed = displayWarning(TTR("sampleRoastingBatch", "Suspicious Input"),
+                                TTR("sampleRoastingBatch", "Entered green coffee weight exceeds maximum batch size. Continue?"));
+                            }
+                            if(proceed) {
+                                doLoadProfile();
+                            }
+                        });
+                        var doSubmit = function() {
 				query = new QSqlQuery();
 				query.prepare("INSERT INTO files (id, name, type, note, file) VALUES(DEFAULT, :name, 'profile', NULL, :data) RETURNING id");
 				query.bind(":name", timefield.text + " " + name.text + " " + profileName.currentText);
@@ -314,9 +346,10 @@
 				query.exec();
 				query.next();
 				var roastedId = query.value(0);
-				query.prepare("INSERT INTO roasting_log (time, unroasted_id, unroasted_quantity, unroasted_total_quantity, roasted_id, roasted_quantity, transaction_type, annotation, machine, duration, approval, humidity, barometric, indoor_air, outdoor_air, files) VALUES(:time, :unroastedids, NULL, :green, :roastedid, :roasted, 'SAMPLEROAST', :note, :machine, :duration, TRUE, NULL, NULL, NULL, NULL, :files)");
+				query.prepare("INSERT INTO roasting_log (time, unroasted_id, unroasted_quantity, unroasted_total_quantity, roasted_id, roasted_quantity, transaction_type, annotation, machine, duration, approval, humidity, barometric, indoor_air, outdoor_air, files) VALUES(:time, :unroastedids, :greens, :green, :roastedid, :roasted, 'SAMPLEROAST', :note, :machine, :duration, TRUE, NULL, NULL, NULL, NULL, :files)");
 				query.bind(":time", timefield.text);
 				query.bind(":unroastedids", "{" + greenId + "}");
+                                query.bind(":greens", "{" + convertToPounds(parseFloat(green.text), GunitBox.currentText) + "}");
 				query.bind(":green", convertToPounds(parseFloat(green.text), GunitBox.currentText));
 				query.bind(":roastedid", Number(roastedId));
 				query.bind(":roasted", convertToPounds(parseFloat(roasted.text), GunitBox.currentText));
@@ -327,7 +360,7 @@
 				query.exec();
 				query = query.invalidate();
 				batch.close();
-			});
+			}
 		]]>
 	</program>
 </window>

config/Windows/offline.xml

@@ -11,10 +11,10 @@
         </splitter>
     </layout>
 	<menu name="File">
-		<item id="save" shortcut="Ctrl+S">Save…</item>
-		<item id="print" shortcut="Ctrl+P">Print…</item>
-		<item id="export">Export CSV…</item>
-		<item id="svgexport">Export XHTML+SVG…</item>
+		<item id="save" shortcut="Ctrl+S">Save...</item>
+		<item id="print" shortcut="Ctrl+P">Print...</item>
+		<item id="export">Export CSV...</item>
+		<item id="svgexport">Export XHTML+SVG...</item>
 		<item id="quit" shortcut="Ctrl+Q">Quit</item>
 	</menu>
 	<menu name="Log">
@@ -54,7 +54,7 @@
 			};
 			var saveMenu = findChildObject(this, 'save');
 			saveMenu.triggered.connect(function() {
-				var filename = QFileDialog.getSaveFileName(window, "Save Log As…", QSettings.value("script/lastDir", "") + "/");
+				var filename = QFileDialog.getSaveFileName(window, TTR("offline", "Save Log As..."), QSettings.value("script/lastDir", "") + "/");
 				if(filename != "") {
 					var file = new QFile(filename);
 					setLogOutputColumns();
@@ -65,12 +65,12 @@
 			var printMenu = findChildObject(this, 'print');
 			printMenu.triggered.connect(function() {
 				var exportWindow = createWindow("print");
-				exportWindow.windowTitle = "Typica - Print";
+				exportWindow.windowTitle = TTR("offline", "Typica - Print");
 				exportWindow.log = log;
 			});
 			var exportMenu = findChildObject(this, 'export');
 			exportMenu.triggered.connect(function() {
-				var filename = QFileDialog.getSaveFileName(window, "Export CSV As…", QSettings.value("script/lastDir", "") + "/");
+				var filename = QFileDialog.getSaveFileName(window, TTR("offline", "Export CSV As..."), QSettings.value("script/lastDir", "") + "/");
 				if(filename != "") {
 					var file = new QFile(filename);
 					setLogOutputColumns();
@@ -81,7 +81,7 @@
 			var svgExportMenu = findChildObject(this, 'svgexport');
 			svgExportMenu.triggered.connect(function() {
 				var exportWindow = createWindow("exportWindow");
-				exportWindow.windowTitle = "Typica - Export XHTML+SVG";
+				exportWindow.windowTitle = TTR("offline", "Typica - Export XHTML+SVG");
 				exportWindow.log = log;
 			});
 			var quitMenu = findChildObject(this, 'quit');

config/Windows/print.xml

@@ -279,18 +279,18 @@
                 output.writeAttribute("transform", "rotate(-90 40,150)");
                 if(log.displayUnits() == 10143)
                 {
-                    output.writeCDATA("Temperature (°C)");
+                    output.writeCDATA(TTR("print", "Temperature (°C)"));
                 }
                 else
                 {
-                    output.writeCDATA("Temperature (°F)");
+                    output.writeCDATA(TTR("print", "Temperature (°F)"));
                 }
                 output.writeEndElement();
                 output.writeStartElement("text");
                 output.writeAttribute("x", "1.9in");
                 output.writeAttribute("y", "3.3in");
                 output.writeAttribute("font-size", "12");
-                output.writeCDATA("Time (minutes)");
+                output.writeCDATA(TTR("print", "Time (minutes)"));
                 output.writeEndElement();
                 output.writeStartElement("line");
                 output.writeAttribute("x1", "0.4in");
@@ -675,7 +675,7 @@
                 if(lossField.text != "")
                 {
                     output.writeStartElement("p");
-                    output.writeCDATA("Weight loss: ");
+                    output.writeCDATA(TTR("print", "Weight loss: "));
                     output.writeCDATA(lossField.text);
                     if(tolField.text != "")
                     {
@@ -687,10 +687,10 @@
                     output.writeStartElement("table");
                     output.writeStartElement("tr");
                     output.writeStartElement("th");
-                    output.writeCDATA("Roasted");
+                    output.writeCDATA(TTR("print", "Roasted"));
                     output.writeEndElement();
                     output.writeStartElement("th");
-                    output.writeCDATA("Green");
+                    output.writeCDATA(TTR("print", "Green"));
                     output.writeEndElement();
                     output.writeEndElement();
                     var green;

config/Windows/roastmanager.xml

@@ -24,7 +24,7 @@
     </layout>
     <program>
         <![CDATA[
-            this.displayStatus("Ready.");
+            this.displayStatus(TTR("newroasted", "Ready."));
             var itemname = findChildObject(this, 'name');
             var newItemButton = findChildObject(this, 'ok');
             var window = this;
@@ -43,7 +43,7 @@
                 drop2.clear();
                 drop1.addSqlOptions("SELECT id, name FROM items WHERE id IN (SELECT item FROM current_items) ORDER BY name");
                 drop2.addSqlOptions("SELECT id, name FROM items WHERE category = 'Coffee: Roasted' AND id NOT IN (SELECT item FROM current_items) ORDER BY name");
-                window.displayStatus("Item removed.");
+                window.displayStatus(TTR("newroasted", "Item removed."));
             });
             restoreButton.clicked.connect(function() {
                 var q = "INSERT INTO current_items (item) VALUES (:id)";
@@ -56,7 +56,7 @@
                 drop2.clear();
                 drop1.addSqlOptions("SELECT id, name FROM items WHERE id IN (SELECT item FROM current_items) ORDER BY name");
                 drop2.addSqlOptions("SELECT id, name FROM items WHERE category = 'Coffee: Roasted' AND id NOT IN (SELECT item FROM current_items) ORDER BY name");
-                window.displayStatus("Item restored.");
+                window.displayStatus(TTR("newroasted", "Item restored."));
             });
             newItemButton.clicked.connect(function() {
                 var q = "INSERT INTO items (id, name, reference, unit, quantity, category) VALUES (default, :name, NULL, 'lb', 0, 'Coffee: Roasted') RETURNING id";
@@ -76,7 +76,7 @@
                 drop2.clear();
                 drop1.addSqlOptions("SELECT id, name FROM items WHERE id IN (SELECT item FROM current_items) ORDER BY name");
                 drop2.addSqlOptions("SELECT id, name FROM items WHERE category = 'Coffee: Roasted' AND id NOT IN (SELECT item FROM current_items) ORDER BY name");
-                window.displayStatus("Item added.");
+                window.displayStatus(TTR("newroasted", "Item added."));
             });
         ]]>
     </program>

config/Windows/roastspec.xml

@@ -0,0 +1,92 @@
+<window id="roastspec">
+    <layout type="horizontal">
+        <layout type="vertical">
+            <layout type="horizontal">
+                <label>Coffee:</label>
+                <sqldrop data="0" display="1" showdata="false" id="currentitems">
+                    <query>SELECT id, name FROM items WHERE id IN (SELECT item FROM current_items) ORDER BY name</query>
+                </sqldrop>
+            </layout>
+            <layout type="horizontal">
+                <label>Expected % weight loss:</label>
+                <line validator="numeric" id="expectedloss" />
+            </layout>
+            <layout type="horizontal">
+                <label>Tolerance</label>
+                <line validator="numeric" id="tolerance" />
+            </layout>
+            <label>Specification Notes:</label>
+            <textarea id="notes" />
+            <layout type="horizontal">
+                <stretch />
+                <button id="save" type="push" name="Save" />
+            </layout>
+        </layout>
+    </layout>
+    <program>
+        <![CDATA[
+            var window = this;
+            this.windowTitle = TTR("roastspec", "Typica - Edit Roasting Specification");
+            var selector = findChildObject(this, 'currentitems');
+            var expected = findChildObject(this, 'expectedloss');
+            var tolerance = findChildObject(this, 'tolerance');
+            var notes = findChildObject(this, 'notes');
+            var savebutton = findChildObject(this, 'save');
+            var updateDisplay = function() {
+                var query = new QSqlQuery();
+                query.prepare("SELECT loss, tolerance, notes FROM roasting_specification WHERE item = :id1 AND time = (SELECT max(time) FROM roasting_specification WHERE item = :id2)");
+                query.bind(":id1", selector.currentData());
+                query.bind(":id2", selector.currentData());
+                query.exec();
+                if(query.next()) {
+                    if(query.value(0).length > 0) {
+                        expected.text = Number(query.value(0)) * 100;
+                    } else {
+                        expected.text = "";
+                    }
+                    if(query.value(1).length > 0) {
+                        tolerance.text = Number(query.value(1)) * 100;
+                    } else {
+                        tolerance.text = "";
+                    }
+                    notes.plainText = query.value(2);
+                } else {
+                    expected.text = "";
+                    tolerance.text = "";
+                    notes.plainText = "";
+                }                
+                query = query.invalidate();
+            };
+            updateDisplay();
+            selector['currentIndexChanged(int)'].connect(function() {
+                updateDisplay();
+            });
+            savebutton.clicked.connect(function() {
+                var query = new QSqlQuery();
+                var columnspec = "time, item, ";
+                var valuespec = "'now', :id, ";
+                if(expected.text.length > 0) {
+                    columnspec += "loss, ";
+                    valuespec += ":loss, ";
+                }
+                if(tolerance.text.length > 0) {
+                    columnspec += "tolerance, ";
+                    valuespec += ":tolerance, ";
+                }
+                columnspec += "notes";
+                valuespec += ":notes";
+                query.prepare("INSERT INTO roasting_specification (" + columnspec + ") VALUES (" + valuespec + ")");
+                query.bind(":id", selector.currentData());
+                if(expected.text.length > 0) {
+                    query.bind(":loss", Number(expected.text) / 100);
+                }
+                if(tolerance.text.length > 0) {
+                    query.bind(":tolerance", Number(tolerance.text) / 100);
+                }
+                query.bind(":notes", notes.plainText);
+                query.exec();
+                window.close();
+            });
+        ]]>
+    </program>
+</window>

config/Windows/setsampleparameters.xml

@@ -13,7 +13,7 @@
         print("Program loaded");
         var window = this;
         var instructions = findChildObject(this, 'instructions');
-        instructions.plainText = "%1 will be replaced with a sample number.";
+        instructions.plainText = TTR("sampleParameters", "%1 will be replaced with a sample number.");
         instructions.readOnly = true;
         var reset = findChildObject(this, 'reset');
         reset.clicked.connect(function() {

config/config.xml

@@ -8,7 +8,6 @@
     <include src="Windows/navigation.xml" />
     <include src="Windows/success.xml" />
     <include src="Windows/roastmanager.xml" />
-    <include src="Windows/history.xml" />
     <include src="Windows/greeninventory.xml" />
     <include src="Windows/newroaster.xml" />
     <include src="Windows/batchdetailsnew.xml" />
@@ -23,27 +22,28 @@
     <include src="Windows/cuppingsessionsummary.xml" />
     <include src="Windows/cuppingsummary.xml" />
     <include src="Windows/purchase.xml" />
-	<include src="Windows/invoicelist.xml" />
-	<include src="Windows/invoiceinfo.xml" />
-	<include src="Windows/editinvoice.xml" />
-	<include src="Windows/editinvoiceitem.xml" />
-	<include src="Windows/editfee.xml" />
-	<include src="Windows/optime.xml" />
-	<include src="Windows/greensales.xml" />
-	<include src="Windows/profilehistory.xml" />
-	<include src="Windows/editbatchdetails.xml" />
-	<include src="Windows/newsamplebatch.xml" />
-	<program>
-		<![CDATA[
-		Windows = new Object();
-		var loggingWindow;
-		var currentBatchInfo;
-		var navwindow = createWindow("navwindow");
-		var aadapt;
-		var badapt;
-		var azero;
-		var bzero;
-		navwindow.windowTitle = "Typica - Choose Your Path";
-		]]>
-	</program>
+    <include src="Windows/invoiceinfo.xml" />
+    <include src="Windows/editinvoice.xml" />
+    <include src="Windows/editinvoiceitem.xml" />
+    <include src="Windows/editfee.xml" />
+    <include src="Windows/optime.xml" />
+    <include src="Windows/greensales.xml" />
+    <include src="Windows/profilehistory.xml" />
+    <include src="Windows/editbatchdetails.xml" />
+    <include src="Windows/newsamplebatch.xml" />
+    <include src="Windows/editreminder.xml" />
+    <include src="Windows/roastspec.xml" />
+    <program>
+        <![CDATA[
+            Windows = new Object();
+            var loggingWindow;
+            var currentBatchInfo;
+            var navwindow = createWindow("navwindow");
+            var aadapt;
+            var badapt;
+            var azero;
+            var bzero;
+            navwindow.windowTitle = TTR("config", "Typica - Choose Your Path");
+        ]]>
+    </program>
 </application>

docs/documentation.html

@@ -16,7 +16,6 @@
 					<a class="tab" href="downloads.html" >Downloads</a>
 					<a class="tab active" >Documentation</a>
 					<a class="tab" href="screenshots.html" >Screenshots and Videos</a>
-					<a class="tab" href="involvement.html" >Get Involved</a>
 					<a href="http://appliedcoffeetechnology.tumblr.com/tagged/Typica" class="tab">Blog</a>
 				</div>
 			</div>

docs/documentation/part2.html

@@ -16,7 +16,6 @@
 					<a class="tab" href="../downloads.html" >Downloads</a>
 					<a class="tab active" href="../documentation.html" >Documentation</a>
 					<a class="tab" href="../screenshots.html" >Screenshots and Videos</a>
-					<a class="tab" href="../involvement.html" >Get Involved</a>
 					<a href="http://appliedcoffeetechnology.tumblr.com/tagged/Typica" class="tab">Blog</a>
 				</div>
 			</div>
@@ -27,24 +26,21 @@
 				<ul>
 					<li><a href="part2/application.html">Opening the Application</a></li>
 					<ul>
-						<li><a href="part2/database-connection.html">Database Connection Settings</a></li>
-						<li><a href="part2/open-configuration.html">Open Configuration File</a></li>
+						<li><a href="windowreference/databaseconnection.html">Connecting to a database</a></li>
+						<li><a href="windowreference/openconfigurationfile">Open Configuration File</a></li>
 						<ul>
 							<li><a href="part2/argument-c.html">Eliminating the Configuration Prompt</a></li>
 						</ul>
-						<li><a>Choose Your Path</a></li>
+						<li><a href="windowreference/navigation.html">Main navigation window</a></li>
 					</ul>
 					<li><a>Configure Roasters</a></li>
-					<li><a>Roast Coffee</a></li>
+					<li><a href="windowreference/logging.html">The Logging View</a></li>
 					<li><a>Purchase Green Coffee</a></li>
 					<li><a>Manage Roasted Coffee Items</a></li>
 					<li><a>Update Inventory</a></li>
-					<li><a>Batch Log</a></li>
 					<li><a>Cupping</a></li>
 					<li><a>Import Target Roast Profiles</a></li>
-					<li><a>Invoice List</a></li>
 					<li><a>Enter Green Coffee Sales</a></li>
-					<li><a>Reports</a></li>
 				</ul>
 			</div>
 		</div>

docs/documentation/windowreference/databaseconnection.html

@@ -0,0 +1,79 @@
+<html>
+    <head>
+        <title>Typica - Connecting to a database</title>
+        <link rel="stylesheet" type="text/css" href="../../style.css">
+    </head>
+    <body>
+        <div id="page">
+            <div id="topmatter">
+                <div id="topbanner">
+                    <img src="../../logo96.png" height="96px" width="96px" alt="Typica logo" />
+                    <h1>Typica</h1>
+                    <h2>Data for Coffee Roasters</h2>
+                </div>
+                <div id="menu">
+                    <a class="tab" href="../../index.html">Project Home</a>
+                    <a class="tab" href="../../downloads.html" >Downloads</a>
+                    <a class="tab active" >Documentation</a>
+                    <a class="tab" href="../../screenshots.html" >Screenshots and Videos</a>
+                    <a href="http://appliedcoffeetechnology.tumblr.com/tagged/Typica" class="tab">Blog</a>
+                </div>
+            </div>
+            <div id="maintext">
+                <h1>Connecting to a database</h1>
+                <p>When opening Typica, if you have not previously connected to
+                a database, you will be prompted for information needed to
+                connect to that database.</p>
+
+                <img src="databaseconnection.png"/>
+                
+                <p>If you do not want to connect to a database, you can click
+                the Cancel button, but doing so means that most of the features
+                of Typica will not work. Clicking the Connect button will cause
+                Typica to attempt to connect to the database with the
+                information provided in the fields. An error message will be
+                presented if that connection attempt fails.</p>
+                
+                <p>After either successfully connecting to a database or
+                cancelling, you will be prompted to
+                <a href="openconfigurationfile.html">open a configuration
+                file.</a></p>
+                
+                <h2>Field descriptions</h2>
+                
+                <h3>Database driver</h3>
+                <p>Currently the only database supported is PostgreSQL.</p>
+                
+                <h3>Host name</h3>
+                <p>This identifies the computer the database is installed on.
+                If the database is on the same computer as Typica, this can be
+                <tt>localhost</tt> otherwise it will most likely be an IP
+                address for another computer on your network.</p>
+                
+                <h3>Port number</h3>
+                <p>PostgreSQL normally communicates on port 5432 but if you
+                have PostgreSQL configured to communicate over a different port
+                this field should be changed to match.</p>
+                
+                <h3>Database name</h3>
+                <p>During installation, the PostgreSQL installer creates a
+                database called <tt>postgres</tt>. If you've created a new
+                database for use with Typica, its name should be used.</p>
+                
+                <h3>User name</h3>
+                <p>During installation, the PostgreSQL installer creates a
+                database user called <tt>postgres</tt>. If you don't want to
+                create separate users, this account can be used. Typica keeps
+                track of which database user performed many data entry tasks so
+                it is recommended to create new users for everybody who will be
+                using Typica.</p>
+                
+                <h3>Password</h3>
+                <p>This is the password previously set for the database user.
+                If you are using the <tt>postgres</tt> user, this was set
+                during PostgreSQL installation.</p>
+
+            </div>
+        </div>
+    </body>
+</html>

docs/documentation/windowreference/logging.html

@@ -0,0 +1,202 @@
+<html>
+    <head>
+        <title>Typica - The Logging View</title>
+        <link rel="stylesheet" type="text/css" href="../../style.css">
+    </head>
+    <body>
+        <div id="page">
+            <div id="topmatter">
+                <div id="topbanner">
+                    <img src="../../logo96.png" height="96px" width="96px" alt="Typica logo" />
+                    <h1>Typica</h1>
+                    <h2>Data for Coffee Roasters</h2>
+                </div>
+                <div id="menu">
+                    <a class="tab" href="../../index.html">Project Home</a>
+                    <a class="tab" href="../../downloads.html" >Downloads</a>
+                    <a class="tab active" >Documentation</a>
+                    <a class="tab" href="../../screenshots.html" >Screenshots and Videos</a>
+                    <a href="http://appliedcoffeetechnology.tumblr.com/tagged/Typica" class="tab">Blog</a>
+                </div>
+            </div>
+            <div id="maintext">
+                <h1>The Logging View</h1>
+                <p>The appearance of the logging view depends on how the selected
+                roaster was configured, but there are a few main areas where
+                different interface items are located.</p>
+
+                <img src="logging.png"/>
+                
+                <p>The window title will change to reflect a loaded target roast
+                profile and can provide the name of the coffee being roasted.</p>
+
+                <p>The menu bar provides access to a number of operations such
+                as saving or loading data on disk, entering new batch information,
+                clearing recorded data, changing how data is displayed, and more.
+                Note that on a Mac the menu bar will be at the top of the screen
+                and not within the window as is normal on that platform.</p>
+
+                <p>Continuing down the window is the indicator panel. This is
+                where current temperature indicators, rate of change information,
+                and timers will be displayed. The number, type, and order of
+                indicators depends on the roaster configuration. There are
+                splitter handles between each indicator which can be used to
+                control the width of each indicator. The last indicator should
+                always be the batch timer. If you don't see this, there should
+                be a splitter handle to the right of the last visible indicator
+                which can be dragged left to reveal additional indicators. A
+                splitter handle at the bottom can be used to control the height
+                of all indicators.</p>
+
+                <p>Next is a row of buttons. At minimum this will include buttons
+                for starting and stopping the batch, but a number of other
+                controls for inserting notes in the log can also be configured
+                to appear here. Under these buttons is another splitter handle
+                that can be used to control the height of to table and graph
+                below.</p>
+
+                <p>Below this and on the left is a table view showing times,
+                temperatures, and notes for both a target profile if one is
+                loaded and the current batch if one is being recorded.</p>
+
+                <p>To the right of the table view is a graph showing both
+                loaded target profiles, if any, and current batch data.</p>
+
+                <h2>Buttons</h2>
+
+                <h3>Start Batch</h3>
+                <p>This button starts recording roasting data. If the New Batch
+                or New Sample Batch windows were used, the roasting data can be
+                associated with a batch in the database. Clicking this will
+                also start the batch timer from 00:00, start any other timers
+                that have been configured to start from the start of the batch,
+                and create any annotations that have been configured for entry
+                at the start of the batch if any.</p>
+
+                <h3>Stop Batch</h3>
+                <p>This button stops the batch timer, stops recording roasting
+                data, and if the New Batch or New Sample Batch windows were
+                used, the window with data associated with the finished batch
+                will be raised.</p>
+
+                <h3>Additional Buttons</h3>
+                <p>Additional buttons and controls will appear if these have
+                been configured.</p>
+
+                <h2>The File Menu</h2>
+
+                <img src="loggingfile.png" />
+
+                <h3>Open...</h3>
+                <p>This can be used to load roasting data previously saved to
+                disk. This is mainly useful when receiving roasting data that
+                has been shared from another roaster. In normal use it is much
+                better to use information saved to the database instead of
+                managing files manually.</p>
+
+                <h3>Save...</h3>
+                <p>This can be used to save roasting data to disk. This is
+                mainly useful to share roasting data with another person using
+                Typica. For other uses it is much better to use the New Batch
+                and New Sample Batch windows to have roasting data saved to the
+                database.</p>
+
+                <h3>Print...</h3>
+                <p>This can be used to print roasting data. The print window
+                will appear, allowing the information printed to be
+                customized.</p>
+
+                <h3>Export CSV...</h3>
+                <p>This can be used to export roasting data as a CSV file which
+                can be opened in all popular spreadsheet applications or used
+                with a wide variety of other tools. If this is something that
+                you frequently require, it may be a good idea to reach out to
+                the author with your use case and see if there is a way to do
+                what you want within Typica or if Typica should be extended to
+                support your use case.</p>
+
+                <h3>Export XHTML+SVG</h3>
+                <p>This can be used to produce the same information that can be
+                printed, but produces that as an XHTML+SVG document.</p>
+
+                <h3>Quit</h3>
+                <p>On some platforms this might be called Exit and on the Mac
+                this will be moved under the Typica menu. It is used to quit
+                Typica.</p>
+                
+                <h2>The Batch Menu</h2>
+                
+                <img src="loggingbatch.png" />
+                
+                <h3>New Batch...</h3>
+                <p>This is the preferred way to enter the details of a
+                production roast such that recorded roasting data can be
+                associated with a batch and green coffee inventory can be
+                adjusted. Selecting this will open the New Batch window.</p>
+                
+                <h3>New Sample Batch...</h3>
+                <p>When roasting a green coffee not in inventory such as
+                pre-purchase samples, you can use this menu item to open the
+                New Sample Batch window and associate the roasting data with
+                additional information about the coffee.</p>
+                
+                <h3>Load Additional Profiles...</h3>
+                <p>If you do not have a target roast profile for the roasted
+                coffee item you are producing but have a batch that you would
+                like to have available for reference previously saved in the
+                database, you can use this menu item to load that information
+                as a target roast profile.</p>
+                
+                <h2>The Log Menu</h2>
+                
+                <img src="logginglog.png" />
+                
+                <h3>Display Celsius</h3>
+                <p>This menu item can be used to change displayed temperature
+                measurements to Celsius.</p>
+                
+                <h3>Display Fahrenheit</h3>
+                <p>This menu item can be used to change displayed temperature
+                measurements to Fahrenheit.</p>
+                
+                <h3>New Sample Parameters</h3>
+                <p>If a Counting Button has been configured, this menu item
+                will be available to change the annotation text or reset the
+                number used in annotations when that button is activated.</p>
+                
+                <h3>Clear Log</h3>
+                <p>This menu item removes all information currently visible in
+                the table and graph views.</p>
+                
+                <h3>Millisecond View</h3>
+                <h3>1 Second View</h3>
+                <h3>5 Second View</h3>
+                <h3>10 Second View</h3>
+                <h3>15 Second View</h3>
+                <h3>30 Second View</h3>
+                <h3>1 Minute View</h3>
+                
+                <p>These items affect the table view. The millisecond view will
+                show every measurement in the table while the other views will
+                limit the entries shown to one per indicated interval with the
+                exception of times associated with an annotation which will
+                always be shown regardless of the selected view.</p>
+                
+                <h3>Manual Entry</h3>
+                <p>This can be used for entering roasting data collected when
+                not connected to a roaster. The utility of this feature is
+                somewhat limited and generally not worth using.</p>
+                
+                <h2> The Graph Menu</h2>
+                
+                <img src="logginggraph.png" />
+                
+                <h3>Reset Translation</h3>
+                <p>If the roaster in use has been configured to use roast
+                profile translation, this item can be used to reset any
+                currently applied translation transformation in the graph.</p>
+                
+            </div>
+        </div>
+    </body>
+</html>

docs/documentation/windowreference/navigation.html

@@ -0,0 +1,156 @@
+<html>
+    <head>
+        <title>Typica - Choose Your Path</title>
+        <link rel="stylesheet" type="text/css" href="../../style.css">
+    </head>
+    <body>
+        <div id="page">
+            <div id="topmatter">
+                <div id="topbanner">
+                    <img src="../../logo96.png" height="96px" width="96px" alt="Typica logo" />
+                    <h1>Typica</h1>
+                    <h2>Data for Coffee Roasters</h2>
+                </div>
+                <div id="menu">
+                    <a class="tab" href="../../index.html">Project Home</a>
+                    <a class="tab" href="../../downloads.html" >Downloads</a>
+                    <a class="tab active" >Documentation</a>
+                    <a class="tab" href="../../screenshots.html" >Screenshots and Videos</a>
+                    <a href="http://appliedcoffeetechnology.tumblr.com/tagged/Typica" class="tab">Blog</a>
+                </div>
+            </div>
+            <div id="maintext">
+                <h1>Main navigation window</h1>
+                <p>Most of the functionality in Typica is available through the
+                main navigation window.</p>
+
+                <img src="navigation.png"/>
+                
+                <h2>Buttons</h2>
+                
+                <h3>Configure Roasters</h3>
+                
+                <p>Typica can communicate with different pieces of data
+                acquisition hardware which must be configured before use.
+                Various features related to recording roasting data can be
+                set in the configuration
+                window.
+                
+                <h3>Roast Coffee</h3>
+                
+                <p>Once at least one coffee roaster has been configured, it
+                will be available from the selector next to the Roast Coffee
+                button. When you want to roast coffee, select the machine
+                you'll be using and click the Roast Coffee button. This will
+                take you to <a href="logging.html">the logging view.</a></p>
+                
+                <h3>Purchase Green Coffee</h3>
+                
+                <p>Typica tracks green coffee inventory. This button allows
+                you to enter the details of green coffee purchases.</p>
+                
+                <h3>Manage Roasted Coffee Items</h3>
+                
+                <p>When entering the details of a new production batch, you
+                will want to select a roasted coffee item. This is connected
+                to the green coffee(s) used, a target roast profile and
+                roasting specification if set. This button allows you to create
+                new roasted coffee items, discontinue items so that they will
+                not show up in lists, and bring back old items.</p>
+                
+                <h3>Edit Roasting Specification</h3>
+                
+                <p>Expected percent weight loss and other information can be
+                presented when roasting coffee for use in determining if a
+                batch matches its product specification.</p>
+                
+                <h3>Update Inventory</h3>
+                
+                <p>Inventory and loss transactions can be used to adjust
+                green coffee inventory.</p>
+                
+                <h3>New Cupping Session</h3>
+                <h3>Join Cupping Session</h3>
+                <h3>Summarize Cupping Session</h3>
+                
+                <p>Typica includes a set of cupping features. Some people use
+                this, but the author does not recommend it. Something much
+                better will be available in the future.</p>
+                
+                <h3>View Target Roast Profiles</h3>
+                
+                <p>Any data ever saved as a target roast profile for roasted
+                coffee items can be seen here.</p>
+                
+                <h3>Import Target Roast Profiles</h3>
+                
+                <p>It is possible to save batch data to disk instead of or in
+                addition to saving that to the database. These files can be
+                shared with other people using Typica. If you want to set data
+                from one of these files as a target roast profile for a given
+                roasted coffee item, this is where you do that.
+                
+                <h3>Enter Green Coffee Sales</h3>
+                
+                <p>If you sell green coffee, the inventory can be adjusted to
+                reflect that here.</p>
+                
+                <h2>Reports Menu</h2>
+                
+                <img src="reportsmenu.png" />
+                
+                <h3>Production</h3>
+                
+                <p>Production reports present information related to coffee
+                roasting activity.</p>
+                
+                <img src="productionreports.png" />
+                
+                <h3>Average Use and Cost by Origin</h3>
+                <h3>Previous Year Production Comparison</h3>
+                <h3>Cost of Green Coffee for Roasted Coffee</h3>
+                <h3>Daily Production Report (Detailed)</h3>
+                <h3>Batch Log</h3>
+                <h3>Previous Year Production Comparison By Month</h3>
+                <h3>Production Summary</h3>
+                <h3>Reminders</h3>
+                <h3>Recent Average Coffee Production</h3>
+                
+                <h3>Purchase</h3>
+                
+                <p>Purchase reports present information related to green coffee
+                purchases.</p>
+                
+                <img src="purchasereports.png" />
+                
+                <h3>Coffee Purchase Previous Years Comparison</h3>
+                <h3>Invoices</h3>
+                
+                <h3>Sales</h3>
+                
+                <p>Sales reports present information related to sales.</p>
+                
+                <img src="salesreport.png" />
+                
+                <h3>Green Coffee Sales</h3>
+                
+                <h3>Inventory</h3>
+                
+                <p>Inventory reports present information on inventory.</p>
+                
+                <img src="inventoryreports.png" />
+                
+                <h3>Inventory Change Summary</h3>
+                <h3>Current Inventory and Availability Projection</h3>
+                <h3>Item Transactions</h3>
+                
+                <h2>Database Menu</h2>
+                <h3>Forget Connection Details</h3>
+                <p>This menu item can be used to force Typica to prompt for
+                database connection information the next time Typica is
+                opened.</p>
+                
+            </div>
+        </div>
+    </body>
+</html>

docs/documentation/windowreference/openconfigurationfile.html

@@ -0,0 +1,38 @@
+<html>
+    <head>
+        <title>Typica - Open Configuration File</title>
+        <link rel="stylesheet" type="text/css" href="../../style.css">
+    </head>
+    <body>
+        <div id="page">
+            <div id="topmatter">
+                <div id="topbanner">
+                    <img src="../../logo96.png" height="96px" width="96px" alt="Typica logo" />
+                    <h1>Typica</h1>
+                    <h2>Data for Coffee Roasters</h2>
+                </div>
+                <div id="menu">
+                    <a class="tab" href="../../index.html">Project Home</a>
+                    <a class="tab" href="../../downloads.html" >Downloads</a>
+                    <a class="tab active" >Documentation</a>
+                    <a class="tab" href="../../screenshots.html" >Screenshots and Videos</a>
+                    <a href="http://appliedcoffeetechnology.tumblr.com/tagged/Typica" class="tab">Blog</a>
+                </div>
+            </div>
+            <div id="maintext">
+                <h1>Open Configuration File</h1>
+                <p>Most of Typica's appearance and functionality is controlled
+                by a set of configuration files. This documentation covers an
+                example configuration included with Typica. When prompted to
+                open a configuration file, select the config.xml file included
+                with Typica. When switching to a new version of Typica, it is
+                important to use the configuration file included with the new
+                version and not the old one. Opening that file will open the
+                <a href="navigation.html">main navigation window.</a></p>
+
+                <img src="openconfigurationfile.png"/>
+                
+            </div>
+        </div>
+    </body>
+</html>

src/Typica.pro

@@ -8,6 +8,7 @@ QT += sql
 QT += xmlpatterns
 QT += scripttools
 QT += webkit
+QT += svg
 
 CONFIG += extserialport
 
@@ -43,3 +44,5 @@ RESOURCES += \
 RC_FILE = typica.rc
 ICON = resources/icons/appicons/logo.icns
 QMAKE_INFO_PLIST = resources/Info.plist
+
+CODECFORTR = UTF-8

src/abouttypica.cpp

@@ -1,9 +1,9 @@
-/*265:*/
+/*275:*/
 #line 33 "./abouttypica.w"
 
 #include "abouttypica.h"
 
-/*266:*/
+/*276:*/
 #line 42 "./abouttypica.w"
 
 AboutTypica::AboutTypica():QMainWindow(NULL)
@@ -17,10 +17,10 @@ aboutFile.close();
 setCentralWidget(banner);
 }
 
-#line 6404 "./typica.w"
+#line 6592 "./typica.w"
 
-/*:266*/
+/*:276*/
 #line 36 "./abouttypica.w"
 
 
-/*:265*/
+/*:275*/

src/abouttypica.h

@@ -1,4 +1,4 @@
-/*264:*/
+/*274:*/
 #line 14 "./abouttypica.w"
 
 #include <QMainWindow> 
@@ -17,4 +17,4 @@ AboutTypica();
 
 #endif
 
-/*:264*/
+/*:274*/

src/daterangeselector.cpp

@@ -1,4 +1,4 @@
-/*656:*/
+/*666:*/
 #line 70 "./daterangeselector.w"
 
 #include <QCalendarWidget> 
@@ -11,7 +11,7 @@
 
 #include "daterangeselector.h"
 
-/*658:*/
+/*668:*/
 #line 115 "./daterangeselector.w"
 
 CustomDateRangePopup::CustomDateRangePopup(QWidget*parent):
@@ -55,7 +55,7 @@ outerLayout->addLayout(buttonLayout);
 setLayout(outerLayout);
 }
 
-/*:658*//*659:*/
+/*:668*//*669:*/
 #line 163 "./daterangeselector.w"
 
 void CustomDateRangePopup::hideEvent(QHideEvent*)
@@ -63,7 +63,7 @@ void CustomDateRangePopup::hideEvent(QHideEvent*)
 emit hidingPopup();
 }
 
-/*:659*//*660:*/
+/*:669*//*670:*/
 #line 172 "./daterangeselector.w"
 
 void CustomDateRangePopup::applyRange()
@@ -78,7 +78,7 @@ endDateSelector->selectedDate().toString(Qt::ISODate)));
 hide();
 }
 
-/*:660*//*661:*/
+/*:670*//*671:*/
 #line 189 "./daterangeselector.w"
 
 void CustomDateRangePopup::validateRange()
@@ -93,10 +93,10 @@ applyButton->setEnabled(true);
 }
 }
 
-/*:661*/
+/*:671*/
 #line 81 "./daterangeselector.w"
 
-/*662:*/
+/*672:*/
 #line 207 "./daterangeselector.w"
 
 DateRangeSelector::DateRangeSelector(QWidget*parent):
@@ -108,7 +108,7 @@ connect(quickSelector,SIGNAL(currentIndexChanged(int)),this,SLOT(updateRange(int
 QDate currentDate= QDate::currentDate();
 
 QHBoxLayout*layout= new QHBoxLayout;
-/*663:*/
+/*673:*/
 #line 236 "./daterangeselector.w"
 
 quickSelector->addItem("Yesterday",QVariant(QStringList()<<
@@ -188,7 +188,7 @@ quickSelector->insertSeparator(quickSelector->count());
 quickSelector->addItem("Lifetime");
 quickSelector->addItem("Custom");
 
-/*:663*/
+/*:673*/
 #line 217 "./daterangeselector.w"
 
 QToolButton*customButton= new QToolButton;
@@ -201,7 +201,7 @@ setLayout(layout);
 connect(customButton,SIGNAL(clicked()),this,SLOT(toggleCustom()));
 }
 
-/*:662*//*664:*/
+/*:672*//*674:*/
 #line 319 "./daterangeselector.w"
 
 void DateRangeSelector::updateRange(int index)
@@ -217,7 +217,7 @@ emit rangeUpdated(quickSelector->itemData(quickSelector->currentIndex()));
 }
 }
 
-/*:664*//*665:*/
+/*:674*//*675:*/
 #line 336 "./daterangeselector.w"
 
 void DateRangeSelector::popupHidden()
@@ -227,7 +227,7 @@ customRangeSelector= NULL;
 quickSelector->setCurrentIndex(lastIndex);
 }
 
-/*:665*//*666:*/
+/*:675*//*676:*/
 #line 347 "./daterangeselector.w"
 
 void DateRangeSelector::setCustomRange(QVariant range)
@@ -238,7 +238,7 @@ lastIndex= quickSelector->count()-1;
 quickSelector->setCurrentIndex(lastIndex);
 }
 
-/*:666*//*667:*/
+/*:676*//*677:*/
 #line 362 "./daterangeselector.w"
 
 void DateRangeSelector::toggleCustom()
@@ -279,7 +279,7 @@ customRangeSelector= NULL;
 }
 }
 
-/*:667*//*668:*/
+/*:677*//*678:*/
 #line 404 "./daterangeselector.w"
 
 QVariant DateRangeSelector::currentRange()
@@ -287,7 +287,7 @@ QVariant DateRangeSelector::currentRange()
 return quickSelector->itemData(lastIndex);
 }
 
-/*:668*//*669:*/
+/*:678*//*679:*/
 #line 412 "./daterangeselector.w"
 
 void DateRangeSelector::setCurrentIndex(int index)
@@ -300,7 +300,7 @@ int DateRangeSelector::currentIndex()
 return quickSelector->currentIndex();
 }
 
-/*:669*//*670:*/
+/*:679*//*680:*/
 #line 432 "./daterangeselector.w"
 
 void DateRangeSelector::setLifetimeRange(QString startDate,QString endDate)
@@ -309,7 +309,7 @@ quickSelector->setItemData(quickSelector->count()-2,
 QVariant(QStringList()<<startDate<<endDate));
 }
 
-/*:670*//*671:*/
+/*:680*//*681:*/
 #line 442 "./daterangeselector.w"
 
 void DateRangeSelector::removeIndex(int index)
@@ -317,12 +317,12 @@ void DateRangeSelector::removeIndex(int index)
 quickSelector->removeItem(index);
 }
 
-/*:671*/
+/*:681*/
 #line 82 "./daterangeselector.w"
 
 
-#if 0
+#ifdef __unix__
 #include "moc_daterangeselector.cpp"
 #endif
 
-/*:656*/
+/*:666*/

src/daterangeselector.h

@@ -1,4 +1,4 @@
-/*655:*/
+/*665:*/
 #line 30 "./daterangeselector.w"
 
 
@@ -9,7 +9,7 @@
 #ifndef TypicaDateRangeSelectorHeader
 #define TypicaDateRangeSelectorHeader
 
-/*657:*/
+/*667:*/
 #line 91 "./daterangeselector.w"
 
 class CustomDateRangePopup:public QWidget
@@ -31,7 +31,7 @@ QCalendarWidget*endDateSelector;
 QPushButton*applyButton;
 };
 
-/*:657*/
+/*:667*/
 #line 39 "./daterangeselector.w"
 
 
@@ -62,4 +62,4 @@ int lastIndex;
 
 #endif
 
-/*:655*/
+/*:665*/

src/daterangeselector.w

@@ -81,7 +81,7 @@ class DateRangeSelector : public QWidget
 @<CustomDateRangePopup implementation@>
 @<DateRangeSelector implementation@>
 
-#if 0
+#ifdef __unix__
 #include "moc_daterangeselector.cpp"
 #endif
 

src/draglabel.cpp

@@ -1,4 +1,4 @@
-/*992:*/
+/*1002:*/
 #line 33 "./scales.w"
 
 #include "draglabel.h"
@@ -26,4 +26,4 @@ drag->exec();
 }
 }
 
-/*:992*/
+/*:1002*/

src/draglabel.h

@@ -1,4 +1,4 @@
-/*991:*/
+/*1001:*/
 #line 13 "./scales.w"
 
 #ifndef TypicaDragLabelInclude
@@ -17,4 +17,4 @@ void mousePressEvent(QMouseEvent*event);
 
 #endif
 
-/*:991*/
+/*:1001*/

src/helpmenu.cpp

@@ -1,11 +1,11 @@
-/*194:*/
+/*204:*/
 #line 36 "./helpmenu.w"
 
 #include "helpmenu.h"
 #include "abouttypica.h"
 #include "licensewindow.h"
 
-/*195:*/
+/*205:*/
 #line 46 "./helpmenu.w"
 
 HelpMenu::HelpMenu():QMenu()
@@ -24,7 +24,7 @@ connect(licenseAction,SIGNAL(triggered()),this,SLOT(displayLicenseWindow()));
 #endif
 }
 
-/*:195*//*196:*/
+/*:205*//*206:*/
 #line 66 "./helpmenu.w"
 
 void HelpMenu::displayAboutTypica()
@@ -33,7 +33,7 @@ AboutTypica*aboutBox= new AboutTypica;
 aboutBox->show();
 }
 
-/*:196*//*197:*/
+/*:206*//*207:*/
 #line 76 "./helpmenu.w"
 
 void HelpMenu::displayLicenseWindow()
@@ -42,11 +42,11 @@ LicenseWindow*window= new LicenseWindow;
 window->show();
 }
 
-#line 4615 "./typica.w"
+#line 4772 "./typica.w"
 
 #line 1 "./licensewindow.w"
-/*:197*/
+/*:207*/
 #line 41 "./helpmenu.w"
 
 
-/*:194*/
+/*:204*/

src/helpmenu.h

@@ -1,4 +1,4 @@
-/*193:*/
+/*203:*/
 #line 16 "./helpmenu.w"
 
 #include <QMenu> 
@@ -18,4 +18,4 @@ void displayLicenseWindow();
 
 #endif
 
-/*:193*/
+/*:203*/

src/licensewindow.cpp

@@ -0,0 +1,69 @@
+/*209:*/
+#line 36 "./licensewindow.w"
+
+/*213:*/
+#line 97 "./licensewindow.w"
+
+#include "licensewindow.h"
+
+#include <QSplitter> 
+#include <QListWidget> 
+#include <QVariant> 
+#include <QUrl> 
+
+#line 4774 "./typica.w"
+
+/*:213*/
+#line 37 "./licensewindow.w"
+
+/*210:*/
+#line 43 "./licensewindow.w"
+
+LicenseWindow::LicenseWindow()
+:QMainWindow(NULL),view(new QWebView)
+{
+QSplitter*split= new QSplitter;
+QListWidget*projects= new QListWidget;
+
+/*212:*/
+#line 79 "./licensewindow.w"
+
+QListWidgetItem*item= new QListWidgetItem("Typica",projects);
+item->setData(Qt::UserRole,QVariant(QUrl("qrc:/resources/html/licenses/typica.html")));
+projects->setCurrentItem(item);
+setWebView(item,NULL);
+item= new QListWidgetItem("d3.js",projects);
+item->setData(Qt::UserRole,QVariant(QUrl("qrc:/resources/html/licenses/d3.html")));
+item= new QListWidgetItem("Entypo",projects);
+item->setData(Qt::UserRole,QVariant(QUrl("qrc:/resources/html/licenses/entypo.html")));
+item= new QListWidgetItem("Tango Desktop Project",projects);
+item->setData(Qt::UserRole,QVariant(QUrl("qrc:/resources/html/licenses/tango.html")));
+item= new QListWidgetItem("QextSerialPort",projects);
+item->setData(Qt::UserRole,QVariant(QUrl("qrc:/resources/html/licenses/qextserialport.html")));
+item= new QListWidgetItem("Qt",projects);
+item->setData(Qt::UserRole,QVariant(QUrl("qrc:/resources/html/licenses/qt.html")));
+
+/*:212*/
+#line 50 "./licensewindow.w"
+
+connect(projects,SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)),
+this,SLOT(setWebView(QListWidgetItem*,QListWidgetItem*)));
+
+split->addWidget(projects);
+split->addWidget(view);
+setCentralWidget(split);
+}
+
+/*:210*//*211:*/
+#line 64 "./licensewindow.w"
+
+void LicenseWindow::setWebView(QListWidgetItem*current,QListWidgetItem*)
+{
+view->load(current->data(Qt::UserRole).toUrl());
+}
+
+/*:211*/
+#line 38 "./licensewindow.w"
+
+
+/*:209*/

src/licensewindow.h

@@ -0,0 +1,24 @@
+/*208:*/
+#line 13 "./licensewindow.w"
+
+#include <QMainWindow> 
+#include <QListWidgetItem> 
+#include <QWebView> 
+
+#ifndef TypicaLicenseHeader
+#define TypicaLicenseHeader
+
+class LicenseWindow:public QMainWindow
+{
+Q_OBJECT
+public:
+LicenseWindow();
+private slots:
+void setWebView(QListWidgetItem*current,QListWidgetItem*);
+private:
+QWebView*view;
+};
+
+#endif
+
+/*:208*/

src/moc_helpmenu.cpp

@@ -22,7 +22,7 @@ static const uint qt_meta_data_HelpMenu[] = {
        6,       // revision
        0,       // classname
        0,    0, // classinfo
-       1,   14, // methods
+       2,   14, // methods
        0,    0, // properties
        0,    0, // enums/sets
        0,    0, // constructors
@@ -31,12 +31,14 @@ static const uint qt_meta_data_HelpMenu[] = {
 
  // slots: signature, parameters, type, tag, flags
       10,    9,    9,    9, 0x0a,
+      31,    9,    9,    9, 0x0a,
 
        0        // eod
 };
 
 static const char qt_meta_stringdata_HelpMenu[] = {
     "HelpMenu\0\0displayAboutTypica()\0"
+    "displayLicenseWindow()\0"
 };
 
 void HelpMenu::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
@@ -46,6 +48,7 @@ void HelpMenu::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, vo
         HelpMenu *_t = static_cast<HelpMenu *>(_o);
         switch (_id) {
         case 0: _t->displayAboutTypica(); break;
+        case 1: _t->displayLicenseWindow(); break;
         default: ;
         }
     }
@@ -84,9 +87,9 @@ int HelpMenu::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
     if (_id < 0)
         return _id;
     if (_c == QMetaObject::InvokeMetaMethod) {
-        if (_id < 1)
+        if (_id < 2)
             qt_static_metacall(this, _c, _id, _a);
-        _id -= 1;
+        _id -= 2;
     }
     return _id;
 }

src/moc_typica.cpp

@@ -3759,25 +3759,31 @@ static const uint qt_meta_data_RoasterConfWidget[] = {
        6,       // revision
        0,       // classname
        0,    0, // classinfo
-       1,   14, // methods
+       4,   14, // methods
        0,    0, // properties
        0,    0, // enums/sets
-       1,   19, // constructors
+       1,   34, // constructors
        0,       // flags
        0,       // signalCount
 
  // slots: signature, parameters, type, tag, flags
       22,   19,   18,   18, 0x08,
+      49,   43,   18,   18, 0x08,
+      74,   43,   18,   18, 0x08,
+      98,   43,   18,   18, 0x08,
 
  // constructors: signature, parameters, type, tag, flags
-      55,   43,   18,   18, 0x0e,
+     138,  126,   18,   18, 0x0e,
 
        0        // eod
 };
 
 static const char qt_meta_stringdata_RoasterConfWidget[] = {
     "RoasterConfWidget\0\0id\0updateRoasterId(int)\0"
-    "model,index\0RoasterConfWidget(DeviceTreeModel*,QModelIndex)\0"
+    "value\0updateCapacityCheck(int)\0"
+    "updateCapacity(QString)\0"
+    "updateCapacityUnit(QString)\0model,index\0"
+    "RoasterConfWidget(DeviceTreeModel*,QModelIndex)\0"
 };
 
 void RoasterConfWidget::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
@@ -3792,6 +3798,9 @@ void RoasterConfWidget::qt_static_metacall(QObject *_o, QMetaObject::Call _c, in
         RoasterConfWidget *_t = static_cast<RoasterConfWidget *>(_o);
         switch (_id) {
         case 0: _t->updateRoasterId((*reinterpret_cast< int(*)>(_a[1]))); break;
+        case 1: _t->updateCapacityCheck((*reinterpret_cast< int(*)>(_a[1]))); break;
+        case 2: _t->updateCapacity((*reinterpret_cast< const QString(*)>(_a[1]))); break;
+        case 3: _t->updateCapacityUnit((*reinterpret_cast< const QString(*)>(_a[1]))); break;
         default: ;
         }
     }
@@ -3829,9 +3838,9 @@ int RoasterConfWidget::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
     if (_id < 0)
         return _id;
     if (_c == QMetaObject::InvokeMetaMethod) {
-        if (_id < 1)
+        if (_id < 4)
             qt_static_metacall(this, _c, _id, _a);
-        _id -= 1;
+        _id -= 4;
     }
     return _id;
 }

src/resources/Info.plist

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
-<plist version="0.9">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
 <dict>
 	<key>CFBundleIconFile</key>
 	<string>@ICON@</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleGetInfoString</key>
-	<string>Typica 1.6.4</string>
+	<string>Typica 1.7.0</string>
 	<key>CFBundleSignature</key>
 	<string>@TYPEINFO@</string>
 	<key>CFBundleExecutable</key>
@@ -17,10 +17,10 @@
 	<key>CFBundleDisplayName</key>
 	<string>Typica</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.6.4</string>
+	<string>1.7.0</string>
 	<key>CFBundleVersion</key>
-	<string>1.6.4</string>
+	<string>1.7.0</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>© 2007–2015 Neal Wilson</string>
+	<string>© 2007–2016 Neal Wilson</string>
 </dict>
 </plist>

src/resources/html/about.html

@@ -10,10 +10,10 @@
 				<div class="topbanner">
 					<a href="http://www.randomfield.com/programs/typica/"><img src="../icons/appicons/logo96.png" height="96px" width="96px" alt="Typica logo" /></a>
 					<h1><a href="http://www.randomfield.com/programs/typica/">Typica</a></h1>
-					<h2>Version 1.6.4</h2>
+					<h2>Version 1.7.0</h2>
 				</div>
 			<div id="maintext">
-				<p>Copyright &copy; 2007&ndash;2015 Neal Evan Wilson
+				<p>Copyright &copy; 2007&ndash;2016 Neal Evan Wilson
 					<span class="icons">
 						<a href="mailto:roaster@wilsonscoffee.com?subject=Thanks%20for%20Typica&amp;body=Message%20initiated%20from%20Typica.">&#9993;</a>
 						<a href="https://twitter.com/N3Roaster">&#62217;</a>
@@ -22,87 +22,11 @@
 						<a href="http://www.linkedin.com/profile/view?id=179814079">&#62232;</a>
 					</span>
 				</p>
-				<h3>Special Thanks</h3>
-				<p>Ongoing development of Typica is made possible through the
-				generous financial contributions from the following:</p>
-				
-				<p>La Cosecha Coffee Roasters</p>
-				<p>Pinnacle Coffee Roasting</p>
-				<p>Water Street Coffee Roaster</p>
-				<p>Anonymous Funders</p>
-				
-				<p>Hardware for developing Phidgets 1048 support was provided
-				by Phidgets, Inc.</p>
-				
-				<p>Special thanks also to all who have sent bug reports and
-				feature requests.</p>
-
-				<div class="nbg">
-				<div class="nextversion">
-				<div class="nextbanner">
-					<img src="typica2logo96.png" height="96px" width="96px" alt="Typica 2.0 logo" />
-					<h1>Preview of the Next Episode</h3>
-				</div>
-				<p>This will likely be one of the last releases in the 1.x
-				series. Typica 1.0 was released in 2007 and I've learned a
-				lot from developing this, using it, and having conversations
-				with others about how they're using this. While there is the
-				possibility of further improvements, I believe Typica has
-				reached a point of maturity with a feature set appropriate for
-				many coffee roasting firms.</p>
-
-				<p>There is a large set of features and extensions that I have
-				avoided implementing because the changes would have been too
-				intrusive for the code base as it currently exists, but that
-				feature set has become too compelling for me to leave undone.
-				I am, therefore, attempting to spend as much time as I can on
-				the development of Typica 2.0. This removes many of the legacy
-				considerations and modernizes the tools and techniques used. I
-				hope that the result is a better and more broadly useful Typica
-				that can be maintained for another several years.</p>
-				
-				<p>While Typica is free and will continue to be made freely
-				available complete with all source code, there are still costs
-				associated with ongoing development and keeping the software
-				available. Some of the costs include:
-					<ul>
-						<li>Obtaining and maintaining hardware appropriate for
-						building and testing new releases</li>
-						<li>Building and maintaining test rigs for various
-						types of data acquisition hardware</li>
-						<li>Maintaining the ability to test on new operating
-						system releases</li>
-						<li>Hosting service</li>
-					</ul>
-				There is also a huge commitment of time in developing, testing,
-				and supporting this.</p>
-
-				<p>Financial support to date does not come close to covering
-				these costs, nor has it been enough that I could consider
-				hiring people to improve the pace and quality of ongoing
-				development. This is fine. I have no intention of halting work
-				on the project as my work has benefitted greatly from having
-				this software and I expect even greater benefit from the next
-				major release. Personally I find the new feature set exciting
-				to work on and am willing to cover funding shortfalls when I
-				can afford to do so.</p>
-				
-				<p>That said, if you're finding this software to be useful in
-				your business, if you've had a good support experience, or if
-				you'd like to help me continue to develop this software, please
-				consider providing some financial support to:</p>
-				
-				<p>Neal Wilson<br />
-				c/o Wilson's Coffee &amp; Tea<br />
-				3306 Washington Ave.<br />
-				Racine, WI 53405<br />
-				USA</p>
-				
-				<p>Another great way to help Typica right now is to reach out
-				to your professional colleagues and let them know that you're
-				using Typica and what you like about it.</p>
-				</div>
-				</div>
+				<p>German Translation: Mario Champignon
+                                    <span class="icons">
+                                        <a href="mailto:mario_champignon@hotmail.com">&#9993;</a>
+                                    </span>
+                                </p>
 				
 				<h3>License Information</h3>
 				<p>Permission is hereby granted, free of charge, to any person

src/scale.cpp

@@ -1,4 +1,4 @@
-/*998:*/
+/*1008:*/
 #line 131 "./scales.w"
 
 #include "scale.h"
@@ -10,7 +10,7 @@ QextSerialPort(port,QextSerialPort::EventDriven)
 connect(this,SIGNAL(readyRead()),this,SLOT(dataAvailable()));
 }
 
-/*:998*//*999:*/
+/*:1008*//*1009:*/
 #line 149 "./scales.w"
 
 void SerialScale::dataAvailable()
@@ -24,7 +24,7 @@ responseBuffer.clear();
 }
 else
 {
-/*1000:*/
+/*1010:*/
 #line 189 "./scales.w"
 
 QStringList responseParts= QString(responseBuffer.simplified()).split(' ');
@@ -53,7 +53,7 @@ unit= Units::Ounce;
 }
 emit newMeasurement(weight,unit);
 
-/*:1000*/
+/*:1010*/
 #line 161 "./scales.w"
 
 responseBuffer.clear();
@@ -61,7 +61,7 @@ responseBuffer.clear();
 }
 }
 
-/*:999*//*1001:*/
+/*:1009*//*1011:*/
 #line 220 "./scales.w"
 
 void SerialScale::tare()
@@ -74,4 +74,4 @@ void SerialScale::weigh()
 write("!KP\x0D");
 }
 
-/*:1001*/
+/*:1011*/

src/scale.h

@@ -1,4 +1,4 @@
-/*997:*/
+/*1007:*/
 #line 103 "./scales.w"
 
 #ifndef TypicaScaleInclude
@@ -25,4 +25,4 @@ QByteArray responseBuffer;
 
 #endif
 
-/*:997*/
+/*:1007*/

src/typica.rc

@@ -1,7 +1,7 @@
 #include <winver.h>
 VS_VERSION_INFO	VERSIONINFO
-FILEVERSION 	1,6,4,0
-PRODUCTVERSION 	1,6,4,0
+FILEVERSION 	1,7,0,0
+PRODUCTVERSION 	1,7,0,0
 FILEFLAGSMASK	0x3fL
 #ifdef _DEBUG
 	FILEFLAGS	VS_FF_DEBUG
@@ -16,13 +16,13 @@ BEGIN
 		BLOCK "040904b0"
 		BEGIN
 			VALUE "CompanyName", "Wilson's Coffee & Tea\0"
-			VALUE "FileDescription", "Typica 1.6.4\0"
-			VALUE "FileVersion", "1.6.4\0"
+			VALUE "FileDescription", "Typica 1.7.0\0"
+			VALUE "FileVersion", "1.7.0\0"
 			VALUE "InternalName", "Typica\0"
-			VALUE "LegalCopyright", "Copyright 2007-2015 Neal Evan Wilson\0"
+			VALUE "LegalCopyright", "Copyright 2007-2016 Neal Evan Wilson\0"
 			VALUE "OriginalFilename", "Typica.exe\0"
 			VALUE "ProductName", "Typica\0"
-			VALUE "ProductVersion", "1.6.4\0"
+			VALUE "ProductVersion", "1.7.0\0"
 		END
 	END
 	BLOCK "VarFileInfo"

src/typica.w

@@ -22,8 +22,8 @@
 \mark{\noexpand\nullsec0{A Note on Notation}}
 \def\pn{Typica}
 \def\filebase{typica}
-\def\version{1.6.4 \number\year-\number\month-\number\day}
-\def\years{2007--2015}
+\def\version{1.7.0 \number\year-\number\month-\number\day}
+\def\years{2007--2016}
 \def\title{\pn{} (Version \version)}
 \newskip\dangerskipb
 \newskip\dangerskip
@@ -623,6 +623,7 @@ various Qt modules.
 #include <QtDebug>
 #include <QtXmlPatterns>
 #include <QtWebKit>
+#include <QtSvg>
 
 @ New code is being written in separate files in a long term effort to improve
 organization of the code. The result of this is that some additional headers
@@ -921,6 +922,53 @@ QScriptValue QWidget_activateWindow(QScriptContext *context,
     return QScriptValue();
 }
 
+@* Scripting QMessageBox.
+
+\noindent Some features require that \pn{} pauses an operation until further
+information can be obtained. An example of this is discretionary validation
+where input is checked and if it seems unlikely but not impossible to be
+correct a dialog should come up asking if that input is correct. If it is not,
+the operation should be cancelled and the person using \pn{} should be allowed
+to correct the information and try again.
+
+For this use case, it is not necessary to fully expose the |QMessageBox| class.
+Instead, it is enough to provide a function that will raise an appropriate
+message and return the selected action.
+
+@<Function prototypes for scripting@>=
+QScriptValue displayWarning(QScriptContext *context, QScriptEngine *engine);
+QScriptValue displayError(QScriptContext *context, QScriptEngine *engine);
+
+@ This function is exposed to the host environment.
+
+@<Set up the scripting engine@>=
+constructor = engine->newFunction(displayWarning);
+engine->globalObject().setProperty("displayWarning", constructor);
+constructor = engine->newFunction(displayError);
+engine->globalObject().setProperty("displayError", constructor);
+
+@ The function takes some arguments.
+
+@<Functions for scripting@>=
+QScriptValue displayWarning(QScriptContext *context, QScriptEngine *)
+{
+    QMessageBox::StandardButton selection = QMessageBox::warning(NULL,
+        argument<QString>(0, context),
+        argument<QString>(1, context),
+        QMessageBox::Ok | QMessageBox::Cancel);
+    if(selection == QMessageBox::Ok) {
+        return QScriptValue(true);
+    }
+    return QScriptValue(false);
+}
+
+QScriptValue displayError(QScriptContext *context, QScriptEngine *)
+{
+    QMessageBox::critical(NULL, argument<QString>(0, context),
+                          argument<QString>(1, context));
+    return QScriptValue();
+}
+
 @* Scripting QMainWindow.
 
 \noindent Rather than directly exposing |QMainWindow| to the scripting engine,
@@ -1363,6 +1411,93 @@ void setQLabelProperties(QScriptValue value, QScriptEngine *engine)
     setQFrameProperties(value, engine);
 }
 
+@* Scripting QSvgWidget.
+
+\noindent Sometimes it is useful to provide a space for simple drawings without
+the need for all of the other capabilities of a web view. This was introduced
+as a way to draw box plots to help guide the creation of roast specifications.
+
+@<Function prototypes for scripting@>=
+void setQSvgWidgetProperties(QScriptValue value, QScriptEngine *engine);
+QScriptValue constructQSvgWidget(QScriptContext *context,
+                                 QScriptEngine *engine);
+QScriptValue QSvgWidget_loadDevice(QScriptContext *context,
+                                   QScriptEngine *engine);
+void addSvgWidgetToLayout(QDomElement element, QStack<QWidget *> *widgetStack,
+                          QStack<QLayout *> *layoutStack);
+
+@ The constructor must be passed to the scripting engine.
+
+@<Set up the scripting engine@>=
+constructor = engine->newFunction(constructQSvgWidget);
+value = engine->newQMetaObject(&QSvgWidget::staticMetaObject, constructor);
+engine->globalObject().setProperty("QSvgWidget", value);
+
+@ The constructor is trivial.
+
+@<Functions for scripting@>=
+QScriptValue constructQSvgWidget(QScriptContext *,
+                                 QScriptEngine *engine)
+{
+    QScriptValue object = engine->newQObject(new QSvgWidget);
+    setQSvgWidgetProperties(object, engine);
+    return object;
+}
+
+@ A property is added that allows loading data from a |QIODevice|.
+
+@<Functions for scripting@>=
+void setQSvgWidgetProperties(QScriptValue value, QScriptEngine *engine)
+{
+    setQWidgetProperties(value, engine);
+    value.setProperty("loadDevice",
+                      engine->newFunction(QSvgWidget_loadDevice));
+}
+
+QScriptValue QSvgWidget_loadDevice(QScriptContext *context, QScriptEngine *)
+{
+    if(context->argumentCount() == 1)
+    {
+        QSvgWidget *self = getself<@[QSvgWidget *@]>(context);
+        QIODevice *device = argument<QIODevice *>(0, context);
+        device->reset();
+        QByteArray data = device->readAll();
+        self->load(data);
+    }
+    else
+    {
+        context->throwError("Incorrect number of arguments passed to "@|
+                            "QSvgWidget::loadData(). This method takes one "@|
+                            "QIODevice as an argument.");
+    }
+    return QScriptValue();
+}
+
+@ Additional work is needed to allow including this from the XML description of
+a window.
+
+@<Additional box layout elements@>=
+else if(currentElement.tagName() == "svgwidget")
+{
+    addSvgWidgetToLayout(currentElement, widgetStack, layoutStack);
+}
+
+@ The function used to create this follows the usual pattern.
+
+@<Functions for scripting@>=
+void addSvgWidgetToLayout(QDomElement element, QStack<QWidget *> *,
+                          QStack<QLayout *> *layoutStack)
+{
+    QBoxLayout *layout = qobject_cast<QBoxLayout *>(layoutStack->top());
+    QSvgWidget *widget = new QSvgWidget;
+    layout->addWidget(widget);
+    QString id = element.attribute("id");
+    if(!id.isEmpty())
+    {
+        widget->setObjectName(id);
+    }
+}
+
 @* Scripting QLineEdit.
 
 \noindent Similarly, we may want to allow line edits in interfaces defined
@@ -4014,6 +4149,7 @@ QScriptValue annotationFromRecord(QScriptContext *context,
                                   QScriptEngine *engine);
 QScriptValue setTabOrder(QScriptContext *context, QScriptEngine *engine);
 QScriptValue saveFileFromDatabase(QScriptContext *context, QScriptEngine *engine);
+QScriptValue scriptTr(QScriptContext *context, QScriptEngine *engine);
 
 @ These functions are passed to the scripting engine.
 
@@ -4029,6 +4165,7 @@ engine->globalObject().setProperty("setTabOrder",
                                    engine->newFunction(setTabOrder));
 engine->globalObject().setProperty("saveFileFromDatabase",
                                    engine->newFunction(saveFileFromDatabase));
+engine->globalObject().setProperty("TTR", engine->newFunction(scriptTr));
 
 @ These functions are not part of an object. They expect a string specifying
 the path to a file and return a string with either the name of the file without
@@ -4155,6 +4292,16 @@ QScriptValue setTabOrder(QScriptContext *context, QScriptEngine *)
     return QScriptValue();
 }
 
+@ This function is used to allow text that must be placed in scripts to be
+translated into other languages.
+
+@<Functions for scripting@>=
+QScriptValue scriptTr(QScriptContext *context, QScriptEngine *)
+{
+    return QScriptValue(QCoreApplication::translate(
+        "configuration",
+        argument<QString>(1, context).toUtf8().data()));
+}
 
 @** Application Configuration.
 
@@ -4204,6 +4351,13 @@ if(!filename.isEmpty())
     QFile file(filename);
     QFileInfo info(filename);
     directory = info.dir();
+    QTextCodec::setCodecForTr(QTextCodec::codecForName("utf-8"));
+    QTranslator *configtr = new QTranslator;
+    if(configtr->load(QString("config.%1").arg(QLocale::system().name()),
+                     QString("%1/Translations").arg(directory.canonicalPath())))
+    {
+        QCoreApplication::installTranslator(configtr);
+    }
     settings.setValue("config", directory.path());
     if(file.open(QIODevice::ReadOnly))
     {
@@ -4528,6 +4682,7 @@ while(i < windowChildren.count())
         }
         else if(element.tagName() == "layout")
         {
+            element.setAttribute("trcontext", "configuration");
             addLayoutToWidget(element, &widgetStack, &layoutStack);
         }
         else if(element.tagName() == "menu")
@@ -4560,7 +4715,8 @@ bar->setParent(window);
 bar->setObjectName("menuBar");
 if(element.hasAttribute("name"))
 {
-    QMenu *menu = bar->addMenu(element.attribute("name"));
+    QMenu *menu = bar->addMenu(QCoreApplication::translate("configuration",
+                                                           element.attribute("name").toUtf8().data()));
     menu->setParent(bar);
     if(element.hasAttribute("type"))
     {
@@ -4592,7 +4748,8 @@ while(j < menuItems.count())
         QDomElement itemElement = item.toElement();
         if(itemElement.tagName() == "item")
         {
-            QAction *itemAction = new QAction(itemElement.text(), menu);
+            QAction *itemAction = new QAction(QCoreApplication::translate("configuration",
+                                              itemElement.text().toUtf8().data()), menu);
             if(itemElement.hasAttribute("id"))
             {
                 itemAction->setObjectName(itemElement.attribute("id"));
@@ -4712,6 +4869,7 @@ void populateStackedLayout(QDomElement element, QStack<QWidget *> *widgetStack,
                 QWidget *widget = new QWidget;
                 layout->addWidget(widget);
                 widgetStack->push(widget);
+                currentElement.setAttribute("trcontext", "configuration");
                 populateWidget(currentElement, widgetStack, layoutStack);
                 widgetStack->pop();
             }
@@ -4822,6 +4980,7 @@ for(int j = 0; j < rowChildren.count(); j++)
             QHBoxLayout *cell = new QHBoxLayout;
             layout->addLayout(cell, row, column, vspan, hspan);
             layoutStack->push(cell);
+            columnElement.setAttribute("trcontext", "configuration");
             populateBoxLayout(columnElement, widgetStack, layoutStack);
             layoutStack->pop();
         }
@@ -4844,6 +5003,7 @@ void populateBoxLayout(QDomElement element, QStack<QWidget *> *widgetStack,
         if(current.isElement())
         {
             currentElement = current.toElement();
+            currentElement.setAttribute("trcontext", "configuration");
             if(currentElement.tagName() == "button")
             {
                 addButtonToLayout(currentElement, widgetStack, layoutStack);
@@ -4869,7 +5029,9 @@ void populateBoxLayout(QDomElement element, QStack<QWidget *> *widgetStack,
             {
                 QBoxLayout *layout =
                     qobject_cast<QBoxLayout *>(layoutStack->top());
-                QLabel *label = new QLabel(currentElement.text());
+                QLabel *label = new QLabel(QCoreApplication::translate(
+                    "configuration",
+                    currentElement.text().toUtf8().data()));
                 layout->addWidget(label);
             }
             else if(currentElement.tagName() == "lcdtemperature")
@@ -5013,6 +5175,7 @@ void populateSplitter(QDomElement element, QStack<QWidget *> *widgetStack,@|
         if(current.isElement())
         {
             currentElement = current.toElement();
+            currentElement.setAttribute("trcontext", "configuration");
             if(currentElement.tagName() == "decoration")
             {
                 addDecorationToSplitter(currentElement, widgetStack,
@@ -5158,7 +5321,9 @@ void addDecorationToSplitter(QDomElement element,
 labeled.
 
 @<Set up decoration@>=
-QString labelText = element.attribute("name");
+QString labelText =
+    QCoreApplication::translate("configuration",
+    element.attribute("name").toUtf8().data());
 Qt::Orientations@, orientation = Qt::Horizontal;
 if(element.hasAttribute("type"))
 {
@@ -5254,6 +5419,7 @@ void populateWidget(QDomElement element, QStack<QWidget *> *widgetStack,@|
             currentElement = current.toElement();
             if(currentElement.tagName() == "layout")
             {
+                currentElement.setAttribute("trcontext", "configuration");
                 addLayoutToWidget(currentElement, widgetStack, layoutStack);
             }
         }
@@ -5269,7 +5435,9 @@ void addButtonToLayout(QDomElement element, QStack<QWidget *> *,@|
                        QStack<QLayout *> *layoutStack)
 {
     QAbstractButton *button = NULL;
-    QString text = element.attribute("name");
+    QString text =
+        QCoreApplication::translate("configuration",
+                                    element.attribute("name").toUtf8().data());
     if(element.hasAttribute("type"))
     {
         QString type = element.attribute("type");
@@ -5323,11 +5491,15 @@ void addSpinBoxToLayout(QDomElement element, QStack<QWidget *> *,@|
     AnnotationSpinBox *box = new AnnotationSpinBox("", "", NULL);
     if(element.hasAttribute("pretext"))
     {
-        box->setPretext(element.attribute("pretext"));
+        box->setPretext(QCoreApplication::translate(
+                        "configuration",
+                        element.attribute("pretext").toUtf8().data()));
     }
     if(element.hasAttribute("posttext"))
     {
-        box->setPosttext(element.attribute("posttext"));
+        box->setPosttext(QCoreApplication::translate(
+                         "configuration",
+                         element.attribute("posttext").toUtf8().data()));
     }
     if(element.hasAttribute("series"))
     {
@@ -5377,10 +5549,6 @@ void addZoomLogToSplitter(QDomElement element, QStack<QWidget *> *widgetStack,
                           QStack<QLayout *> *)
 {
     ZoomLog *widget = new ZoomLog;
-    if(!widget)
-    {
-        qDebug() << "Error constructing widget!";
-    }
     if(element.hasAttribute("id"))
     {
         widget->setObjectName(element.attribute("id"));
@@ -5399,7 +5567,10 @@ void addZoomLogToSplitter(QDomElement element, QStack<QWidget *> *widgetStack,
                 currentElement = current.toElement();
                 if(currentElement.tagName() == "column")
                 {
-                    QString text = currentElement.text();
+                    QString text =
+                        QCoreApplication::translate(
+                            "configuration",
+                            currentElement.text().toUtf8().data());
                     widget->setHeaderData(column, text);
                     column++;
                 }
@@ -5543,8 +5714,11 @@ void addSaltToLayout(QDomElement element, QStack<QWidget *> *,@|
                 {
                     if(currentElement.hasAttribute("name"))
                     {
-                        model->setHeaderData(currentColumn, Qt::Horizontal,
-                                             currentElement.attribute("name"));
+                        model->setHeaderData(currentColumn,
+                            Qt::Horizontal,
+                            QCoreApplication::translate(
+                                "configuration",
+                                currentElement.attribute("name").toUtf8().data()));
                     }
                     if(currentElement.hasAttribute("delegate"))
                     {
@@ -5925,6 +6099,8 @@ void setQDateTimeEditProperties(QScriptValue value, QScriptEngine *engine)
     value.setProperty("day", engine->newFunction(QDateTimeEdit_day));
     value.setProperty("month", engine->newFunction(QDateTimeEdit_month));
     value.setProperty("year", engine->newFunction(QDateTimeEdit_year));
+    value.setProperty("setToCurrentTime",
+                      engine->newFunction(QDateTimeEdit_setToCurrentTime));
 }
 
 @ Certain operations on a |QDateEdit| are easier with a few convenience
@@ -5969,6 +6145,13 @@ QScriptValue QDateTimeEdit_year(QScriptContext *context, QScriptEngine *)
     return QScriptValue(self->date().year());
 }
 
+QScriptValue QDateTimeEdit_setToCurrentTime(QScriptContext *context, QScriptEngine *)
+{
+    QDateTimeEdit *self = getself<QDateTimeEdit *>(context);
+    self->setDateTime(QDateTime::currentDateTime());
+    return QScriptValue();
+}
+
 @ A few function prototypes are needed for this.
 
 @<Function prototypes for scripting@>=
@@ -5980,6 +6163,7 @@ QScriptValue QDateTimeEdit_day(QScriptContext *context, QScriptEngine *engine);
 QScriptValue QDateTimeEdit_month(QScriptContext *context,
                                  QScriptEngine *engine);
 QScriptValue QDateTimeEdit_year(QScriptContext *context, QScriptEngine *engine);
+QScriptValue QDateTimeEdit_setToCurrentTime(QScriptContext *context, QScriptEngine *engine);
 
 @ In order to get to objects created from the XML description, it is necessary
 to provide a function that can be called to retrieve children of a given widget.
@@ -6116,6 +6300,10 @@ else if(className == "QLineEdit")
 {
     setQLineEditProperties(value, engine);
 }
+else if(className == "QSvgWidget")
+{
+    setQSvgWidgetProperties(value, engine);
+}
 
 @ In the list of classes, the SaltTable entry is for a class which does not
 strictly exist on its own. It is, however, useful to provide some custom
@@ -12437,15 +12625,15 @@ text can be replaced with translated text based on the user'@q'@>s locale. For m
 details, see the Qt Linguist manual.
 
 @<Load translation objects@>=
-QTranslator base;
-if(base.load(QString("qt_%1").arg(QLocale::system().name())))
+QTranslator *base = new QTranslator;
+if(base->load(QString("qt_%1").arg(QLocale::system().name()), QString("%1/Translations").arg(QCoreApplication::applicationDirPath())))
 {
-    installTranslator(&base);
+    installTranslator(base);
 }
-QTranslator app;
-if(app.load(QString("%1_%2").arg("Typica").arg(QLocale::system().name())))
+QTranslator *app = new QTranslator;
+if(app->load(QString("%1_%2").arg("Typica").arg(QLocale::system().name()), QString("%1/Translations").arg(QCoreApplication::applicationDirPath())))
 {
-    installTranslator(&app);
+    installTranslator(app);
 }
 
 @ We also want to be able to access the application instance from within the
@@ -13286,6 +13474,7 @@ class SqlConnectionSetup : public QDialog@/
         QFormLayout *formLayout;
         QComboBox *driver;
         QLineEdit *hostname;
+        QLineEdit *portnumber;
         QLineEdit *dbname;
         QLineEdit *user;
         QLineEdit *password;
@@ -13300,6 +13489,7 @@ class SqlConnectionSetup : public QDialog@/
 @<SqlConnectionSetup implementation@>=
 SqlConnectionSetup::SqlConnectionSetup() :
     formLayout(new QFormLayout), driver(new QComboBox), hostname(new QLineEdit),
+    portnumber(new QLineEdit),
     dbname(new QLineEdit), user(new QLineEdit), password(new QLineEdit),
     layout(new QVBoxLayout), buttons(new QHBoxLayout),
     cancelButton(new QPushButton(tr("Cancel"))),
@@ -13308,6 +13498,8 @@ SqlConnectionSetup::SqlConnectionSetup() :
     driver->addItem("PostgreSQL", "QPSQL");
     formLayout->addRow(tr("Database driver:"), driver);
     formLayout->addRow(tr("Host name:"), hostname);
+    formLayout->addRow(tr("Port number:"), portnumber);
+    portnumber->setText("5432");
     formLayout->addRow(tr("Database name:"), dbname);
     formLayout->addRow(tr("User name:"), user);
     password->setEchoMode(QLineEdit::Password);
@@ -13319,6 +13511,7 @@ SqlConnectionSetup::SqlConnectionSetup() :
     buttons->addWidget(connectButton);
     layout->addLayout(buttons);
     connect(connectButton, SIGNAL(clicked(bool)), this, SLOT(testConnection()));
+    connectButton->setDefault(true);
     setLayout(layout);
     setModal(true);
 }
@@ -13339,6 +13532,7 @@ void SqlConnectionSetup::testConnection()
                                   toString());
     database.setConnectOptions("application_name=Typica");
     database.setHostName(hostname->text());
+    database.setPort(portnumber->text().toInt());
     database.setDatabaseName(dbname->text());
     database.setUserName(user->text());
     database.setPassword(password->text());
@@ -13349,6 +13543,7 @@ void SqlConnectionSetup::testConnection()
         settings.setValue("database/driver",
                           driver->itemData(driver->currentIndex()).toString());
         settings.setValue("database/hostname", hostname->text());
+        settings.setValue("database/portnumber", portnumber->text());
         settings.setValue("database/dbname", dbname->text());
         settings.setValue("database/user", user->text());
         settings.setValue("database/password", password->text());
@@ -13381,6 +13576,7 @@ QSqlDatabase database =
     QSqlDatabase::addDatabase(settings.value("database/driver").toString());
 database.setConnectOptions("application_name=Typica");
 database.setHostName(settings.value("database/hostname").toString());
+database.setPort(settings.value("database/portnumber", 5432).toInt());
 database.setDatabaseName(settings.value("database/dbname").toString());
 database.setUserName(settings.value("database/user").toString());
 database.setPassword(settings.value("database/password").toString());
@@ -13728,11 +13924,13 @@ if(file.open(QIODevice::ReadOnly))
     QDomDocument document;
     document.setContent(&file, true);
     QDomElement root = document.documentElement();
+    QString translationContext = root.attribute("id");
     QDomNode titleNode = root.elementsByTagName("reporttitle").at(0);
     if(!titleNode.isNull())
     {
         QDomElement titleElement = titleNode.toElement();
-        QString title = titleElement.text();
+        QString title = QCoreApplication::translate("configuration",
+                                                    titleElement.text().toUtf8().data());
         if(!title.isEmpty())
         {
             QStringList hierarchy = title.split(":->");
@@ -15993,6 +16191,9 @@ class RoasterConfWidget : public BasicDeviceConfigurationWidget
                                             const QModelIndex &index);
     @[private slots@]:@/
         void updateRoasterId(int id);
+        void updateCapacityCheck(int value);
+        void updateCapacity(const QString &value);
+        void updateCapacityUnit(const QString &value);
 };
 
 @ Aside from the ID number used to identify the roaster in the database we also
@@ -16074,7 +16275,26 @@ RoasterConfWidget::RoasterConfWidget(DeviceTreeModel *model, const QModelIndex &
     idLayout->addWidget(idLabel);
     QSpinBox *id = new QSpinBox;
     idLayout->addWidget(id);
+    idLayout->addStretch();
     layout->addLayout(idLayout);
+    QHBoxLayout *capacityLayout = new QHBoxLayout;
+    QCheckBox *capacityCheckEnabled = new QCheckBox(tr("Maximum batch size:"));
+    QDoubleSpinBox *capacity = new QDoubleSpinBox;
+    capacity->setMinimum(0.0);
+    capacity->setDecimals(3);
+    capacity->setMaximum(999999.999);
+    QComboBox *capacityUnit = new QComboBox;
+    capacityUnit->addItem("g");
+    capacityUnit->addItem("Kg");
+    capacityUnit->addItem("oz");
+    capacityUnit->addItem("Lb");
+    capacityUnit->setCurrentIndex(3);
+    capacityLayout->addWidget(capacityCheckEnabled);
+    capacityLayout->addWidget(capacity);
+    capacityLayout->addWidget(capacityUnit);
+    capacityLayout->addStretch();
+    layout->addLayout(capacityLayout);
+    layout->addStretch();
     @<Get device configuration data for current node@>@;
     for(int i = 0; i < configData.size(); i++)
     {
@@ -16082,11 +16302,25 @@ RoasterConfWidget::RoasterConfWidget(DeviceTreeModel *model, const QModelIndex &
         if(node.attribute("name") == "databaseid")
         {
             id->setValue(node.attribute("value").toInt());
-            break;
+        }
+        else if(node.attribute("name") == "checkcapacity")
+        {
+            capacityCheckEnabled->setChecked(node.attribute("value") == "true");
+        }
+        else if(node.attribute("name") == "capacity")
+        {
+            capacity->setValue(node.attribute("value").toDouble());
+        }
+        else if(node.attribute("name") == "capacityunit")
+        {
+            capacityUnit->setCurrentIndex(capacityUnit->findText(node.attribute("value")));
         }
     }
     updateRoasterId(id->value());
     connect(id, SIGNAL(valueChanged(int)), this, SLOT(updateRoasterId(int)));
+    connect(capacityCheckEnabled, SIGNAL(stateChanged(int)), this, SLOT(updateCapacityCheck(int)));
+    connect(capacity, SIGNAL(valueChanged(QString)), this, SLOT(updateCapacity(QString)));
+    connect(capacityUnit, SIGNAL(currentIndexChanged(QString)), this, SLOT(updateCapacityUnit(QString)));
     setLayout(layout);
 }
 
@@ -16103,7 +16337,7 @@ QDomElement referenceElement =
 QDomNodeList configData = referenceElement.elementsByTagName("attribute");
 QDomElement node;
 
-@ We need to propagate changes to the ID number field to the device
+@ We need to propagate changes to the configuration fields to the device
 configuration document. The |updateAttribute()| method in the base class
 makes this trivial.
 
@@ -16113,6 +16347,21 @@ void RoasterConfWidget::updateRoasterId(int id)
     updateAttribute("databaseid", QString("%1").arg(id));
 }
 
+void RoasterConfWidget::updateCapacityCheck(int value)
+{
+    updateAttribute("checkcapacity", value == Qt::Checked ? "true" : "false");
+}
+
+void RoasterConfWidget::updateCapacity(const QString &value)
+{
+    updateAttribute("capacity", value);
+}
+
+void RoasterConfWidget::updateCapacityUnit(const QString &value)
+{
+    updateAttribute("capacityunit", value);
+}
+
 @ Finally we must register the configuration widget so that it can be
 instantiated at the appropriate time.
 

src/units.cpp

@@ -1,10 +1,10 @@
-/*269:*/
+/*279:*/
 #line 42 "./units.w"
 
 #include "units.h"
 #include <QtDebug> 
 
-/*:269*//*270:*/
+/*:279*//*280:*/
 #line 53 "./units.w"
 
 bool Units::isTemperatureUnit(Unit unit)
@@ -15,7 +15,7 @@ unit==Kelvin||
 unit==Rankine);
 }
 
-/*:270*//*271:*/
+/*:280*//*281:*/
 #line 71 "./units.w"
 
 double Units::convertTemperature(double value,Unit fromUnit,Unit toUnit)
@@ -113,7 +113,7 @@ break;
 return 0;
 }
 
-/*:271*//*272:*/
+/*:281*//*282:*/
 #line 169 "./units.w"
 
 double Units::convertRelativeTemperature(double value,Unit fromUnit,Unit toUnit)
@@ -211,7 +211,7 @@ break;
 return 0;
 }
 
-/*:272*//*273:*/
+/*:282*//*283:*/
 #line 267 "./units.w"
 
 double Units::convertWeight(double value,Unit fromUnit,Unit toUnit)
@@ -316,4 +316,4 @@ unit==Ounce||
 unit==Gram);
 }
 
-/*:273*/
+/*:283*/

src/units.h

@@ -1,4 +1,4 @@
-/*268:*/
+/*278:*/
 #line 8 "./units.w"
 
 #include <QObject> 
@@ -32,4 +32,4 @@ static bool isWeightUnit(Unit unit);
 
 #endif
 
-/*:268*/
+/*:278*/

src/webelement.cpp

@@ -1,9 +1,9 @@
-/*563:*/
+/*573:*/
 #line 368 "./webview.w"
 
 #include "webelement.h"
 
-/*561:*/
+/*571:*/
 #line 311 "./webview.w"
 
 TypicaWebElement::TypicaWebElement(QWebElement element):e(element)
@@ -11,7 +11,7 @@ TypicaWebElement::TypicaWebElement(QWebElement element):e(element)
 
 }
 
-/*:561*//*562:*/
+/*:571*//*572:*/
 #line 320 "./webview.w"
 
 void TypicaWebElement::appendInside(const QString&markup)
@@ -59,8 +59,8 @@ void TypicaWebElement::setPlainText(const QString&text)
 e.setPlainText(text);
 }
 
-/*:562*/
+/*:572*/
 #line 371 "./webview.w"
 
 
-/*:563*/
+/*:573*/

src/webelement.h

@@ -1,4 +1,4 @@
-/*556:*/
+/*566:*/
 #line 248 "./webview.w"
 
 #include <QWebElement> 
@@ -27,4 +27,4 @@ QWebElement e;
 
 #endif
 
-/*:556*/
+/*:566*/

src/webview.cpp

@@ -1,9 +1,9 @@
-/*541:*/
+/*551:*/
 #line 50 "./webview.w"
 
 #include "webview.h"
 
-/*542:*/
+/*552:*/
 #line 57 "./webview.w"
 
 TypicaWebView::TypicaWebView():QWebView()
@@ -12,7 +12,7 @@ page()->setLinkDelegationPolicy(QWebPage::DelegateExternalLinks);
 connect(page(),SIGNAL(linkClicked(QUrl)),this,SLOT(linkDelegate(QUrl)));
 }
 
-/*:542*//*543:*/
+/*:552*//*553:*/
 #line 73 "./webview.w"
 
 void TypicaWebView::linkDelegate(const QUrl&url)
@@ -20,7 +20,7 @@ void TypicaWebView::linkDelegate(const QUrl&url)
 if(url.scheme()=="typica")
 {
 QString address(url.toEncoded());
-/*544:*/
+/*554:*/
 #line 91 "./webview.w"
 
 if(address=="typica://aboutqt")
@@ -29,10 +29,10 @@ QMessageBox::aboutQt(this);
 return;
 }
 
-/*:544*/
+/*:554*/
 #line 79 "./webview.w"
 
-/*545:*/
+/*555:*/
 #line 100 "./webview.w"
 
 if(address.startsWith("typica://script/"))
@@ -41,7 +41,7 @@ emit scriptLinkClicked(address.remove(0,16));
 return;
 }
 
-/*:545*/
+/*:555*/
 #line 80 "./webview.w"
 
 }
@@ -51,7 +51,7 @@ QDesktopServices::openUrl(url);
 }
 }
 
-/*:543*//*546:*/
+/*:553*//*556:*/
 #line 112 "./webview.w"
 
 void TypicaWebView::load(const QString&url)
@@ -88,7 +88,7 @@ QString TypicaWebView::saveXml()
 return page()->currentFrame()->documentElement().toOuterXml();
 }
 
-/*:546*//*552:*/
+/*:556*//*562:*/
 #line 205 "./webview.w"
 
 QWebElement TypicaWebView::documentElement()
@@ -101,8 +101,8 @@ QWebElement TypicaWebView::findFirstElement(const QString&selector)
 return page()->mainFrame()->findFirstElement(selector);
 }
 
-/*:552*/
+/*:562*/
 #line 53 "./webview.w"
 
 
-/*:541*/
+/*:551*/

src/webview.h

@@ -1,4 +1,4 @@
-/*540:*/
+/*550:*/
 #line 14 "./webview.w"
 
 #include <QWebView> 
@@ -34,4 +34,4 @@ void linkDelegate(const QUrl&url);
 
 #endif
 
-/*:540*/
+/*:550*/

web/output/download-mac-latest.html

@@ -16,26 +16,10 @@
 	<div id="maintext">
 <h1>Thank you for downloading Typica.</h1>
 <p>Your download from:</p>
-<p><a href="http://www.randomfield.com/programs/typica/1.6/Typica-1.6.4.dmg">http://www.randomfield.com/programs/typica/1.6/Typica-1.6.4.dmg</a></p>
+<p><a href="http://www.randomfield.com/programs/typica/1.7/Typica-1.7.dmg">http://www.randomfield.com/programs/typica/1.7/Typica-1.7.dmg</a></p>
 <p>should begin automatically. If it does not,
 please click the above link.</p>
 <h2>Please Help Support Ongoing Development</h2>
-<p>This will likely be one of the last releases in the 1.x
-series. Typica 1.0 was released in 2007 and I've learned a
-lot from developing this, using it, and having conversations
-with others about how they're using this. While there is the
-possibility of further improvements, I believe Typica has
-reached a point of maturity with a feature set appropriate for
-many coffee roasting firms.</p>
-<p>There is a large set of features and extensions that I have
-avoided implementing because the changes would have been too
-intrusive for the code base as it currently exists, but that
-feature set has become too compelling for me to leave undone.
-I am, therefore, attempting to spend as much time as I can on
-the development of Typica 2.0. This removes many of the legacy
-considerations and modernizes the tools and techniques used. I
-hope that the result is a better and more broadly useful Typica
-that can be maintained for another several years.</p>
 <p>While Typica is free and will continue to be made freely
 available complete with all source code, there are still costs
 associated with ongoing development and keeping the software
@@ -51,27 +35,23 @@ available. Some of the costs include:
 	</ul>
 There is also a huge commitment of time in developing, testing,
 and supporting this.</p>
-<p>Financial support to date does not come close to covering
-these costs, nor has it been enough that I could consider
-hiring people to improve the pace and quality of ongoing
-development. This is fine. I have no intention of halting work
-on the project as my work has benefitted greatly from having
-this software and I expect even greater benefit from the next
-major release. Personally I find the new feature set exciting
-to work on and am willing to cover funding shortfalls when I
-can afford to do so.</p>
-<p>That said, if you're finding this software to be useful in
-your business, if you've had a good support experience, or if
+<p>While Typica is for many uses a mature and reliable program,
+there are still a number of areas where the program can be
+improved and additional areas where I think it makes a lot of
+sense to extend the program. The limited funding for this work
+does slow progress. If you're finding this software to be useful
+in your business, if you've had a good support experience, or if
 you'd like to help me continue to develop this software, please
-consider providing some financial support to:</p>
+consider providing some financial support. Checks can be sent to:
 <p>Neal Wilson<br />
 c/o Wilson's Coffee &amp; Tea<br />
 3306 Washington Ave.<br />
 Racine, WI 53405<br />
 USA</p>
+<p>or you can visit my <a href="http://youtube.com/users/N3Roaster">YouTube
+channel</a> and click the blue Support button on the right.</p>
 <p>Another great way to help Typica right now is to reach out
 to your professional colleagues and let them know that you're
 using Typica and what you like about it.</p>
-<p>Please note that I am unable to accept money through PayPal.</p>
-<iframe width="1" height="1" frameborder="0" src="http://www.randomfield.com/programs/typica/1.6/Typica-1.6.4.dmg"></iframe>
+<iframe width="1" height="1" frameborder="0" src="http://www.randomfield.com/programs/typica/1.7/Typica-1.7.dmg"></iframe>
 </div></div></body></html>

web/output/download-windows-latest.html

@@ -16,26 +16,10 @@
 	<div id="maintext">
 <h1>Thank you for downloading Typica.</h1>
 <p>Your download from:</p>
-<p><a href="http://www.randomfield.com/programs/typica/1.6/Typica-1.6.4.zip">http://www.randomfield.com/programs/typica/1.6/Typica-1.6.4.zip</a></p>
+<p><a href="http://www.randomfield.com/programs/typica/1.7/Typica-1.7.zip">http://www.randomfield.com/programs/typica/1.7/Typica-1.7.zip</a></p>
 <p>should begin automatically. If it does not,
 please click the above link.</p>
 <h2>Please Help Support Ongoing Development</h2>
-<p>This will likely be one of the last releases in the 1.x
-series. Typica 1.0 was released in 2007 and I've learned a
-lot from developing this, using it, and having conversations
-with others about how they're using this. While there is the
-possibility of further improvements, I believe Typica has
-reached a point of maturity with a feature set appropriate for
-many coffee roasting firms.</p>
-<p>There is a large set of features and extensions that I have
-avoided implementing because the changes would have been too
-intrusive for the code base as it currently exists, but that
-feature set has become too compelling for me to leave undone.
-I am, therefore, attempting to spend as much time as I can on
-the development of Typica 2.0. This removes many of the legacy
-considerations and modernizes the tools and techniques used. I
-hope that the result is a better and more broadly useful Typica
-that can be maintained for another several years.</p>
 <p>While Typica is free and will continue to be made freely
 available complete with all source code, there are still costs
 associated with ongoing development and keeping the software
@@ -51,27 +35,23 @@ available. Some of the costs include:
 	</ul>
 There is also a huge commitment of time in developing, testing,
 and supporting this.</p>
-<p>Financial support to date does not come close to covering
-these costs, nor has it been enough that I could consider
-hiring people to improve the pace and quality of ongoing
-development. This is fine. I have no intention of halting work
-on the project as my work has benefitted greatly from having
-this software and I expect even greater benefit from the next
-major release. Personally I find the new feature set exciting
-to work on and am willing to cover funding shortfalls when I
-can afford to do so.</p>
-<p>That said, if you're finding this software to be useful in
-your business, if you've had a good support experience, or if
+<p>While Typica is for many uses a mature and reliable program,
+there are still a number of areas where the program can be
+improved and additional areas where I think it makes a lot of
+sense to extend the program. The limited funding for this work
+does slow progress. If you're finding this software to be useful
+in your business, if you've had a good support experience, or if
 you'd like to help me continue to develop this software, please
-consider providing some financial support to:</p>
+consider providing some financial support. Checks can be sent to:
 <p>Neal Wilson<br />
 c/o Wilson's Coffee &amp; Tea<br />
 3306 Washington Ave.<br />
 Racine, WI 53405<br />
 USA</p>
+<p>or you can visit my <a href="http://youtube.com/users/N3Roaster">YouTube
+channel</a> and click the blue Support button on the right.</p>
 <p>Another great way to help Typica right now is to reach out
 to your professional colleagues and let them know that you're
 using Typica and what you like about it.</p>
-<p>Please note that I am unable to accept money through PayPal.</p>
-<iframe width="1" height="1" frameborder="0" src="http://www.randomfield.com/programs/typica/1.6/Typica-1.6.4.zip"></iframe>
+<iframe width="1" height="1" frameborder="0" src="http://www.randomfield.com/programs/typica/1.7/Typica-1.7.zip"></iframe>
 </div></div></body></html>

web/output/downloads.html

@@ -14,10 +14,10 @@
 	</div>
 	</div>
 	<div id="maintext">
-<p>The latest release of Typica is version 1.6.4, released June 7, 2015.
+<p>The latest release of Typica is version 1.7, released January 24, 2016.
 This is available for Microsoft Windows, and Intel/Mac OS X.</p>
-<p><a href="download-mac-latest.html">Typica 1.6.4 for Intel/Mac OS X</a></p>
-<p><a href="download-windows-latest.html">Typica 1.6.4 for Microsoft Windows</a></p>
+<p><a href="download-mac-latest.html">Typica 1.7 for Intel/Mac OS X</a></p>
+<p><a href="download-windows-latest.html">Typica 1.7 for Microsoft Windows</a></p>
 <p>The latest source code can always be found on
 <a href="https://github.com/N3Roaster/typica">GitHub</a>.</p>
 </div></div></body></html>

web/output/index.html

@@ -1,11 +1,6 @@
 <html><head>
 	<title>Typica - Data for Coffee Roasters</title>
 	<link rel="stylesheet" type="text/css" href="style.css">
-<meta name="twitter:card" content="summary_large_image">
-<meta name="twitter:site" content="@N3Roaster">
-<meta name="twitter:title" content="Typica 1.6.4 Now Available. Free Software for Coffee Roasters">
-<meta name="twitter:description" content="Typica is a cross-platform application for coffee roasters with features for recording your roasts, tracking green coffee inventory, product development, improving production consistency, and more.">
-<meta name="twitter:image" content="http://www.randomfield.com/programs/typica/release164tc.png">
 	</head><body><div id="page"><div id="topmatter">
 	<div id="topbanner">
 	<img src="logo96.png" height="96px" width="96px" alt="Typica logo" />
@@ -25,14 +20,14 @@ inventory, product development, improving production consistency,
 and more.</p>
 <p>The program is free open source software available under the
 MIT license.</p>
-<h1>Typica 1.6.4 Now Available</h1>
-<p>The latest release of Typica includes bug fixes and minor
-feature updates. The most significant new feature is the
-ability to use three new types of timer in addition to the
-familiar batch timer. See the documentation for details on how to
-configure these or watch this new video describing each of the
-new timer types and why you might want to use them.</p>
-<iframe width="640" height="360" src="https://www.youtube.com/embed/2zt9XlQd9oY" frameborder="0" allowfullscreen></iframe>
+<h1>Typica 1.7 Now Available</h1>
+<iframe width="640" height="360" src="https://www.youtube.com/embed/U7xTefVLRfk" frameborder="0" allowfullscreen></iframe>
+<p>The latest release of Typica includes several new features
+such as support for more detailed roast specifications, ability
+to set reminders based on production, a new batch log with search
+and filter features, and more. This also marks the first release
+that includes a translation of the program to another language.
+People using a computer with German locale settings will see that.</p>
 <h1>Data Acquisition</h1>
 <p>Every batch of coffee you roast with Typica can be recorded for
 future reference. A practically unlimited number of target roast