Vous avez reçu un message "Your GitLab account has been locked ..." ? Pas d'inquiétude : lisez cet article https://docs.gricad-pages.univ-grenoble-alpes.fr/help/unlock/

Commit e6a95b86 authored by Arnaud Bey's avatar Arnaud Bey
Browse files

fix #75 - affichage des résultats

parent 1558116c
......@@ -59,6 +59,7 @@ days: days
decline_challenge: Decline challenge
definition: Definition of
description: Description
details: Details
determiner: Determiner
done_objectives: Completed objectives
edit_game: 'Edit games'
......@@ -113,8 +114,8 @@ massive: 'Massive game'
massives: 'Massive games'
me: Me
message: Message
minute: minute
minutes: minutes
minute: min.
minutes: min.
mood: Mood
mute_sounds: Turn off sounds
my_friends: 'My friends'
......@@ -164,10 +165,10 @@ rush: Rush
save_grid: 'Save the grid'
save_objectives: 'Save objectives'
save: Save
score: Total score
second: second
score: Score
second: sec.
secondPerson: 2nd person
seconds: seconds
seconds: sec.
see_combos: 'See combos'
see_constraints: See possible constraints
see_grid: 'See grid'
......
......@@ -65,6 +65,7 @@ days: jours
decline_challenge: Refuser le défi
definition: Définition de
description: Description
details: Détails
determiner: déterminant
display_mail: Afficher son email
done_objectives: Objectifs réalisés
......@@ -128,8 +129,8 @@ massive: 'partie massive'
massives: 'Parties massives'
me: Moi
message: Message
minute: minute
minutes: minutes
minute: min.
minutes: min.
mood: Mode
mute_sounds: Désactiver les sons
my_friends: 'Mes contacts'
......@@ -186,10 +187,10 @@ save_all: Tout sauvegarder
save_grid: 'Sauvegarder la grille'
save_objectives: 'Sauvegarder les objectifs'
save: Sauvegarder
score: Score total
second: seconde
score: Score
second: sec.
secondPerson: 2ème personne
seconds: secondes
seconds: sec.
see_combos: 'Voir les combos possibles'
see_constraints: Voir les contraintes possibles
see_grid: 'Voir la grille'
......
......@@ -12,13 +12,13 @@
{% macro foundableComplete(foundable, activity, activities, type) %}
{% import _self as my_macros %}
{% set percent = my_macros.percent(foundable, activities) %}
<div class="col-4 foundable mb-2" data-form="{{ foundable.form }}" data-points="{{ foundable.points }}" data-percent="{{ percent }}" data-length="{{ foundable.form|length }}">
<div class="col-sm-6 col-md-4 foundable mb-2" data-form="{{ foundable.form }}" data-points="{{ foundable.points }}" data-percent="{{ percent }}" data-length="{{ foundable.form|length }}">
<div class="accordion" id="accordion{{type}}">
<div class="card">
<div data-toggle="collapse" data-target="#{{ type ~ '-' ~ foundable.id }}" class="btn card-header {% if activity and foundable in activity.foundForms and type == "foundable" %}bg-success{% endif %}" >
{{ foundable.form | upper }} <span class="text-muted">({{ foundable.points}})</span>
<span class="float-right">
<span class="badge badge-light">{{ percent }}</span>
<span class="badge badge-secondary">{{ percent }}</span>
</span>
</div>
<div id="{{ type ~ '-' ~ foundable.id }}" class="collapse" data-parent="#accordion{{type}}">
......
{% set scores = getScores(massive) %}
{% import "MagicWordBundle:Player:macros.html.twig" as pmacros %}
<div class="card">
<div class="card-body">
<table class="table table-bordered table-striped">
<div class="card p-0">
<div class="card-body p-0">
<div class="table-responsive">
<table class="table table-striped text-center">
<thead>
<th>{{ "rank" | trans }}</th>
<th>{{ "player" | trans }}</th>
......@@ -32,6 +33,7 @@
{% endfor %}
</tbody>
</table>
</div>
</div>
</div>
......
......@@ -3,22 +3,14 @@
{% block title %}{{ 'massive_end' | trans }}{% endblock %}
{% block body -%}
<div class="card">
<div class="card-header">
{% include "MagicWordBundle:Common:backtohome.html.twig" %}
{{ 'game_end' | trans }} <strong>{{ massive.name }}</strong>
</div>
<div class="card-body">
<!-- Nav tabs -->
<ul class="nav nav-tabs" role="tablist">
<li role="presentation" class="active"><a href="#ranking" aria-controls="ranking" role="tab" data-toggle="tab">{{ "ranking" | trans }}</a></li>
</ul>
<nav aria-label="breadcrumb">
<ol class="breadcrumb" style="background-color: #fff;">
<li class="breadcrumb-item"><a href="{{path('home')}}">Accueil</a></li>
<li class="breadcrumb-item" aria-current="page"><a href="{{path('home_play')}}">Jouer</a></li>
<li class="breadcrumb-item" aria-current="page"><a href="{{path('massives')}}">{{'massives'|trans}}</a></li>
<li class="breadcrumb-item active" aria-current="page">{{ 'game_end' | trans }} {{ massive.name }}</li>
</ol>
</nav>
<div class="tab-content">
<div role="tabpanel" class="tab-pane active show" id="ranking">
{% include "MagicWordBundle:Game/Massive/partials:ranking.html.twig" %}
</div>
</div>
</div>
</div>
{% include "MagicWordBundle:Game/Massive/partials:ranking.html.twig" %}
{% endblock %}
{% macro playerPicAndName(player) %}
{% set picUrl = (player.profilepicPath) ? asset('upload/profilepic/' ~ player.profilepicPath) : asset('img/user.png') %}
<img height="22px" src="{{ picUrl }}"/>
<a href="{{ path('profile', {"id": player.id}) }}">{{ player.username }}</a>
{% set picUrl = (player.profilepicPath) ? asset('upload/profilepic/' ~ player.profilepicPath) : asset('img/user.png') %}
<img height="22px" src="{{ picUrl }}"/>
<a href="{{ path('profile', {"id": player.id}) }}">{{ player.username }}</a>
{% endmacro %}
......@@ -21,7 +21,7 @@
<div class="card-body">
<div id="founded" class="row">
{% for foundable in activity.foundForms %}
{{ macros.foundableComplete(foundable, activity, activities, "found") }}
{{ macros.foundableComplete(foundable, activity, activities, "found") }}
{% endfor %}
</div>
</div>
......
{% import "MagicWordBundle:Player:macros.html.twig" as pmacros %}
<div class="card">
<div class="card-body">
<table class="table table-bordered table-striped">
<thead>
<div class="card p-0">
<div class="card-body p-0">
<div class="table-responsive">
<table class="table table-hover text-center">
<thead class="thead-light">
<th>{{ "rank" | trans }}</th>
<th>{{ "player" | trans }}</th>
<th>{{ "score" | trans }}</th>
......@@ -34,6 +35,7 @@
{% endfor %}
</tbody>
</table>
</div>
</div>
</div>
......
......@@ -18,7 +18,6 @@
</ol>
</nav>
<div class="card">
<div class="card-body">
<div class="row mb-2">
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment