From 52cfdb400bdd59964372562b3d81098bcdfe5e94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89lie=20Bouttier?= <elie@bouttier.eu>
Date: Fri, 3 Nov 2017 19:48:57 +0100
Subject: [PATCH] volunteers: sms prefered

---
 cfp/forms.py                                  |   2 +-
 cfp/migrations/0016_auto_20171103_1842.py     |  30 ++++++++++++++++
 cfp/models.py                                 |   3 +-
 .../cfp/staff/volunteer_details.html          |   2 +-
 locale/fr/LC_MESSAGES/django.mo               | Bin 17522 -> 17583 bytes
 locale/fr/LC_MESSAGES/django.po               |  32 ++++++++++--------
 6 files changed, 52 insertions(+), 17 deletions(-)
 create mode 100644 cfp/migrations/0016_auto_20171103_1842.py

diff --git a/cfp/forms.py b/cfp/forms.py
index 7f28a78..84c7891 100644
--- a/cfp/forms.py
+++ b/cfp/forms.py
@@ -327,4 +327,4 @@ class VolunteerForm(forms.ModelForm):
 
     class Meta:
         model = Volunteer
-        fields = ['name', 'email', 'phone_number', 'notes']
+        fields = ['name', 'email', 'phone_number', 'sms_prefered', 'notes']
diff --git a/cfp/migrations/0016_auto_20171103_1842.py b/cfp/migrations/0016_auto_20171103_1842.py
new file mode 100644
index 0000000..69051ec
--- /dev/null
+++ b/cfp/migrations/0016_auto_20171103_1842.py
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.1 on 2017-11-03 18:42
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cfp', '0015_conference_schedule_redirection_url'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='volunteer',
+            name='sms_prefered',
+            field=models.BooleanField(default=False, verbose_name='SMS prefered'),
+        ),
+        migrations.AlterField(
+            model_name='conference',
+            name='schedule_redirection_url',
+            field=models.URLField(blank=True, default='', help_text='If specified, schedule tab will redirect to this URL.', verbose_name='Schedule redirection URL'),
+        ),
+        migrations.AlterField(
+            model_name='volunteer',
+            name='email',
+            field=models.EmailField(max_length=254, verbose_name='Email'),
+        ),
+    ]
diff --git a/cfp/models.py b/cfp/models.py
index aa31c99..b8bf6e3 100644
--- a/cfp/models.py
+++ b/cfp/models.py
@@ -406,9 +406,10 @@ class Vote(PonyConfModel):
 class Volunteer(PonyConfModel):
     site = models.ForeignKey(Site, on_delete=models.CASCADE)
     name = models.CharField(max_length=128, verbose_name=_('Your Name'))
-    email = models.EmailField()
+    email = models.EmailField(verbose_name=_('Email'))
     token = models.UUIDField(default=uuid.uuid4, editable=False, unique=True)
     phone_number = models.CharField(max_length=64, blank=True, default='', verbose_name=_('Phone number'))
+    sms_prefered = models.BooleanField(default=False, verbose_name=_('SMS prefered'))
     language = models.CharField(max_length=10, blank=True)
     notes = models.TextField(default='', blank=True, verbose_name=_('Notes'),
                              help_text=_('If you have some constraints, you can indicate them here.'))
diff --git a/cfp/templates/cfp/staff/volunteer_details.html b/cfp/templates/cfp/staff/volunteer_details.html
index e334e7d..650c183 100644
--- a/cfp/templates/cfp/staff/volunteer_details.html
+++ b/cfp/templates/cfp/staff/volunteer_details.html
@@ -12,7 +12,7 @@
     <dd><a href="mailto:{{ volunteer.email }}">{{ volunteer.email }}</a></dd>
   {% if volunteer.phone_number %}
   <dt>{% trans "Phone number" %}</dt>
-    <dd><a href="tel:{{ volunteer.phone_number }}">{{ volunteer.phone_number }}</a></dd>
+    <dd><a href="tel:{{ volunteer.phone_number }}">{{ volunteer.phone_number }}</a>{% if volunteer.sms_prefered %} (SMS){% endif %}</dd>
   {% endif %}
 </dl>
 
diff --git a/locale/fr/LC_MESSAGES/django.mo b/locale/fr/LC_MESSAGES/django.mo
index 6635a947fa83d3bc1ae0c407f6c945a7e8250466..753eedfee19123b8477b98558221ff508c41c075 100644
GIT binary patch
delta 5072
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
R`nk>ZWzF>sMHvD9{|CfG^@;!h

delta 5032
zcmX}v33L_J9mnw-@&XA7A%I~CggnSb*drt?VF`qw5QMNq1=2z&(L@@QMF|BQKm-H@
z6@tMn5{oE;EGaE1C?b(o5zrzkRVYZI+S5Z3d!SVhr{CY3KhELzK6mbWGjs2M?o1B5
zo(Q|PI?OxQGEn8%E|U&qOcUq&ggLi3R=v*M*~+;z9EFYXA&kKV$UnD&k4UV>rntrS
zcc4zO&-xoMiv5!qjc2gEbDq0ILq80=&AA>Jhl6nlM&M%90G4AqzJV?96Xc(}$VVIe
zFX{qu@y@lz1k`{tQT_c<109Y5EWik^?+R(e(Q!9U#QRY*Ie^XaDCz{CVKY3BI?)wu
zhc}R-xfWbi18Rr*z9(uR{rKpNV^K4ogKcpM#&UhPiH1(F6*aP*`U3Z&4mgZ0@i=Ng
z=TVipiW<;$)bRnzpbN*K1{{y7KoVwR8g{{ZF%_4g*NMh98r|^&<Zig@sERaYn3`dG
z)QPgpL8uGn;d(5<GW-(bSUV#)NE0ba@Xt2|wPt2x5Eo%bd@+IgXVEx7M>T$j18@y1
zV<|SEDv;00Ov3S~MLLHMop2p$ExdrL$WGM2>rfSFKvm>~?SGE?-38Qy{?UQ@>jzit
z2RF>HM1N65qe`5N+-8@FI`JK-%8f_ObROnmB~k=;5H-NlsNa8W{>%EWqpln7Q3w4X
z2DRu~qYmtZ8fj0|4EtLDNK{28qSnGR)Qlg*6kLirZY%0MZ=xo!AGHXNqHgK8sOx#*
z)Kx!-Mcva5s0*Z^X4V^Z!Ytd*L5(~YHPcb%4Aevxp$7Iis$x~B^Sp^OaW`rJ@xf39
zJ=co{>&=bF?pTg}ag%ur^;oIix^O&dKpjytNI^}Y7wVo4Hb-DM`vs^0j6?ly66&}a
zAwB0RXy}BMs2M$q{BzIoQGoT<A3^;p*zbs%*^_21vQFK8^Hb#Zx~pbvGJ|8kJKm1P
z*b~=d2G@7*(9q1jK@H?P)J$%eH?2P+#qW<s-Kv(T;}TG7BpG>tT$b$@qRux1HS;pm
z<NXNgR;@u#rPxS=!MYmrJq)ma33adjX$DgL3wK1_k~GZ59Mti1aVS=y26!4Zz_X~|
zT{aWb{DDkL<M|)M7iDy4MEh_c9zvDs2TaEvd{6{egevty?21*`1K&l>@Ct_GPpAv)
zb=L@@Q2Q~qACH<~+b-0<35`TLwCYna12ZuKr`moAs&s2nzpuea+=e>QZVXMp_7CCc
zFkV2YMctgyM&ck;Me|XMewt@rEWoC8EJdAYEou=}q3&%R@|t(=qXzO7>I7F&e=8!p
z`S18P*pK~DsPintTwH5@ggUMnqmo{#H3nl-I*L#invR<30@JhaSD`BNto2u;o|;$i
z0j$SpOyR!hDd~+G$Vk+Ssu1;k3346JRoD+!piZ>T_P5#o9%S9P4^anR#UTEKF__4+
zq|$ap4Y&{LuVs!o7B!&~)cGs1F+PK_T;EmG(1F`fC)$Oo#D42Pg1PJ;L%o<{c$hPA
z7^dSaoPZlpPr+r>1*3ZVk7E#3fgIF@^HJ9sgKz2iFQTy(1DX6`VbN?y4d@z=fL8kt
zsK>2!AO9WS4Y`f35cRk%#u_|`Iatgnk6<;bLd9AB3#T0QbXBAJPoWo2<2(&5hU>`R
z1s9v`kFbZCjjG5{)PbY18Qx>xm)iHUZGR!^yvtFGw;HwTx1-L}fU4ZdZ0fJ)^#&c&
z@ki8*i&?_4Sc$seD%1rxT7RwW@3H+u*qrZApel6^wMf6mR`@^Ed7Ab22atezQ>ON(
z{yHF+4n1x~s6{ppTcd|<aT5;5UC2AhT|*71-2i{4>8M*a7<IvX)Bq-<?)fzP{yx-N
zn2kZK^k^i}*o-PoJ?aDvs1bgFI`Q{dhCgC5&g4e2Y}{(p@%6~Eac7Xpx@Z;xKXrMi
ziY`Gdy3MG8)uJZuy-p*J#@ncoo<LpjG-^O+Q5E?H+u?t(4aN@gAG0*ni3gzihhq?@
zU@0!b4tN0{!<(qeE*~7Ktmih<Q0e!g7T?FH1O9FMF++H5vfmA<x+_D?bPH;xr%(fk
z9_r8RHq-<X%+6+4)bDP${Tz(a^PfjUBfkrSSc+|NC8{DdsKxl2_3uMf<^-xTXRte7
zLf%QPWv>4>As2P8^HCKZhdORLCg3a_=+Rh7gLjKNj3sy#HPQ*g{1Z$?RiG4^tgA&;
z=mHkvP1J?Pu|j#|-DKpI;nra~9!6F8TWpU_^85-Wqt}~`A{v_MN^FErp-%WThU4?7
z)&4T-G24Oqt9KApfy3r;3@t*`B8wj3SEdE(@f(7=H3g{aO&me})iH$*m1YJ8umZ#I
zGx9kpCu!u?R!rj(X&}0gHmzoDx&_)^BP=1ehv@dH<eG%G9VC~`*8T57Lsh6Dmx;EM
z<Q;OCcG&94DWbvN+8(sV3pmBv&*6L4uEI)dA2%PuSIA$8-jKS!`-1EwcamhnTlnYg
zZ?vBIdCzZ5hu@Pwk}X8rLLYa|T!P_b0?}GHO5P%Rf({aG9f@}zAKi%Vn>H<&Rb&}?
zjQpBtTk8}0{D{wc$lpnj{D~YQXUGMzncPbrCQlJ<hke|WrY8QZ=0A_dChOdYbtHxi
zByW&kk`_d7#aml7jZa90b?E8QOC^r<A$OAxiMC&mMPv+_Otd{uo({D%47O5I8*1?s
zU^W>=UMDL^D(Ot#CzHrnvY+U2noG3liP3u`Kz5No6D{iBk-lUNxwS2((U=_3^@o!o
z<PM^3Jt-kG$VKu9X->3#O$tIS{!4|0)_xoxu=W#}K@O0wtS{2sZN7~k5N{A4`PNy6
z<E*^_XIlFh{))7;{iWt|oJLYek@bn+T06&VgmbLD6{D>^O!t2qJ7>wK);S&%$;afc
z<OJzOPLqD*exmJ5A2$_Oldfc__3gtE)*fIc;j3gFIZs9tT|e|HeKfS=f3$;_ZGRU2
z#@c(ayS4LhJ{d{cTHlNK2eN>?L?)6>WINIJu0DnZAD&k_H@KjDepzsSS;_pmg{>||
j*Oe!oiVE}{n3=U9HzOsGH83-~t}LTlT-~b!Vxs>K?{DU#

diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index c0bc783..308ab72 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-03 14:15+0000\n"
-"PO-Revision-Date: 2017-11-03 15:16+0100\n"
+"POT-Creation-Date: 2017-11-03 18:42+0000\n"
+"PO-Revision-Date: 2017-11-03 19:43+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: fr\n"
@@ -42,7 +42,7 @@ msgstr "Confirmé"
 msgid "Cancelled"
 msgstr "Annulé"
 
-#: cfp/forms.py:41 cfp/models.py:437
+#: cfp/forms.py:41 cfp/models.py:438
 msgid "Activity"
 msgstr "Activité"
 
@@ -65,12 +65,12 @@ msgstr "Catégorie"
 msgid "Title"
 msgstr "Titre"
 
-#: cfp/forms.py:87 cfp/models.py:137 cfp/models.py:432
+#: cfp/forms.py:87 cfp/models.py:137 cfp/models.py:433
 #: cfp/templates/cfp/staff/talk_details.html:64
 msgid "Description"
 msgstr "Description"
 
-#: cfp/forms.py:88 cfp/models.py:105 cfp/models.py:413
+#: cfp/forms.py:88 cfp/models.py:105 cfp/models.py:414
 #: cfp/templates/cfp/staff/participant_details.html:16
 #: cfp/templates/cfp/staff/talk_details.html:78
 #: cfp/templates/cfp/staff/volunteer_details.html:20
@@ -156,7 +156,7 @@ msgstr "Ajouter une étiquette"
 msgid "Put in a room"
 msgstr "Assigner à une salle"
 
-#: cfp/forms.py:183 cfp/models.py:135 cfp/models.py:187 cfp/models.py:430
+#: cfp/forms.py:183 cfp/models.py:135 cfp/models.py:187 cfp/models.py:431
 #: cfp/templates/cfp/staff/participant_list.html:35
 #: cfp/templates/cfp/staff/volunteer_list.html:29
 msgid "Name"
@@ -367,15 +367,24 @@ msgstr "Refusé"
 msgid "Pending decision, score: %(score).1f"
 msgstr "En cours, score : %(score).1f"
 
-#: cfp/models.py:414
+#: cfp/models.py:409 cfp/templates/cfp/staff/volunteer_details.html:11
+#: cfp/templates/cfp/staff/volunteer_list.html:30
+msgid "Email"
+msgstr "E-mail"
+
+#: cfp/models.py:412
+msgid "SMS prefered"
+msgstr "SMS préférés"
+
+#: cfp/models.py:415
 msgid "If you have some constraints, you can indicate them here."
 msgstr "Si vous avez des contraintes, vous pouvez les indiquer ici."
 
-#: cfp/models.py:433 cfp/templates/cfp/staff/volunteer_details.html:8
+#: cfp/models.py:434 cfp/templates/cfp/staff/volunteer_details.html:8
 msgid "Volunteer"
 msgstr "Bénévole"
 
-#: cfp/models.py:438 cfp/templates/cfp/staff/volunteer_details.html:25
+#: cfp/models.py:439 cfp/templates/cfp/staff/volunteer_details.html:25
 #: cfp/templates/cfp/staff/volunteer_list.html:32
 msgid "Activities"
 msgstr "Activités"
@@ -811,11 +820,6 @@ msgstr "responsable"
 msgid "No tracks."
 msgstr "Aucune session."
 
-#: cfp/templates/cfp/staff/volunteer_details.html:11
-#: cfp/templates/cfp/staff/volunteer_list.html:30
-msgid "Email"
-msgstr "E-mail"
-
 #: cfp/templates/cfp/staff/volunteer_details.html:29
 msgid "The volunteer applied for following activities:"
 msgstr "Le bénévole s'est proposé pour les activités suivantes :"