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 10a05a8166f4bdc53b9e6dad7ccc28b9fd19cb73..7559a18612d750f6a70cb9ddfceadbf24995f22d 100644 (file)
--- 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 8a7eb6caaa6df6f0cfdb2eabdda17121d3d4b573..459df4b7ca00a51d96d06ca04f6161d0a4e7f515 100644 (file)
--- 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 ada6854d6b9f3a3f09923d7637b735329ea2b326..e40bdcec6446cc56325939919e8c59139ebed3df 100755 (executable)
--- 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},