mirror of
https://github.com/pretix/pretix.git
synced 2026-02-26 10:02:27 +00:00
Compare commits
1 Commits
datasync-l
...
programtim
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
dc17725a86 |
@@ -222,7 +222,7 @@ class ItemBundleSerializer(serializers.ModelSerializer):
|
|||||||
class ItemProgramTimeSerializer(serializers.ModelSerializer):
|
class ItemProgramTimeSerializer(serializers.ModelSerializer):
|
||||||
class Meta:
|
class Meta:
|
||||||
model = ItemProgramTime
|
model = ItemProgramTime
|
||||||
fields = ('id', 'start', 'end')
|
fields = ('id', 'start', 'end', 'location')
|
||||||
|
|
||||||
def validate(self, data):
|
def validate(self, data):
|
||||||
data = super().validate(data)
|
data = super().validate(data)
|
||||||
|
|||||||
19
src/pretix/base/migrations/0297_itemprogramtime_location.py
Normal file
19
src/pretix/base/migrations/0297_itemprogramtime_location.py
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
# Generated by Django 4.2.27 on 2026-01-21 12:06
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
import i18nfield.fields
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
("pretixbase", "0296_invoice_invoice_from_state"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name="itemprogramtime",
|
||||||
|
name="location",
|
||||||
|
field=i18nfield.fields.I18nTextField(max_length=200, null=True),
|
||||||
|
)
|
||||||
|
]
|
||||||
@@ -2306,10 +2306,17 @@ class ItemProgramTime(models.Model):
|
|||||||
:type start: datetime
|
:type start: datetime
|
||||||
:param end: The date and time this program time ends
|
:param end: The date and time this program time ends
|
||||||
:type end: datetime
|
:type end: datetime
|
||||||
|
:param location: venue
|
||||||
|
:type location: str
|
||||||
"""
|
"""
|
||||||
item = models.ForeignKey('Item', related_name='program_times', on_delete=models.CASCADE)
|
item = models.ForeignKey('Item', related_name='program_times', on_delete=models.CASCADE)
|
||||||
start = models.DateTimeField(verbose_name=_("Start"))
|
start = models.DateTimeField(verbose_name=_("Start"))
|
||||||
end = models.DateTimeField(verbose_name=_("End"))
|
end = models.DateTimeField(verbose_name=_("End"))
|
||||||
|
location = I18nTextField(
|
||||||
|
null=True, blank=True,
|
||||||
|
max_length=200,
|
||||||
|
verbose_name=_("Location"),
|
||||||
|
)
|
||||||
|
|
||||||
def clean(self):
|
def clean(self):
|
||||||
if hasattr(self, 'item') and self.item and self.item.event.has_subevents:
|
if hasattr(self, 'item') and self.item and self.item.event.has_subevents:
|
||||||
|
|||||||
@@ -1354,6 +1354,10 @@ class ItemProgramTimeForm(I18nModelForm):
|
|||||||
def __init__(self, *args, **kwargs):
|
def __init__(self, *args, **kwargs):
|
||||||
super().__init__(*args, **kwargs)
|
super().__init__(*args, **kwargs)
|
||||||
self.fields['end'].widget.attrs['data-date-after'] = '#id_{prefix}-start_0'.format(prefix=self.prefix)
|
self.fields['end'].widget.attrs['data-date-after'] = '#id_{prefix}-start_0'.format(prefix=self.prefix)
|
||||||
|
self.fields['location'].widget.attrs['rows'] = '1'
|
||||||
|
self.fields['location'].widget.attrs['placeholder'] = _(
|
||||||
|
'Sample Conference Center, Heidelberg, Germany'
|
||||||
|
)
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
model = ItemProgramTime
|
model = ItemProgramTime
|
||||||
@@ -1361,6 +1365,7 @@ class ItemProgramTimeForm(I18nModelForm):
|
|||||||
fields = [
|
fields = [
|
||||||
'start',
|
'start',
|
||||||
'end',
|
'end',
|
||||||
|
'location'
|
||||||
]
|
]
|
||||||
field_classes = {
|
field_classes = {
|
||||||
'start': forms.SplitDateTimeField,
|
'start': forms.SplitDateTimeField,
|
||||||
|
|||||||
@@ -34,6 +34,7 @@
|
|||||||
{% bootstrap_form_errors form %}
|
{% bootstrap_form_errors form %}
|
||||||
{% bootstrap_field form.start layout="control" %}
|
{% bootstrap_field form.start layout="control" %}
|
||||||
{% bootstrap_field form.end layout="control" %}
|
{% bootstrap_field form.end layout="control" %}
|
||||||
|
{% bootstrap_field form.location layout="control" %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
@@ -59,6 +60,7 @@
|
|||||||
<div class="panel-body form-horizontal">
|
<div class="panel-body form-horizontal">
|
||||||
{% bootstrap_field formset.empty_form.start layout="control" %}
|
{% bootstrap_field formset.empty_form.start layout="control" %}
|
||||||
{% bootstrap_field formset.empty_form.end layout="control" %}
|
{% bootstrap_field formset.empty_form.end layout="control" %}
|
||||||
|
{% bootstrap_field formset.empty_form.location layout="control" %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% endescapescript %}
|
{% endescapescript %}
|
||||||
|
|||||||
@@ -153,7 +153,7 @@ def get_private_icals(event, positions):
|
|||||||
# Actual ical organizer field is not useful since it will cause "your invitation was accepted" emails to the organizer
|
# Actual ical organizer field is not useful since it will cause "your invitation was accepted" emails to the organizer
|
||||||
descr.append(_('Organizer: {organizer}').format(organizer=event.organizer.name))
|
descr.append(_('Organizer: {organizer}').format(organizer=event.organizer.name))
|
||||||
description = '\n'.join(descr)
|
description = '\n'.join(descr)
|
||||||
location = None
|
location = ", ".join(l.strip() for l in str(pt.location).splitlines() if l.strip())
|
||||||
dtstart = pt.start.astimezone(tz)
|
dtstart = pt.start.astimezone(tz)
|
||||||
dtend = pt.end.astimezone(tz)
|
dtend = pt.end.astimezone(tz)
|
||||||
uid = 'pretix-{}-{}-{}-{}@{}'.format(
|
uid = 'pretix-{}-{}-{}-{}@{}'.format(
|
||||||
|
|||||||
@@ -1964,6 +1964,13 @@ def program_time2(item, category):
|
|||||||
end=datetime(2017, 12, 30, 0, 0, 0, tzinfo=timezone.utc))
|
end=datetime(2017, 12, 30, 0, 0, 0, tzinfo=timezone.utc))
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.fixture
|
||||||
|
def program_time3(item, category):
|
||||||
|
return item.program_times.create(start=datetime(2017, 12, 30, 0, 0, 0, tzinfo=timezone.utc),
|
||||||
|
end=datetime(2017, 12, 31, 0, 0, 0, tzinfo=timezone.utc),
|
||||||
|
location='Testlocation')
|
||||||
|
|
||||||
|
|
||||||
TEST_PROGRAM_TIMES_RES = {
|
TEST_PROGRAM_TIMES_RES = {
|
||||||
0: {
|
0: {
|
||||||
"start": "2017-12-27T00:00:00Z",
|
"start": "2017-12-27T00:00:00Z",
|
||||||
@@ -1972,24 +1979,37 @@ TEST_PROGRAM_TIMES_RES = {
|
|||||||
1: {
|
1: {
|
||||||
"start": "2017-12-29T00:00:00Z",
|
"start": "2017-12-29T00:00:00Z",
|
||||||
"end": "2017-12-30T00:00:00Z",
|
"end": "2017-12-30T00:00:00Z",
|
||||||
|
},
|
||||||
|
2: {
|
||||||
|
"start": "2017-12-30T00:00:00Z",
|
||||||
|
"end": "2017-12-31T00:00:00Z",
|
||||||
|
"location": "Testlocation",
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.django_db
|
@pytest.mark.django_db
|
||||||
def test_program_times_list(token_client, organizer, event, item, program_time, program_time2):
|
def test_program_times_list(token_client, organizer, event, item, program_time, program_time2, program_time3):
|
||||||
res = dict(TEST_PROGRAM_TIMES_RES)
|
res = dict(TEST_PROGRAM_TIMES_RES)
|
||||||
res[0]["id"] = program_time.pk
|
res[0]["id"] = program_time.pk
|
||||||
res[1]["id"] = program_time2.pk
|
res[1]["id"] = program_time2.pk
|
||||||
|
res[2]["id"] = program_time3.pk
|
||||||
resp = token_client.get('/api/v1/organizers/{}/events/{}/items/{}/program_times/'.format(organizer.slug, event.slug,
|
resp = token_client.get('/api/v1/organizers/{}/events/{}/items/{}/program_times/'.format(organizer.slug, event.slug,
|
||||||
item.pk))
|
item.pk))
|
||||||
assert resp.status_code == 200
|
assert resp.status_code == 200
|
||||||
assert res[0]['start'] == resp.data['results'][0]['start']
|
assert res[0]['start'] == resp.data['results'][0]['start']
|
||||||
assert res[0]['end'] == resp.data['results'][0]['end']
|
assert res[0]['end'] == resp.data['results'][0]['end']
|
||||||
assert res[0]['id'] == resp.data['results'][0]['id']
|
assert res[0]['id'] == resp.data['results'][0]['id']
|
||||||
|
# assert res[0] == resp.data['results'][0]
|
||||||
assert res[1]['start'] == resp.data['results'][1]['start']
|
assert res[1]['start'] == resp.data['results'][1]['start']
|
||||||
assert res[1]['end'] == resp.data['results'][1]['end']
|
assert res[1]['end'] == resp.data['results'][1]['end']
|
||||||
assert res[1]['id'] == resp.data['results'][1]['id']
|
assert res[1]['id'] == resp.data['results'][1]['id']
|
||||||
|
# assert res[1] == resp.data['results'][1]
|
||||||
|
assert res[2]['start'] == resp.data['results'][2]['start']
|
||||||
|
assert res[2]['end'] == resp.data['results'][2]['end']
|
||||||
|
assert res[2]['location'] == resp.data['results'][2]['location']
|
||||||
|
assert res[2]['id'] == resp.data['results'][2]['id']
|
||||||
|
assert res[2] == resp.data['results'][2]
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.django_db
|
@pytest.mark.django_db
|
||||||
|
|||||||
Reference in New Issue
Block a user