diff --git a/schoolapps/dashboard/migrations/0003_auto_20190410_1416.py b/schoolapps/dashboard/migrations/0003_auto_20190410_1416.py deleted file mode 100644 index 31a70937195197551809a7a36ad4ed4c0c9dd44e..0000000000000000000000000000000000000000 --- a/schoolapps/dashboard/migrations/0003_auto_20190410_1416.py +++ /dev/null @@ -1,27 +0,0 @@ -# Generated by Django 2.1.5 on 2019-04-10 12:16 - -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', '0002_auto_20190102_1724'), - ] - - 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), - ), - migrations.AddField( - model_name='notification', - name='user', - field=models.ForeignKey(default=None, on_delete=django.db.models.deletion.CASCADE, - related_name='notifications', to=settings.AUTH_USER_MODEL), - ), - ] diff --git a/schoolapps/timetable/views.py b/schoolapps/timetable/views.py index 92a82934a9d956c4d83c598eaf240ec0b343fdde..3aee8634e1eb2417294541a5499ac567dedbefdf 100755 --- a/schoolapps/timetable/views.py +++ b/schoolapps/timetable/views.py @@ -8,7 +8,7 @@ from django.shortcuts import render, redirect, get_object_or_404 from django.utils import timezone from material import Fieldset, Row -from schoolapps.settings import SHORT_WEEK_DAYS, LONG_WEEK_DAYS, WEEK_DAYS +from schoolapps.settings import SHORT_WEEK_DAYS, LONG_WEEK_DAYS from timetable.filters import HintFilter from timetable.forms import HintForm from timetable.hints import get_all_hints_by_date, get_all_hints_by_time_period, get_all_hints_by_class_and_time_period