Private
Public Access
1
0
This commit is contained in:
Sander Roosendaal
2019-10-29 09:42:12 +01:00
parent d9db459b07
commit 4fb8694dcb
2 changed files with 242 additions and 242 deletions

View File

@@ -1671,7 +1671,11 @@ def getrowdata_db(id=0, doclean=False, convertnewtons=True,
def getsmallrowdata_db(columns, ids=[], doclean=True,workstrokesonly=True,compute=True): def getsmallrowdata_db(columns, ids=[], doclean=True,workstrokesonly=True,compute=True):
# prepmultipledata(ids) # prepmultipledata(ids)
csvfilenames = ['media/strokedata_{id}.parquet.gz'.format(id=id) for id in ids] if ids:
csvfilenames = ['media/strokedata_{id}.parquet.gz'.format(id=id) for id in ids]
else:
return pd.DataFrame()
data = [] data = []
columns = [c for c in columns if c != 'None'] columns = [c for c in columns if c != 'None']
columns = list(set(columns)) columns = list(set(columns))
@@ -2617,5 +2621,3 @@ def workout_normv(w,pp=4.0):
r.rest) r.rest)
return 0,0 return 0,0

View File

@@ -6,7 +6,6 @@ from __future__ import unicode_literals, absolute_import
from django.utils.encoding import python_2_unicode_compatible from django.utils.encoding import python_2_unicode_compatible
from django.db import models,IntegrityError
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.core.validators import validate_email from django.core.validators import validate_email
from django.core.exceptions import ValidationError from django.core.exceptions import ValidationError
@@ -16,7 +15,6 @@ from django.dispatch import receiver
from django.forms.widgets import SplitDateTimeWidget,SelectDateWidget from django.forms.widgets import SplitDateTimeWidget,SelectDateWidget
#from django.forms.extras.widgets import SelectDateWidget #from django.forms.extras.widgets import SelectDateWidget
from django.forms.formsets import BaseFormSet from django.forms.formsets import BaseFormSet
from django.contrib.admin.widgets import AdminDateWidget,AdminTimeWidget,AdminSplitDateTime
from datetimewidget.widgets import DateTimeWidget from datetimewidget.widgets import DateTimeWidget
from django.core.validators import validate_email from django.core.validators import validate_email
import os import os