Merge branch 'Aufinal/bda_revente' of https://git.eleves.ens.fr/cof-geek/gestioCOF into Aufinal/bda_revente

This commit is contained in:
Ludovic Stephan 2016-09-27 17:00:30 +02:00
commit fcad789e77

View file

@ -15,17 +15,15 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='SpectacleRevente',
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False,
auto_created=True, primary_key=True)),
('id', models.AutoField(serialize=False, primary_key=True,
auto_created=True, verbose_name='ID')),
('date', models.DateTimeField(
default=django.utils.timezone.now,
verbose_name='Date de mise en vente')),
verbose_name='Date de mise en vente',
default=django.utils.timezone.now)),
('notif_sent', models.BooleanField(
default=False, verbose_name='Notification envoy\xe9e')),
verbose_name='Notification envoyée', default=False)),
('tirage_done', models.BooleanField(
default=False, verbose_name='Tirage effectu\xe9')),
('attribution', models.OneToOneField(related_name='revente',
to='bda.Attribution')),
verbose_name='Tirage effectué', default=False)),
],
options={
'verbose_name': 'Revente',
@ -34,26 +32,35 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='participant',
name='choicesrevente',
field=models.ManyToManyField(related_name='revente',
to='bda.Spectacle', blank=True),
field=models.ManyToManyField(to='bda.Spectacle',
related_name='subscribed',
blank=True),
),
migrations.AddField(
model_name='spectaclerevente',
name='interested',
field=models.ManyToManyField(related_name='wanted',
to='bda.Participant', blank=True),
name='answered_mail',
field=models.ManyToManyField(to='bda.Participant',
related_name='wanted',
blank=True),
),
migrations.AddField(
model_name='spectaclerevente',
name='attribution',
field=models.OneToOneField(to='bda.Attribution',
related_name='revente'),
),
migrations.AddField(
model_name='spectaclerevente',
name='seller',
field=models.ForeignKey(related_name='original_shows',
field=models.ForeignKey(to='bda.Participant',
verbose_name='Vendeur',
to='bda.Participant'),
related_name='original_shows'),
),
migrations.AddField(
model_name='spectaclerevente',
name='soldTo',
field=models.ForeignKey(verbose_name='Vendue \xe0', blank=True,
to='bda.Participant', null=True),
field=models.ForeignKey(to='bda.Participant',
verbose_name='Vendue à', null=True,
blank=True),
),
]