martin/blechreiz-website
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Eventplanning: New "needsAction" state

Browse Source
This commit is contained in:
Martin Bauer
2014-06-22 10:33:39 +02:00
parent 290db91956
commit df22b838fa
4 changed files with 42 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
eventplanner/models.py
View File

@@ -120,7 +120,8 @@ class Event ( models.Model ):
class EventParticipation( models.Model ):
OPTIONS = ( ('?' , _('?' )),
('Yes', _('Yes')),
('No' , _('No' ))
('No' , _('No' )),
('-' , _( '-' ))
)
event = models.ForeignKey( Event, verbose_name=_("event") )
@@ -149,8 +150,8 @@ class EventParticipation( models.Model ):
futurePart = EventParticipation.objects.filter( event__date__gte = datetime.now() )
maybeObjects = futurePart.filter( user = user ).filter( status = '?' )
if len( maybeObjects ) > 0:
notYetEntered = futurePart.filter( user = user ).filter( status = '-' )
if len( notYetEntered ) > 0:
return False
else:
return True
@@ -175,7 +176,7 @@ class EventParticipation( models.Model ):
try:
result = EventParticipation.objects.get( event = event, user = user )
except EventParticipation.DoesNotExist:
result = EventParticipation.objects.create( event = event, user = user, status='?', comment = '' )
result = EventParticipation.objects.create( event = event, user = user, status='-', comment = '' )
return result