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

Merge branch 'develop' into feature/restapi

Browse Source
This commit is contained in:
Sander Roosendaal
2016-12-08 16:02:58 +01:00
parent 21dbc43947 28d2664f38
commit 5708aebf1e
3 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rowers/interactiveplots.py
View File

@@ -996,7 +996,7 @@ def interactive_flex_chart2(id=0,promember=0,
plot = Figure(x_axis_type=x_axis_type,y_axis_type=y_axis_type, plot = Figure(x_axis_type=x_axis_type,y_axis_type=y_axis_type,
tools=TOOLS, tools=TOOLS,
toolbar_sticky=False, toolbar_sticky=False
) )
x1means = Span(location=x1mean,dimension='height',line_color='green', x1means = Span(location=x1mean,dimension='height',line_color='green',
@@ -1235,8 +1235,6 @@ def interactive_flex_chart2(id=0,promember=0,
js_resources = INLINE.render_js() js_resources = INLINE.render_js()
css_resources = INLINE.render_css() css_resources = INLINE.render_css()
return [script,div,js_resources,css_resources] return [script,div,js_resources,css_resources]

16
rowers/views.py
View File

@@ -2687,14 +2687,14 @@ def workout_flexchart3_view(request,*args,**kwargs):
workstrokesonly = False workstrokesonly = False
# create interactive plot # create interactive plot
res = interactive_flex_chart2(id,xparam=xparam,yparam1=yparam1, script,div,js_resources,css_resources = interactive_flex_chart2(id,xparam=xparam,yparam1=yparam1,
yparam2=yparam2, yparam2=yparam2,
promember=promember,plottype=plottype, promember=promember,plottype=plottype,
workstrokesonly=workstrokesonly) workstrokesonly=workstrokesonly)
script = res[0] # script = res[0]
div = res[1] # div = res[1]
js_resources = res[2] # js_resources = res[2]
css_resources = res[3] # css_resources = res[3]
if row.workouttype == 'water': if row.workouttype == 'water':
return render(request, return render(request,
@@ -4560,13 +4560,9 @@ def rower_favoritecharts_view(request):
FavoriteChart.objects.filter(user=r).delete() FavoriteChart.objects.filter(user=r).delete()
FavoriteChart.objects.bulk_create(new_instances) FavoriteChart.objects.bulk_create(new_instances)
successmessage = "You have updated your favorites" successmessage = "You have updated your favorites"
FavoriteChartFormSet=formset_factory(FavoriteForm,formset=BaseFavoriteFormSet)
print new_instances
print "aap",len(new_instances)
if len(new_instances)==0: if len(new_instances)==0:
FavoriteChartFormSet=formset_factory(FavoriteForm,formset=BaseFavoriteFormSet,extra=1) FavoriteChartFormSet=formset_factory(FavoriteForm,formset=BaseFavoriteFormSet,extra=1)
favorites_formset = FavoriteChartFormSet()
favorites_formset = FavoriteChartFormSet()
except IntegrityError: except IntegrityError:
message = "something went wrong" message = "something went wrong"

3
rowsandall_app/settings.py
View File

@@ -60,6 +60,9 @@ AUTHENTICATION_BACKENDS = (
) )
MIDDLEWARE_CLASSES = [ MIDDLEWARE_CLASSES = [
'django.middleware.gzip.GZipMiddleware',
'htmlmin.middleware.HtmlMinifyMiddleware',
'htmlmin.middleware.MarkRequestMiddleware',
'django.middleware.csrf.CsrfViewMiddleware', 'django.middleware.csrf.CsrfViewMiddleware',
'django.middleware.security.SecurityMiddleware', 'django.middleware.security.SecurityMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware',