fix profile and course menu title

diff --git a/teleforma/models/crfpa.py b/teleforma/models/crfpa.py
index 20b6a932a3c9b22db5c3cfa94bcb2e81b1818cce..be63e9bddaa23bb87ecb3b207abd463654b251f1 100644 (file)
--- a/teleforma/models/crfpa.py
+++ b/teleforma/models/crfpa.py
@@ -105,14 +105,14 @@ class Training(Model):
 
 class Student(Model):
 
-    user            = ForeignKey(User, related_name='crfpa_student', verbose_name=_('user'), unique=True)
+    user            = ForeignKey(User, related_name='student', verbose_name=_('user'), unique=True)
     #period          = ManyToManyField('Period', related_name='student', verbose_name=_('period'),
     #                             blank=True, null=True)
     iej             = ForeignKey('IEJ', related_name='student', verbose_name=_('iej'),
                                  blank=True, null=True, on_delete=models.SET_NULL)
     #training        = ForeignKey('Training', related_name='student', verbose_name=_('training'),
     #                             blank=True, null=True, on_delete=models.SET_NULL)
-    trainings       = ManyToManyField('Training', related_name='student_profile', verbose_name=_('trainings'),
+    trainings       = ManyToManyField('Training', related_name='student_trainings', verbose_name=_('trainings'),
                                       blank=True, null=True)
     platform_only   = BooleanField(_('platform only'))
     procedure       = ForeignKey('Course', related_name="procedure",

diff --git a/teleforma/templates/teleforma/courses.html b/teleforma/templates/teleforma/courses.html
index dec2defbae798c49ad3fc9bbd3c6a06a530ed79a..f8d8213935030cbcd2aefd0a9ae95ef15de3e8a9 100644 (file)
--- a/teleforma/templates/teleforma/courses.html
+++ b/teleforma/templates/teleforma/courses.html
@@ -20,7 +20,7 @@ $(document).ready(function(){
 {% block modules %}
 <div class="module">
 
-<h3><a href="{% url teleforma-home %}"><img src="{{ STATIC_URL }}telemeta/images/module_playlist.png" alt="playlists" style="vertical-align:middle" />{% trans "My courses" %}</a></h3>
+<h3><img src="{{ STATIC_URL }}telemeta/images/module_playlist.png" alt="playlists" style="vertical-align:middle" />{{ period }}</h3>
 <div style="background: white;">
 <ul>
 {% block courses %}

diff --git a/teleforma/templates/telemeta/base.html b/teleforma/templates/telemeta/base.html
index 40585fcc44af76e204aff5f925a9f67dc1efc533..d1f597df41fdccabb7fde28f932ae2a7574ac430 100644 (file)
--- a/teleforma/templates/telemeta/base.html
+++ b/teleforma/templates/telemeta/base.html
@@ -96,7 +96,7 @@ alt="logo" />
       </ul>
     </li>
   {% else %}
-   <li><a href="{% url teleforma-desk-period-list period.id %}" class="red">{% trans "Desk" %}</a></li>
+   <li><a href="{% url teleforma-home %}" class="red">{% trans "Desk" %}</a></li>
   {% endif %}
 
  {% else %}

diff --git a/teleforma/templates/telemeta/profile_detail.html b/teleforma/templates/telemeta/profile_detail.html
index efb267a2426095fb90155b636bcf48116189975e..87f6d7c7726029cf44dcfaff1d267ecb6a43ebfa 100644 (file)
--- a/teleforma/templates/telemeta/profile_detail.html
+++ b/teleforma/templates/telemeta/profile_detail.html
@@ -20,7 +20,7 @@
     {% with usr|user_courses as courses %}
      {% for c in courses %}
        {% with c.course as course %}
-       <li>{{ course.title}} {{ course.type }}</li>
+       <li><a href="#">{{ course.title}} {{ course.type }}</a></li>
        {% endwith %}
      {% endfor %}
     {% endwith %}
@@ -60,14 +60,9 @@
       <dt>{% trans "Last Name" %}</dt><dd>{{ usr.last_name }}</dd>
       <dt>{% trans "Username" %}</dt><dd>{{ usr.username }}</dd>
 
-      {% if usr.crfpa_student.get %}
-        {% if user.is_staff %}
-        <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>
-        {% else %}
+      {% if usr.student.get %}
         <dt>{% trans "IEJ" %}</dt><dd>{{ usr.student.get.iej }}</dd>
-        <dt>{% trans "Training" %}</dt><dd>{{ usr.student.get.training }}</dd>
-        {% endif %}
+        <dt>{% trans "Trainings" %}</dt><dd>{% for training in usr.student.get.trainings.all %}{{ training }}<br />{% endfor %}</dd>
         <dt>{% trans "Platform only" %}</dt><dd>{{ usr.student.get.platform_only|yes_no }}</dd>
         <dt>{% trans "Procedure"%}</dt><dd>{{ usr.student.get.procedure}}</dd>
         <dt>{% trans "Oral spe"%}</dt><dd>{{ usr.student.get.oral_speciality }}</dd>

diff --git a/teleforma/views/core.py b/teleforma/views/core.py
index 83c3cd784db274a08af705ee5ac88b7b26851f72..0878ee76e267b1e64c627d582f30cb45f8e7cf88 100644 (file)
--- a/teleforma/views/core.py
+++ b/teleforma/views/core.py
@@ -152,17 +152,10 @@ def get_host(request):
     return host
 
 def get_periods(user):
-    if settings.TELEFORMA_E_LEARNING_TYPE == 'CRFPA':
-        student = user.crfpa_student.all()
-        if student:
-            student = user.crfpa_student.get()
-            periods = [training.period for training in student.trainings.all()]
-
-    elif settings.TELEFORMA_E_LEARNING_TYPE == 'AE':
-        student = user.ae_student.all()
-        if student:
-            student = user.ae_student.get()
-            periods = student.period.all()
+    student = user.student.all()
+    if student:
+        student = user.student.get()
+        periods = [training.period for training in student.trainings.all()]
 
     if user.is_superuser or user.is_staff:
         periods = Period.objects.all()

diff --git a/teleforma/views/crfpa.py b/teleforma/views/crfpa.py
index 647978cd0a877267692dc2710ac9f5a74f86ac20..6545d29f5508d2d3c6f5f8a8b415b900017f6d58 100644 (file)
--- a/teleforma/views/crfpa.py
+++ b/teleforma/views/crfpa.py
@@ -43,7 +43,7 @@ def get_crfpa_courses(user, date_order=False, num_order=False, period=None):
         return courses
 
     professor = user.professor.all()
-    student = user.crfpa_student.all()
+    student = user.student.all()
 
     if professor:
         professor = user.professor.get()
@@ -51,7 +51,7 @@ def get_crfpa_courses(user, date_order=False, num_order=False, period=None):
                                   types=CourseType.objects.all())
 
     elif student:
-        student = user.crfpa_student.get()
+        student = user.student.get()
         for training in student.trainings.all():
             if training.period == period:
                 break
@@ -151,7 +151,7 @@ class UsersTrainingView(UsersView):
 
     def get_queryset(self):
         self.training = Training.objects.filter(id=self.args[0])
-        return User.objects.filter(crfpa_student__trainings__in=self.training).order_by('last_name')
+        return User.objects.filter(student__trainings__in=self.training).order_by('last_name')
 
     def get_context_data(self, **kwargs):
         context = super(UsersTrainingView, self).get_context_data(**kwargs)
@@ -166,7 +166,7 @@ class UsersIejView(UsersView):
 
     def get_queryset(self):
         self.iej = IEJ.objects.filter(id=self.args[0])
-        return User.objects.filter(crfpa_student__iej__in=self.iej).order_by('last_name')
+        return User.objects.filter(student__iej__in=self.iej).order_by('last_name')
 
     def get_context_data(self, **kwargs):
         context = super(UsersIejView, self).get_context_data(**kwargs)
@@ -309,7 +309,7 @@ class AnnalsView(ListView):
     student = None
 
     def get_docs(self, iej=None, course=None):
-        students = self.user.crfpa_student.all()
+        students = self.user.student.all()
         annals = {}
         courses = [c['course'] for c in self.all_courses]