diff --git a/subjects/forms.py b/subjects/forms.py index ec0c245..fb11cdf 100644 --- a/subjects/forms.py +++ b/subjects/forms.py @@ -16,8 +16,8 @@ class CreateSubjectForm(forms.ModelForm): class Meta: model = Subject - fields = ('name', 'description_brief', 'description', 'init_date', 'end_date', 'visible', 'professor', - 'students', ) + fields = ('name', 'description_brief', 'description', 'init_date', 'end_date','subscribe_begin', 'subscribe_end', + 'visible', 'professor', 'students', ) widgets = { diff --git a/subjects/migrations/0010_auto_20170109_2304.py b/subjects/migrations/0010_auto_20170109_2304.py deleted file mode 100644 index 9435fa2..0000000 --- a/subjects/migrations/0010_auto_20170109_2304.py +++ /dev/null @@ -1,27 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10.4 on 2017-01-10 02:04 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('subjects', '0009_auto_20170105_1835'), - ] - - operations = [ - migrations.AddField( - model_name='subject', - name='subscribe_begin', - field=models.DateTimeField(default=1, verbose_name='Begin Subscribe'), - preserve_default=False, - ), - migrations.AddField( - model_name='subject', - name='subscribe_end', - field=models.DateTimeField(default=1, verbose_name='End Subscribe'), - preserve_default=False, - ), - ] diff --git a/subjects/migrations/0010_auto_20170110_1439.py b/subjects/migrations/0010_auto_20170110_1439.py new file mode 100644 index 0000000..433c2dc --- /dev/null +++ b/subjects/migrations/0010_auto_20170110_1439.py @@ -0,0 +1,28 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.4 on 2017-01-10 17:39 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.utils.timezone + + +class Migration(migrations.Migration): + + dependencies = [ + ('subjects', '0009_auto_20170105_1835'), + ] + + operations = [ + migrations.AddField( + model_name='subject', + name='subscribe_begin', + field=models.DateField(auto_now_add=True, default=django.utils.timezone.now, verbose_name='Begin Subscribe'), + preserve_default=False, + ), + migrations.AddField( + model_name='subject', + name='subscribe_end', + field=models.DateField(auto_now_add=True, default=django.utils.timezone.now, verbose_name='End Subscribe'), + preserve_default=False, + ), + ] diff --git a/subjects/migrations/0011_auto_20170109_2308.py b/subjects/migrations/0011_auto_20170109_2308.py deleted file mode 100644 index 3e2609d..0000000 --- a/subjects/migrations/0011_auto_20170109_2308.py +++ /dev/null @@ -1,26 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10.4 on 2017-01-10 02:08 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('subjects', '0010_auto_20170109_2304'), - ] - - operations = [ - migrations.AlterField( - model_name='subject', - name='subscribe_begin', - field=models.DateTimeField(default=datetime.datetime.now, verbose_name='Begin Subscribe'), - ), - migrations.AlterField( - model_name='subject', - name='subscribe_end', - field=models.DateTimeField(default=datetime.datetime.now, verbose_name='End Subscribe'), - ), - ] diff --git a/subjects/migrations/0011_auto_20170110_1446.py b/subjects/migrations/0011_auto_20170110_1446.py new file mode 100644 index 0000000..1d4d2ae --- /dev/null +++ b/subjects/migrations/0011_auto_20170110_1446.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.4 on 2017-01-10 17:46 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('subjects', '0010_auto_20170110_1439'), + ] + + operations = [ + migrations.AlterField( + model_name='subject', + name='subscribe_begin', + field=models.DateField(verbose_name='Begin Subscribe'), + ), + migrations.AlterField( + model_name='subject', + name='subscribe_end', + field=models.DateField(verbose_name='End Subscribe'), + ), + ] diff --git a/subjects/migrations/0012_auto_20170109_2312.py b/subjects/migrations/0012_auto_20170109_2312.py deleted file mode 100644 index b267016..0000000 --- a/subjects/migrations/0012_auto_20170109_2312.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10.4 on 2017-01-10 02:12 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('subjects', '0011_auto_20170109_2308'), - ] - - operations = [ - migrations.AlterField( - model_name='subject', - name='subscribe_begin', - field=models.DateTimeField(verbose_name='Begin Subscribe'), - ), - migrations.AlterField( - model_name='subject', - name='subscribe_end', - field=models.DateTimeField(verbose_name='End Subscribe'), - ), - ] diff --git a/subjects/models.py b/subjects/models.py index b6bb954..5c0f667 100644 --- a/subjects/models.py +++ b/subjects/models.py @@ -30,8 +30,8 @@ class Subject(models.Model): create_date = models.DateTimeField(_('Creation Date'), auto_now_add = True) update_date = models.DateTimeField(_('Date of last update'), auto_now=True) - #subscribe_begin = models.DateTimeField(_('Begin Subscribe')) - #subscribe_end = models.DateTimeField(_('End Subscribe')) + subscribe_begin = models.DateField(_('Begin Subscribe')) + subscribe_end = models.DateField(_('End Subscribe')) professor = models.ManyToManyField(User, related_name="professors", blank=True) students = models.ManyToManyField(User,verbose_name=_('Students'), related_name='subject_student', blank = True) -- libgit2 0.21.2