DGNum/ernestophone.ens.fr
6
0
Fork 0
Code Issues 7 Pull requests 3 Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into admin_permissions

Browse source
This commit is contained in:
Martin Pépin 2017-09-13 22:02:48 +02:00
commit 2d714cc130
17 changed files with 81 additions and 302 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
calendrier/migrations/0001_initial.py
View file

@ -1,57 +1,43 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('gestion', '0003_auto_20151014_1904'),
('gestion', '0001_initial'),
]
operations = [
migrations.CreateModel(
name='Event',
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False,
primary_key=True, auto_created=True)),
('id', models.AutoField(auto_created=True, primary_key=True, verbose_name='ID', serialize=False)),
('nom', models.CharField(max_length=100)),
('nomcourt', models.CharField(verbose_name='Nom court',
max_length=9)),
('nomcourt', models.CharField(max_length=9, verbose_name='Nom court')),
('date', models.DateField()),
('debut', models.TimeField()),
('fin', models.TimeField(blank=True, null=True)),
('slug', models.CharField(max_length=7, editable=False,
unique=True)),
('slug', models.CharField(max_length=7, editable=False, unique=True)),
('lieu', models.CharField(max_length=200)),
('description', models.TextField(blank=True)),
('calendrier', models.BooleanField(
verbose_name='Afficher dans le calendrier pour tous',
default=False)),
('desc_users', models.TextField(blank=True, verbose_name='Infos (visible seulement des fanfaron-ne-s)', null=True)),
('calendrier', models.BooleanField(verbose_name='Afficher dans le calendrier pour tous', default=False)),
],
options={
'verbose_name': 'Événement',
},
bases=(models.Model,),
),
migrations.CreateModel(
name='Participants',
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False,
primary_key=True, auto_created=True)),
('reponse', models.CharField(verbose_name='Réponse',
choices=[
('oui', 'Oui'),
('non', 'Non'),
('pe', 'Peut-être')],
default='non', max_length=20)),
('id', models.AutoField(auto_created=True, primary_key=True, verbose_name='ID', serialize=False)),
('reponse', models.CharField(max_length=20, choices=[('oui', 'Oui'), ('non', 'Non'), ('pe', 'Peut-être')], default='non', verbose_name='Réponse')),
('details', models.CharField(blank=True, max_length=50)),
('event', models.ForeignKey(to='calendrier.Event')),
('participant', models.ForeignKey(to='gestion.ErnestoUser')),
],
options={
},
bases=(models.Model,),
),
]

23
calendrier/migrations/0002_event_desc_users.py
View file

@ -1,23 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('calendrier', '0001_initial'),
]
operations = [
migrations.AddField(
model_name='event',
name='desc_users',
field=models.TextField(
null=True,
verbose_name='Infos (visible seulement des fanfaron-ne-s)',
blank=True),
preserve_default=True,
),
]

28
gestion/migrations/0001_initial.py
View file

@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
from django.db import migrations, models
from django.conf import settings
@ -15,25 +15,19 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='ErnestoUser',
fields=[
('id', models.AutoField(auto_created=True, serialize=False,
primary_key=True, verbose_name='ID')),
('is_ernesto', models.BooleanField(
default=True,
verbose_name="Membre de l'Ernestophone")),
('is_chef', models.BooleanField(default=False,
verbose_name='Chef Fanfare')),
('phone', models.CharField(max_length=20,
verbose_name='Telephone',
blank=True)),
('instru', models.CharField(max_length=40,
verbose_name='Instrument joué',
blank=True)),
('user', models.OneToOneField(to=settings.AUTH_USER_MODEL)),
('id', models.AutoField(auto_created=True, primary_key=True, verbose_name='ID', serialize=False)),
('is_ernesto', models.BooleanField(verbose_name="Membre de l'Ernestophone", default=True)),
('is_chef', models.BooleanField(verbose_name='Chef Fanfare', default=False)),
('phone', models.CharField(blank=True, max_length=20, verbose_name='Téléphone')),
('instru', models.CharField(blank=True, max_length=40, verbose_name='Instrument joué')),
('slug', models.CharField(max_length=7, editable=False, unique=True)),
('doodlename', models.CharField(blank=True, max_length=30, verbose_name='Nom pour le doodle')),
('mails', models.BooleanField(verbose_name='Recevoir les mails', default=True)),
('user', models.OneToOneField(to=settings.AUTH_USER_MODEL, related_name='profile')),
],
options={
'verbose_name': 'Profil Ernestophoniste',
'verbose_name_plural': 'Profils Ernestophonistes',
'verbose_name_plural': 'Profil Ernestophoniste',
},
bases=(models.Model,),
),
]

27
gestion/migrations/0002_auto_20150413_1705.py
View file

@ -1,27 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
from django.conf import settings
class Migration(migrations.Migration):
dependencies = [
('gestion', '0001_initial'),
]
operations = [
migrations.AlterField(
model_name='ernestouser',
name='phone',
field=models.CharField(max_length=20, blank=True,
verbose_name='Téléphone'),
),
migrations.AlterField(
model_name='ernestouser',
name='user',
field=models.OneToOneField(to=settings.AUTH_USER_MODEL,
related_name='profile'),
),
]

33
gestion/migrations/0003_auto_20151014_1904.py
View file

@ -1,33 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('gestion', '0002_auto_20150413_1705'),
]
operations = [
migrations.AlterModelOptions(
name='ernestouser',
options={'verbose_name_plural': 'Profil Ernestophoniste',
'verbose_name': 'Profil Ernestophoniste'},
),
migrations.AddField(
model_name='ernestouser',
name='doodlename',
field=models.CharField(max_length=30, default='afafa', blank=True,
verbose_name='Nom pour le doodle'),
preserve_default=False,
),
migrations.AddField(
model_name='ernestouser',
name='slug',
field=models.CharField(max_length=7, default='fafafa',
editable=False, unique=True),
preserve_default=False,
),
]

21
gestion/migrations/0004_ernestouser_mails.py
View file

@ -1,21 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('gestion', '0003_auto_20151014_1904'),
]
operations = [
migrations.AddField(
model_name='ernestouser',
name='mails',
field=models.BooleanField(default=True,
verbose_name='Recevoir les mails'),
preserve_default=True,
),
]

6
pads/migrations/0001_initial.py
View file

@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
from django.db import migrations, models
class Migration(migrations.Migration):
@ -13,8 +13,7 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='Pad',
fields=[
('id', models.AutoField(verbose_name='ID', primary_key=True,
auto_created=True, serialize=False)),
('id', models.AutoField(auto_created=True, primary_key=True, verbose_name='ID', serialize=False)),
('nom', models.CharField(max_length=100)),
('url', models.URLField()),
('date', models.DateField(verbose_name='Créé le')),
@ -22,6 +21,5 @@ class Migration(migrations.Migration):
options={
'verbose_name': 'Pad',
},
bases=(models.Model,),
),
]

23
partitions/migrations/0001_initial.py
View file

@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
from django.db import migrations, models
class Migration(migrations.Migration):
@ -13,13 +13,24 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='Partition',
fields=[
('id', models.AutoField(auto_created=True, serialize=False,
primary_key=True, verbose_name='ID')),
('id', models.AutoField(auto_created=True, primary_key=True, verbose_name='ID', serialize=False)),
('nom', models.CharField(max_length=100)),
('part', models.FileField(upload_to='partitions/')),
],
options={
},
bases=(models.Model,),
),
migrations.CreateModel(
name='PartitionSet',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, verbose_name='ID', serialize=False)),
('nom', models.CharField(max_length=100)),
('auteur', models.CharField(max_length=100)),
('category', models.CharField(max_length=8, choices=[('active', 'Actif'), ('incoming', 'À venir'), ('old', 'Archive'), ('optional', 'Optionnel')], default='incoming', verbose_name='Types de partitions')),
('infos', models.TextField(blank=True, verbose_name='Infos utiles', null=True)),
],
),
migrations.AddField(
model_name='partition',
name='morceau',
field=models.ForeignKey(to='partitions.PartitionSet'),
),
]

28
partitions/migrations/0002_partitionset.py
View file

@ -1,28 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('partitions', '0001_initial'),
]
operations = [
migrations.CreateModel(
name='PartitionSet',
fields=[
('id', models.AutoField(primary_key=True, verbose_name='ID',
auto_created=True, serialize=False)),
('nom', models.CharField(max_length=100)),
('auteur', models.CharField(max_length=100)),
('pupitres', models.ManyToManyField(
to='partitions.Partition')),
],
options={
},
bases=(models.Model,),
),
]

24
partitions/migrations/0003_auto_20150316_1613.py
View file

@ -1,24 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('partitions', '0002_partitionset'),
]
operations = [
migrations.RemoveField(
model_name='partitionset',
name='pupitres',
),
migrations.AddField(
model_name='partition',
name='morceau',
field=models.ForeignKey(to='partitions.PartitionSet', default='1'),
preserve_default=False,
),
]

18
partitions/migrations/0004_remove_partition_morceau.py
View file

@ -1,18 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('partitions', '0003_auto_20150316_1613'),
]
operations = [
migrations.RemoveField(
model_name='partition',
name='morceau',
),
]

20
partitions/migrations/0005_partition_morceau.py
View file

@ -1,20 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('partitions', '0004_remove_partition_morceau'),
]
operations = [
migrations.AddField(
model_name='partition',
name='morceau',
field=models.ForeignKey(to='partitions.PartitionSet', default=1),
preserve_default=False,
),
]

33
partitions/migrations/0006_partitionset_category_and_infos.py
View file

@ -1,33 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('partitions', '0005_partition_morceau'),
]
operations = [
migrations.AddField(
model_name='partitionset',
name='category',
field=models.CharField(choices=[
('active', 'Actif'),
('incoming', 'À venir'),
('old', 'Archive')],
max_length=8,
verbose_name='Types de partitions',
default='incoming'),
preserve_default=True,
),
migrations.AddField(
model_name='partitionset',
name='infos',
field=models.TextField(null=True, blank=True,
verbose_name='Infos utiles'),
preserve_default=True,
),
]

24
partitions/migrations/0007_add_category_optional.py
View file

@ -1,24 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('partitions', '0006_partitionset_category_and_infos'),
]
operations = [
migrations.AlterField(
model_name='partitionset',
name='category',
field=models.CharField(
default='incoming',
verbose_name='Types de partitions',
choices=[('active', 'Actif'), ('incoming', 'À venir'),
('old', 'Archive'), ('optional', 'Optionnel')],
max_length=8),
),
]

38
propositions/migrations/0001_initial.py Normal file
View file

@ -0,0 +1,38 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('gestion', '0001_initial'),
]
operations = [
migrations.CreateModel(
name='Prop',
fields=[
('id', models.AutoField(primary_key=True, verbose_name='ID', auto_created=True, serialize=False)),
('nom', models.CharField(max_length=100)),
('artiste', models.CharField(max_length=100, blank=True)),
('lien', models.URLField(blank=True)),
('nboui', models.IntegerField(verbose_name='oui', default=0)),
('nbnon', models.IntegerField(verbose_name='non', default=0)),
('user', models.ForeignKey(verbose_name='Proposé par', to='gestion.ErnestoUser')),
],
options={
'verbose_name': 'Proposition',
},
),
migrations.CreateModel(
name='Reponses',
fields=[
('id', models.AutoField(primary_key=True, verbose_name='ID', auto_created=True, serialize=False)),
('reponse', models.CharField(verbose_name='Réponse', choices=[('oui', 'Oui'), ('non', 'Non')], max_length=20, blank=True)),
('part', models.ForeignKey(to='gestion.ErnestoUser')),
('prop', models.ForeignKey(to='propositions.Prop')),
],
),
]

0
propositions/migrations/__init__.py Normal file
View file

5
requirements.txt
View file

@ -1,2 +1,5 @@
Django==1.8.*
gunicorn==19.6
# Pour la prod
ipython
gunicorn