From 0e005600cd8721640a794b9ddaaf4588d152c283 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal
Date: Wed, 19 Sep 2018 07:53:39 +0200
Subject: [PATCH 01/19] removed races from plan
---
rowers/views.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rowers/views.py b/rowers/views.py
index 72a2ea17..eac57b4b 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -14553,7 +14553,7 @@ def rower_trainingplan_view(request,id=0):
if ps.sessionmode == 'time':
mm.plantime += ps.sessionvalue
mm.actualtime += int(ps.sessionvalue*ratio)
- elif ps.sessionmode == 'distance':
+ elif ps.sessionmode == 'distance' and ps.sessiontype != 'race':
mm.plandistance += ps.sessionvalue
mm.actualdistance += int(ps.sessionvalue*ratio)
elif ps.sessionmode == 'rScore':
From a099aea328051252374babc6edd26b1486b6c589 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal
Date: Wed, 19 Sep 2018 08:27:32 +0200
Subject: [PATCH 02/19] bug fix
---
rowers/views.py | 8 +-------
static/css/styles2.css | 12 ++++++------
2 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/rowers/views.py b/rowers/views.py
index eac57b4b..4d19ddc6 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -12728,13 +12728,7 @@ def plannedsession_teamcreate_view(request,timeperiod='thisweek',
startdate,enddate = get_dates_timeperiod(timeperiod)
- try:
- trainingplan = TrainingPlan.objects.filter(
- startdate__lte = startdate,
- rower = r,
- enddate__gte = enddate)[0]
- except IndexError:
- trainingplan = None
+ trainingplan = None
sps = []
for team in teams:
diff --git a/static/css/styles2.css b/static/css/styles2.css
index ccdd6c09..8e304869 100644
--- a/static/css/styles2.css
+++ b/static/css/styles2.css
@@ -113,13 +113,13 @@
@media (min-width: 768px) {
.wrapper {
- grid-template-columns: 1fr 5fr 1fr;
+ grid-template-columns: 1fr 4fr 1fr;
grid-template-areas:
- "header header header user"
- "nav nav nav nav"
- "sidebar content content content"
- "sidebar content content content"
- "ad footer footer footer"
+ "header header user"
+ "nav nav nav"
+ "sidebar content content"
+ "sidebar content content"
+ "ad footer footer"
}
nav ul {
From ae20f940baa063a0f21c32d58a9cf311c58d4c1c Mon Sep 17 00:00:00 2001
From: Sander Roosendaal
Date: Wed, 19 Sep 2018 12:19:27 +0200
Subject: [PATCH 03/19] added analysis menu item
---
templates/newbase.html | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/templates/newbase.html b/templates/newbase.html
index 8e5021cb..75ee0bde 100644
--- a/templates/newbase.html
+++ b/templates/newbase.html
@@ -56,7 +56,7 @@
-
+
@@ -149,7 +149,7 @@
Racing
- Team
+ Analysis
From 8364506763be22052f578c393b989d28bab4184f Mon Sep 17 00:00:00 2001
From: Sander Roosendaal
Date: Thu, 20 Sep 2018 16:04:59 +0200
Subject: [PATCH 04/19] different user icons, main nav order
---
templates/newbase.html | 95 +++++++++++++++++++++++++++++-------------
1 file changed, 66 insertions(+), 29 deletions(-)
diff --git a/templates/newbase.html b/templates/newbase.html
index 75ee0bde..0b097d54 100644
--- a/templates/newbase.html
+++ b/templates/newbase.html
@@ -96,6 +96,7 @@
+
+
+
-
- {% block main %}
- {% endblock %}
-
-
-
- {% block ad %}
- Advertising
- {% endblock %}
-
- {% analytical_body_bottom %}
- {% block body_bottom %}{% endblock %}
+
+
+ {% block main %}
+ {% endblock %}
+
+
+
+
+
+ {% block ad %}
+ Advertising
+ {% endblock %}
+
+ {% analytical_body_bottom %}
+ {% block body_bottom %}{% endblock %}