From c683ef5617684688085fbd8087a4c73d8e8634ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mario=20Andre=CC=81s=20Correa?= Date: Wed, 15 Jan 2014 13:49:00 -0500 Subject: [PATCH] now showing bandango_connections at bottom --- app/assets/stylesheets/presets.css.sass | 3 +++ app/controllers/bandangos_controller.rb | 1 + .../bandango_connections/_bandango_connection.html.erb | 4 ++++ .../_bandango_connections.html.erb | 10 ++++++++++ app/views/bandangos/_bandango.html.erb | 3 +++ app/views/bandangos/show.html.erb | 5 +++++ app/views/bandangos/show.js.erb | 1 + 7 files changed, 27 insertions(+) create mode 100644 app/views/bandango_connections/_bandango_connection.html.erb create mode 100644 app/views/bandango_connections/_bandango_connections.html.erb create mode 100644 app/views/bandangos/show.js.erb diff --git a/app/assets/stylesheets/presets.css.sass b/app/assets/stylesheets/presets.css.sass index 12d949a..4f821be 100644 --- 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 index e418c89..a3e621d 100644 --- 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 new file mode 100644 index 0000000..953a9f5 --- /dev/null +++ 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 new file mode 100644 index 0000000..fd11aae --- /dev/null +++ b/app/views/bandango_connections/_bandango_connections.html.erb @@ -0,0 +1,10 @@ +<% if @connections.any? %> + <% @connections.each do |connection| %> + <%= render connection %> + <% end %> +
+ <%= paginate @connections, remote: true %> +
+<% else %> + Ninguna +<% end %> diff --git a/app/views/bandangos/_bandango.html.erb b/app/views/bandangos/_bandango.html.erb index 5213e31..7685102 100644 --- 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 %> <%= bandango.nombre %> + + <%= "hace #{time_ago_in_words bandango.last_connection_time}" if bandango.last_connection_time %> + <% end %> diff --git a/app/views/bandangos/show.html.erb b/app/views/bandangos/show.html.erb index 40dbcca..13d0707 100644 --- a/app/views/bandangos/show.html.erb +++ b/app/views/bandangos/show.html.erb @@ -14,3 +14,8 @@ token: <%= @bandango.token %> <%= link_to "Editar", edit_business_bandango_path(@business, @bandango), :class => "btn btn-link" %> + +

Conexiones

+
+ <%= render "bandango_connections/bandango_connections" %> +
diff --git a/app/views/bandangos/show.js.erb b/app/views/bandangos/show.js.erb new file mode 100644 index 0000000..3991bc4 --- /dev/null +++ b/app/views/bandangos/show.js.erb @@ -0,0 +1 @@ +$(".bandango_connections").html("<%= j render('bandango_connections/bandango_connections') %>");