Merge branch 'release/v5.44'

rowers/dataprep.py

@@ -56,7 +56,7 @@ import sys
 
 import utils
 import datautils
-from utils import lbstoN,myqueue
+from utils import lbstoN,myqueue,is_ranking_piece
 
 from timezonefinder import TimezoneFinder
 
@@ -921,6 +921,9 @@ def save_workout_database(f2, r, dosmooth=True, workouttype='rower',
         w.startdatetime = timezone.now()
         w.save()
 
+    if is_ranking_piece(w):
+        w.rankingpiece = True
+        w.save()
 
     if privacy == 'visible':
         ts = Team.objects.filter(rower=r)

rowers/tasks.py

@@ -493,7 +493,17 @@ def handle_otwsetpower(self,f1, boattype, weightvalue,
 def handle_updateergcp(rower_id,workoutfilenames,debug=False,**kwargs):
     therows = []
     for f1 in workoutfilenames:
+        try:
             rowdata = rdata(f1)
+        except IOError:
+            try:
+                rowdata = rdata(f1 + '.csv')
+            except IOError:
+                try:
+                    rowdata = rdata(f1 + '.gz')
+                except IOError:
+                    rowdata = 0
+        
 	if rowdata != 0:
 	    therows.append(rowdata)
 

rowers/templates/.#oterankings.html

@@ -1 +0,0 @@
-E408191@CZ27LT9RCGN72.63064:1514927368

rowers/templates/list_workouts.html

@@ -4,12 +4,49 @@
 
 {% block title %}Rowsandall Workouts List{% endblock %}
 
-{% block content %}
+{% block scripts %}
-
 <script>
   setTimeout("location.reload(true);",60000);
 </script>
+<script
+  type='text/javascript'
+  src='https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js'>
+</script>
+<script>
+  $(function() {
+  $("td.rankingtoggle").click( function() {
+  var workout_id = $(this).attr('workoutid');
+  console.log(workout_id);
+  $.getJSON(window.location.protocol + '//'+window.location.host + '/rowers/workout/'+workout_id+'/toggle-ranking', function(json) {
+  console.log(JSON.stringify(json));
+  rankingpiece = json.result;
+  tdid = "#star"+workout_id;
+  console.log(rankingpiece);
+  console.log($(tdid).length);
+  if (rankingpiece) {
+  $(tdid).addClass('yellow');
+  $(tdid).removeClass('notyellow');
+  $(tdid).html('&starf;');
+  console.log('adding yellow '+tdid);
+  } else {
+  $(tdid).removeClass('yellow');
+  $(tdid).addClass('notyellow');
+  $(tdid).html('&star;');
+  console.log('remove yellow '+tdid);
+  };
+  });
+  });
+  });
+</script>
 
+{% endblock %}
+
+{% block content %}
+<style>
+  #mypointer {
+  cursor: pointer;
+  }
+</style>
 
 <div class="grid_12">
 
@@ -51,6 +88,7 @@
     <table width="100%" class="listtable shortpadded">
       <thead>
         <tr>
+          <th> R</th>
           <th style="width:80"> Date</th>
           <th> Time</th>
           <th> Name</th>
@@ -76,56 +114,67 @@
           {% else %}
         <tr>
           {% endif %}
+          <td  id="mypointer"
+               class="rankingtoggle" workoutid="{{ workout.id }}">
+            {% if workout.rankingpiece %}
+            <span id="star{{ workout.id }}" class="yellow">&starf;</span>
+            {% else %}
+            <span id="star{{ workout.id }}" class="notyellow">&star;</span>
+            {% endif %}
+          </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]
-              {% endif %}
               {% if workout.name != '' %}
-              <a href={% url rower.defaultlandingpage id=workout.id %}>{{ workout.name }}</a> </td>
+          <td>
+            <a href={% url rower.defaultlandingpage id=workout.id %}>
+              {{ workout.name }}
+            </a>
+          </td>
           {% else %}
-            <a href={% url rower.defaultlandingpage id=workout.id %}>No Name</a> </td>
+          <td>
-{% endif %}
+            <a href={% url rower.defaultlandingpage
-{% else %}
+               id=workout.id %}>No Name
-{% if workout.name != '' %}
+          </a></td> 
-<a href="/rowers/workout/{{ workout.id }}/">{{ workout.name }}</a> </td>
+          {% endif %}
-{% else %}
+          {% else %}
-<a href="/rowers/workout/{{ workout.id }}/">No Name</a> </td>
+          {% if workout.name != '' %}
-{% endif %}
+          <td><a href="/rowers/workout/{{ workout.id }}/">{{ workout.name }}</a></td>
-{% endif %}
+          {% else %}
-<td> {{ workout.workouttype }} </td>
+          <td><a href="/rowers/workout/{{ workout.id }}/">No Name</a> </td>
-<td> {{ workout.distance }}m</td>
+          {% endif %}
-<td> {{ workout.duration |durationprint:"%H:%M:%S.%f" }} </td>
+          {% endif %}
-<td> {{ workout.averagehr }} </td>
+          <td> {{ workout.workouttype }} </td>
-<td> {{ workout.maxhr }} </td>
+          <td> {{ workout.distance }}m</td>
+          <td> {{ workout.duration |durationprint:"%H:%M:%S.%f" }} </td>
+          <td> {{ workout.averagehr }} </td>
+          <td> {{ workout.maxhr }} </td>
           {% if not team %}
-<td>
+          <td>
             <a class="small" href="/rowers/workout/{{ workout.id }}/export">Export</a>
-</td>
+          </td>
           {% else %}
-<td colspan="2">
+          <td colspan="2">
             {{ workout.user.user.first_name }} {{ workout.user.user.last_name }}
           </td>
           {% endif %}
-<td> <a class="small" href="/rowers/workout/{{ workout.id }}/flexchart">Flex</a> </td>
+          <td> <a class="small" href="/rowers/workout/{{ workout.id }}/flexchart">Flex</a> </td>
-<td>
+          <td>
             <a class="small" href="/rowers/workout/{{ workout.id }}/deleteconfirm">Delete
-</td>
+          </td>
           
-</tr>
+        </tr>
         
-{% endfor %}
+        {% endfor %}
-</tbody>
+      </tbody>
-</table>
+    </table>
-{% else %}
+    {% else %}
-<p> No workouts found </p>
+    <p> No workouts found </p>
-{% endif %}
+    {% endif %}
-</div>
+  </div>
   
   
-<div class="grid_4 omega">
+  <div class="grid_4 omega">
     {% if team %}
     <div class="grid_4" id="teambuttons">
       <div class="grid_3 alpha">
@@ -184,13 +233,13 @@
         Sander Roosendaal. A Masters rower.
         
         Read his <a href="http://blog.rowsandall.com/">blog</a>
-</p>
+      </p>
       <div style="text-align: right; padding: 2em">
         <a href="http://blog.rowsandall.com/">
           <img src="/static/img/sander.jpg" width="80"></a>
       </div>
     </div>
-</div>
+  </div>
 </div>
 </div>
 
@@ -215,7 +264,7 @@
     {% else %}
     <form id="searchform" action="/rowers/list-workouts/{{ startdate|date:"Y-m-d" }}/{{ enddate|date:"Y-m-d" }}"
           method="get" accept-charset="utf-8">
-{% endif %}    
+      {% endif %}    
       <div class="grid_3 prefix_1 alpha">
         <input class="searchfield" id="searchbox" name="q" type="text" placeholder="Search">
       </div>
@@ -249,4 +298,4 @@
     {% endif %}
   </span>
   
-{% endblock %}
+  {% endblock %}

rowers/urls.py

@@ -212,6 +212,7 @@ urlpatterns = [
     url(r'^graph/(?P<id>\d+)/deleteconfirm$',views.graph_delete_confirm_view),
     url(r'^graph/(?P<id>\d+)/delete$',views.graph_delete_view),
     url(r'^workout/(?P<id>\d+)/get-thumbnails$',views.get_thumbnails),
+    url(r'^workout/(?P<id>\d+)/toggle-ranking$',views.workout_toggle_ranking),
     url(r'^workout/(?P<id>\d+)/get-testscript$',views.get_testscript),
     url(r'^workout/upload/team/$',views.team_workout_upload_view),
     url(r'^workout/upload/$',views.workout_upload_view,name='workout_upload_view'),

rowers/utils.py

@@ -5,6 +5,7 @@ import colorsys
 from django.conf import settings
 
 import uuid
+import datetime
 
 lbstoN = 4.44822
 
@@ -127,6 +128,22 @@ palettes = {
   'yellow_red':trcolors(255,255,178,189,0,39)
 }
 
+rankingdistances = [100,500,1000,2000,5000,6000,10000,21097,42195,100000]
+rankingdurations = []
+rankingdurations.append(datetime.time(minute=1))
+rankingdurations.append(datetime.time(minute=4))
+rankingdurations.append(datetime.time(minute=30))
+rankingdurations.append(datetime.time(hour=1,minute=15))
+rankingdurations.append(datetime.time(hour=1))
+
+
+def is_ranking_piece(workout):
+    if workout.distance in rankingdistances:
+        return True
+    elif workout.duration in rankingdurations:
+        return True
+    
+    return False
 
 def range_to_color_hex(groupcols,palette='monochrome_blue'):
 

rowers/views.py

@@ -711,7 +711,8 @@ def splitstdata(lijst):
 from utils import (
     geo_distance,serialize_list,deserialize_list,uniqify,
     str2bool,range_to_color_hex,absolute,myqueue,get_call,
-    calculate_age
+    calculate_age,rankingdistances,rankingdurations,
+    is_ranking_piece
     )
 
 import datautils
@@ -3175,7 +3176,7 @@ def addmanual_view(request):
 
             if id:
                 w = Workout.objects.get(id=id)
-                w.rankingpiece = rankingpiece
+                w.rankingpiece = rankingpiece or is_ranking_piece(w)
                 w.notes = notes
                 w.save()
                 messages.info(request,'New workout created')
@@ -3297,29 +3298,22 @@ def rankings_view(request,theuser=0,
     enddate = datetime.datetime.combine(enddate,datetime.time(23,59,59))
     enddate = enddate+datetime.timedelta(days=1)
 
-    rankingdistances = [100,500,1000,2000,5000,6000,10000,21097,42195,100000]
-    rankingdurations = []
-    rankingdurations.append(datetime.time(minute=1))
-    rankingdurations.append(datetime.time(minute=4))
-    rankingdurations.append(datetime.time(minute=30))
-    rankingdurations.append(datetime.time(hour=1,minute=15))
-    rankingdurations.append(datetime.time(hour=1))
-
     thedistances = []
     theworkouts = []
     thesecs = []
 
-
-
     rankingdistances.sort()
     rankingdurations.sort()
 
     for rankingdistance in rankingdistances:
     
-	workouts = Workout.objects.filter(user=r,distance=rankingdistance,
+	workouts = Workout.objects.filter(
+            user=r,distance=rankingdistance,
 	    workouttype__in=['rower','dynamic','slides'],
+            rankingpiece=True,
 	    startdatetime__gte=startdate,
-					  startdatetime__lte=enddate).order_by('duration')
+	    startdatetime__lte=enddate
+        ).order_by('duration')
 	if workouts:
 	    thedistances.append(rankingdistance)
 	    theworkouts.append(workouts[0])
@@ -3333,10 +3327,13 @@ def rankings_view(request,theuser=0,
 
     for rankingduration in rankingdurations:
     
-	workouts = Workout.objects.filter(user=r,duration=rankingduration,
+	workouts = Workout.objects.filter(
+            user=r,duration=rankingduration,
 	    workouttype='rower',
+            rankingpiece=True,
 	    startdatetime__gte=startdate,
-					  startdatetime__lte=enddate).order_by('-distance')
+	    startdatetime__lte=enddate
+        ).order_by('-distance')
 	if workouts:
 	    thedistances.append(workouts[0].distance)
 	    theworkouts.append(workouts[0])
@@ -3641,13 +3638,6 @@ def rankings_view2(request,theuser=0,
     enddate = datetime.datetime.combine(enddate,datetime.time(23,59,59))
     enddate = enddate+datetime.timedelta(days=1)
 
-    rankingdistances = [100,500,1000,2000,5000,6000,10000,21097,42195,100000]
-    rankingdurations = []
-    rankingdurations.append(datetime.time(minute=1))
-    rankingdurations.append(datetime.time(minute=4))
-    rankingdurations.append(datetime.time(minute=30))
-    rankingdurations.append(datetime.time(hour=1,minute=15))
-    rankingdurations.append(datetime.time(hour=1))
 
     thedistances = []
     theworkouts = []
@@ -3660,8 +3650,10 @@ def rankings_view2(request,theuser=0,
 
     for rankingdistance in rankingdistances:
     
-	workouts = Workout.objects.filter(user=r,distance=rankingdistance,
+	workouts = Workout.objects.filter(
+            user=r,distance=rankingdistance,
 	    workouttype__in=['rower','dynamic','slides'],
+            rankingpiece=True,
 	    startdatetime__gte=startdate,
 	    startdatetime__lte=enddate).order_by('duration')
 	if workouts:
@@ -3677,8 +3669,10 @@ def rankings_view2(request,theuser=0,
 
     for rankingduration in rankingdurations:
     
-	workouts = Workout.objects.filter(user=r,duration=rankingduration,
+	workouts = Workout.objects.filter(
+            user=r,duration=rankingduration,
 	    workouttype='rower',
+            rankingpiece=True,
 	    startdatetime__gte=startdate,
 	    startdatetime__lte=enddate).order_by('-distance')
 	if workouts:
@@ -3983,12 +3977,6 @@ def otwrankings_view(request,theuser=0,
     enddate = enddate+datetime.timedelta(days=1)
 
  
-    rankingdurations = []
-    rankingdurations.append(datetime.time(minute=1))
-    rankingdurations.append(datetime.time(minute=4))
-    rankingdurations.append(datetime.time(minute=30))
-    rankingdurations.append(datetime.time(hour=1))
-    rankingdurations.append(datetime.time(hour=1,minute=15))
 
     thedistances = []
     theworkouts = []
@@ -4235,14 +4223,6 @@ def oterankings_view(request,theuser=0,
     enddate = enddate+datetime.timedelta(days=1)
 
  
-    rankingdurations = []
-    rankingdurations.append(datetime.time(minute=1))
-    rankingdurations.append(datetime.time(minute=4))
-    rankingdurations.append(datetime.time(minute=30))
-    rankingdurations.append(datetime.time(hour=1))
-    rankingdurations.append(datetime.time(hour=1,minute=15))
-
-    rankingdistances = [100,500,1000,2000,5000,6000,10000,21097,42195,100000]
     
     thedistances = []
     theworkouts = []
@@ -9302,6 +9282,35 @@ def workout_getc2workout_view(request,c2id):
 	    url = reverse(workout_c2import_view)
 	    return HttpResponseRedirect(url)
 
+@login_required
+def workout_toggle_ranking(request,id=0):
+    is_ajax = False
+    if request.is_ajax():
+        is_ajax = True
+
+    try:
+	# check if valid ID exists (workout exists)
+	row = Workout.objects.get(id=id)
+    except Workout.DoesNotExist:
+        raise Http404("Workout doesn't exist")
+
+    if not checkworkoutuser(request.user,row):
+        message = "You are not allowed to change this workout"
+        messages.error(request,message)
+
+    # we are still here - we own the workout
+    row.rankingpiece = not row.rankingpiece
+    row.save()
+
+    if is_ajax:
+        return JSONResponse({'result':row.rankingpiece})
+    else: 
+        url = reverse(workouts_view)
+        response = HttpResponseRedirect(url)
+
+    return response
+        
+        
 # This is the main view for processing uploaded files
 @login_required()
 def workout_upload_view(request,

static/css/rowsandall.css

@@ -56,6 +56,19 @@ body {
   padding-bottom: 20px;
 }
 
+.notyellow {
+    font-size: 1.2em;
+    height: auto;
+    padding: 0px;
+}
+
+.yellow {
+    color: #cccc00;
+    font-size: 1.2em;
+    height: auto;
+    padding: 0px;
+}
+
 
 a {
 /*  color: #fff; */