From e54d914b14b31c6c8bb1aa986abe548fce6aa392 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Thu, 21 Sep 2017 21:14:12 +0200
Subject: [PATCH 1/2] date, time in local time

---
 rowers/templates/list_workouts.html | 12 +++++++-----
 rowers/views.py                     |  8 ++++----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/rowers/templates/list_workouts.html b/rowers/templates/list_workouts.html
index d2158284..073e53a5 100644
--- a/rowers/templates/list_workouts.html
+++ b/rowers/templates/list_workouts.html
@@ -1,7 +1,9 @@
 {% extends "base.html" %}
 {% load staticfiles %}
 {% load rowerfilters %}
-
+{% load tz %}
+{% get_current_timezone as TIME_ZONE %}
+{% load l10n %}
 {% block title %}Workouts{% endblock %}
 
 {% block content %}
@@ -51,8 +53,7 @@
     <table width="100%" class="listtable shortpadded">
       <thead>
         <tr>
-          <th style="width:80px"> Date</th>
-          <th> Time</th>
+          <th style="width:120px"> Date, Time</th>
           <th> Name</th>
           <th> Type</th>
           <th> Distance </th>
@@ -76,8 +77,9 @@
           {% else %}
         <tr>
           {% endif %}
-            <td> {{ workout.date |truncatechars:15}} </td>
-            <td> {{ workout.starttime }} </td>
+          {% localtime on %}
+          <td> {{ workout.startdatetime|localtime|date:"Y-m-d, H:i" }} </td>
+          {% endlocaltime %}
             <td>
               {% if workout.user.user == user or user == team.manager %}
               {% if workout.rankingpiece %}
diff --git a/rowers/views.py b/rowers/views.py
index 7f7f745a..4c618b3a 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -4341,17 +4341,17 @@ def workouts_view(request,message='',successmessage='',
         if theteam.viewing == 'allmembers' or theteam.manager == request.user:
             workouts = Workout.objects.filter(team=theteam,
                                           startdatetime__gte=startdate,
-                                          startdatetime__lte=enddate).order_by("-date", "-starttime")
+                                          startdatetime__lte=enddate).order_by("-startdatetime")
             g_workouts = Workout.objects.filter(team=theteam,
                                                 startdatetime__gte=activity_startdate,
                                                 startdatetime__lte=activity_enddate).order_by("-date", "-starttime")
         elif theteam.viewing == 'coachonly':
             workouts = Workout.objects.filter(team=theteam,user=r,
                                               startdatetime__gte=startdate,
-                                              startdatetime__lte=enddate).order_by("-date","-starttime")
+                                              startdatetime__lte=enddate).order_by("-startdatetime")
             g_workouts = Workout.objects.filter(team=theteam,user=r,
                                                 startdatetime__gte=activity_startdate,
-                                                enddatetime__lte=activity_enddate).order_by("-date","-starttime")
+                                                enddatetime__lte=activity_enddate).order_by("-startdatetime")
 
 
     else:
@@ -4361,7 +4361,7 @@ def workouts_view(request,message='',successmessage='',
                                       startdatetime__lte=enddate).order_by("-date", "-starttime")
         g_workouts = Workout.objects.filter(user=r,
                                             startdatetime__gte=activity_startdate,
-                                            startdatetime__lte=activity_enddate).order_by("-date","-starttime")
+                                            startdatetime__lte=activity_enddate).order_by("-startdatetime")
 
     query = request.GET.get('q')
     if query:

From c9628b2e1d60e57701d5ee9694314c3d68eafc12 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Thu, 21 Sep 2017 21:31:17 +0200
Subject: [PATCH 2/2] time in zone rowed - workouts list

---
 rowers/templates/list_workouts.html | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/rowers/templates/list_workouts.html b/rowers/templates/list_workouts.html
index 073e53a5..61cbc9ae 100644
--- a/rowers/templates/list_workouts.html
+++ b/rowers/templates/list_workouts.html
@@ -1,9 +1,7 @@
 {% extends "base.html" %}
 {% load staticfiles %}
 {% load rowerfilters %}
-{% load tz %}
-{% get_current_timezone as TIME_ZONE %}
-{% load l10n %}
+
 {% block title %}Workouts{% endblock %}
 
 {% block content %}
@@ -53,7 +51,8 @@
     <table width="100%" class="listtable shortpadded">
       <thead>
         <tr>
-          <th style="width:120px"> Date, Time</th>
+          <th style="width:80"> Date</th>
+          <th> Time</th>
           <th> Name</th>
           <th> Type</th>
           <th> Distance </th>
@@ -77,10 +76,9 @@
           {% else %}
         <tr>
           {% endif %}
-          {% localtime on %}
-          <td> {{ workout.startdatetime|localtime|date:"Y-m-d, H:i" }} </td>
-          {% endlocaltime %}
-            <td>
+          <td> {{ workout.date|date:"Y-m-d" }} </td>
+          <td> {{ workout.starttime|date:"H:i" }} </td>
+          <td>
               {% if workout.user.user == user or user == team.manager %}
               {% if workout.rankingpiece %}
               [RANKING PIECE]