klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2025-07-09 19:40:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Normally fixs tests

Browse Source
This commit is contained in:
Antoine Bartuccio
2016-12-13 22:22:19 +01:00
parent d14af8e452
commit a284637190
4 changed files with 44 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
election/migrations/0001_initial.py
View File

@ -13,10 +13,11 @@ class Migration(migrations.Migration):
operations = [
migrations.CreateModel(
name='Candidate',
name='Candidature',
fields=[
('id', models.AutoField(serialize=False, primary_key=True, auto_created=True, verbose_name='ID')),
('program', models.TextField(blank=True, null=True, verbose_name='description')),
('has_voted', models.ManyToManyField(related_name='has_voted', to=settings.AUTH_USER_MODEL, verbose_name='has_voted')),
],
),
migrations.CreateModel(
@ -25,38 +26,44 @@ class Migration(migrations.Migration):
('id', models.AutoField(serialize=False, primary_key=True, auto_created=True, verbose_name='ID')),
('title', models.CharField(max_length=255, verbose_name='title')),
('description', models.TextField(blank=True, null=True, verbose_name='description')),
('start_proposal', models.DateTimeField(verbose_name='start proposal')),
('end_proposal', models.DateTimeField(verbose_name='end proposal')),
('start_candidature', models.DateTimeField(verbose_name='start candidature')),
('end_candidature', models.DateTimeField(verbose_name='end candidature')),
('start_date', models.DateTimeField(verbose_name='start date')),
('end_date', models.DateTimeField(verbose_name='end date')),
],
),
migrations.CreateModel(
name='Responsability',
name='List',
fields=[
('id', models.AutoField(serialize=False, primary_key=True, auto_created=True, verbose_name='ID')),
('title', models.CharField(max_length=255, verbose_name='title')),
],
),
migrations.CreateModel(
name='Role',
fields=[
('id', models.AutoField(serialize=False, primary_key=True, auto_created=True, verbose_name='ID')),
('title', models.CharField(max_length=255, verbose_name='title')),
('description', models.TextField(blank=True, null=True, verbose_name='description')),
('election', models.ForeignKey(to='election.Election', verbose_name='election', related_name='responsability')),
('election', models.ForeignKey(related_name='role', to='election.Election', verbose_name='election')),
],
),
migrations.CreateModel(
name='Vote',
fields=[
('id', models.AutoField(serialize=False, primary_key=True, auto_created=True, verbose_name='ID')),
('candidate', models.ManyToManyField(to='election.Candidate', related_name='vote', verbose_name='candidate')),
('election', models.ForeignKey(to='election.Election', verbose_name='election', related_name='vote')),
('user', models.ForeignKey(to=settings.AUTH_USER_MODEL, verbose_name='user', related_name='vote')),
('candidature', models.ManyToManyField(related_name='vote', to='election.Candidature', verbose_name='candidature')),
('role', models.ForeignKey(related_name='vote', to='election.Role', verbose_name='role')),
],
),
migrations.AddField(
model_name='candidate',
name='responsability',
field=models.ForeignKey(to='election.Responsability', verbose_name='responsability', related_name='candidate'),
model_name='candidature',
name='role',
field=models.ForeignKey(related_name='candidature', to='election.Role', verbose_name='role'),
),
migrations.AddField(
model_name='candidate',
model_name='candidature',
name='user',
field=models.ForeignKey(blank=True, to=settings.AUTH_USER_MODEL, verbose_name='user', related_name='candidate'),
field=models.ForeignKey(blank=True, related_name='candidate', to=settings.AUTH_USER_MODEL, verbose_name='user'),
),
]

4
election/models.py
View File

@ -5,8 +5,6 @@ from django.conf import settings
from datetime import timedelta
from core.models import User
from subscription.models import Subscriber
from subscription.views import get_subscriber
class Election(models.Model):
@ -66,7 +64,7 @@ class List(models.Model):
"""
To allow per list vote
"""
title = models.CharField(_('title'))
title = models.CharField(_('title'), max_length=255)
class Vote(models.Model):

2
election/views.py
View File

@ -6,7 +6,7 @@ from django.utils.translation import ugettext_lazy as _
from django.conf import settings
from core.views import CanViewMixin, CanEditMixin, CanEditPropMixin, CanCreateMixin
from election.models import Election, Responsability, Candidate
from election.models import Election, Role, Candidature
# Display elections