diff --git a/users/forms.py b/users/forms.py
index 3c87ff93..404101d8 100644
--- a/users/forms.py
+++ b/users/forms.py
@@ -46,7 +46,7 @@ from re2o.utils import remove_user_room, get_input_formats_help_text
from re2o.mixins import FormRevMixin
from re2o.field_permissions import FieldPermissionFormMixin
-from .widgets import DateTimePicker
+from .widgets import DateTimePicker, DatePicker
from .models import (
User,
@@ -316,6 +316,7 @@ class AdherentForm(FormRevMixin, FieldPermissionFormMixin, ModelForm):
self.fields['room'].label = _("Room")
self.fields['room'].empty_label = _("No room")
self.fields['school'].empty_label = _("Select a school")
+ self.fields['birthday'].label = _("Your birthday")
def clean_email(self):
if not OptionalUser.objects.first().local_email_domain in self.cleaned_data.get('email'):
@@ -334,12 +335,14 @@ class AdherentForm(FormRevMixin, FieldPermissionFormMixin, ModelForm):
'email',
'school',
'comment',
+ 'birthday',
'disclaimer',
'room',
'shell',
'telephone',
'gpg_fingerprint'
]
+ widgets = {'birthday':DatePicker}
def clean_telephone(self):
@@ -600,7 +603,7 @@ class BanForm(FormRevMixin, ModelForm):
super(BanForm, self).__init__(*args, prefix=prefix, **kwargs)
self.fields['date_end'].label = _("End date")
self.fields['date_end'].localize = False
-
+
class Meta:
model = Ban
exclude = ['user']
diff --git a/users/migrations/0078_auto_20180826_1440.py b/users/migrations/0078_auto_20180826_1440.py
deleted file mode 100644
index 52ddb96e..00000000
--- a/users/migrations/0078_auto_20180826_1440.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10.7 on 2018-08-26 12:40
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('users', '0077_auto_20180824_1750'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='user',
- name='disclaimer',
- field=models.FileField(blank=True, upload_to='disclaimers'),
- ),
- migrations.AlterField(
- model_name='user',
- name='state',
- field=models.IntegerField(choices=[(0, 'STATE_ACTIVE'), (1, 'STATE_DISABLED'), (2, 'STATE_ARCHIVE')], default=0),
- ),
- ]
diff --git a/users/migrations/0078_user_date.py b/users/migrations/0078_user_date.py
new file mode 100644
index 00000000..4d6b3dd3
--- /dev/null
+++ b/users/migrations/0078_user_date.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2018-08-28 13:56
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('users', '0077_user_disclaimer'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='user',
+ name='date',
+ field=models.DateField(default=None, verbose_name='Date'),
+ ),
+ ]
diff --git a/users/migrations/0079_auto_20180828_0859.py b/users/migrations/0079_auto_20180828_0859.py
new file mode 100644
index 00000000..2d839d55
--- /dev/null
+++ b/users/migrations/0079_auto_20180828_0859.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2018-08-28 13:59
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('users', '0078_user_date'),
+ ]
+
+ operations = [
+ migrations.RenameField(
+ model_name='user',
+ old_name='date',
+ new_name='birthday',
+ ),
+ ]
diff --git a/users/migrations/0080_auto_20180828_1029.py b/users/migrations/0080_auto_20180828_1029.py
new file mode 100644
index 00000000..d3e7140c
--- /dev/null
+++ b/users/migrations/0080_auto_20180828_1029.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2018-08-28 15:29
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('users', '0079_auto_20180828_0859'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='user',
+ name='birthday',
+ field=models.DateTimeField(default=None, verbose_name='Date'),
+ ),
+ ]
diff --git a/users/migrations/0081_auto_20180828_1031.py b/users/migrations/0081_auto_20180828_1031.py
new file mode 100644
index 00000000..78ff184f
--- /dev/null
+++ b/users/migrations/0081_auto_20180828_1031.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2018-08-28 15:31
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('users', '0080_auto_20180828_1029'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='user',
+ name='birthday',
+ field=models.DateField(default=None, verbose_name='Date'),
+ ),
+ ]
diff --git a/users/models.py b/users/models.py
index f0400352..dfd4744d 100755
--- a/users/models.py
+++ b/users/models.py
@@ -87,6 +87,9 @@ from machines.models import Domain, Interface, Machine, regen
from preferences.models import GeneralOption, AssoOption, OptionalUser
from preferences.models import OptionalMachine, MailMessageOption
+from datetime import date
+
+
# Utilitaires généraux
@@ -238,6 +241,7 @@ class User(RevMixin, FieldPermissionModelMixin, AbstractBaseUser,
default=get_fresh_user_uid,
unique=True
)
+ birthday = models.DateField(_("Date"), default=None)
disclaimer = models.FileField(upload_to='disclaimers', blank=True)
rezo_rez_uid = models.PositiveIntegerField(
unique=True,
diff --git a/users/templates/users/datetimepicker.html b/users/templates/users/datetimepicker.html
index ec91c374..2aaf63f9 100644
--- a/users/templates/users/datetimepicker.html
+++ b/users/templates/users/datetimepicker.html
@@ -6,11 +6,15 @@
+
+
diff --git a/users/templates/users/user.html b/users/templates/users/user.html
index fbac1546..c111a67b 100644
--- a/users/templates/users/user.html
+++ b/users/templates/users/user.html
@@ -38,6 +38,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,