diff --git a/README.md b/README.md
index 65f447807ccf9b1f771f5235bbf85f08599fb0ea..e396009803b52882d9dc4258f71b47b1de552e7c 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,18 @@
# school-apps
+## Apps
+### In Betrieb
+keine
+### Im Testbetrieb
+keine
+### In der Entwicklung
+- **Dashboard**: Verwaltet Aktivitäten und Benachrichtigungen (welche auch per E-Mail versendet werden, dient also auch zum E-Mail-Versand)
+- **AUB**: Antrag auf Unterrichtsbefreiung
+### Ideen (bestätigt)
+- Stunden-, Vertretungsplan
+- REBUS
+### Ideen (unbestätigt)
+- Elternsprechtag
+- Bundesjungendspiele
## Installation
### Grundsystem
```
diff --git a/schoolapps/aub/migrations/0001_initial.py b/schoolapps/aub/migrations/0001_initial.py
deleted file mode 100644
index a4771f97e4a5aab6c11836b27fd3c6728f8650a5..0000000000000000000000000000000000000000
--- a/schoolapps/aub/migrations/0001_initial.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# Generated by Django 2.0 on 2017-12-21 10:51
-
-from django.conf import settings
-from django.db import migrations, models
-import django.utils.timezone
-
-
-class Migration(migrations.Migration):
-
- initial = True
-
- dependencies = [
- migrations.swappable_dependency(settings.AUTH_USER_MODEL),
- ]
-
- operations = [
- migrations.CreateModel(
- name='Aub',
- fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('from_date', models.DateField(default=django.utils.timezone.now)),
- ('to_date', models.DateField(default=django.utils.timezone.now)),
- ('x', models.TextField(blank=True, default='')),
- ('from_lesson',
- models.IntegerField(choices=[(1, 1), (2, 2), (3, 3), (4, 4), (5, 5), (6, 6), (7, 7), (8, 8), (9, 9)],
- default=1)),
- ('to_lesson',
- models.IntegerField(choices=[(1, 1), (2, 2), (3, 3), (4, 4), (5, 5), (6, 6), (7, 7), (8, 8), (9, 9)],
- default=1)),
- ('description', models.TextField()),
- ('created_at', models.DateTimeField(default=django.utils.timezone.now)),
- ('created_by', models.ForeignKey(default=None, on_delete=models.SET(None), related_name='aubs',
- to=settings.AUTH_USER_MODEL)),
- ],
- ),
- ]
diff --git a/schoolapps/aub/migrations/0002_remove_aub_x.py b/schoolapps/aub/migrations/0002_remove_aub_x.py
deleted file mode 100644
index 72abf457160f8556132e9cab2848b86c721142bd..0000000000000000000000000000000000000000
--- a/schoolapps/aub/migrations/0002_remove_aub_x.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# Generated by Django 2.0 on 2017-12-21 11:01
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
- dependencies = [
- ('aub', '0001_initial'),
- ]
-
- operations = [
- migrations.RemoveField(
- model_name='aub',
- name='x',
- ),
- ]
diff --git a/schoolapps/aub/migrations/0003_auto_20171221_1206.py b/schoolapps/aub/migrations/0003_auto_20171221_1206.py
deleted file mode 100644
index 19a69d44d2f2befff3287037213266dcfe04bd4d..0000000000000000000000000000000000000000
--- a/schoolapps/aub/migrations/0003_auto_20171221_1206.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# Generated by Django 2.0 on 2017-12-21 11:06
-
-from django.db import migrations, models
-import django.utils.timezone
-
-
-class Migration(migrations.Migration):
- dependencies = [
- ('aub', '0002_remove_aub_x'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='aub',
- name='from_time',
- field=models.TimeField(default=django.utils.timezone.now),
- ),
- migrations.AddField(
- model_name='aub',
- name='to_time',
- field=models.TimeField(default=django.utils.timezone.now),
- ),
- migrations.AlterField(
- model_name='aub',
- name='from_lesson',
- field=models.IntegerField(blank=True,
- choices=[(1, 1), (2, 2), (3, 3), (4, 4), (5, 5), (6, 6), (7, 7), (8, 8), (9, 9)],
- default=1),
- ),
- migrations.AlterField(
- model_name='aub',
- name='to_lesson',
- field=models.IntegerField(blank=True,
- choices=[(1, 1), (2, 2), (3, 3), (4, 4), (5, 5), (6, 6), (7, 7), (8, 8), (9, 9)],
- default=1),
- ),
- ]
diff --git a/schoolapps/aub/migrations/0004_auto_20171222_1722.py b/schoolapps/aub/migrations/0004_auto_20171222_1722.py
deleted file mode 100644
index 0caa2952f5adb80ff48f13d5675b260320ece641..0000000000000000000000000000000000000000
--- a/schoolapps/aub/migrations/0004_auto_20171222_1722.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# Generated by Django 2.0 on 2017-12-22 16:22
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
- dependencies = [
- ('aub', '0003_auto_20171221_1206'),
- ]
-
- operations = [
- migrations.AlterModelOptions(
- name='aub',
- options={'permissions': (('apply_for_aub', 'Apply for a AUB'), ('allow_request', 'Allow a request'),
- ('check_request', 'Check a request'))},
- ),
- ]
diff --git a/schoolapps/aub/migrations/0005_auto_20171222_1723.py b/schoolapps/aub/migrations/0005_auto_20171222_1723.py
deleted file mode 100644
index 665af0a6d1daf7b52ae86a06a4b6b5b8e51632ca..0000000000000000000000000000000000000000
--- a/schoolapps/aub/migrations/0005_auto_20171222_1723.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# Generated by Django 2.0 on 2017-12-22 16:23
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
- dependencies = [
- ('aub', '0004_auto_20171222_1722'),
- ]
-
- operations = [
- migrations.AlterModelOptions(
- name='aub',
- options={'permissions': (
- ('apply_for_aub', 'Apply for a AUB'), ('allow_aub', 'Allow a AUB'), ('check_aub', 'Check a AUB'))},
- ),
- ]
diff --git a/schoolapps/aub/migrations/0006_auto_20171222_1736.py b/schoolapps/aub/migrations/0006_auto_20171222_1736.py
deleted file mode 100644
index d8ca56b1332049f9cf89cbc8c5e813089cce1332..0000000000000000000000000000000000000000
--- a/schoolapps/aub/migrations/0006_auto_20171222_1736.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Generated by Django 2.0 on 2017-12-22 16:36
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
- dependencies = [
- ('aub', '0005_auto_20171222_1723'),
- ]
-
- operations = [
- migrations.RemoveField(
- model_name='aub',
- name='from_lesson',
- ),
- migrations.RemoveField(
- model_name='aub',
- name='to_lesson',
- ),
- ]
diff --git a/schoolapps/aub/migrations/0007_auto_20171222_1738.py b/schoolapps/aub/migrations/0007_auto_20171222_1738.py
deleted file mode 100644
index 3d59c1be9021f1468206a5739cbde1f5f37b0f97..0000000000000000000000000000000000000000
--- a/schoolapps/aub/migrations/0007_auto_20171222_1738.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# Generated by Django 2.0 on 2017-12-22 16:38
-
-from django.db import migrations, models
-import django.utils.timezone
-
-
-class Migration(migrations.Migration):
- dependencies = [
- ('aub', '0006_auto_20171222_1736'),
- ]
-
- operations = [
- migrations.RemoveField(
- model_name='aub',
- name='from_date',
- ),
- migrations.RemoveField(
- model_name='aub',
- name='from_time',
- ),
- migrations.RemoveField(
- model_name='aub',
- name='to_date',
- ),
- migrations.RemoveField(
- model_name='aub',
- name='to_time',
- ),
- migrations.AddField(
- model_name='aub',
- name='from_dt',
- field=models.DateTimeField(default=django.utils.timezone.now),
- ),
- migrations.AddField(
- model_name='aub',
- name='to_dt',
- field=models.DateTimeField(default=django.utils.timezone.now),
- ),
- ]
diff --git a/schoolapps/aub/migrations/0008_status.py b/schoolapps/aub/migrations/0008_status.py
deleted file mode 100644
index 048c5a42a0471568ad9f07b1ad752ed4b93d2fdc..0000000000000000000000000000000000000000
--- a/schoolapps/aub/migrations/0008_status.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Generated by Django 2.0 on 2017-12-29 13:52
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
- dependencies = [
- ('aub', '0007_auto_20171222_1738'),
- ]
-
- operations = [
- migrations.CreateModel(
- name='Status',
- fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('name', models.CharField(max_length=100)),
- ('style_classes', models.CharField(max_length=200)),
- ],
- ),
- ]
diff --git a/schoolapps/aub/migrations/0009_aub_status.py b/schoolapps/aub/migrations/0009_aub_status.py
deleted file mode 100644
index bfe04a1dbef3bc1801a7af6891ca6aa8931b48e7..0000000000000000000000000000000000000000
--- a/schoolapps/aub/migrations/0009_aub_status.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# Generated by Django 2.0 on 2018-01-01 15:32
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
- dependencies = [
- ('aub', '0008_status'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='aub',
- name='status',
- field=models.ForeignKey(default=2, on_delete=models.SET(2), related_name='aubs', to='aub.Status'),
- ),
- ]
diff --git a/schoolapps/aub/migrations/0010_auto_20180101_1634.py b/schoolapps/aub/migrations/0010_auto_20180101_1634.py
deleted file mode 100644
index c6b991632afcede69e323cb1677dbc5b690ef017..0000000000000000000000000000000000000000
--- a/schoolapps/aub/migrations/0010_auto_20180101_1634.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Generated by Django 2.0 on 2018-01-01 15:34
-
-from django.conf import settings
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
- dependencies = [
- ('aub', '0009_aub_status'),
- ]
-
- operations = [
- migrations.AlterField(
- model_name='aub',
- name='created_by',
- field=models.ForeignKey(default=3, on_delete=models.SET(3), related_name='aubs',
- to=settings.AUTH_USER_MODEL),
- ),
- ]
diff --git a/schoolapps/aub/migrations/0011_auto_20180101_1722.py b/schoolapps/aub/migrations/0011_auto_20180101_1722.py
deleted file mode 100644
index 17113a41a492b143bce453f6f286548619a140b9..0000000000000000000000000000000000000000
--- a/schoolapps/aub/migrations/0011_auto_20180101_1722.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# Generated by Django 2.0 on 2018-01-01 16:22
-
-from django.db import migrations, models
-import django.utils.timezone
-
-
-class Migration(migrations.Migration):
- dependencies = [
- ('aub', '0010_auto_20180101_1634'),
- ]
-
- operations = [
- migrations.RemoveField(
- model_name='aub',
- name='from_dt',
- ),
- migrations.RemoveField(
- model_name='aub',
- name='to_dt',
- ),
- migrations.AddField(
- model_name='aub',
- name='from_date',
- field=models.DateField(default=django.utils.timezone.now),
- ),
- migrations.AddField(
- model_name='aub',
- name='from_time',
- field=models.TimeField(default=django.utils.timezone.now),
- ),
- migrations.AddField(
- model_name='aub',
- name='to_date',
- field=models.DateField(default=django.utils.timezone.now),
- ),
- migrations.AddField(
- model_name='aub',
- name='to_time',
- field=models.TimeField(default=django.utils.timezone.now),
- ),
- ]
diff --git a/schoolapps/aub/migrations/0012_auto_20180101_1748.py b/schoolapps/aub/migrations/0012_auto_20180101_1748.py
deleted file mode 100644
index f5d87fb0418d0afb4a392fe81ab384f5551390e1..0000000000000000000000000000000000000000
--- a/schoolapps/aub/migrations/0012_auto_20180101_1748.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# Generated by Django 2.0 on 2018-01-01 16:48
-
-from django.db import migrations, models
-import django.utils.timezone
-
-
-class Migration(migrations.Migration):
- dependencies = [
- ('aub', '0011_auto_20180101_1722'),
- ]
-
- operations = [
- migrations.RemoveField(
- model_name='aub',
- name='from_date',
- ),
- migrations.RemoveField(
- model_name='aub',
- name='from_time',
- ),
- migrations.RemoveField(
- model_name='aub',
- name='to_date',
- ),
- migrations.RemoveField(
- model_name='aub',
- name='to_time',
- ),
- migrations.AddField(
- model_name='aub',
- name='from_dt',
- field=models.DateTimeField(default=django.utils.timezone.now),
- ),
- migrations.AddField(
- model_name='aub',
- name='to_dt',
- field=models.DateTimeField(default=django.utils.timezone.now),
- ),
- ]
diff --git a/schoolapps/aub/migrations/__init__.py b/schoolapps/aub/migrations/__init__.py
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/schoolapps/dashboard/migrations/0001_initial.py b/schoolapps/dashboard/migrations/0001_initial.py
deleted file mode 100644
index 2b10c48c73f9b9f135de9069b3dc96d0b4973b12..0000000000000000000000000000000000000000
--- a/schoolapps/dashboard/migrations/0001_initial.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Generated by Django 2.0 on 2017-12-22 11:22
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
- initial = True
-
- dependencies = [
- ]
-
- operations = [
- migrations.CreateModel(
- name='Activity',
- fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('title', models.CharField(max_length=200)),
- ('description', models.TextField(max_length=500)),
- ('app', models.CharField(max_length=100)),
- ],
- ),
- ]
diff --git a/schoolapps/dashboard/migrations/0002_activity_user.py b/schoolapps/dashboard/migrations/0002_activity_user.py
deleted file mode 100644
index 18f9a636db9a88e85a959c28fda5dfb9cd2f5727..0000000000000000000000000000000000000000
--- a/schoolapps/dashboard/migrations/0002_activity_user.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Generated by Django 2.0 on 2017-12-22 11:33
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
- dependencies = [
- migrations.swappable_dependency(settings.AUTH_USER_MODEL),
- ('dashboard', '0001_initial'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='activity',
- name='user',
- field=models.ForeignKey(default=None, on_delete=django.db.models.deletion.CASCADE,
- to=settings.AUTH_USER_MODEL),
- ),
- ]
diff --git a/schoolapps/dashboard/migrations/0003_activity_created_at.py b/schoolapps/dashboard/migrations/0003_activity_created_at.py
deleted file mode 100644
index c0ee7e6c90df5e3be13a7f09caf6cf21303b65f4..0000000000000000000000000000000000000000
--- a/schoolapps/dashboard/migrations/0003_activity_created_at.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.0 on 2017-12-22 11:36
-
-from django.db import migrations, models
-import django.utils.timezone
-
-
-class Migration(migrations.Migration):
- dependencies = [
- ('dashboard', '0002_activity_user'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='activity',
- name='created_at',
- field=models.DateTimeField(default=django.utils.timezone.now),
- ),
- ]
diff --git a/schoolapps/dashboard/migrations/0004_notification.py b/schoolapps/dashboard/migrations/0004_notification.py
deleted file mode 100644
index 97a6c3c80b9c3ab7ec11165c654a993c0fb625f1..0000000000000000000000000000000000000000
--- a/schoolapps/dashboard/migrations/0004_notification.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# Generated by Django 2.0 on 2017-12-22 14:07
-
-from django.conf import settings
-from django.db import migrations, models
-import django.utils.timezone
-
-
-class Migration(migrations.Migration):
- dependencies = [
- migrations.swappable_dependency(settings.AUTH_USER_MODEL),
- ('dashboard', '0003_activity_created_at'),
- ]
-
- operations = [
- migrations.CreateModel(
- name='Notification',
- fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('title', models.CharField(max_length=200)),
- ('description', models.TextField(max_length=500)),
- ('app', models.CharField(max_length=100)),
- ('created_at', models.DateTimeField(default=django.utils.timezone.now)),
- ('to', models.ManyToManyField(to=settings.AUTH_USER_MODEL)),
- ],
- ),
- ]
diff --git a/schoolapps/dashboard/migrations/0005_auto_20171222_1722.py b/schoolapps/dashboard/migrations/0005_auto_20171222_1722.py
deleted file mode 100644
index ff718c541022c1d8919f0293cbb2ad5f5c050b86..0000000000000000000000000000000000000000
--- a/schoolapps/dashboard/migrations/0005_auto_20171222_1722.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.0 on 2017-12-22 16:22
-
-from django.conf import settings
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
- dependencies = [
- ('dashboard', '0004_notification'),
- ]
-
- operations = [
- migrations.AlterField(
- model_name='notification',
- name='to',
- field=models.ManyToManyField(related_name='notifications', to=settings.AUTH_USER_MODEL),
- ),
- ]
diff --git a/schoolapps/dashboard/migrations/__init__.py b/schoolapps/dashboard/migrations/__init__.py
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/schoolapps/schoolapps/settings.py b/schoolapps/schoolapps/settings.py
index fe873a475578d0a505107f286ec41706f8e23b40..938e433eefdca28d05be16307543ea6c499f78e2 100644
--- a/schoolapps/schoolapps/settings.py
+++ b/schoolapps/schoolapps/settings.py
@@ -30,7 +30,7 @@ ALLOWED_HOSTS = []
INSTALLED_APPS = [
'dashboard.apps.DashboardConfig',
- 'aub.apps.AubConfig',
+# 'aub.apps.AubConfig',
'django.contrib.admin',
'django.contrib.auth',
'django.contrib.contenttypes',
diff --git a/schoolapps/schoolapps/urls.py b/schoolapps/schoolapps/urls.py
index 420419c99c46fa610cb675a84d824a19d4d6283c..9f0094a32e4e702956221525bea8ef1406b59b5e 100644
--- a/schoolapps/schoolapps/urls.py
+++ b/schoolapps/schoolapps/urls.py
@@ -33,7 +33,7 @@ urlpatterns = [
#######
# AUB #
#######
- path('aub/', include('aub.urls')),
+# path('aub/', include('aub.urls')),
#########
# Admin #