diff --git a/teamsnap/dashboard/templates/dashboard.html b/teamsnap/dashboard/templates/dashboard.html index 9c473af..6bbb31d 100644 --- a/teamsnap/dashboard/templates/dashboard.html +++ b/teamsnap/dashboard/templates/dashboard.html @@ -19,54 +19,7 @@
{% for event, availability_summary in events_availabilities|slice:":5" %} -
-
-
-
-
- -
-
-
-
-
-

{{ event.data.formatted_title }}

-
{{ event.data.start_date|date:"D, F j, g:i A" }}
-
{{ event.data.location_name }}
-
-
- - Go to Lineup - - - - -
- - - - -
-
-
-
-
+ {% include "widgets/event-card.html"%} {% endfor %}
@@ -82,41 +35,7 @@
{% for event in ts_events_past|slice:":4" %} -
-
-
-
-
-

{{ event.data.formatted_results }}

-
-
-
-
-

{{ event.data.formatted_title }}

-
{{ event.data.start_date|date:"D, F j" }}
- {#
{{ event.data.location_name }}
Go to Lineup#} - -
-
- - - - -
-
-
-
-
+ {% include "widgets/event-card.html"%} {% endfor %}
@@ -124,42 +43,3 @@ {% endblock %} -{% block inline_javascript %} - -{% endblock %} diff --git a/teamsnap/dashboard/templates/widgets/event-card.html b/teamsnap/dashboard/templates/widgets/event-card.html new file mode 100644 index 0000000..ff6da85 --- /dev/null +++ b/teamsnap/dashboard/templates/widgets/event-card.html @@ -0,0 +1,44 @@ +{% load availability_percentage %} +
+
+
+
+ {{ event.data.formatted_title }} +
+ {{ event.data.start_date|date:"D, F j, g:i A" }}
+ {{ event.data.location_name }} +
+
+ {% if not event.data.results %} +
+
+
{{ availability_summary.data.player_going_count }}
+
{{ availability_summary.data.player_maybe_count }}
+
{{ availability_summary.data.player_not_going_count }}
+
{{ availability_summary.data.player_unknown_count }}
+
+
+ {% endif %} + {% if event.data.results %} +
+ {{ event.data.formatted_results }} +
+ {% endif %} +
+ +
+ +
+
diff --git a/teamsnap/dashboard/views.py b/teamsnap/dashboard/views.py index 8c6adf3..13163f1 100644 --- a/teamsnap/dashboard/views.py +++ b/teamsnap/dashboard/views.py @@ -1,9 +1,22 @@ import datetime +from django import template from django.shortcuts import redirect, render from teamsnap.views import get_teamsnap_client +register = template.Library() + + +@register.simple_tag +def multiply(a, b): + return a * b + + +@register.simple_tag +def divide(a, b): + return int(a / b) + def dashboard(request, team_id=None): if not team_id: diff --git a/teamsnap/lineup/templates/lineup/edit.html b/teamsnap/lineup/templates/lineup/edit.html index 7815256..6e713a4 100644 --- a/teamsnap/lineup/templates/lineup/edit.html +++ b/teamsnap/lineup/templates/lineup/edit.html @@ -4,40 +4,27 @@ {#{% block page_subheading %}{% endblock %}#} {% block content %} - {#
#} - {#
#} - {# {% for event_data in contexts %}#} - {#
#} - {#
#} - {#

{{ event_data.event.data.formatted_title }}

#} - {#
{{ event_data.data.start_date }}
#} - {#
#} - {# {% include 'teamsnap/lineup/widgets/lineup.html' with formset_lineup=event_data.formset_lineup formset_bench=event_data.formset_bench event_id=event_data.event.data.id %}#} - {#
#} - {# {% endfor %}#} - {#
#} - {#
#} -
- -
- - - - {% for event_data in contexts %} - - {% endfor %} - - -
- {% include "lineup/widgets/lineup.html" with event=event_data.event event_id=event_data.event.data.id formset=event_data.formset formset_startinglineup=event_data.formset_startinglineup formset_bench=event_data.formset_bench formset_out=event_data.formset_out formset_startingpositionalonly=event_data.formset_startingpositionalonly %} -
-
+
+ +
+ + + + {% for event_data in contexts %} + + {% endfor %} + + +
+ {% include "lineup/widgets/lineup.html" with event=event_data.event event_id=event_data.event.data.id formset=event_data.formset formset_startinglineup=event_data.formset_startinglineup formset_bench=event_data.formset_bench formset_out=event_data.formset_out formset_startingpositionalonly=event_data.formset_startingpositionalonly availability_summary=event_data.availability_summary %} +
+
+
{% endblock %} {% block inline_javascript %} - {{ block.super }} + {{ block.super }}