From efe9211511b329a0a898abd09abd21a4c91af927 Mon Sep 17 00:00:00 2001 From: Filipe Medeiros Date: Wed, 23 Nov 2016 16:48:02 -0300 Subject: [PATCH] Ajustes nos campos da classe Course --- app/templates/home_admin_content.html | 13 ++----------- courses/forms.py | 91 ++----------------------------------------------------------------------------------------- courses/migrations/0001_initial.py | 9 +-------- courses/models.py | 11 ++--------- courses/serializers.py | 5 +---- courses/templates/course/course_card.html | 24 ------------------------ courses/templates/course/view.html | 51 +-------------------------------------------------- 7 files changed, 9 insertions(+), 195 deletions(-) diff --git a/app/templates/home_admin_content.html b/app/templates/home_admin_content.html index af7de39..a181d4d 100644 --- a/app/templates/home_admin_content.html +++ b/app/templates/home_admin_content.html @@ -2,16 +2,7 @@ {% for course in objects %}
-
-

{{ course }}

-
-
-
    -
  • {% trans 'Students' %}: {{ course.max_students }}
    • -
  • {% trans 'Beginning' %}: {{ course.init_date }}
    • -
  • {% trans 'End' %}: {{ course.end_date }}
    • -
-
+

{{ course }}

{% trans 'Edit' %}
-{% endfor %} \ No newline at end of file +{% endfor %} diff --git a/courses/forms.py b/courses/forms.py index 6084e1e..9995f65 100644 --- a/courses/forms.py +++ b/courses/forms.py @@ -16,60 +16,19 @@ class CategoryCourseForm(forms.ModelForm): 'name': _('CourseCategory name') } - class CourseForm(forms.ModelForm): - def clean_end_register_date(self): - init_register_date = self.cleaned_data['init_register_date'] - end_register_date = self.cleaned_data['end_register_date'] - - if init_register_date and end_register_date and end_register_date < init_register_date: - raise forms.ValidationError(_('The end date may not be before the start date.')) - return end_register_date - - def clean_init_date(self): - end_register_date = self.cleaned_data['end_register_date'] - init_date = self.cleaned_data['init_date'] - - if end_register_date and init_date and init_date <= end_register_date: - raise forms.ValidationError(_('The course start date must be after the end of registration.')) - return init_date - - def clean_end_date(self): - init_date = self.cleaned_data['init_date'] - end_date = self.cleaned_data['end_date'] - - if init_date and end_date and end_date < init_date: - raise forms.ValidationError(_('The end date may not be before the start date.')) - return end_date - class Meta: model = Course - fields = ('name', 'objectivies', 'content', 'max_students', 'init_register_date', 'end_register_date', - 'init_date', 'end_date', 'category', 'coordenator','public') + fields = ('name', 'category', 'coordenator','public') 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': _('Category'), 'coordenator': _('Coordenator'), 'public':_('Public'), } 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'), 'coordenator': _('Course Coordenator'), 'public':_('To define if the course can be accessed by people not registered'), } @@ -77,77 +36,31 @@ class CourseForm(forms.ModelForm): widgets = { 'ategoy': forms.Select(), 'coordenator': forms.Select(), - 'content': SummernoteWidget(), - 'objectivies': SummernoteWidget(), } class UpdateCourseForm(CourseForm): - def clean_end_register_date(self): - init_register_date = self.cleaned_data['init_register_date'] - end_register_date = self.cleaned_data['end_register_date'] - - if init_register_date and end_register_date and end_register_date < init_register_date: - raise forms.ValidationError(_('The end date may not be before the start date.')) - return end_register_date - - def clean_init_date(self): - end_register_date = self.cleaned_data['end_register_date'] - init_date = self.cleaned_data['init_date'] - - if end_register_date and init_date and init_date <= end_register_date: - raise forms.ValidationError(_('The course start date must be after the end of registration.')) - return init_date - - def clean_end_date(self): - init_date = self.cleaned_data['init_date'] - end_date = self.cleaned_data['end_date'] - - if init_date and end_date and end_date < init_date: - raise forms.ValidationError(_('The end date may not be before the start date.')) - return end_date - def __init__(self, *args, **kwargs): super(UpdateCourseForm, self).__init__(*args, **kwargs) self.fields["students"].required = False class Meta: model = Course - fields = ('name', 'objectivies', 'content', 'max_students', 'init_register_date', 'end_register_date', - 'init_date', 'end_date', 'category','students', 'coordenator','public') + fields = ('name', 'category', 'coordenator','public') 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': _('Category'), 'coordenator': _('Coordenator'), - 'students': _('Student'), 'public':_('Public'), } 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'), 'coordenator': _('Course Coordenator'), - 'students': _("Course's Students"), 'public':_('To define if the course can be accessed by people not registered'), } widgets = { 'categoy': forms.Select(), 'coordenator': forms.Select(), - 'content': SummernoteWidget(), - 'objectivies': SummernoteWidget(), } class SubjectForm(forms.ModelForm): diff --git a/courses/migrations/0001_initial.py b/courses/migrations/0001_initial.py index 31ac681..c63856c 100644 --- a/courses/migrations/0001_initial.py +++ b/courses/migrations/0001_initial.py @@ -57,20 +57,13 @@ class Migration(migrations.Migration): ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('name', models.CharField(max_length=100, verbose_name='Name')), ('slug', autoslug.fields.AutoSlugField(editable=False, populate_from='name', unique=True, verbose_name='Slug')), - ('objectivies', models.TextField(blank=True, verbose_name='Objectivies')), - ('content', models.TextField(blank=True, verbose_name='Content')), - ('max_students', models.PositiveIntegerField(blank=True, verbose_name='Maximum Students')), ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')), - ('init_register_date', models.DateField(verbose_name='Register Date (Begin)')), - ('end_register_date', models.DateField(verbose_name='Register Date (End)')), - ('init_date', models.DateField(verbose_name='Begin of Course Date')), - ('end_date', models.DateField(verbose_name='End of Course Date')), ('public', models.BooleanField(default=False, verbose_name='Public')), ], options={ 'verbose_name_plural': 'Courses', 'verbose_name': 'Course', - 'ordering': ('create_date', 'name'), + 'ordering': ('create_date', 'name'), }, ), migrations.CreateModel( diff --git a/courses/models.py b/courses/models.py index ecee6df..53059f6 100644 --- a/courses/models.py +++ b/courses/models.py @@ -38,16 +38,9 @@ class Course(models.Model): name = models.CharField(_('Name'), max_length = 100) slug = AutoSlugField(_("Slug"),populate_from='name',unique=True) - objectivies = models.TextField(_('Objectivies'), blank = True) - content = models.TextField(_('Content'), blank = True) - max_students = models.PositiveIntegerField(_('Maximum Students'), blank = True) - create_date = models.DateTimeField(_('Creation Date'), auto_now_add = True) - init_register_date = models.DateField(_('Register Date (Begin)')) - end_register_date = models.DateField(_('Register Date (End)')) - init_date = models.DateField(_('Begin of Course Date')) - end_date = models.DateField(_('End of Course Date')) + create_date = models.DateTimeField(_('Creation Date'), auto_now_add = True, blank = True) category = models.ForeignKey(CourseCategory, verbose_name = _('Category'), related_name='course_category') - coordenator = models.ForeignKey(User, verbose_name = _('Coordenator'), related_name ='course_coordenator', null = True) + coordenator = models.ForeignKey(User, verbose_name = _('Coordenator'), related_name ='course_coordenator', null = True, blank = 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/serializers.py b/courses/serializers.py index 5370532..8b12d03 100644 --- a/courses/serializers.py +++ b/courses/serializers.py @@ -6,8 +6,7 @@ class CourseSerializer(serializers.ModelSerializer): #The set comes from the ManyToMany Relationship in django class Meta: model = Course - fields = ('name', 'slug', 'objectivies', 'content', 'max_students', 'create_date', - 'init_register_date', 'end_register_date', 'init_date', 'end_date', 'public', 'category' ,'students', 'professors') + fields = ('name', 'category', 'coordenator','public') class SubjectSerializer(serializers.ModelSerializer): class Meta: @@ -18,5 +17,3 @@ class TopicSerializer(serializers.ModelSerializer): class Meta: model = Topic fields = ('name', 'slug','description','create_date','update_date','visible','owner','subject') - - diff --git a/courses/templates/course/course_card.html b/courses/templates/course/course_card.html index bceb073..437ddc8 100644 --- a/courses/templates/course/course_card.html +++ b/courses/templates/course/course_card.html @@ -3,9 +3,6 @@
-

{{course.name}}

@@ -31,27 +28,6 @@ {% endif %}
-
-
-

{% trans 'Course Name' %}: {{course.name}}

-

{% trans 'Coordenator' %}: {{course.coordenator}}

-

{% trans 'Professor' %}: {{course.professors.all.0}}

-

- {% trans 'Description' %}: - - {{course.content | safe }} - -

-
-
-

{% trans 'Init register' %}: {{course.init_register_date}}

-
-
-

{% trans 'End register' %}: {{course.end_register_date}}

-
-
-
-
diff --git a/courses/templates/course/view.html b/courses/templates/course/view.html index 7eb0333..426da1e 100644 --- a/courses/templates/course/view.html +++ b/courses/templates/course/view.html @@ -47,21 +47,6 @@

{% trans 'Coordinator' %}: {{course.coordenator}}

-

{% trans 'Teacher' %}: {{course.professors.all.0}}

-

- {% trans 'Description' %}: - - {{ course.objectivies |safe }} - -

-
-
-

{% trans 'Begin of Course Date' %}: {{course.init_date}}

-
-
-

{% trans 'End of Course Date' %}: {{course.end_date}}

-
-
@@ -84,20 +69,12 @@ -
-
- -
-
-
+
{% for subject in subjects %}
-

{{subject.name}}

@@ -126,29 +103,6 @@ {% endif %}
-
-
-

{% trans "Professor" %}: {% for professor in subject.professors.all %}{% if not forloop.first %},{% endif %} - {{professor}}{% if forloop.last %}.{% endif %}{% endfor %}

-

- {% trans 'Category' %}: {{ subject.category }} -

-

- {% trans "Description" %}: - - {{subject.description | safe}} - -

-
-
-

{% trans "Begining" %}: {{subject.init_date}}

-
-
-

{% trans "End" %}: {{subject.end_date}}

-
-
-
-
{% endfor %} @@ -159,10 +113,7 @@ {% trans 'Create Subject' %}
{% endif %} - -
-