Merge branch 'master' into Kerl/mails_rappel

bda/admin.py

@@ -5,6 +5,7 @@ from django.core.mail import send_mail
 from django.contrib import admin
 from django.db.models import Sum, Count
 from bda.models import Spectacle, Salle, Participant, ChoixSpectacle, Attribution, Tirage
+from django import forms
 
 from datetime import timedelta
 
@@ -121,6 +122,16 @@ Le Bureau des Arts
         self.message_user(request, u"%s été informé%s avec succès." % (message_bit, plural))
     send_attribs.short_description = u"Envoyer les résultats par mail"
 
+class AttributionAdminForm(forms.ModelForm):
+    def clean(self):
+        cleaned_data=super(AttributionAdminForm, self).clean()
+        participant = cleaned_data.get("participant")
+        spectacle = cleaned_data.get("spectacle")
+        if participant and spectacle:
+            if participant.tirage != spectacle.tirage:
+                raise forms.ValidationError(u"Erreur : le participant et le spectacle n'appartiennent pas au même tirage")
+        return cleaned_data
+
 class AttributionAdmin(admin.ModelAdmin):
     def paid(self, obj):
         return obj.participant.paid
@@ -128,18 +139,22 @@ class AttributionAdmin(admin.ModelAdmin):
     paid.boolean = True
     list_display = ("id", "spectacle", "participant", "given", "paid")
     search_fields = ('spectacle__title', 'participant__user__username', 'participant__user__first_name', 'participant__user__last_name')
+    form = AttributionAdminForm
 
 import autocomplete_light
 class ChoixSpectacleAdmin(admin.ModelAdmin):
     form = autocomplete_light.modelform_factory(ChoixSpectacle, exclude=[])
-    list_display = ("participant", "spectacle", "priority", "double_choice")
+    def tirage(self, obj):
-    list_filter = ("double_choice",)
+        return obj.participant.tirage
+    list_display = ("participant", "tirage", "spectacle", "priority", "double_choice")
+    list_filter = ("double_choice", "participant__tirage")
     search_fields = ('participant__user__username', 'participant__user__first_name', 'participant__user__last_name')
 
 class SpectacleAdmin(admin.ModelAdmin):
     model = Spectacle
-    list_display = ("title", "date", "location", "slots", "price", "listing")
+    list_display = ("title", "date", "tirage", "location", "slots", "price",
-    list_filter = ("location",)
+                    "listing")
+    list_filter = ("location", "tirage",)
     search_fields = ("title", "location__name")
 
 class TirageAdmin(admin.ModelAdmin):

bda/templates/bda-participants.html

@@ -2,6 +2,7 @@
 
 {% block realcontent %}
     <h2>{{ spectacle }}</h2>
+    <h3><a href="{% url "admin:bda_attribution_add" %}?spectacle={{spectacle.id}}">Ajouter une attribution</a></h3>
       <table class='etat-bda' align="center">
         <thead>
           <tr>
@@ -25,11 +26,16 @@
             </div>
           </td>
           <td align="center">
-            <div class={%if participant.given %}"greenratio"{%else%}"redratio"{%endif%}>
+            <div class={%if participant.given == participant.nb_places %}"greenratio"
-            {% if participant.given %}Oui{% else %}Non{%endif%}
+                        {%elif participant.given == 0%}"redratio"
+                        {%else%}"orangeratio"
+                        {%endif%}>
+            {% if participant.given == participant.nb_places %}Oui
+            {% elif participant.given == 0 %}Non
+            {% else %}{{participant.given}}/{{participant.nb_places}}
+            {%endif%}
             </div>
           </td>
-          
         </tr>
         {% endfor %}
       </table>
@@ -41,8 +47,7 @@
       <br>
       <button type="button" onclick="toggle('export-salle')">Afficher/Cacher liste noms</button>
       <pre id="export-salle" style="display:none">
-{% for participant in participants %}{{participant.name}}{% if participant.nb_places == 2 %}
+{% for participant in participants %}{{participant.name}} : {{participant.nb_places}} places
-{{participant.name}}{%endif%}
 {% endfor %}
       </pre>
 

bda/templates/bda-unpaid.html

@@ -4,4 +4,5 @@
     <h2>Impayés</h2>
     <textarea style="width: 100%; height: 100px; margin-top: 10px;">
 {% for participant in unpaid %}{{ participant.user.email }}, {% endfor %}</textarea>
+    <h3>Total&nbsp: {{ unpaid|length }}</h3>
 {% endblock %}

bda/views.py

@@ -5,6 +5,7 @@ from __future__ import division
 from django.shortcuts import render, get_object_or_404
 from django.contrib.auth.decorators import login_required
 from django.db import models
+from django.db.models import Count
 from django.core import serializers
 from django.forms.models import inlineformset_factory
 import hashlib
@@ -302,11 +303,12 @@ def spectacle(request, tirage_id, spectacle_id):
                             'name': participant.user.get_full_name, 
                             'username': participant.user.username, 
                             'email': participant.user.email, 
-                            'given': attrib.given, 
+                            'given': int(attrib.given), 
                             'paid': participant.paid, 
                             'nb_places': 1}
         if participant.id in participants:
             participants[participant.id]['nb_places'] += 1 
+            participants[participant.id]['given'] += attrib.given
         else:
             participants[participant.id] = participant_info
 
@@ -331,7 +333,9 @@ class SpectacleListView(ListView):
 @buro_required
 def unpaid(request, tirage_id):
     tirage = get_object_or_404(Tirage, id=tirage_id)
-    unpaid = tirage.participant_set.filter(paid=False).all()
+    unpaid = tirage.participant_set \
+            .annotate(nb_attributions=Count('attribution')) \
+            .filter(paid=False, nb_attributions__gt=0).all()
     return render(request, "bda-unpaid.html", {"unpaid": unpaid})
 
 @buro_required                   

cof/urls.py

@@ -53,6 +53,7 @@ urlpatterns = patterns('',
     url(r'^autocomplete/registration$', 'gestioncof.autocomplete.autocomplete'),
     url(r'^autocomplete/', include('autocomplete_light.urls')),
     # Interface admin
+    url(r'^admin/logout/', 'gestioncof.views.logout'),
     url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
     url(r'^admin/(?P<app_label>[\d\w]+)/(?P<model_name>[\d\w]+)/csv/',
             'gestioncof.csv_views.admin_list_export',

gestioncof/admin.py

@@ -30,7 +30,8 @@ def add_link_field(target_model = '', field = '', link_text = unicode, desc_text
 class SurveyQuestionAnswerInline(admin.TabularInline):
     model = SurveyQuestionAnswer
 
-@add_link_field(desc_text = lambda x: "Réponses", link_text = lambda x: "Éditer les réponses")
+@add_link_field(desc_text=lambda x: "Réponses",
+        link_text=lambda x: "Éditer les réponses")
 class SurveyQuestionInline(admin.TabularInline):
     model = SurveyQuestion
 
@@ -47,7 +48,8 @@ class SurveyAdmin(admin.ModelAdmin):
 class EventOptionChoiceInline(admin.TabularInline):
     model = EventOptionChoice
 
-@add_link_field(desc_text = lambda x: "Choix", link_text = lambda x: "Éditer les choix")
+@add_link_field(desc_text=lambda x: "Choix",
+        link_text=lambda x: "Éditer les choix")
 class EventOptionInline(admin.TabularInline):
     model = EventOption
 
@@ -67,7 +69,6 @@ class EventAdmin(admin.ModelAdmin):
 
 class CofProfileInline(admin.StackedInline):
     model = CofProfile
-    #form = BaseDynamicEntityForm
     inline_classes = ("collapse open",)
 
 class FkeyLookup(object):
@@ -80,8 +81,9 @@ class FkeyLookup(object):
  
     def __get__(self, obj, klass):
         if obj is None:
-            return self  # hack required to make Django validate (if obj is None, then we're a class, and classes are callable <wink>)
+            return self  # hack required to make Django validate (if obj is
- 
+                         # None, then we're a class, and classes are callable
+                         # <wink>)
         item = getattr(obj, self.fk)
         for attr in self.fkattrs:
             item = getattr(item, attr)
@@ -121,9 +123,14 @@ class UserProfileAdmin(UserAdmin):
             return False
     is_cof.short_description = 'Membre du COF'
     is_cof.boolean = True
-    list_display = ('profile_num',) + UserAdmin.list_display + ('profile_login_clipper','profile_phone','profile_occupation','profile_mailing_cof','profile_mailing_bda','profile_mailing_bda_revente','is_cof','is_buro',)
+    list_display = ('profile_num',) + UserAdmin.list_display \
+            + ( 'profile_login_clipper','profile_phone','profile_occupation',
+                'profile_mailing_cof','profile_mailing_bda',
+                'profile_mailing_bda_revente','is_cof','is_buro',)
     list_display_links = ('username','email','first_name','last_name')
-    list_filter = UserAdmin.list_filter + ('profile__is_cof', 'profile__is_buro', 'profile__mailing_cof', 'profile__mailing_bda')
+    list_filter = UserAdmin.list_filter \
+            + ( 'profile__is_cof', 'profile__is_buro', 'profile__mailing_cof',
+                'profile__mailing_bda')
     search_fields = UserAdmin.search_fields + ('profile__phone',)
     inlines = [
                 CofProfileInline,
@@ -140,11 +147,13 @@ class EventRegistrationAdmin(admin.ModelAdmin):
     form = autocomplete_light.modelform_factory(EventRegistration, exclude=[])
     list_display = ('__unicode__','event','user','paid')
     list_filter = ('paid',)
-    search_fields = ('user__username', 'user__first_name', 'user__last_name', 'user__email', 'event__title')
+    search_fields = ('user__username', 'user__first_name', 'user__last_name',
+                     'user__email', 'event__title')
 
 class PetitCoursAbilityAdmin(admin.ModelAdmin):
     list_display = ('user','matiere','niveau','agrege')
-    search_fields = ('user__username', 'user__first_name', 'user__last_name', 'user__email', 'matiere__name', 'niveau')
+    search_fields = ('user__username', 'user__first_name', 'user__last_name',
+                     'user__email', 'matiere__name', 'niveau')
     list_filter = ('matiere','niveau','agrege')
 
 class PetitCoursAttributionAdmin(admin.ModelAdmin):
@@ -153,7 +162,8 @@ class PetitCoursAttributionAdmin(admin.ModelAdmin):
 class PetitCoursAttributionCounterAdmin(admin.ModelAdmin):
     list_display = ('user','matiere','count',)
     list_filter = ('matiere',)
-    search_fields = ('user__username', 'user__first_name', 'user__last_name', 'user__email', 'matiere__name')
+    search_fields = ('user__username', 'user__first_name', 'user__last_name',
+                     'user__email', 'matiere__name')
     actions = ['reset',]
     actions_on_bottom = True
     
@@ -161,9 +171,9 @@ class PetitCoursAttributionCounterAdmin(admin.ModelAdmin):
         queryset.update(count=0)
     reset.short_description = u"Remise à zéro du compteur"
 
-
 class PetitCoursDemandeAdmin(admin.ModelAdmin):
-    list_display = ('name','email','agrege_requis','niveau','created','traitee','processed')
+    list_display = ('name','email','agrege_requis','niveau','created',
+                    'traitee','processed')
     list_filter = ('traitee','niveau')
 
 admin.site.register(Survey, SurveyAdmin)

gestioncof/migrations/0002_enable_unprocessed_demandes.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('gestioncof', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='petitcoursdemande',
+            name='processed',
+            field=models.DateTimeField(null=True, verbose_name='Date de traitement', blank=True),
+        ),
+    ]

gestioncof/petits_cours_models.py

@@ -46,12 +46,25 @@ class PetitCoursAbility(models.Model):
 class PetitCoursDemande(models.Model):
     name = models.CharField(_(u"Nom/prénom"), max_length=200)
     email = models.CharField(_(u"Adresse email"), max_length=300)
-    phone = models.CharField(_(u"Téléphone (facultatif)"), max_length = 20, blank = True)
+    phone = models.CharField(_(u"Téléphone (facultatif)"),
-    quand = models.CharField(_(u"Quand ?"), help_text = _(u"Indiquez ici la période désirée pour les petits cours (vacances scolaires, semaine, week-end)."), max_length = 300, blank = True)
+                             max_length=20, blank=True)
-    freq = models.CharField(_(u"Fréquence"), help_text = _(u"Indiquez ici la fréquence envisagée (hebdomadaire, 2 fois par semaine, ...)"), max_length = 300, blank = True)
+    quand = models.CharField(
-    lieu = models.CharField(_(u"Lieu (si préférence)"), help_text = _(u"Si vous avez avez une préférence sur le lieu."), max_length = 300, blank = True)
+            _(u"Quand ?"),
+            help_text=_(u"Indiquez ici la période désirée pour les petits" \
+                    + " cours (vacances scolaires, semaine, week-end)."),
+            max_length=300, blank=True)
+    freq = models.CharField(
+            _(u"Fréquence"),
+            help_text=_(u"Indiquez ici la fréquence envisagée " \
+                    + "(hebdomadaire, 2 fois par semaine, ...)"),
+            max_length=300, blank=True)
+    lieu = models.CharField(
+            _(u"Lieu (si préférence)"),
+            help_text=_(u"Si vous avez avez une préférence sur le lieu."),
+            max_length=300, blank=True)
 
-    matieres = models.ManyToManyField(PetitCoursSubject, verbose_name = _(u"Matières"),
+    matieres = models.ManyToManyField(
+            PetitCoursSubject, verbose_name=_(u"Matières"),
             related_name="demandes")
     agrege_requis = models.BooleanField(_(u"Agrégé requis"), default=False)
     niveau = models.CharField (_(u"Niveau"),
@@ -63,7 +76,8 @@ class PetitCoursDemande(models.Model):
 
     traitee = models.BooleanField(_(u"Traitée"), default=False)
     traitee_par = models.ForeignKey(User, blank=True, null=True)
-    processed = models.DateTimeField(_(u"Date de traitement"), blank = True)
+    processed = models.DateTimeField(_(u"Date de traitement"),
+                                     blank=True, null=True)
     created = models.DateTimeField(_(u"Date de création"), auto_now_add=True)
 
     class Meta:
@@ -79,14 +93,16 @@ class PetitCoursAttribution(models.Model):
     matiere = models.ForeignKey(PetitCoursSubject, verbose_name=_(u"Matière"))
     date = models.DateTimeField(_(u"Date d'attribution"), auto_now_add=True)
     rank = models.IntegerField("Rang dans l'email")
-    selected = models.BooleanField(_(u"Sélectionné par le demandeur"), default = False)
+    selected = models.BooleanField(_(u"Sélectionné par le demandeur"),
+            default=False)
 
     class Meta:
         verbose_name = "Attribution de petits cours"
         verbose_name_plural = "Attributions de petits cours"
 
     def __unicode__(self):
-        return u"Attribution de la demande %d à %s pour %s" % (self.demande.id, self.user.username, self.matiere)
+        return u"Attribution de la demande %d à %s pour %s" \
+                % (self.demande.id, self.user.username, self.matiere)
 
 class PetitCoursAttributionCounter(models.Model):
     user = models.ForeignKey(User)
@@ -98,4 +114,6 @@ class PetitCoursAttributionCounter(models.Model):
         verbose_name_plural = "Compteurs d'attributions de petits cours"
 
     def __unicode__(self):
-        return u"%d demandes envoyées à %s pour %s" % (self.count, self.user.username, self.matiere)
+        return u"%d demandes envoyées à %s pour %s" \
+                % (self.count, self.user.username, self.matiere)
+

gestioncof/templates/home.html

@@ -63,12 +63,18 @@
                     <li><a href="{% url "gestioncof.views.survey_status" survey.id %}">Sondage : {{ survey.title }}</a></li>
                 {% endfor %}
               <br>
+		</ul>
               <h3>Gestion tirages BDA</h3>
+	      <ul>
                 {% for tirage in open_tirages %}
-                    <li><a href="{% url "bda-liste-spectacles" tirage.id %}"> {{ tirage.title }}</a></li>
+		    <h4>{{ tirage.title }}</h4>
+                    <li><a href="{% url "bda-liste-spectacles" tirage.id %}">Spectacles</a></li>
+		    <li><a href="{% url "admin:bda_participant_changelist" %}?tirage__id__exact={{ tirage.id }}">Participants</a></li>
                 {% endfor %}
+	      </ul>
 
-              <br>
+	      <h3>Liens utiles</h3>
+	      <ul>
                   <li><a href="{% url "gestioncof.views.utile_cof" %}">Liens utiles du COF</a></li>
                   <li><a href="{% url "gestioncof.views.utile_bda" %}">Liens utiles BdA</a></li>
               </ul>

gestioncof/templatetags/utils.py

@@ -35,4 +35,3 @@ def highlight_clipper(clipper, q):
         text = clipper.username
     return highlight_text(text, q)
 
-

gestioncof/urls.py

@@ -2,41 +2,41 @@ from django.conf.urls import url
 from gestioncof.petits_cours_views import DemandeListView
 
 export_patterns = [
-    url(r'members$', 'gestioncof.views.export_members'),
+    url(r'^members$', 'gestioncof.views.export_members'),
-    url(r'mega/avecremarques$', 'gestioncof.views.export_mega_remarksonly'),
+    url(r'^mega/avecremarques$', 'gestioncof.views.export_mega_remarksonly'),
-    url(r'mega/participants$', 'gestioncof.views.export_mega_participants'),
+    url(r'^mega/participants$', 'gestioncof.views.export_mega_participants'),
-    url(r'mega/orgas$', 'gestioncof.views.export_mega_orgas'),
+    url(r'^mega/orgas$', 'gestioncof.views.export_mega_orgas'),
-    url(r'mega/(?P<type>.+)$', 'gestioncof.views.export_mega_bytype'),
+    url(r'^mega/(?P<type>.+)$', 'gestioncof.views.export_mega_bytype'),
-    url(r'mega$', 'gestioncof.views.export_mega'),
+    url(r'^mega$', 'gestioncof.views.export_mega'),
 ]
 
 petitcours_patterns = [
-    url(r'inscription$', 'gestioncof.petits_cours_views.inscription',
+    url(r'^inscription$', 'gestioncof.petits_cours_views.inscription',
         name='petits-cours-inscription'),
-    url(r'demande$', 'gestioncof.petits_cours_views.demande',
+    url(r'^demande$', 'gestioncof.petits_cours_views.demande',
         name='petits-cours-demande'),
-    url(r'demande-raw$', 'gestioncof.petits_cours_views.demande_raw',
+    url(r'^demande-raw$', 'gestioncof.petits_cours_views.demande_raw',
         name='petits-cours-demande-raw'),
-    url(r'demandes$', DemandeListView.as_view(),
+    url(r'^demandes$', DemandeListView.as_view(),
         name='petits-cours-demandes-list'),
-    url(r'demandes/(?P<demande_id>\d+)$', 'gestioncof.petits_cours_views.details',
+    url(r'^demandes/(?P<demande_id>\d+)$', 'gestioncof.petits_cours_views.details',
         name='petits-cours-demande-details'),
-    url(r'demandes/(?P<demande_id>\d+)/traitement$',
+    url(r'^demandes/(?P<demande_id>\d+)/traitement$',
         'gestioncof.petits_cours_views.traitement',
         name='petits-cours-demande-traitement'),
-    url(r'demandes/(?P<demande_id>\d+)/retraitement$',
+    url(r'^demandes/(?P<demande_id>\d+)/retraitement$',
         'gestioncof.petits_cours_views.retraitement',
         name='petits-cours-demande-retraitement'),
 ]
 
 surveys_patterns = [
-    url(r'^survey/(?P<survey_id>\d+)/status$', 'gestioncof.views.survey_status'),
+    url(r'^(?P<survey_id>\d+)/status$', 'gestioncof.views.survey_status'),
-    url(r'^survey/(?P<survey_id>\d+)$', 'gestioncof.views.survey'),
+    url(r'^(?P<survey_id>\d+)$', 'gestioncof.views.survey'),
 ]
 
 events_patterns = [
-    url(r'^event/(?P<event_id>\d+)$', 'gestioncof.views.event'),
+    url(r'^(?P<event_id>\d+)$', 'gestioncof.views.event'),
-    url(r'^event/(?P<event_id>\d+)/status$', 'gestioncof.views.event_status'),
+    url(r'^(?P<event_id>\d+)/status$', 'gestioncof.views.event_status'),
 ]
 
 

gestioncof/views.py

@@ -403,7 +403,7 @@ def export_members(request):
     response = HttpResponse(content_type = 'text/csv')
     response['Content-Disposition'] = 'attachment; filename=membres_cof.csv'
 
-    writer = unicodecsv.UnicodeWriter(response)
+    writer = unicodecsv.writer(response)
     for profile in CofProfile.objects.filter(is_cof = True).all():
         user = profile.user
         bits = [profile.num, user.username, user.first_name, user.last_name, user.email, profile.phone, profile.occupation, profile.departement, profile.type_cotiz]
@@ -415,7 +415,7 @@ def export_members(request):
 def csv_export_mega(filename, qs):
     response = HttpResponse(content_type = 'text/csv')
     response['Content-Disposition'] = 'attachment; filename=' + filename
-    writer = unicodecsv.UnicodeWriter(response)
+    writer = unicodecsv.writer(response)
 
     for reg in qs.all():
         user = reg.user
@@ -431,7 +431,7 @@ def export_mega_remarksonly(request):
     filename = 'remarques_mega_2015.csv'
     response = HttpResponse(content_type = 'text/csv')
     response['Content-Disposition'] = 'attachment; filename=' + filename
-    writer = unicodecsv.UnicodeWriter(response)
+    writer = unicodecsv.writer(response)
 
     event = Event.objects.get(title = "Mega 15")
     commentfield = event.commentfields.get(name = "Commentaires")