diff --git a/.isort.cfg b/.isort.cfg index 59e40fe752e18ce472c1e83eeddf5752e2f0ea16..4f814e3f99f72172593c3e3b1d8732db106c55ad 100644 --- a/.isort.cfg +++ b/.isort.cfg @@ -3,4 +3,4 @@ line_length = 88 multi_line_output = 3 include_trailing_comma = true -known_third_party = PyPDF2,arrow,bleach,bs4,captcha,celery,dateutil,django,environ,faker,fastjsonschema,icalevents,icalevnt,markdown,modelcluster,pirates,pytest,pytz,requests,sentry_sdk,taggit,wagtail,wagtailmetadata,weasyprint,yaml +known_third_party = PyPDF2,arrow,bleach,bs4,captcha,celery,dateutil,django,environ,faker,fastjsonschema,icalevents,markdown,modelcluster,pirates,pytest,pytz,requests,sentry_sdk,taggit,wagtail,wagtailmetadata,weasyprint,yaml diff --git a/calendar_utils/models.py b/calendar_utils/models.py index 2f11fa7439611706197d4ac24615b8e3f0ad44fd..9d4dc690df76ff4bb72b9c99a520b9bef5cb0da4 100644 --- a/calendar_utils/models.py +++ b/calendar_utils/models.py @@ -109,10 +109,7 @@ class PersonCalendarMixin(CalendarMixin): def get_parsed_calendar_data(self) -> list: calendar_format_events = [] - for event in ( - self.calendar.past_events - + self.calendar.future_events - ): + for event in self.calendar.past_events + self.calendar.future_events: parsed_event = { "allDay": event["all_day"], "start": event["start"].isoformat(), diff --git a/district/migrations/0110_remove_districtpersonpage_ical_calendar_url_and_more.py b/district/migrations/0110_remove_districtpersonpage_ical_calendar_url_and_more.py index aaba09b6dde33a50c5a8235ece2f89bb45e4f949..513f16346a78b1b89fa2797fe2ae0c9b41b08d10 100644 --- a/district/migrations/0110_remove_districtpersonpage_ical_calendar_url_and_more.py +++ b/district/migrations/0110_remove_districtpersonpage_ical_calendar_url_and_more.py @@ -1,29 +1,35 @@ # Generated by Django 4.1.8 on 2023-04-16 12:45 -from django.db import migrations, models import django.db.models.deletion +from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ - ('calendar_utils', '0004_auto_20220505_1228'), - ('district', '0109_districtpersonpage_ical_calendar_url'), + ("calendar_utils", "0004_auto_20220505_1228"), + ("district", "0109_districtpersonpage_ical_calendar_url"), ] operations = [ migrations.RemoveField( - model_name='districtpersonpage', - name='ical_calendar_url', + model_name="districtpersonpage", + name="ical_calendar_url", ), migrations.AddField( - model_name='districtpersonpage', - name='calendar', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='calendar_utils.calendar'), + model_name="districtpersonpage", + name="calendar", + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + to="calendar_utils.calendar", + ), ), migrations.AddField( - model_name='districtpersonpage', - name='calendar_url', - field=models.URLField(blank=True, null=True, verbose_name='URL kalendáře ve formátu iCal'), + model_name="districtpersonpage", + name="calendar_url", + field=models.URLField( + blank=True, null=True, verbose_name="URL kalendáře ve formátu iCal" + ), ), ] diff --git a/main/migrations/0056_remove_mainpersonpage_ical_calendar_url_and_more.py b/main/migrations/0056_remove_mainpersonpage_ical_calendar_url_and_more.py index 6c828cdaa95ce9859687ec1eac3ce992a175be48..e061823811b77fb8737146638c4ad03c02ea748f 100644 --- a/main/migrations/0056_remove_mainpersonpage_ical_calendar_url_and_more.py +++ b/main/migrations/0056_remove_mainpersonpage_ical_calendar_url_and_more.py @@ -1,29 +1,35 @@ # Generated by Django 4.1.8 on 2023-04-16 12:45 -from django.db import migrations, models import django.db.models.deletion +from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ - ('calendar_utils', '0004_auto_20220505_1228'), - ('main', '0055_remove_mainpersonpage_nextcloud_calendar_url_and_more'), + ("calendar_utils", "0004_auto_20220505_1228"), + ("main", "0055_remove_mainpersonpage_nextcloud_calendar_url_and_more"), ] operations = [ migrations.RemoveField( - model_name='mainpersonpage', - name='ical_calendar_url', + model_name="mainpersonpage", + name="ical_calendar_url", ), migrations.AddField( - model_name='mainpersonpage', - name='calendar', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='calendar_utils.calendar'), + model_name="mainpersonpage", + name="calendar", + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + to="calendar_utils.calendar", + ), ), migrations.AddField( - model_name='mainpersonpage', - name='calendar_url', - field=models.URLField(blank=True, null=True, verbose_name='URL kalendáře ve formátu iCal'), + model_name="mainpersonpage", + name="calendar_url", + field=models.URLField( + blank=True, null=True, verbose_name="URL kalendáře ve formátu iCal" + ), ), ]