fix prof seminars, add icons

diff --git a/teleforma/templates/teleforma/inc/question_list.html b/teleforma/templates/teleforma/inc/question_list.html
index 9854613dbb4a2f0bc47a0227e3cefd47ea942d46..bb505eed0ee9670c00d9614ed01edf063cef6266 100644 (file)
--- a/teleforma/templates/teleforma/inc/question_list.html
+++ b/teleforma/templates/teleforma/inc/question_list.html
@@ -13,7 +13,7 @@
             <tr>
             <td {% if forloop.first %}class="border-top"{% endif %} width="35%"><a href="{% url teleforma-question-answer question.id %}">{{ question.title }} n°{{ question.rank }}</a></td>
             <td {% if forloop.first %}class="border-top"{% endif %} width="60%">{% if question|submitted:user %}{% trans "submitted on" %} {{ question|submitted:user }}{% elif question|saved:user %}{% trans "saved on" %} {{ question|saved:user }}{% endif %} </td>
-            <td {% if forloop.first %}class="border-top"{% endif %} width="5%" align="center">{% if question|submitted:user and not question|validated:user %}<img src="{{ STATIC_URL }}teleforma/images/chronometer.png" style="vertical-align:middle" alt="" title="{% trans "Waiting for validation" %}" />{% elif question|submitted:user and question|validated:user %}<img src="{{ STATIC_URL }}telemeta/images/ok.png" style="vertical-align:middle" alt="" title="{% trans "Validated" %}" />{% endif %}</td>
+            <td {% if forloop.first %}class="border-top"{% endif %} width="5%" align="center">{% if question|submitted:user and not question|validated:user %}<img src="{{ STATIC_URL }}teleforma/images/chronometer.png" style="vertical-align:middle" alt="" title="{% trans "Waiting for validation" %}" />{% elif question|submitted:user and question|validated:user %}<img src="{{ STATIC_URL }}telemeta/images/ok.png" style="vertical-align:middle" alt="" title="{% trans "Validated" %}" />{% elif question|saved:user and not question|submitted:user %}<img src="{{ STATIC_URL }}telemeta/images/media-record.png" style="vertical-align:middle" alt="" title="{% trans "Saved" %}" />{% endif %}</td>
             </tr>
         {% endfor %}
     </tbody>

diff --git a/teleforma/templates/teleforma/seminars.html b/teleforma/templates/teleforma/seminars.html
index d238f5b85b783c5dbc3d4f5d3b531b09b07053eb..9560a2ccf7438226ca6d749f75c196d1c9716e6c 100644 (file)
--- a/teleforma/templates/teleforma/seminars.html
+++ b/teleforma/templates/teleforma/seminars.html
@@ -118,7 +118,7 @@ $(function() {
   <h3><img src="{{STATIC_URL}}teleforma/images/status.png" alt="status" style="vertical-align:middle" /> {% trans "Progressions" %}</h3>
  <div class="progress">
   <ul>
-    <li>{% trans "General" %} : {{ total_progress }}
+    <li>{% trans "General" %} : {{ total_progress }}%
      <div id="progressbar-general"></div>
     </li>
   </ul>

diff --git a/teleforma/views/pro.py b/teleforma/views/pro.py
index f6c184eb0faae3b46851a934068cdf8d9ba38993..c68f9e9fe49088946c9a2d84f60d66a86aa5fba5 100644 (file)
--- a/teleforma/views/pro.py
+++ b/teleforma/views/pro.py
@@ -102,8 +102,12 @@ def get_seminars(user):
     auditor = user.auditor.all()
 
     if professor:
+        seminars = []
         professor = user.professor.get()
-        seminars = professor.seminars.all()
+        courses = professor.courses.all()
+        for course in courses:
+            for seminar in course.seminar.all():
+                seminars.append(seminar)
 
     elif auditor and not (user.is_staff or user.is_superuser):
         auditor = user.auditor.get()
@@ -149,10 +153,15 @@ def total_progress(user):
 
     progress = 0
     auditor = user.auditor.all()
+    professor = user.professor.all()
+
     if auditor and not (user.is_staff or user.is_superuser):
         seminars = auditor[0].seminars.all()        
     elif user.is_superuser or user.is_staff:
         seminars = Seminar.objects.all()
+    elif professor:
+        seminars = get_seminars(user)
+        
     for seminar in seminars:
         progress += seminar_progress(user, seminar)