From: yomguy Date: Thu, 7 Jun 2012 16:12:04 +0000 (+0200) Subject: no training for profs, multiple choice for student period, fix document data, admin... X-Git-Tag: 0.5^2~7 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=ec64da52e65b3a7e82232695e5c97c1c9b9ff9c0;p=teleforma.git no training for profs, multiple choice for student period, fix document data, admin course order by number --- diff --git a/teleforma/admin.py b/teleforma/admin.py index 6659a0b2..591d1d97 100644 --- a/teleforma/admin.py +++ b/teleforma/admin.py @@ -11,9 +11,11 @@ admin.site.unregister(User) class StudentProfileInline(admin.StackedInline): model = Student + filter_horizontal = ['period'] class StudentAdmin(admin.ModelAdmin): model = Student + class ProfessorProfileInline(admin.StackedInline): model = Professor filter_horizontal = ['courses'] @@ -35,6 +37,7 @@ class TrainingAdmin(admin.ModelAdmin): class CourseAdmin(admin.ModelAdmin): model = Course + ordering = ['number'] class DocumentAdmin(admin.ModelAdmin): exclude = ['readers'] diff --git a/teleforma/management/commands/teleforma-import-users-pb.py b/teleforma/management/commands/teleforma-import-users-pb.py index a914da8f..dc25d3bb 100644 --- a/teleforma/management/commands/teleforma-import-users-pb.py +++ b/teleforma/management/commands/teleforma-import-users-pb.py @@ -65,13 +65,14 @@ class Command(BaseCommand): if created: student = Student.objects.filter(user=user) - if not student: - student = Student(user=user) - student.platform_only, student.training = self.get_training(row[3].value) - student.period = Period.objects.get(name='Estivale') - student.iej = self.get_iej(row[2].value) - student.save() + if student: + student.delete() + student = Student(user=user) + student.platform_only, student.training = self.get_training(row[3].value) + student.iej = self.get_iej(row[2].value) + student.save() + student.period = Period.objects.filter(name='Estivale') student.procedure = self.get_courses(row[4].value) student.written_speciality = self.get_courses(row[5].value) student.oral_speciality = self.get_courses(row[6].value) diff --git a/teleforma/models.py b/teleforma/models.py index e5bf53fb..6de9ea24 100755 --- a/teleforma/models.py +++ b/teleforma/models.py @@ -148,8 +148,6 @@ class Course(Model): class Professor(Model): user = ForeignKey(User, related_name='professor', verbose_name=_('user'), unique=True) - training = ForeignKey('Training', related_name='professor', verbose_name=_('training'), - blank=True, null=True, on_delete=models.SET_NULL) courses = ManyToManyField('Course', related_name="professor", verbose_name=_('courses'), blank=True, null=True) @@ -446,8 +444,8 @@ class Training(Model): class Student(Model): user = ForeignKey(User, related_name='student', verbose_name=_('user'), unique=True ) - period = ForeignKey('Period', related_name='student', verbose_name=_('period'), - blank=True, null=True, on_delete=models.SET_NULL) + 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')) diff --git a/teleforma/templates/teleforma/inc/conference_list.html b/teleforma/templates/teleforma/inc/conference_list.html index 9d2e0ed2..5c28763d 100644 --- a/teleforma/templates/teleforma/inc/conference_list.html +++ b/teleforma/templates/teleforma/inc/conference_list.html @@ -19,7 +19,7 @@ {% for conference in course.conference.all|from_course_type:type %} {{ conference.session }} - {{ conference.professor }} + {% if conference.professor.user %}{{ conference.professor }}{% endif %} {{ conference.date_begin }} {% if conference.streaming %} diff --git a/teleforma/templates/teleforma/inc/media_list.html b/teleforma/templates/teleforma/inc/media_list.html index f25dcb68..83c0e8a0 100644 --- a/teleforma/templates/teleforma/inc/media_list.html +++ b/teleforma/templates/teleforma/inc/media_list.html @@ -20,7 +20,7 @@ {% if media.published or user.is_staff %} {{ media.conference.session }} - {% if media.conference %}{{ media.conference.professor }}{% endif %} + {% if media.conference.professor.user %}{{ media.conference.professor }}{% endif %} {% if media.conference.date_begin %}{{ media.conference.date_begin }}{% endif %} {{ media.item.approx_duration }} diff --git a/teleforma/templates/telemeta/inc/user_list.html b/teleforma/templates/telemeta/inc/user_list.html index 5dfcef22..10a05a81 100644 --- a/teleforma/templates/telemeta/inc/user_list.html +++ b/teleforma/templates/telemeta/inc/user_list.html @@ -19,6 +19,7 @@ {% trans "Last Name"%} {% trans "First Name"%} {% trans "IEJ"%} + {% trans "Training"%} {% trans "Procedure"%} {% trans "Oral spe"%} {% trans "Written spe"%} @@ -37,6 +38,7 @@ {% if user.student.get %} {% with user.student.get as student %} {{ student.iej.name }} + {{ student.training }} {{ student.procedure.code }} {{ student.oral_speciality.code }} {{ student.written_speciality.code }} diff --git a/teleforma/views.py b/teleforma/views.py index ca7cef33..2c2ba59e 100755 --- a/teleforma/views.py +++ b/teleforma/views.py @@ -56,7 +56,6 @@ def get_courses(user): ] elif student: student = user.student.get() - courses = [{'courses': get_course(student.procedure), 'types':student.training.procedure.all()}, {'courses': get_course(student.written_speciality), @@ -94,7 +93,7 @@ def get_courses(user): course_menu = [{'courses': courses[0]['courses'].order_by('number'), 'types': courses[0]['types']}, ] - print course_menu + else: courses = None return courses