Download as
Browse Code »

Commit b23745a174e1669cc287ed7681e925b62cb72fd0

Authored by Zambom
1 parent 44c1868c
Exists in master and in 3 other branches amadeus_univasf, image-crop, refactoring

Adjusting pendencies datetime input

Showing 2 changed files with 9 additions and 2 deletions   Show diff stats
amadeus/settings.py
  Diff comments   View file @b23745a
@@ -269,8 +269,10 @@ OAUTH2_PROVIDER = { @@ -269,8 +269,10 @@ OAUTH2_PROVIDER = {
269 269
270 #For date purposes 270 #For date purposes
271 DATETIME_INPUT_FORMATS.append('%d/%m/%y') 271 DATETIME_INPUT_FORMATS.append('%d/%m/%y')
272 -DATE_INPUT_FORMATS.append('%d/%m/%y')  
273 DATETIME_INPUT_FORMATS.append('%m/%d/%y') 272 DATETIME_INPUT_FORMATS.append('%m/%d/%y')
  273 +DATETIME_INPUT_FORMATS.append('%m/%d/%Y %I:%M %p')
  274 +DATETIME_INPUT_FORMATS.append('%d/%m/%Y %H:%M')
  275 +DATE_INPUT_FORMATS.append('%d/%m/%y')
274 DATE_INPUT_FORMATS.append('%m/%d/%y') 276 DATE_INPUT_FORMATS.append('%m/%d/%y')
275 277
276 #s3direct 278 #s3direct
pendencies/forms.py
  Diff comments   View file @b23745a
@@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
2 import datetime 2 import datetime
3 3
4 from django import forms 4 from django import forms
  5 +from django.conf import settings
5 from django.utils.translation import ugettext_lazy as _ 6 from django.utils.translation import ugettext_lazy as _
6 7
7 from subjects.models import Subject 8 from subjects.models import Subject
@@ -19,14 +20,18 @@ class PendenciesForm(forms.ModelForm): @@ -19,14 +20,18 @@ class PendenciesForm(forms.ModelForm):
19 20
20 begin_date_check = forms.BooleanField(required = False) 21 begin_date_check = forms.BooleanField(required = False)
21 end_date_check = forms.BooleanField(required = False) 22 end_date_check = forms.BooleanField(required = False)
  23 + begin_date = forms.DateTimeField(input_formats = settings.DATETIME_INPUT_FORMATS)
  24 + end_date = forms.DateTimeField(input_formats = settings.DATETIME_INPUT_FORMATS)
22 25
23 class Meta: 26 class Meta:
24 model = Pendencies 27 model = Pendencies
25 - fields = ['action', 'begin_date', 'end_date'] 28 + fields = ['action']
26 29
27 def clean(self): 30 def clean(self):
28 cleaned_data = super(PendenciesForm, self).clean() 31 cleaned_data = super(PendenciesForm, self).clean()
29 32
  33 + print(cleaned_data)
  34 +
30 pend_id = cleaned_data.get('id', None) 35 pend_id = cleaned_data.get('id', None)
31 36
32 action = cleaned_data.get('action', None) 37 action = cleaned_data.get('action', None)