Merge pull request #3 from Varal7/feature/show-likes

Show who liked your reset

counter/templates/baseTemplate.html

@@ -10,7 +10,7 @@
 	<link rel="shortcut icon" type="image/png" href="{{STATIC_URL}}/favicon.ico" />
 	<title>SeumBook™ – {% block title %}{% endblock %}</title>
 
-	{# Load the tag library #} {% load bootstrap3 %} {# Load CSS and JavaScript #} {% bootstrap_css %} {# Display django.contrib.messages as Bootstrap alerts #} {% bootstrap_messages %}
+	{# Load the tag library #} {% load bootstrap3 %} {# Load CSS and JavaScript #} {% bootstrap_css %} {% bootstrap_javascript jquery=True %} {# Display django.contrib.messages as Bootstrap alerts #} {% bootstrap_messages %}
 
 	<style>
 		body {

counter/templates/homeTemplate.html

@@ -12,7 +12,7 @@
 							<b>{{ myCounter.trigramme }}</b> <small>{{ myCounter.name }}</small>
 						</a>
 						{% if not myCounter.lastReset.noSeum %}
-							<span class="pull-right badge">
+							<span class="pull-right badge" {% if myCounter.likeCount %} data-toggle="tooltip" data-placement="top" title="{{ myCounter.likersString }}" {% endif %}>
 								<span class="glyphicon glyphicon-fire"></span>&emsp;{{ myCounter.likeCount }}
 							</span>
 						{% endif %}
@@ -212,4 +212,10 @@
 		{% endif %}
 	</a>
 </div>
+
+<script>
+$(function () {
+  $('[data-toggle="tooltip"]').tooltip()
+})
+</script>
 {% endblock %}

counter/views.py

@@ -16,6 +16,7 @@ from graphos.sources.model import ModelDataSource
 import random
 import math
 import copy
+import functools
 from django.utils import timezone
 
 # JSS above this limit will not be displayed on the home page col graph
@@ -51,8 +52,13 @@ def home(request):
                 myCounter.lastReset.selfSeum = False
             myCounter.lastReset.delta = datetime.now(
             ) - myCounter.lastReset.timestamp.replace(tzinfo=None)
-            myCounter.likeCount = Like.objects.filter(
-                reset=myCounter.lastReset).count()
+            likesMe = Like.objects.filter(
+                reset=myCounter.lastReset)
+            myCounter.likeCount = likesMe.count()
+            if myCounter.likeCount:
+                myCounter.likersString = functools.reduce(
+                            lambda a,b: a + ", " +  b,
+                            [like.liker.trigramme for like in likesMe])
         myCounter.lastReset.formatted_delta = format_timedelta(
             myCounter.lastReset.delta, locale='fr', threshold=1)
     except Counter.DoesNotExist: