From b4f6a94177d7e3588c5e8f6715d47aa003dd64e3 Mon Sep 17 00:00:00 2001 From: Gregory Trullemans Date: Wed, 22 Nov 2023 10:27:41 +0100 Subject: [PATCH] Update intensity table head --- .../followup/templates/intensities/list.html | 9 ++- jarvis/followup/views.py | 63 ++++++++++++++++--- 2 files changed, 60 insertions(+), 12 deletions(-) diff --git a/jarvis/followup/templates/intensities/list.html b/jarvis/followup/templates/intensities/list.html index c22c521..a672669 100644 --- a/jarvis/followup/templates/intensities/list.html +++ b/jarvis/followup/templates/intensities/list.html @@ -5,8 +5,7 @@
-

Intensity listing {% if gymnast %}for {{ gymnast }}{% endif %} -

+

Intensity listing {% if gymnast %}for {{ gymnast }}{% endif %}

@@ -30,12 +29,12 @@ Gymnast Time Diff - # skill + # Skill # passes T/p D/p - # skill - # S/p + S/T + S/p D/S diff --git a/jarvis/followup/views.py b/jarvis/followup/views.py index 5ab1175..ff1b43e 100644 --- a/jarvis/followup/views.py +++ b/jarvis/followup/views.py @@ -64,6 +64,41 @@ import pendulum User = get_user_model() +MAIL_HEADER = """ +Gregory Trullemans
+ + +""" + @login_required @require_http_methods(["GET"]) @@ -522,9 +557,8 @@ def note_create_or_update(request, note_id=None, gymnast_id=None): [new_note.gymnast.user.email, new_note.gymnast.email_trainer], fail_silently=False, html_message=f"""

Bonjour,

-

Une nouvelle note vous a été envoyée.

-

Vous pouvez la consulter en cliquant ici.

-

Excellente journée

+

Une nouvelle note vous a été envoyée. Vous pouvez la consulter en cliquant ici.

+

Excellente journée

Jarvis

""", ) return HttpResponseRedirect( @@ -1451,9 +1485,9 @@ def intensity_create_or_update(request, intensity_id=None, gymnast_id=None):
  • {number_of_passes} passages
  • {time} minutes
  • {quantity_of_skill} figures
    • -
  • {difficulty / 10} diff.
    • +
  • {difficulty / 10} difficulty
    • -

    Statistics :

    +

    Statistics:

    • Time/passe: {time_by_passe:.2f}
    • Skill/time: {skill_by_time:.2f}
      • @@ -1461,9 +1495,24 @@ def intensity_create_or_update(request, intensity_id=None, gymnast_id=None):
    • Diff/passe: {diff_by_passe:.2f}
    • Diff/skill: {diff_by_skill:.2f}
    -

    Excellente journée

    -

    Jarvis

    """, +
    +

    Jarvis

    +

    Trampoline Trainer Help

    + + + + + + + +
    + + + Flying Acrobatics Trampoline Club
    + Rue René Francq, 7
    + 1428 Lillois-Witterzée +
    """, ) return HttpResponseRedirect(