Compact display, show less people

.gitignore

@@ -4,3 +4,4 @@ settings.py
 dev.db
 static/.sass-cache
 uploads/[^.]*
+venv

main/views.py

@@ -2,7 +2,7 @@
 from datetime import datetime
 from datetime import timedelta
 from itertools import groupby
-import simplejson as json
+import json
 import time
 
 from django.contrib.auth import login, logout as auth_logout
@@ -14,7 +14,7 @@ from django.shortcuts import render_to_response, get_object_or_404
 from django.template import RequestContext
 from django.forms.formsets import formset_factory
 from django.contrib import messages
-from django.db.models import Count, Sum
+from django.db.models import Count, Sum, Max, Min
 
 from models import *
 
@@ -36,7 +36,9 @@ def home(request):
 
 def register(request):
     products = Product.objects.filter(active=True)
-    users = User.objects.filter(userprofile__balance__gt=0)
+    cheapest_product_price = products.aggregate(Min('sale_price_int')).values()[0]
+    one_year_ago = datetime.now() - timedelta(days=365) # one year ago
+    users = User.objects.filter(userprofile__balance__gt=cheapest_product_price)
     # sort users after user's last purchase time
     users = sorted(users, key=lambda u: u.get_profile().last_purchase_date(), reverse=True)
     users_js = users_format_js(users)

requirements.txt

@@ -0,0 +1,2 @@
+Django==1.4.8
+MySQL-python==1.2.4

static/js/register.js

@@ -74,7 +74,7 @@ $(document).ready(function() {
         display.html(qty);
         /* Update total*/
         var sale_price_int = Number($(this).children("span.sale_price_int").text());
-        var cur_total = Number($("span.total_text").text())
+        var cur_total = Number($("span.total_text").text());
         $("span.total_text").html(cur_total + sale_price_int);
     });
     /* Form reset */
@@ -95,4 +95,15 @@ $(document).ready(function() {
     }, 5000);
 
     $("h2").tooltip({placement: 'right'});
+    /* Toggle infrequent users */
+    $(".toggle-infrequent-users").on('click', function(e) {
+        e.preventDefault();
+        $("li.customer.infrequent").toggleClass('hidden');
+        if($(this).text() === "Vis alle") {
+            $(this).text("Skjul gamliser");
+        }
+        else {
+            $(this).text("Vis alle");
+        }
+    });
 });

static/sass/screen.scss

@@ -1,16 +1,15 @@
 @import "compass";
 @import "compass/reset";
 
-// Fixes image path for icons from sass-bootstrap
-$iconSpritePath: generated-image-url("glyphicons-halflings.png");
-$iconWhiteSpritePath: generated-image-url("glyphicons-halflings-white.png");
-
 @import "bootstrap";
 @import "bootstrap-responsive";
 
 body {
 
     #header {
+        .navbar {
+            margin-bottom: 0;
+        }
     }
 
     #customer {
@@ -31,6 +30,9 @@ body {
                     color: #468847;
                     background-color: #DFF0D8;
                 }
+                &.hidden {
+                    display: none !important;
+                }
                 .name {
                     font-weight: bold;
                 }
@@ -40,6 +42,7 @@ body {
 
     #register {
         #products {
+            margin-bottom:2em;
             ul {
                 @include inline-block-list;
                 
@@ -68,17 +71,15 @@ body {
             }
         }
         
-        #total {
-            div {
+        .total {
             color: #ffffff;
             background-color: #222;
-                padding: 10px;
+            padding: 0 10px;
             min-width:115px;
             h2 {
                 color: #ffffff;
             }
         }
-        }
         h2 {
             display: inline-block;
         }
@@ -104,6 +105,5 @@ body {
         }
     }
     section {
-        margin-bottom:2em;
     }
 }

templates/register.html

@@ -31,8 +31,7 @@
                     <!-- Actual customer select field (hidden) -->
                     <div style="display:none;">{{orderform.customer }}</div>
                         <ul class="well">
-                        {% for user in users %}
-                                <li class="customer">
+                        {% for user in users %}<li class="customer{% if user.get_profile.last_purchase_date < one_year_ago %} infrequent hidden{% endif %}">
                                 {% if user.get_profile.image %}
                                     <img class="profile" src="{{ user.get_profile.image }}" alt="Profile picture" /><br />
                                 {% else %}
@@ -41,9 +40,11 @@
                                 <span class="name">{{ user.first_name }} {{ user.last_name|slice:":1"}}</span><br />
                                 <span class="balance">{{ user.get_profile.balance }}</span>
                                 <span class="id" style="display:none;">{{ user.id }}</span>
-                                </li>
-                        {% endfor %}
+                                </li>{% endfor %}
                         </ul>
+                        <div class="users-description pull-right">
+                            <small>Viser: De med minst <strong>{{ cheapest_product_price }}</strong> i saldo<span class="infrequent-users"> og mer enn ett kjøp siden <strong>{{ one_year_ago }}</strong></span>. <a href="#" class="toggle-infrequent-users">Vis alle</a></small>
+                        </div>
                 </div>
                 {%else%}
                     <div class="span3">
@@ -73,13 +74,11 @@
                     </ul>
                 </div>
             </section>
-            <section id="total" class="row-fluid">
-                <div class="span2">
-                    <h2>Totalt: <span class="total_text"></span></h2>
-                </div>
-            </section>
         </fieldset>
         <div class="form-actions">
+                <div class="span3 total">
+                    <h2>Totalt: <span class="total_text"></span></h2>
+                </div>
                 <button type="submit" class="btn btn-large btn-primary" name="submit_order">Kjøp</button>
                 <button type="reset" class="btn">Start på nytt</button>
         </div>