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

Update email sent

This commit is contained in:
Gregory Trullemans 2023-11-29 11:13:47 +01:00
parent fbe02f39c5
commit 04bc4158f6
3 changed files with 45 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
jarvis/followup/views.py
View File

@ -941,10 +941,10 @@ def injury_create_or_update(request, injury_id=None, gymnast_id=None):
html_message=f"""<p>Bonjour,</p>
<p>Un nouvelle blessure enregistrée pour {gymnast} pour le {date.strftime('%d %B %Y')}:</p>
<ul>
<li>{INJURY_MECHANISM_CHOICE[mechanism][1]},</li>
<li>{INJURY_TYPE_CHOICE[injury_type][1]},</li>
<li>{INJURY_LOCATION_CHOICE[location][1]},</li>
<li>{INJURY_BODY_SIDE_CHOICE[body_side][1]},</li>
<li>caused by {INJURY_MECHANISM_CHOICE[mechanism][1]},</li>
<li>on {INJURY_LOCATION_CHOICE[location][1]},</li>
<li>{INJURY_BODY_SIDE_CHOICE[body_side][1]} side,</li>
</ul>
{MAIL_FOOTER}""",
)
@ -1033,6 +1033,7 @@ def wellbeing_create_or_update(
stress = form.cleaned_data["stress"]
fatigue = form.cleaned_data["fatigue"]
muscle_soreness = form.cleaned_data["muscle_soreness"]
details = form.cleaned_data["informations"]
functionality = ContentType.objects.get(model="wellbeing")
for notification in gymnast.notifications.filter(
functionality=functionality
@ -1054,6 +1055,7 @@ def wellbeing_create_or_update(
<li>Fatigue: {fatigue}</li>
<li>Muscle soreness: {muscle_soreness}</li>
</ul>
{details}
{MAIL_FOOTER}
""",
)
@ -1155,7 +1157,7 @@ def heightweight_create_or_update(request, heightweight_id=None, gymnast_id=None
receiver,
fail_silently=False,
html_message=f"""<p>Bonjour,</p>
<p>Un nouveau poids/taille enregistré pour {gymnast} pour le {date.strftime('%d %B %Y')} :</p>
<p>Un nouveau poids/taille enregistré pour {gymnast} pour le {date.strftime('%d %B %Y')}:</p>
<ul>
<li>Height: {height} cm</li>
<li>Weight: {weight} kg</li>
@ -1474,8 +1476,8 @@ def intensity_create_or_update(request, intensity_id=None, gymnast_id=None):
number_of_passes = form.cleaned_data["number_of_passes"]
skill_by_time = quantity_of_skill / time
skill_by_passe = quantity_of_skill / number_of_passes
diff_by_skill = difficulty / quantity_of_skill
diff_by_passe = difficulty / number_of_passes
diff_by_skill = difficulty / (10 * quantity_of_skill)
diff_by_passe = difficulty / (10 * number_of_passes)
time_by_passe = time / number_of_passes
gymnast = Gymnast.objects.get(pk=form.cleaned_data["gymnast"].id)
functionality = ContentType.objects.get(model="intensity")
@ -1491,7 +1493,7 @@ def intensity_create_or_update(request, intensity_id=None, gymnast_id=None):
receiver,
fail_silently=False,
html_message=f"""<p>Bonjour,</p>
<p>{gymnast} a encodé une nouvelle intensité (pour le {date.strftime('%d %B %Y')}) :</p>
<p>{gymnast} a encodé une nouvelle intensité pour le {date.strftime('%d %B %Y')}:</p>
<ul>
<li>{number_of_passes} passages</li>
<li>{time} minutes</li>
@ -1500,8 +1502,8 @@ def intensity_create_or_update(request, intensity_id=None, gymnast_id=None):
</ul>
<p><u>Statistics:</u></p>
<ul>
<li>Time/passe: {time_by_passe:.2f}</li>
<li>Skill/time: {skill_by_time:.2f}</li>
<li>Passe: {time_by_passe:.2f}min</li>
<li>Skill: {skill_by_time:.2f}min</li>
<li>Skill/passe: {skill_by_passe:.2f}</li>
<li>Diff/passe: {diff_by_passe:.2f}</li>
<li>Diff/skill: {diff_by_skill:.2f}</li>

5
jarvis/people/urls.py
View File

@ -106,6 +106,11 @@ gymnast_urlpatterns = [
views.gymnast_report_evaluation,
name="gymnast_report_evaluation",
),
# path(
# r"resume/<int:gymnast_id>/season/<str:season>/week_number/<int:week_number>/",
# views.generate_week_resume,
# name="generate_week_resume",
# ),
path(r"add/", views.gymnast_create_or_update, name="gymnast_create"),
path(
r"edit/<int:gymnast_id>/", views.gymnast_create_or_update, name="gymnast_update"

30
jarvis/people/views.py
View File

@ -1375,7 +1375,7 @@ def generate_timeline_report(
- nouveau apprentissage (learned skill)
- blessures
- GymnastHasRoutine
eton les trie par date.
et on les trie par date.
Args:
gymnast_id (int) identifiant du gymnast
@ -1493,3 +1493,31 @@ def generate_timeline_report(
],
) # , font_config=font_config)
return response
# @login_required
# @require_http_methods(["GET"])
# def generate_week_resume(request, gymnast_id, season=None, week_number=None):
# """va rechercher les informations nécessaires pour aider à la note de la semaine
# - wellbeing
# - intensity
# - injury
# Args:
# gymnast_id (int) identifiant du gymnast
# season (int) saison
# week_number (int) numéro de semaine
# date (date) date
# """
# gymnast = get_object_or_404(Gymnast, pk=gymnast_id)
# if season is None:
# date_begin = pendulum.now().date()
# season, week_number = from_date_to_week_number(date_begin)
# else:
# date_begin, _ = from_week_number_to_date(season, week_number)
# date_begin = date_begin.date()
# wellbeing_list = gymnast.wellbeing.objects.filter(season="season", week_number="week_number")
# intensity_list = gymnast.intensities.objects.filter(season="season", week_number="week_number")
# injury_list = gymnast.injuries.filter(season="season", week_number="week_number")