From 6ede5f03fda8dac56b2f7b2cb4f71fed9132deb9 Mon Sep 17 00:00:00 2001
From: Michael Vignotto <michael@Mini-di-Michael.homenet.telecomitalia.it>
Date: Sun, 14 Jun 2020 14:43:31 +0200
Subject: [PATCH] =?UTF-8?q?Aggiunta=20Classe=20Quantit=C3=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../__pycache__/admin.cpython-37.pyc          | Bin 677 -> 714 bytes
 .../__pycache__/models.cpython-37.pyc         | Bin 3830 -> 3884 bytes
 cocktail_list/admin.py                        |   3 +-
 .../migrations/0008_auto_20200614_1225.py     |  30 +++++++++++
 .../migrations/0009_auto_20200614_1236.py     |  23 +++++++++
 .../0008_auto_20200614_1219.cpython-37.pyc    | Bin 0 -> 1034 bytes
 .../0008_auto_20200614_1225.cpython-37.pyc    | Bin 0 -> 1018 bytes
 .../0009_auto_20200614_1236.cpython-37.pyc    | Bin 0 -> 859 bytes
 cocktail_list/models.py                       |  47 ++++++------------
 cocktail_list/templates/cocktail.html         |   2 +-
 db.sqlite3                                    | Bin 172032 -> 180224 bytes
 11 files changed, 72 insertions(+), 33 deletions(-)
 create mode 100644 cocktail_list/migrations/0008_auto_20200614_1225.py
 create mode 100644 cocktail_list/migrations/0009_auto_20200614_1236.py
 create mode 100644 cocktail_list/migrations/__pycache__/0008_auto_20200614_1219.cpython-37.pyc
 create mode 100644 cocktail_list/migrations/__pycache__/0008_auto_20200614_1225.cpython-37.pyc
 create mode 100644 cocktail_list/migrations/__pycache__/0009_auto_20200614_1236.cpython-37.pyc

diff --git a/cocktail_list/__pycache__/admin.cpython-37.pyc b/cocktail_list/__pycache__/admin.cpython-37.pyc
index 838f8ecaa9af8cb4731ab8f19377b8ae2bbdde12..fbb4c47249196f42584c7922ae5a40f9eb074cec 100644
GIT binary patch
delta 276
zcmZ3=dWx0TiI<m)0SKOoJ&SuWkynzjW}>=kP%e8EJ0pWTLkdd@YYRgPYbs+FM>BI2
zCy?e^z@5sxkdcuA%4S7kvmvqBk=QJ$oD=)x7+EK-)#dxb3A8P+G%>Fvv*hr?iMMhX
zxhA_a7O)8cg^PqH?`8Cm2B}~L;$k)+!NJG^ghe1RKTV#=3QUI4MI1oREiT{ul++x@
zl-$fbu<R|C;>?oNTO38H>6yhPsYOK)6M;%0EMbr)4x8Nkl+v73J4PU{m=8$sFv>6s
JvGXuOAOO=%Jd6MU

delta 238
zcmX@bx|EgIiI<m)0SJ87Uys{Akyny2XQH~Q6C;B=Lkdd@YYRgPYbs+Fdoyzs2ax7m
zz?I6pkdcuA%4S7kvmvorQaL8hlVfC=xL0@Lj~qtM$*GJ5Y=S^riUcR$X7rHe05VyD
zxR?z{a4@m}VG&5oPm_DH9g|_mEiT{ul++x@l-$fbu*5Bv;>?oNTO38H>6yhPsYOK)
m!+=^KEFmE47Kcr4eoARhsvRScSIh$>co-#^h1hu*K@b30<}+ge

diff --git a/cocktail_list/__pycache__/models.cpython-37.pyc b/cocktail_list/__pycache__/models.cpython-37.pyc
index f0d780243f1c0ddf6d206d2df8495b933e7a0382..bbb351ba2e4d7cbe4cfae30d1ae134a8f10e4dc9 100644
GIT binary patch
literal 3884
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
ZnSI%8(uR)d;{)ItEA^GdmDg7m{sN_D4J!Zu

literal 3830
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
ZBrq{n`-jjq+{<EC;H*Azed652*q`Y?FM9w0

diff --git a/cocktail_list/admin.py b/cocktail_list/admin.py
index 0b4fcc4..9f0fc8d 100644
--- a/cocktail_list/admin.py
+++ b/cocktail_list/admin.py
@@ -1,5 +1,5 @@
 from django.contrib import admin
-from .models import Ingredienti,Cocktail,Strumenti,Bicchieri
+from .models import Ingredienti,Cocktail,Strumenti,Bicchieri,Quantitá
 # Register your models here.
 
 class CocktailModel(admin.ModelAdmin):
@@ -12,4 +12,5 @@ class CocktailModel(admin.ModelAdmin):
 admin.site.register(Ingredienti)
 admin.site.register(Strumenti)
 admin.site.register(Bicchieri)
+admin.site.register(Quantitá)
 admin.site.register(Cocktail,CocktailModel)
\ No newline at end of file
diff --git a/cocktail_list/migrations/0008_auto_20200614_1225.py b/cocktail_list/migrations/0008_auto_20200614_1225.py
new file mode 100644
index 0000000..2d99342
--- /dev/null
+++ b/cocktail_list/migrations/0008_auto_20200614_1225.py
@@ -0,0 +1,30 @@
+# Generated by Django 3.0.7 on 2020-06-14 12:25
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cocktail_list', '0007_auto_20200602_1728'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Quantitá',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('quantity', models.CharField(max_length=120)),
+            ],
+        ),
+        migrations.RemoveField(
+            model_name='ingredienti',
+            name='quantitá',
+        ),
+        migrations.AddField(
+            model_name='ingredienti',
+            name='quantitá_ingrediente',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='cocktail_list.Quantitá'),
+        ),
+    ]
diff --git a/cocktail_list/migrations/0009_auto_20200614_1236.py b/cocktail_list/migrations/0009_auto_20200614_1236.py
new file mode 100644
index 0000000..69d1c66
--- /dev/null
+++ b/cocktail_list/migrations/0009_auto_20200614_1236.py
@@ -0,0 +1,23 @@
+# Generated by Django 3.0.7 on 2020-06-14 12:36
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cocktail_list', '0008_auto_20200614_1225'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='quantitá',
+            options={'verbose_name': 'Quantitá', 'verbose_name_plural': 'Quantitá'},
+        ),
+        migrations.AlterField(
+            model_name='ingredienti',
+            name='quantitá_ingrediente',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cocktail_list.Quantitá'),
+        ),
+    ]
diff --git a/cocktail_list/migrations/__pycache__/0008_auto_20200614_1219.cpython-37.pyc b/cocktail_list/migrations/__pycache__/0008_auto_20200614_1219.cpython-37.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..62be907afcb6fe029b6a809326e6adda6634e755
GIT binary patch
literal 1034
zcmY*YO>fgc5VhBiW9OqyX-frHF8Go!AzCDankE!gsFk2_$$^!dnWT385!O!CaD{7r
zM34LgZb<zXdqqO(U*N=e-K4OQC$rv}=l7n+2laYIqxEz9_op9*rv1t{%VkosPgmNc
z02=6_7U@GhVne3qdlni)^Nj`unBO!oQ4dOAjbRDcspgh$sYi2}tVI4qc$uHXskEX5
zFicNI`Pp*i&)=sj%_yKY)Il3E&?oxPKr<jTFwhFhVA8Jy7L*s}n1N0AY;d5m(8p}T
zpt@jG?LZCcu%_|~<?B>cg$CAwdSC@>!8&ZfgM~pjn+tPd3>(lOu3OSMUXmon^-(gq
z$UHyfp`T`Qr`>Mva&ML;yxZ=!+t1rw-r4Q$%^c$UZsx_ApWR$b=EH|W$&LoDDQl{F
zB+$zcWOXY1$P;sZfph7kD10yUzo4vLqBu)Z<gpi_v_BV6^V=)Jb#*e%yW%0nlkA*G
znX1Sd`xrthtA0EY2tLxo6_2~-n``BG?y^D^4Z@mjQ&<)7`&K-e?a<MGa+@nft|7~S
zV{aB_(n(@Yn3$ntS>l>vllm06EGbH|F%?MCE|Ka~kGmmlu1Ih$E1c7-pM^+yjdLOs
z=6doS;1pxPc;sU$7{SVFUm16ts}MAknsj>P{$Va%I{kA`6lwK6M#&`>8@mTkWR=52
zpg)P<lG_#pUOY)8gEMI>0W^oQ-0z+CdxO`ql1%Y#Hot4)X|5>`e|YO7X-Qj=KRWj?
zYz;8I$dYMmpwRe1@ARm(bZwQWX`z<ow6|z(_Wqrl&NJTWc3w26bCG{pWxCSG6l}vX
zO`WkVeaoPK-C}uU`a@mSxt4Sa8BI7-4i%<6THS0GpH*`yP&^@2)qAh0$Xq&*_RHd3
Oyvn^zb1DtpHvR%O$}frl

literal 0
HcmV?d00001

diff --git a/cocktail_list/migrations/__pycache__/0008_auto_20200614_1225.cpython-37.pyc b/cocktail_list/migrations/__pycache__/0008_auto_20200614_1225.cpython-37.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..40dc547c396cbe9f7abc3ca19e331e043eb535a4
GIT binary patch
literal 1018
zcmY*Y&2G~`5VqHjW9O%T6cw&qAeSVKfcAh;(}bc5wGtFAKCp5!Q`e4v!rG}Cu5isO
zAoa*|^ey&^gw$8y#CYALu-1-ey))l_^X>Ss*{o?aT06f#|1dP|SFu<Qlbi#ZS(^-K
zphsG)yL!xArWb1#8Ls(O0|U(O8kneum2ZYy0d}UfDz}uQwV15MfiJu~NRv!jaS9k^
zr{iL8IqKvb(9Ci&sJS|5E(6`yT?5UK(7-?|tb$2T1uUp8%yR}deY3%V+Co2PK7;y#
zQM3aMXu_KEYviv}RK3W=M%WCka4lSi4cJ_mu(dFJ!`*-f#C2ObCrgsVxH(S8liUj;
z9tBzM?sU7|J?_o&l=r&5Zue!k$9MO7`!k35zMpwX9^^OIk_GVbNV4N$%ajcjJr?NY
z2(msELF|b+pWs|N8H&J*g0CnWmncSQhCK0Nl=hbrYJPh~xGkN8^R9S=iJxB(DN_Ym
z=K)5L$$F6Z0wF*;T=BR|zPVP47b+`Mu})aChh$a({5}<DJGAp(we3|wR7PbKdC7#1
zo<)&#(u5N%<|tX7whXaFxe8xa6syzLrnI>_mUCI-oGyD7A^8o?>G-IqpjZJ;F#$}*
z0cL^`imVTmR3`;*L0zaxr%!qx6~#(taN&v4t$)Bcy~J{1_W??;c9aSX{Nx?!YeDEG
zekvJ^q^<Z;=gI1ze>Uh3-^f}z#k+3&sfnjW35EH?JD=!cvQ8X~FFcGoL(C?5I_(S<
z8b9ox9e0*OtsK=Kl(Ova4t2`@zn!xCobUE}FWS?&DE_4?&Fm2w+ptViXKY*FHt4Ne
ztguX1Q7ub4Wf5%{DSb*w9<M&O%ipNIEKfWkOqF|IQRzLS4QanBZ{l^KY*rB2&~4){
Da^NUP

literal 0
HcmV?d00001

diff --git a/cocktail_list/migrations/__pycache__/0009_auto_20200614_1236.cpython-37.pyc b/cocktail_list/migrations/__pycache__/0009_auto_20200614_1236.cpython-37.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..ef439c71504d7233ff05d4de9ecea0aac640e15a
GIT binary patch
literal 859
zcmZWn&2G~`5MHkx|0O|12vwEf0dle302N3GHEk#$)FKpd@qv|_9a6jgV{Ie#4A;B?
z2RQN^JOt8Sk&t)=PR!bM8^lUGnxCC-zM0vB@z^DJe(d~u`-KwnQyKj+P}#>@c_=vH
zT1ql4)G``UP1!WnL*p6YIyXKMZh)2yKI-9s(*>Cfeq#=qQ0ZpzN<?*B<drnDf<s!J
zELE&OHY)pgtLG?ygc>Iy<=RRMbubb{Lwv08nexG!qQ~SWx4=qla1uAMl3_C9Hh0#P
zyK8+#!!aLX{gHHz`@+a#yeyXIbrh#8jjLL22SM<VMNM6>X)q0fz1{n4cRGF0ILP6B
z6XkVWfB)KAuX_toMjt?&78S5O%0S-Qv{;!oB1-X*(FU!e?0O!?`APtf0Wq7~oAB&9
z0?jr?{^96t7Iuo9;pCtON$X;w<5bloTOLAjmV<XOr2J%ZL)xr$GbUZe@L7`r>LbRm
zuT*hU7KajY4*4>MO5om!yg5s25XTDk)g^VebsZ^Sp{qCUQ6V5+<uBnvnmmc}RUs)q
zm3GSwS1hf=+2U|Ee=6Oggv+&mBjOHbx8e`;-&7zfKZ}=V5v2Ycs`I)i{dtSV4rYrN
zem{pRrCl1P^dHH`^*#D;efRdf@<OOjYvHZ7P}sU@7#h_^R7t9}(TORYj=aZD+vdCO
mcCMUW_fNgPEups4=3aNwX?HOo?Z@4ipQs^Kiolj;>wf_uPWXKQ

literal 0
HcmV?d00001

diff --git a/cocktail_list/models.py b/cocktail_list/models.py
index f025001..acf282d 100644
--- a/cocktail_list/models.py
+++ b/cocktail_list/models.py
@@ -2,42 +2,27 @@ from django.db import models
 from django.urls import reverse
 # Create your models here.
 
+class Quantitá(models.Model):
+    quantity = models.CharField(max_length=120)
+    
+    def __str__(self):
+        return self.quantity
+
+    class Meta:
+        verbose_name = "Quantitá"
+        verbose_name_plural = "Quantitá"
+
 
 class Ingredienti(models.Model):
     ingrediente = models.CharField(max_length=100)
-    quantitá_scelta = [
-    ('5ML', '5 ml'),
-    ('10ML', '10 ml'),
-    ('15ML', '15 ml'),
-    ('20ML', '20 ml'),
-    ('25ML', '25 ml'),
-    ('30ML', '30 ml'),
-    ('35ML', '35 ml'),
-    ('40ML', '40 ml'),
-    ('45ML', '45 ml'),
-    ('50ML', '50 ml'),
-    ('55ML', '55 ml'),
-    ('60ML', '60 ml'),
-    ('65ML', '65 ml'),
-    ('70ML', '70 ml'),
-    ('75ML', '75 ml'),
-    ('80ML', '80 ml'),
-    ('85ML', '85 ml'),
-    ('90ML', '90 ml'),
-    ('95ML', '95 ml'),
-    ('100ML', '100 ml'),
-    ('1 Goccia', '1 goccia'),
-    ('2 Gocce', '2 goccie'),
-    ('3 Gocce', '3 goccie'),
-    ('4 Gocce', '4 goccie'),
-    ('5 Gocce', '5 goccie'),
-    ('Cubetti', '3 Cubetti'),
-    ('Spruzzo', '1 Spruzzo'),
-    ]
-    quantitá = models.CharField(max_length=30,choices=quantitá_scelta,default="5ML")
+    quantitá_ingrediente = models.ForeignKey(Quantitá,on_delete=models.CASCADE)
+
+
+    def __repr__(self):
+        return self.quantitá_ingrediente.quantity + " " +  self.ingrediente 
 
     def __str__(self):
-        return self.ingrediente
+        return f"{self.ingrediente}"
 
     class Meta:
         verbose_name = "Ingrediente"
diff --git a/cocktail_list/templates/cocktail.html b/cocktail_list/templates/cocktail.html
index e462f68..ee8fa39 100644
--- a/cocktail_list/templates/cocktail.html
+++ b/cocktail_list/templates/cocktail.html
@@ -29,7 +29,7 @@ COCKTAIL  | {{ cocktail.nome_cocktail }}
             <hr>
             <ul>
                 {% for ingredienti in cocktail.ingredienti.all %}
-                <li class="text-on-body">{{ ingredienti.ingrediente }}</li>
+                <li class="text-on-body">{{ ingredienti.quantitá_ingrediente }} {{ ingredienti.ingrediente }}</li>
                 {% endfor %}
             </ul>
             <hr>
diff --git a/db.sqlite3 b/db.sqlite3
index 31a3a73c024f7259d8bc1a134ed539118bda0bea..0e022007ca06466e76057b1073a4a4b8e7049acd 100644
GIT binary patch
delta 3417
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
S?;4t{Rd!wxk;!$VXZ{zQLBeSO

delta 671
zcmXX?Ur19?9KPq=>Akyi_nWS@?M`z-<uaKrHzO@&nBaq^>meT$)FOPz)G>AX;zH?<
z5|}qQ5rGzyK!}VRjVRHIB&<kb59y1LPnG7A6hzV?I`AF%ecw6X@8e4(EQv*B!js)B
z2tpBu%t1I>Zxxr3<|pk*h%WO7U9ts?fcLhU*0}T)&0%c13o<o}IxFBS!gzsx+{L)M
zr+z`Rx}?q;1*O+i1&4(KS#yY$X6EgqPJPKgk?F~^i`9g^ic+`USK=T(eY~WOD0;f&
zXr4>qixp@Be&9XUF%J!A(S>qMW8BD2?5X-*RgPX<{n@3!EnpjKSjJ0CVGNfLK?rXC
z>W`|s8^4RbtOZ?aityB(S;j(ZSUh0m?iSbuY$1*3xR09{L<{Os2_NkI=dP;TyZu_Y
zt0Q_b7V8c*)LUhf;I`LvcV6zez(>7h_?~^xdpbH8<P*31cd%tBJ=>7}3&!5?r~I7K
zpf_-$qAXMqJmwDt%R|ASu`zY1RP@22ODhpx(7b9mHg*;@584F$#x8cSibr_JgWbRg
z2GGlb)5Obj6@axpCNrW3Lrj_@$2oNpY-oXui5|I#NsF8c+qR@s(L1s(i9T}^lU7KC
zbHC(N(;9htPNvpT!8)qG=5@rasnJt3L1l_b0Vzy!yQ?rA6dMRzuA*M{tdXAKVp6~x
zB)ND8sbm{%x8+()X+iC^)@5~AdX$thWZsnLq>mXJrnKoTUp8Yx<~O1_`Q>od){>FJ
zR60iYQxk7#ll|zY`Rr$mYD8v%IL&4LK6*Xl$d&f6#8wCBKDHdCHs*{|H|su69;D{t
Hw5jkfQ5eP?