Merge branch 'master' into better_inventory

 Conflicts:
	README
	data/templates/products/entry.html
	docker/Dockerfile
	docker/init.sh
	src/database/database.vala
	src/database/db-interface.vala
	src/pdf-stock/Makefile
	src/pdf-stock/pdf-stock-interface.vala
	src/pdf-stock/pdf-stock.vala
	src/web/Makefile
	src/web/main.vala
	templates/menu.html
	templates/products/index.html

1 files changed, 80 insertions, 0 deletions

diff --git a/data/templates/stats/profit_per_day.html b/data/templates/stats/profit_per_day.html
new file mode 100644
index 0000000..bcb07ea
--- /dev/null
+++ b/data/templates/stats/profit_per_day.html
@@ -0,0 +1,80 @@
+		<div id="placeholder" style="width:800px;height:400px;float: left;"></div>
+		<div style="float: left;">
+			<button id="resetzoom" class="btn btn-default">Reset Zoom</button>
+			<br><br>
+			<ul id="overviewLegend">
+			</ul>
+		</div>
+
+<script type="text/javascript">
+$(function () {
+    var datasets = {{{DATA}}};
+
+    // hard-code color indices to prevent them from shifting as
+    // countries are turned on/off
+	var i = 0, choiceContainer = $("#overviewLegend");
+
+	$.each(datasets, function(key, val) {
+		val.color = i;
+		++i;
+		l = val.label;
+		var li = $('<li />').appendTo(choiceContainer);
+		
+		$('<input name="' + key + '" id="' + key + '" type="checkbox" checked="checked" />').appendTo(li);
+		$('<label>', {
+			text: l, 
+			'for': l
+		}).appendTo(li);
+	});
+
+    choiceContainer.find("input").click(plotAccordingToChoices);
+    
+    function plotAccordingToChoices() {
+        var data = [];
+
+        choiceContainer.find("input:checked").each(function () {
+            var key = $(this).attr("name");
+            if (key && datasets[key])
+                data.push(datasets[key]);
+        });
+
+		var options = {
+			legend: {
+				show: true
+			},
+			series: {
+				lines: { show: true },
+				points: { show: true}
+			},
+			yaxis: { 
+				mode: "money",
+				tickDecimals: 2,
+				tickFormatter: function suffixFormatter(val, axis) {
+					return val.toFixed(axis.tickDecimals) + "€"
+				}
+			},
+			xaxis: {
+				mode: "time",
+				timeformat: "%y-%0m-%0d"
+			},
+			zoom: {
+				interactive: true
+			},
+			pan: {
+				interactive: true
+			}
+		}
+
+        if (data.length > 0)
+            $.plot($("#placeholder"), data, options);
+    }
+
+    plotAccordingToChoices();
+
+	$("#resetzoom").click(function(eventObject) { plotAccordingToChoices(); });
+
+	$('.legendColorBox > div').each(function(i){
+		$(this).clone().prependTo(choiceContainer.find("li").eq(i));
+	});
+});
+</script>