add department to conference views

diff --git a/teleforma/admin.py b/teleforma/admin.py
index f67f2042693c463f235bdbb96b86470615aae3a1..94a3be3e4ae580bba2e6280cc19cc8d3621ac94c 100644 (file)
--- a/teleforma/admin.py
+++ b/teleforma/admin.py
@@ -82,8 +82,6 @@ admin.site.register(Training, TrainingAdmin)
 admin.site.register(CourseType)
 admin.site.register(StreamingServer)
 admin.site.register(LiveStream)
-admin.site.register(Student, StudentAdmin)
-admin.site.register(Professor, ProfessorAdmin)
 admin.site.register(Seminar, SeminarAdmin)
 admin.site.register(Question)
 admin.site.register(Testimonial)

diff --git a/teleforma/models/core.py b/teleforma/models/core.py
index 71293b1ce3d5563163e98af5676b9c1f3cbdc047..f3b2f59806b3d50f019289a5a341c2398243ae12 100644 (file)
--- a/teleforma/models/core.py
+++ b/teleforma/models/core.py
@@ -267,7 +267,7 @@ class Conference(Model):
     def to_json_dict(self):
         data = {'id': self.public_id, 'course_code': self.course.code,
                 'course_type': self.course_type.name, 'professor_id': self.professor.user.username,
-                'period': self.period,
+                'period': self.period, 'department': self.department,
                 'session': self.session,
                 'streams':[] }
 

diff --git a/teleforma/views/core.py b/teleforma/views/core.py
index c6de450e59414fcd2f442b1590e3c7bad513e5ef..7194c95f143cf594151cc7c3ac2c7df1f09f7cd8 100644 (file)
--- a/teleforma/views/core.py
+++ b/teleforma/views/core.py
@@ -481,8 +481,9 @@ class ConferenceRecordView(FormView):
                                                        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)
+                if conference['professor_id']:
+                    user = User.objects.get(username=conference['professor_id'])
+                    conf.professor = Professor.objects.get(user=user)
                 try:
                     organization, c = Organization.objects.get_or_create(name=conference['organization'])
                     conf.room, c = Room.objects.get_or_create(name=conference['room'],
@@ -492,6 +493,7 @@ class ConferenceRecordView(FormView):
 
                 conf.date_begin = datetime.datetime.now()
                 conf.period, c = Period.objects.get_or_create(name=conference['period'])
+                conf.department = conference['department']
                 conf.save()
                 course.save()
                 for stream in conference['streams']: