From 1f2171520eb4719fefc5a32f26ef2a002cd61f0d Mon Sep 17 00:00:00 2001
From: Victor Costa <vfcosta@gmail.com>
Date: Thu, 11 Jun 2015 16:45:54 -0300
Subject: [PATCH] Display last score point on dashboard

---
 public/style.css                      |  9 +++++++++
 views/gamification/dashboard.html.erb | 33 ++++++++++++++++++---------------
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/public/style.css b/public/style.css
index 8eca46e..3cb39db 100644
--- a/public/style.css
+++ b/public/style.css
@@ -71,3 +71,12 @@
   position: absolute;
   left: 0;
 }
+
+.gamification .points .level {
+  display: inline-block;
+  margin: 0 30px;
+  vertical-align: top;
+}
+.gamification .points .scores {
+  display: inline-block;
+}
diff --git a/views/gamification/dashboard.html.erb b/views/gamification/dashboard.html.erb
index 117e3e5..49a655f 100644
--- a/views/gamification/dashboard.html.erb
+++ b/views/gamification/dashboard.html.erb
@@ -7,24 +7,27 @@
 <div class="gamification">
   <h1><%= _('Gamification Dashboard for %s' % @target.identifier) %></h1>
 
-  <div>
-    <h3> <%= _('Level') %></h3>
-    <%= level_chart(@target) %>
-  </div>
-
-  <div class="scores">
-    <h3><%= _('Score') %></h3>
-    <% Merit::PointRules::AVAILABLE_RULES.each do |category, setting| %>
-      <div class="score <%= category %>">
-        <span class="label"><%= _('%s: ' % category) %></span>
-        <span class="value"><%= @target.points(:category => category) %></span>
+  <div class="points">
+    <div class="level">
+      <h3> <%= _('Level') %></h3>
+      <%= level_chart(@target) %>
+      <div class="score total">
+        <span class="label"><%= _('Total: ') %></span>
+        <span class="value"><%= @target.points %></span>
       </div>
-    <% end %>
-    <div class="score total">
-      <span class="label"><%= _('Total: ') %></span>
-      <span class="value"><%= @target.points %></span>
+    </div>
+
+    <div class="scores">
+      <h3><%= _('Last Score Points') %></h3>
+      <% @target.score_points.order('created_at desc').limit(5).each do |point| %>
+        <div class="score <%= point.score.category %>">
+          <span class="label"><%= _('%s: ' % point.num_points ) %></span>
+          <span class="value"><%= point.created_at %></span>
+        </div>
+      <% end %>
     </div>
   </div>
+
   <div class="badges">
     <h3><%= _('Badges') %></h3>
     <ul class="badge-list">
--
libgit2 0.21.2