removed StrokeData table and all references to it

rowers/dataprep.py

@@ -7,7 +7,7 @@ from __future__ import unicode_literals
 # All the data preparation, data cleaning and data mangling should
 # be defined here
 from __future__ import unicode_literals, absolute_import
-from rowers.models import Workout, StrokeData,Team
+from rowers.models import Workout, Team
 
 import pytz
 
@@ -55,7 +55,7 @@ from rowingdata import (
 from rowingdata.csvparsers import HumonParser
 
 
-from rowers.metrics import axes,calc_trimp,rowingmetrics
+from rowers.metrics import axes,calc_trimp,rowingmetrics,dtypes
 from rowers.models import strokedatafields
 
 #allowedcolumns = [item[0] for item in rowingmetrics]
@@ -117,35 +117,6 @@ columndict = {
     'cumdist': 'cum_dist',
 }
 
-# dtypes
-dtypes = {'workoutid':int,
-          'hr':int,
-          'pace':float,
-          'velo':float,
-          'spm':float,
-          'driveenergy':float,
-          'power':float,
-          'averageforce':float,
-          'peakforce':float,
-          'drivelength':float,
-          'distance':float,
-          'cumdist':float,
-          'drivespeed':float,
-          'catch':float,
-          'slip':float,
-          'finish':float,
-          'wash':float,
-          'peakforceangle':float,
-          'totalangle':float,
-          'effectiveangle':float,
-          'rhythm':float,
-          'efficiency':float,
-          'distanceperstroke':float,
-          'ftime':str,
-          'fpace':str,
-          'fergpace':str,
-          'fnowindpace':str,
-}
 
 from scipy.signal import savgol_filter
 
@@ -605,41 +576,6 @@ def getstatsfields():
 
     return fieldlist, fielddict
 
-def getstatsfields_old():
-    # Get field names and remove those that are not useful in stats
-    fields = StrokeData._meta.get_fields()
-
-    fielddict = {field.name: field.verbose_name for field in fields}
-
-    # fielddict.pop('workoutid')
-    fielddict.pop('ergpace')
-    fielddict.pop('hr_an')
-    fielddict.pop('hr_tr')
-    fielddict.pop('hr_at')
-    fielddict.pop('hr_ut2')
-    fielddict.pop('hr_ut1')
-    fielddict.pop('time')
-    fielddict.pop('distance')
-    fielddict.pop('nowindpace')
-    fielddict.pop('fnowindpace')
-    fielddict.pop('fergpace')
-    fielddict.pop('equivergpower')
-#    fielddict.pop('workoutstate')
-    fielddict.pop('fpace')
-    fielddict.pop('pace')
-    fielddict.pop('id')
-    fielddict.pop('ftime')
-    fielddict.pop('x_right')
-    fielddict.pop('hr_max')
-    fielddict.pop('hr_bottom')
-    fielddict.pop('cumdist')
-
-    try:
-        fieldlist = [field for field, value in fielddict.iteritems()]
-    except AttributeError:
-        fieldlist = [field for field, value in fielddict.items()]
-
-    return fieldlist, fielddict
 
 
 # A string representation for time deltas