From: yomguy <yomguy@parisson.com>
Date: Mon, 11 Jun 2012 08:57:06 +0000 (+0200)
Subject: fix profile courses, no options in tabs, fix XLS export col width
X-Git-Tag: 0.5^2~1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=6d0ac8668f01eefab45625fe053d276b8f1cdda3;p=teleforma.git

fix profile courses, no options in tabs, fix XLS export col width
---

diff --git a/teleforma/templates/telemeta/inc/user_list.html b/teleforma/templates/telemeta/inc/user_list.html
index 10a05a81..7559a186 100644
--- a/teleforma/templates/telemeta/inc/user_list.html
+++ b/teleforma/templates/telemeta/inc/user_list.html
@@ -25,7 +25,6 @@
     <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>
@@ -44,7 +43,6 @@
         <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 8a7eb6ca..459df4b7 100644
--- a/teleforma/templates/telemeta/profile_detail.html
+++ b/teleforma/templates/telemeta/profile_detail.html
@@ -17,11 +17,11 @@
     <div style="background: white;">
     <ul>
     {% block courses %}
-    {% with user|user_courses as courses %}
+    {% with usr|user_courses as courses %}
      {% for c in courses %}
-      {% for course in c.courses %}
+       {% with c.course as course %}
        <li><a href="{% url teleforma-course-detail course.id %}">{{ course.title}} {{ course.type }}</a></li>
-      {% endfor %}
+       {% endwith %}
      {% endfor %}
     {% endwith %}
     {% endblock courses %}
diff --git a/teleforma/views.py b/teleforma/views.py
index ada6854d..e40bdcec 100755
--- a/teleforma/views.py
+++ b/teleforma/views.py
@@ -404,12 +404,12 @@ class UsersXLSExport(object):
         cols = [{'name':'NOM', 'width':5000},
                 {'name':'PRENOM', 'width':5000},
                 {'name':'IEJ', 'width':2500},
-                {'name':'FORMATION', 'width':5000},
+                {'name':'FORMATION', 'width':6000},
                 {'name':'PROC', 'width':2500},
-                {'name':'Ecrit Spe', 'width':2500},
-                {'name':'Oral Spe', 'width':2500},
-                {'name':'ORAL 1', 'width':2500},
-                {'name':'ORAL 2', 'width':2500},
+                {'name':'Ecrit Spe', 'width':3000},
+                {'name':'Oral Spe', 'width':3000},
+                {'name':'ORAL 1', 'width':3000},
+                {'name':'ORAL 2', 'width':3000},
                 {'name':'MAIL', 'width':7500},
                 {'name':'ADRESSE', 'width':7500},
                 {'name':'CP', 'width':2500},