separate pending and treated answers

diff --git a/teleforma/templates/teleforma/answer_detail.html b/teleforma/templates/teleforma/answer_detail.html
index c0a86f0fcba11cbfa7089fcaff9a8573ffb20adf..4f30e4403e1287e2bf8e491602dac243d102f670 100644 (file)
--- a/teleforma/templates/teleforma/answer_detail.html
+++ b/teleforma/templates/teleforma/answer_detail.html
@@ -13,13 +13,13 @@ $(document).ready(function(){
 $('#validate').unbind('click').click(function() {
  json(['{{answer.id}}'],'teleforma.validate_answer');
  $('#validate').unbind('click');
- setTimeout(function() {window.location.href = "{% url teleforma-answers %}";}, 1000);
+ setTimeout(function() {window.location.href = "{% url teleforma-answers-pending %}";}, 1000);
  });
 
 $('#reject').unbind('click').click(function() {
  json(['{{answer.id}}'],'teleforma.reject_answer');
  $('#reject').unbind('click');
- setTimeout(function() {window.location.href = "{% url teleforma-answers %}";}, 1000);
+ setTimeout(function() {window.location.href = "{% url teleforma-answers-pending %}";}, 1000);
  });
 
 });

diff --git a/teleforma/templates/teleforma/answers.html b/teleforma/templates/teleforma/answers.html
index 92e34441a3439c0a1fff7aaeb72d8decf8d1de60..f70a4f17c0ab514d3d971895282accf12433cfd6 100644 (file)
--- a/teleforma/templates/teleforma/answers.html
+++ b/teleforma/templates/teleforma/answers.html
@@ -37,13 +37,12 @@ var answerUtils = {
 {% block modules %}
 <div class="module">
 
-<h3><a href="{% url teleforma-desk %}"><img src="{{ STATIC_URL }}telemeta/images/module_playlist.png" alt="playlists" style="vertical-align:middle" />{% trans "My seminars" %}</a></h3>
+<h3><a href="{% url teleforma-desk %}"><img src="{{ STATIC_URL }}telemeta/images/module_playlist.png" alt="playlists" style="vertical-align:middle" />{% trans "Answers" %}</a></h3>
 <div style="background: white;">
 <ul>
 {% block courses %}
-{% for seminar in all_seminars %}
-   <li><a href="{% url teleforma-seminar-detail seminar.id %}">{{ seminar.title }}</a></li>
- {% endfor %}
+   <li><a href="{% url teleforma-answers-pending %}">{% locale "Pending" %}</a></li>
+   <li><a href="{% url teleforma-answers-treated %}">{% locale "Treated" %}</a></li>
 {% endblock courses %}
 </ul>
 </div>

diff --git a/teleforma/templates/telemeta/base.html b/teleforma/templates/telemeta/base.html
index f7148c674337a7d5d55b5e84fef73b687dbbde66..c1a9ec4607c66b2a86014e78e6f66c2cd7834523 100644 (file)
--- a/teleforma/templates/telemeta/base.html
+++ b/teleforma/templates/telemeta/base.html
@@ -105,7 +105,7 @@ alt="logo" />
 
  {% if user.is_staff %}
    <li><a href="{% url teleforma-users %}" class="yellow">{% trans "Users" %}</a></li>
-   <li><a href="{% url teleforma-answers %}" class="green">{% trans "Answers" %}{% untreated_answer_count %}</a></li>
+   <li><a href="{% url teleforma-answers-pending %}" class="green">{% trans "Answers" %}{% untreated_answer_count %}</a></li>
    {% else %}
    <li><a href="{% url teleforma-help %}" class="yellow">{% trans "Help" %}</a></li>
    <li><a href="{% url teleforma-testimonials %}" class="green">{% trans "Testimonials" %}</a></li>

diff --git a/teleforma/urls.py b/teleforma/urls.py
index 362d889224c8d2515081002a263690f0bfe3767f..114c85c5c58f217512e52683a2243117d4dbb689 100644 (file)
--- a/teleforma/urls.py
+++ b/teleforma/urls.py
@@ -99,7 +99,8 @@ urlpatterns = patterns('',
     # Questions
     url(r'^desk/seminars/(?P<id>.*)/questions/(?P<pk>.*)/$', AnswerView.as_view(),
         name="teleforma-question-answer"),
-    url(r'^desk/answers/$', AnswersView.as_view(), name="teleforma-answers"),
+    url(r'^desk/answers_pending/$', AnswersPendingView.as_view(), name="teleforma-answers-pending"),
+    url(r'^desk/answers_treated/$', AnswersTreatedView.as_view(), name="teleforma-answers-treated"),
     url(r'^desk/answers/(?P<pk>.*)/$', AnswerDetailView.as_view(), name="teleforma-answer-detail"),
 
     # Evaluations

diff --git a/teleforma/views/pro.py b/teleforma/views/pro.py
index e5baf082a8557019ef6e9a0d9e791618230c31cd..cc48a39cdffed5f9b4f796d1dd1a95f4961bde21 100644 (file)
--- a/teleforma/views/pro.py
+++ b/teleforma/views/pro.py
@@ -388,6 +388,18 @@ class AnswersView(ListView):
         notify_user(mess, 'acceptance')
 
 
+class AnswersPendingView(AnswersView):
+
+    def get_queryset(self):
+        return Answer.objects.filter(status=3, treated=False)
+
+
+class AnswersTreatedView(AnswersView):
+
+    def get_queryset(self):
+        return Answer.objects.filter(status=3, treated=True)
+
+
 class AnswerDetailViewTest(DetailView):
     """For test only"""