Fix database and add some view

This commit is contained in:
2016-12-05 23:49:13 +01:00
parent d685e9ba29
commit 135fa00e25
7 changed files with 92 additions and 5 deletions

View File

@ -17,6 +17,7 @@ class Election(models.Model):
description = models.TextField(_('description'), null=True, blank=True)
start_date = models.DateTimeField(_('start date'), blank=False)
end_date = models.DateTimeField(_('end date'), blank=False)
electors = models.ManyToManyField(Subscriber, related_name='election', verbose_name=_("electors"), blank=True)
def __str__(self):
return self.title
@ -26,6 +27,9 @@ class Election(models.Model):
now = timezone.now()
return bool(now <= self.end_date and now >= self.start_date)
def has_voted(self, user):
return self.electors.filter(id=user.id).exists()
def get_results(self):
pass
@ -33,7 +37,7 @@ class Election(models.Model):
class Responsability(models.Model):
"""
"""
election = models.ForeignKey(Election, related_name='election', verbose_name=_("election"))
election = models.ForeignKey(Election, related_name='responsability', verbose_name=_("election"))
title = models.CharField(_('title'), max_length=255)
description = models.TextField(_('description'), null=True, blank=True)
blank_votes = models.IntegerField(_('blank votes'), default=0)
@ -45,7 +49,7 @@ class Responsability(models.Model):
class Candidate(models.Model):
"""
"""
responsability = models.ForeignKey(Responsability, related_name='responsability', verbose_name=_("responsability"))
responsability = models.ForeignKey(Responsability, related_name='candidate', verbose_name=_("responsability"))
subscriber = models.ForeignKey(Subscriber, verbose_name=_('user'), related_name='candidate', blank=True)
program = models.TextField(_('description'), null=True, blank=True)
votes = models.IntegerField(_('votes'), default=0)