Merge branch 'develop' into feature/planning

rowers/datautils.py

@@ -252,7 +252,7 @@ def getcp(dfgrouped,logarr):
             
             dt = pd.Series(dt)
             cpw = pd.Series(cpw)
-            if len(dt):
+            if len(dt)>2:
                 cpvalues = griddata(dt.values,
                                     cpw.values,
                                     logarr,method='linear',

rowers/templates/workout_form.html

@@ -159,7 +159,7 @@
     <div id="thumb-container" class="grid_2 alpha">
       <a href="/rowers/graph/{{ graph.id }}/">
 	<img src="/{{ graph.filename }}" 
-	     onerror="this.src='/static/img/ajax_loader_blue_350.gif'"
+	     onerror="this.src='/static/img/rowingtimer.gif'"
 	     alt="{{ graph.filename }}" width="120" height="100"></a>
     </div>	
     {% elif forloop.counter == 3 %}

rowers/views.py

@@ -331,18 +331,25 @@ def get_job_status(jobid):
                 'result': 1,
             }
 
-            
+    try:
-    if 'fail' in summary['status'].lower():
+        if 'fail' in summary['status'].lower():
-        summary['failed'] = True
+            summary['failed'] = True
-    else:
+        else:
-        summary['failed'] = False
+            summary['failed'] = False
 
-    if 'success' in summary['status'].lower():
+        if 'success' in summary['status'].lower():
-        summary['finished'] = True
+            summary['finished'] = True
-    elif 'finished' in summary['status'].lower():
+        elif 'finished' in summary['status'].lower():
-        summary['finished'] = True
+            summary['finished'] = True
-    else:
+        else:
-        summary['finished'] = False
+            summary['finished'] = False
+    except AttributeError:
+        summary = {
+            'status': 'failed',
+            'result': 0,
+            'finished': True,
+            'failed': True
+            }
 
     return summary