adding names of athlete to alert pages
This commit is contained in:
@@ -1072,10 +1072,12 @@ class Alert(models.Model):
|
|||||||
|
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
stri = u'Alert {name} on {metric} for {workouttype}'.format(
|
stri = u'Alert {name} on {metric} for {workouttype} - running on {first_name} every {period} days'.format(
|
||||||
name = self.name,
|
name = self.name,
|
||||||
metric = self.measured.metric,
|
metric = self.measured.metric,
|
||||||
workouttype = self.workouttype
|
workouttype = self.workouttype,
|
||||||
|
first_name = self.rower.user.first_name,
|
||||||
|
period = self.period,
|
||||||
)
|
)
|
||||||
|
|
||||||
return stri
|
return stri
|
||||||
|
|||||||
@@ -30,7 +30,7 @@
|
|||||||
<form action="" method="post">
|
<form action="" method="post">
|
||||||
<ul class="main-content">
|
<ul class="main-content">
|
||||||
<li class="grid_2">
|
<li class="grid_2">
|
||||||
<h2>Alert</h2>
|
<h2>New Alert for {{ rower.user.first_name }}</h2>
|
||||||
<p>
|
<p>
|
||||||
{{ formset.management_form }}
|
{{ formset.management_form }}
|
||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
|
|||||||
@@ -28,7 +28,7 @@
|
|||||||
<form action="" method="post">
|
<form action="" method="post">
|
||||||
<ul class="main-content">
|
<ul class="main-content">
|
||||||
<li class="grid_2">
|
<li class="grid_2">
|
||||||
<h2>Alert</h2>
|
<h2>Alert {{ alert.name }} for {{ alert.rower.user.first_name }}</h2>
|
||||||
<p>
|
<p>
|
||||||
{{ formset.management_form }}
|
{{ formset.management_form }}
|
||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
|
|||||||
@@ -4577,6 +4577,7 @@ def alert_edit_view(request,id=0,userid=0):
|
|||||||
'form':form,
|
'form':form,
|
||||||
'measuredform':measuredform,
|
'measuredform':measuredform,
|
||||||
'formset':filter_formset,
|
'formset':filter_formset,
|
||||||
|
'alert':alert,
|
||||||
})
|
})
|
||||||
|
|
||||||
# alert delete view
|
# alert delete view
|
||||||
|
|||||||
Reference in New Issue
Block a user