order seminars by progress

diff --git a/teleforma/context_processors.py b/teleforma/context_processors.py
index 95a036bd8c97f5d594e0b8b0049ad2c7db8b44e4..d151460631a2359313766ae1c76abe8cc4f9448b 100644 (file)
--- a/teleforma/context_processors.py
+++ b/teleforma/context_processors.py
@@ -103,6 +103,21 @@ def all_seminars(request, progress_order=False):
     else:
         seminars = {}
 
+    if seminars and progress_order == True:
+        s_list = []
+        for seminar in seminars:
+            d = {}
+            d['seminar'] = seminar
+            d['progress'] = seminar_progress(user, seminar)
+            s_list.append(d)
+
+        seminars = sorted(s_list, key=lambda k: k['progress'], reverse=False)
+        sem = []
+        for s in seminars:
+            sem.append(s['seminar'])
+        seminars = sem
+        print seminars
+
     return {'all_seminars': seminars}
 
 

diff --git a/teleforma/templates/teleforma/seminars.html b/teleforma/templates/teleforma/seminars.html
index 74d4e4407b454e1f8f26a4af75328ff07be9a7cf..41b62213dc839fed371a483944f0c294feb28bf1 100644 (file)
--- a/teleforma/templates/teleforma/seminars.html
+++ b/teleforma/templates/teleforma/seminars.html
@@ -77,7 +77,7 @@ $(function() {
 {% block course %}
 
 <div class="desk_center">
-    {% for seminar in all_seminars %}
+    {% for seminar in object_list %}
       
       <div class="course">
 
@@ -86,9 +86,10 @@ $(function() {
          <div style="float: right; font-size: 0.9em;">
           {% if seminar|progress:user == 100 %}
           <img src="{{ STATIC_URL }}telemeta/images/ok.png" title="{% trans "validated" %}" alt="{% trans "validated" %}"/>
+          {% else %}
+          {{ seminar|progress:user }}%
           {% endif %}
           </div>
-
         </div>
 
         <div class="course_content">

diff --git a/teleforma/views/pro.py b/teleforma/views/pro.py
index 8a4e0773812e142eeebb13c01dc2b48ba358d86f..3fd4445e7a767656af73f90ec27b255aa80c600d 100644 (file)
--- a/teleforma/views/pro.py
+++ b/teleforma/views/pro.py
@@ -116,8 +116,8 @@ class SeminarsView(ListView):
     model = Seminar
     template_name='teleforma/seminars.html'
 
-    # def get_queryset(self):
-    #      return all_seminars(self.request, progress_order=True)
+    def get_queryset(self):
+        return all_seminars(self.request, progress_order=True)['all_seminars']
 
     @method_decorator(login_required)
     def dispatch(self, *args, **kwargs):