Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
addings models
  • Loading branch information
mvogl committed Jul 11, 2017
1 parent 42f9aae commit 9693999
Show file tree
Hide file tree
Showing 9 changed files with 478 additions and 17 deletions.
1 change: 1 addition & 0 deletions .dockerignore
Expand Up @@ -4,3 +4,4 @@
.gitignore
.gitlab-ci.yml
myvenv
eoa-venv
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -2,6 +2,7 @@
*~
__pychache__
myvenv
eoa-venv
db.sqlite3
/static
.DS_Store
216 changes: 216 additions & 0 deletions eoa/migrations/0003_auto_20170711_1243.py
@@ -0,0 +1,216 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.3 on 2017-07-11 10:43
from __future__ import unicode_literals

from django.db import migrations, models
import django.db.models.deletion
import eoa.models


class Migration(migrations.Migration):

dependencies = [
('eoa', '0002_auto_20170705_1329'),
]

operations = [
migrations.CreateModel(
name='Chapter',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('title', models.CharField(blank=True, max_length=200)),
('order', models.PositiveIntegerField()),
('number', models.CharField(blank=True, max_length=20)),
('language', models.CharField(choices=[('de', 'German'), ('en', 'English'), ('it', 'Italian')], default='de', max_length=2)),
('doi', models.CharField(blank=True, max_length=200)),
('citation', models.CharField(blank=True, max_length=200)),
('pdf', models.FileField(blank=True, upload_to=eoa.models.filepath)),
],
options={
'ordering': ('order',),
'abstract': False,
},
),
migrations.CreateModel(
name='Part',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('title', models.CharField(blank=True, max_length=200)),
('order', models.PositiveIntegerField()),
('number', models.CharField(blank=True, max_length=20)),
('language', models.CharField(choices=[('de', 'German'), ('en', 'English'), ('it', 'Italian')], default='de', max_length=2)),
('doi', models.CharField(blank=True, max_length=200)),
('citation', models.CharField(blank=True, max_length=200)),
('pdf', models.FileField(blank=True, upload_to=eoa.models.filepath)),
],
options={
'ordering': ('order',),
'abstract': False,
},
),
migrations.CreateModel(
name='Section',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('title', models.CharField(blank=True, max_length=200)),
('order', models.PositiveIntegerField()),
('number', models.CharField(blank=True, max_length=20)),
('language', models.CharField(choices=[('de', 'German'), ('en', 'English'), ('it', 'Italian')], default='de', max_length=2)),
('doi', models.CharField(blank=True, max_length=200)),
('citation', models.CharField(blank=True, max_length=200)),
('pdf', models.FileField(blank=True, upload_to=eoa.models.filepath)),
],
options={
'ordering': ('order',),
'abstract': False,
},
),
migrations.CreateModel(
name='Subsection',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('title', models.CharField(blank=True, max_length=200)),
('order', models.PositiveIntegerField()),
('number', models.CharField(blank=True, max_length=20)),
('language', models.CharField(choices=[('de', 'German'), ('en', 'English'), ('it', 'Italian')], default='de', max_length=2)),
('doi', models.CharField(blank=True, max_length=200)),
('citation', models.CharField(blank=True, max_length=200)),
('pdf', models.FileField(blank=True, upload_to=eoa.models.filepath)),
],
options={
'ordering': ('order',),
'abstract': False,
},
),
migrations.AlterModelOptions(
name='author',
options={'ordering': ('lastname',)},
),
migrations.AlterModelOptions(
name='publication',
options={'ordering': ('title',)},
),
migrations.RemoveField(
model_name='author',
name='middlenames',
),
migrations.RemoveField(
model_name='publication',
name='author',
),
migrations.AddField(
model_name='author',
name='foto',
field=models.ImageField(blank=True, upload_to='authors'),
),
migrations.AddField(
model_name='author',
name='publications',
field=models.ManyToManyField(to='eoa.Publication'),
),
migrations.AddField(
model_name='publication',
name='featured',
field=models.BooleanField(default=False),
),
migrations.AddField(
model_name='publication',
name='language',
field=models.CharField(choices=[('de', 'German'), ('en', 'English'), ('it', 'Italian')], default='de', max_length=2),
),
migrations.AddField(
model_name='publication',
name='publication_id',
field=models.IntegerField(default=None),
),
migrations.AddField(
model_name='publication',
name='published',
field=models.BooleanField(default=False),
),
migrations.AddField(
model_name='publication',
name='series',
field=models.CharField(choices=[('sources', 'Sources'), ('studies', 'Studies'), ('essays', 'Essays'), ('proceedings', 'Proceedings'), ('textbooks', 'Textbooks')], default='sources', max_length=20),
),
migrations.AddField(
model_name='publication',
name='subtitle',
field=models.CharField(default=None, max_length=200),
),
migrations.AlterField(
model_name='publication',
name='pages',
field=models.PositiveIntegerField(),
),
migrations.AddField(
model_name='subsection',
name='authors',
field=models.ManyToManyField(blank=True, default=None, to='eoa.Author'),
),
migrations.AddField(
model_name='subsection',
name='chapter',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='eoa.Chapter'),
),
migrations.AddField(
model_name='subsection',
name='part',
field=models.ForeignKey(blank=True, on_delete=django.db.models.deletion.CASCADE, to='eoa.Part'),
),
migrations.AddField(
model_name='subsection',
name='publication',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='eoa.Publication'),
),
migrations.AddField(
model_name='subsection',
name='section',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='eoa.Section'),
),
migrations.AddField(
model_name='section',
name='authors',
field=models.ManyToManyField(blank=True, default=None, to='eoa.Author'),
),
migrations.AddField(
model_name='section',
name='chapter',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='eoa.Chapter'),
),
migrations.AddField(
model_name='section',
name='part',
field=models.ForeignKey(blank=True, on_delete=django.db.models.deletion.CASCADE, to='eoa.Part'),
),
migrations.AddField(
model_name='section',
name='publication',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='eoa.Publication'),
),
migrations.AddField(
model_name='part',
name='authors',
field=models.ManyToManyField(blank=True, default=None, to='eoa.Author'),
),
migrations.AddField(
model_name='part',
name='publication',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='eoa.Publication'),
),
migrations.AddField(
model_name='chapter',
name='authors',
field=models.ManyToManyField(blank=True, default=None, to='eoa.Author'),
),
migrations.AddField(
model_name='chapter',
name='part',
field=models.ForeignKey(blank=True, on_delete=django.db.models.deletion.CASCADE, to='eoa.Part'),
),
migrations.AddField(
model_name='chapter',
name='publication',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='eoa.Publication'),
),
]
30 changes: 30 additions & 0 deletions eoa/migrations/0004_auto_20170711_1251.py
@@ -0,0 +1,30 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.3 on 2017-07-11 10:51
from __future__ import unicode_literals

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('eoa', '0003_auto_20170711_1243'),
]

operations = [
migrations.AddField(
model_name='author',
name='description',
field=models.CharField(blank=True, default=None, max_length=200, null=True),
),
migrations.AddField(
model_name='author',
name='homepage',
field=models.CharField(blank=True, default=None, max_length=200, null=True),
),
migrations.AddField(
model_name='author',
name='middlenames',
field=models.CharField(blank=True, default=None, max_length=200, null=True),
),
]
21 changes: 21 additions & 0 deletions eoa/migrations/0005_auto_20170711_1306.py
@@ -0,0 +1,21 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.3 on 2017-07-11 11:06
from __future__ import unicode_literals

from django.db import migrations, models
import eoa.models


class Migration(migrations.Migration):

dependencies = [
('eoa', '0004_auto_20170711_1251'),
]

operations = [
migrations.AlterField(
model_name='author',
name='foto',
field=models.ImageField(blank=True, upload_to=eoa.models.filepath),
),
]
41 changes: 41 additions & 0 deletions eoa/migrations/0006_paragraph.py
@@ -0,0 +1,41 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.3 on 2017-07-11 13:03
from __future__ import unicode_literals

from django.db import migrations, models
import django.db.models.deletion
import eoa.models


class Migration(migrations.Migration):

dependencies = [
('eoa', '0005_auto_20170711_1306'),
]

operations = [
migrations.CreateModel(
name='Paragraph',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('title', models.CharField(blank=True, max_length=200)),
('order', models.PositiveIntegerField()),
('number', models.CharField(blank=True, max_length=20)),
('language', models.CharField(choices=[('de', 'German'), ('en', 'English'), ('it', 'Italian')], default='de', max_length=2)),
('doi', models.CharField(blank=True, max_length=200)),
('citation', models.CharField(blank=True, max_length=200)),
('pdf', models.FileField(blank=True, upload_to=eoa.models.filepath)),
('text', models.TextField()),
('authors', models.ManyToManyField(blank=True, default=None, to='eoa.Author')),
('chapter', models.ForeignKey(blank=True, on_delete=django.db.models.deletion.CASCADE, to='eoa.Chapter')),
('part', models.ForeignKey(blank=True, on_delete=django.db.models.deletion.CASCADE, to='eoa.Part')),
('publication', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='eoa.Publication')),
('section', models.ForeignKey(blank=True, on_delete=django.db.models.deletion.CASCADE, to='eoa.Section')),
('subsection', models.ForeignKey(blank=True, on_delete=django.db.models.deletion.CASCADE, to='eoa.Subsection')),
],
options={
'ordering': ('order',),
'abstract': False,
},
),
]

0 comments on commit 9693999

Please sign in to comment.