diff --git a/.idea/misc.xml b/.idea/misc.xml index aa4cee9594287760f8847f3624bd402c67a31e4e..ba7b70587080ac2d496eba641ea6d25fda1ac287 100755 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> - <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.6 (school-apps)" project-jdk-type="Python SDK" /> + <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7 (SchoolApps)" project-jdk-type="Python SDK" /> <component name="PyCharmProfessionalAdvertiser"> <option name="shown" value="true" /> </component> diff --git a/.idea/school-apps.iml b/.idea/school-apps.iml index e490d464724df20945b1bac315d0025acdc9ad21..92aaf5da99a787684be08744cf91a1b60503b225 100755 --- a/.idea/school-apps.iml +++ b/.idea/school-apps.iml @@ -17,7 +17,7 @@ <sourceFolder url="file://$MODULE_DIR$/schoolapps" isTestSource="false" /> <excludeFolder url="file://$MODULE_DIR$/venv" /> </content> - <orderEntry type="jdk" jdkName="Python 3.6 (school-apps)" jdkType="Python SDK" /> + <orderEntry type="jdk" jdkName="Python 3.7 (SchoolApps)" jdkType="Python SDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="jquery-3.2.1" level="application" /> <orderEntry type="library" name="react.production" level="application" /> diff --git a/schoolapps/aub/migrations/0012_auto_20190425_2022.py b/schoolapps/aub/migrations/0012_auto_20190425_2022.py deleted file mode 100644 index 16abd1f06a714f6bbafa049a642a8a991ba2e0d9..0000000000000000000000000000000000000000 --- a/schoolapps/aub/migrations/0012_auto_20190425_2022.py +++ /dev/null @@ -1,63 +0,0 @@ -# Generated by Django 2.2 on 2019-04-25 18:22 - -import datetime -from django.conf import settings -from django.db import migrations, models -import django.utils.timezone - - -class Migration(migrations.Migration): - dependencies = [ - #('aub', '0011_merge_20190318_2004'), - ] - - operations = [ - migrations.AlterModelOptions( - name='aub', - options={'permissions': ( - ('apply_for_aub', 'Apply for a AUB'), ('cancel_aub', 'Cancel a AUB'), ('allow1_aub', 'First permission'), - ('allow2_aub', 'Second permission'), ('check1_aub', 'Check a AUB'), ('check2_aub', 'Check a AUB'), - ('view_archive', 'View AUB archive')), 'verbose_name': 'AUB', 'verbose_name_plural': 'AUBs'}, - ), - migrations.AlterField( - model_name='aub', - name='created_at', - field=models.DateTimeField(default=django.utils.timezone.now, verbose_name='Erstellungszeitpunkt'), - ), - 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, verbose_name='Erstellt von'), - ), - migrations.AlterField( - model_name='aub', - name='from_date', - field=models.DateField(default=datetime.date.today, verbose_name='Startdatum'), - ), - migrations.AlterField( - model_name='aub', - name='from_time', - field=models.TimeField(default=django.utils.timezone.now, verbose_name='Startzeit'), - ), - migrations.AlterField( - model_name='aub', - name='status', - field=models.IntegerField( - choices=[(0, 'In Bearbeitung 1'), (1, 'In Bearbeitung 2'), (2, 'Genehmigt'), (3, 'Abgelehnt')], - default=0, verbose_name='Status'), - ), - migrations.AlterField( - model_name='aub', - name='to_date', - field=models.DateField(default=datetime.date.today, verbose_name='Enddatum'), - ), - migrations.AlterField( - model_name='aub', - name='to_time', - field=models.TimeField(default=django.utils.timezone.now, verbose_name='Endzeit'), - ), - migrations.DeleteModel( - name='Status', - ), - ]