From 33416fa6d76932f9064cc26b727a12c7fd688ffd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89lie=20Bouttier?= Date: Sat, 22 Oct 2016 00:56:37 +0200 Subject: [PATCH] volunteers --- locale/fr/LC_MESSAGES/django.mo | Bin 11605 -> 12320 bytes locale/fr/LC_MESSAGES/django.po | 270 +++++++++--------- ponyconf/templates/base.html | 12 +- ponyconf/urls.py | 1 + proposals/urls.py | 2 +- volunteers/forms.py | 9 + volunteers/migrations/0001_initial.py | 6 +- volunteers/models.py | 3 + .../templates/volunteers/participate.html | 31 ++ volunteers/urls.py | 12 + volunteers/views.py | 31 +- 11 files changed, 227 insertions(+), 150 deletions(-) create mode 100644 volunteers/forms.py create mode 100644 volunteers/templates/volunteers/participate.html create mode 100644 volunteers/urls.py diff --git a/locale/fr/LC_MESSAGES/django.mo b/locale/fr/LC_MESSAGES/django.mo index ab9d1a75453842acdda5fef95fc1bf1881cff813..9d41c78d7dfbbb2c5532158c00efbac08cb01077 100644 GIT binary patch delta 4642 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 Qz&2NX<2;YQaPT?De\n" "Language-Team: LANGUAGE \n" @@ -85,8 +85,8 @@ msgstr "J’accepte d’être enregistré en vidéo" msgid "Video licence" msgstr "Licence vidéo" -#: accounts/models.py:80 proposals/models.py:115 -#: proposals/templates/proposals/talk_detail.html:87 +#: accounts/models.py:80 proposals/models.py:116 +#: proposals/templates/proposals/talk_detail.html:86 #: proposals/templates/proposals/user_details.html:57 msgid "Notes" msgstr "Notes" @@ -209,7 +209,7 @@ msgid "Delete These" msgstr "Supprimer ces" #: accounts/templates/registration/login.html:11 -#: ponyconf/templates/base.html:101 +#: ponyconf/templates/base.html:111 msgid "Login" msgstr "Se connecter" @@ -274,20 +274,28 @@ msgid "You can use this page to communicate with the staff." msgstr "" "Vous pouvez utiliser cette page pour communiquer avec l’équipe organisatrice." -#: planning/templates/planning/program.html:9 ponyconf/templates/base.html:76 +#: planning/templates/planning/program.html:9 ponyconf/templates/base.html:86 msgid "Program" msgstr "Programme" -#: planning/templates/planning/room_detail.html:19 -#: planning/templates/planning/room_detail.html:28 +#: planning/templates/planning/room_detail.html:13 +msgid "Scheduled talks" +msgstr "Exposés planifiés" + +#: planning/templates/planning/room_detail.html:22 +#: planning/templates/planning/room_detail.html:33 msgid "No talks." msgstr "Aucun exposé." +#: planning/templates/planning/room_detail.html:25 +msgid "Unscheduled talks" +msgstr "Exposés non planifiés" + #: planning/templates/planning/room_form.html:14 msgid "Room" msgstr "Salle" -#: planning/templates/planning/room_list.html:9 ponyconf/templates/base.html:73 +#: planning/templates/planning/room_list.html:9 ponyconf/templates/base.html:83 msgid "Rooms" msgstr "Salles" @@ -300,14 +308,11 @@ msgid "place" msgstr "" #: planning/templates/planning/room_list.html:24 -#, fuzzy -#| msgid "Filter talks already / not yet scheduled" msgid "Some talks are not scheduled yet." -msgstr "Filtrer les exposés déjà / pas encore planifiées" +msgstr "Certains exposés ne sont pas encore planifiés." #: planning/templates/planning/room_list.html:25 -#: proposals/templates/proposals/talk_list.html:56 -#: proposals/templates/proposals/talk_list.html:92 +#: proposals/templates/proposals/talk_list.html:41 #: proposals/templates/proposals/topic_list.html:23 #: proposals/templates/proposals/track_list.html:23 msgid "talk" @@ -317,36 +322,11 @@ msgstr "exposé" msgid "No rooms." msgstr "Aucune salle." -#: planning/templates/planning/talk_detail.html:20 -#: proposals/templates/proposals/talk_detail.html:68 -msgid "No speakers." -msgstr "Aucun orateur." - -#: planning/templates/planning/talk_detail.html:37 proposals/models.py:47 -#: proposals/models.py:70 proposals/models.py:112 -#: proposals/templates/proposals/talk_detail.html:57 -msgid "Description" -msgstr "Description" - -#: planning/templates/planning/talk_detail2.html:62 proposals/models.py:111 -msgid "Abstract" -msgstr "Résumé" - -#: planning/templates/planning/talk_detail2.html:78 -#, fuzzy -#| msgid "average:" -msgid "Coverage" -msgstr "moyenne :" - -#: planning/templates/planning/talk_detail2.html:94 -msgid "See more" -msgstr "Voir plus" - -#: ponyconf/settings.py:139 +#: ponyconf/settings.py:140 msgid "English" msgstr "Anglais" -#: ponyconf/settings.py:140 +#: ponyconf/settings.py:141 msgid "French" msgstr "Français" @@ -354,64 +334,74 @@ msgstr "Français" msgid "Home" msgstr "Accueil" -#: ponyconf/templates/base.html:47 +#: ponyconf/templates/base.html:48 #: proposals/templates/proposals/participate.html:9 msgid "Participate" msgstr "Participer" -#: ponyconf/templates/base.html:48 proposals/models.py:113 -#: proposals/templates/proposals/talk_list.html:47 +#: ponyconf/templates/base.html:51 +msgid "Propose an intervention" +msgstr "Proposer une intervention" + +#: ponyconf/templates/base.html:54 +#: volunteers/templates/volunteers/participate.html:9 +msgid "Enrole as volunteer" +msgstr "Devenir bénévole" + +#: ponyconf/templates/base.html:58 proposals/models.py:114 +#: proposals/templates/proposals/talk_detail.html:22 +#: proposals/templates/proposals/talk_list.html:48 #: proposals/templates/proposals/topic_list.html:9 msgid "Topics" msgstr "Thèmes" -#: ponyconf/templates/base.html:50 +#: ponyconf/templates/base.html:60 #: proposals/templates/proposals/track_list.html:9 msgid "Tracks" msgstr "Sessions" -#: ponyconf/templates/base.html:59 +#: ponyconf/templates/base.html:69 msgid "Listing" msgstr "Liste" -#: ponyconf/templates/base.html:62 +#: ponyconf/templates/base.html:72 #: proposals/templates/proposals/talk_list.html:9 #: proposals/templates/proposals/user_details.html:20 msgid "Talks" msgstr "Exposés" -#: ponyconf/templates/base.html:65 proposals/models.py:108 +#: ponyconf/templates/base.html:75 proposals/models.py:109 #: proposals/templates/proposals/speaker_list.html:9 -#: proposals/templates/proposals/talk_detail.html:61 -#: proposals/templates/proposals/talk_list.html:46 +#: proposals/templates/proposals/talk_detail.html:60 +#: proposals/templates/proposals/talk_list.html:47 msgid "Speakers" msgstr "Orateurs" -#: ponyconf/templates/base.html:70 +#: ponyconf/templates/base.html:80 msgid "Planning" msgstr "" -#: ponyconf/templates/base.html:81 +#: ponyconf/templates/base.html:91 msgid "Administration" msgstr "Administration" -#: ponyconf/templates/base.html:88 +#: ponyconf/templates/base.html:98 msgid "Conference" msgstr "Conférence" -#: ponyconf/templates/base.html:90 +#: ponyconf/templates/base.html:100 volunteers/models.py:15 msgid "Participants" msgstr "Participants" -#: ponyconf/templates/base.html:91 +#: ponyconf/templates/base.html:101 msgid "Correspondence" msgstr "Correspondance" -#: ponyconf/templates/base.html:100 +#: ponyconf/templates/base.html:110 msgid "Register" msgstr "S’inscrire" -#: ponyconf/templates/base.html:126 +#: ponyconf/templates/base.html:136 msgid "Powered by" msgstr "Propulsé par" @@ -449,56 +439,65 @@ msgstr "Assigner à une session" msgid "Put in a room" msgstr "Assigner à une salle" -#: proposals/models.py:45 proposals/models.py:68 +#: proposals/models.py:46 proposals/models.py:69 volunteers/models.py:12 msgid "Name" msgstr "Nom" -#: proposals/models.py:49 +#: proposals/models.py:48 proposals/models.py:71 proposals/models.py:113 +#: proposals/templates/proposals/talk_detail.html:56 volunteers/models.py:14 +msgid "Description" +msgstr "Description" + +#: proposals/models.py:50 msgid "Managers" msgstr "Responsables" -#: proposals/models.py:71 +#: proposals/models.py:72 msgid "Destination track" msgstr "Session de destination" -#: proposals/models.py:73 +#: proposals/models.py:74 msgid "Reviewers" msgstr "Responsables" -#: proposals/models.py:89 +#: proposals/models.py:90 msgid "Default duration (min)" msgstr "Durée par défaut (min)" -#: proposals/models.py:90 +#: proposals/models.py:91 msgid "Color on program" msgstr "Couleur sur le programme" -#: proposals/models.py:109 proposals/templates/proposals/talk_list.html:44 +#: proposals/models.py:110 proposals/templates/proposals/talk_list.html:45 msgid "Title" msgstr "Titre" -#: proposals/models.py:109 +#: proposals/models.py:110 msgid "After submission, title can only be changed by the staff." msgstr "" "Après soumission, le titre ne peut être modifié que par l’équipe " "d’organisation." -#: proposals/models.py:113 +#: proposals/models.py:112 +msgid "Abstract" +msgstr "Résumé" + +#: proposals/models.py:114 msgid "The topics can not be changed after submission." msgstr "Les thèmes ne peuvent pas être modifiés après soumission." -#: proposals/models.py:114 proposals/templates/proposals/talk_detail.html:29 -#: proposals/templates/proposals/talk_detail.html:74 -#: proposals/templates/proposals/talk_list.html:48 +#: proposals/models.py:115 proposals/templates/proposals/talk_detail.html:29 +#: proposals/templates/proposals/talk_detail.html:73 +#: proposals/templates/proposals/talk_list.html:49 #: proposals/templates/proposals/track_form.html:14 msgid "Track" msgstr "Session" -#: proposals/models.py:116 proposals/templates/proposals/talk_list.html:45 +#: proposals/models.py:117 proposals/templates/proposals/talk_list.html:46 msgid "Intervention kind" msgstr "Type d’intervention" -#: proposals/models.py:119 +#: proposals/models.py:120 msgid "Duration (min)" msgstr "Durée (min)" @@ -528,7 +527,7 @@ msgstr "par" #: proposals/templates/proposals/_talk_list.html:11 #: proposals/templates/proposals/_talk_list.html:17 -#: proposals/templates/proposals/talk_list.html:66 +#: proposals/templates/proposals/talk_list.html:64 msgid "and" msgstr "et" @@ -571,47 +570,46 @@ msgstr "Afficher les options de filtrage…" msgid "Filter" msgstr "Filtrer" -#: proposals/templates/proposals/speaker_list.html:46 +#: proposals/templates/proposals/speaker_list.html:44 +#: proposals/templates/proposals/talk_list.html:41 +msgid "Total:" +msgstr "Total :" + +#: proposals/templates/proposals/speaker_list.html:44 +msgid "speaker" +msgstr "orateur" + +#: proposals/templates/proposals/speaker_list.html:48 msgid "Username" msgstr "Nom d’utilisateur" -#: proposals/templates/proposals/speaker_list.html:47 +#: proposals/templates/proposals/speaker_list.html:49 msgid "Fullname" msgstr "Prénom et nom" -#: proposals/templates/proposals/speaker_list.html:48 +#: proposals/templates/proposals/speaker_list.html:50 msgid "Talk count" msgstr "Nombre d’exposé" -#: proposals/templates/proposals/speaker_list.html:49 +#: proposals/templates/proposals/speaker_list.html:51 msgctxt "table column title" msgid "Need transport?" msgstr "Transport ?" -#: proposals/templates/proposals/speaker_list.html:50 +#: proposals/templates/proposals/speaker_list.html:52 msgctxt "table column title" msgid "Need accommodation?" msgstr "Hébergement ?" -#: proposals/templates/proposals/speaker_list.html:51 +#: proposals/templates/proposals/speaker_list.html:53 msgid "Need sound?" msgstr "Son ?" -#: proposals/templates/proposals/speaker_list.html:90 +#: proposals/templates/proposals/speaker_list.html:92 #: proposals/templates/proposals/user_details.html:9 msgid "Contact" msgstr "Contacter" -#: proposals/templates/proposals/speaker_list.html:100 -#: proposals/templates/proposals/talk_list.html:56 -#: proposals/templates/proposals/talk_list.html:92 -msgid "Total:" -msgstr "Total :" - -#: proposals/templates/proposals/speaker_list.html:100 -msgid "speaker" -msgstr "orateur" - #: proposals/templates/proposals/talk_decide.html:9 msgid "Are you sure to accept this proposals?" msgstr "Êtes-vous sûr d’accepter cette propositon d’intervention ?" @@ -663,14 +661,8 @@ msgid "No abstract provided." msgstr "Aucun résumé fourni." #: proposals/templates/proposals/talk_detail.html:20 -#, fuzzy -#| msgid "Format:" msgid "Format" -msgstr "Format :" - -#: proposals/templates/proposals/talk_detail.html:22 -msgid "Topics:" -msgstr "Thèmes :" +msgstr "Format" #: proposals/templates/proposals/talk_detail.html:26 #: proposals/templates/proposals/topic_list.html:31 @@ -678,78 +670,78 @@ msgid "No topics." msgstr "Aucun thème." #: proposals/templates/proposals/talk_detail.html:33 -#: proposals/templates/proposals/talk_detail.html:75 +#: proposals/templates/proposals/talk_detail.html:74 msgid "No assigned yet." msgstr "Pas encore assigné." -#: proposals/templates/proposals/talk_detail.html:41 -#: proposals/templates/proposals/talk_detail.html:49 +#: proposals/templates/proposals/talk_detail.html:40 +#: proposals/templates/proposals/talk_detail.html:48 msgid "not defined" msgstr "non défini" -#: proposals/templates/proposals/talk_detail.html:59 +#: proposals/templates/proposals/talk_detail.html:58 msgid "No description provided." msgstr "Aucune description fournie." -#: proposals/templates/proposals/talk_detail.html:79 +#: proposals/templates/proposals/talk_detail.html:67 +msgid "No speakers." +msgstr "Aucun orateur." + +#: proposals/templates/proposals/talk_detail.html:78 msgid "Assign to" msgstr "Assigner à" -#: proposals/templates/proposals/talk_detail.html:89 +#: proposals/templates/proposals/talk_detail.html:88 msgid "No notes." msgstr "Aucune note." -#: proposals/templates/proposals/talk_detail.html:93 +#: proposals/templates/proposals/talk_detail.html:92 msgid "Moderation" msgstr "Modération" -#: proposals/templates/proposals/talk_detail.html:95 -#: proposals/templates/proposals/talk_list.html:49 +#: proposals/templates/proposals/talk_detail.html:94 +#: proposals/templates/proposals/talk_list.html:50 msgid "Status" msgstr "Statut" -#: proposals/templates/proposals/talk_detail.html:100 -#, fuzzy -#| msgid "Vote:" +#: proposals/templates/proposals/talk_detail.html:99 msgid "Vote" -msgstr "Vote :" +msgstr "Vote" -#: proposals/templates/proposals/talk_detail.html:109 +#: proposals/templates/proposals/talk_detail.html:108 msgid "vote" msgstr "vote" -#: proposals/templates/proposals/talk_detail.html:109 +#: proposals/templates/proposals/talk_detail.html:108 msgid "average:" msgstr "moyenne :" -#: proposals/templates/proposals/talk_detail.html:115 -#, fuzzy -#| msgid "Messages:" +#: proposals/templates/proposals/talk_detail.html:114 msgid "Messages" -msgstr "Messages :" +msgstr "Messages" -#: proposals/templates/proposals/talk_detail.html:116 +#: proposals/templates/proposals/talk_detail.html:115 msgid "These messages are for organization team only." msgstr "Ces messages sont à destination de la team d’organisation seulement." -#: proposals/templates/proposals/talk_list.html:78 +#: proposals/templates/proposals/talk_list.html:76 msgid "Accepted" msgstr "Accepté" -#: proposals/templates/proposals/talk_list.html:80 +#: proposals/templates/proposals/talk_list.html:78 msgid "Declined" msgstr "Décliné" -#: proposals/templates/proposals/talk_list.html:82 +#: proposals/templates/proposals/talk_list.html:80 #, python-format msgid "Pending, score: %(score)s" msgstr "En cours, score : %(score)s" -#: proposals/templates/proposals/talk_list.html:100 +#: proposals/templates/proposals/talk_list.html:93 msgid "For selected talks:" msgstr "Pour les exposés sélectionnés :" -#: proposals/templates/proposals/talk_list.html:108 +#: proposals/templates/proposals/talk_list.html:101 msgid "Apply" msgstr "Appliquer" @@ -825,44 +817,40 @@ msgstr "Accepte d’être enregistré en vidéo :" msgid "Video licence:" msgstr "Licence vidéo :" -#: proposals/views.py:213 +#: proposals/views.py:214 msgid "Talk modified successfully!" msgstr "Exposé modifié avec succès !" -#: proposals/views.py:219 +#: proposals/views.py:220 msgid "Talk proposed successfully!" msgstr "Exposé proposé avec succès !" -#: proposals/views.py:234 +#: proposals/views.py:235 msgid "Talk assigned to track successfully!" msgstr "Exposé assigné à la session avec succès !" -#: proposals/views.py:303 +#: proposals/views.py:304 msgid "Vote successfully created" msgstr "A voté !" -#: proposals/views.py:303 +#: proposals/views.py:304 msgid "Vote successfully updated" msgstr "Vote mis à jour" -#: proposals/views.py:329 +#: proposals/views.py:330 msgid "Decision taken in account" msgstr "Décision enregistrée" -#~ msgid "Abstract:" -#~ msgstr "Résumé :" +#: volunteers/templates/volunteers/participate.html:19 +msgid "Sorry, I have a setback" +msgstr "Désolé, j’ai un contretemps" -#~ msgid "Description:" -#~ msgstr "Description :" +#: volunteers/templates/volunteers/participate.html:21 +msgid "I will be happy to help on that!" +msgstr "Je serai heureux d’aider à cela !" -#~ msgid "Speakers:" -#~ msgstr "Orateurs :" - -#~ msgid "Track:" -#~ msgstr "Session :" - -#~ msgid "Notes:" -#~ msgstr "Notes :" - -#~ msgid "Status:" -#~ msgstr "Statut :" +#: volunteers/templates/volunteers/participate.html:28 +msgid "We are not yet looking for volunteers … come back later!" +msgstr "" +"Nous ne sommes pas encore en recherche de bénévoles … mais revenez plus " +"tard !" diff --git a/ponyconf/templates/base.html b/ponyconf/templates/base.html index b2041ac..312c63b 100644 --- a/ponyconf/templates/base.html +++ b/ponyconf/templates/base.html @@ -43,7 +43,17 @@
    {% trans "Home" %} {% if request.user.is_authenticated %} - {% trans "Participate" %} +
  • +  {% trans "Participate" %}  + +
    • {% trans "Topics" %} {% if request|staff %} {% trans "Tracks" %} diff --git a/ponyconf/urls.py b/ponyconf/urls.py index 761630d..05cd5f2 100644 --- a/ponyconf/urls.py +++ b/ponyconf/urls.py @@ -24,5 +24,6 @@ urlpatterns = [ url(r'', include('proposals.urls')), url(r'^conversations/', include('conversations.urls')), url(r'^planning/', include('planning.urls')), + url(r'^volunteers/', include('volunteers.urls')), url(r'^select2/', include('django_select2.urls')), ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) diff --git a/proposals/urls.py b/proposals/urls.py index a4686ef..30d12c4 100644 --- a/proposals/urls.py +++ b/proposals/urls.py @@ -6,7 +6,7 @@ urlpatterns = [ url(r'^markdown/$', views.markdown_preview, name='markdown'), url(r'^$', views.home, name='home'), url(r'^conference/$', views.conference, name='conference'), - url(r'^participate/$', views.participate, name='participate'), + url(r'^talk/propose/$', views.participate, name='participate-as-speaker'), url(r'^talk/$', views.talk_list, name='list-talks'), url(r'^talk/add/$', views.talk_edit, name='add-talk'), url(r'^talk/edit/(?P[-\w]+)$', views.talk_edit, name='edit-talk'), diff --git a/volunteers/forms.py b/volunteers/forms.py new file mode 100644 index 0000000..4ed18d1 --- /dev/null +++ b/volunteers/forms.py @@ -0,0 +1,9 @@ +from django import forms + +from .models import Activity + + +class ActivityForm(forms.ModelForm): + class Meta: + model = Activity + fields=['name', 'description', 'participants'] diff --git a/volunteers/migrations/0001_initial.py b/volunteers/migrations/0001_initial.py index 3fcd7f2..286579d 100644 --- a/volunteers/migrations/0001_initial.py +++ b/volunteers/migrations/0001_initial.py @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-19 21:17 +# Generated by Django 1.10.1 on 2016-10-21 22:12 from __future__ import unicode_literals +import autoslug.fields from django.conf import settings from django.db import migrations, models import django.db.models.deletion @@ -12,8 +13,8 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('sites', '0002_alter_domain_unique'), migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('sites', '0002_alter_domain_unique'), ] operations = [ @@ -22,6 +23,7 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('name', models.CharField(max_length=256, verbose_name='Name')), + ('slug', autoslug.fields.AutoSlugField(editable=False, populate_from='name')), ('description', models.TextField(blank=True, verbose_name='Description')), ('participants', models.ManyToManyField(blank=True, to=settings.AUTH_USER_MODEL, verbose_name='Participants')), ('site', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='sites.Site')), diff --git a/volunteers/models.py b/volunteers/models.py index bebf4ca..4c948e1 100644 --- a/volunteers/models.py +++ b/volunteers/models.py @@ -3,11 +3,14 @@ from django.contrib.sites.models import Site from django.utils.translation import ugettext_lazy as _ from django.contrib.auth.models import User +from autoslug import AutoSlugField + class Activity(models.Model): site = models.ForeignKey(Site, on_delete=models.CASCADE) name = models.CharField(max_length=256, verbose_name=_('Name')) + slug = AutoSlugField(populate_from='name') description = models.TextField(blank=True, verbose_name=_('Description')) participants = models.ManyToManyField(User, blank=True, verbose_name=_('Participants')) diff --git a/volunteers/templates/volunteers/participate.html b/volunteers/templates/volunteers/participate.html new file mode 100644 index 0000000..4a5db92 --- /dev/null +++ b/volunteers/templates/volunteers/participate.html @@ -0,0 +1,31 @@ +{% extends 'base.html' %} + +{% load accounts_tags i18n %} + +{% block participatetab %} class="active"{% endblock %} + +{% block content %} + +

    {% trans "Enrole as volunteer" %}

    + +{% for activity in activities %} +{% if forloop.first %}
    {% endif %} +
    +

    {{ activity.name }}

    +

    +

    {{ activity.description }}

    +

    + {% if request.user in activity.participants.all %} + {% trans "Sorry, I have a setback" %} + {% else %} + {% trans "I will be happy to help on that!" %} + {% endif %} +

    +

    +
    +{% if forloop.last %}
    {% endif %} +{% empty %} +{% trans "We are not yet looking for volunteers … come back later!" %} +{% endfor %} + +{% endblock %} diff --git a/volunteers/urls.py b/volunteers/urls.py new file mode 100644 index 0000000..9df2eac --- /dev/null +++ b/volunteers/urls.py @@ -0,0 +1,12 @@ +from django.conf.urls import url + +from . import views + + +urlpatterns = [ + url(r'^enrole/$', views.participate, name='participate-as-volunteer'), + url(r'^activities/$', views.ActivityList.as_view(), name='list-activities'), + url(r'^activities/add/$', views.ActivityCreate.as_view(), name='add-activity'), + url(r'^activities/(?P[-\w]+)/edit/$', views.ActivityUpdate.as_view(), name='edit-activity'), + url(r'^activities/(?P[-\w]+)/enrole/$', views.participate, name='enrole-in-activity'), +] diff --git a/volunteers/views.py b/volunteers/views.py index 94b41b7..54e2d2b 100644 --- a/volunteers/views.py +++ b/volunteers/views.py @@ -1,11 +1,32 @@ -from django.shortcuts import render +from django.shortcuts import render, get_object_or_404, redirect from django.contrib.sites.shortcuts import get_current_site from django.views.generic import CreateView, DetailView, ListView, UpdateView +from django.contrib.auth.decorators import login_required from ponyconf.mixins import OnSiteFormMixin from accounts.mixins import OrgaRequiredMixin, StaffRequiredMixin +from .models import Activity +from .forms import ActivityForm + + + +@login_required +def participate(request, slug=None): + if slug: + # TODO: enrole action should be done on post (with bootstrap modal confirmation box?) + activity = get_object_or_404(Activity, site=get_current_site(request), slug=slug) + if request.user in activity.participants.all(): + activity.participants.remove(request.user) + else: + activity.participants.add(request.user) + activity.save() + return redirect('participate-as-volunteer') + activities = Activity.objects.filter(site=get_current_site(request)) + return render(request, 'volunteers/participate.html', { + 'activities': activities, + }) class ActivityMixin(object): @@ -17,17 +38,17 @@ class ActivityFormMixin(OnSiteFormMixin): form_class = ActivityForm -class ActivityList(StaffRequiredMixin, RoomMixin, ListView): +class ActivityList(StaffRequiredMixin, ActivityMixin, ListView): pass -class ActivityCreate(OrgaRequiredMixin, RoomMixin, RoomFormMixin, CreateView): +class ActivityCreate(OrgaRequiredMixin, ActivityMixin, ActivityFormMixin, CreateView): model = Activity -class ActivityUpdate(OrgaRequiredMixin, RoomMixin, RoomFormMixin, UpdateView): +class ActivityUpdate(OrgaRequiredMixin, ActivityMixin, ActivityFormMixin, UpdateView): pass -class ActivityDetail(StaffRequiredMixin, RoomMixin, DetailView): +class ActivityDetail(StaffRequiredMixin, ActivityMixin, DetailView): pass