From 40ad973b33ce29d2be0503bedb1b21dcd55b332e Mon Sep 17 00:00:00 2001
From: Sander Roosendaal
Date: Fri, 16 Aug 2019 18:18:54 +0200
Subject: [PATCH] alert form
---
rowers/models.py | 5 +++++
rowers/templates/alert_create.html | 30 ++++++++++++++++++++++++++++++
rowers/templates/alert_edit.html | 30 ++++++++++++++++++++++++++++++
rowers/templates/alerts.html | 2 +-
rowers/urls.py | 1 +
rowers/views/analysisviews.py | 6 ++++++
rowers/views/statements.py | 1 +
7 files changed, 74 insertions(+), 1 deletion(-)
create mode 100644 rowers/templates/alert_create.html
create mode 100644 rowers/templates/alert_edit.html
diff --git a/rowers/models.py b/rowers/models.py
index 9d81610f..1d0fcc42 100644
--- a/rowers/models.py
+++ b/rowers/models.py
@@ -1054,6 +1054,11 @@ class Alert(models.Model):
)
return stri
+
+class AlertEditForm(ModelForm):
+ class Meta:
+ model = Alert
+ fields = ['name','measured','reststrokes','period','emailalert','workouttype']
class BasePlannedSessionFormSet(BaseFormSet):
def clean(self):
diff --git a/rowers/templates/alert_create.html b/rowers/templates/alert_create.html
new file mode 100644
index 00000000..a637b3bd
--- /dev/null
+++ b/rowers/templates/alert_create.html
@@ -0,0 +1,30 @@
+{% extends "newbase.html" %}
+{% load staticfiles %}
+
+{% block title %}Planned Session{% endblock %}
+
+{% block main %}
+Alert Edit
+
+
+
+
+
+
+
+
+{% endblock %}
+
+{% block sidebar %}
+{% include 'menu_analytics.html' %}
+{% endblock %}
diff --git a/rowers/templates/alert_edit.html b/rowers/templates/alert_edit.html
new file mode 100644
index 00000000..a637b3bd
--- /dev/null
+++ b/rowers/templates/alert_edit.html
@@ -0,0 +1,30 @@
+{% extends "newbase.html" %}
+{% load staticfiles %}
+
+{% block title %}Planned Session{% endblock %}
+
+{% block main %}
+Alert Edit
+
+
+
+
+
+{% endblock %}
+
+{% block sidebar %}
+{% include 'menu_analytics.html' %}
+{% endblock %}
diff --git a/rowers/templates/alerts.html b/rowers/templates/alerts.html
index 4693136d..5740d620 100644
--- a/rowers/templates/alerts.html
+++ b/rowers/templates/alerts.html
@@ -59,7 +59,7 @@
{% endif %}
- Create new alert
+ Create new alert
diff --git a/rowers/urls.py b/rowers/urls.py
index d6150c1a..14e04c6f 100644
--- a/rowers/urls.py
+++ b/rowers/urls.py
@@ -422,6 +422,7 @@ urlpatterns = [
re_path(r'^alerts/(?P\d+)/delete/$',views.AlertDelete.as_view(),name='alert_delete_view'),
re_path(r'^alerts/(?P\d+)/edit/user/(?P\d+)/$',views.alert_edit_view,name='alert_edit_view'),
re_path(r'^alerts/(?P\d+)/edit/$',views.alert_edit_view,name='alert_edit_view'),
+ re_path(r'^alerts/new/$',views.alert_create_view, name='alert_create_view'),
re_path(r'^user-boxplot/user/(?P\d+)/$',views.boxplot_view,name='boxplot_view'),
re_path(r'^user-boxplot/$',views.boxplot_view,name='boxplot_view'),
re_path(r'^user-boxplot-data/$',views.boxplot_view_data,name='boxplot_view_data'),
diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py
index 13fa1b89..035946cc 100644
--- a/rowers/views/analysisviews.py
+++ b/rowers/views/analysisviews.py
@@ -4337,9 +4337,12 @@ def alerts_view(request,userid=0):
def alert_create_view(request,userid=0):
r = getrequestrower(request,userid=userid)
+ form = AlertEditForm()
+
return render(request,'alert_create.html',
{
'rower':r,
+ 'form':form,
})
# alert report view
@@ -4351,9 +4354,12 @@ def alert_create_view(request,userid=0):
def alert_edit_view(request,id=0,userid=0):
r = getrequestrower(request,userid=userid)
+ form = AlertEditForm()
+
return render(request,'alert_edit.html',
{
'rower':r,
+ 'form':form,
})
# alert delete view
diff --git a/rowers/views/statements.py b/rowers/views/statements.py
index 23d6e377..2f62d5c1 100644
--- a/rowers/views/statements.py
+++ b/rowers/views/statements.py
@@ -94,6 +94,7 @@ from rowers.models import (
microcyclecheckdates,mesocyclecheckdates,macrocyclecheckdates,
TrainingMesoCycleForm, TrainingMicroCycleForm,
RaceLogo,RowerBillingAddressForm,PaidPlan,
+ AlertEditForm,
PlannedSessionComment,CoachRequest,CoachOffer,checkaccessplanuser
)
from rowers.models import (