cst1/kpsul
1
0
Fork 0
forked from DGNum/gestioCOF
Code Pull requests Activity

Ajoute l'inscription à ses résultats du tirage

Browse source
This commit is contained in:
Martin Pépin 2016-07-16 01:51:20 +02:00
parent 7b32edbd38
commit 0887cf824d
4 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gestioncof/forms.py
View file

@ -336,14 +336,18 @@ class AdminEventForm(forms.Form):
class CalendarForm(forms.ModelForm): class CalendarForm(forms.ModelForm):
subscribe_to_events = forms.BooleanField(initial=True, subscribe_to_events = forms.BooleanField(
label="S'abonner aux événements") initial=True,
shows = forms.ModelMultipleChoiceField( label="Événements du COF.")
label="S'abonner aux spectacles suivants", subscribe_to_my_shows = forms.BooleanField(
initial=True,
label="Les spectacles pour lesquels j'ai obtenu une place.")
other_shows = forms.ModelMultipleChoiceField(
label="Spectacles supplémentaires.",
queryset=Spectacle.objects.filter(tirage__active=True), queryset=Spectacle.objects.filter(tirage__active=True),
widget=forms.CheckboxSelectMultiple, widget=forms.CheckboxSelectMultiple)
initial=Spectacle.objects.filter(tirage__active=True))
class Meta: class Meta:
model = CalendarSubscription model = CalendarSubscription
exclude = ['user', 'token'] fields = ['subscribe_to_events', 'subscribe_to_my_shows',
'other_shows']

8
gestioncof/migrations/0005_add_calendar.py
View file

@ -21,7 +21,8 @@ class Migration(migrations.Migration):
auto_created=True, primary_key=True)), auto_created=True, primary_key=True)),
('token', models.UUIDField()), ('token', models.UUIDField()),
('subscribe_to_events', models.BooleanField(default=True)), ('subscribe_to_events', models.BooleanField(default=True)),
('shows', models.ManyToManyField(to='bda.Spectacle')), ('subscribe_to_my_shows', models.BooleanField(default=True)),
('other_shows', models.ManyToManyField(to='bda.Spectacle')),
('user', models.OneToOneField(to=settings.AUTH_USER_MODEL)), ('user', models.OneToOneField(to=settings.AUTH_USER_MODEL)),
], ],
), ),
@ -43,8 +44,7 @@ class Migration(migrations.Migration):
migrations.AlterField( migrations.AlterField(
model_name='event', model_name='event',
name='start_date', name='start_date',
field=models.DateTimeField(null=True, field=models.DateTimeField(
verbose_name=b'Date de d\xc3\xa9but', null=True, verbose_name=b'Date de d\xc3\xa9but', blank=True),
blank=True),
), ),
] ]

3
gestioncof/models.py
View file

@ -239,5 +239,6 @@ class Clipper(models.Model):
class CalendarSubscription(models.Model): class CalendarSubscription(models.Model):
token = models.UUIDField() token = models.UUIDField()
user = models.OneToOneField(User) user = models.OneToOneField(User)
shows = models.ManyToManyField(Spectacle) other_shows = models.ManyToManyField(Spectacle)
subscribe_to_events = models.BooleanField(default=True) subscribe_to_events = models.BooleanField(default=True)
subscribe_to_my_shows = models.BooleanField(default=True)

9
gestioncof/views.py
View file

@ -24,7 +24,7 @@ from gestioncof.forms import UserProfileForm, EventStatusFilterForm, \
SurveyForm, SurveyStatusFilterForm, RegistrationUserForm, \ SurveyForm, SurveyStatusFilterForm, RegistrationUserForm, \
RegistrationProfileForm, AdminEventForm, EventForm, CalendarForm RegistrationProfileForm, AdminEventForm, EventForm, CalendarForm
from bda.models import Tirage from bda.models import Tirage, Attribution
@login_required @login_required
@ -654,8 +654,13 @@ def calendar(request):
def calendar_ics(request, token): def calendar_ics(request, token):
subscription = get_object_or_404(CalendarSubscription, token=token) subscription = get_object_or_404(CalendarSubscription, token=token)
shows = set(subscription.other_shows.all()) \
| {attr.show
for attr in Attribution.objects.filter(
participant__user=subscription.user,
participant__tirage__active=True)}
vcal = Calendar() vcal = Calendar()
for show in subscription.shows.all(): for show in shows:
vevent = Vevent() vevent = Vevent()
vevent.add('dtstart', show.date) vevent.add('dtstart', show.date)
vevent.add('dtend', show.date + timedelta(seconds=7200)) vevent.add('dtend', show.date + timedelta(seconds=7200))