From 34e966f5de1e51c8a8d8b1c6e4472693ab8c76da Mon Sep 17 00:00:00 2001
From: volpino <fox91@anche.no>
Date: Fri, 27 Jul 2012 12:21:48 +0200
Subject: [PATCH] euscanwww: Adding queue position in refresh package alert
 message

Signed-off-by: volpino <fox91@anche.no>
---
 euscanwww/djeuscan/models.py                     |  7 +++++++
 euscanwww/djeuscan/templates/euscan/package.html | 12 +++++++-----
 euscanwww/djeuscan/views.py                      | 15 ++++++++++-----
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/euscanwww/djeuscan/models.py b/euscanwww/djeuscan/models.py
index 86f79bc..c2b2d17 100644
--- a/euscanwww/djeuscan/models.py
+++ b/euscanwww/djeuscan/models.py
@@ -324,6 +324,13 @@ class RefreshPackageQuery(models.Model):
     priority = models.IntegerField(default=0)
     users = models.ManyToManyField(User)
 
+    @property
+    def position(self):
+        ordered = RefreshPackageQuery.objects.all().order_by("-priority")
+        for pos, obj in enumerate(ordered, start=1):
+            if obj == self:
+                return pos
+
     def __unicode__(self):
         return u'[%d] %s' % (self.priority, self.package)
 
diff --git a/euscanwww/djeuscan/templates/euscan/package.html b/euscanwww/djeuscan/templates/euscan/package.html
index 8c90efe..d0381a9 100644
--- a/euscanwww/djeuscan/templates/euscan/package.html
+++ b/euscanwww/djeuscan/templates/euscan/package.html
@@ -25,8 +25,9 @@
 
 {% block content %}
 
-<div class="refresh-alert alert {% if not refreshed %}hide{% endif %}">
-  A refresh request is in progress, please wait...
+<div class="refresh-alert alert {% if not refresh_pos %}hide{% endif %}">
+  <p>A refresh request is in progress, please wait...</p>
+  <p>Queue position: <span id="refresh-pos">{{ refresh_pos }}</span></p>
 </div>
 
 <h2>
@@ -34,10 +35,10 @@
 
   {% if user.is_authenticated %}
     <span class="pull-right">
-      <button class="btn refresh-button {% if refreshed %}hide{% endif %}" data-category="{{ package.category }}" data-package="{{ package.name }}">
+      <button class="btn refresh-button {% if refresh_requested %}hide{% endif %}" data-category="{{ package.category }}" data-package="{{ package.name }}">
         <img src="{{ STATIC_URL}}/img/refresh-active.png" alt="Refresh" >
       </button>
-      <button class="btn refresh-button-disabled disabled {% if not refreshed %}hide{% endif %}">
+      <button class="btn refresh-button-disabled disabled {% if not refresh_requested %}hide{% endif %}">
         <img src="{{ STATIC_URL}}/img/refresh-inactive.png" alt="Refresh" >
       </button>
       <button class="btn favourite-button {% if favourited %}hide{% endif %}" data-url="{% url "favourite_package" package.category package.name %}">
@@ -67,9 +68,10 @@
     $(".refresh-button").click(function() {
       var url = "{% url "refresh_package" "XXX" "YYY" %}";
       $.post(url.replace("XXX", $(this).data("category")).replace("YYY", $(this).data("package")),
-        function() {
+        function(data) {
           $(".refresh-button").addClass("hide");
           $(".refresh-button-disabled").removeClass("hide");
+          $("#refresh-pos").text(data.position);
           $(".refresh-alert").show("slow");
         });
     });
diff --git a/euscanwww/djeuscan/views.py b/euscanwww/djeuscan/views.py
index 89460f4..9c15bcf 100644
--- a/euscanwww/djeuscan/views.py
+++ b/euscanwww/djeuscan/views.py
@@ -195,10 +195,13 @@ def package(request, category, package):
             favourited = True
 
     try:
-        refreshed = request.user in \
-            RefreshPackageQuery.objects.get(package=package).users.all()
+        refresh_query = RefreshPackageQuery.objects.get(package=package)
     except RefreshPackageQuery.DoesNotExist:
-        refreshed = False
+        refresh_requested = False
+        refresh_pos = None
+    else:
+        refresh_requested = request.user in refresh_query.users.all()
+        refresh_pos = refresh_query.position
 
     return {
         'package': package,
@@ -209,7 +212,8 @@ def package(request, category, package):
         'msg': log.messages() if log else "",
         'last_scan': last_scan,
         'favourited': favourited,
-        'refreshed': refreshed,
+        'refresh_requested': refresh_requested,
+        'refresh_pos': refresh_pos,
     }
 
 
@@ -369,7 +373,8 @@ def refresh_package(request, category, package):
     if not created:
         obj.priority += 1
         obj.save()
-    return {"result": "success"}
+
+    return {"result": "success", "position": obj.position}
 
 
 @login_required