From e26f1dccc7553a9b750f5bbdce824b44f6a9bcf4 Mon Sep 17 00:00:00 2001
From: Sebastian Reichel <sre@ring0.de>
Date: Thu, 6 Sep 2018 23:31:55 +0200
Subject: web: user-import: show RFID diff

---
 data/templates/users/import.html |  2 +-
 src/web/web.vala                 | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/data/templates/users/import.html b/data/templates/users/import.html
index 1a0e6ef..567d627 100644
--- a/data/templates/users/import.html
+++ b/data/templates/users/import.html
@@ -21,7 +21,7 @@
 <div style="display: {{{STEP23}}}">
 	<table class="table table-bordered">
 		<thead>
-			<tr><th><i class="icon-wrench"></i></th><th>ID</th><th>Firstname</th><th>Lastname</th><th>E-Mail</th><th>Gender</th><th>Street</th><th>Postcode</th><th>City</th><th>PGP</th><th>Hidden</th><th>Disabled</th><th>Joined at</th></tr>
+			<tr><th><i class="icon-wrench"></i></th><th>ID</th><th>Firstname</th><th>Lastname</th><th>E-Mail</th><th>Gender</th><th>Street</th><th>Postcode</th><th>City</th><th>PGP</th><th>Hidden</th><th>Disabled</th><th>Joined at</th><th>RFID</th></tr>
 		</thead>
 		<tbody>
 			{{{DATA1}}}
diff --git a/src/web/web.vala b/src/web/web.vala
index 3098308..94c2ca1 100644
--- a/src/web/web.vala
+++ b/src/web/web.vala
@@ -224,10 +224,20 @@ 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><td>$(dbmember.joined_at)</td></tr>";
+						var dbmemberrfid = "<ul>";
+						foreach(var rfidcode in dbmember.rfid) {
+							dbmemberrfid += @"<li>$(rfidcode)</li>";
+						}
+						dbmemberrfid += "</ul>";
+						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><td>$(dbmemberrfid)</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><td>$(member.joined_at)</td></tr>";
+						var memberrfid = "<ul>";
+						foreach(var rfidcode in member.rfid) {
+							memberrfid += @"<li>$(rfidcode)</li>";
+						}
+						memberrfid += "</ul>";
+						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><td>$(memberrfid)</td></tr>";
 					}
 				}
 				t.replace("DATA1", data1);
-- 
cgit v1.2.3