From b7a0d41db244e626d3c59d7420ebc7b6d7f8e39d Mon Sep 17 00:00:00 2001 From: Ludovic Stephan Date: Fri, 20 Nov 2020 14:55:31 +0100 Subject: [PATCH] Simplify models --- votes/models.py | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/votes/models.py b/votes/models.py index c1baae9..f614447 100644 --- a/votes/models.py +++ b/votes/models.py @@ -17,31 +17,25 @@ class Election(models.Model): User, on_delete=models.SET_NULL, blank=True, null=True ) - counted = models.BooleanField(_("dépouillée"), default=False) results_public = models.BooleanField(_("résultats publics"), default=False) + tallied = models.BooleanField(_("dépouillée"), default=False) + archived = models.BooleanField(_("archivée"), default=False) class Question(models.Model): - election = models.ForeignKey(Election, on_delete=models.CASCADE) + election = models.ForeignKey( + Election, related_name="questions", on_delete=models.CASCADE + ) text = models.TextField(_("question"), blank=False) - # TODO: add voting type - class Option(models.Model): - question = models.ForeignKey(Question, on_delete=models.CASCADE) + question = models.ForeignKey( + Question, related_name="options", on_delete=models.CASCADE + ) text = models.TextField(_("texte"), blank=False) - - -class Vote(models.Model): - question = models.ForeignKey(Question, on_delete=models.CASCADE) - user = models.ForeignKey(User, on_delete=models.CASCADE) - votes = models.ManyToManyField(Option, through="OptionVote") - - -class OptionVote(models.Model): - vote = models.ForeignKey(Vote, on_delete=models.CASCADE) - option = models.ForeignKey(Option, on_delete=models.CASCADE) - # Préparation pour condorcet ? - ranking = models.PositiveSmallIntegerField(_("rang"), default=0) + voters = models.ManyToManyField( + User, + related_name="votes", + ) \ No newline at end of file