Sulley
/
Ultron
1
0
Fork 0
Code Issues 15 Pull Requests 1 Projects Releases Wiki Activity

Rename Accdent to Injury

This commit is contained in:
Gregory Trullemans 2023-07-11 10:48:45 +02:00
parent 49a39980ad
commit d226109e28
13 changed files with 33 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/base.html
View File

@ -79,7 +79,7 @@
{% menuitem 'routine_list' 'tim-icons icon-components' 'Routines' %}
{% menuitem 'event_list' 'fal fa-calendar-alt' 'Events' %}
{% if request.user|has_group:"trainer" %}
{% menuitem 'accident_list' 'fal fa-comment-alt-medical' 'Accidents' %}
{% menuitem 'accident_list' 'fal fa-comment-alt-medical' 'Injuries' %}
{% endif %}
{% menuitem 'place_list' 'fal fa-map-marked-alt' 'Places' %}
{% if request.user|has_group:"trainer" %}

2
templates/followup/accidents/details.html
View File

@ -6,7 +6,7 @@
<div class="col-12 col-sm-8 col-md-6">
<div class="card">
<div class="card-header">
<h4 class="mb-0">Accident : {{ accident.date | date:"d-m-Y" }}</h4>
<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 />

2
templates/followup/accidents/list.html
View File

@ -5,7 +5,7 @@
<div class="card-header">
<div class="row">
<div class="col-md-4">
<h4 class=""> Accidents Listing</h4>
<h4 class=""> Injuries Listing</h4>
</div>
<div class="col-1 ml-auto">
<div class="text-right">

2
templates/people/gymnasts/list_accident.html
View File

@ -2,7 +2,7 @@
<div class="col-md-12">
<div class="card">
<div class="card-header">
<h4>Accidents</h4>
<h4>Injuries</h4>
</div>
<div class="card-body pt-0 pb-0">
{% if accident_list %}

2
templates/people/gymnasts/tabs/tab_physiological.html
View File

@ -67,7 +67,7 @@
<div class="col-md-12">
<div class="card">
<div class="card-header">
<h4>Accidents</h4>
<h4>Injuries</h4>
</div>
<div class="card-body pt-0 pb-0">
{% if accident_list %}

8
ultron/followup/admin.py
View File

@ -11,7 +11,7 @@ from .models import (
Note,
Point,
Chrono,
Accident,
Injury,
WellBeing,
HeightWeight,
LearnedSkill,
@ -88,8 +88,8 @@ class PointAdmin(admin.ModelAdmin):
autocomplete_fields = ("gymnast", "event")
class AccidentAdmin(admin.ModelAdmin):
model = Accident
class InjuryAdmin(admin.ModelAdmin):
model = Injury
fields = ("date", "gymnast", "skill", "informations") # educative
readonly_fields = ("season", "week_number", "created_at", "updated_at")
@ -234,7 +234,7 @@ admin.site.register(Plan, PlanAdmin)
admin.site.register(Note, NoteAdmin)
admin.site.register(Point, PointAdmin)
admin.site.register(Chrono, ChronoAdmin)
admin.site.register(Accident, AccidentAdmin)
admin.site.register(Injury, InjuryAdmin)
admin.site.register(WellBeing, WellBeingAdmin)
admin.site.register(LearnedSkill, LearnedSkillAdmin)
admin.site.register(HeightWeight, HeightWeightAdmin)

6
ultron/followup/forms.py
View File

@ -7,7 +7,7 @@ from .models import (
Note,
Point,
Chrono,
Accident,
Injury,
WellBeing,
HeightWeight,
LearnedSkill,
@ -180,9 +180,9 @@ class ScoreForm(forms.ModelForm):
)
class AccidentForm(forms.ModelForm):
class InjuryForm(forms.ModelForm):
class Meta:
model = Accident
model = Injury
fields = ("gymnast", "date", "nb_week_off", "informations")
widgets = {
"date": forms.DateInput(

10
ultron/followup/models.py
View File

@ -126,15 +126,15 @@ class ChronoDetails(models.Model):
value = models.DecimalField(max_digits=5, decimal_places=3)
class Accident(Markdownizable, Seasonisable):
class Injury(Markdownizable, Seasonisable):
"""
La classe `Accident` permet d'indiquer qu'un gymnaste a eu un accident, en liaison avec un
La classe `Injury` permet d'indiquer qu'un gymnaste a eu une blessure, en liaison avec un
skill ou non.
"""
class Meta:
verbose_name = "Accident"
verbose_name_plural = "Accidents"
verbose_name = "Injury"
verbose_name_plural = "Injuries"
# unique_together = ("gymnast", "skill", "date")
gymnast = models.ForeignKey(
@ -165,7 +165,7 @@ class Accident(Markdownizable, Seasonisable):
)
def timeline_representation(self):
return f"<li>{self.date:%d %b %Y} - Accident ({self.skill}): {self.nb_week_off} (weeks off)</li>"
return f"<li>{self.date:%d %b %Y} - Inuried on ({self.skill}): {self.nb_week_off} (weeks off)</li>"
class LearnedSkill(Seasonisable):

2
ultron/followup/tests_urls.py
View File

@ -52,7 +52,7 @@ class URLTestCase(TestCase):
self.assertEqual(resolve("/follow-up/score/add/").view_name, "score_create")
self.assertEqual(resolve("/follow-up/score/edit/1/").view_name, "score_update")
# Accident URL
# Injury URL
self.assertEqual(
resolve("/follow-up/accident/search/").view_name, "accident_search"
)

2
ultron/followup/urls.py
View File

@ -72,7 +72,7 @@ urlpatterns = [
),
#
#
# Accident
# 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"),

18
ultron/followup/views.py
View File

@ -16,7 +16,7 @@ from .models import (
Note,
Point,
Chrono,
Accident,
Injury,
WellBeing,
LearnedSkill,
HeightWeight,
@ -29,7 +29,7 @@ from .forms import (
NoteForm,
ScoreForm,
ChronoForm,
AccidentForm,
InjuryForm,
WellBeingForm,
HeightWeightForm,
LearnedSkillForm,
@ -350,14 +350,14 @@ def accident_listing(request):
if request.user.groups.filter(name="trainer").exists():
pattern = request.GET.get("pattern", None)
if pattern:
accident_list = Accident.objects.filter(
accident_list = Injury.objects.filter(
Q(gymnast__last_name__icontains=pattern)
| Q(gymnast__first_name__icontains=pattern)
)
else:
accident_list = Accident.objects.all()
accident_list = Injury.objects.all()
else:
accident_list = Accident.objects.filter(
accident_list = Injury.objects.filter(
Q(gymnast__last_name=request.user.last_name)
& Q(gymnast__first_name=request.user.first_name)
)
@ -374,7 +374,7 @@ def accident_create_or_update(request, accident_id=None, gymnast_id=None):
"""
if accident_id:
accident = get_object_or_404(Accident, pk=accident_id)
accident = get_object_or_404(Injury, pk=accident_id)
data = {
"gymnast_related": accident.gymnast,
"skill_related": accident.skill,
@ -387,7 +387,7 @@ def accident_create_or_update(request, accident_id=None, gymnast_id=None):
data = {"gymnast": gymnast_id, "gymnast_related": str(gymnast)}
if request.method == "POST":
form = AccidentForm(request.POST, instance=accident)
form = InjuryForm(request.POST, instance=accident)
if form.is_valid():
accident = form.save()
@ -397,7 +397,7 @@ def accident_create_or_update(request, accident_id=None, gymnast_id=None):
else:
return render(request, "followup/accidents/create.html", {"form": form})
form = AccidentForm(instance=accident, initial=data)
form = InjuryForm(instance=accident, initial=data)
context = {"form": form, "accident_id": accident_id}
return render(request, "followup/accidents/create.html", context)
@ -408,7 +408,7 @@ def accident_detail(request, accident_id):
"""
Récupère toutes les informations d'un accident.
"""
accident = get_object_or_404(Accident, pk=accident_id)
accident = get_object_or_404(Injury, pk=accident_id)
return render(request, "followup/accidents/details.html", {"accident": accident})

6
ultron/people/views.py
View File

@ -37,7 +37,7 @@ from ultron.followup.models import (
Skill,
Point,
Chrono,
Accident,
Injury,
WellBeing,
LearnedSkill,
HeightWeight,
@ -240,7 +240,7 @@ def gymnast_display_accident(request, gymnast_id):
"""
Renvoie la liste des accidents d'un gymnaste.
"""
accident_list = Accident.objects.filter(gymnast=gymnast_id)
accident_list = Injury.objects.filter(gymnast=gymnast_id)
context = {"accident_list": accident_list, "gymnast_id": gymnast_id}
return render(request, "people/gymnasts/list_accident.html", context)
@ -251,7 +251,7 @@ def gymnast_display_physiological(request, gymnast_id):
"""
Renvoie les listes des tailles/poids, état d'esprit et accidents.
"""
accident_list = Accident.objects.filter(gymnast=gymnast_id).order_by("date")
accident_list = Injury.objects.filter(gymnast=gymnast_id).order_by("date")
wellbeing_list = WellBeing.objects.filter(gymnast=gymnast_id).order_by("date")
height_weight_list = HeightWeight.objects.filter(gymnast=gymnast_id).order_by(
"date"

10
ultron/tools/pdf_generator.py
View File

@ -1,15 +1,11 @@
import locale
import os
import re
from datetime import date, datetime, timedelta
from datetime import date, timedelta
from statistics import mean
import pendulum
import yaml
from django.conf import settings
from django.db.models import F, Max, Q
from django.db.models import F, Q
from PIL import Image
from reportlab.lib import colors
from reportlab.lib.pagesizes import A4
from reportlab.lib.styles import getSampleStyleSheet
@ -20,7 +16,6 @@ from ultron.followup.models import (
Plan,
Point,
Chrono,
Accident,
WellBeing,
HeightWeight,
LearnedSkill,
@ -33,7 +28,6 @@ from ultron.planning.models import Event
from .date_week_transition import from_date_to_week_number
import environ
from pathlib import Path
# Initialise environment variables
env = environ.Env()