Merge branch 'development' into programpipe

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-2013 Neal Evan Wilson
+Copyright 2007-2014 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

@@ -37,7 +37,10 @@
 				QSettings.setValue("script/report_unit", unitBox.currentIndex);
 				refresh();
 			});
+			var rowData = new Array();
+			var rowIndex;
             function refresh() {
+				rowIndex = 0;
                 var buffer = new QBuffer;
                 buffer.open(3);
                 var output = new XmlWriter(buffer);
@@ -119,7 +122,15 @@
                 while(query.next())
                 {
                     output.writeStartElement("tr");
-                    output.writeTextElement("td", query.value(0));
+					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));
@@ -146,7 +157,15 @@
                 while(query.next())
                 {
                     output.writeStartElement("tr");
-                    output.writeTextElement("td", query.value(0));
+					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));
@@ -170,6 +189,39 @@
                 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);
+			});
         ]]>
     </program>
 </window>

config/Reports/greensales.xml

@@ -0,0 +1,112 @@
+<window id="greensales">
+	<reporttitle>Sales:->Green Coffee Sales</reporttitle>
+	<layout type="vertical">
+		<layout type="horizontal">
+			<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 = "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");
+			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("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 view = findChildObject(this, 'report');
+			var printMenu = findChildObject(this, 'print');
+			printMenu.triggered.connect(function() {
+				view.print();
+			});
+			var reportitems = new Array();
+			function refresh() {
+				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.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);
+				var conversion = 1;
+				var unitText = 'Lb';
+				if(unitBox.currentIndex == 0) {
+					conversion = 2.2;
+					unitText = '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");
+				query.bind(":conversion", conversion);
+				query.bind(":ed", endDate);
+				query.bind(":sd", startDate);
+				query.exec();
+				output.writeStartElement("table");
+				output.writeAttribute("rules", "groups");
+				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.writeEndElement();
+				output.writeEndElement();
+				output.writeStartElement("tbody");
+				while(query.next()) {
+					output.writeStartElement("tr");
+					output.writeAttribute("id", "r"+query.value(0));
+					reportitems.push(query.value(0));
+					output.writeTextElement("td", query.value(0));
+					output.writeTextElement("td", query.value(1));
+					output.writeTextElement("td", query.value(2));
+					output.writeTextElement("td", query.value(3));
+					output.writeTextElement("td", query.value(4));
+					output.writeEndElement();
+				}
+				output.writeEndElement();
+				output.writeEndElement();
+				output.writeEndElement();
+				output.writeEndElement();
+				output.writeEndDocument();
+				view.setContent(buffer);
+				buffer.close();
+				query = query.invalidate();
+			}
+			refresh();
+			dateSelect.rangeUpdated.connect(refresh);
+		]]>
+	</program>
+</window>
+

config/Reports/itemtransactions.xml

@@ -46,6 +46,9 @@
 				output.writeAttribute("xmlns", "http://www.w3.org/1999/xhtml");
 				output.writeStartElement("head");
 				output.writeTextElement("title", "Item Transactions");
+				output.writeStartElement("script");
+				output.writeAttribute("src", "Scripts/d3.min.js");
+				output.writeEndElement();
 				output.writeStartElement("style");
 				output.writeAttribute("type", "text/css");
 				output.writeCDATA("tr.PURCHASE {background-color: #77FF77}");
@@ -126,7 +129,48 @@
 					}
 					output.writeEndElement() // table
 					
-					query.prepare("SELECT time::date, type, quantity / :c1, balance / :c2 FROM item_history(:item)");
+					output.writeStartElement("div");
+					output.writeAttribute("id", "chart");
+					output.writeEndElement();
+					
+					query.prepare("WITH q AS (SELECT roasted_id, unroasted_id, unroasted_quantity, unroasted_total_quantity, roasted_quantity, generate_subscripts(unroasted_quantity, 1) AS s FROM roasting_log) SELECT (SELECT name FROM items WHERE id = roasted_id) AS name, roasted_id, SUM(unroasted_quantity[s]) AS total, COUNT(unroasted_quantity[s]), SUM((unroasted_quantity[s]/unroasted_total_quantity)*roasted_quantity)::numeric(12,3) AS roast_proportion FROM q WHERE unroasted_id[s] = :item1 GROUP BY roasted_id UNION SELECT 'Green Sales', NULL, SUM(quantity), COUNT(1), NULL FROM sale WHERE item = :item2 UNION SELECT 'Inventory Adjustment', NULL, ((SELECT SUM(quantity) FROM purchase WHERE item = :item3) - (SELECT quantity FROM items WHERE id = :item4) - (SELECT SUM(quantity) FROM all_transactions WHERE type != 'PURCHASE' AND type != 'INVENTORY' AND item = :item5)), (SELECT COUNT(1) FROM inventory WHERE item = :item6), NULL UNION SELECT 'Loss', NULL, SUM(quantity), COUNT(1), NULL FROM loss WHERE item = :item7 UNION SELECT 'Current Inventory', NULL, (SELECT quantity FROM items WHERE id = :item8), NULL, NULL ORDER BY total DESC");
+					query.bind(":item1", itemBox.currentData());
+					query.bind(":item2", itemBox.currentData());
+					query.bind(":item3", itemBox.currentData());
+					query.bind(":item4", itemBox.currentData());
+					query.bind(":item5", itemBox.currentData());
+					query.bind(":item6", itemBox.currentData());
+					query.bind(":item7", itemBox.currentData());
+					query.bind(":item8", itemBox.currentData());
+					query.exec();
+					var chartData = "var data = [";
+					var roastedCoffeeLines = "";
+					var adjustmentLines = "";
+					var currentInventoryLine = "";
+					var conversion = 1;
+					if(unitBox.currentIndex == 0) {
+						conversion = 2.2;
+					}
+					while(query.next()) {
+						if(Number(query.value(1)) > 0) {
+							roastedCoffeeLines += "['" + query.value(0).replace(/\'/g, "\\x27") + "'," + query.value(2) / conversion + "," + query.value(3) + "," + query.value(4) / conversion + "],";
+						} else if (query.value(0) == "Current Inventory") {
+							currentInventoryLine = "['Current Inventory'," + query.value(2) / conversion + "," + query.value(3) + "," + query.value(4) / conversion + "]";
+						} else {
+							if(Number(query.value(3)) > 0) {
+								adjustmentLines += "['" + query.value(0) + "'," + query.value(2) / conversion + "," + query.value(3) + "," + query.value(4) / conversion + "],";
+							}
+						}
+					}
+					chartData = chartData + roastedCoffeeLines + adjustmentLines + currentInventoryLine + "];";
+					
+					output.writeTextElement("script", chartData);
+					
+					output.writeStartElement("script");
+					output.writeAttribute("src", "Scripts/greenusechart.js");
+					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)");
 					switch(unitBox.currentIndex)
 					{
 						case 0:
@@ -146,6 +190,7 @@
 					output.writeTextElement("th", "Type");
 					output.writeTextElement("th", "Quantity");
 					output.writeTextElement("th", "Balance");
+					output.writeTextElement("th", "Record");
 					output.writeEndElement(); // tr
 					var prev_balance = "0";
 					var prev_prec = 0;
@@ -175,6 +220,23 @@
 						}
 						output.writeTextElement("td", query.value(3));
 						prev_balance = query.value(3);
+						if(query.value(1) == "PURCHASE") {
+							output.writeStartElement("td");
+							output.writeStartElement("a");
+							output.writeAttribute("href", "typica://script/i" + query.value(5));
+							output.writeCDATA(query.value(6) + " (" + query.value(5) + ")");
+							output.writeEndElement();
+							output.writeEndElement();
+						} else if(query.value(1) == "USE") {
+							output.writeStartElement("td");
+							output.writeStartElement("a");
+							output.writeAttribute("href", "typica://script/p" + query.value(4).slice(1,-1));
+							output.writeCDATA(query.value(7) + " " + query.value(4));
+							output.writeEndElement();
+							output.writeEndElement();
+						} else {
+							output.writeTextElement("td", "");
+						}
 						output.writeEndElement(); // tr
 					}
 					output.writeEndElement(); // table
@@ -193,7 +255,59 @@
 				buffer.close();
 				query = query.invalidate();
 			}
-			refresh();
+			if(itemBox.currentData() > 0) {
+				refresh();
+			}
+			
+			/* Open invoices */
+			var openInvoice = function(url) {
+				var arg = url.slice(1, url.length);
+				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();
+			};
+			
+			/* Open batch data */
+			var openProfile = function(url) {
+				var arg = url.slice(1, url.length);
+				var details = createWindow("batchDetails");
+				var fakeTable = new Object;
+				fakeTable.holding = new Array(7);
+				fakeTable.data = function(r, c) {
+					return this.holding[c];
+				};
+				var query = new QSqlQuery();
+				query.exec("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 files = '{" + arg + "}'");
+				query.next();
+				for(var i = 0; i < 8; i++) {
+					fakeTable.holding[i] = query.value(i);
+				}
+				query = query.invalidate();
+				details.loadData(fakeTable, 0);
+			};
+			
+			view.scriptLinkClicked.connect(function(url) {
+				var linkType = url[0];
+				switch(linkType) {
+					case 'i':
+						openInvoice(url);
+						break;
+					case 'p':
+						openProfile(url);
+						break;
+				}
+			});
 		]]>
 	</program>
 </window>

config/Scripts/greenusechart.js

@@ -0,0 +1,116 @@
+// Data access functions
+var label = function(d) {return d[0];};
+var greenValue = function(d) {return d[1];};
+var transactionCount = function(d) {return d[2];};
+var roastValue = function(d) {return d[3];};
+
+// Chart parameters
+var valueLabelWidth = 0; // Temporary, will be updated when labels are generated
+var barHeight = 30;
+var barHeight2 = barHeight / 2;
+var barLabelWidth = 0;
+var barLabelPadding = 5;
+var gridLabelHeight = 18;
+var gridChartOffset = 3;
+var maxBarWidth = 500;
+
+// Scales
+var x1s = d3.scale.linear().domain([0, d3.max(data, function(d) { return greenValue(d); })*1.15]).range([0, maxBarWidth]);
+var x2s = d3.scale.linear().domain([0, d3.max(data, function(d) { return transactionCount(d); })*1.15]).range([0, maxBarWidth]);
+var ys = d3.scale.ordinal().domain(d3.range(0, data.length)).rangeBands([0, data.length * barHeight]);
+var ytext = function(d, i) {return ys(i) + ys.rangeBand() / 2;};
+var ybar = function(d, i) {return ys(i);};
+var ybar2 = function(d, i) {return ys(i) + (barHeight2 / 2)};
+var ybar3 = function(d, i) {return ys(i);};
+var ybar4 = function(d, i) {return ys(i) + barHeight;};
+
+// Chart
+var svg = d3.select("#chart").append("svg")
+	.attr("width", 1000)
+	.attr("height", gridLabelHeight + gridLabelHeight + gridChartOffset + data.length * barHeight);
+
+// Bar labels
+var yxe = svg.append("g")
+	.attr("class", "y axis left");
+yxe.selectAll("text").data(data).enter().append("text")
+	.attr("y", ytext)
+	.attr("stroke", "none")
+	.attr("fill", "black")
+	.attr("dy", ".35em")
+	.attr("text-anchor", "end")
+	.text(label);
+// Determine maximum label width
+yxe.selectAll("text").each(function() {
+	if(barLabelWidth < this.getComputedTextLength()) {
+		barLabelWidth = this.getComputedTextLength();
+	}
+});
+barLabelWidth += 10;
+yxe.attr("transform", "translate(" + (barLabelWidth - barLabelPadding) + "," + (gridLabelHeight + gridChartOffset) + ")");
+
+// Weight axis
+var x1xe = svg.append("g")
+	.attr("class", "x axis top")
+	.attr("transform", "translate(" + barLabelWidth + "," + gridLabelHeight + ")");
+	
+x1xe.selectAll("text").data(x1s.ticks(10)).enter().append("text")
+	.attr("x", x1s)
+	.attr("dy", -3)
+	.attr("text-anchor", "middle")
+	.text(String);
+// Top ticks extend approximately half way down the chart
+x1xe.selectAll("line").data(x1s.ticks(10)).enter().append("line")
+	.attr("x1", x1s)
+	.attr("x2", x1s)
+	.attr("y1", 0)
+	.attr("y2", ys.rangeExtent()[1] /2)
+	.style("stroke", "#ccc");
+
+// Transaction count axis
+var x2xe = svg.append("g")
+	.attr("class", "x axis bottom")
+	.attr("transform", "translate(" + barLabelWidth + "," + (ys.rangeExtent()[1] + gridChartOffset + gridLabelHeight + gridLabelHeight) + ")");
+
+x2xe.selectAll("text").data(x2s.ticks(10)).enter().append("text")
+	.attr("x", x2s)
+	.attr("dy", -3)
+	.attr("text-anchor", "middle")
+	.text(String);
+// Bottom ticks extend approximately half way up the chart	
+x2xe.selectAll("line").data(x2s.ticks(10)).enter().append("line")
+	.attr("x1", x2s)
+	.attr("x2", x2s)
+	.attr("y1", -gridLabelHeight - (ys.rangeExtent()[1] /2))
+	.attr("y2", -gridLabelHeight)
+	.style("stroke", "#ccc");
+
+// Green coffee bars
+var gbars = svg.append("g")
+	.attr("transform", "translate(" + barLabelWidth + "," + (gridLabelHeight + gridChartOffset) + ")");
+gbars.selectAll("rect").data(data).enter().append("rect")
+	.attr("y", ybar)
+	.attr("height", barHeight)
+	.attr("width", function(d) {return x1s(greenValue(d));})
+	.attr("stroke", "white")
+	.attr("fill", "royalblue");
+
+// Roasted coffee bars
+var rbars = svg.append("g")
+	.attr("transform", "translate(" + barLabelWidth + "," + (gridLabelHeight + gridChartOffset) + ")");
+rbars.selectAll("rect").data(data).enter().append("rect")
+	.attr("y", ybar2)
+	.attr("height", barHeight2)
+	.attr("width", function(d) {return x1s(roastValue(d));})
+	.attr("stroke", "white")
+	.attr("fill", "orangered");
+
+// Transaction ticks
+var tticks = svg.append("g")
+	.attr("transform", "translate(" + barLabelWidth + "," + (gridLabelHeight + gridChartOffset) + ")");
+tticks.selectAll("line").data(data).enter().append("line")
+	.attr("x1", function(d) {return x2s(transactionCount(d));})
+	.attr("x2", function(d) {return x2s(transactionCount(d));})
+	.attr("y1", ybar3)
+	.attr("y2", ybar4)
+	.attr("stroke-width", "3")
+	.style("stroke", "black");

config/Windows/batchdetailsnew.xml

@@ -17,7 +17,7 @@
 			var compare = findChildObject(this, 'compare');
 			var edit = findChildObject(this, 'edit');
 			edit.enabled = false;
-			if(typeof(navigationwindow.loggingWindow) == "undefined") {
+			if(typeof(Windows.loggingWindow) == "undefined") {
 				compare.enabled = false;
 				target.enabled = false;
 			}
@@ -44,7 +44,7 @@
                 var nextSeries = startSeries + 2;
                 QSettings.setValue('cseries', nextSeries);
                 var input = new XMLInput(buffer, startSeries);
-                var graph = findChildObject(navigationwindow.loggingWindow, 'graph');
+                var graph = findChildObject(Windows.loggingWindow, 'graph');
                 input.measure.connect(graph.newMeasurement);
                 input.input();
 				query = query.invalidate();
@@ -59,13 +59,13 @@
 				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');
+				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 == navigationwindow.loggingWindow.targetcolumnname)
+					if(text == Windows.loggingWindow.targetcolumnname)
 					{
 						targetseries = col;
 					}
@@ -83,7 +83,7 @@
 				input.lastColumn.connect(function(c) {
 					lc = c;
 					QSettings.setValue("liveColumn", c + 1);
-					navigationwindow.loggingWindow.postLoadColumnSetup(c);
+					Windows.loggingWindow.postLoadColumnSetup(c);
 				});
 				input.annotation.connect(log.newAnnotation);
 				input.annotation.connect(function(note, tcol, ncol) {
@@ -91,9 +91,9 @@
 						log.newAnnotation(note, i, ncol);
 					}
 				});
-				navigationwindow.loggingWindow.windowTitle = "Typica - " + pname;
-				navigationwindow.loggingWindow.raise();
-				navigationwindow.loggingWindow.activateWindow();
+				Windows.loggingWindow.windowTitle = "Typica - " + pname;
+				Windows.loggingWindow.raise();
+				Windows.loggingWindow.activateWindow();
 				input.input();
 				log.newAnnotation("End", 1, lc);
 				query = query.invalidate();

config/Windows/greensales.xml

@@ -2,7 +2,7 @@
 	<layout type="vertical">
 		<layout type="horizontal">
 			<label>Date:</label>
-			<calendar id="date" />
+			<calendar time="true" id="date" />
 			<label>Customer:</label>
 			<line id="customer" />
 			<label>Weight Unit:</label>

config/Windows/productionroaster.xml

@@ -644,6 +644,7 @@
             lsplit.saveState("script/logSplitter");
             log.saveState("script/log", 7);
 			window.navigationWindow.loggingWindow = undefined;
+			Windows.loggingWindow = undefined;
         });
 		this.restoreSizeAndPosition('window');
         vsplit.restoreState("script/mainSplitter");
@@ -985,6 +986,7 @@
 			var bwindow = createWindow("sampleRoastingBatch");
 		});
 		window.postLoadColumnSetup(0);
+		Windows.loggingWindow = window;
 		]]>
     </program>
 </window>

config/config.xml

@@ -34,6 +34,7 @@
 	<include src="Windows/editbatchdetails.xml" />
 	<include src="Windows/newsamplebatch.xml" />
 	<program>
+		Windows = new Object();
 		var loggingWindow;
 		var currentBatchInfo;
 		var navwindow = createWindow("navwindow");

src/resources/html/about.html

@@ -142,6 +142,18 @@
 				<a href="http://tango.freedesktop.org">Tango Desktop Project</a>.</p>
 				<p>Entypo pictograms by Daniel Bruce &mdash;
 				<a href="http://www.entypo.com">www.entypo.com</a></p>
+				<p>Some charts are produced with the help of d3.js which is provided
+				with the following license:</p>
+				<p>Copyright &copy; 2010-2014, Michael Bostock</p>
+				<p>All rights reserved.</p>
+				<p>Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:</p>
+				<ul>
+					<li>Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+					<li>Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+					<li>The name Michael Bostock may not be used to endorse or promote products derived from this software without specific prior written permission.
+				</ul>
+				<p>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL MICHAEL BOSTOCK BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</p>
+
 			</div>
 		</div>
 	</body>

src/typica.w

@@ -3530,7 +3530,8 @@ engine->globalObject().setProperty("sqlToArray",
 engine->globalObject().setProperty("setFont", engine->newFunction(setFont));
 engine->globalObject().setProperty("annotationFromRecord",
                                    engine->newFunction(annotationFromRecord));
-engine->globalObject().setProperty("setTabOrder", engine->newFunction(setTabOrder));
+engine->globalObject().setProperty("setTabOrder",
+                                   engine->newFunction(setTabOrder));
 
 @ 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
@@ -5288,13 +5289,38 @@ editor. This one provides a calendar.
 void addCalendarToLayout(QDomElement element, QStack<QWidget *> *,@|
                          QStack<QLayout *> *layoutStack)
 {
-	QDateEdit *widget = new QDateEdit;
-	widget->setCalendarPopup(true);
+	QWidget *widget;
+	if(element.hasAttribute("time"))
+	{
+		if(element.attribute("time") == "true")
+		{
+			QDateTimeEdit *edit = new QDateTimeEdit;
+			edit->setDateTime(QDateTime::currentDateTime());
+			edit->setCalendarPopup(true);
+			edit->setDisplayFormat("yyyy-MM-dd hh:mm:ss");
+			widget = qobject_cast<QWidget *>(edit);
+		}
+		else
+		{
+			QDateEdit *edit = new QDateEdit;
+			edit->setDate(QDate::currentDate());
+			edit->setCalendarPopup(true);
+			edit->setDisplayFormat("yyyy-MM-dd");
+			widget = qobject_cast<QWidget *>(edit);
+		}
+	}
+	else
+	{
+		QDateEdit *edit = new QDateEdit;
+		edit->setDate(QDate::currentDate());
+		edit->setCalendarPopup(true);
+		edit->setDisplayFormat("yyyy-MM-dd");
+		widget = qobject_cast<QWidget *>(edit);
+	}
 	if(element.hasAttribute("id"))
 	{
 		widget->setObjectName(element.attribute("id"));
 	}
-	widget->setDate(QDate::currentDate());
 	QBoxLayout *layout = qobject_cast<QBoxLayout *>(layoutStack->top());
 	layout->addWidget(widget);
 }
@@ -5428,6 +5454,10 @@ else if(className == "QDateEdit")
 {
 	setQDateEditProperties(value, engine);
 }
+else if(className == "QDateTimeEdit")
+{
+	setQDateTimeEditProperties(value, engine);
+}
 else if(className == "QFrame")
 {
 	setQFrameProperties(value, engine);

src/webview.w

@@ -20,6 +20,7 @@ In order to simplify the implementation of certain features, we subclass
 #include <QPrintDialog>
 #include <QWebFrame>
 #include <QWebElement>
+#include <QSettings>
 
 #ifndef TypicaWebViewHeader
 #define TypicaWebViewHeader
@@ -131,9 +132,11 @@ void TypicaWebView::setHtml(const QString &html, const QUrl &baseUrl)
 
 void TypicaWebView::setContent(QIODevice *device)
 {
+	QSettings settings;
 	device->reset();
 	QByteArray content = device->readAll();
-	QWebView::setContent(content, "application/xhtml+xml");
+	QUrl baseDir = QUrl("file://" + settings.value("config").toString() + "/");
+	QWebView::setContent(content, "application/xhtml+xml", baseDir);
 }
 
 QString TypicaWebView::saveXml()