From 101e4cebb2e2172f2f99bbad15861e2ae46e63b1 Mon Sep 17 00:00:00 2001
From: Arnaud Fabre <arnaud.fabre@camobscura.fr>
Date: Thu, 21 May 2015 17:30:56 +0200
Subject: [PATCH] Extends dossier and proposal title length
---
.../migrations/0005_auto_20150521_1529.py | 26 +++++++++++++++++++
representatives_votes/models.py | 11 ++++++--
representatives_votes/utils.py | 1 -
3 files changed, 35 insertions(+), 3 deletions(-)
create mode 100644 representatives_votes/migrations/0005_auto_20150521_1529.py
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 0000000..17ae419
--- /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 60d2062..d26c0af 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 bb8492c..7eb2a19 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):
--
GitLab