Merge branch 'release/v4.82'

rowers/forms.py

@@ -65,7 +65,7 @@ class DocumentsForm(forms.Form):
     def __init__(self, *args, **kwargs):
         from django.forms.widgets import HiddenInput
         super(DocumentsForm, self).__init__(*args, **kwargs)
-        self.fields['offline'].widget = HiddenInput()
+#        self.fields['offline'].widget = HiddenInput()
 
 from utils import (
     workflowleftpanel,workflowmiddlepanel,

rowers/templates/document_form.html

@@ -22,8 +22,9 @@
       }
       if (f.size > 1048576) {
       $('#id_offline').val('True');
+      $('#id_offline').prop('checked','True');
       console.log("Set offline to True");
-      $('#extra_message').text('Because of the large size, the file will be processed offline. You will receive email when it is done. The extra actions will not be performed.');
+      $('#extra_message').text('Because of the large size, we recommend to use  background processing. You will receive email when it is done. The extra actions will not be performed.');
       $('#extra_message').addClass('message');      
       }
       });

rowers/urls.py

@@ -189,6 +189,7 @@ urlpatterns = [
     url(r'^graph/(?P<id>\d+)/$',views.graph_show_view),
     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/upload/team/$',views.team_workout_upload_view),
     url(r'^workout/upload/$',views.workout_upload_view,name='workout_upload_view'),
     url(r'^workout/(?P<id>\d+)/histo$',views.workout_histo_view),

rowers/utils.py

@@ -224,10 +224,6 @@ def myqueue(queue,function,*args,**kwargs):
     if settings.DEBUG:
         kwargs['debug'] = True
 
-        print 'myqueue'
-        print args
-        print kwargs
-        
         job = function.delay(*args,**kwargs)
     else:
         job_id = str(uuid.uuid4())

rowers/views.py

@@ -144,6 +144,13 @@ from rq import Queue,cancel_job
 
 from django.core.cache import cache
 
+# Utility to get stroke data in a JSON response
+class JSONResponse(HttpResponse):
+    def __init__(self, data, **kwargs):
+        content = JSONRenderer().render(data)
+        kwargs['content_type'] = 'application/json'
+        super(JSONResponse, self).__init__(content, **kwargs)
+
 def getvalue(data):
     perc = 0
     total = 1
@@ -440,7 +447,7 @@ def get_stored_tasks_status(request):
         taskids = []
 
     taskstatus = []
-    for id,func_name in taskids:
+    for id,func_name in reversed(taskids):
         progress = 0
         cached_progress = cache.get(id)
         finished = get_job_status(id)['finished']
@@ -467,6 +474,47 @@ def get_stored_tasks_status(request):
     
     return taskstatus
 
+@login_required()
+def get_thumbnails(request,id):
+    try:
+        row = Workout.objects.get(id=id)
+    except Workout.DoesNotExist:
+	raise Http404("Workout doesn't exist")
+    if (checkworkoutuser(request.user,row)==False):
+        raise Http404("You are not allowed to edit this workout")
+    
+    r = getrower(request.user)
+    result = request.user.is_authenticated() and ispromember(request.user)
+    if result:
+	promember=1
+    if request.user == row.user.user:
+	mayedit=1
+
+    comments = WorkoutComment.objects.filter(workout=row)
+
+    aantalcomments = len(comments)
+
+    workouttype = 'ote'
+    if row.workouttype in ('water','coastal'):
+        workouttype = 'otw'
+
+    try:
+        favorites = FavoriteChart.objects.filter(user=r,
+                                           workouttype__in=[workouttype,'both']).order_by("id")
+        maxfav = len(favorites)-1
+    except:
+        favorites = None
+        maxfav = 0
+
+    charts = []
+    
+    charts = thumbnails_set(r,id,favorites)
+    if charts[0]['script'] == '': 
+        charts = []
+
+        
+    return JSONResponse(charts)
+
 @login_required()
 def session_jobs_view(request):
     taskstatus = get_stored_tasks_status(request)
@@ -9540,12 +9588,6 @@ def rower_revokeapp_view(request,id=0):
         raise Http404("Access token doesn't exist")
 
 
-# Utility to get stroke data in a JSON response
-class JSONResponse(HttpResponse):
-    def __init__(self, data, **kwargs):
-        content = JSONRenderer().render(data)
-        kwargs['content_type'] = 'application/json'
-        super(JSONResponse, self).__init__(content, **kwargs)
 
 # Creates unix time stamp from a datetime object
 def totimestamp(dt, epoch=datetime.datetime(1970,1,1,tzinfo=tz('UTC'))):