diff --git a/website/db.sqlite3 b/website/db.sqlite3
index 221d564296ae27f6e0b2b3c668157c3bb191fa67..e2402ec97d92142e67570f560eeba0f0e60e609a 100644
Binary files a/website/db.sqlite3 and b/website/db.sqlite3 differ
diff --git a/website/nutriform/forms.py b/website/nutriform/forms.py
index c965fada509502e8d77dac9105870946298290a8..feb7bcf32fbe6c362b2f4b2d05c0a0b5737d6877 100644
--- a/website/nutriform/forms.py
+++ b/website/nutriform/forms.py
@@ -1,11 +1,12 @@
from django import forms
+from django import forms
from datetime import datetime
from django.contrib.auth.models import User
from django.contrib.auth.forms import UserCreationForm, UserChangeForm
from django.core.exceptions import ValidationError
import os
-from .models import QuestionQuotid, InfosUser
+from .models import QuestionQuotid, InfosUser, Maladies_permanentes, MALADIES_PERMANENTES
class UserForm(UserCreationForm):
@@ -37,8 +38,9 @@ class QuestionQuotidForm(forms.ModelForm):
exclude = ('user', 'date')
class InfoUserForm(forms.ModelForm):
+ #maladies = forms.SelectMultiple(choices= Maladies_permanentes.objects.all())
+ maladies = forms.MultipleChoiceField(widget = forms.SelectMultiple(), choices=MALADIES_PERMANENTES)
class Meta:
model = InfosUser
- fields = '__all__'
- exclude = ('user',)
\ No newline at end of file
+ fields = ('date_naissance', 'adresse', 'sexe', 'maladies')
\ No newline at end of file
diff --git a/website/nutriform/migrations/0012_maladies_permanentes.py b/website/nutriform/migrations/0012_maladies_permanentes.py
new file mode 100644
index 0000000000000000000000000000000000000000..f2bc759662711fb6e7aba5ad346e62b46fde536b
--- /dev/null
+++ b/website/nutriform/migrations/0012_maladies_permanentes.py
@@ -0,0 +1,20 @@
+# Generated by Django 2.2.7 on 2019-11-28 09:57
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('nutriform', '0011_auto_20191127_2335'),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='Maladies_permanentes',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('maladies', models.CharField(blank=True, choices=[('DER', 'Maladies dermatologiques'), ('CAV', 'Maladies cardio-vasculaires'), ('RES', 'Maladies cardio-vasculaires'), ('CAN', 'Cancer'), ('OCU', 'Maladies et troubles oculaires'), ('GEN', 'Maladies génétiques'), ('INF', 'Maladies infectieuses'), ('RAR', 'Maladies rares')], max_length=3, null=True)),
+ ],
+ ),
+ ]
diff --git a/website/nutriform/migrations/0013_auto_20191128_1107.py b/website/nutriform/migrations/0013_auto_20191128_1107.py
new file mode 100644
index 0000000000000000000000000000000000000000..c7ae23d878c4f6190c96fb7e59e6eaf4bc102df8
--- /dev/null
+++ b/website/nutriform/migrations/0013_auto_20191128_1107.py
@@ -0,0 +1,22 @@
+# Generated by Django 2.2.7 on 2019-11-28 10:07
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('nutriform', '0012_maladies_permanentes'),
+ ]
+
+ operations = [
+ migrations.RemoveField(
+ model_name='infosuser',
+ name='maladies',
+ ),
+ migrations.AddField(
+ model_name='infosuser',
+ name='maladies',
+ field=models.ManyToManyField(blank=True, null=True, to='nutriform.Maladies_permanentes'),
+ ),
+ ]
diff --git a/website/nutriform/migrations/0014_auto_20191128_1107.py b/website/nutriform/migrations/0014_auto_20191128_1107.py
new file mode 100644
index 0000000000000000000000000000000000000000..0d57ef7cdbc2471bd3201bce38709b78cb28b73c
--- /dev/null
+++ b/website/nutriform/migrations/0014_auto_20191128_1107.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.7 on 2019-11-28 10:07
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('nutriform', '0013_auto_20191128_1107'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='infosuser',
+ name='maladies',
+ field=models.ManyToManyField(blank=True, to='nutriform.Maladies_permanentes'),
+ ),
+ ]
diff --git a/website/nutriform/migrations/0015_auto_20191128_1220.py b/website/nutriform/migrations/0015_auto_20191128_1220.py
new file mode 100644
index 0000000000000000000000000000000000000000..e77a2d53213ae3152589662b722ab66db0e6909b
--- /dev/null
+++ b/website/nutriform/migrations/0015_auto_20191128_1220.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.7 on 2019-11-28 11:20
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('nutriform', '0014_auto_20191128_1107'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='maladies_permanentes',
+ name='maladies',
+ field=models.CharField(choices=[('DER', 'Maladies dermatologiques'), ('CAV', 'Maladies cardio-vasculaires'), ('RES', 'Maladies cardio-vasculaires'), ('CAN', 'Cancer'), ('OCU', 'Maladies et troubles oculaires'), ('GEN', 'Maladies génétiques'), ('INF', 'Maladies infectieuses'), ('RAR', 'Maladies rares')], max_length=3, null=True),
+ ),
+ ]
diff --git a/website/nutriform/migrations/0016_maladies_permanentes_user.py b/website/nutriform/migrations/0016_maladies_permanentes_user.py
new file mode 100644
index 0000000000000000000000000000000000000000..c10cddbb7be2e3db168b12e2e3f21fd500b338a0
--- /dev/null
+++ b/website/nutriform/migrations/0016_maladies_permanentes_user.py
@@ -0,0 +1,21 @@
+# Generated by Django 2.2.7 on 2019-11-28 12:25
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+ ('nutriform', '0015_auto_20191128_1220'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='maladies_permanentes',
+ name='user',
+ field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+ ),
+ ]
diff --git a/website/nutriform/models.py b/website/nutriform/models.py
index ed64b7b67a64604d5d6dbb9a8283087807132469..d74aeb6908eaa19a7c623a59070c9d46e4da74d9 100644
--- a/website/nutriform/models.py
+++ b/website/nutriform/models.py
@@ -61,6 +61,24 @@ class QuestionQuotid(models.Model):
def __str__(self):
return self.user.__str__() + " : " + self.date.__str__()
+MALADIES_PERMANENTES = [
+ ('DER', 'Maladies dermatologiques'),
+ ('CAV', 'Maladies cardio-vasculaires'),
+ ('RES', 'Maladies cardio-vasculaires'),
+ ('CAN', 'Cancer'),
+ ('OCU', 'Maladies et troubles oculaires'),
+ ('GEN', 'Maladies génétiques'),
+ ('INF', 'Maladies infectieuses'),
+ ('RAR', 'Maladies rares')
+]
+
+class Maladies_permanentes (models.Model):
+ maladies = models.CharField(max_length=3, choices=MALADIES_PERMANENTES, null=True)
+ user = models.ForeignKey(User, on_delete=models.CASCADE, null=True)
+
+ def __str__(self):
+ return self.maladies
+
SEXE_CHOICES = [
('M', 'Homme'),
('F', 'Femme'),
@@ -70,5 +88,5 @@ class InfosUser(models.Model):
adresse = models.CharField(max_length=200, null=True)
date_naissance = models.DateField(null=True)
sexe = models.CharField(max_length=1, choices=SEXE_CHOICES, null=True)
- maladies = models.TextField(max_length=200, null=True, blank=True)
+ maladies = models.ManyToManyField(Maladies_permanentes, blank=True)
user = models.ForeignKey(User, null=True, on_delete=models.CASCADE)
\ No newline at end of file