From 54828fef6bd859234b353685dade7d6841d7dd18 Mon Sep 17 00:00:00 2001
From: Holger Cremer <HolgerCremer@gmail.com>
Date: Tue, 13 Jun 2017 22:14:26 +0200
Subject: adds the joined_at column and support in the db/web

---
 src/web/csv.vala | 7 ++++---
 src/web/web.vala | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'src/web')

diff --git a/src/web/csv.vala b/src/web/csv.vala
index bb1b166..cb1c057 100644
--- a/src/web/csv.vala
+++ b/src/web/csv.vala
@@ -62,9 +62,10 @@ public class CSVMemberFile {
 				m.postcode = csv_value(linedata[5]);
 				m.city = csv_value(linedata[6]);
 				m.gender = csv_value(linedata[7]) == "m" ? "masculinum" : csv_value(linedata[7]) == "w" ? "femininum" : "unknown";
-				m.pgp = csv_value(linedata[8]);
-				m.hidden = int.parse(csv_value(linedata[9])) != 0;
-				m.disabled = int.parse(csv_value(linedata[10])) != 0;
+				m.joined_at = int.parse(csv_value(linedata[8]));
+				m.pgp = csv_value(linedata[9]);
+				m.hidden = int.parse(csv_value(linedata[10])) != 0;
+				m.disabled = int.parse(csv_value(linedata[11])) != 0;
 				m.soundTheme = "";
 				if(csv_value(linedata[0]) != "EXTERNEMITGLIEDSNUMMER")
 					members += m;
diff --git a/src/web/web.vala b/src/web/web.vala
index c63db73..e60b325 100644
--- a/src/web/web.vala
+++ b/src/web/web.vala
@@ -214,10 +214,10 @@ public class WebServer {
 				foreach(var member in csvimport.get_members()) {
 					if(db.user_exists(member.id) && !db.user_equals(member)) {
 						var dbmember = db.get_user_info(member.id);
-						data1 += @"<tr class=\"error\"><td><i class=\"icon-minus-sign\"></i><td>$(dbmember.id)</td><td>$(dbmember.firstname)</td><td>$(dbmember.lastname)</td><td>$(dbmember.email)</td><td>$(dbmember.gender)</td><td>$(dbmember.street)</td><td>$(dbmember.postcode)</td><td>$(dbmember.city)</td><td>$(dbmember.pgp)</td><td>$(dbmember.hidden)</td><td>$(dbmember.disabled)</td></tr>";
+						data1 += @"<tr class=\"error\"><td><i class=\"icon-minus-sign\"></i><td>$(dbmember.id)</td><td>$(dbmember.firstname)</td><td>$(dbmember.lastname)</td><td>$(dbmember.email)</td><td>$(dbmember.gender)</td><td>$(dbmember.street)</td><td>$(dbmember.postcode)</td><td>$(dbmember.city)</td><td>$(dbmember.pgp)</td><td>$(dbmember.hidden)</td><td>$(dbmember.disabled)</td><td>$(dbmember.joined_at)</td></tr>";
 					}
 					if(!db.user_exists(member.id) || !db.user_equals(member)) {
-						data1 += @"<tr class=\"success\"><td><i class=\"icon-plus-sign\"></td><td>$(member.id)</td><td>$(member.firstname)</td><td>$(member.lastname)</td><td>$(member.email)</td><td>$(member.gender)</td><td>$(member.street)</td><td>$(member.postcode)</td><td>$(member.city)</td><td>$(member.pgp)</td><td>$(member.hidden)</td><td>$(member.disabled)</td></tr>";
+						data1 += @"<tr class=\"success\"><td><i class=\"icon-plus-sign\"></td><td>$(member.id)</td><td>$(member.firstname)</td><td>$(member.lastname)</td><td>$(member.email)</td><td>$(member.gender)</td><td>$(member.street)</td><td>$(member.postcode)</td><td>$(member.city)</td><td>$(member.pgp)</td><td>$(member.hidden)</td><td>$(member.disabled)</td><td>$(member.joined_at)</td></tr>";
 					}
 				}
 				t.replace("DATA1", data1);
-- 
cgit v1.2.3