From 821dcccfcb43d27ce4190f3fcf9266af7112563d Mon Sep 17 00:00:00 2001
From: Jasper Berghoef <jasper.berghoef@gmail.com>
Date: Thu, 10 Nov 2016 09:27:26 +0100
Subject: [PATCH] Some eenie weenie fixes

---
 src/personalisation/middleware.py                             | 3 ++-
 src/personalisation/static/personalisation/segment/index.css  | 2 +-
 .../templates/modeladmin/personalisation/segment/index.html   | 4 ++--
 src/personalisation/templatetags/personalisation_filters.py   | 3 ++-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/personalisation/middleware.py b/src/personalisation/middleware.py
index 1d945e2..bcb39e9 100644
--- a/src/personalisation/middleware.py
+++ b/src/personalisation/middleware.py
@@ -34,6 +34,7 @@ class SegmentMiddleware(object):
         return response
 
     def test_rules(self, rules, request):
+        """Test wether the user matches a segment's rules'"""
         if len(rules) > 0:
             for rule in rules:
                 result = rule.test_user(request)
@@ -50,5 +51,5 @@ class SegmentMiddleware(object):
         segment.visit_count = segment.visit_count + 1
         segment.save()
 
-        if segment not in request.session['segments']:
+        if segment.encoded_name() not in request.session['segments']:
             request.session['segments'].append(segment.encoded_name())
diff --git a/src/personalisation/static/personalisation/segment/index.css b/src/personalisation/static/personalisation/segment/index.css
index 0b1619f..dc1c5f8 100644
--- a/src/personalisation/static/personalisation/segment/index.css
+++ b/src/personalisation/static/personalisation/segment/index.css
@@ -14,7 +14,7 @@
     box-sizing: border-box;
     position: relative;
     width: calc(50% - 10px);
-    height: 126px;
+    min-height: 126px;
     padding: 10px 20px;
     margin-bottom: 20px;
     border: 1px solid #d9d9d9;
diff --git a/src/personalisation/templates/modeladmin/personalisation/segment/index.html b/src/personalisation/templates/modeladmin/personalisation/segment/index.html
index bfcb66c..07bb768 100644
--- a/src/personalisation/templates/modeladmin/personalisation/segment/index.html
+++ b/src/personalisation/templates/modeladmin/personalisation/segment/index.html
@@ -24,8 +24,8 @@
                                         <div class="block">
                                             <a href="inspect/{{ segment.pk }}"><h2>{{ segment }}</h2></a>
                                             <ul class="segment_stats">
-                                                <li class="visit_stat">{{ segment.visit_count|localize }}</li>
-                                                <li class="days_stat">{{ segment.enable_date|days_since:segment.disable_date }}</li>
+                                                <li class="visit_stat">{{ segment.visit_count|localize }} visits</li>
+                                                <li class="days_stat">{{ segment.enable_date|days_since:segment.disable_date }} days</li>
                                             </ul>
                                             {% if user_can_create %}
                                             <ul class="block_actions">
diff --git a/src/personalisation/templatetags/personalisation_filters.py b/src/personalisation/templatetags/personalisation_filters.py
index 37ab50f..47f85f4 100644
--- a/src/personalisation/templatetags/personalisation_filters.py
+++ b/src/personalisation/templatetags/personalisation_filters.py
@@ -3,11 +3,12 @@ from django.utils import timezone
 
 register = Library()
 
+
 @register.filter(name='days_since')
 def active_days(enable_date, disable_date):
     """Returns the number of days the segment has been active"""
     if enable_date is not None:
-        if disable_date is None or (disable_date < enable_date):
+        if disable_date is None or disable_date <= enable_date:
             # There is no disable date, or it is not relevant.
             delta = timezone.now() - enable_date
             return delta.days