From 372eb22311332f60f7a14e578614964ab3ef41f0 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Mon, 8 Jul 2013 14:38:52 +0200 Subject: [PATCH] add comment to remote conf, modify init mess --- teleforma/models/core.py | 4 ++++ teleforma/templates/postman/email_user_init.txt | 4 ++-- teleforma/views/core.py | 15 ++++++++------- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/teleforma/models/core.py b/teleforma/models/core.py index d953ba61..6fae038d 100644 --- a/teleforma/models/core.py +++ b/teleforma/models/core.py @@ -275,6 +275,7 @@ class Conference(Model): 'professor_id': self.professor.user.username if self.professor else 'None', 'period': self.period.name if self.period else 'None', 'session': self.session if self.session else 'None', + 'comment': self.comment if self.comment else 'None', 'streams': [], 'date_begin': self.date_begin.strftime('%Y %m %d %H %M %S') if self.date_begin else 'None', 'date_end': self.date_end.strftime('%Y %m %d %H %M %S') if self.date_end else 'None', @@ -325,6 +326,9 @@ class Conference(Model): dl = data['date_end'].split(' ') self.date_end = datetime.datetime(int(dl[0]), int(dl[1]), int(dl[2]), int(dl[3]), int(dl[4]), int(dl[5])) + if data['comment'] != 'None': + self.comment = data['comment'] + if 'room' in data.keys(): self.room, c = Room.objects.get_or_create(name=data['room'], diff --git a/teleforma/templates/postman/email_user_init.txt b/teleforma/templates/postman/email_user_init.txt index 4be2b1ab..6a57488d 100644 --- a/teleforma/templates/postman/email_user_init.txt +++ b/teleforma/templates/postman/email_user_init.txt @@ -1,6 +1,6 @@ {% load i18n %}{% load telemeta_utils %}{% load teleforma_tags %}{% autoescape off %}{% trans "Hello" %} {{ usr.first_name }} {{ usr.last_name }}, -Suite à votre inscription à la formation semestrielle 2013 du Pré-Barreau, nous vous invitons à initialiser votre compte sur notre plateforme e-learning interactive et multi-média. Pour cela, merci de cliquer sur le lien suivant puis d'indiquez votre adresse e-mail : +Suite à votre inscription à la formation estivale 2013 du Pré-Barreau, nous vous invitons à initialiser votre compte sur notre plateforme e-learning interactive et multi-média. Pour cela, merci de cliquer sur le lien suivant puis d'indiquez votre adresse e-mail : http://{{ site.domain }}/accounts/password_reset/ @@ -21,4 +21,4 @@ Une page d'aide est disponible pour vous assister lors de la découverte de ces {% blocktrans %}Note: This message is issued by an automated system. -Do not reply, this would not be taken into account.{% endblocktrans %}{% endautoescape %} +Do not reply, this would not be taken into account.{% endblocktrans %}{% endautoescape %} \ No newline at end of file diff --git a/teleforma/views/core.py b/teleforma/views/core.py index 94155ced..345d4573 100644 --- a/teleforma/views/core.py +++ b/teleforma/views/core.py @@ -121,8 +121,8 @@ def stream_from_file(__file): def get_room(content_type=None, id=None, name=None): - if settings.TELEFORMA_GLOBAL_TWEETER or name == 'site': - rooms = jqchat.models.Room.objects.filter(name='site') + if settings.TELEFORMA_GLOBAL_TWEETER or 'site' in name: + rooms = jqchat.models.Room.objects.filter(name=name) else: rooms = jqchat.models.Room.objects.filter(content_type=content_type, @@ -192,7 +192,7 @@ class CourseView(DetailView): courses = format_courses(courses, course=course, types=c['types']) context['courses'] = courses context['all_courses'] = all_courses - context['notes'] = course.notes.all().filter(author=self.request.user) + # context['notes'] = course.notes.all().filter(author=self.request.user) content_type = ContentType.objects.get(app_label="teleforma", model="course") context['room'] = get_room(name=course.title, content_type=content_type, id=course.id) @@ -281,7 +281,7 @@ class MediaView(DetailView): context['course'] = media.course context['item'] = media.item context['type'] = media.course_type - context['notes'] = media.notes.all().filter(author=self.request.user) + # context['notes'] = media.notes.all().filter(author=self.request.user) content_type = ContentType.objects.get(app_label="teleforma", model="course") context['room'] = get_room(name=media.course.title, content_type=content_type, id=media.course.id) @@ -343,7 +343,7 @@ class DocumentView(DetailView): context['all_courses'] = all_courses document = self.get_object() context['course'] = document.course - context['notes'] = document.notes.all().filter(author=self.request.user) + # context['notes'] = document.notes.all().filter(author=self.request.user) content_type = ContentType.objects.get(app_label="teleforma", model="course") context['room'] = get_room(name=document.course, content_type=content_type, id=document.course.id) @@ -397,7 +397,7 @@ class ConferenceView(DetailView): conference = self.get_object() context['course'] = conference.course context['type'] = conference.course_type - context['notes'] = conference.notes.all().filter(author=self.request.user) + # context['notes'] = conference.notes.all().filter(author=self.request.user) content_type = ContentType.objects.get(app_label="teleforma", model="course") context['room'] = get_room(name=conference.course.title, content_type=content_type, id=conference.course.id) @@ -547,7 +547,6 @@ class ConferenceRecordView(FormView): conf, c = Conference.objects.get_or_create(public_id=conference['id'], course=course, course_type=course_type) if c: - conf.session = conference['session'] user = User.objects.get(username=conference['professor_id']) conf.professor = Professor.objects.get(user=user) try: @@ -559,6 +558,8 @@ class ConferenceRecordView(FormView): conf.date_begin = datetime.datetime.now() conf.period, c = Period.objects.get_or_create(name=conference['period']) + conf.session = conference['session'] + conf.comment = conference['comment'] conf.save() course.save() for stream in conference['streams']: -- 2.39.5