Update Injury template
This commit is contained in:
Gregory Trullemans
parent
a47df78e40
commit
d66a3f419e
|
|
@ -1,84 +0,0 @@
|
|||
{% extends "base.html" %}
|
||||
{% load static %}
|
||||
{% load has_group %}
|
||||
|
||||
{% block content %}
|
||||
<div class="row justify-content-center">
|
||||
<div class="col-12 col-sm-12 col-md-8 col-lg-8 col-xl-6">
|
||||
<div class="card">
|
||||
<div class="card-header">
|
||||
<h4 class="">{% if accident_id %}Edit{% else %}Add{% endif %} accident</h4>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<form action="{% if accident_id %}{% url 'accident_update' accident_id %}{% else %}{% url 'accident_create' %}{% endif %}" method="post" class="form-horizontal" id="formulaire" name="formulaire">
|
||||
{% csrf_token %}
|
||||
<div class="form-group row ">
|
||||
<label for="id_date" class="col-sm-2 col-md-2 col-lg-2 col-xl-2 col-form-label">Gymnast <span class="text-danger"><b>*</b></span></label>
|
||||
<div class="col-sm-9 col-md-9 col-lg-6 col-lg-4 col-xl-4 {% if form.jumper.errors %}has-danger{% endif %}">
|
||||
{% if request.user|has_group:"trainer" %}
|
||||
{{ form.gymnast }}
|
||||
{{ form.gymnast_related }}
|
||||
{% if form.gymnast.errors %} <span class="btn btn-sm btn-danger-outline">{% for error in form.gymnast.errors %}{{ error }}{% endfor %}</span>{% endif %}
|
||||
{% else %}
|
||||
<input type="text" class="form-control" value="{{ request.user.first_name }} {{ request.user.last_name }}" readonly="readonly" />
|
||||
<input type="hidden" name="gymnast" id="gymnast" value="{{ request.user.gymnast.id }}" />
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row ">
|
||||
<label for="id_date" class="col-sm-2 col-md-2 col-lg-2 col-xl-2 col-form-label">Date <span class="text-danger"><b>*</b></span></label>
|
||||
<div class="col-sm-3 col-md-4 col-lg-4 col-xl-4 {% if form.date.errors %}has-danger{% endif %}">
|
||||
{{ form.date }}
|
||||
{% if form.date.errors %}<span class="btn btn-sm btn-danger-outline">{% for error in form.date.errors %}{{ error }}{% endfor %}</span>{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row ">
|
||||
<label for="id_skill" class="col-sm-2 col-md-2 col-lg-2 col-xl-2 col-form-label">Skill</label>
|
||||
<div class="col-sm-8 col-md-6 col-lg-6 col-xl-6 {% if form.skill.errors %}has-danger{% endif %}">
|
||||
{{ form.skill }}
|
||||
{{ form.skill_related }}
|
||||
{% if form.skill.errors %} <span class="btn btn-sm btn-danger-outline">{% for error in form.skill.errors %}{{ error }}{% endfor %}</span>{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row ">
|
||||
<label for="id_nb_week_off" class="col-sm-2 col-md-2 col-lg-2 col-xl-2 col-form-label"># Week off</label>
|
||||
<div class="col-sm-3 col-md-4 col-lg-2 {% if form.nb_week_off.errors %}has-danger{% endif %}">
|
||||
{{ form.nb_week_off }}
|
||||
{% if form.nb_week_off.errors %} <span class="btn btn-sm btn-danger-outline">{% for error in form.nb_week_off.errors %}{{ error }}{% endfor %}</span>{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row ">
|
||||
<label for="id_information" class="col-sm-2 col-md-2 col-lg-2 col-xl-2 col-form-label">Informations</label>
|
||||
<div class="col-sm-9 col-md-9 col-lg-9 col-xl-9 {% if form.id_informations.errors %}has-danger{% endif %}">
|
||||
{{ form.informations }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group text-center">
|
||||
<input type="submit" value="{% if accident_id %}Save{% else %}Add{% endif %}" class="btn btn-warning" />
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
{% block footerscript %}
|
||||
<script type="text/javascript" >
|
||||
$(function(){
|
||||
blackDashboard.initDateTimePicker();
|
||||
});
|
||||
|
||||
const csrf_token = "{{ csrf_token|escapejs }}";
|
||||
const gymnast_lookup = "{% url 'gymnast_lookup' %}";
|
||||
const skill_lookup = "{% url 'skill_lookup' %}";
|
||||
</script>
|
||||
<script src="{% static "js/template_users/datepicker_maxdate_today.js" %}"></script>
|
||||
{% if request.session.template == 0 %}
|
||||
<script src="{% static "js/template_users/gymnast_autocomplete_black.js" %}"></script>
|
||||
<script src="{% static "js/template_users/skill_autocomplete_black.js" %}"></script>
|
||||
{% else %}
|
||||
<script src="{% static "js/template_users/gymnast_autocomplete.js" %}"></script>
|
||||
<script src="{% static "js/template_users/skill_autocomplete.js" %}"></script>
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
{% extends "base.html" %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
<div class="row justify-content-center">
|
||||
<div class="col-12 col-sm-8 col-md-6">
|
||||
<div class="card">
|
||||
<div class="card-header">
|
||||
<h4 class="mb-0">Injury : {{ accident.date | date:"d-m-Y" }}</h4>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<a href="{% url 'gymnast_details' accident.gymnast.id %}">{{ accident.gymnast }}</a><br />
|
||||
{% if accident.nb_week_off %}
|
||||
{{ accident.nb_week_off }} week(s) off.<br />
|
||||
{% endif %}
|
||||
<br />
|
||||
|
||||
{{ accident.to_markdown | safe }}
|
||||
|
||||
<div class="card-footer pl-0 pb-0">
|
||||
<a href="{% url 'accident_list' %}">
|
||||
<button type="submit" value="add" class="btn btn-icon btn-warning ">
|
||||
<i class="tim-icons icon-double-left"></i>
|
||||
</button>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
|
|
@ -1,90 +0,0 @@
|
|||
{% extends "listing.html" %}
|
||||
|
||||
{% block datacontent %}
|
||||
<div class="card mb-0">
|
||||
<div class="card-header">
|
||||
<div class="row">
|
||||
<div class="col-md-4">
|
||||
<h4 class=""> Injuries Listing</h4>
|
||||
</div>
|
||||
<div class="col-1 ml-auto">
|
||||
<div class="text-right">
|
||||
<a href="{% url 'accident_create' %}">
|
||||
<button type="submit" value="add" class="btn btn-icon btn-warning ">
|
||||
<i class="fas fa-plus"></i>
|
||||
</button>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<div class="table-responsive">
|
||||
{% if accident_list %}
|
||||
<table class="table tablesorter table-striped" data-sort="table" id="accident_table">
|
||||
<thead class="text-primary">
|
||||
<tr>
|
||||
<th style="width: 3%"></th>
|
||||
<th class="header text-left" style="width: 10%">Date</th>
|
||||
<th class="header text-left" style="width: 30%">Gymnast</th>
|
||||
<th style="width: 30%">Skill</th>
|
||||
<th style="width: 25%"># Week off</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for accident in accident_list %}
|
||||
<tr role="row" class="{% cycle 'odd' 'even' %}">
|
||||
<td>
|
||||
<a href="{% url 'accident_update' accident.id %}">
|
||||
<span class="tim-icons icon-pencil text-warning"></span>
|
||||
</a>
|
||||
</td>
|
||||
<td class="text-left"><a href="{% url 'accident_details' accident.id %}">{{ accident.date | date:"d-m-Y" }}</a></td>
|
||||
<td class="text-left"><a href="{% url 'gymnast_details_tab' accident.gymnast.id 'physiological' %}">{{ accident.gymnast }}</a></td>
|
||||
<td class="text-left">
|
||||
{% if accident.skill %}
|
||||
<a href="{% url 'skill_details' accident.skill.id %}">{{ accident.skill }}</a>
|
||||
{% else %}
|
||||
-
|
||||
{% endif %}
|
||||
</td>
|
||||
<td class="text-right">
|
||||
{% if accident.nb_week_off %}
|
||||
{{ accident.nb_week_off }}
|
||||
{% else %}
|
||||
-
|
||||
{% endif %}
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
{% else %}
|
||||
<p class="muted-text">There are no accident corresponding to your criterias.</p>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
{% block footerscript %}
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function () {
|
||||
$('#accident_table').tablesorter({
|
||||
headers: {
|
||||
0: { sorter: false }, // disable first column
|
||||
},
|
||||
dateFormat: "uk",
|
||||
sortList: [[1, 1]]
|
||||
});
|
||||
|
||||
$('#accident_table').DataTable({
|
||||
scrollY: 500,
|
||||
paging: false,
|
||||
searching: false,
|
||||
ordering: false,
|
||||
"bInfo": false,
|
||||
});
|
||||
});
|
||||
</script>
|
||||
{% endblock %}
|
||||
|
|
@ -54,21 +54,21 @@ class URLTestCase(TestCase):
|
|||
|
||||
# Injury URL
|
||||
self.assertEqual(
|
||||
resolve("/follow-up/accident/search/").view_name, "accident_search"
|
||||
resolve("/follow-up/injury/search/").view_name, "accident_search"
|
||||
)
|
||||
self.assertEqual(resolve("/follow-up/accident/").view_name, "accident_list")
|
||||
self.assertEqual(resolve("/follow-up/injury/").view_name, "accident_list")
|
||||
self.assertEqual(
|
||||
resolve("/follow-up/accident/add/").view_name, "accident_create"
|
||||
resolve("/follow-up/injury/add/").view_name, "accident_create"
|
||||
)
|
||||
self.assertEqual(
|
||||
resolve("/follow-up/accident/add/1/").view_name,
|
||||
resolve("/follow-up/injury/add/1/").view_name,
|
||||
"accident_create_for_gymnast",
|
||||
)
|
||||
self.assertEqual(
|
||||
resolve("/follow-up/accident/edit/1/").view_name, "accident_update"
|
||||
resolve("/follow-up/injury/edit/1/").view_name, "accident_update"
|
||||
)
|
||||
self.assertEqual(
|
||||
resolve("/follow-up/accident/1/").view_name, "accident_details"
|
||||
resolve("/follow-up/injury/1/").view_name, "accident_details"
|
||||
)
|
||||
|
||||
# Mindstate URL
|
||||
|
|
|
|||
|
|
@ -73,21 +73,21 @@ urlpatterns = [
|
|||
#
|
||||
#
|
||||
# Injury
|
||||
path(r"accident/search/", views.accident_listing, name="accident_search"),
|
||||
path(r"accident/", views.accident_listing, name="accident_list"),
|
||||
path(r"accident/add/", views.accident_create_or_update, name="accident_create"),
|
||||
path(r"injury/search/", views.accident_listing, name="accident_search"),
|
||||
path(r"injury/", views.accident_listing, name="accident_list"),
|
||||
path(r"injury/add/", views.accident_create_or_update, name="accident_create"),
|
||||
path(
|
||||
r"accident/add/<int:gymnast_id>/",
|
||||
r"injury/add/<int:gymnast_id>/",
|
||||
views.accident_create_or_update,
|
||||
name="accident_create_for_gymnast",
|
||||
),
|
||||
path(
|
||||
r"accident/edit/<int:accident_id>/",
|
||||
r"injury/edit/<int:accident_id>/",
|
||||
views.accident_create_or_update,
|
||||
name="accident_update",
|
||||
),
|
||||
path(
|
||||
r"accident/<int:accident_id>/", views.accident_detail, name="accident_details"
|
||||
r"injury/<int:accident_id>/", views.accident_detail, name="accident_details"
|
||||
),
|
||||
#
|
||||
#
|
||||
|
|
|
|||
|
|
@ -363,7 +363,7 @@ def accident_listing(request):
|
|||
)
|
||||
|
||||
context = {"accident_list": accident_list}
|
||||
return render(request, "followup/accidents/list.html", context)
|
||||
return render(request, "followup/injuries/list.html", context)
|
||||
|
||||
|
||||
@login_required
|
||||
|
|
@ -395,11 +395,11 @@ def accident_create_or_update(request, accident_id=None, gymnast_id=None):
|
|||
reverse("accident_details", args=(accident.pk,))
|
||||
)
|
||||
else:
|
||||
return render(request, "followup/accidents/create.html", {"form": form})
|
||||
return render(request, "followup/injuries/create.html", {"form": form})
|
||||
|
||||
form = InjuryForm(instance=accident, initial=data)
|
||||
context = {"form": form, "accident_id": accident_id}
|
||||
return render(request, "followup/accidents/create.html", context)
|
||||
return render(request, "followup/injuries/create.html", context)
|
||||
|
||||
|
||||
@login_required
|
||||
|
|
@ -409,7 +409,7 @@ def accident_detail(request, accident_id):
|
|||
Récupère toutes les informations d'un accident.
|
||||
"""
|
||||
accident = get_object_or_404(Injury, pk=accident_id)
|
||||
return render(request, "followup/accidents/details.html", {"accident": accident})
|
||||
return render(request, "followup/injuries/details.html", {"accident": accident})
|
||||
|
||||
|
||||
@login_required
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ gymnast_urlpatterns = [
|
|||
name="gymnast_display_events_and_notes",
|
||||
),
|
||||
path(
|
||||
r"details/<int:gymnast_id>/accident/",
|
||||
r"details/<int:gymnast_id>/injury/",
|
||||
views.gymnast_display_accident,
|
||||
name="gymnast_display_accident",
|
||||
),
|
||||
|
|
|
|||
Loading…
Reference in New Issue