Merge branch 'release-1.6.4' of https://github.com/N3Roaster/typica into release-1.6.4

config/Windows/greeninventory.xml

@@ -15,6 +15,7 @@
 			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 = ";
@@ -25,7 +26,9 @@
 			var text = items.currentText;
 			text = text + " Current inventory: ";
 			text = text + query.value(0);
-			text = text + " pounds (";
+			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 = ";
@@ -45,7 +48,10 @@
 				q = q + ", ";
 				if(units.currentText == "lb") {
 					q = q + value.text;
-				} else {
+				} 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();
@@ -83,7 +89,9 @@
 				var text = items.currentText;
 				text = text + " Current inventory: ";
 				text = text + query.value(0);
-				text = text + " pounds (";
+				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 = ";

config/Windows/history.xml

@@ -31,7 +31,7 @@
 				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, ((unroasted_total_quantity - roasted_quantity) / unroasted_total_quantity * 100::numeric)::numeric(12,2) AS weight_loss, duration, annotation FROM roasting_log WHERE time >= " + startDate + "::date AND time < " + endDate + "::date + interval '1 day' ORDER BY time DESC";
+				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);
 			}

config/Windows/productionroaster.xml

@@ -1130,7 +1130,7 @@
                 var file = new QFile(filename);
                 log.clearOutputColumns();
 				channelSkip = 0;
-				for(var i = 0; i < columnNames.length - channelSkip; i++)
+				for(var i = 0; i < channels.length; i++)
 				{
 					if(channelVisibility[i]) {
 						if(channelType[i] == "T") {