add non treated answer counter

diff --git a/teleforma/forms.py b/teleforma/forms.py
index 4ddbd60f78fd57d801980e486afffd67f9d9837a..a5380d7a10bc5b3891334d3d500cc3e62e031aaf 100644 (file)
--- a/teleforma/forms.py
+++ b/teleforma/forms.py
@@ -18,11 +18,12 @@ class QuestionForm(ModelForm):
 
 class AnswerForm(ModelForm):
 
-    def __init__(self, *args, **kwargs): 
+    def __init__(self, *args, **kwargs):
         super(AnswerForm, self).__init__(*args, **kwargs)
         self.fields['answer'].widget.attrs['cols'] = 81
         self.fields['answer'].widget.attrs['rows'] = 32
         self.fields['status'].widget = HiddenInput()
+        self.fields['treated'].widget = HiddenInput()
 
     class Meta:
         model = Answer

diff --git a/teleforma/models/pro.py b/teleforma/models/pro.py
index fb13bf988087587cc1d558326ad1970048571fb9..f23c17e8c4ff9f1f7126ebb56096acff6ffc7308 100755 (executable)
--- a/teleforma/models/pro.py
+++ b/teleforma/models/pro.py
@@ -154,7 +154,7 @@ class Answer(models.Model):
 
     def validate(self):
         self.validated = True
-        self.treated = False
+        self.treated = True
         self.date_validated = datetime.datetime.now()
         self.save()
 

diff --git a/teleforma/templates/telemeta/base.html b/teleforma/templates/telemeta/base.html
index f57c0eb2ff4cd743c9de9090bfce0746c6235b3d..ef99ee5f53e83dfc23a15dcc979526fbb98b9d2b 100644 (file)
--- a/teleforma/templates/telemeta/base.html
+++ b/teleforma/templates/telemeta/base.html
@@ -104,7 +104,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" %}</a></li>
+   <li><a href="{% url teleforma-answers %}" 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/templatetags/teleforma_tags.py b/teleforma/templatetags/teleforma_tags.py
index 341fd2709e8922092afa93c822c34efaea20f96a..b579720039303a908bf1d2bcc5a6d7e4a6a63176 100644 (file)
--- a/teleforma/templatetags/teleforma_tags.py
+++ b/teleforma/templatetags/teleforma_tags.py
@@ -138,17 +138,17 @@ def yes_no(bool):
 def from_course_type(contents, type):
     if contents:
         return contents.filter(course_type=type)
-    
+
 @register.filter
 def from_doc_type(contents, type):
     if contents:
         return contents.filter(type=type)
-    
+
 @register.filter
 def from_periods(contents, periods):
     if contents:
         return contents.filter(period__in=periods)
-    
+
 @register.assignment_tag
 def get_all_professors():
     return Professor.objects.all().order_by('user__first_name')
@@ -244,16 +244,16 @@ def validated(question, user):
 @register.filter
 def summary(text, N):
     return text[:N] + '...'
-    
+
 @register.filter
 def progress(seminar, user):
     return seminar_progress(user, seminar)
-    
+
 @register.filter
 def in_download_formats(file):
     ext = os.path.splitext(file)[1][1:]
     return ext in settings.TELEMETA_DOWNLOAD_FORMATS
-    
+
 @register.filter
 def user_seminars(user):
     return all_seminars(user)['all_seminars']
@@ -295,4 +295,11 @@ def fancy_duration(duration):
         time += str(hours) + 'h'
     time += str(minutes) + 'mn'
     return time
-    
+
+@register.simple_tag
+def untreated_answer_count():
+    answers = Answer.objects.filter(treated=False)
+    if answers:
+        return ' (' + str(len(answers)) + ')'
+    else:
+        return ''