diff --git a/poetry.lock b/poetry.lock
index c8cfdcd94..9a17db4b9 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -1651,17 +1651,6 @@ files = [
{file = "sorl_thumbnail-12.10.0-py3-none-any.whl", hash = "sha256:733eb2eee392d4a874f88fb3ed6f0572fa9c361b06e0411b83e435ba69c51f52"},
]
-[[package]]
-name = "sortedcontainers"
-version = "2.4.0"
-description = "Sorted Containers -- Sorted List, Sorted Dict, Sorted Set"
-optional = false
-python-versions = "*"
-files = [
- {file = "sortedcontainers-2.4.0-py2.py3-none-any.whl", hash = "sha256:a163dcaede0f1c021485e957a39245190e74249897e2ae4b2aa38595db237ee0"},
- {file = "sortedcontainers-2.4.0.tar.gz", hash = "sha256:25caa5a06cc30b6b83d11423433f65d1f9d76c4c6a0c90e3379eaa43b9bfdb88"},
-]
-
[[package]]
name = "sqlparse"
version = "0.5.0"
@@ -1861,4 +1850,4 @@ files = [
[metadata]
lock-version = "2.0"
python-versions = "~3.10.0"
-content-hash = "9cc3edd81f19cae7b6b3111fad25d06943108f5483fd9b81734d9f4bced8251a"
+content-hash = "da9e9f78cdefddcc430a60795a9be354aec21c9204b6e89834f4d98879740cf8"
diff --git a/pyproject.toml b/pyproject.toml
index 8ea6e44fa..94bea5ce8 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -29,7 +29,6 @@ psycopg2 = "2.9.9"
pytz = "2024.1"
requests = "2.31.0"
sorl-thumbnail = "12.10.0"
-sortedcontainers = "2.4.0"
tabulate = "0.9.0"
uwsgi = "2.0.24"
Pillow = "10.3.0"
diff --git a/src/core/context_processors.py b/src/core/context_processors.py
index 8c69cf1ff..5ceb6e392 100644
--- a/src/core/context_processors.py
+++ b/src/core/context_processors.py
@@ -54,9 +54,5 @@ def sponsors(request):
}
-def events(request):
- return {'schedule_redirect_url': settings.SCHEDULE_REDIRECT_URL}
-
-
def frontend_host(request):
return {'FRONTEND_HOST': settings.FRONTEND_HOST}
diff --git a/src/core/tests/test_views.py b/src/core/tests/test_views.py
index 16f148970..5e0be86db 100644
--- a/src/core/tests/test_views.py
+++ b/src/core/tests/test_views.py
@@ -2,11 +2,7 @@
import os
import pytest
-from django.conf import settings
from django.utils.translation import activate
-from pytest_django.asserts import assertRedirects
-
-from events.models import Schedule
@pytest.mark.django_db
@@ -97,14 +93,8 @@ def test_content_pages(client, parser, content_page_full_path):
assert response.status_code == 200, content_page_full_path
-@pytest.fixture
-def schedule(db):
- """Generate a schedule to prevent the schedule page from returning 404.
- """
- return Schedule.objects.create(html='')
-
-
-def test_content_pages_links(client, parser, schedule, content_page_full_path):
+@pytest.mark.django_db
+def test_content_pages_links(client, parser, content_page_full_path):
"""Test to make sure all in-site links in a content page work.
"""
if '/surveys/conference/' in content_page_full_path:
@@ -116,14 +106,6 @@ def test_content_pages_links(client, parser, schedule, content_page_full_path):
link_status_codes = []
for tag in link_tags:
link = tag.get('href')
- if "/events/schedule/" in link \
- and settings.SCHEDULE_REDIRECT_URL:
- assertRedirects(
- client.get(link),
- settings.SCHEDULE_REDIRECT_URL,
- fetch_redirect_response=False
- )
- continue
try:
status = client.get(link, follow=True).status_code
except Exception: # Catch internal server error for better reporting.
diff --git a/src/events/admin.py b/src/events/admin.py
index f5ba89006..79e283794 100644
--- a/src/events/admin.py
+++ b/src/events/admin.py
@@ -23,7 +23,6 @@
KeynoteEvent,
ProposedTalkEvent,
ProposedTutorialEvent,
- Schedule,
SponsoredEvent,
Time,
)
@@ -208,10 +207,3 @@ class SponsoredEventAdmin(admin.ModelAdmin):
search_fields = ['title', 'abstract']
prepopulated_fields = {'slug': ['title']}
raw_id_fields = ['host']
-
-
-@admin.register(Schedule)
-class ScheduleAdmin(admin.ModelAdmin):
- fields = ['html', 'created_at']
- readonly_fields = ['created_at']
- list_display = ['created_at']
diff --git a/src/events/forms.py b/src/events/forms.py
index 77e08f395..ab564e4ab 100644
--- a/src/events/forms.py
+++ b/src/events/forms.py
@@ -1,12 +1,6 @@
from django import forms
-from .models import CustomEvent, Schedule
-
-
-class ScheduleCreationForm(forms.ModelForm):
- class Meta:
- model = Schedule
- fields = ['html']
+from .models import CustomEvent
class CustomEventForm(forms.ModelForm):
diff --git a/src/events/management/commands/import_events.py b/src/events/management/commands/import_events.py
index 527d6288a..64dc26f24 100644
--- a/src/events/management/commands/import_events.py
+++ b/src/events/management/commands/import_events.py
@@ -7,11 +7,11 @@
from django.core.management.base import BaseCommand
from django.utils.dateparse import parse_time
-from events.models import Location, Time
-from events.renderers import EVENT_CLASSES
+from events.models import CustomEvent, KeynoteEvent, Location, ProposedTalkEvent, SponsoredEvent, Time
cst = pytz.timezone('Asia/Taipei')
+EVENT_CLASSES = (CustomEvent, KeynoteEvent, ProposedTalkEvent, SponsoredEvent)
DAYS = list(settings.EVENTS_DAY_NAMES.keys())
diff --git a/src/events/migrations/0053_delete_schedule.py b/src/events/migrations/0053_delete_schedule.py
new file mode 100644
index 000000000..9daf95bc2
--- /dev/null
+++ b/src/events/migrations/0053_delete_schedule.py
@@ -0,0 +1,16 @@
+# Generated by Django 3.2.25 on 2024-04-15 09:07
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('events', '0052_remove_sponsoredevent_prefer_time'),
+ ]
+
+ operations = [
+ migrations.DeleteModel(
+ name='Schedule',
+ ),
+ ]
diff --git a/src/events/models.py b/src/events/models.py
index d5b0229d4..01caaf93a 100644
--- a/src/events/models.py
+++ b/src/events/models.py
@@ -117,22 +117,6 @@ class Location:
R4 = '7-r4'
OTHER = '8-oth'
- @classmethod
- def get_md_width(cls, value):
- return {
- '2-all': 4,
- '3-r012': 3,
- '4-r0': 1,
- '5-r1': 1,
- '6-r2': 1,
- '1-r3': 1,
- '7-r4': 1,
- '8-oth': 1,
- }[value]
-
-
-EVENT_ROOMS = {Location.R0, Location.R1, Location.R2, Location.R3, Location.R4}
-
class BaseEvent(ConferenceRelated):
"""Base interface for all events in the schedule.
@@ -455,23 +439,3 @@ def get_absolute_url(self):
return reverse('events_tutorial_detail', kwargs={
'pk': self.proposal.pk,
})
-
-
-class Schedule(ConferenceRelated):
-
- html = models.TextField(
- verbose_name=_('HTML'),
- )
- created_at = models.DateTimeField(
- verbose_name=_('created at'),
- auto_now_add=True,
- )
-
- class Meta:
- verbose_name = _('Schedule')
- verbose_name_plural = _('Schedules')
- ordering = ['-created_at']
- get_latest_by = 'created_at'
-
- def __str__(self):
- return gettext('Schedule created at {}').format(self.created_at)
diff --git a/src/events/renderers.py b/src/events/renderers.py
deleted file mode 100644
index f72cce981..000000000
--- a/src/events/renderers.py
+++ /dev/null
@@ -1,405 +0,0 @@
-import itertools
-
-import sortedcontainers
-from django.conf import settings
-from django.utils.html import format_html, format_html_join
-from django.utils.safestring import mark_safe
-from django.utils.timezone import make_naive
-from django.utils.translation import gettext
-from django.utils.translation import gettext_lazy as _
-
-from core.utils import html_join
-from events.models import (
- CustomEvent,
- KeynoteEvent,
- Location,
- ProposedTalkEvent,
- SponsoredEvent,
-)
-from proposals.utils import format_names
-
-
-def render_customevent(e):
- return format_html(
- '',
- title=e.title,
- )
-
-
-def render_keynoteevent(e):
- return format_html(
- ''
- '
{title}
'
- '
{speaker}'
- '
'
- '
{title}'
- '
{speakers}'
- '
{lang}
'
- '
'
- '{display}
',
- key=location.split('-', 1)[-1],
- display={
- Location.ALL: '',
- Location.R012: 'R0 R1 R2',
- Location.R0: 'R0',
- Location.R1: 'R1',
- Location.R2: 'R2',
- Location.R3: 'R3',
- Location.R4: 'R4',
- }.get(location),
- )
-
-
-def _has_tall_event(events):
- return any(
- isinstance(e, ProposedTalkEvent) or isinstance(e, SponsoredEvent)
- for e in events
- )
-
-
-def render_block(
- event, time_map, events, extra_classes=None, *,
- min_height=0, max_height=None):
- location = event.location
- height = time_map[event.end_time] - time_map[event.begin_time]
- if max_height is not None:
- height = min(height, max_height)
- if height == 1 and min_height < 1 and not _has_tall_event(events):
- height = 'small'
- return format_html(
- ''
- '{location}{event}
',
- w=Location.get_md_width(location),
- h=height,
- location=render_block_location(location),
- event=render_event(event),
- classes=(' ' + ' '.join(extra_classes) if extra_classes else ''),
- )
-
-
-def render_attached_period(begin, end):
- begin = make_naive(begin.value)
- end = make_naive(end.value)
- return format_html(
- ''
- '{begin_h}:{begin_m} – {end_h}:{end_m}
',
- begin_h=begin.hour, begin_m=begin.strftime(r'%M'),
- end_h=end.hour, end_m=end.strftime(r'%M'),
- )
-
-
-def _render_blocks(events, time_map):
- """Render a R0-3 belt, a R0-2 partial belt (plus optionally a R3 event),
- or an all-block (with or without R3) format.
- """
- if events[0].location == Location.R3:
- # If this contains R3, shuffle it to the back.
- r3_event, *events = events
-
- # If this is not a smooth row, we need to prevent any block from
- # being rendered as short because we can't handle it with multi-height.
- if any(r3_event.end_time != e.end_time for e in events):
- min_height = 1
- else:
- min_height = 0
- r3_block = render_block(
- r3_event, time_map, events, min_height=min_height,
- )
- else:
- r3_event = None
- r3_block = ''
-
- # Render period block for R3.
- # We cheat a little here: Times in R0-2 are supposed to be identical;
- # only R3 can be different. We just compare the first event's times
- # and R3's. If they are identical, R3 does not need its own period block,
- # otherwise it does.
- r3_period = ''
- rx_begin, rx_end = events[0].begin_time, events[0].end_time
- if r3_event:
- r3_begin = r3_event.begin_time
- r3_end = r3_event.end_time
- if r3_begin != rx_begin or r3_end != rx_end:
- r3_period = render_attached_period(r3_begin, r3_end)
-
- return format_html(
- '{r012_period}{r012_blocks}{r3_period}{r3_block}',
- r012_period=render_attached_period(rx_begin, rx_end),
- r012_blocks=html_join(
- '',
- (render_block(e, time_map, events) for e in events),
- ),
- r3_period=r3_period,
- r3_block=r3_block,
- )
-
-
-def _render_multirow_subrow(event_iter, time_map, events):
- # Render period block for this row, and the first event.
- e0 = next(event_iter)
- cells = [
- render_attached_period(e0.begin_time, e0.end_time),
- render_block(e0, time_map, events)
- ]
- cols = Location.get_md_width(e0.location)
-
- # Keep rendering until we fill a row.
- while cols < 3:
- try:
- e = next(event_iter)
- except StopIteration:
- break
- cells.append(render_block(e, time_map, events))
- cols += Location.get_md_width(e.location)
- return cells
-
-
-def _render_multirow(events, time_map, max_height):
- """Render a complex format that contains a multi-row R3 event.
- """
- sp_event, *events = events
- # Sort events by time, and then location. This is done here because
- # we need to exclude the R3 event (by putting it first).
- events = sorted(events, key=lambda e: (e.begin_time.value, e.location))
- event_iter = iter(events)
-
- # Render R0-R2 events in the first time period.
- cells = _render_multirow_subrow(event_iter, time_map, events)
-
- # Render the multi-row R3 event.
- cells.extend([
- render_attached_period(sp_event.begin_time, sp_event.end_time),
- render_block(
- sp_event, time_map, events, ['pull-right'],
- max_height=max_height,
- ),
- ])
-
- # Render the rest of the events.
- try:
- while True:
- cells += _render_multirow_subrow(event_iter, time_map, events)
- except StopIteration:
- pass
-
- # Join the results.
- return html_join('', cells)
-
-
-def render_columned_period(times, events):
- cell_args = [
- _get_column_period_args(begin, end)
- for begin, end in zip(times[:-1], times[1:])
- if any(e.end_time == end for e in events)
- ]
- cells = format_html_join(
- '',
- '{}:{}
|
{}:{}
',
- iter(cell_args),
- )
- height = len(cell_args)
- if height == 1 and not _has_tall_event(events):
- height = 'small'
- html = format_html(
- '{cells}
',
- height=height,
- cells=cells,
- )
- return html, height
-
-
-def _get_column_period_args(begin_time, end_time):
- begin_naive = make_naive(begin_time.value)
- end_naive = make_naive(end_time.value)
- return (
- begin_naive.hour,
- begin_naive.strftime('%M'),
- end_naive.hour,
- end_naive.strftime('%M'),
- )
-
-
-def render_row(times, events):
- events = sorted(events, key=lambda e: e.location)
- times = sorted(times)
- time_map = {t: i for i, t in enumerate(times)}
-
- period_block, max_height = render_columned_period(times, events)
- try:
- sp_event = events[0]
- except IndexError: # No events in this time period.
- content = ''
- else:
- if (sp_event.location != Location.R3 or sp_event.end_time <= times[1]):
- # If there's no R3 event, or if R3 event is not multi-row.
- content = _render_blocks(events, time_map)
- else:
- # If there is a multi-row R3 event.
- content = _render_multirow(events, time_map, max_height)
- return format_html(
- '{period}'
- '',
- period=period_block,
- content=content,
- )
-
-
-# This is made global so that we can easily test for equality.
-def group_key(e):
- return e.location
-
-
-def make_group(*events):
- return sortedcontainers.SortedListWithKey(events, key=group_key)
-
-
-def collect_event_groups(events):
- # Map of (sorted-tuple-of-times): [list-of-events].
- # This automatically sorts the keys by ``begin_time``.
- groups = sortedcontainers.SortedDict()
-
- for e in events:
-
- e_begin_time = e.begin_time
- e_end_time = e.end_time
-
- # Short circuit: If there's an identical group, just join it.
- if (e_begin_time, e_end_time) in groups:
- groups[(e_begin_time, e_end_time)].add(e)
- continue
-
- # Look for a suitable group.
- for key in groups.keys():
- begin_time, *_, end_time = key
- if ((begin_time <= e_begin_time and end_time >= e_end_time) or
- (e_begin_time <= begin_time and e_end_time >= end_time)):
- # Either key can contain event, or event can contain key.
- events = groups.pop(key)
- events.add(e)
- times = sorted(set(key) | {e_begin_time, e_end_time})
- groups[tuple(times)] = events
- break
- else:
- # No suitable group. Let's make a new one.
- # This automatically sorts the items by location.
- groups[(e_begin_time, e_end_time)] = make_group(e)
-
- return groups
-
-
-EVENT_CLASSES = (CustomEvent, KeynoteEvent, ProposedTalkEvent, SponsoredEvent)
-
-
-def _filter_events(kls, day):
- return (
- kls.objects
- .filter(begin_time__value__date=day, end_time__value__date=day)
- .select_related('begin_time', 'end_time')
- )
-
-
-def render_table(day):
- events = itertools.chain.from_iterable(
- _filter_events(Cls, day)
- for Cls in EVENT_CLASSES
- )
- groups = collect_event_groups(events)
-
- head = mark_safe("""
-
- """)
- body = html_join('', (
- render_row(times, group) for times, group in groups.items()
- ))
- return format_html(
- '{head}{body}
',
- head=head, body=body,
- )
-
-
-def render_day(day, display):
- events = list(itertools.chain.from_iterable(
- _filter_events(Cls, day)
- for Cls in EVENT_CLASSES
- ))
- if not events:
- return ''
- return format_html(
- '{table}',
- slug=day.strftime(r'%Y-%m-%d'),
- display=display, table=render_table(day),
- )
-
-
-def render_all():
- return html_join('', (
- render_day(day, display)
- for day, display in settings.EVENTS_DAY_NAMES.items()
- ))
diff --git a/src/events/templatetags/events.py b/src/events/templatetags/events.py
index f8d2919a5..3ba31e503 100644
--- a/src/events/templatetags/events.py
+++ b/src/events/templatetags/events.py
@@ -1,161 +1,12 @@
-from datetime import datetime, timedelta
-from math import floor
-
from django.conf import settings
from django.template import Library
-from django.template.loader import get_template
-from django.utils import translation
-from django.utils.translation import gettext_lazy as _
-from events.models import KeynoteEvent, Location
-from proposals.utils import format_names
+from events.models import KeynoteEvent
from sponsors.models import OpenRole, Sponsor
-LOCATION_DISPLAY_DICT = {
- Location.R0: _('R1'),
- Location.R1: _('R2'),
- Location.R2: _('R3'),
- Location.R3: _('Multifunction room'),
- Location.R4: _('Goodideas Studio'),
- Location.R012: _('R1, R2, R3'),
- Location.OTHER: _('Other'),
-}
-ROW_UNIT = 5 * 60 # in seconds
-MARKER_UNIT = 30 * 60 # in seconds
-
register = Library()
-@register.simple_tag
-def calc_grid_row(begin, end, timeline_start='08:30'):
- d_format = '%H:%M'
- start_point = datetime.strptime(timeline_start, d_format)
-
- def get_row(t):
- diff = datetime.strptime(t, d_format) - start_point
- return int(diff.seconds / ROW_UNIT) + 1
-
- start_row = get_row(begin)
- end_row = get_row(end)
- return {'start_row': start_row, 'end_row': end_row}
-
-
-@register.filter
-def gen_timeline(start, end):
- timeline = [{'time': start, 'row_start': 1, 'row_end': 6}]
- d_format = '%H:%M'
-
- time_start = datetime.strptime(start, d_format)
- time_end = datetime.strptime(end, d_format)
- ticks_count = floor((time_end - time_start).seconds / MARKER_UNIT)
-
- scale_unit_multiplier = int(MARKER_UNIT / ROW_UNIT) # 6 (magic number)
- time_next = time_start
- row_start_next = 1
- row_end_next = 6
- for __ in range(ticks_count):
- time_next += timedelta(seconds=MARKER_UNIT)
- row_start_next += scale_unit_multiplier
- row_end_next += scale_unit_multiplier
- t = datetime.strftime(time_next, d_format)
- c = '--hour' if t.endswith('00') else '--half-an-hour'
- timeline.append({
- 'time': t,
- 'row_start': row_start_next,
- 'row_end': row_end_next,
- 'class': c
- })
-
- return timeline
-
-
-@register.filter
-def event_cell_class(event):
- event_class = {
- 'events.customevent': 'custom',
- 'events.keynoteevent': 'keynote',
- 'events.proposedtalkevent': 'talk',
- 'events.proposedtutorialevent': 'tutorial',
- 'events.sponsoredevent': 'talk',
- }[event._meta.label_lower]
- classes = [event_class]
- if getattr(event, 'break_event', False):
- classes.append('is-break')
- return ' '.join(classes)
-
-
-@register.filter
-def event_tr_class(slot_info):
- for __, event in slot_info:
- if event._meta.label_lower == 'events.customevent':
- return 'custom'
- return ''
-
-
-@register.filter
-def room_display(value):
- return LOCATION_DISPLAY_DICT.get(value, '')
-
-
-def get_custom_event_display(event):
- template = get_template('events/_includes/schedule_custom_event.html')
- return template.render({'event': event})
-
-
-def get_keynote_event_display(event):
- template = get_template('events/_includes/schedule_keynote_event.html')
- return template.render({'event': event, 'is_remote': event.is_remote})
-
-
-def _render_talk_event_template(event, info, speaker_names, sponsored, is_remote=False):
- template = get_template('events/_includes/schedule_talk_event.html')
- return template.render({
- 'event': event, 'info': info, 'sponsored': sponsored,
- 'speakers': format_names(speaker_names), 'is_remote': is_remote,
- })
-
-
-def get_talk_event_display(event):
- proposal = event.proposal
- speaker_names = [proposal.submitter.speaker_name]
- if getattr(event, '_additional_speaker_count', 1):
- speaker_names.extend(
- proposal.additionalspeaker_set
- .values_list('user__speaker_name', flat=True),
- )
- return _render_talk_event_template(event, proposal, speaker_names, False, event.is_remote)
-
-
-def get_tutorial_event_display(event):
- proposal = event.proposal
- speaker_names = [proposal.submitter.speaker_name]
- if getattr(event, '_additional_speaker_count', 1):
- speaker_names.extend(
- proposal.additionalspeaker_set
- .values_list('user__speaker_name', flat=True),
- )
- return _render_talk_event_template(event, proposal, speaker_names, False, event.is_remote)
-
-
-def get_sponsored_event_display(event):
- return _render_talk_event_template(
- event, event, [event.host.speaker_name], True,
- )
-
-
-@register.filter
-def event_display(event):
- with translation.override('en-us'):
- f = {
- 'events.customevent': get_custom_event_display,
- 'events.keynoteevent': get_keynote_event_display,
- 'events.proposedtalkevent': get_talk_event_display,
- 'events.proposedtutorialevent': get_tutorial_event_display,
- 'events.sponsoredevent': get_sponsored_event_display,
- }[event._meta.label_lower]
- return f(event)
-
-
@register.filter
def event_date_display(event):
try:
diff --git a/src/events/tests/renderers/__init__.py b/src/events/tests/renderers/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/events/tests/renderers/conftest.py b/src/events/tests/renderers/conftest.py
deleted file mode 100644
index c097f6fe6..000000000
--- a/src/events/tests/renderers/conftest.py
+++ /dev/null
@@ -1,329 +0,0 @@
-import datetime
-
-import pytest
-import pytz
-
-from events.models import (
- CustomEvent,
- KeynoteEvent,
- Location,
- ProposedTalkEvent,
- Time,
-)
-from proposals.models import AdditionalSpeaker
-
-cst = pytz.timezone('Asia/Taipei')
-
-
-class RendererTestUtils:
- @staticmethod
- def is_safe(s):
- """Check whether a string is safe.
-
- This is Django's internal API, but we exploit it for easy testing.
- """
- return not s or hasattr(s, '__html__')
-
-
-@pytest.fixture
-def utils():
- return RendererTestUtils
-
-
-@pytest.fixture
-def keynote_belt_event(db, get_time):
- return KeynoteEvent.objects.create(
- speaker_name='Amber Brown',
- slug='amber-brown',
- begin_time=get_time('2016-06-05 9:00'),
- end_time=get_time('2016-06-05 10:00'),
- location=Location.ALL,
- )
-
-
-@pytest.fixture
-def custom_partial_belt_event(db, get_time):
- return CustomEvent.objects.create(
- title='Job Fair',
- begin_time=get_time('2016-06-04 14:45'),
- end_time=get_time('2016-06-04 15:15'),
- location=Location.R012,
- )
-
-
-@pytest.fixture
-def proposed_talk_block_event(accepted_talk_proposal, another_user, get_time):
- e = ProposedTalkEvent.objects.create(
- proposal=accepted_talk_proposal,
- begin_time=get_time('2016-06-03 16:00'),
- end_time=get_time('2016-06-03 16:45'),
- location=Location.R0,
- )
- AdditionalSpeaker.objects.create(
- user=another_user, proposal=accepted_talk_proposal,
- )
- return e
-
-
-@pytest.fixture
-def events(
- custom_partial_belt_event, keynote_belt_event,
- proposed_talk_block_event, sponsored_block_event):
- return {
- 'custom_event': custom_partial_belt_event,
- 'keynote_event': keynote_belt_event,
- 'proposed_talk_event': proposed_talk_block_event,
- 'sponsored_event': sponsored_block_event,
- }
-
-
-@pytest.fixture
-def day():
- return datetime.date(2016, 8, 19)
-
-
-@pytest.fixture
-def make_time(day):
-
- def _make_time(h, m=0):
- dt = datetime.datetime.combine(day, datetime.time(h, m))
- return Time(value=cst.localize(dt))
-
- return _make_time
-
-
-@pytest.fixture
-def belt_begin_time(make_time):
- return make_time(15)
-
-
-@pytest.fixture
-def belt_end_time(make_time):
- return make_time(16)
-
-
-@pytest.fixture
-def belt_event(belt_begin_time, belt_end_time):
- return KeynoteEvent(
- speaker_name='Amber Brown',
- slug='amber-brown',
- begin_time=belt_begin_time,
- end_time=belt_end_time,
- )
-
-
-@pytest.fixture
-def partial_belt_begin_time(make_time):
- return make_time(1)
-
-
-@pytest.fixture
-def partial_belt_end_time(make_time):
- return make_time(2)
-
-
-@pytest.fixture
-def partial_belt_events(partial_belt_begin_time, partial_belt_end_time):
- event = CustomEvent(
- title='Refreshment',
- location=Location.R012,
- begin_time=partial_belt_begin_time,
- end_time=partial_belt_end_time,
- )
- return [event]
-
-
-@pytest.fixture
-def partial_belt_block_begin_time(make_time):
- return make_time(3)
-
-
-@pytest.fixture
-def partial_belt_block_end_time(make_time):
- return make_time(4)
-
-
-@pytest.fixture
-def partial_belt_block_events(
- partial_belt_block_begin_time, partial_belt_block_end_time):
- events = [
- CustomEvent(
- title='Refreshment',
- location=Location.R012,
- begin_time=partial_belt_block_begin_time,
- end_time=partial_belt_block_end_time,
- ),
- CustomEvent(
- title='Free-market sub-orbital tattoo',
- location=Location.R3,
- begin_time=partial_belt_block_begin_time,
- end_time=partial_belt_block_end_time,
- ),
- ]
- return events
-
-
-@pytest.fixture
-def partial_block_begin_time(make_time):
- return make_time(5)
-
-
-@pytest.fixture
-def partial_block_end_time(make_time):
- return make_time(6)
-
-
-@pytest.fixture
-def partial_block_events(partial_block_begin_time, partial_block_end_time):
- events = [
- CustomEvent(
- title='Boost Maintainability',
- location=Location.R0,
- begin_time=partial_block_begin_time,
- end_time=partial_block_end_time,
- ),
- CustomEvent(
- title='We Made the PyCon TW 2016 Website',
- location=Location.R1,
- begin_time=partial_block_begin_time,
- end_time=partial_block_end_time,
- ),
- CustomEvent(
- title='Deep Learning and Application in Python',
- location=Location.R2,
- begin_time=partial_block_begin_time,
- end_time=partial_block_end_time,
- ),
- ]
- return events
-
-
-@pytest.fixture
-def block_begin_time(make_time):
- return make_time(7)
-
-
-@pytest.fixture
-def block_end_time(make_time):
- return make_time(8)
-
-
-@pytest.fixture
-def block_events(block_begin_time, block_end_time):
- events = [
- CustomEvent(
- title='Boost Maintainability',
- location=Location.R0,
- begin_time=block_begin_time,
- end_time=block_end_time,
- ),
- CustomEvent(
- title='We Made the PyCon TW 2016 Website',
- location=Location.R1,
- begin_time=block_begin_time,
- end_time=block_end_time,
- ),
- CustomEvent(
- title='Deep Learning and Application in Python',
- location=Location.R2,
- begin_time=block_begin_time,
- end_time=block_end_time,
- ),
- CustomEvent(
- title='Free-market sub-orbital tattoo',
- location=Location.R3,
- begin_time=block_begin_time,
- end_time=block_end_time,
- ),
- ]
- return events
-
-
-@pytest.fixture
-def mismatch_block_begin_time(make_time):
- return make_time(9)
-
-
-@pytest.fixture
-def mismatch_block_mid_time(make_time):
- return make_time(10)
-
-
-@pytest.fixture
-def mismatch_block_end_time(make_time):
- return make_time(11)
-
-
-@pytest.fixture
-def mismatch_block_events(
- mismatch_block_begin_time, mismatch_block_mid_time,
- mismatch_block_end_time):
- events = [
- CustomEvent(
- title='Refreshment',
- location=Location.R012,
- begin_time=mismatch_block_begin_time,
- end_time=mismatch_block_end_time,
- ),
- CustomEvent(
- title='Free-market sub-orbital tattoo',
- location=Location.R3,
- begin_time=mismatch_block_begin_time,
- end_time=mismatch_block_mid_time,
- ),
- ]
- return events
-
-
-@pytest.fixture
-def multirow_block_begin_time(make_time):
- return make_time(12)
-
-
-@pytest.fixture
-def multirow_block_mid_time(make_time):
- return make_time(13)
-
-
-@pytest.fixture
-def multirow_block_end_time(make_time):
- return make_time(14)
-
-
-@pytest.fixture
-def multirow_block_events(
- multirow_block_begin_time, multirow_block_mid_time,
- multirow_block_end_time):
- events = [
- CustomEvent(
- title='Boost Maintainability',
- location=Location.R0,
- begin_time=multirow_block_begin_time,
- end_time=multirow_block_mid_time,
- ),
- CustomEvent(
- title='We Made the PyCon TW 2016 Website',
- location=Location.R1,
- begin_time=multirow_block_begin_time,
- end_time=multirow_block_mid_time,
- ),
- CustomEvent(
- title='Deep Learning and Application in Python',
- location=Location.R2,
- begin_time=multirow_block_begin_time,
- end_time=multirow_block_mid_time,
- ),
- CustomEvent(
- title='Free-market sub-orbital tattoo',
- location=Location.R3,
- begin_time=multirow_block_begin_time,
- end_time=multirow_block_end_time,
- ),
- CustomEvent(
- title='Refreshment',
- location=Location.R012,
- begin_time=multirow_block_mid_time,
- end_time=multirow_block_end_time,
- ),
- ]
- return events
diff --git a/src/events/tests/renderers/test_collect.py b/src/events/tests/renderers/test_collect.py
deleted file mode 100644
index cda922946..000000000
--- a/src/events/tests/renderers/test_collect.py
+++ /dev/null
@@ -1,37 +0,0 @@
-import itertools
-
-import pytest
-import sortedcontainers
-
-from events import renderers
-from events.renderers import make_group
-
-
-@pytest.fixture
-def events(
- belt_event, partial_belt_events, partial_belt_block_events,
- partial_block_events, block_events, mismatch_block_events,
- multirow_block_events):
- return itertools.chain(
- [belt_event], partial_belt_events, partial_belt_block_events,
- partial_block_events, block_events, mismatch_block_events,
- multirow_block_events,
- )
-
-
-def test_collect_event_groups(
- belt_event, partial_belt_events, partial_belt_block_events,
- partial_block_events, block_events, mismatch_block_events,
- multirow_block_events, make_time, events):
- groups = renderers.collect_event_groups(events)
- assert groups == sortedcontainers.SortedDict({
- (make_time(1), make_time(2)): make_group(*partial_belt_events),
- (make_time(3), make_time(4)): make_group(*partial_belt_block_events),
- (make_time(5), make_time(6)): make_group(*partial_block_events),
- (make_time(7), make_time(8)): make_group(*block_events),
- (make_time(9), make_time(10), make_time(11)): make_group(
- *mismatch_block_events),
- (make_time(12), make_time(13), make_time(14)): make_group(
- *multirow_block_events),
- (make_time(15), make_time(16)): make_group(belt_event),
- })
diff --git a/src/events/tests/renderers/test_render_block.py b/src/events/tests/renderers/test_render_block.py
deleted file mode 100644
index cfbacccdd..000000000
--- a/src/events/tests/renderers/test_render_block.py
+++ /dev/null
@@ -1,150 +0,0 @@
-import pytest
-
-from events import renderers
-from events.models import CustomEvent, Location
-
-
-@pytest.fixture
-def simple_component_renderer(mocker):
- mocker.patch.multiple(
- 'events.renderers',
- render_event=str,
- render_block_location=lambda v: f'{v} ',
- )
-
-
-@pytest.fixture
-def time_map(events):
- times = set()
- for e in events.values():
- times.add(e.begin_time)
- times.add(e.end_time)
- return {time: i for i, time in enumerate(sorted(times))}
-
-
-# Hack to get all possible location values by introspection.
-POSSIBLE_LOCATIONS = sorted(
- getattr(Location, k)
- for k in Location.__dict__ if k.isupper() and k != 'OTHER'
-)
-
-
-@pytest.mark.parametrize('location', POSSIBLE_LOCATIONS)
-def test_render_block_location(parser, utils, location):
- rendered = renderers.render_block_location(location)
- assert utils.is_safe(rendered)
-
- expected = {
- Location.ALL: (
- ''
- ),
- Location.R012: (
- ''
- 'R0 R1 R2
'
- ),
- Location.R0: (
- ''
- 'R0
'
- ),
- Location.R1: (
- ''
- 'R1
'
- ),
- Location.R2: (
- ''
- 'R2
'
- ),
- Location.R3: (
- ''
- 'R3
'
- ),
- Location.R4: (
- ''
- 'R4
'
- ),
- }.get(location)
- if expected:
- assert parser.arrange(rendered) == parser.arrange(expected)
-
-
-@pytest.mark.parametrize('event_key', [
- 'custom_event', 'keynote_event', 'proposed_talk_event', 'sponsored_event',
-])
-@pytest.mark.usefixtures('simple_component_renderer')
-def test_render_block(parser, utils, time_map, events, event_key):
- e = events[event_key]
- rendered = renderers.render_block(e, time_map, [e])
- assert utils.is_safe(rendered)
-
- expected = {
- 'custom_event': """
-
- 3-r012 Job Fair
-
""",
- 'keynote_event': """
-
- 2-all Keynote: Amber Brown
-
""",
- 'proposed_talk_event': """
-
- 4-r0 Beyond the Style Guides<br>
-
""",
- 'sponsored_event': """
-
- 6-r2 Camera engine office woman lights
-
""",
- }[event_key]
- assert parser.arrange(rendered) == parser.arrange(expected)
-
-
-@pytest.mark.parametrize('event_key,begin,end', [
- ('custom_event', '14:45', '15:15'),
- ('keynote_event', '9:00', '10:00'),
- ('proposed_talk_event', '16:00', '16:45'),
- ('sponsored_event', '11:00', '11:25'),
-])
-def test_render_attached_period(utils, events, event_key, begin, end):
- e = events[event_key]
- rendered = renderers.render_attached_period(e.begin_time, e.end_time)
- assert utils.is_safe(rendered)
- assert rendered == (
- f'{begin} – {end}
'
- )
-
-
-@pytest.mark.parametrize('time_count', [2, 3, 4])
-def test_render_columned_period(parser, utils, make_time, time_count):
- times = [make_time(h) for h in range(time_count)]
- rendered, _ = renderers.render_columned_period(times, [
- CustomEvent(
- title='M<3', location=Location.ALL,
- begin_time=begin_time, end_time=end_time,
- )
- for begin_time, end_time in zip(times[:-1], times[1:])
- ])
- assert utils.is_safe(rendered)
-
- expected = {
- 2: (
- ''
- ),
- 3: (
- ''
- '
0:00
|
1:00
'
- '
1:00
|
2:00
'
- '
'
- '
0:00
|
1:00
'
- '
1:00
|
2:00
'
- '
2:00
|
3:00
'
- '
-
- |9:00 10:00|
- |Keynote: Amber Brown|
-
-
-
- |1:00 2:00|
- |Refreshment|
-
-
-
- |3:00 4:00|
- |Refreshment|
- |Free-market sub-orbital tattoo|
-
-
-
- |5:00 6:00|
- |Boost Maintainability|
- |We Made the PyCon TW 2016 Website|
- |Deep Learning and Application in Python|
-
-
-
- |7:00 8:00|
- |Boost Maintainability|
- |We Made the PyCon TW 2016 Website|
- |Deep Learning and Application in Python|
- |Free-market sub-orbital tattoo|
-
-
-
- |9:00 11:00|
- |Refreshment|
- |9:00 10:00|
- |Free-market sub-orbital tattoo|
-
-
-
- |12:00 13:00|
- |Boost Maintainability|
- |We Made the PyCon TW 2016 Website|
- |Deep Learning and Application in Python|
- |12:00 14:00|
- |Free-market sub-orbital tattoo (pull-right)|
- |13:00 14:00|
- |Refreshment|
-
-