From 51f6cd9eebc8118aff94900ab77ab8f38511a115 Mon Sep 17 00:00:00 2001
From: juliotoscano <juliotoscanodebrito@gmail.com>
Date: Tue, 8 Nov 2016 10:03:00 -0300
Subject: [PATCH] added coordenator #229

---
 courses/forms.py                          | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------
 courses/models.py                         |  1 +
 courses/templates/course/course_card.html |  1 +
 courses/templates/course/view.html        |  4 ++--
 4 files changed, 56 insertions(+), 48 deletions(-)

diff --git a/courses/forms.py b/courses/forms.py
index d72ef8c..cebcebf 100644
--- a/courses/forms.py
+++ b/courses/forms.py
@@ -51,34 +51,37 @@ class CourseForm(forms.ModelForm):
 	class Meta:
 		model = Course
 		fields = ('name', 'objectivies', 'content', 'max_students', 'init_register_date', 'end_register_date',
-					'init_date', 'end_date', 'category',)
+					'init_date', 'end_date', 'category', 'coordenator')
 		labels = {
-			'name': _('Name'),
-			'objectivies': _('Objectives'),
-			'content': _('Content'),
-			'max_students': _('Number of studets maximum'),
-			'init_register_date': _('Course registration start date'),
-			'end_register_date': _('Course registration end date'),
-			'init_date': _('Course start date'),
-			'end_date': _('Course end date'),
-			'category': _('CourseCategory'),
+                            'name': _('Name'),
+                            'objectivies': _('Objectives'),
+                            'content': _('Content'),
+                            'max_students': _('Number of studets maximum'),
+                            'init_register_date': _('Course registration start date'),
+                            'end_register_date': _('Course registration end date'),
+                            'init_date': _('Course start date'),
+                            'end_date': _('Course end date'),
+                            'category': _('CourseCategory'),
+                            'coordenator': _('Coordenator'),
 		}
 		help_texts = {
-			'name': _('Course name'),
-			'objectivies': _('Course objective'),
-			'content': _('Course modules'),
-			'max_students': _('Max number of students that a class can have'),
-			'init_register_date': _('Date that starts the registration period of the course (dd/mm/yyyy)'),
-			'end_register_date': _('Date that ends the registration period of the course (dd/mm/yyyy)'),
-			'init_date': _('Date that the course starts (dd/mm/yyyy)'),
-			'end_date': _('Date that the course ends (dd/mm/yyyy)'),
-			'category': _('CourseCategory which the course belongs'),
+                            'name': _('Course name'),
+                            'objectivies': _('Course objective'),
+                            'content': _('Course modules'),
+                            'max_students': _('Max number of students that a class can have'),
+                            'init_register_date': _('Date that starts the registration period of the course (dd/mm/yyyy)'),
+                            'end_register_date': _('Date that ends the registration period of the course (dd/mm/yyyy)'),
+                            'init_date': _('Date that the course starts (dd/mm/yyyy)'),
+                            'end_date': _('Date that the course ends (dd/mm/yyyy)'),
+                            'category': _('CourseCategory which the course belongs'),
+                            'coordenator': _('Course Coordenator'),
 		}
 
 		widgets = {
-			'categoy': forms.Select(),
-			'objectivies': SummernoteWidget(attrs={'cols': 80, 'rows': 5}),
-			'content': SummernoteWidget(attrs={'cols': 80, 'rows': 5}),
+                            'categoy': forms.Select(),
+                            'coordenator': forms.Select(),
+                            'objectivies': SummernoteWidget(attrs={'cols': 80, 'rows': 5}),
+                            'content': SummernoteWidget(attrs={'cols': 80, 'rows': 5}),
 		}
 
 class UpdateCourseForm(CourseForm):
@@ -89,35 +92,38 @@ class UpdateCourseForm(CourseForm):
 	class Meta:
 		model = Course
 		fields = ('name', 'objectivies', 'content', 'max_students', 'init_register_date', 'end_register_date',
-					'init_date', 'end_date', 'category','students',)
+					'init_date', 'end_date', 'category','students', 'coordenator')
 		labels = {
-			'name': _('Name'),
-			'objectivies': _('Objectives'),
-			'content': _('Content'),
-			'max_students': _('Number of studets maximum'),
-			'init_register_date': _('Course registration start date'),
-			'end_register_date': _('Course registration end date'),
-			'init_date': _('Course start date'),
-			'end_date': _('Course end date'),
-			'category': _('CourseCategory'),
-			'students': _('Student'),
+                            'name': _('Name'),
+                            'objectivies': _('Objectives'),
+                            'content': _('Content'),
+                            'max_students': _('Number of studets maximum'),
+                            'init_register_date': _('Course registration start date'),
+                            'end_register_date': _('Course registration end date'),
+                            'init_date': _('Course start date'),
+                            'end_date': _('Course end date'),
+                            'category': _('CourseCategory'),
+                            'coordenator': _('Coordenator'),
+                            'students': _('Student'),
 		}
 		help_texts = {
-			'name': _('Course name'),
-			'objectivies': _('Course objective'),
-			'content': _('Course modules'),
-			'max_students': _('Max number of students that a class can have'),
-			'init_register_date': _('Date that starts the registration period of the course (dd/mm/yyyy)'),
-			'end_register_date': _('Date that ends the registration period of the course (dd/mm/yyyy)'),
-			'init_date': _('Date that the course starts (dd/mm/yyyy)'),
-			'end_date': _('Date that the course ends (dd/mm/yyyy)'),
-			'category': _('CourseCategory which the course belongs'),
-			'students': _("Course's Students"),
+                            'name': _('Course name'),
+                            'objectivies': _('Course objective'),
+                            'content': _('Course modules'),
+                            'max_students': _('Max number of students that a class can have'),
+                            'init_register_date': _('Date that starts the registration period of the course (dd/mm/yyyy)'),
+                            'end_register_date': _('Date that ends the registration period of the course (dd/mm/yyyy)'),
+                            'init_date': _('Date that the course starts (dd/mm/yyyy)'),
+                            'end_date': _('Date that the course ends (dd/mm/yyyy)'),
+                            'category': _('CourseCategory which the course belongs'),
+                            'coordenator': _('Course Coordenator'),
+                            'students': _("Course's Students"),
 		}
 		widgets = {
-			'categoy': forms.Select(),
-			'objectivies': SummernoteWidget(attrs={'cols': 80, 'rows': 5}),
-			'content': SummernoteWidget(attrs={'cols': 80, 'rows': 5}),
+                            'categoy': forms.Select(),
+                            'coordenator': forms.Select(),
+                            'objectivies': SummernoteWidget(attrs={'cols': 80, 'rows': 5}),
+                            'content': SummernoteWidget(attrs={'cols': 80, 'rows': 5}),
 		}
 
 class SubjectForm(forms.ModelForm):
diff --git a/courses/models.py b/courses/models.py
index 60ad7a5..1ecf84f 100644
--- a/courses/models.py
+++ b/courses/models.py
@@ -47,6 +47,7 @@ class Course(models.Model):
 	init_date = models.DateField(_('Begin of Course Date'))
 	end_date = models.DateField(_('End of Course Date'))
 	category = models.ForeignKey(CourseCategory, verbose_name = _('Category'), related_name='course_category')
+	coordenator = models.ForeignKey(User, verbose_name = _('Coordenator'), related_name ='course_coordenator', null = True)
 	professors = models.ManyToManyField(User,verbose_name=_('Professors'), related_name='courses_professors')
 	students = models.ManyToManyField(User,verbose_name=_('Students'), related_name='courses_student', blank = True)
 	public = models.BooleanField(_('Public'), default=False)
diff --git a/courses/templates/course/course_card.html b/courses/templates/course/course_card.html
index c98069b..089aa71 100644
--- a/courses/templates/course/course_card.html
+++ b/courses/templates/course/course_card.html
@@ -34,6 +34,7 @@
         <div class="panel-collapse collapseOne-{{course.slug}} collapse in" role="tabpanel" aria-labelledby="headingOne" aria-expanded="true" aria-hidden="false" tabindex="0">
           <div class="panel-body">
             <p><b>{% trans 'Course Name' %}: </b>{{course.name}}</p>
+            <p><b>{% trans 'Coordenator' %}: </b>{{course.coordenator}}</p>
             <p><b>{% trans 'Professor' %}: </b>{{course.professors.all.0}}</p>
             <p>
               <b>{% trans 'Description' %}:</b>
diff --git a/courses/templates/course/view.html b/courses/templates/course/view.html
index beb720a..c914456 100644
--- a/courses/templates/course/view.html
+++ b/courses/templates/course/view.html
@@ -94,8 +94,8 @@
       </div>
     </div>
     <div class="panel-body">
-      <p><b>{% trans 'Coordinator' %}: </b>{% for professor in course.professors.all %}{% if not forloop.first %},{% endif %}
-              {{professor}}{% if forloop.last %}.{% endif %}{% endfor %}</p>
+      <p><b>{% trans 'Coordinator' %}: </b>{{course.coordenator}}</p>
+      <p><b>{% trans 'Teacher' %}: </b>{{course.professors.all.0}}</p>
       <p>
         <b>{% trans 'Description' %}:</b>
         <i>
--
libgit2 0.21.2