now showing bandango_connections at bottom

vilcabamba · Jan 15, 2014 · c683ef5 · c683ef5
1 parent 5bd17b7
commit c683ef5
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 0 deletions.
diff --git a/app/assets/stylesheets/presets.css.sass b/app/assets/stylesheets/presets.css.sass
@@ -26,3 +26,6 @@
 
 .stronger
   font-weight: 400
+
+.light
+  color: #777
diff --git a/app/controllers/bandangos_controller.rb b/app/controllers/bandangos_controller.rb
@@ -3,6 +3,7 @@ class BandangosController < ApplicationController
   before_action :find_bandango, only: [:show, :edit, :update]
 
   def show
+    @connections = @bandango.connections.page(params[:page]).per(10)
   end
 
   def edit

diff --git a/app/views/bandango_connections/_bandango_connection.html.erb b/app/views/bandango_connections/_bandango_connection.html.erb
@@ -0,0 +1,4 @@
+<%= div_for bandango_connection, :class => "model" do %>
+  <%= l bandango_connection.created_at, format: :short %>:
+  <%= bandango_connection.transacciones_sent.join(", ") %>
+<% end %>
diff --git a/app/views/bandango_connections/_bandango_connections.html.erb b/app/views/bandango_connections/_bandango_connections.html.erb
@@ -0,0 +1,10 @@
+<% if @connections.any? %>
+  <% @connections.each do |connection| %>
+    <%= render connection %>
+  <% end %>
+  <div class="align_center">
+    <%= paginate @connections, remote: true %>
+  </div>
+<% else %>
+  Ninguna
+<% end %>
diff --git a/app/views/bandangos/_bandango.html.erb b/app/views/bandangos/_bandango.html.erb
@@ -1,3 +1,6 @@
 <%= link_to [@business, bandango], :class => "bandango" do %>
   <span class="nombre"><%= bandango.nombre %></span>
+  <span class="light">
+    <%= "hace #{time_ago_in_words bandango.last_connection_time}" if bandango.last_connection_time %>
+  </span>
 <% end %>
diff --git a/app/views/bandangos/show.html.erb b/app/views/bandangos/show.html.erb
@@ -14,3 +14,8 @@ token:
 <code><%= @bandango.token %></code>
 
 <%= link_to "Editar", edit_business_bandango_path(@business, @bandango), :class => "btn btn-link" %>
+
+<h4>Conexiones</h4>
+<div class="well bandango_connections models">
+  <%= render "bandango_connections/bandango_connections" %>
+</div>
diff --git a/app/views/bandangos/show.js.erb b/app/views/bandangos/show.js.erb
@@ -0,0 +1 @@
+$(".bandango_connections").html("<%= j render('bandango_connections/bandango_connections') %>");