Got auto-detection in logs working, improved user index readability

2012-09-16 02:53:45 -07:00
parent 5174b4c50c
commit 152d6e4e03
3 changed files with 7 additions and 74 deletions
--- a/app/views/door_logs/index.html.erb
+++ b/app/views/door_logs/index.html.erb
@@ -30,7 +30,10 @@
              when 'G'
                "Granted"
              end %>
-        <%= "Card: "+(door_log.data.to_i+(@divided_tmp*32767)).to_s(16) %>
+        <% @cardnum = (door_log.data.to_i+(@divided_tmp*32767)).to_s(16) %>
+        <%= "Card: "+@cardnum %>
+	<% @card_user = User.find(:first,:conditions=>['card_number LIKE ?', @cardnum]) %>
+	<%= "("+@card_user.name+")" unless @card_user.nil? %>
      </td>
   <% else 
        @divided_tmp = nil