diff --git a/freezing/web/templates/base.html b/freezing/web/templates/base.html index 826d2ff..a7c9249 100644 --- a/freezing/web/templates/base.html +++ b/freezing/web/templates/base.html @@ -102,7 +102,7 @@
  • Distance vs. Avg Low Temp
  • Individual Dist/Elev/Speed
  • -
  • Team Cumulative
  • +
  • Team Cumulative
  • Team Weekly Points
  • diff --git a/freezing/web/views/chartdata.py b/freezing/web/views/chartdata.py index d6942fc..6e7c884 100644 --- a/freezing/web/views/chartdata.py +++ b/freezing/web/views/chartdata.py @@ -1050,9 +1050,9 @@ def parameterized_suffering_query( select A.display_name as athlete_name, A.id as ath_id, W.{0} as {1}, - R.start_date as date, - R.location as loc, - R.moving_time as moving + any_value(R.start_date) as date, + any_value(R.location) as loc, + any_value(R.moving_time) as moving from rides R inner join ride_weather W on R.id=W.ride_id inner join lbd_athletes A on A.id=R.athlete_id @@ -1067,7 +1067,7 @@ def parameterized_suffering_query( ) as SQ ON SQ.{1}2 = W.{0} AND SQ.ath2_id = A.id - group by athlete_name + group by athlete_name, ath_id order by {1} {3}, moving DESC; """.format( weath_field, weath_nick, func, desc, superlative_restriction diff --git a/setup.py b/setup.py index 5e95414..4929178 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ __copyright__ = "Copyright 2015 Hans Lellelid" -version = "1.3.1" +version = "1.3.2" long_description = """ The freezing saddles cycling competition website/scoreboard.