Sulley
/
Jarvis
1
0
Fork 0
Code Issues 22 Pull Requests 1 Projects Releases Wiki Activity

Fix some static inclusion bug

This commit is contained in:
Gregory Trullemans 2024-01-26 09:44:51 +01:00
parent ec6f582bd5
commit ebb5029e6d
4 changed files with 42 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jarvis/followup/forms.py
View File

@ -621,6 +621,7 @@ class IntensityForm(forms.ModelForm):
"placeholder": "xxx", "placeholder": "xxx",
"min": "1", "min": "1",
"step": "1", "step": "1",
"value": "90",
} }
), ),
"theorical_time": forms.NumberInput( "theorical_time": forms.NumberInput(
@ -629,6 +630,7 @@ class IntensityForm(forms.ModelForm):
"placeholder": "xxx", "placeholder": "xxx",
"min": "1", "min": "1",
"step": "1", "step": "1",
"value": "90",
} }
), ),
"difficulty": forms.NumberInput( "difficulty": forms.NumberInput(
@ -670,6 +672,7 @@ class IntensityForm(forms.ModelForm):
"min": "1", "min": "1",
"step": "1", "step": "1",
"max": "99", "max": "99",
"value": "21",
} }
), ),
"number_of_passes_asked": forms.NumberInput( "number_of_passes_asked": forms.NumberInput(
@ -679,6 +682,7 @@ class IntensityForm(forms.ModelForm):
"min": "1", "min": "1",
"step": "1", "step": "1",
"max": "99", "max": "99",
"value": "21",
} }
), ),
"number_of_gymnast": forms.NumberInput( "number_of_gymnast": forms.NumberInput(
@ -688,6 +692,7 @@ class IntensityForm(forms.ModelForm):
"min": "1", "min": "1",
"step": "1", "step": "1",
"max": "25", "max": "25",
"value": "2",
} }
), ),
"date": forms.TextInput( "date": forms.TextInput(

6
jarvis/followup/templates/heightweight/create.html
View File

@ -88,10 +88,10 @@
const csrf_token = "{{ csrf_token|escapejs }}"; const csrf_token = "{{ csrf_token|escapejs }}";
const gymnast_lookup = "{% url 'gymnast_lookup' %}"; const gymnast_lookup = "{% url 'gymnast_lookup' %}";
</script> </script>
<script src="{% static " js/template_users/datepicker_maxdate_today.js" %}"></script> <script src="{% static "js/template_users/datepicker_maxdate_today.js" %}"></script>
{% if request.session.template == 0 %} {% if request.session.template == 0 %}
<script src="{% static " js/template_users/gymnast_autocomplete_black.js" %}"></script> <script src="{% static "js/template_users/gymnast_autocomplete_black.js" %}"></script>
{% else %} {% else %}
<script src="{% static " js/template_users/gymnast_autocomplete.js" %}"></script> <script src="{% static "js/template_users/gymnast_autocomplete.js" %}"></script>
{% endif %} {% endif %}
{% endblock %} {% endblock %}

61
jarvis/followup/templates/intensities/create.html
View File

@ -15,7 +15,7 @@
method="post" class="form-horizontal" id="formulaire" name="formulaire"> method="post" class="form-horizontal" id="formulaire" name="formulaire">
{% csrf_token %} {% csrf_token %}
<div class="form-group row "> <div class="form-group row ">
<label for="id_date" class="col-4 col-sm-2 col-md-2 col-lg-2 col-xl-2 col-form-label">Gymnast <span class="text-danger"><b>*</b></span></label> <label for="id_date" class="col-4 col-sm-2 col-md-2 col-lg-3 col-xl-2 col-form-label pr-0">Gymnast <span class="text-danger"><b>*</b></span></label>
<div class="col-8 col-sm-9 col-md-9 col-lg-6 col-lg-8 col-xl-8 {% if form.jumper.errors %}has-danger{% endif %}"> <div class="col-8 col-sm-9 col-md-9 col-lg-6 col-lg-8 col-xl-8 {% if form.jumper.errors %}has-danger{% endif %}">
{{ form.gymnast }} {{ form.gymnast }}
{{ form.gymnast_related }} {{ form.gymnast_related }}
@ -23,7 +23,7 @@
</div> </div>
</div> </div>
<div class="form-group row "> <div class="form-group row ">
<label for="id_date" class="col-4 col-sm-2 col-md-2 col-lg-2 col-xl-2 col-form-label">Date <span class="text-danger"><b>*</b></span></label> <label for="id_date" class="col-4 col-sm-2 col-md-2 col-lg-3 col-xl-2 col-form-label pr-0">Date <span class="text-danger"><b>*</b></span></label>
<div class="col-5 col-sm-3 col-md-3 col-lg-4 col-xl-3 {% if form.date.errors %}has-danger{% endif %}"> <div class="col-5 col-sm-3 col-md-3 col-lg-4 col-xl-3 {% if form.date.errors %}has-danger{% endif %}">
{{ form.date }} {{ form.date }}
{% if form.date.errors %}<span class="btn btn-sm btn-danger-outline">{% for error in form.date.errors %}{{ error }}{% endfor %}</span>{% endif %} {% if form.date.errors %}<span class="btn btn-sm btn-danger-outline">{% for error in form.date.errors %}{{ error }}{% endfor %}</span>{% endif %}
@ -31,67 +31,64 @@
</div> </div>
<div class="form-group row "> <div class="form-group row ">
<label for="id_time" class="col-4 col-sm-2 col-md-2 col-lg-2 col-xl-2 col-form-label">Time <span class="text-danger"><b>*</b></span></label> <label for="id_time" class="col-4 col-sm-2 col-md-3 col-lg-3 col-xl-2 col-form-label pr-0">Time <span class="text-danger"><b>*</b></span></label>
<div class="col-5 col-sm-3 col-md-3 col-lg-2 {% if form.time.errors %}has-danger{% endif %}"> <div class="col-5 col-sm-2 col-md-3 col-lg-3 {% if form.time.errors %}has-danger{% endif %}">
{{ form.time }} {{ form.time }}
{% if form.time.errors %}&nbsp;<span class="btn btn-sm btn-danger-outline">{% for error in form.time.errors %}{{ error }}{% endfor %}</span>{% endif %} {% if form.time.errors %}&nbsp;<span class="btn btn-sm btn-danger-outline">{% for error in form.time.errors %}{{ error }}{% endfor %}</span>{% endif %}
</div> </div>
</div>
<div class="form-group row "> <label for="id_theorical_time" class="col-4 col-sm-3 col-md-3 col-lg-3 col-xl-2 col-form-label pl-0 pr-0">Theorical time <span class="text-danger"><b>*</b></span></label>
<label for="id_theorical_time" class="col-4 col-sm-2 col-md-2 col-lg-2 col-xl-2 col-form-label">Theorical time <span class="text-danger"><b>*</b></span></label> <div class="col-5 col-sm-2 col-md-3 col-lg-3 {% if form.theorical_time.errors %}has-danger{% endif %}">
<div class="col-5 col-sm-3 col-md-3 col-lg-2 {% if form.theorical_time.errors %}has-danger{% endif %}">
{{ form.theorical_time }} {{ form.theorical_time }}
{% if form.theorical_time.errors %}&nbsp;<span class="btn btn-sm btn-danger-outline">{% for error in form.theorical_time.errors %}{{ error }}{% endfor %}</span>{% endif %} {% if form.theorical_time.errors %}&nbsp;<span class="btn btn-sm btn-danger-outline">{% for error in form.theorical_time.errors %}{{ error }}{% endfor %}</span>{% endif %}
</div> </div>
</div> </div>
<div class="form-group row "> <div class="form-group row ">
<label for="id_difficulty" class="col-4 col-sm-2 col-md-2 col-lg-2 col-xl-2 col-form-label">Difficulty <span class="text-danger"><b>*</b></span></label> <label for="id_difficulty" class="col-4 col-sm-2 col-md-3 col-lg-3 col-xl-2 col-form-label pr-0">Difficulty <span class="text-danger"><b>*</b></span></label>
<div class="col-5 col-sm-3 col-md-3 col-lg-2 {% if form.difficulty.errors %}has-danger{% endif %}"> <div class="col-5 col-sm-2 col-md-3 col-lg-3 {% if form.difficulty.errors %}has-danger{% endif %}">
{{ form.difficulty }} {{ form.difficulty }}
{% if form.difficulty.errors %}&nbsp;<span class="btn btn-sm btn-danger-outline">{% for error in form.difficulty.errors %}{{ error }}{% endfor %}</span>{% endif %} {% if form.difficulty.errors %}&nbsp;<span class="btn btn-sm btn-danger-outline">{% for error in form.difficulty.errors %}{{ error }}{% endfor %}</span>{% endif %}
</div> </div>
</div>
<div class="form-group row "> <label for="id_difficulty_asked" class="col-4 col-sm-3 col-md-3 col-lg-3 col-xl-2 col-form-label pl-0 pr-0">Difficulty asked <span class="text-danger"><b>*</b></span></label>
<label for="id_difficulty_asked" class="col-4 col-sm-2 col-md-2 col-lg-2 col-xl-2 col-form-label">Difficulty <span class="text-danger"><b>*</b></span></label> <div class="col-5 col-sm-2 col-md-3 col-lg-3 {% if form.difficulty_asked.errors %}has-danger{% endif %}">
<div class="col-5 col-sm-3 col-md-3 col-lg-2 {% if form.difficulty_asked.errors %}has-danger{% endif %}">
{{ form.difficulty_asked }} {{ form.difficulty_asked }}
{% if form.difficulty_asked.errors %}&nbsp;<span class="btn btn-sm btn-danger-outline">{% for error in form.difficulty_asked.errors %}{{ error }}{% endfor %}</span>{% endif %} {% if form.difficulty_asked.errors %}&nbsp;<span class="btn btn-sm btn-danger-outline">{% for error in form.difficulty_asked.errors %}{{ error }}{% endfor %}</span>{% endif %}
</div> </div>
</div> </div>
<div class="form-group row "> <div class="form-group row ">
<label for="id_quantity_of_skill" class="col-4 col-sm-2 col-md-2 col-lg-2 col-xl-2 col-form-label"># of skill <span class="text-danger"><b>*</b></span></label> <label for="id_quantity_of_skill" class="col-4 col-sm-2 col-md-3 col-lg-3 col-xl-2 col-form-label pr-0"># skill <span class="text-danger"><b>*</b></span></label>
<div class="col-5 col-sm-3 col-md-3 col-lg-2 {% if form.quantity_of_skill.errors %}has-danger{% endif %}"> <div class="col-5 col-sm-2 col-md-3 col-lg-3 {% if form.quantity_of_skill.errors %}has-danger{% endif %}">
{{ form.quantity_of_skill }} {{ form.quantity_of_skill }}
{% if form.quantity_of_skill.errors %}&nbsp;<span class="btn btn-sm btn-danger-outline">{% for error in form.quantity_of_skill.errors %}{{ error }}{% endfor %}</span>{% endif %} {% if form.quantity_of_skill.errors %}&nbsp;<span class="btn btn-sm btn-danger-outline">{% for error in form.quantity_of_skill.errors %}{{ error }}{% endfor %}</span>{% endif %}
</div> </div>
</div><div class="form-group row ">
<label for="id_quantity_of_skill_asked" class="col-4 col-sm-2 col-md-2 col-lg-2 col-xl-2 col-form-label"># of skill asked<span class="text-danger"><b>*</b></span></label> <label for="id_quantity_of_skill_asked" class="col-4 col-sm-3 col-md-3 col-lg-3 col-xl-2 col-form-label pl-0 pr-0"># skill asked <span class="text-danger"><b>*</b></span></label>
<div class="col-5 col-sm-3 col-md-3 col-lg-2 {% if form.quantity_of_skill_asked.errors %}has-danger{% endif %}"> <div class="col-5 col-sm-2 col-md-3 col-lg-3 {% if form.quantity_of_skill_asked.errors %}has-danger{% endif %}">
{{ form.quantity_of_skill_asked }} {{ form.quantity_of_skill_asked }}
{% if form.quantity_of_skill_asked.errors %}&nbsp;<span class="btn btn-sm btn-danger-outline">{% for error in form.quantity_of_skill_asked.errors %}{{ error }}{% endfor %}</span>{% endif %} {% if form.quantity_of_skill_asked.errors %}&nbsp;<span class="btn btn-sm btn-danger-outline">{% for error in form.quantity_of_skill_asked.errors %}{{ error }}{% endfor %}</span>{% endif %}
</div> </div>
</div> </div>
<div class="form-group row "> <div class="form-group row ">
<label for="id_number_of_passes" class="col-4 col-sm-2 col-md-2 col-lg-2 col-xl-2 col-form-label"># of passes <span class="text-danger"><b>*</b></span></label> <label for="id_number_of_passes" class="col-4 col-sm-2 col-md-3 col-lg-3 col-xl-2 col-form-label pr-0"># passes <span class="text-danger"><b>*</b></span></label>
<div class="col-5 col-sm-3 col-md-3 col-lg-2 {% if form.number_of_passes.errors %}has-danger{% endif %}"> <div class="col-5 col-sm-2 col-md-3 col-lg-3 {% if form.number_of_passes.errors %}has-danger{% endif %}">
{{ form.number_of_passes }} {{ form.number_of_passes }}
{% if form.number_of_passes.errors %}&nbsp;<span class="btn btn-sm btn-danger-outline">{% for error in form.number_of_passes.errors %}{{ error }}{% endfor %}</span>{% endif %} {% if form.number_of_passes.errors %}&nbsp;<span class="btn btn-sm btn-danger-outline">{% for error in form.number_of_passes.errors %}{{ error }}{% endfor %}</span>{% endif %}
</div> </div>
</div>
<div class="form-group row "> <label for="id_number_of_passes_asked" class="col-4 col-sm-3 col-md-3 col-lg-3 col-xl-2 col-form-label pl-0 pr-0"># passes asked <span class="text-danger"><b>*</b></span></label>
<label for="id_number_of_passes_asked" class="col-4 col-sm-2 col-md-2 col-lg-2 col-xl-2 col-form-label"># of passes asked<span class="text-danger"><b>*</b></span></label> <div class="col-5 col-sm-2 col-md-3 col-lg-3 {% if form.number_of_passes_asked.errors %}has-danger{% endif %}">
<div class="col-5 col-sm-3 col-md-3 col-lg-2 {% if form.number_of_passes_asked.errors %}has-danger{% endif %}">
{{ form.number_of_passes_asked }} {{ form.number_of_passes_asked }}
{% if form.number_of_passes_asked.errors %}&nbsp;<span class="btn btn-sm btn-danger-outline">{% for error in form.number_of_passes_asked.errors %}{{ error }}{% endfor %}</span>{% endif %} {% if form.number_of_passes_asked.errors %}&nbsp;<span class="btn btn-sm btn-danger-outline">{% for error in form.number_of_passes_asked.errors %}{{ error }}{% endfor %}</span>{% endif %}
</div> </div>
</div> </div>
<div class="form-group row "> <div class="form-group row ">
<label for="id_number_of_gymnast" class="col-4 col-sm-2 col-md-2 col-lg-2 col-xl-2 col-form-label"># of gymnast<span class="text-danger"><b>*</b></span></label> <label for="id_number_of_gymnast" class="col-4 col-sm-2 col-md-3 col-lg-3 col-xl-2 col-form-label pr-0"># gymnast <span class="text-danger"><b>*</b></span></label>
<div class="col-5 col-sm-3 col-md-3 col-lg-2 {% if form.number_of_gymnast.errors %}has-danger{% endif %}"> <div class="col-5 col-sm-2 col-md-3 col-lg-3 {% if form.number_of_gymnast.errors %}has-danger{% endif %}">
{{ form.number_of_gymnast }} {{ form.number_of_gymnast }}
{% if form.number_of_gymnast.errors %}&nbsp;<span class="btn btn-sm btn-danger-outline">{% for error in form.number_of_gymnast.errors %}{{ error }}{% endfor %}</span>{% endif %} {% if form.number_of_gymnast.errors %}&nbsp;<span class="btn btn-sm btn-danger-outline">{% for error in form.number_of_gymnast.errors %}{{ error }}{% endfor %}</span>{% endif %}
</div> </div>
@ -167,12 +164,12 @@
{% endif %} {% endif %}
}); });
</script> </script>
<script src="{% static " js/template_users/datepicker_maxdate_today.js" %}"></script> <script src="{% static "js/template_users/datepicker_maxdate_today.js" %}"></script>
{% if request.session.template == 0 %} {% if request.session.template == 0 %}
<script src="{% static " js/template_users/gymnast_autocomplete_black.js" %}"></script> <script src="{% static "js/template_users/gymnast_autocomplete_black.js" %}"></script>
<script src="{% static " js/template_users/skill_autocomplete_black.js" %}"></script> <script src="{% static "js/template_users/skill_autocomplete_black.js" %}"></script>
{% else %} {% else %}
<script src="{% static " js/template_users/gymnast_autocomplete.js" %}"></script> <script src="{% static "js/template_users/gymnast_autocomplete.js" %}"></script>
<script src="{% static " js/template_users/skill_autocomplete.js" %}"></script> <script src="{% static "js/template_users/skill_autocomplete.js" %}"></script>
{% endif %} {% endif %}
{% endblock %} {% endblock %}

10
jarvis/followup/templates/notes/create.html
View File

@ -81,12 +81,12 @@
const gymnast_lookup = "{% url 'gymnast_lookup' %}"; const gymnast_lookup = "{% url 'gymnast_lookup' %}";
const skill_lookup = "{% url 'skill_lookup' %}"; const skill_lookup = "{% url 'skill_lookup' %}";
</script> </script>
<script src="{% static " js/template_users/datepicker_maxdate_today.js" %}"></script> <script src="{% static "js/template_users/datepicker_maxdate_today.js" %}"></script>
{% if request.session.template == 0 %} {% if request.session.template == 0 %}
<script src="{% static " js/template_users/gymnast_autocomplete_black.js" %}"></script> <script src="{% static "js/template_users/gymnast_autocomplete_black.js" %}"></script>
<script src="{% static " js/template_users/skill_autocomplete_black.js" %}"></script> <script src="{% static "js/template_users/skill_autocomplete_black.js" %}"></script>
{% else %} {% else %}
<script src="{% static " js/template_users/gymnast_autocomplete.js" %}"></script> <script src="{% static "js/template_users/gymnast_autocomplete.js" %}"></script>
<script src="{% static " js/template_users/skill_autocomplete.js" %}"></script> <script src="{% static "js/template_users/skill_autocomplete.js" %}"></script>
{% endif %} {% endif %}
{% endblock %} {% endblock %}