lucaspalomodevelop/eventcally
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/eventcally.git synced 2026-03-13 00:07:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #449 from eventcally/issues/448

Browse Source 
Organization events: Add postcode filter #448
This commit is contained in:
Daniel Grams 2023-04-19 23:35:30 +02:00 committed by GitHub
commit 473478cebc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
project/forms/event.py
View File

@ -450,6 +450,7 @@ class FindEventForm(FlaskForm):
coerce=int,
choices=distance_choices,
)
postal_code = StringField(lazy_gettext("Postal code"), validators=[Optional()])
submit = SubmitField(lazy_gettext("Find events"))

15
project/templates/manage/events.html
View File

@ -59,7 +59,7 @@ var vue_app_data = { eventId: 0 };
{{ render_field_with_errors(form.keyword, formrow="1") }}
{% endif %}
{% set form_collapsed = not form.category_id.data and not form.organizer_id.data and not form.event_place_id.data and not form.coordinate.data %}
{% set form_collapsed = not form.category_id.data and not form.organizer_id.data and not form.event_place_id.data and not form.postal_code.data and not form.coordinate.data %}
<div id="extended_search_form" class="{% if form_collapsed %}collapse{% else %}show{% endif %}">
{% if form.category_id %}
@ -74,6 +74,8 @@ var vue_app_data = { eventId: 0 };
{{ render_field_with_errors(form.event_place_id, formrow="1") }}
{% endif %}
{{ render_field_with_errors(form.postal_code, formrow="1") }}
{{ render_event_dates_location_field(form.location, form.distance) }}
</div>
@ -93,7 +95,8 @@ var vue_app_data = { eventId: 0 };
<th>{{ _('Event') }}</th>
<th>{{ _('Organizer') }}</th>
<th>{{ _('Place') }}</th>
<th><i class="fa fa-info" data-toggle="tooltip" title="{{ _('Number of references') }} / {{ _('Number of reference requests.') }}"></i></th>
<th><i class="fa fa-fw fa-image" data-toggle="tooltip" title="{{ _('Photo') }}"></i></th>
<th><i class="fa fa-fw fa-link" data-toggle="tooltip" title="{{ _('Number of references') }} / {{ _('Number of reference requests.') }}"></i></th>
</tr>
</thead>
<tbody>
@ -123,8 +126,12 @@ var vue_app_data = { eventId: 0 };
{{ render_event_warning_pills(event) }}
</td>
<td><a href="{{ url_for('organizer_update', id=event.organizer.id) }}" class="text-body">{{ event.organizer.name }}</a></td>
<td><a href="{{ url_for('event_place_update', id=event.event_place.id) }}" class="text-body">{{ event.event_place.name }}</a></td>
<td class="fit">{{ event.references|length }}/{{ event.reference_requests|length }}</td>
<td>
<div><a href="{{ url_for('event_place_update', id=event.event_place.id) }}" class="text-body">{{ event.event_place.name }}</a></div>
<div>{% if event.event_place.location %}{{ event.event_place.location.postalCode }} {{ event.event_place.location.city }}{% endif %}</div>
</td>
<td><i class="fa fa-fw fa-image {% if event.photo %}text-success{% else %}text-muted{% endif %}" data-toggle="tooltip" title="{{ _('Photo') }}"></i></td>
<td class="fit"><span data-toggle="tooltip" title="{{ _('Number of references') }} / {{ _('Number of reference requests.') }}">{{ event.references|length }}/{{ event.reference_requests|length }}</span></td>
</tr>
{% endfor %}
</tbody>

8
project/templates/manage/organizers.html
View File

@ -19,8 +19,8 @@
<th>{{ _('Location') }}</th>
<th>{{ _('Phone') }}</th>
<th>{{ _('Email') }} / {{ _('Link URL') }}</th>
<th>{{ _('Logo') }}</th>
<th><i class="fa fa-info" data-toggle="tooltip" title="{{ _('Number of events') }}"></i></th>
<th><i class="fa fa-fw fa-image" data-toggle="tooltip" title="{{ _('Logo') }}"></i></th>
<th><i class="fa fa-fw fa-calendar" data-toggle="tooltip" title="{{ _('Number of events') }}"></i></th>
</tr>
</thead>
<tbody>
@ -44,8 +44,8 @@
<div>{{ organizer.email or '' }}</div>
<div>{{ organizer.url or '' }}</div>
</td>
<td>{% if organizer.logo %}<i class="fa fa-fw fa-check-circle text-success"></i>{% endif %}</td>
<td><a class="text-body" href="{{ url_for('manage_admin_unit_events', id=admin_unit.id, organizer_id=organizer.id) }}">{{ organizer.events|length }}</a></td>
<td><i class="fa fa-fw fa-image {% if organizer.logo %}text-success{% else %}text-muted{% endif %}" data-toggle="tooltip" title="{{ _('Logo') }}"></i></td>
<td><a class="text-body" href="{{ url_for('manage_admin_unit_events', id=admin_unit.id, organizer_id=organizer.id) }}" data-toggle="tooltip" title="{{ _('Number of events') }}">{{ organizer.events|length }}</a></td>
</tr>
{% endfor %}
</tbody>

12
project/templates/manage/places.html
View File

@ -17,9 +17,9 @@
<tr>
<th>{{ _('Name') }}</th>
<th>{{ _('Location') }}</th>
<th><i class="fa fa-info" data-toggle="tooltip" title="{{ _('Coordinates') }}"></i></th>
<th>{{ _('Photo') }}</th>
<th><i class="fa fa-info" data-toggle="tooltip" title="{{ _('Number of events') }}"></i></th>
<th><i class="fa fa-fw fa-map-marker-alt" data-toggle="tooltip" title="{{ _('Coordinates') }}"></i></th>
<th><i class="fa fa-fw fa-image" data-toggle="tooltip" title="{{ _('Photo') }}"></i></th>
<th><i class="fa fa-fw fa-calendar" data-toggle="tooltip" title="{{ _('Number of events') }}"></i></th>
</tr>
</thead>
<tbody>
@ -35,9 +35,9 @@
</div>
</td>
<td>{{ render_location(place.location) }}</td>
<td>{% if place.location and place.location.coordinate %}<i class="fa fa-fw fa-check-circle text-success"></i>{% endif %}</td>
<td>{% if place.photo %}<i class="fa fa-fw fa-check-circle text-success"></i>{% endif %}</td>
<td><a class="text-body" href="{{ url_for('manage_admin_unit_events', id=admin_unit.id, event_place_id=place.id) }}">{{ place.events|length }}</a></td>
<td><i class="fa fa-fw fa-map-marker-alt {% if place.location and place.location.coordinate %}text-success{% else %}text-muted{% endif %}" data-toggle="tooltip" title="{{ _('Coordinates') }}"></i></td>
<td><i class="fa fa-fw fa-image {% if place.photo %}text-success{% else %}text-muted{% endif %}" data-toggle="tooltip" title="{{ _('Photo') }}"></i></td>
<td><a class="text-body" href="{{ url_for('manage_admin_unit_events', id=admin_unit.id, event_place_id=place.id) }}" data-toggle="tooltip" title="{{ _('Number of events') }}">{{ place.events|length }}</a></td>
</tr>
{% endfor %}
</tbody>