Merge branch 'release/v3.06'

rowers/dataprep.py

@@ -29,7 +29,7 @@ from rowingdata import (
 
 from rowers.models import Team
 from rowers.metrics import axes
-
+from async_messages import messages as a_messages
 import os
 import zipfile
 import pandas as pd
@@ -411,6 +411,18 @@ def save_workout_database(f2,r,dosmooth=True,workouttype='rower',
 		hrtr=r.tr,hran=r.an,ftp=r.ftp,
                 powerperc=powerperc,powerzones=r.powerzones)
     row = rdata(f2,rower=rr)
+
+    checks = row.check_consistency()
+    allchecks = 1
+    for key,value in checks.iteritems():
+        if not value:
+            allchecks = 0
+            a_messages.error(r.user,'Failed consistency check: '+key+', autocorrected')
+
+    if not allchecks:
+        row.repair()
+            
+    
     if row == 0:
 	return (0,'Error: CSV data file not found')
 

rowers/dataprepnodjango.py

@@ -131,6 +131,17 @@ def save_workout_database(f2,r,dosmooth=True,workouttype='rower',
 		hrtr=r.tr,hran=r.an,ftp=r.ftp,
                 powerperc=powerperc,powerzones=r.powerzones)
     row = rdata(f2,rower=rr)
+
+    checks = row.check_consistency()
+    allchecks = 1
+    for key,value in checks.iteritems():
+        if not value:
+            allchecks = 0
+
+    if not allchecks:
+        row.repair()
+
+    
     if row == 0:
 	return (0,'Error: CSV data file not found')
 

rowers/teams.py

@@ -9,6 +9,7 @@ from django.db import IntegrityError
 import uuid
 from django.conf import settings
 
+
 import django_rq
 queue = django_rq.get_queue('default')
 queuelow = django_rq.get_queue('low')