diff --git a/jarvis/followup/templates/heightweight/list.html b/jarvis/followup/templates/heightweight/list.html index 9fac766..d9cad38 100644 --- a/jarvis/followup/templates/heightweight/list.html +++ b/jarvis/followup/templates/heightweight/list.html @@ -187,17 +187,8 @@ }); }); - var timeFormat = 'DD-M-YYYY'; - - $('#injury_table').tablesorter({ - headers: { - 0: { sorter: false }, - }, - dateFormat: "uk", - sortList: [[1, 1]] - }); - {% if height_weight_list %} + var timeFormat = 'DD-M-YYYY'; var ctx = document.getElementById("chart_height_weight").getContext("2d"); var border_color_pink = 'rgb(255, 99, 132)'; diff --git a/jarvis/followup/templates/wellbeing/list.html b/jarvis/followup/templates/wellbeing/list.html index 40d54c8..c56006f 100644 --- a/jarvis/followup/templates/wellbeing/list.html +++ b/jarvis/followup/templates/wellbeing/list.html @@ -1,5 +1,6 @@ {% extends "listing.html" %} {% load has_group %} +{% load static %} {% block datacontent %}
- | Date | - {% if not gymnast %} -Gymnast | - {% endif %} -Mindstate | -Sleep | -Stress | -Fatigue | -Muscle soreness | -
---|---|---|---|---|---|---|---|
- - - - | -- {% if wellbeing.gymnast.id in request.session.available_gymnast or request.user.is_superuser %}{% endif %}{{ wellbeing.date | date:"j-n-Y" }} - | - {% if not gymnast %} -- {% if wellbeing.gymnast.id in request.session.available_gymnast or request.user.is_superuser %}{% endif %} - {{ wellbeing.gymnast }} - - | - {% endif %} -- {% if wellbeing.mindstate < 5%}{% endif %} - {{ wellbeing.mindstate }} - {% if wellbeing.mindstate < 5%}{% endif %} - | -- {% if wellbeing.sleep < 5%}{% endif %} - {{ wellbeing.sleep }} - {% if wellbeing.sleep < 5%}{% endif %} - | -- {% if wellbeing.stress > 5%}{% endif %} - {{ wellbeing.stress }} - {% if wellbeing.stress > 5%}{% endif %} - | -- {% if wellbeing.fatigue > 5%}{% endif %} - {{ wellbeing.fatigue }} - {% if wellbeing.fatigue > 5%}{% endif %} - | -- {% if wellbeing.muscle_soreness > 5%}{% endif %} - {{ wellbeing.muscle_soreness }} - {% if wellbeing.muscle_soreness > 5%}{% endif %} - | -
+ | Date | +Mindstate | +Sleep | +Stress | +Fatigue | +Muscle soreness | +
---|---|---|---|---|---|---|
+ + + + | ++ {% if wellbeing.gymnast.id in request.session.available_gymnast or request.user.is_superuser %}{% endif %}{{ wellbeing.date | date:"j-n-Y" }} + | ++ {% if wellbeing.mindstate < 5%}{% endif %} + {{ wellbeing.mindstate }} + {% if wellbeing.mindstate < 5%}{% endif %} + | ++ {% if wellbeing.sleep < 5%}{% endif %} + {{ wellbeing.sleep }} + {% if wellbeing.sleep < 5%}{% endif %} + | ++ {% if wellbeing.stress > 5%}{% endif %} + {{ wellbeing.stress }} + {% if wellbeing.stress > 5%}{% endif %} + | ++ {% if wellbeing.fatigue > 5%}{% endif %} + {{ wellbeing.fatigue }} + {% if wellbeing.fatigue > 5%}{% endif %} + | ++ {% if wellbeing.muscle_soreness > 5%}{% endif %} + {{ wellbeing.muscle_soreness }} + {% if wellbeing.muscle_soreness > 5%}{% endif %} + | +
There are no well being corresponding to your criterias
+ {% if wellbeing_list %} ++ | Date | + {% if not gymnast %} +Gymnast | + {% endif %} +Mindstate | +Sleep | +Stress | +Fatigue | +Muscle soreness | +
---|---|---|---|---|---|---|---|
+ + + + | ++ {% if wellbeing.gymnast.id in request.session.available_gymnast or request.user.is_superuser %}{% endif %}{{ wellbeing.date | date:"j-n-Y" }} + | + {% if not gymnast %} ++ {% if wellbeing.gymnast.id in request.session.available_gymnast or request.user.is_superuser %}{% endif %} + {{ wellbeing.gymnast }} + + | + {% endif %} ++ {% if wellbeing.mindstate < 5%}{% endif %} + {{ wellbeing.mindstate }} + {% if wellbeing.mindstate < 5%}{% endif %} + | ++ {% if wellbeing.sleep < 5%}{% endif %} + {{ wellbeing.sleep }} + {% if wellbeing.sleep < 5%}{% endif %} + | ++ {% if wellbeing.stress > 5%}{% endif %} + {{ wellbeing.stress }} + {% if wellbeing.stress > 5%}{% endif %} + | ++ {% if wellbeing.fatigue > 5%}{% endif %} + {{ wellbeing.fatigue }} + {% if wellbeing.fatigue > 5%}{% endif %} + | ++ {% if wellbeing.muscle_soreness > 5%}{% endif %} + {{ wellbeing.muscle_soreness }} + {% if wellbeing.muscle_soreness > 5%}{% endif %} + | +
There are no well being corresponding to your criterias
+ {% endif %} {% endif %}