From b23745a174e1669cc287ed7681e925b62cb72fd0 Mon Sep 17 00:00:00 2001 From: Zambom Date: Thu, 23 Feb 2017 12:25:05 -0300 Subject: [PATCH] Adjusting pendencies datetime input --- amadeus/settings.py | 4 +++- pendencies/forms.py | 7 ++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/amadeus/settings.py b/amadeus/settings.py index 8df9662..dba55dd 100644 --- a/amadeus/settings.py +++ b/amadeus/settings.py @@ -269,8 +269,10 @@ 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') +DATETIME_INPUT_FORMATS.append('%m/%d/%Y %I:%M %p') +DATETIME_INPUT_FORMATS.append('%d/%m/%Y %H:%M') +DATE_INPUT_FORMATS.append('%d/%m/%y') DATE_INPUT_FORMATS.append('%m/%d/%y') #s3direct diff --git a/pendencies/forms.py b/pendencies/forms.py index 93ba67a..eaef78d 100644 --- a/pendencies/forms.py +++ b/pendencies/forms.py @@ -2,6 +2,7 @@ import datetime from django import forms +from django.conf import settings from django.utils.translation import ugettext_lazy as _ from subjects.models import Subject @@ -19,14 +20,18 @@ class PendenciesForm(forms.ModelForm): begin_date_check = forms.BooleanField(required = False) end_date_check = forms.BooleanField(required = False) + begin_date = forms.DateTimeField(input_formats = settings.DATETIME_INPUT_FORMATS) + end_date = forms.DateTimeField(input_formats = settings.DATETIME_INPUT_FORMATS) class Meta: model = Pendencies - fields = ['action', 'begin_date', 'end_date'] + fields = ['action'] def clean(self): cleaned_data = super(PendenciesForm, self).clean() + print(cleaned_data) + pend_id = cleaned_data.get('id', None) action = cleaned_data.get('action', None) -- libgit2 0.21.2