DGNum/gestioCOF
13
2
Fork 2
Code Issues 79 Pull requests 18 Projects Releases 12 Packages Wiki Activity Actions

Merge branch 'Kerl/fusion_bda' into 'master'

Browse source 
Kerl/fusion bda

Ce patch fusionne les trois applications `bda`, `bda2`, `bda3` existantes en une seule qui peut gérer autant de tirage que souhaité par le BdA.

Après avoir appliqué ce patch, il est nécessaire d'effectuer les migrations qui vont avec : `python manage.py migrate`

Fixes #3 

See merge request !17
This commit is contained in:
Basile Clement 2016-06-07 23:38:24 +02:00
commit fb16276ee3
56 changed files with 339 additions and 3277 deletions
Download patch file Download diff file Expand all files Collapse all files

14
gestioncof/views.py
View file

@ -20,14 +20,17 @@ from gestioncof.forms import UserProfileForm, EventStatusFilterForm, \
SurveyForm, SurveyStatusFilterForm, RegistrationUserForm, \
RegistrationProfileForm, AdminEventForm, EventForm
from bda.models import Tirage
import re
@login_required
def home(request):
data = {"surveys": Survey.objects.filter(old = False).all(),
"events": Event.objects.filter(old = False).all(),
"open_surveys": Survey.objects.filter(survey_open = True, old = False).all(),
"open_events": Event.objects.filter(registration_open = True, old = False).all()}
data = {"surveys": Survey.objects.filter(old=False).all(),
"events": Event.objects.filter(old=False).all(),
"open_surveys": 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()}
return render(request, "home.html", data)
def login(request):
@ -496,7 +499,8 @@ def utile_cof(request):
@buro_required
def utile_bda(request):
return render(request, "utile_bda.html", {})
tirages = Tirage.objects.all()
return render(request, "utile_bda.html", {'tirages': tirages})
@buro_required
def liste_bdadiff(request):