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

Update note form

This commit is contained in:
Gregory Trullemans 2023-06-12 13:17:14 +02:00
parent a5cc4c7b7f
commit b8ab1b3242
3 changed files with 37 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jarvis/followup/forms.py
View File

@ -504,10 +504,16 @@ class PlanForm(forms.ModelForm):
class NoteForm(forms.ModelForm): class NoteForm(forms.ModelForm):
class Meta: class Meta:
model = Note model = Note
fields = ("gymnast", "coach", "status", "informations", "date") fields = ("gymnast", "coach", "title", "status", "informations", "date")
widgets = { widgets = {
"gymnast": forms.HiddenInput(), "gymnast": forms.HiddenInput(),
"coach": forms.HiddenInput(), "coach": forms.HiddenInput(),
"title": forms.TextInput(
attrs={
"class": "form-control",
"placeholder": "Note of the week",
}
),
"status": forms.Select(attrs={"class": "form-control selectpicker"}), "status": forms.Select(attrs={"class": "form-control selectpicker"}),
"date": forms.TextInput( "date": forms.TextInput(
attrs={ attrs={

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

@ -19,17 +19,25 @@
<label for="id_date" class="col-4 col-sm-2 col-md-2 col-lg-2 col-xl-2 col-form-label">Gymnast <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> <span class="text-danger"><b>*</b></span></label>
<div <div
class="col-8 col-md-9 col-lg-6 col-lg-4 col-xl-4 {% if form.jumper.errors %}has-danger{% endif %}"> class="col-8 col-md-9 col-lg-6 col-lg-4 col-xl-4 {% if form.jumper.errors %}has-danger{% endif %}">
{{ form.gymnast }} {{ form.gymnast }}
{{ form.gymnast_related }} {{ form.gymnast_related }}
{% if form.gymnast.errors %}&nbsp;<span class="btn btn-sm btn-danger-outline">{% for error in form.gymnast.errors %}{{ error }}{% endfor %}</span>{% endif %} {% if form.gymnast.errors %}&nbsp;<span class="btn btn-sm btn-danger-outline">{% for error in form.gymnast.errors %}{{ error }}{% endfor %}</span>{% endif %}
</div> </div>
</div> </div>
<div class="form-group row {% if form.title.errors %}has-error has-feedback{% endif %}">
<label for="id_title" class="col-4 col-sm-2 col-md-2 col-lg-2 col-xl-2 col-form-label">Title <span
class="text-danger"><b>*</b></label>
<div class="col-8 col-md-9 col-lg-6 col-lg-4 col-xl-4">
{{ form.title }}
{% if form.title.errors %}&nbsp;<span class="btn btn-sm btn-danger-outline">{% for error in form.title.errors %}{{ error }}{% endfor %}</span>{% endif %}
</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 <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> class="text-danger"><b>*</b></span></label>
<div <div
class="col-8 col-sm-6 col-md-4 col-lg-4 col-xl-4 {% if form.date.errors %}has-danger{% endif %}"> class="col-8 col-sm-6 col-md-4 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 %}
</div> </div>

40
jarvis/followup/views.py
View File

@ -493,26 +493,26 @@ def note_create_or_update(request, note_id=None, gymnast_id=None):
if form.is_valid(): if form.is_valid():
new_note = form.save() new_note = form.save()
if ( # if (
(new_note.gymnast.user.email or new_note.gymnast.email_trainer) # (new_note.gymnast.user.email or new_note.gymnast.email_trainer)
and ((not note_id) or (note_id and note.status == 0)) # and ((not note_id) or (note_id and note.status == 0))
and new_note.status == 1 # and new_note.status == 1
): # ):
send_mail( # send_mail(
"Nouvelle note", # "Nouvelle note",
"Une nouvelle note vous a été envoyée", # "Une nouvelle note vous a été envoyée",
settings.EMAIL_HOST_USER, # settings.EMAIL_HOST_USER,
[new_note.gymnast.user.email, new_note.gymnast.email_trainer], # [new_note.gymnast.user.email, new_note.gymnast.email_trainer],
fail_silently=False, # fail_silently=False,
html_message="""<p>Bonjour,</p> # html_message="""<p>Bonjour,</p>
<p>Une nouvelle note vous a été envoyée. Vous pouvez la consulter en liquant <a href='" # <p>Une nouvelle note vous a été envoyée. Vous pouvez la consulter en liquant <a href='"
+ request.build_absolute_uri( # + request.build_absolute_uri(
reverse( # reverse(
"gymnast_details_tab", args=(new_note.gymnast.id, "event") # "gymnast_details_tab", args=(new_note.gymnast.id, "event")
) # )
) # )
+ "'>ici</a>.</p><br /><p>Excellente journée</p><p>Jarvis</p>""", # + "'>ici</a>.</p><br /><p>Excellente journée</p><p>Jarvis</p>""",
) # )
return HttpResponseRedirect( return HttpResponseRedirect(
reverse("gymnast_details_tab", args=(new_note.gymnast.id, "event")) reverse("gymnast_details_tab", args=(new_note.gymnast.id, "event"))
) )