diff --git a/rowers/plannedsessions.py b/rowers/plannedsessions.py
index e037df2e..3b274605 100644
--- a/rowers/plannedsessions.py
+++ b/rowers/plannedsessions.py
@@ -226,6 +226,7 @@ cratiocolors = {
'over target': "purple",
'way over target': "violet",
'missed': "black",
+ 'not assigned': "",
'not done': "white",
}
@@ -312,9 +313,11 @@ def is_session_complete_ws(ws,ps):
return ratio,'partial',completiondate
else:
+ thevalue = 0
for key,value in cratios.iteritems():
- if ratio>value:
+ if ratio>value and value>thevalue:
verdict = key
+ thevalue = value
completiondate = ws.reverse()[0].date
return ratio,verdict,completiondate
diff --git a/rowers/stravastuff.py b/rowers/stravastuff.py
index 0017f38f..32eb785f 100644
--- a/rowers/stravastuff.py
+++ b/rowers/stravastuff.py
@@ -505,8 +505,8 @@ def add_workout_from_data(user,importid,data,strokedata,
except KeyError:
power = 2.8*velo**3
- if power.std() == 0 and power.mean() == 0:
- power = 2.8*velo**3
+ #if power.std() == 0 and power.mean() == 0:
+ # power = 2.8*velo**3
# save csv
# Create data frame with all necessary data to write to csv
diff --git a/rowers/templates/plannedsessions.html b/rowers/templates/plannedsessions.html
index 6f4eeb41..8856d4f6 100644
--- a/rowers/templates/plannedsessions.html
+++ b/rowers/templates/plannedsessions.html
@@ -48,11 +48,13 @@
{% if ps.sessiontype != 'race' %}
{% else %}
{% endif %}
|
diff --git a/rowers/templates/plannedsessionscoach.html b/rowers/templates/plannedsessionscoach.html
index 8e552d9a..e582e40d 100644
--- a/rowers/templates/plannedsessionscoach.html
+++ b/rowers/templates/plannedsessionscoach.html
@@ -58,20 +58,12 @@
{% for r in rowers %}
- {% if thedict|lookup:'results'|lookup:r.id == 'completed' %}
-
- {% elif thedict|lookup:'results'|lookup:r.id == 'partial' %}
-
- {% elif thedict|lookup:'results'|lookup:r.id == 'not done' %}
-
- {% elif thedict|lookup:'results'|lookup:r.id == 'not assigned' %}
-
{% else %}
-
+
{% endif %}
|
{% endfor %}
diff --git a/rowers/views.py b/rowers/views.py
index 2414e64a..79c139c7 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -14760,14 +14760,17 @@ def plannedsessions_coach_view(request,
for ps in sps:
rowerstatus = {}
+ rowercolor = {}
for r in rowers:
ratio, status,completiondate = is_session_complete(r,ps)
rowerstatus[r.id] = status
+ rowercolor[r.id] = cratiocolors[status]
sessiondict = {
'id': ps.id,
'results':rowerstatus,
'name': ps.name,
'startdate': ps.startdate,
+ 'color': rowercolor,
'preferreddate': ps.preferreddate,
'enddate': ps.enddate,
}
diff --git a/static/css/rowsandall2.css b/static/css/rowsandall2.css
index 87d98fdf..4838a54d 100644
--- a/static/css/rowsandall2.css
+++ b/static/css/rowsandall2.css
@@ -389,6 +389,62 @@ th.rotate > div > span {
color: #a9c08c;
}
+.lightgreen {
+ background: #e2f0da;
+ color: #fdffc;
+ border: solid 1px #b2bfaa;
+}
+
+.lightgreen:active {
+ color: #f5faf2;
+}
+
+.lightgreen:hover {
+ background: #b2bfaa;
+}
+
+.mediumgreen {
+ background: #aad090;
+ color: #fafff7;
+ border: solid 1px #8db374;
+}
+
+.mediumgreen:active {
+ color: #d8e6cf;
+}
+
+.mediumgreen:hover {
+ background: #8db374;
+}
+
+.purple {
+ background: #8c1ec1;
+ color: #e9ddf0;
+ border: solid 1px #6b0f99;
+}
+
+.purple:active {
+ color: #cfa160;
+}
+
+.purple:hover {
+ background: #6b0f99;
+}
+
+.violet {
+ background: #c20d60;
+ color: #f0dae5;
+ border: solid 1px #99034e;
+}
+
+.violet:active {
+ color: #e595bd;
+}
+
+.violet:hover {
+ background: #99034e;
+}
+
.blue {
color: #fae7e9;
border: solid 1px #27aae2;
@@ -799,21 +855,6 @@ th.rotate > div > span {
color: #999;
}
-.lightgreen {
- background: #e2f0da;
-}
-
-.mediumgreen {
- background: #aad090;
-}
-
-.purple {
- background: #8c1ec1;
-}
-
-.violet {
- background: #c20d60;
-}
/* blue */