From c328605de40965687ec70c6007dc7bf4f3ef23e8 Mon Sep 17 00:00:00 2001
From: theom <theo.mornico@yahoo.fr>
Date: Thu, 28 Nov 2019 13:30:09 +0100
Subject: [PATCH] maladies choix
---
website/db.sqlite3 | Bin 167936 -> 188416 bytes
website/nutriform/forms.py | 8 ++++---
.../migrations/0012_maladies_permanentes.py | 20 ++++++++++++++++
.../migrations/0013_auto_20191128_1107.py | 22 ++++++++++++++++++
.../migrations/0014_auto_20191128_1107.py | 18 ++++++++++++++
.../migrations/0015_auto_20191128_1220.py | 18 ++++++++++++++
.../0016_maladies_permanentes_user.py | 21 +++++++++++++++++
website/nutriform/models.py | 20 +++++++++++++++-
8 files changed, 123 insertions(+), 4 deletions(-)
create mode 100644 website/nutriform/migrations/0012_maladies_permanentes.py
create mode 100644 website/nutriform/migrations/0013_auto_20191128_1107.py
create mode 100644 website/nutriform/migrations/0014_auto_20191128_1107.py
create mode 100644 website/nutriform/migrations/0015_auto_20191128_1220.py
create mode 100644 website/nutriform/migrations/0016_maladies_permanentes_user.py
diff --git a/website/db.sqlite3 b/website/db.sqlite3
index 221d564296ae27f6e0b2b3c668157c3bb191fa67..e2402ec97d92142e67570f560eeba0f0e60e609a 100644
GIT binary patch
delta 3597
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
Ug#lFGvoV8dHdZDU21ZUc06}XpPXGV_
delta 1867
zcmZoTz}>KbYl4&z!)pcx22BPA1`P%V21W)3hOUV^Mr;hP8T3pPHl{4#XO`zsnanO=
zzgbb?9{Xk$iM#C5{IeK1`Bho@U-HNB7xC}s@8)04e~Vw0-;SSYv!cN>J}!Pc24%*)
z)bjZF>555=5^O@^^32AJ(*qM2g&A2V+v)o-a!u~m_wWQ+$-uzEE6Oa-m{?kp5no!I
zTEs5O$gIzpl9ia3o*$o^nO>Awl9``ZEYHQjz`(_?&%nQmzny;?e<gnmzdrvv{)_y3
z`Q0}wCJ6IS*0;YZ!Nsq~!2g#20{<TVmHbor+xRQ^qxs$V^)@Re2=PzW^S{Qd!E<>s
zdqCi3MTKgf&6i^gnfX|Fy&3rJ_-63F<n`wHw^>o)9gjETEQUr+1`bhPUJg!2&4Q%t
zlr*FG;*3NiQ!^DqQv(A70~JeWvy$*E<Eql2R11}oir}OaSMS`g@Vub>&@3-ASFb2<
zkMIhY60_~zwM<)?rfpzi;bY;y%)oz{{}umN{=58NHw!i#<ez?dK9laI29^M34Svzd
z>=yzzD;n(On;x*9k!7>w{nsCuH8>wkXTQJ*a&QOd_6Ii^RmAvM_*a3#;Sv8{{`356
zHY+A{@$;GGCT8Y1fC#<Z#LVfd)-#1|YG4uIVd8CJ;5)?I!sEuxu~|{!7uR+!X(k)S
zSOx}0JKq*o$I`^C9J8DpW25q%l1$UwlA?mV!o<?7f|7K@jGV-rbib-VL%*uXa$gr;
zQ@<>)EI*e>!^kX8WB>4=jHoQ9Z2ypKW8d7sDqk1BEI*e}6ThtVim2%iWtpTHji)zA
zGZhD$_`3U=Munss`DF!~`njZ=_`CRJ`h`T6`{sJ(_`7==`sPOEMrH+NMrI`&`G@3W
z`Gxozdgd9}8W|W`>KYp98X74WSXddDTA5nv85)}!Sz2swk!5ON;$h<7&cMH&{|^5o
z{yUo$6B78R7w9u7fl{+7A#X9OF#9r2?~!Fvn0{NINt1_(|1bmpBmTquOZZziD<)L%
zPw%j2l96LzV35b{jOmB$nVfi7_+K&b|Kb0}|AGJ2X2FKT{I=SRYz&Ty{Je$=!G)!X
zMX3rYsR}uX3areGjO?r+l8psKGBGhTb8_<X7c;Q%3o!6s;$O@!!0)nHF@c}ch=rZO
zTalNMe{xm5CO4a}E-O2OBbdLoUWJ?8mw|!7z!}W1s+Sfuw6rwWH89pSGG_DDWkOcT
z<fg+2=5z8-URy6U`D;D@c9sODKm1w@2*Az1l)sHXo!^6Blb?&vg6}NfdcKK#rF`Lh
zQoMh7?`>98_{T2N!sEv-?(WXmE?$zDl#`0c-mD1bbgdpH0Tx)sm)X7{iE$buS7V(o
zySTA2W3%#fp9IGDJpLgHexW`-nhXp~>!;gvGp%P~U|{?+{e3r+_4N7_M#=5-k{D+*
z*2@TSGKe!WGBPSM6r>iFq%tx2vO%K4P}j&@Mi5=r99dQXUDg>%R+fvCL7Wq0vLM7{
z8-%1`kcSLENHZ%)o?&`o9+MOc$PLr$^Oz(ctl4=?QuQD)h;Al3gmz<DZiLxInZ>D0
zNM;+k2Y~`z7UU}igs%{ulH~;1%*e>8C|Cf}%*>*MkaQ1{<v>W+gMx&aMHen_7UUtz
zj*tgwXF}3$>K-J^hAPd>A`aJW;vOW+0+D7=goX;UKU~_}JxGQbB+bbPk}k?DPDy2Q
zLzb3h0!cH%q*Ixh9Fe7E7{SsE42puqiFqZd%uL9#yxb-X?3@7%e7<~Ayw5q`a|Up~
z=C)vW-K?mf%Pzug!o&?udHh7Dyy+W~7(YyJXl7!Y?%m5Yhq+NEYI<%b(_BucNN`eY
z(FP^OnbX&FF)2;gPGn4%)lpC?POV5)QYcF-O3p|u(lFG7rBVi#?H1ik>zSAg-KNWT
WGO10^Pi5RZIg7(^`{zC;UPb_FcGBkn
diff --git a/website/nutriform/forms.py b/website/nutriform/forms.py
index c965fad..feb7bcf 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 0000000..f2bc759
--- /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 0000000..c7ae23d
--- /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 0000000..0d57ef7
--- /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 0000000..e77a2d5
--- /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 0000000..c10cddb
--- /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 ed64b7b..d74aeb6 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
--
GitLab