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 #64 from DanielGrams/issue/63-booked_up

Browse Source 
Show booked_up in event lists #63
This commit is contained in:
Daniel Grams 2021-01-18 15:07:10 +01:00 committed by GitHub
commit cff13e5ba9
12 changed files with 43 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
project/api/event/schemas.py
View File

@ -88,6 +88,7 @@ class EventSearchItemSchema(EventRefSchema):
photo = fields.Nested(ImageRefSchema)
place = fields.Nested(PlaceSearchItemSchema, attribute="event_place")
status = EnumField(EventStatus)
booked_up = marshmallow.auto_field()
organizer = fields.Nested(OrganizerRefSchema)
organization = fields.Nested(OrganizationRefSchema, attribute="admin_unit")
categories = fields.List(fields.Nested(EventCategoryRefSchema))

14
project/templates/_macros.html
View File

@ -125,7 +125,7 @@
<td>{{ render_event_date(event) }}</td>
<td>
<a href="{{ url_for('event', event_id=event.id) }}">{{ event.name }}</a>
{{ render_event_status_pill(event) }}
{{ render_event_warning_pills(event) }}
</td>
<td>{{ render_event_organizer(event.organizer) }}</td>
<td>{{ render_place(event.event_place) }}</td>
@ -238,6 +238,16 @@
{% endif %}
{% endmacro %}
{% macro render_booked_up_pill(event) %}
{% if event.booked_up %}
<span class="badge badge-pill badge-warning">{{ _('Booked up') }}</span>
{% endif %}
{% endmacro %}
{% macro render_event_warning_pills(event) %}
{{ render_event_status_pill(event) }} {{ render_booked_up_pill(event) }}
{% endmacro %}
{% macro render_event_review_status_pill(event) %}
{% if event.review_status %}
<span class="badge badge-pill {% if event.review_status == 2 %}badge-success{% elif event.review_status == 1 %}badge-info{% else %}badge-danger{% endif %}">{{ event.review_status | loc_enum }}</span>
@ -339,7 +349,7 @@
</div>
<div class="card-body">
<h5 class="card-title">{{ event.name }}{{ render_event_status_pill(event) }}</h5>
<h5 class="card-title">{{ event.name }}{{ render_event_warning_pills(event) }}</h5>
{% if dates and dates|length > 1 %}
<div>
<i class="fa fa-fw fas fa-calendar" data-toggle="tooltip" title="{{ _('Date') }}"></i>

4
project/templates/event_date/list.html
View File

@ -1,5 +1,5 @@
{% extends "layout.html" %}
{% from "_macros.html" import render_google_filter_autocomplete_header, render_event_dates_filter_form, render_pagination, render_event_status_pill, render_place, render_events_sub_menu %}
{% from "_macros.html" import render_google_filter_autocomplete_header, render_event_dates_filter_form, render_pagination, render_place, render_events_sub_menu %}
{% block title %}
{{ _('Event Dates') }}
{% endblock %}
@ -175,7 +175,7 @@
'<div class="card-header">' + start.format("dd. DD.MM.YYYY LT") + '</div>' +
img_tag +
'<div class="card-body" style="padding:1rem">' +
'<h5 class="card-title"><a href="eventdate/' + event_date.id + '">' + event.name + '</a> <span class="small" style="vertical-align: middle;">' + render_event_status_pill(event) + '</span></h5>' +
'<h5 class="card-title"><a href="eventdate/' + event_date.id + '">' + event.name + '</a> <span class="small" style="vertical-align: middle;">' + render_event_warning_pills(event) + '</span></h5>' +
'<p class="card-text">' + event.description.truncate(100) + '</p>' +
'</div>' +
'<div class="card-footer text-muted small">' +

13
project/templates/layout.html
View File

@ -75,6 +75,19 @@
return '';
}
function render_booked_up_pill(event) {
if (event.booked_up) {
return '<span class="badge badge-pill badge-warning">{{ _('Booked up') }}</span>';
}
return '';
}
function render_event_warning_pills(event) {
return render_event_status_pill(event) + ' ' + render_booked_up_pill(event);
}
</script>
<title>{% block title %}{{ title|default('oveda') }}{% endblock title %}</title>

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

@ -1,6 +1,6 @@
{% extends "layout_manage.html" %}
{% set active_id = "events" %}
{% from "_macros.html" import render_event_dates_filter_form, render_event_status_pill, render_pagination, render_event_date, render_field_with_errors, render_event_organizer %}
{% from "_macros.html" import render_event_dates_filter_form, render_event_warning_pills, render_pagination, render_event_date, render_field_with_errors, render_event_organizer %}
{% block title %}
{{ _('Events') }}
{% endblock %}
@ -29,7 +29,7 @@
<a class="dropdown-item" href="{{ url_for('event_create_for_admin_unit_id', id=event.admin_unit_id, template_id=event.id) }}">{{ _('Duplicate') }}&hellip;</a>
</div>
</div>
{{ render_event_status_pill(event) }}
{{ render_event_warning_pills(event) }}
<small>{{ event.organizer.name }}</small>
</li>
{% endfor %}

2
project/templates/manage/reference_requests_incoming.html
View File

@ -1,6 +1,6 @@
{% extends "layout_manage.html" %}
{% set active_id = "reference_requests_incoming" %}
{% from "_macros.html" import render_reference_request_review_status_pill, render_event_status_pill, render_event_date, render_pagination, render_event_organizer %}
{% from "_macros.html" import render_reference_request_review_status_pill, render_event_date, render_pagination, render_event_organizer %}
{% block title %}
{{ _('Reference requests') }}
{% endblock %}

2
project/templates/manage/reference_requests_outgoing.html
View File

@ -1,6 +1,6 @@
{% extends "layout_manage.html" %}
{% set active_id = "reference_requests_outgoing" %}
{% from "_macros.html" import render_reference_request_review_status_pill, render_event_status_pill, render_event_date, render_pagination, render_event_organizer %}
{% from "_macros.html" import render_reference_request_review_status_pill, render_event_date, render_pagination, render_event_organizer %}
{% block title %}
{{ _('Reference requests') }}
{% endblock %}

4
project/templates/manage/references_incoming.html
View File

@ -1,6 +1,6 @@
{% extends "layout_manage.html" %}
{% set active_id = "references_incoming" %}
{% from "_macros.html" import render_event_status_pill, render_event_date, render_pagination, render_event_organizer %}
{% from "_macros.html" import render_event_warning_pills, render_event_date, render_pagination, render_event_organizer %}
{% block title %}
{{ _('References') }}
{% endblock %}
@ -21,7 +21,7 @@
<a class="dropdown-item" href="{{ url_for('reference_delete', id=reference.id) }}">{{ _('Delete') }}&hellip;</a>
</div>
</div>
{{ render_event_status_pill(reference.event) }}
{{ render_event_warning_pills(reference.event) }}
<small>{{ reference.event.admin_unit.name }}</small>
</li>
{% endfor %}

4
project/templates/manage/references_outgoing.html
View File

@ -1,6 +1,6 @@
{% extends "layout_manage.html" %}
{% set active_id = "references_outgoing" %}
{% from "_macros.html" import render_event_status_pill, render_event_date, render_pagination, render_event_organizer %}
{% from "_macros.html" import render_event_warning_pills, render_event_date, render_pagination, render_event_organizer %}
{% block title %}
{{ _('References') }}
{% endblock %}
@ -19,7 +19,7 @@
<a class="dropdown-item" href="{{ url_for('event', event_id=reference.event.id) }}">{{ _('View') }}</a>
</div>
</div>
{{ render_event_status_pill(reference.event) }}
{{ render_event_warning_pills(reference.event) }}
<small>{{ reference.admin_unit.name }}</small>
</li>
{% endfor %}

4
project/templates/planing/list.html
View File

@ -1,5 +1,5 @@
{% extends "layout.html" %}
{% from "_macros.html" import render_field, render_field_with_errors, render_event_dates_date_field, render_event_dates_location_field, render_google_filter_autocomplete_header, render_event_dates_filter_form, render_pagination, render_event_status_pill, render_place, render_events_sub_menu %}
{% from "_macros.html" import render_field, render_field_with_errors, render_event_dates_date_field, render_event_dates_location_field, render_google_filter_autocomplete_header, render_event_dates_filter_form, render_pagination, render_place, render_events_sub_menu %}
{% block title %}
{{ _('Event Planing') }}
{% endblock %}
@ -61,7 +61,7 @@ $( function() {
} else {
tbody.append('<tr>' +
'<td class="fit">' + start.format("LT") + '</td>' +
'<td colspan="3"><a href="eventdate/' + event_date.id + '">' + event.name + '</a> ' + render_event_status_pill(event) + '</td>' +
'<td colspan="3"><a href="eventdate/' + event_date.id + '">' + event.name + '</a> ' + render_event_warning_pills(event) + '</td>' +
'<td class="small text-muted">' + event.organizer.name + '</td>' +
'</tr>');
no_events = false;

6
project/templates/widget/event_date/list.html
View File

@ -1,5 +1,5 @@
{% extends "layout.html" %}
{% from "_macros.html" import render_widget_styles, render_pagination, render_event_status_pill, render_event_status_pill, render_place, render_events_sub_menu %}
{% from "_macros.html" import render_widget_styles, render_pagination, render_event_warning_pills, render_event_warning_pills, render_place, render_events_sub_menu %}
{% block title %}
{{ _('Widget') }}
{% endblock %}
@ -56,7 +56,7 @@
<div class="card-body">
<div class="row">
<div class="col-sm-8">
<h5 class="card-title">{{ date.event.name }}{{ render_event_status_pill(date.event) }}</h5>
<h5 class="card-title">{{ date.event.name }}{{ render_event_warning_pills(date.event) }}</h5>
<h6 class="card-subtitle mb-2 text-body"><i class="fa fa-calendar"></i> {{ date.start | dateformat('medium') }} {{ date.start | timeformat('short') }}</h6>
<p class="card-text">{{ date.event.description | truncate(200) }}</p>
{% if date.event.admin_unit_id != params.admin_unit_id %}
@ -88,7 +88,7 @@
<div class="card-body">
<div class="row">
<div class="col-sm-12">
<h5 class="card-title">{{ date.event.name }}{{ render_event_status_pill(date.event) }}</h5>
<h5 class="card-title">{{ date.event.name }}{{ render_event_warning_pills(date.event) }}</h5>
<h6 class="card-subtitle mb-2 text-body"><i class="fa fa-calendar"></i> {{ date.start | dateformat('medium') }} {{ date.start | timeformat('short') }}</h6>
<p class="card-text">{{ date.event.description | truncate(100) }}</p>
{% if date.event.admin_unit_id != params.admin_unit_id %}

4
project/templates/widget/infoscreen/read.html
View File

@ -1,5 +1,5 @@
{% extends "layout.html" %}
{% from "_macros.html" import render_widget_styles, render_location, render_location_prop, render_logo, render_pagination, render_event_status_pill, render_place, render_events_sub_menu %}
{% from "_macros.html" import render_widget_styles, render_location, render_location_prop, render_logo, render_pagination, render_event_warning_pills, render_place, render_events_sub_menu %}
{% block title %}
{{ admin_unit.name }} Infoscreen
{% endblock %}
@ -53,7 +53,7 @@
</div>
{% endif %}
<div class="col" style="padding:1rem">
<h3>{{ date.event.name }}{{ render_event_status_pill(date.event) }}</h3>
<h3>{{ date.event.name }}{{ render_event_warning_pills(date.event) }}</h3>
<p>{{ date.event.description | truncate(300) }}</p>
</div>
</div>