Private
Public Access
1
0

unknown column error fixed in data explore view

This commit is contained in:
Sander Roosendaal
2018-12-08 09:15:16 +01:00
parent f439204bf9
commit cc40615f46
3 changed files with 18 additions and 4 deletions

View File

@@ -25,6 +25,10 @@ class LoginForm(forms.Form):
username = forms.CharField() username = forms.CharField()
password = forms.CharField(widget=forms.PasswordInput()) password = forms.CharField(widget=forms.PasswordInput())
# search form
class SearchForm(forms.Form):
q = forms.CharField(max_length=255,required=False,initial='Search')
# simple form for Contact page. Sends email to info@rowsandall.com # simple form for Contact page. Sends email to info@rowsandall.com
class EmailForm(forms.Form): class EmailForm(forms.Form):
firstname = forms.CharField(max_length=255) firstname = forms.CharField(max_length=255)

View File

@@ -93,7 +93,7 @@
<tbody> <tbody>
{% for key, value in stats.items %} {% for key, value in stats.items %}
<tr> <tr>
{% if value.std > 2 %} {% if value.std > 10 %}
<td>{{ value.verbosename }}</td> <td>{{ value.verbosename }}</td>
<td>{{ value.mean|floatformat:0 }}</td> <td>{{ value.mean|floatformat:0 }}</td>
<td> {{ value.wmean|floatformat:0 }}</td> <td> {{ value.wmean|floatformat:0 }}</td>

View File

@@ -50,7 +50,7 @@ from rowers.forms import (
RaceResultFilterForm,PowerIntervalUpdateForm,FlexAxesForm, RaceResultFilterForm,PowerIntervalUpdateForm,FlexAxesForm,
FlexOptionsForm,DataFrameColumnsForm,OteWorkoutTypeForm, FlexOptionsForm,DataFrameColumnsForm,OteWorkoutTypeForm,
MetricsForm,DisqualificationForm,disqualificationreasons, MetricsForm,DisqualificationForm,disqualificationreasons,
disqualifiers disqualifiers,SearchForm,
) )
from django.core.urlresolvers import reverse, reverse_lazy from django.core.urlresolvers import reverse, reverse_lazy
@@ -6994,6 +6994,9 @@ def workouts_view(request,message='',successmessage='',
reduce(operator.and_, reduce(operator.and_,
(Q(notes__icontains=q) for q in query_list)) (Q(notes__icontains=q) for q in query_list))
) )
searchform = SearchForm(initial={'q':query})
else:
searchform = SearchForm()
paginator = Paginator(workouts,20) # show 25 workouts per page paginator = Paginator(workouts,20) # show 25 workouts per page
page = request.GET.get('page') page = request.GET.get('page')
@@ -7038,6 +7041,7 @@ def workouts_view(request,message='',successmessage='',
{'workouts': workouts, {'workouts': workouts,
'active': 'nav-workouts', 'active': 'nav-workouts',
'rower':r, 'rower':r,
'searchform':searchform,
'breadcrumbs':breadcrumbs, 'breadcrumbs':breadcrumbs,
'dateform':dateform, 'dateform':dateform,
'startdate':startdate, 'startdate':startdate,
@@ -8496,10 +8500,16 @@ def workout_data_view(request, id=0):
datadf.sort_values(['ftime'],inplace=True) datadf.sort_values(['ftime'],inplace=True)
datadf.drop(labels=[ columns = datadf.columns.values
to_be_dropped = [
'id','time','hr_an','hr_at','hr_bottom','hr_max', 'id','time','hr_an','hr_at','hr_bottom','hr_max',
'hr_tr','hr_ut1','hr_ut2','x_right', 'hr_tr','hr_ut1','hr_ut2','x_right',
],inplace=True,axis=1) ]
to_be_dropped = [c for c in to_be_dropped if c in columns]
datadf.drop(labels=to_be_dropped,inplace=True,axis=1)
cols = ['ftime','cumdist','fpace','spm', cols = ['ftime','cumdist','fpace','spm',