From 2b9150f774aec52d167374ea89565671b982f0ee Mon Sep 17 00:00:00 2001
From: Gregory Trullemans <redj@MacBook-Pro-de-Gregory.local>
Date: Wed, 19 Oct 2022 08:54:43 +0200
Subject: [PATCH] Update gymnast details skill info

---
 templates/people/gymnasts/tab_skill.html | 87 ++++++++++++++++++++++--
 1 file changed, 80 insertions(+), 7 deletions(-)

diff --git a/templates/people/gymnasts/tab_skill.html b/templates/people/gymnasts/tab_skill.html
index 0a53cfa8de..8b15a251e8 100644
--- a/templates/people/gymnasts/tab_skill.html
+++ b/templates/people/gymnasts/tab_skill.html
@@ -4,7 +4,7 @@
     <div class="col-md-12">
         <div class="card">
             <div class="card-body">
-                {% if planned_skill or skill_whith_help or skill_without_help or skill_by_rank or skill_by_level or skill_by_age or unknown_skill %}
+                {% if planned_skill or skill_whith_help or skill_without_help or skill_chained or skill_masterised or skill_by_rank or skill_by_level or skill_by_age or unknown_skill %}
                 <ul class="nav nav-pills nav-pills-warning nav-pills-icons justify-content-center">
                     {% if planned_skill %}
                     <li class="nav-item">
@@ -38,6 +38,14 @@
                     </li>
                     {% endif %}
 
+                    {% if skill_masterised %}
+                    <li class="nav-item">
+                        <a class="nav-link {% if skill_masterised and not skill_chained and not skill_without_help and not skill_whith_help and not planned_skill %}active{% endif %}" data-toggle="tab" href="#skill_masterised">
+                            Masterised <!-- ({{ skill_without_help|length }}) -->
+                        </a>
+                    </li>
+                    {% endif %}
+
                     {% if skill_by_rank %}
                     <li class="nav-item">
                         <a class="nav-link {% if skill_by_rank and not skill_chained and not skill_without_help and not skill_whith_help and not planned_skill %}active{% endif %}" data-toggle="tab" href="#skill_by_rank">
@@ -152,6 +160,7 @@
                                 <tr>
                                     {% if user_is_trainer %}
                                     <td>
+                                        <!-- WITH HELP -->
                                         <button type="button" rel="tooltip" class="btn btn-success btn-link btn-sm btn-icon checkUnknownSkill text-without-help" data-gymnast_id="{{ gymnast.id }}" data-skill_id="{{ skill.id }}" data-learning_step="2">
                                             <i class="far fa-check-double"></i>
                                         </button>
@@ -184,7 +193,7 @@
                             <thead>
                                 <tr>
                                     {% if user_is_trainer %}
-                                        <th style="width: 10%"></th>
+                                        <th style="width: 12%"></th>
                                     {% endif %}
                                     <th style="width: 10%">Notation</th>
                                     <th class="header text-left" style="width: 55%">Label</th>
@@ -198,12 +207,19 @@
                                 <tr>
                                     {% if user_is_trainer %}
                                     <td>
+                                        <button type="button" rel="tooltip" class="btn btn-success btn-link btn-sm btn-icon checkUnknownSkill text-with-help" data-gymnast_id="{{ gymnast.id }}" data-skill_id="{{ plan.educative.id }}" data-learning_step="1">
+                                            <i class="far fa-check"></i>
+                                        </button>
+                                        <!-- WITHOUT HELP -->
                                         <button type="button" rel="tooltip" class="btn btn-success btn-link btn-sm btn-icon checkUnknownSkill text-chained" data-gymnast_id="{{ gymnast.id }}" data-skill_id="{{ skill.id }}" data-learning_step="3">
                                             <i class="far fa-link"></i>
                                         </button>
                                         <button type="button" rel="tooltip" class="btn btn-success btn-link btn-sm btn-icon checkUnknownSkill text-masterised" data-gymnast_id="{{ gymnast.id }}" data-skill_id="{{ skill.id }}" data-learning_step="4">
                                             <i class="far fa-thumbs-up"></i>
                                         </button>
+                                        <button type="button" rel="tooltip" class="btn btn-success btn-link btn-sm btn-icon checkUnknownSkill text-unknown" data-gymnast_id="{{ gymnast.id }}" data-skill_id="{{ skill.id }}" data-learning_step="0">
+                                            <i class="far fa-thumbs-down"></i>
+                                        </button>
                                     </td>
                                     {% endif %}
                                     <td>{{ skill.notation }}</td>
@@ -224,10 +240,10 @@
                             <thead>
                                 <tr>
                                     {% if user_is_trainer %}
-                                        <th style="width: 10%"></th>
+                                        <th style="width: 12%"></th>
                                     {% endif %}
                                     <th style="width: 10%">Notation</th>
-                                    <th class="header text-left" style="width: 55%">Label</th>
+                                    <th class="header text-left" style="width: 35%">Label</th>
                                     <th class="header" style="width: 7%">Diff.</th>
                                     <th class="header" style="width: 7%">Level</th>
                                     <th class="header" style="width: 7%">Rank</th>
@@ -238,9 +254,66 @@
                                 <tr>
                                     {% if user_is_trainer %}
                                     <td>
+                                        <button type="button" rel="tooltip" class="btn btn-success btn-link btn-sm btn-icon checkUnknownSkill text-with-help" data-gymnast_id="{{ gymnast.id }}" data-skill_id="{{ plan.educative.id }}" data-learning_step="1">
+                                            <i class="far fa-check"></i>
+                                        </button>
+                                        <button type="button" rel="tooltip" class="btn btn-success btn-link btn-sm btn-icon checkUnknownSkill text-without-help" data-gymnast_id="{{ gymnast.id }}" data-skill_id="{{ skill.id }}" data-learning_step="2">
+                                            <i class="far fa-check-double"></i>
+                                        </button>
+                                        <!-- chained -->
                                         <button type="button" rel="tooltip" class="btn btn-success btn-link btn-sm btn-icon checkUnknownSkill text-masterised" data-gymnast_id="{{ gymnast.id }}" data-skill_id="{{ skill.id }}" data-learning_step="4">
                                             <i class="far fa-thumbs-up"></i>
                                         </button>
+                                        <button type="button" rel="tooltip" class="btn btn-success btn-link btn-sm btn-icon checkUnknownSkill text-unknown" data-gymnast_id="{{ gymnast.id }}" data-skill_id="{{ skill.id }}" data-learning_step="0">
+                                            <i class="far fa-thumbs-down"></i>
+                                        </button>
+                                    </td>
+                                    {% endif %}
+                                    <td>{{ skill.notation }}</td>
+                                    <td class="text-left"><a href="{% url 'skill_details' skill.id %}">{{ skill.long_label }}</a></td>
+                                    <td>{{ skill.difficulty }}</td>
+                                    <td>{{ skill.level }}</td>
+                                    <td>{{ skill.rank }}</td>
+                                </tr>
+                                {% endfor %}
+                            </tbody>
+                        </table>
+                    </div>
+                    {% endif %}
+
+                    {% if skill_masterised %}
+                    <div class="tab-pane {% if skill_masterised and not skill_chained and not skill_without_help and not skill_whith_help and not planned_skill %}active{% endif %}" id="skill_masterised">
+                        <table class="table table-striped table-condensed tablesorter" id="table_skill_masterised">
+                            <thead>
+                                <tr>
+                                    {% if user_is_trainer %}
+                                        <th style="width: 12%"></th>
+                                    {% endif %}
+                                    <th style="width: 10%">Notation</th>
+                                    <th class="header text-left" style="width: 35%">Label</th>
+                                    <th class="header" style="width: 7%">Diff.</th>
+                                    <th class="header" style="width: 7%">Level</th>
+                                    <th class="header" style="width: 7%">Rank</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                {% for skill in skill_masterised %}
+                                <tr>
+                                    {% if user_is_trainer %}
+                                    <td>
+                                        <button type="button" rel="tooltip" class="btn btn-success btn-link btn-sm btn-icon checkUnknownSkill text-with-help" data-gymnast_id="{{ gymnast.id }}" data-skill_id="{{ plan.educative.id }}" data-learning_step="1">
+                                            <i class="far fa-check"></i>
+                                        </button>
+                                        <button type="button" rel="tooltip" class="btn btn-success btn-link btn-sm btn-icon checkUnknownSkill text-without-help" data-gymnast_id="{{ gymnast.id }}" data-skill_id="{{ plan.educative.id }}" data-learning_step="2">
+                                            <i class="far fa-check-double"></i>
+                                        </button>
+                                        <button type="button" rel="tooltip" class="btn btn-success btn-link btn-sm btn-icon checkUnknownSkill text-chained" data-gymnast_id="{{ gymnast.id }}" data-skill_id="{{ plan.educative.id }}" data-learning_step="3">
+                                            <i class="far fa-link"></i>
+                                        </button>
+                                        <!-- MASTERISED -->
+                                        <button type="button" rel="tooltip" class="btn btn-success btn-link btn-sm btn-icon checkUnknownSkill text-unknown" data-gymnast_id="{{ gymnast.id }}" data-skill_id="{{ skill.id }}" data-learning_step="0">
+                                            <i class="far fa-thumbs-down"></i>
+                                        </button>
                                     </td>
                                     {% endif %}
                                     <td>{{ skill.notation }}</td>
@@ -477,9 +550,9 @@
             $.ajax({
                 url: '/follow-up/learnedskill/new/',
                 data: {
-                    gymnast_id: $(this).data('gymnastid'),
-                    skill_id: $(this).data('skillid'),
-                    learning_step: $(this).data('link'),
+                    gymnast_id: $(this).data('gymnast_id'),
+                    skill_id: $(this).data('skill_id'),
+                    learning_step: $(this).data('learning_step'),
                     csrfmiddlewaretoken: '{{ csrf_token }}'
                 },
                 type: 'POST',