sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'release/v21.0.2'

Browse Source
This commit is contained in:
Sander Roosendaal
2024-05-20 09:31:58 +02:00
parent 2b48302c89 e8e9bc6e0a
commit 5c18197cec
5 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
rowers/dataprep.py
View File

@@ -576,17 +576,20 @@ def setcp(workout, background=False, recurrance=True):
cpvalues = pl.Series(np.array(response.power)) cpvalues = pl.Series(np.array(response.power))
powermean = response.avgpower powermean = response.avgpower
df = pl.DataFrame({ try:
'delta': delta, df = pl.DataFrame({
'cp': cpvalues, 'delta': delta,
'id': workout.id, 'cp': cpvalues,
}) 'id': workout.id,
})
df = df.drop_nulls()
df = df.drop_nulls()
with gzip.open(filename, 'w') as f:
df.write_parquet(f)
with gzip.open(filename, 'w') as f:
df.write_parquet(f)
except Exception as e:
dologging("metrics.log", "setcp: "+ str(e))
return pl.DataFrame({'delta': [], 'cp': []}), pl.Series(dtype=pl.Float64), pl.Series(dtype=pl.Float64)
#df.to_parquet(filename, engine='fastparquet', compression='GZIP') #df.to_parquet(filename, engine='fastparquet', compression='GZIP')

3
rowers/mytypes.py
View File

@@ -15,6 +15,7 @@ workouttypes_ordered = collections.OrderedDict({
'coastal': 'Coastal', 'coastal': 'Coastal',
'c-boat': 'Dutch C boat', 'c-boat': 'Dutch C boat',
'churchboat': 'Finnish Church boat', 'churchboat': 'Finnish Church boat',
'Surfboat': 'Surfboat',
'Ride': 'Ride', 'Ride': 'Ride',
'bike': 'Bike', 'bike': 'Bike',
'Run': 'Run', 'Run': 'Run',
@@ -336,6 +337,7 @@ otwtypes = (
'coastal', 'coastal',
'c-boat', 'c-boat',
'churchboat' 'churchboat'
'surfboat',
) )
otetypes = ( otetypes = (
@@ -501,6 +503,7 @@ boatbrands = (
('levator', 'Levator Boatworks'), ('levator', 'Levator Boatworks'),
('liangjin', 'Liangjin Boat'), ('liangjin', 'Liangjin Boat'),
('liteboat', 'LiteBoat'), ('liteboat', 'LiteBoat'),
('Monomoy', 'Monomoy'),
('littleriver', 'Little River Marine'), ('littleriver', 'Little River Marine'),
('kaschper', 'Kaschper Racing Shells'), ('kaschper', 'Kaschper Racing Shells'),
('kanghua', 'Kanghua'), ('kanghua', 'Kanghua'),

BIN
rowers/tests/testdata/testdata.tcx.gz vendored
View File

Binary file not shown.

2
rowers/urls.py
View File

@@ -795,8 +795,6 @@ urlpatterns = [
views.InStrokeAnalysisDelete.as_view(), name='instroke_analysis_delete_view'), views.InStrokeAnalysisDelete.as_view(), name='instroke_analysis_delete_view'),
re_path(r'^analysis/forcecurveanalysis/(?P<pk>\d+)/delete/$', re_path(r'^analysis/forcecurveanalysis/(?P<pk>\d+)/delete/$',
views.ForceCurveAnalysisDelete.as_view(), name='forcecurve_analysis_delete_view'), views.ForceCurveAnalysisDelete.as_view(), name='forcecurve_analysis_delete_view'),
re_path(r'^promembership', TemplateView.as_view(
template_name='promembership.html'), name='promembership'),
re_path(r'^checkout/(?P<planid>\d+)/$', re_path(r'^checkout/(?P<planid>\d+)/$',
views.payment_confirm_view, name='payment_confirm_view'), views.payment_confirm_view, name='payment_confirm_view'),
re_path(r'^upgradecheckout/(?P<planid>\d+)/$', re_path(r'^upgradecheckout/(?P<planid>\d+)/$',

2
rowsandall_app/settings.py
View File

@@ -449,7 +449,7 @@ OAUTH2_PROVIDER = {
'ACCESS_TOKEN_MODEL': 'oauth2_provider.AccessToken', 'ACCESS_TOKEN_MODEL': 'oauth2_provider.AccessToken',
'APPLICATION_MODEL': 'oauth2_provider.Application', 'APPLICATION_MODEL': 'oauth2_provider.Application',
'REFRESH_TOKEN_MODEL': 'oauth2_provider.RefreshToken', 'REFRESH_TOKEN_MODEL': 'oauth2_provider.RefreshToken',
'ACCESS_TOKEN_EXPIRE_SECONDS': 36000, 'ACCESS_TOKEN_EXPIRE_SECONDS': 360000,
# 'OAUTH2_BACKEND_CLASS': 'oauth2_provider.oauth2_backends.JSONOAuthLibCore' # 'OAUTH2_BACKEND_CLASS': 'oauth2_provider.oauth2_backends.JSONOAuthLibCore'
} }