From 726c96a4ead4b2b5850f79e455f8666f5985cc18 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Thu, 4 Jul 2013 23:12:42 +0200 Subject: [PATCH] fix profile and course menu title --- teleforma/models/crfpa.py | 4 ++-- teleforma/templates/teleforma/courses.html | 2 +- teleforma/templates/telemeta/base.html | 2 +- teleforma/templates/telemeta/profile_detail.html | 11 +++-------- teleforma/views/core.py | 15 ++++----------- teleforma/views/crfpa.py | 10 +++++----- 6 files changed, 16 insertions(+), 28 deletions(-) diff --git a/teleforma/models/crfpa.py b/teleforma/models/crfpa.py index 20b6a932..be63e9bd 100644 --- 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 dec2defb..f8d82139 100644 --- a/teleforma/templates/teleforma/courses.html +++ b/teleforma/templates/teleforma/courses.html @@ -20,7 +20,7 @@ $(document).ready(function(){ {% block modules %}
-

playlists{% trans "My courses" %}

+

playlists{{ period }}

    {% block courses %} diff --git a/teleforma/templates/telemeta/base.html b/teleforma/templates/telemeta/base.html index 40585fcc..d1f597df 100644 --- a/teleforma/templates/telemeta/base.html +++ b/teleforma/templates/telemeta/base.html @@ -96,7 +96,7 @@ alt="logo" />
{% else %} -
  • {% trans "Desk" %}
    • +
  • {% trans "Desk" %}
    • {% endif %} {% else %} diff --git a/teleforma/templates/telemeta/profile_detail.html b/teleforma/templates/telemeta/profile_detail.html index efb267a2..87f6d7c7 100644 --- 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 %} -
  • {{ course.title}} {{ course.type }}
    • +
  • {{ course.title}} {{ course.type }}
    • {% endwith %} {% endfor %} {% endwith %} @@ -60,14 +60,9 @@
    {% trans "Last Name" %}
    {{ usr.last_name }}
    {% trans "Username" %}
    {{ usr.username }}
    - {% if usr.crfpa_student.get %} - {% if user.is_staff %} -
    {% trans "IEJ" %}
    {{ usr.student.get.iej }}
    -
    {% trans "Training" %}
    {{ usr.student.get.training }}
    - {% else %} + {% if usr.student.get %}
    {% trans "IEJ" %}
    {{ usr.student.get.iej }}
    -
    {% trans "Training" %}
    {{ usr.student.get.training }}
    - {% endif %} +
    {% trans "Trainings" %}
    {% for training in usr.student.get.trainings.all %}{{ training }}
    {% endfor %}
    {% trans "Platform only" %}
    {{ usr.student.get.platform_only|yes_no }}
    {% trans "Procedure"%}
    {{ usr.student.get.procedure}}
    {% trans "Oral spe"%}
    {{ usr.student.get.oral_speciality }}
    diff --git a/teleforma/views/core.py b/teleforma/views/core.py index 83c3cd78..0878ee76 100644 --- 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 647978cd..6545d29f 100644 --- 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] -- 2.39.5