]> git.parisson.com Git - teleforma.git/commitdiff
fix profile and user list
authoryomguy <yomguy@parisson.com>
Wed, 6 Jun 2012 09:14:17 +0000 (11:14 +0200)
committeryomguy <yomguy@parisson.com>
Wed, 6 Jun 2012 09:14:17 +0000 (11:14 +0200)
teleforma/templates/telemeta/inc/user_list.html
teleforma/templates/telemeta/profile_detail.html

index cd4458c439238ad0cc535d7014eeb27ce588b001..d6c8a010ea9314a118e8065883b34208d0b61568 100644 (file)
@@ -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>
      {% 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>
index 97340ab985288eced577d713007733499c8a0864..b4890d26a61ed326bf73df22688f368a56b658ff 100644 (file)
       {% 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 %}