From 41065712a6615ec03e6e5d092fd7dd9f2dd2aafd Mon Sep 17 00:00:00 2001
From: Daniel Grams <grams.daniel@gmail.com>
Date: Mon, 18 Jan 2021 14:03:10 +0100
Subject: [PATCH] Show booked_up in event lists #63

---
 project/api/event/schemas.py                       |  1 +
 project/templates/_macros.html                     | 14 ++++++++++++--
 project/templates/event_date/list.html             |  4 ++--
 project/templates/layout.html                      | 13 +++++++++++++
 project/templates/manage/events.html               |  4 ++--
 .../manage/reference_requests_incoming.html        |  2 +-
 .../manage/reference_requests_outgoing.html        |  2 +-
 project/templates/manage/references_incoming.html  |  4 ++--
 project/templates/manage/references_outgoing.html  |  4 ++--
 project/templates/planing/list.html                |  4 ++--
 project/templates/widget/event_date/list.html      |  6 +++---
 project/templates/widget/infoscreen/read.html      |  4 ++--
 12 files changed, 43 insertions(+), 19 deletions(-)

diff --git a/project/api/event/schemas.py b/project/api/event/schemas.py
index aba641b..c2f435b 100644
--- a/project/api/event/schemas.py
+++ b/project/api/event/schemas.py
@@ -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))
diff --git a/project/templates/_macros.html b/project/templates/_macros.html
index 551442c..900eaf1 100644
--- a/project/templates/_macros.html
+++ b/project/templates/_macros.html
@@ -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>
diff --git a/project/templates/event_date/list.html b/project/templates/event_date/list.html
index 43f5774..c501db4 100644
--- a/project/templates/event_date/list.html
+++ b/project/templates/event_date/list.html
@@ -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">' +
diff --git a/project/templates/layout.html b/project/templates/layout.html
index 72d2cf4..aa9c8f1 100644
--- a/project/templates/layout.html
+++ b/project/templates/layout.html
@@ -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>
diff --git a/project/templates/manage/events.html b/project/templates/manage/events.html
index 999547b..f389566 100644
--- a/project/templates/manage/events.html
+++ b/project/templates/manage/events.html
@@ -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 %}
diff --git a/project/templates/manage/reference_requests_incoming.html b/project/templates/manage/reference_requests_incoming.html
index ae0488f..fd5890c 100644
--- a/project/templates/manage/reference_requests_incoming.html
+++ b/project/templates/manage/reference_requests_incoming.html
@@ -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 %}
diff --git a/project/templates/manage/reference_requests_outgoing.html b/project/templates/manage/reference_requests_outgoing.html
index e5fa9ba..6e8cea7 100644
--- a/project/templates/manage/reference_requests_outgoing.html
+++ b/project/templates/manage/reference_requests_outgoing.html
@@ -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 %}
diff --git a/project/templates/manage/references_incoming.html b/project/templates/manage/references_incoming.html
index 34778d1..ddbe7c5 100644
--- a/project/templates/manage/references_incoming.html
+++ b/project/templates/manage/references_incoming.html
@@ -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 %}
diff --git a/project/templates/manage/references_outgoing.html b/project/templates/manage/references_outgoing.html
index 82e8a8c..0dd6a56 100644
--- a/project/templates/manage/references_outgoing.html
+++ b/project/templates/manage/references_outgoing.html
@@ -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 %}
diff --git a/project/templates/planing/list.html b/project/templates/planing/list.html
index 62eb1fd..cbac7a0 100644
--- a/project/templates/planing/list.html
+++ b/project/templates/planing/list.html
@@ -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;
diff --git a/project/templates/widget/event_date/list.html b/project/templates/widget/event_date/list.html
index 7c3bbef..fed0f57 100644
--- a/project/templates/widget/event_date/list.html
+++ b/project/templates/widget/event_date/list.html
@@ -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 %}
diff --git a/project/templates/widget/infoscreen/read.html b/project/templates/widget/infoscreen/read.html
index b4f5fb1..5269252 100644
--- a/project/templates/widget/infoscreen/read.html
+++ b/project/templates/widget/infoscreen/read.html
@@ -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>