From: yomguy <yomguy@parisson.com>
Date: Wed, 6 Jun 2012 09:14:17 +0000 (+0200)
Subject: fix profile and user list
X-Git-Tag: 0.5^2~21^2~1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=dad2d5bad101a0e0c300c5a707b0839d0f3ac6d5;p=teleforma.git

fix profile and user list
---

diff --git a/teleforma/templates/telemeta/inc/user_list.html b/teleforma/templates/telemeta/inc/user_list.html
index cd4458c4..d6c8a010 100644
--- a/teleforma/templates/telemeta/inc/user_list.html
+++ b/teleforma/templates/telemeta/inc/user_list.html
@@ -24,6 +24,7 @@
     <th>{% trans "Written spe"%}</th>
     <th>{% trans "Oral 1"%}</th>
     <th>{% trans "Oral 2"%}</th>
+    <th>{% trans "Options"%}</th>
     <th>{% trans "Write"%}</th>
     </tr>
     </thead>
@@ -36,11 +37,12 @@
      {% if user.student.get %}
       {% with user.student.get as student %}
         <td>{{ student.iej.name }}</td>
-        <td>{{ student.procedure.all.0.code }}</td>
-        <td>{{ student.oral_speciality.all.0.code }}</td>
-        <td>{{ student.written_speciality.all.0.code }}</td>
-        <td>{{ student.oral_1.all.0.code }}</td>
-        <td>{{ student.oral_2.all.0.code }}</td>
+        <td>{{ student.procedure.code }}</td>
+        <td>{{ student.oral_speciality.code }}</td>
+        <td>{{ student.written_speciality.code }}</td>
+        <td>{{ student.oral_1.code }}</td>
+        <td>{{ student.oral_2.code }}</td>
+        <td>{{ student.options.code }}</td>
      {% endwith %}
     {% elif user.professor.get %}
         <td>{% trans "Professor" %}</td>
diff --git a/teleforma/templates/telemeta/profile_detail.html b/teleforma/templates/telemeta/profile_detail.html
index 97340ab9..b4890d26 100644
--- a/teleforma/templates/telemeta/profile_detail.html
+++ b/teleforma/templates/telemeta/profile_detail.html
@@ -62,11 +62,12 @@
       {% if usr.student.get %}
         <dt>{% trans "IEJ" %}</dt><dd><a href="{% url teleforma-iej-users usr.student.get.iej.id %}">{{ usr.student.get.iej }}</a></dd>
         <dt>{% trans "Training" %}</dt><dd><a href="{% url teleforma-training-users usr.student.get.training.id %}">{{ usr.student.get.training }}</a></dd>
-        <dt>{% trans "Procedure"%}</dt><dd>{% for proc in usr.student.get.procedure.all %}{{ proc }}, {% endfor %}</dd>
-        <dt>{% trans "Oral spe"%}</dt><dd>{% for spec in usr.student.get.oral_speciality.all %}{{ spec }}, {% endfor %}</dd>
-        <dt>{% trans "Written spe"%}</dt><dd>{% for spec in usr.student.get.written_speciality.all %}{{ spec }}, {% endfor %}</dd>
-        <dt>{% trans "Oral 1"%}</dt><dd>{% for oral in usr.student.get.oral_1.all %}{{ oral }}, {% endfor %}</dd>
-        <dt>{% trans "Oral 2"%}</dt><dd>{% for oral in usr.student.get.oral_2.all %}{{ oral }}, {% endfor %}</dd>
+        <dt>{% trans "Procedure"%}</dt><dd>{{ usr.student.get.procedure}}</dd>
+        <dt>{% trans "Oral spe"%}</dt><dd>{{ usr.student.get.oral_speciality }}</dd>
+        <dt>{% trans "Written spe"%}</dt><dd>{{ usr.student.get.written_speciality }}</dd>
+        <dt>{% trans "Oral 1"%}</dt><dd>{{ usr.student.get.oral_1 }}</dd>
+        <dt>{% trans "Oral 2"%}</dt><dd>{{ usr.student.get.oral_2 }}</dd>
+        <dt>{% trans "Options"%}</dt><dd>{{ usr.student.get.options }}</dd>
       {% endif %}
 
       {% if user.is_staff or user.is_superuser %}