Skip to content

Commit

Permalink
Merge pull request #3 from rmorell/master
Browse files Browse the repository at this point in the history
A few more...
  • Loading branch information
Brian Klug committed May 22, 2012
2 parents 0ff4bd6 + 960ad87 commit 2bf4573
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions models.py
Expand Up @@ -40,6 +40,8 @@ def vote_for_member(self,member=None):
return self.votes.filter('member =',member).get() return self.votes.filter('member =',member).get()


def register_vote(self,choice,member=None): def register_vote(self,choice,member=None):
if self.has_results:
raise Exception('Cannot vote in closed polls.')
if not member: if not member:
member = users.get_current_user() member = users.get_current_user()
member_vote = self.vote_for_member(member) member_vote = self.vote_for_member(member)
Expand All @@ -59,6 +61,8 @@ def register_vote(self,choice,member=None):
def extend_duration(self,hours): def extend_duration(self,hours):
if hours <= 0: if hours <= 0:
raise Exception('Negative extensions are not valid.') raise Exception('Negative extensions are not valid.')
if self.has_results:
raise Exception('Cannot extend closed polls.')
self.duration += hours self.duration += hours
if self.start_time: if self.start_time:
self.end_time = self.start_time + timedelta(hours=self.duration) self.end_time = self.start_time + timedelta(hours=self.duration)
Expand All @@ -76,9 +80,11 @@ def hours_left(self):
return hours return hours


def is_active(self): def is_active(self):
self.update_status()
return self.status in ('active') return self.status in ('active')


def has_results(self): def has_results(self):
self.update_status()
return self.status in ('done') return self.status in ('done')


def member_is_creator(self,member=None): def member_is_creator(self,member=None):
Expand Down

0 comments on commit 2bf4573

Please sign in to comment.