Download as
Browse Code »

Commit 77c6000d36139fe445b0cdb98b191fe52aef3667

Authored by Felipe Henrique de Almeida Bormann
1 parent 156a0d45
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

fixed error on date input for course model, now it accepts english formatting on input correctly

Showing 4 changed files with 16 additions and 5 deletions   Show diff stats
courses/forms.py
  Diff comments   View file @77c6000
... ... @@ -3,6 +3,7 @@ from django.utils.translation import ugettext_lazy as _
3 3 from .models import CourseCategory, Course, Subject, Topic, ActivityFile, Activity, FileMaterial, LinkMaterial
4 4 from s3direct.widgets import S3DirectWidget
5 5 from django_summernote.widgets import SummernoteWidget
  6 +from amadeus import settings
6 7  
7 8 class CategoryCourseForm(forms.ModelForm):
8 9  
... ... @@ -18,7 +19,13 @@ class CategoryCourseForm(forms.ModelForm):
18 19  
19 20  
20 21 class CourseForm(forms.ModelForm):
  22 +
  23 + init_date = forms.DateField(input_formats=settings.DATE_INPUT_FORMATS)
  24 + end_register_date = forms.DateField(input_formats=settings.DATE_INPUT_FORMATS)
  25 + init_register_date = forms.DateField(input_formats=settings.DATE_INPUT_FORMATS)
  26 + end_date = forms.DateField(input_formats=settings.DATE_INPUT_FORMATS)
21 27 def clean_end_register_date(self):
  28 +
22 29 init_register_date = self.cleaned_data['init_register_date']
23 30 end_register_date = self.cleaned_data['end_register_date']
24 31  
... ... @@ -27,6 +34,8 @@ class CourseForm(forms.ModelForm):
27 34 return end_register_date
28 35  
29 36 def clean_init_date(self):
  37 +
  38 +
30 39 end_register_date = self.cleaned_data['end_register_date']
31 40 init_date = self.cleaned_data['init_date']
32 41  
... ... @@ -35,6 +44,7 @@ class CourseForm(forms.ModelForm):
35 44 return init_date
36 45  
37 46 def clean_end_date(self):
  47 + print(self.cleaned_data)
38 48 init_date = self.cleaned_data['init_date']
39 49 end_date = self.cleaned_data['end_date']
40 50  
... ... @@ -43,15 +53,17 @@ class CourseForm(forms.ModelForm):
43 53 return end_date
44 54  
45 55  
  56 +
46 57 class Meta:
47 58 model = Course
48 59 fields = ('name', 'objectivies', 'content', 'max_students', 'init_register_date', 'end_register_date',
49 60 'init_date', 'end_date', 'category', 'coordenator','public')
  61 + localized_fields = ('init_register_date', 'end_register_date', 'init_date', 'end_date',)
50 62 labels = {
51 63 'name': _('Name'),
52 64 'objectivies': _('Objectives'),
53 65 'content': _('Content'),
54   - 'max_students': _('Number of studets maximum'),
  66 + 'max_students': _('Number of students maximum'),
55 67 'init_register_date': _('Course registration start date'),
56 68 'end_register_date': _('Course registration end date'),
57 69 'init_date': _('Course start date'),
... ... @@ -119,7 +131,7 @@ class UpdateCourseForm(CourseForm):
119 131 'name': _('Name'),
120 132 'objectivies': _('Objectives'),
121 133 'content': _('Content'),
122   - 'max_students': _('Number of studets maximum'),
  134 + 'max_students': _('Number of students maximum'),
123 135 'init_register_date': _('Course registration start date'),
124 136 'end_register_date': _('Course registration end date'),
125 137 'init_date': _('Course start date'),
... ...
courses/templates/course/create.html
  Diff comments   View file @77c6000
... ... @@ -20,7 +20,7 @@
20 20 <label for="{{ field.auto_id }}">{{ field.label }}</label>
21 21 {% endif %}
22 22 {% if field.auto_id == 'id_init_register_date' or field.auto_id == 'id_end_register_date' or field.auto_id == 'id_init_date' or field.auto_id == 'id_end_date'%}
23   - <input type="text" class="form-control date-picker" name="{{field.name}}" value="{{field.value|date:'SHORT_DATE_FORMAT'}}" min="{{now|date:'SHORT_DATE_FORMAT'}}">
  23 + <input type="text" class="form-control date-picker" name="{{field.name}}" value="{{field.value|date}}" min="{{now|date:'SHORT_DATE_FORMAT'}}">
24 24 {% elif field.auto_id == 'id_public' %}
25 25 <div class="checkbox">
26 26 <label>
... ...
courses/templates/course/datepicker.html
  Diff comments   View file @77c6000
1   -<div class="input-append date" id="dp2" data-date="12-02-2012" data-date-format="dd-mm-yyyy">
  1 +<div class="input-append date" id="dp2" data-date="12-02-2012" >
2 2 <input class="span2" size="16" type="text">
3 3 <span class="add-on"><i class="icon-th"></i></span>
4 4 </div>
5 5 \ No newline at end of file
... ...
courses/views.py
  Diff comments   View file @77c6000
... ... @@ -155,7 +155,6 @@ class CreateCourseView(LoginRequiredMixin, HasRoleMixin, LogMixin, NotificationM
155 155 def form_valid(self, form):
156 156 self.object = form.save()
157 157 self.object.professors.add(self.request.user)
158   -
159 158 self.log_context['course_id'] = self.object.id
160 159 self.log_context['course_name'] = self.object.name
161 160 self.log_context['course_slug'] = self.object.slug
... ...