- {% if open_tirages %}
- {% for tirage in open_tirages %}
+ {% if active_tirages %}
+ {% for tirage in active_tirages %}
{% endfor %}
{% else %}
diff --git a/gestioncof/templates/liste_clubs.html b/gestioncof/templates/liste_clubs.html
new file mode 100644
index 00000000..c248a7a6
--- /dev/null
+++ b/gestioncof/templates/liste_clubs.html
@@ -0,0 +1,25 @@
+{% extends "base_title.html" %}
+
+{% block page_size %}col-sm-8{% endblock %}
+
+{% block realcontent %}
+
Clubs enregistrés sur GestioCOF
+
+{% endblock %}
diff --git a/gestioncof/templates/membres_clubs.html b/gestioncof/templates/membres_clubs.html
new file mode 100644
index 00000000..8c932ed5
--- /dev/null
+++ b/gestioncof/templates/membres_clubs.html
@@ -0,0 +1,41 @@
+{% extends "base_title.html" %}
+
+
+{% block realcontent %}
+
{{ club }}
+
+
+{% if club.respos.exists %}
+
Respo{{ club.respos.all|pluralize }}
+
+{% for member in club.respos.all %}
+
+ | {{ member }} |
+ {{ member.email }} |
+ |
+
+{% endfor %}
+
+{% else %}
+
Pas de respo
+{% endif %}
+
+
+{% if club.membres.exists %}
+
Liste des membres
+
+{% for member in members_no_respo %}
+
+ | {{ member }} |
+ {{ member.email }} |
+ |
+
+{% endfor %}
+
+{% else %}
+Ce club ne comporte actuellement aucun membre.
+{% endif %}
+
+{% endblock %}
diff --git a/gestioncof/templates/registration_form.html b/gestioncof/templates/registration_form.html
index b9699647..8668152b 100644
--- a/gestioncof/templates/registration_form.html
+++ b/gestioncof/templates/registration_form.html
@@ -12,16 +12,19 @@
{{ user_form | bootstrap }}
{{ profile_form | bootstrap }}
- {% if event_forms %}
- {% for event_form in event_forms %}
+
+
+ {{ clubs_form | bootstrap }}
+
+ {{ event_formset.management_form }}
+ {% for event_form in event_formset %}
-
Inscription {{ event_form.event.title }} :
+ Inscription {{ event_form.event.title }} :
- {{ event_form | bootstrap }}
+ {{ event_form | bootstrap }}
{% endfor %}
- {% endif %}
{% if login_clipper or member %}
{% endif %}
diff --git a/gestioncof/urls.py b/gestioncof/urls.py
index 89cd5aa8..ad108005 100644
--- a/gestioncof/urls.py
+++ b/gestioncof/urls.py
@@ -52,3 +52,10 @@ calendar_patterns = [
url(r'^(?P
[a-z0-9-]+)/calendar.ics$',
'gestioncof.views.calendar_ics')
]
+
+clubs_patterns = [
+ url(r'^membres/(?P\w+)', views.membres_club, name='membres-club'),
+ url(r'^liste', views.liste_clubs, name='liste-clubs'),
+ url(r'^change_respo/(?P\w+)/(?P\d+)',
+ views.change_respo, name='change-respo'),
+]
diff --git a/gestioncof/views.py b/gestioncof/views.py
index 378cb44d..3148308a 100644
--- a/gestioncof/views.py
+++ b/gestioncof/views.py
@@ -10,10 +10,11 @@ from datetime import timedelta
from icalendar import Calendar, Event as Vevent
from django.shortcuts import redirect, get_object_or_404, render
-from django.http import Http404, HttpResponse
+from django.http import Http404, HttpResponse, HttpResponseForbidden
from django.contrib.auth.decorators import login_required
from django.contrib.auth.views import login as django_login_view
from django.contrib.auth.models import User
+from django.utils import timezone
import django.utils.six as six
from gestioncof.models import Survey, SurveyAnswer, SurveyQuestion, \
@@ -23,11 +24,12 @@ from gestioncof.models import Event, EventRegistration, EventOption, \
from gestioncof.models import EventCommentField, EventCommentValue, \
CalendarSubscription
from gestioncof.shared import send_custom_mail
-from gestioncof.models import CofProfile, Clipper
+from gestioncof.models import CofProfile, Clipper, Club
from gestioncof.decorators import buro_required, cof_required
from gestioncof.forms import UserProfileForm, EventStatusFilterForm, \
SurveyForm, SurveyStatusFilterForm, RegistrationUserForm, \
- RegistrationProfileForm, AdminEventForm, EventForm, CalendarForm
+ RegistrationProfileForm, EventForm, CalendarForm, EventFormset, \
+ RegistrationPassUserForm, ClubsForm
from bda.models import Tirage, Spectacle
@@ -40,7 +42,11 @@ def home(request):
Survey.objects.filter(survey_open=True, old=False).all(),
"open_events":
Event.objects.filter(registration_open=True, old=False).all(),
- "open_tirages": Tirage.objects.filter(active=True).all()}
+ "active_tirages": Tirage.objects.filter(active=True).all(),
+ "open_tirages":
+ Tirage.objects.filter(active=True,
+ ouverture__lte=timezone.now()).all(),
+ "now": timezone.now()}
return render(request, "home.html", data)
@@ -91,7 +97,7 @@ def logout(request):
@login_required
def survey(request, survey_id):
survey = get_object_or_404(Survey, id=survey_id)
- if not survey.survey_open:
+ if not survey.survey_open or survey.old:
raise Http404
success = False
deleted = False
@@ -188,7 +194,7 @@ def update_event_form_comments(event, form, registration):
@login_required
def event(request, event_id):
event = get_object_or_404(Event, id=event_id)
- if not event.registration_open:
+ if (not event.registration_open) or event.old:
raise Http404
success = False
if request.method == "POST":
@@ -295,7 +301,7 @@ def survey_status(request, survey_id):
"form": form})
-@login_required
+@cof_required
def profile(request):
success = False
if request.method == "POST":
@@ -313,45 +319,6 @@ def registration_set_ro_fields(user_form, profile_form):
profile_form.fields['login_clipper'].widget.attrs['readonly'] = True
-@buro_required
-def registration_form(request, login_clipper=None, username=None):
- member = None
- if login_clipper:
- clipper = get_object_or_404(Clipper, username=login_clipper)
- try: # check if the given user is already registered
- member = User.objects.filter(username=login_clipper).get()
- username = member.username
- login_clipper = None
- except User.DoesNotExist:
- # new user, but prefill
- user_form = RegistrationUserForm()
- profile_form = RegistrationProfileForm()
- user_form.fields['username'].initial = login_clipper
- user_form.fields['email'].initial = \
- login_clipper + "@clipper.ens.fr"
- profile_form.fields['login_clipper'].initial = login_clipper
- if clipper.fullname:
- bits = clipper.fullname.split(" ")
- user_form.fields['first_name'].initial = bits[0]
- if len(bits) > 1:
- user_form.fields['last_name'].initial = " ".join(bits[1:])
- registration_set_ro_fields(user_form, profile_form)
- if username:
- member = get_object_or_404(User, username=username)
- (profile, _) = CofProfile.objects.get_or_create(user=member)
- # already existing, prefill
- user_form = RegistrationUserForm(instance=member)
- profile_form = RegistrationProfileForm(instance=profile)
- registration_set_ro_fields(user_form, profile_form)
- elif not login_clipper:
- # new user
- user_form = RegistrationUserForm()
- profile_form = RegistrationProfileForm()
- return render(request, "registration_form.html",
- {"user_form": user_form, "profile_form": profile_form,
- "member": member, "login_clipper": login_clipper})
-
-
@buro_required
def registration_form2(request, login_clipper=None, username=None):
events = Event.objects.filter(old=False).all()
@@ -359,24 +326,27 @@ def registration_form2(request, login_clipper=None, username=None):
if login_clipper:
clipper = get_object_or_404(Clipper, username=login_clipper)
try: # check if the given user is already registered
- member = User.objects.filter(username=login_clipper).get()
+ member = User.objects.get(username=login_clipper)
username = member.username
login_clipper = None
except User.DoesNotExist:
# new user, but prefill
- user_form = RegistrationUserForm()
- profile_form = RegistrationProfileForm()
- event_forms = [AdminEventForm(event=event) for event in events]
- user_form.fields['username'].initial = login_clipper
- user_form.fields['email'].initial = \
- login_clipper + "@clipper.ens.fr"
- profile_form.fields['login_clipper'].initial = login_clipper
+ # user
+ user_form = RegistrationUserForm(initial={
+ 'username': login_clipper,
+ 'email': "%s@clipper.ens.fr" % login_clipper})
if clipper.fullname:
bits = clipper.fullname.split(" ")
user_form.fields['first_name'].initial = bits[0]
if len(bits) > 1:
user_form.fields['last_name'].initial = " ".join(bits[1:])
+ # profile
+ profile_form = RegistrationProfileForm(initial={
+ 'login_clipper': login_clipper})
registration_set_ro_fields(user_form, profile_form)
+ # events & clubs
+ event_formset = EventFormset(events=events, prefix='events')
+ clubs_form = ClubsForm(initial={'clubs': member.clubs.all()})
if username:
member = get_object_or_404(User, username=username)
(profile, _) = CofProfile.objects.get_or_create(user=member)
@@ -384,121 +354,185 @@ def registration_form2(request, login_clipper=None, username=None):
user_form = RegistrationUserForm(instance=member)
profile_form = RegistrationProfileForm(instance=profile)
registration_set_ro_fields(user_form, profile_form)
- event_forms = []
+ # events
+ current_registrations = []
for event in events:
try:
- current_registration = EventRegistration.objects.get(
- user=member, event=event)
- form = AdminEventForm(
- event=event,
- current_registration=current_registration,
- paid=current_registration.paid)
+ current_registrations.append(
+ EventRegistration.objects.get(user=member, event=event))
except EventRegistration.DoesNotExist:
- form = AdminEventForm(event=event)
- event_forms.append(form)
+ current_registrations.append(None)
+ event_formset = EventFormset(
+ events=events, prefix='events',
+ current_registrations=current_registrations)
+ # Clubs
+ clubs_form = ClubsForm(initial={'clubs': member.clubs.all()})
elif not login_clipper:
# new user
- user_form = RegistrationUserForm()
+ user_form = RegistrationPassUserForm()
+ user_form.force_long_username()
profile_form = RegistrationProfileForm()
- event_forms = [AdminEventForm(event=event) for event in events]
+ event_formset = EventFormset(events=events, prefix='events')
+ clubs_form = ClubsForm()
return render(request, "registration_form.html",
- {"user_form": user_form, "profile_form": profile_form,
- "member": member, "login_clipper": login_clipper,
- "event_forms": event_forms})
+ {"member": member, "login_clipper": login_clipper,
+ "user_form": user_form,
+ "profile_form": profile_form,
+ "event_formset": event_formset,
+ "clubs_form": clubs_form})
@buro_required
def registration(request):
if request.POST:
request_dict = request.POST.copy()
+ # num ne peut pas être défini manuellement
if "num" in request_dict:
del request_dict["num"]
- success = False
- user_form = RegistrationUserForm(request_dict)
- profile_form = RegistrationProfileForm(request_dict)
- events = Event.objects.filter(old=False).all()
- event_forms = \
- [AdminEventForm(request_dict, event=event) for event in events]
- user_form.is_valid()
- profile_form.is_valid()
- for event_form in event_forms:
- event_form.is_valid()
member = None
login_clipper = None
+ success = False
+
+ # -----
+ # Remplissage des formulaires
+ # -----
+
+ if 'password1' in request_dict or 'password2' in request_dict:
+ user_form = RegistrationPassUserForm(request_dict)
+ else:
+ user_form = RegistrationUserForm(request_dict)
+ profile_form = RegistrationProfileForm(request_dict)
+ clubs_form = ClubsForm(request_dict)
+ events = Event.objects.filter(old=False).all()
+ event_formset = EventFormset(events=events, data=request_dict,
+ prefix='events')
if "user_exists" in request_dict and request_dict["user_exists"]:
username = request_dict["username"]
try:
- member = User.objects.filter(username=username).get()
- (profile, _) = CofProfile.objects.get_or_create(user=member)
+ member = User.objects.get(username=username)
user_form = RegistrationUserForm(request_dict, instance=member)
- profile_form = RegistrationProfileForm(request_dict,
- instance=profile)
except User.DoesNotExist:
try:
- clipper = Clipper.objects.filter(username=username).get()
+ clipper = Clipper.objects.get(username=username)
login_clipper = clipper.username
except Clipper.DoesNotExist:
- pass
- for form in event_forms:
- if not form.is_valid():
- break
- if form.cleaned_data['status'] == 'no':
- continue
- all_choices = get_event_form_choices(form.event, form)
- if user_form.is_valid() and profile_form.is_valid() \
- and not any([not form.is_valid() for form in event_forms]):
+ user_form.force_long_username()
+ else:
+ user_form.force_long_username()
+
+ # -----
+ # Validation des formulaires
+ # -----
+
+ if user_form.is_valid():
member = user_form.save()
- (profile, _) = CofProfile.objects.get_or_create(user=member)
+ profile, _ = CofProfile.objects.get_or_create(user=member)
was_cof = profile.is_cof
request_dict["num"] = profile.num
+ # Maintenant on remplit le formulaire de profil
profile_form = RegistrationProfileForm(request_dict,
instance=profile)
- profile_form.is_valid()
- profile_form.save()
- (profile, _) = CofProfile.objects.get_or_create(user=member)
- if profile.is_cof and not was_cof:
- send_custom_mail(member, "bienvenue")
- for form in event_forms:
- if form.cleaned_data['status'] == 'no':
- try:
- current_registration = EventRegistration.objects.get(
+ if (profile_form.is_valid() and event_formset.is_valid()
+ and clubs_form.is_valid()):
+ # Enregistrement du profil
+ profile = profile_form.save()
+ if profile.is_cof and not was_cof:
+ send_custom_mail(member, "bienvenue")
+ # Enregistrement des inscriptions aux événements
+ for form in event_formset:
+ if 'status' not in form.cleaned_data:
+ form.cleaned_data['status'] = 'no'
+ if form.cleaned_data['status'] == 'no':
+ try:
+ current_registration = EventRegistration.objects \
+ .get(user=member, event=form.event)
+ current_registration.delete()
+ except EventRegistration.DoesNotExist:
+ pass
+ continue
+ all_choices = get_event_form_choices(form.event, form)
+ (current_registration, created_reg) = \
+ EventRegistration.objects.get_or_create(
user=member, event=form.event)
- current_registration.delete()
- except EventRegistration.DoesNotExist:
- pass
- continue
- all_choices = get_event_form_choices(form.event, form)
- (current_registration, created_reg) = \
- EventRegistration.objects.get_or_create(user=member,
- event=form.event)
- update_event_form_comments(form.event, form,
- current_registration)
- current_registration.options = all_choices
- current_registration.paid = \
- (form.cleaned_data['status'] == 'paid')
- current_registration.save()
- if form.event.title == "Mega 15" and created_reg:
- field = EventCommentField.objects.get(event=form.event,
- name="Commentaires")
- try:
- comments = EventCommentValue.objects.get(
- commentfield=field,
- registration=current_registration).content
- except EventCommentValue.DoesNotExist:
- comments = field.default
- send_custom_mail(member, "mega", {"remarques": comments})
- success = True
+ update_event_form_comments(form.event, form,
+ current_registration)
+ current_registration.options = all_choices
+ current_registration.paid = \
+ (form.cleaned_data['status'] == 'paid')
+ current_registration.save()
+ if form.event.title == "Mega 15" and created_reg:
+ field = EventCommentField.objects.get(
+ event=form.event, name="Commentaires")
+ try:
+ comments = EventCommentValue.objects.get(
+ commentfield=field,
+ registration=current_registration).content
+ except EventCommentValue.DoesNotExist:
+ comments = field.default
+ send_custom_mail(member, "mega",
+ {"remarques": comments})
+ # Enregistrement des inscriptions aux clubs
+ member.clubs.clear()
+ for club in clubs_form.cleaned_data['clubs']:
+ club.membres.add(member)
+ club.save()
+ success = True
return render(request, "registration_post.html",
{"success": success,
"user_form": user_form,
"profile_form": profile_form,
"member": member,
"login_clipper": login_clipper,
- "event_forms": event_forms})
+ "event_formset": event_formset,
+ "clubs_form": clubs_form})
else:
return render(request, "registration.html")
+# -----
+# Clubs
+# -----
+
+
+@login_required
+def membres_club(request, name):
+ # Vérification des permissions : l'utilisateur doit être membre du burô
+ # ou respo du club.
+ user = request.user
+ club = get_object_or_404(Club, name=name)
+ if not request.user.profile.is_buro \
+ and club not in user.clubs_geres.all():
+ return HttpResponseForbidden('Permission denied
')
+ members_no_respo = club.membres.exclude(clubs_geres=club).all()
+ return render(request, 'membres_clubs.html',
+ {'club': club,
+ 'members_no_respo': members_no_respo})
+
+
+@buro_required
+def change_respo(request, club_name, user_id):
+ club = get_object_or_404(Club, name=club_name)
+ user = get_object_or_404(User, id=user_id)
+ if user in club.respos.all():
+ club.respos.remove(user)
+ elif user in club.membres.all():
+ club.respos.add(user)
+ else:
+ raise Http404
+ return redirect('membres-club', name=club_name)
+
+
+@cof_required
+def liste_clubs(request):
+ clubs = Club.objects
+ if request.user.profile.is_buro:
+ data = {'owned_clubs': clubs.all()}
+ else:
+ data = {'owned_clubs': request.user.clubs_geres,
+ 'other_clubs': clubs.exclude(respos=request.user)}
+ return render(request, 'liste_clubs.html', data)
+
+
@buro_required
def export_members(request):
response = HttpResponse(content_type='text/csv')
diff --git a/provisioning/prepare_django.sh b/provisioning/prepare_django.sh
index 5c661cc8..ef26235e 100644
--- a/provisioning/prepare_django.sh
+++ b/provisioning/prepare_django.sh
@@ -1,4 +1,4 @@
# Doit être lancé par bootstrap.sh
python manage.py migrate
-python manage.py loaddata users root bda gestion
+python manage.py loaddata users root bda gestion sites