diff --git a/categories/migrations/0010_auto_20170201_0013.py b/categories/migrations/0010_auto_20170201_0013.py new file mode 100644 index 0000000..3a49952 --- /dev/null +++ b/categories/migrations/0010_auto_20170201_0013.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.4 on 2017-02-01 03:13 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('categories', '0009_auto_20170130_1828'), + ] + + operations = [ + migrations.AlterField( + model_name='category', + name='coordinators', + field=models.ManyToManyField(blank=True, related_name='coordinators', to=settings.AUTH_USER_MODEL), + ), + ] diff --git a/links/forms.py b/links/forms.py index 5025282..e99b647 100644 --- a/links/forms.py +++ b/links/forms.py @@ -26,8 +26,8 @@ class LinkForm(forms.ModelForm): tags = forms.CharField(label = _('Tags'), required = False) link_url = forms.URLField(label = _('Website URL'),required=True) - initial_view_date = forms.DateField(input_formats=['%Y/%m/%d', '%d/%m/%Y', '%m/%d/%Y']) - end_view_date = forms.DateField(input_formats=['%Y/%m/%d', '%d/%m/%Y', '%m/%d/%Y']) + initial_view_date = forms.DateTimeField(input_formats=['%Y/%m/%d %H:%M', '%d/%m/%Y %H:%M', '%m/%d/%Y %H:%M'], required=False) + 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 ')]) class Meta: model = Link @@ -49,21 +49,13 @@ class LinkForm(forms.ModelForm): if cleaned_data.get('end_view'): end_view = cleaned_data.get('end_view') - if end_view: - if cleaned_data.get('end_view_date'): - end_view_date = cleaned_data.get('end_view_date') - print(end_view_date) - if not end_view_date: - raise ValidationError(_('End View Date is not set'), code='invalid' ) + if end_view and not cleaned_data.get('end_view_date'): + raise ValidationError(_('End View Date is not set'), code='invalid' ) if cleaned_data.get('initial_view'): initial_view = cleaned_data.get('initial_view') - if initial_view: - if cleaned_data.get('initial_view_date'): - initial_view_date = cleaned_data.get('initial_view_date') - print(initial_view_date) - if not initial_view_date: - raise ValidationError(_('Initial View Date is not set'), code='invalid' ) + if initial_view and not cleaned_data.get('initial_view_date'): + raise ValidationError(_('Initial View Date is not set'), code='invalid' ) return cleaned_data diff --git a/links/migrations/0002_auto_20170201_0013.py b/links/migrations/0002_auto_20170201_0013.py new file mode 100644 index 0000000..ca96a85 --- /dev/null +++ b/links/migrations/0002_auto_20170201_0013.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.4 on 2017-02-01 03:13 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('links', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='link', + name='end_view_date', + field=models.DateField(verbose_name='Initial View Date'), + ), + migrations.AlterField( + model_name='link', + name='initial_view_date', + field=models.DateField(verbose_name='Initial View Date'), + ), + ] diff --git a/links/migrations/0003_auto_20170201_0029.py b/links/migrations/0003_auto_20170201_0029.py new file mode 100644 index 0000000..e9dee2f --- /dev/null +++ b/links/migrations/0003_auto_20170201_0029.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.4 on 2017-02-01 03:29 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.utils.timezone + + +class Migration(migrations.Migration): + + dependencies = [ + ('links', '0002_auto_20170201_0013'), + ] + + operations = [ + migrations.AlterField( + model_name='link', + name='end_view_date', + field=models.DateField(default=django.utils.timezone.now, verbose_name='Initial View Date'), + ), + migrations.AlterField( + model_name='link', + name='initial_view_date', + field=models.DateField(default=django.utils.timezone.now, verbose_name='Initial View Date'), + ), + ] diff --git a/links/migrations/0004_auto_20170201_0032.py b/links/migrations/0004_auto_20170201_0032.py new file mode 100644 index 0000000..8004cc5 --- /dev/null +++ b/links/migrations/0004_auto_20170201_0032.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.4 on 2017-02-01 03:32 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.utils.timezone + + +class Migration(migrations.Migration): + + dependencies = [ + ('links', '0003_auto_20170201_0029'), + ] + + operations = [ + migrations.AlterField( + model_name='link', + name='end_view_date', + field=models.DateTimeField(default=django.utils.timezone.now, verbose_name='Initial View Date'), + ), + migrations.AlterField( + model_name='link', + name='initial_view_date', + field=models.DateTimeField(default=django.utils.timezone.now, verbose_name='Initial View Date'), + ), + ] diff --git a/links/migrations/0005_auto_20170201_0101.py b/links/migrations/0005_auto_20170201_0101.py new file mode 100644 index 0000000..481e160 --- /dev/null +++ b/links/migrations/0005_auto_20170201_0101.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.4 on 2017-02-01 04:01 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.utils.timezone + + +class Migration(migrations.Migration): + + dependencies = [ + ('links', '0004_auto_20170201_0032'), + ] + + operations = [ + migrations.AlterField( + model_name='link', + name='end_view_date', + field=models.DateTimeField(default=django.utils.timezone.now, null=True, verbose_name='Initial View Date'), + ), + migrations.AlterField( + model_name='link', + name='initial_view_date', + field=models.DateTimeField(default=django.utils.timezone.now, null=True, verbose_name='Initial View Date'), + ), + ] diff --git a/links/models.py b/links/models.py index cc988bc..3b68cc1 100644 --- a/links/models.py +++ b/links/models.py @@ -15,9 +15,9 @@ class Link(Resource): link_url = models.URLField(verbose_name = _("Link_URL")) initial_view = models.BooleanField(_('Initial View'), default = False) - initial_view_date = models.DateField(_('Initial View Date'), default=timezone.now) + initial_view_date = models.DateTimeField(_('Initial View Date'), default= timezone.now, null=True) end_view = models.BooleanField(_('Initial View'), default = False) - end_view_date = models.DateField(_('Initial View Date'), default=timezone.now) + end_view_date = models.DateTimeField(_('Initial View Date'), default=timezone.now, null=True) class Meta: verbose_name = "Link" verbose_name_plural = "Links" diff --git a/links/templates/links/_form.html b/links/templates/links/_form.html index fa4b616..b0c1a2f 100644 --- a/links/templates/links/_form.html +++ b/links/templates/links/_form.html @@ -92,7 +92,7 @@