added support for all date formats

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