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, 11 insertions, 1 deletions

diff --git a/src/web/csv.vala b/src/web/csv.vala
index 299af8d..6356f77 100644
--- a/src/web/csv.vala
+++ b/src/web/csv.vala
@@ -1,4 +1,5 @@
 /* Copyright 2012, Sebastian Reichel <sre@ring0.de>
+ * Copyright 2017-2018, Johannes Rudolph <johannes.rudolph@gmx.com>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -16,7 +17,7 @@
 public class CSVMemberFile {
 	private UserInfo[] members;
 
-	public Gee.List<int> missing_unblocked_members() throws DatabaseError, IOError {
+	public Gee.List<int> missing_unblocked_members() throws DatabaseError, IOError, DBusError {
 		var result = new Gee.ArrayList<int>();
 		var dbusers = db.get_member_ids();
 
@@ -66,6 +67,15 @@ public class CSVMemberFile {
 				m.pgp = csv_value(linedata[9]);
 				m.hidden = int.parse(csv_value(linedata[10])) != 0;
 				m.disabled = int.parse(csv_value(linedata[11])) != 0;
+				string[] rfid = {};
+				if(csv_value(linedata[12]) != "")
+					rfid += csv_value(linedata[12]);
+				if(csv_value(linedata[13]) != "")
+					rfid += csv_value(linedata[13]);
+				if(csv_value(linedata[14]) != "")
+					rfid += csv_value(linedata[14]);
+				m.rfid = rfid;
+
 				m.soundTheme = "";
 				if(csv_value(linedata[0]) != "EXTERNEMITGLIEDSNUMMER")
 					members += m;