diff --git a/representatives_votes/migrations/0005_auto_20150521_1529.py b/representatives_votes/migrations/0005_auto_20150521_1529.py new file mode 100644 index 0000000000000000000000000000000000000000..17ae419c428cfd2f9e0682f1e9a9d6bdb57b4373 --- /dev/null +++ b/representatives_votes/migrations/0005_auto_20150521_1529.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('representatives_votes', '0004_auto_20150513_1216'), + ] + + operations = [ + migrations.AlterField( + model_name='dossier', + name='title', + field=models.CharField(max_length=1000), + preserve_default=True, + ), + migrations.AlterField( + model_name='proposal', + name='title', + field=models.CharField(max_length=1000), + preserve_default=True, + ), + ] diff --git a/representatives_votes/models.py b/representatives_votes/models.py index 60d2062de64ae25657309c567480acf0e8391d5f..d26c0af558eb68825b9677b8f211ce95b49aaf70 100644 --- a/representatives_votes/models.py +++ b/representatives_votes/models.py @@ -4,7 +4,7 @@ from django.db import models class Dossier(models.Model): - title = models.CharField(max_length=500) + title = models.CharField(max_length=1000) reference = models.CharField(max_length=200) text = models.TextField() link = models.URLField() @@ -12,7 +12,7 @@ class Dossier(models.Model): class Proposal(models.Model): dossier = models.ForeignKey(Dossier) - title = models.CharField(max_length=500) + title = models.CharField(max_length=1000) description = models.TextField() reference = models.CharField(max_length=200, null=True) datetime = models.DateTimeField() @@ -21,6 +21,13 @@ class Proposal(models.Model): total_against = models.IntegerField() total_for = models.IntegerField() + # Presentation for the api + def vote_api_list(self): + return [ + {'position': vote.position, + 'representative': vote.representative_remote_id} + for vote in self.vote_set.all()] + class Vote(models.Model): VOTECHOICES = ( diff --git a/representatives_votes/utils.py b/representatives_votes/utils.py index bb8492ca3ba0281fc71e92f61132d2a0cbeec2f9..7eb2a193715d589777e8aa3cf26c04dc8b9d7f5c 100644 --- a/representatives_votes/utils.py +++ b/representatives_votes/utils.py @@ -11,7 +11,6 @@ def export_a_dossier(dossier): }} ret['proposals'] = [export_a_proposal(proposal) for proposal in dossier.proposal_set.all()] - return ret def export_a_proposal(proposal):