Download as
Browse Code »

Commit 22c2915e5c4ec55d9a9fc60bd50bdc11bd32bb3b

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

added support for all date formats

Showing 3 changed files with 8 additions and 2 deletions   Show diff stats
amadeus/settings.py
  Diff comments   View file @22c2915
@@ -231,6 +231,8 @@ OAUTH2_PROVIDER = { @@ -231,6 +231,8 @@ OAUTH2_PROVIDER = {
231 #For date purposes 231 #For date purposes
232 DATETIME_INPUT_FORMATS.append('%d/%m/%y') 232 DATETIME_INPUT_FORMATS.append('%d/%m/%y')
233 DATE_INPUT_FORMATS.append('%d/%m/%y') 233 DATE_INPUT_FORMATS.append('%d/%m/%y')
  234 +DATETIME_INPUT_FORMATS.append('%m/%d/%y')
  235 +DATE_INPUT_FORMATS.append('%m/%d/%y')
234 236
235 #s3direct 237 #s3direct
236 238
courses/forms.py
  Diff comments   View file @22c2915
@@ -62,6 +62,8 @@ class UpdateCourseForm(CourseForm): @@ -62,6 +62,8 @@ class UpdateCourseForm(CourseForm):
62 } 62 }
63 63
64 class SubjectForm(forms.ModelForm): 64 class SubjectForm(forms.ModelForm):
  65 + init_date = forms.DateField(input_formats=settings.DATE_INPUT_FORMATS)
  66 + end_date = forms.DateField(input_formats=settings.DATE_INPUT_FORMATS)
65 def clean_end_date(self): 67 def clean_end_date(self):
66 end_date = self.cleaned_data['end_date'] 68 end_date = self.cleaned_data['end_date']
67 if('init_date' in self.cleaned_data): 69 if('init_date' in self.cleaned_data):
@@ -71,8 +73,10 @@ class SubjectForm(forms.ModelForm): @@ -71,8 +73,10 @@ class SubjectForm(forms.ModelForm):
71 return end_date 73 return end_date
72 74
73 class Meta: 75 class Meta:
  76 +
74 model = Subject 77 model = Subject
75 fields = ('name', 'description','init_date', 'end_date', 'visible',) 78 fields = ('name', 'description','init_date', 'end_date', 'visible',)
  79 + localized_fields = ('init_date', 'end_date',)
76 labels = { 80 labels = {
77 'name': _('Name'), 81 'name': _('Name'),
78 'description': _('Description'), 82 'description': _('Description'),
@@ -153,4 +157,4 @@ class LinkMaterialForm(forms.ModelForm): @@ -153,4 +157,4 @@ class LinkMaterialForm(forms.ModelForm):
153 model = LinkMaterial 157 model = LinkMaterial
154 fields = ['material', 'name', 'description','url'] 158 fields = ['material', 'name', 'description','url']
155 159
156 ->>>>>>> dev 160 +
courses/templates/course/datepicker.html
  Diff comments   View file @22c2915
1 -<div class="input-append date" id="dp2" data-date="12-02-2012" > 1 +<div class="input-append date" id="dp2" >
2 <input class="span2" size="16" type="text"> 2 <input class="span2" size="16" type="text">
3 <span class="add-on"><i class="icon-th"></i></span> 3 <span class="add-on"><i class="icon-th"></i></span>
4 </div> 4 </div>
5 \ No newline at end of file 5 \ No newline at end of file