From 97e9a3c9d523491e5a480223b15db8283ede4e3e Mon Sep 17 00:00:00 2001 From: Adam Goldsmith Date: Mon, 22 Jan 2024 12:33:34 -0500 Subject: [PATCH] membershipworks: Use django-tables2 for event reports --- .../event_index_report.dj.html | 35 +------- .../event_month_report.dj.html | 37 +------- .../membershipworks/event_year_report.dj.html | 35 +------- membershipworks/views.py | 86 ++++++++++++++++++- 4 files changed, 88 insertions(+), 105 deletions(-) diff --git a/membershipworks/templates/membershipworks/event_index_report.dj.html b/membershipworks/templates/membershipworks/event_index_report.dj.html index 7da8d62..fd5664d 100644 --- a/membershipworks/templates/membershipworks/event_index_report.dj.html +++ b/membershipworks/templates/membershipworks/event_index_report.dj.html @@ -1,40 +1,9 @@ {% extends "base.dj.html" %} -{% load membershipworks_tags %} +{% load render_table from django_tables2 %} {% block title %}Event Report Index{% endblock %} {% block breadcrumbs %}{% endblock %} {% block content %} -
- - - - - - - - - - - - - - - {% for year in object_list %} - - - - - - - - - - - {% endfor %} - -
MonthEventsCanceled EventsTicketsUnique InstructorsMeetingsTotal HoursTotal Person Hours
- {{ year.year|date:"Y" }} - {{ year.event_count }}{{ year.canceled_event_count }}{{ year.count__sum }}{{ year.instructor__count }}{{ year.meeting_times__count__sum }}{{ year.duration__sum|duration_as_hours|floatformat:-2 }}{{ year.person_hours__sum|duration_as_hours|floatformat:-2 }}
-
+ {% render_table table %} {% endblock %} diff --git a/membershipworks/templates/membershipworks/event_month_report.dj.html b/membershipworks/templates/membershipworks/event_month_report.dj.html index 7c6c13b..3e6e2a3 100644 --- a/membershipworks/templates/membershipworks/event_month_report.dj.html +++ b/membershipworks/templates/membershipworks/event_month_report.dj.html @@ -1,6 +1,6 @@ {% extends "base.dj.html" %} -{% load membershipworks_tags %} +{% load render_table from django_tables2 %} {% block title %}Event Report {{ month|date:"N Y" }}{% endblock %} {% block breadcrumbs %} @@ -13,40 +13,7 @@ {% endblock %} {% block content %} -
- - - - - - - - - - - - - - - - {% for event in object_list %} - - - - - - - - - - - - {% endfor %} - -
TitleDateInstructorCategoryTicket CountTicket CapMeetingsTotal DurationPerson Hours
- {{ event.title }} - {{ event.start|date }}{{ event.instructor }}{{ event.category }}{{ event.count }}{{ event.cap }}{{ event.meeting_times__count }}{{ event.duration|duration_as_hours|floatformat:-2 }}{{ event.person_hours|duration_as_hours|floatformat:-2 }}
-
+ {% render_table table %}