From 1e512990fbcb1d256f325acc27e6fabb9430c85c Mon Sep 17 00:00:00 2001 From: Gregory Trullemans Date: Mon, 7 Feb 2022 12:09:29 +0100 Subject: [PATCH] Gymnast User finished --- README.md | 11 +++++ templates/people/gymnasts/details.html | 19 +++++--- templates/people/gymnasts/list_mindstate.html | 14 ++++-- templates/people/gymnasts/list_routine.html | 27 +++++++---- .../people/gymnasts/list_scores_chronos.html | 47 +++++++++++-------- templates/people/gymnasts/list_skill.html | 44 ++++++++++++++--- .../templatetags/is_user_equal_to_gymnast.py | 9 ++++ 7 files changed, 123 insertions(+), 48 deletions(-) create mode 100644 ultron/tools/templatetags/is_user_equal_to_gymnast.py diff --git a/README.md b/README.md index f658e45642..41b5af73ce 100644 --- a/README.md +++ b/README.md @@ -44,6 +44,17 @@ Peut tout faire sauf : - Gérer les Pays - Gérer les lieux +##### Gymnaste + +Un gymnaste peut tout faire pour *lui-même* : + +- Ajouter un chrono +- Ajouter un score +- Ajouter un height/weight +- … + + + ### Skill ### Learned Skill diff --git a/templates/people/gymnasts/details.html b/templates/people/gymnasts/details.html index 909b5876a3..ceb57ba0cd 100644 --- a/templates/people/gymnasts/details.html +++ b/templates/people/gymnasts/details.html @@ -2,6 +2,8 @@ {% load skill_doughnut %} {% load level_chart_bar %} +{% load has_group %} +{% load is_user_equal_to_gymnast %} {% block page_title %}{{ gymnast.first_name }} {{ gymnast.last_name }}{% endblock %} @@ -81,11 +83,13 @@ -
  • - - - -
    • + {% if request.user|has_group:"Trainer" or request.user|is_user_equal_to_gymnast:gymnast.id %} +
  • + + + +
    • + {% endif %}
  • @@ -101,7 +105,9 @@
    -
    + {% if request.user|has_group:"Trainer" or request.user|is_user_equal_to_gymnast:gymnast.id %} +
    + {% endif %}
    @@ -118,6 +124,7 @@ $(document).ready(function() { var default_url = '/gymnast/details/' + {{ gymnast.id }} + '/'; + // TODO: check pourquoi il n'y a pas le TAB physiological est pas présent. {% if tab is None or tab == 'skill' %} tab_url = default_url + 'skill/'; var tab_div = '#skill'; diff --git a/templates/people/gymnasts/list_mindstate.html b/templates/people/gymnasts/list_mindstate.html index 0b11c2cc23..646f767edc 100644 --- a/templates/people/gymnasts/list_mindstate.html +++ b/templates/people/gymnasts/list_mindstate.html @@ -1,3 +1,5 @@ +{% load has_group %} +{% load is_user_equal_to_gymnast %}
    @@ -56,11 +58,13 @@ {% endif %}
    - - - + {% if request.user|has_group:"Trainer" or request.user|is_user_equal_to_gymnast:gymnastid %} + + + + {% endif %}
    diff --git a/templates/people/gymnasts/list_routine.html b/templates/people/gymnasts/list_routine.html index 1616e0ff14..2329afd65c 100644 --- a/templates/people/gymnasts/list_routine.html +++ b/templates/people/gymnasts/list_routine.html @@ -1,3 +1,6 @@ +{% load has_group %} +{% load is_user_equal_to_gymnast %} +
    @@ -44,11 +47,13 @@ - - - + {% if request.user|has_group:"Trainer" or request.user|is_user_equal_to_gymnast:gymnast_id %} + + + + {% endif %}
    @@ -95,11 +100,13 @@ - - - + {% if request.user|has_group:"Trainer" or request.user|is_user_equal_to_gymnast:gymnast_id %} + + + + {% endif %} diff --git a/templates/people/gymnasts/list_scores_chronos.html b/templates/people/gymnasts/list_scores_chronos.html index 40251c369e..86f80b1d64 100644 --- a/templates/people/gymnasts/list_scores_chronos.html +++ b/templates/people/gymnasts/list_scores_chronos.html @@ -1,3 +1,6 @@ +{% load has_group %} +{% load is_user_equal_to_gymnast %} +
    @@ -99,18 +102,20 @@
    {% if score_list %} - - - + + + {% endif %} - - - + {% if request.user|has_group:"Trainer" or request.user|is_user_equal_to_gymnast:gymnast_id %} + + + + {% endif %}
    @@ -131,18 +136,20 @@
    {% if chrono_list %} - - - + + + {% endif %} - - - + {% if request.user|has_group:"Trainer" or request.user|is_user_equal_to_gymnast:gymnast_id %} + + + + {% endif %}
    diff --git a/templates/people/gymnasts/list_skill.html b/templates/people/gymnasts/list_skill.html index ba391f4bda..95add8a5e3 100644 --- a/templates/people/gymnasts/list_skill.html +++ b/templates/people/gymnasts/list_skill.html @@ -1,3 +1,5 @@ +{% load has_group %} +
    @@ -74,7 +76,9 @@ - + {% if request.user|has_group:"Trainer" %} + + {% endif %} @@ -86,6 +90,7 @@ {% for skill in planified_skill %} + {% if request.user|has_group:"Trainer" %} + {% endif %} @@ -118,7 +124,9 @@
    Notation Label Deadline
    {{ skill.notation }} {{ skill.long_label }} {{ skill.plan_date | date:"d-m-Y" }}
    - + {% if request.user|has_group:"Trainer" %} + + {% endif %} @@ -129,6 +137,7 @@ {% for skill in skill_whith_help %} + {% if request.user|has_group:"Trainer" %} + {% endif %} @@ -157,7 +167,9 @@
    Notation Label Diff.
    {{ skill.notation }} {{ skill.long_label }} {{ skill.difficulty }}
    - + {% if request.user|has_group:"Trainer" %} + + {% endif %} @@ -168,6 +180,7 @@ {% for skill in skill_without_help %} + {% if request.user|has_group:"Trainer" %} + {% endif %} @@ -193,7 +207,9 @@
    Notation Label Diff.
    {{ skill.notation }} {{ skill.long_label }} {{ skill.difficulty }}
    - + {% if request.user|has_group:"Trainer" %} + + {% endif %} @@ -204,6 +220,7 @@ {% for skill in skill_by_rank %} + {% if request.user|has_group:"Trainer" %} + {% endif %} @@ -237,7 +255,9 @@
    ActionsActionsNotation Label Diff.
    {{ skill.notation }} {{ skill.long_label }} {{ skill.difficulty }}
    - + {% if request.user|has_group:"Trainer" %} + + {% endif %} @@ -248,6 +268,7 @@ {% for skill in skill_by_level %} + {% if request.user|has_group:"Trainer" %} + {% endif %} @@ -279,7 +301,9 @@
    ActionsActionsNotation Label Diff.
    {{ skill.notation }} {{ skill.long_label }} {{ skill.difficulty }}
    - + {% if request.user|has_group:"Trainer" %} + + {% endif %} @@ -291,6 +315,7 @@ {% for skill in skill_by_age %} + {% if request.user|has_group:"Trainer" %} + {% endif %} @@ -322,7 +348,9 @@
    ActionsActionsNotation Label Diff.
    {{ skill.notation }} {{ skill.long_label }} {{ skill.difficulty }}
    - + {% if request.user|has_group:"Trainer" %} + + {% endif %} @@ -333,6 +361,7 @@ {% for skill in unknown_skill %} + {% if request.user|has_group:"Trainer" %} + {% endif %} diff --git a/ultron/tools/templatetags/is_user_equal_to_gymnast.py b/ultron/tools/templatetags/is_user_equal_to_gymnast.py new file mode 100644 index 0000000000..10aada1423 --- /dev/null +++ b/ultron/tools/templatetags/is_user_equal_to_gymnast.py @@ -0,0 +1,9 @@ +from django import template + + +register = template.Library() + + +@register.filter +def is_user_equal_to_gymnast(user, gymnast_id): + return user.gymnast.id == gymnast_id
    ActionsActionsNotation Label Diff.
    {{ skill.notation }} {{ skill.long_label }} {{ skill.difficulty }}