diff --git a/README.md b/README.md index ddfa177c..0d5d0e54 100644 --- a/README.md +++ b/README.md @@ -162,3 +162,10 @@ Pour mettre à jour les paquets Python, utiliser la commande suivante : Pour mettre à jour les modèles après une migration, il faut ensuite faire : python manage.py migrate + + +## Documentation utilisateur + +Une brève documentation utilisateur pour se faliliariser plus vite avec l'outil +est accessible sur le +[wiki](https://git.eleves.ens.fr/cof-geek/gestioCOF/wikis/home). diff --git a/bda/admin.py b/bda/admin.py index 2cdce0a6..476f7d89 100644 --- a/bda/admin.py +++ b/bda/admin.py @@ -16,7 +16,6 @@ class AttributionInline(admin.TabularInline): model = Attribution class ParticipantAdmin(admin.ModelAdmin): - #inlines = [ChoixSpectacleInline] inlines = [AttributionInline] def get_queryset(self, request): return Participant.objects.annotate(nb_places = Count('attributions'), @@ -31,8 +30,9 @@ class ParticipantAdmin(admin.ModelAdmin): else: return u"0 €" total.admin_order_field = "total" total.short_description = "Total à payer" - list_display = ("user", "nb_places", "total", "paid", "paymenttype") - list_filter = ("paid",) + list_display = ("user", "nb_places", "total", "paid", "paymenttype", + "tirage") + list_filter = ("paid", "tirage") search_fields = ('user__username', 'user__first_name', 'user__last_name') actions = ['send_attribs',] actions_on_bottom = True diff --git a/bda/views.py b/bda/views.py index fd0a0cdc..4c66e669 100644 --- a/bda/views.py +++ b/bda/views.py @@ -237,7 +237,9 @@ def do_tirage(request, tirage_id): # FIXME: Établir les conditions de validations (formulaire ?) # cf. issue #32 if False: - Attribution.objects.all().delete() + Attribution.objects.filter( + spectacle__tirage=tirage_elt + ).delete() for (show, members, _) in results: for (member, _, _, _) in members: attrib = Attribution(spectacle=show, participant=member) diff --git a/gestioncof/admin.py b/gestioncof/admin.py index ee0f1409..09ac61fd 100644 --- a/gestioncof/admin.py +++ b/gestioncof/admin.py @@ -164,6 +164,12 @@ class PetitCoursAttributionCounterAdmin(admin.ModelAdmin): list_filter = ('matiere',) search_fields = ('user__username', 'user__first_name', 'user__last_name', 'user__email', 'matiere__name') + actions = ['reset',] + actions_on_bottom = True + + def reset(self, request, queryset): + 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', diff --git a/gestioncof/forms.py b/gestioncof/forms.py index 751755b4..a470face 100644 --- a/gestioncof/forms.py +++ b/gestioncof/forms.py @@ -79,6 +79,11 @@ class SurveyForm(forms.Form): field.question_id = question.id self.fields["question_%d" % question.id] = field + def answers(self): + for name, value in self.cleaned_data.items(): + if name.startswith('question_'): + yield (self.fields[name].question_id, value) + class SurveyStatusFilterForm(forms.Form): def __init__(self, *args, **kwargs): survey = kwargs.pop("survey") diff --git a/gestioncof/templates/petits_cours_demandes_list.html b/gestioncof/templates/petits_cours_demandes_list.html index b3115815..101da253 100644 --- a/gestioncof/templates/petits_cours_demandes_list.html +++ b/gestioncof/templates/petits_cours_demandes_list.html @@ -20,7 +20,7 @@ {% for matiere in demande.matieres.all %}{% if forloop.counter0 > 0 %}, {% endif %}{{ matiere }}{% endfor %} {{ demande.created|date:"d E Y" }} - {% if demande.traitee_par %}{{ demande.traitee_par.username }}{% else %}{% endif %} + {% if demande.traitee_par %}{{ demande.traitee_par.username }}{% else %}{% endif %} Détails {% endfor %} diff --git a/gestioncof/views.py b/gestioncof/views.py index 963fd5f5..70084e14 100644 --- a/gestioncof/views.py +++ b/gestioncof/views.py @@ -59,11 +59,6 @@ def logout(request): else: return redirect("django.contrib.auth.views.logout") - def answers(self): - for name, value in self.cleaned_data.items(): - if name.startswith('question_'): - yield (self.fields[name].question_id, value) - @login_required def survey(request, survey_id): survey = get_object_or_404(Survey, id = survey_id)