Download as
Browse Code »

Commit 334435de49848bfa8e9a69e40b46cccd4c92b013

Authored by Felipe Henrique de Almeida Bormann
1 parent 74cf290d
Exists in master and in 3 other branches amadeus_univasf, image-crop, refactoring

fixed input date format from datetime picker

Showing 1 changed file with 11 additions and 3 deletions   Show diff stats
links/forms.py
  Diff comments   View file @334435d
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 from django import forms 2 from django import forms
3 from django.utils.translation import ugettext_lazy as _ 3 from django.utils.translation import ugettext_lazy as _
4 from django.utils.html import strip_tags 4 from django.utils.html import strip_tags
5 - 5 +from django.core.exceptions import ValidationError
6 from subjects.models import Tag 6 from subjects.models import Tag
7 7
8 from pendencies.forms import PendenciesForm 8 from pendencies.forms import PendenciesForm
@@ -26,8 +26,8 @@ class LinkForm(forms.ModelForm): @@ -26,8 +26,8 @@ class LinkForm(forms.ModelForm):
26 26
27 tags = forms.CharField(label = _('Tags'), required = False) 27 tags = forms.CharField(label = _('Tags'), required = False)
28 link_url = forms.URLField(label = _('Website URL'),required=True) 28 link_url = forms.URLField(label = _('Website URL'),required=True)
29 - initial_view_date = forms.DateTimeField(input_formats=['%Y/%m/%d %H:%M', '%d/%m/%Y %H:%M', '%m/%d/%Y %H:%M'], required=False)  
30 - end_view_date = forms.DateTimeField(input_formats=['%Y/%m/%d %H:%M', '%d/%m/%Y %H:%M', '%m/%d/%Y %H:%M'], required=False ,help_text=[_('It sets a limit date to finish viewing the website link ')]) 29 + initial_view_date = forms.DateTimeField(input_formats=['%Y/%m/%d %I:%M %p', '%d/%m/%Y %I:%M %p', '%m/%d/%Y %I:%M %p'], required=False)
  30 + end_view_date = forms.DateTimeField(input_formats=['%Y/%m/%d %I:%M %p', '%d/%m/%Y %I:%M %p', '%m/%d/%Y %I:%M %p'], required=False ,help_text=[_('It sets a limit date to finish viewing the website link ')])
31 31
32 class Meta: 32 class Meta:
33 model = Link 33 model = Link
@@ -50,12 +50,20 @@ class LinkForm(forms.ModelForm): @@ -50,12 +50,20 @@ class LinkForm(forms.ModelForm):
50 if cleaned_data.get('end_view'): 50 if cleaned_data.get('end_view'):
51 end_view = cleaned_data.get('end_view') 51 end_view = cleaned_data.get('end_view')
52 if end_view and not cleaned_data.get('end_view_date'): 52 if end_view and not cleaned_data.get('end_view_date'):
  53 + print("here 1")
53 raise ValidationError(_('End View Date is not set'), code='invalid' ) 54 raise ValidationError(_('End View Date is not set'), code='invalid' )
54 55
55 if cleaned_data.get('initial_view'): 56 if cleaned_data.get('initial_view'):
56 initial_view = cleaned_data.get('initial_view') 57 initial_view = cleaned_data.get('initial_view')
57 if initial_view and not cleaned_data.get('initial_view_date'): 58 if initial_view and not cleaned_data.get('initial_view_date'):
  59 + print("here 2")
58 raise ValidationError(_('Initial View Date is not set'), code='invalid' ) 60 raise ValidationError(_('Initial View Date is not set'), code='invalid' )
  61 + if cleaned_data.get('initial_view_date') and cleaned_data.get('end_view_date'):
  62 + end_view_date = cleaned_data.get('end_view_date')
  63 + initial_view_date = cleaned_data.get('initial_view_date')
  64 + if end_view_date < initial_view_date:
  65 + print("here 3")
  66 + raise ValidationError(_('End View Date before Initial View Date'), code='invalid' )
59 67
60 return cleaned_data 68 return cleaned_data
61 69