diff --git a/app/templates/_game_player_info.html b/app/templates/_game_player_info.html index b1d512c..cba60d2 100644 --- a/app/templates/_game_player_info.html +++ b/app/templates/_game_player_info.html @@ -3,15 +3,19 @@ - + + + + + - + - +
My Role{{ current_user.}}{{ current_user.role_in_game(game).name }}
Game State{{ game.state.name }}
Start Time10:00{% if game.start_time %}{{ moment(game.start_time).format('DD-MM-YYYY, hh:mm')}}{% else %}-{% endif %}
End Time18:00{% if game.end_time %}{{ moment(game.end_time).format('DD-MM-YYYY, hh:mm')}}{% else %}-{% endif %}
diff --git a/app/templates/game_bunny_dashboard.html b/app/templates/game_bunny_dashboard.html index 4da5150..a674330 100644 --- a/app/templates/game_bunny_dashboard.html +++ b/app/templates/game_bunny_dashboard.html @@ -98,7 +98,7 @@ L.control.scale().addTo(map); L.tileLayer( 'https://geodata.nationaalgeoregister.nl/tiles/service/wmts/brtachtergrondkaartpastel/EPSG:3857/{z}/{x}/{y}.png', { - attribution: 'Kaartgegevens © Kadaster' + attribution: 'Kaartgegevens © Kadaster' }).addTo( map ); var objectives = JSON.parse('{{ json.dumps(game.objectives, cls=objective_encoder)|safe }}') diff --git a/app/templates/game_hunter_dashboard.html b/app/templates/game_hunter_dashboard.html index 4528bf0..a9237ae 100644 --- a/app/templates/game_hunter_dashboard.html +++ b/app/templates/game_hunter_dashboard.html @@ -7,7 +7,7 @@ {% endblock %} {% block app_content %} -

{{ game.name }} Dashboard

+

{{ game.name }}: {{ current_user.name }}

{% include '_game_player_info.html' %}

Bunnies:

@@ -23,7 +23,7 @@ {% for player in game.bunnies() %} {{ player.name }} - {{ player.caught_by_players | selectattr('game', '==', game)|list|length}} + {{ player.caught_by_players | selectattr('game', '==', game) | selectattr('catching_player', '==', current_user) |list|length}} {% with location = player.last_location(game) %} {% if location %}{{ moment(location.timestamp).fromNow()}}: {% endif %} {{ location }} @@ -52,7 +52,7 @@ L.control.scale().addTo(map); L.tileLayer( 'https://geodata.nationaalgeoregister.nl/tiles/service/wmts/brtachtergrondkaartpastel/EPSG:3857/{z}/{x}/{y}.png', { - attribution: 'Kaartgegevens © Kadaster' + attribution: 'Kaartgegevens © Kadaster' }).addTo( map ); var greenIcon = new L.Icon({ diff --git a/app/templates/game_owner_dashboard.html b/app/templates/game_owner_dashboard.html index 4da5150..a674330 100644 --- a/app/templates/game_owner_dashboard.html +++ b/app/templates/game_owner_dashboard.html @@ -98,7 +98,7 @@ L.control.scale().addTo(map); L.tileLayer( 'https://geodata.nationaalgeoregister.nl/tiles/service/wmts/brtachtergrondkaartpastel/EPSG:3857/{z}/{x}/{y}.png', { - attribution: 'Kaartgegevens © Kadaster' + attribution: 'Kaartgegevens © Kadaster' }).addTo( map ); var objectives = JSON.parse('{{ json.dumps(game.objectives, cls=objective_encoder)|safe }}') diff --git a/app/templates/objective.html b/app/templates/objective.html index d452010..a8e86a1 100644 --- a/app/templates/objective.html +++ b/app/templates/objective.html @@ -69,7 +69,7 @@ L.control.scale().addTo(map); L.tileLayer( 'https://geodata.nationaalgeoregister.nl/tiles/service/wmts/brtachtergrondkaartpastel/EPSG:3857/{z}/{x}/{y}.png', { - attribution: 'Kaartgegevens © Kadaster' + attribution: 'Kaartgegevens © Kadaster' }).addTo( map ); if ('{{ owner }}' == 'True'){ diff --git a/app/templates/player.html b/app/templates/player.html index cdaea91..45d1db4 100644 --- a/app/templates/player.html +++ b/app/templates/player.html @@ -48,7 +48,7 @@ L.control.scale().addTo(map); L.tileLayer( 'https://geodata.nationaalgeoregister.nl/tiles/service/wmts/brtachtergrondkaartpastel/EPSG:3857/{z}/{x}/{y}.png', { - attribution: 'Kaartgegevens © Kadaster' + attribution: 'Kaartgegevens © Kadaster' }).addTo( map ); var greenIcon = new L.Icon({