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

Reponse Codes

Browse Source
This commit is contained in:
Sander Roosendaal
2016-11-28 15:49:46 +01:00
parent 962bc20513
commit 45ac5f80a3
2 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
rowers/views.py
View File

@@ -3,7 +3,11 @@ import operator
from django.views.generic.base import TemplateView from django.views.generic.base import TemplateView
from django.db.models import Q from django.db.models import Q
from django.shortcuts import render from django.shortcuts import render
from django.http import HttpResponse, HttpResponseRedirect from django.http import (
HttpResponse, HttpResponseRedirect,
HttpResponseForbidden, HttpResponseNotAllowed,
HttpResponseNotFound,
)
from django.contrib.auth import authenticate, login, logout from django.contrib.auth import authenticate, login, logout
from rowers.forms import LoginForm,DocumentsForm,UploadOptionsForm from rowers.forms import LoginForm,DocumentsForm,UploadOptionsForm
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
@@ -2019,7 +2023,7 @@ def workout_view(request,id=0):
except Workout.DoesNotExist: except Workout.DoesNotExist:
return HttpResponse("Workout doesn't exist") return HttpResponseNotFound("Workout doesn't exist")
@user_passes_test(promember,login_url="/login") @user_passes_test(promember,login_url="/login")
@@ -4036,7 +4040,7 @@ def workout_delete_confirm_view(request, id=0):
'workout':row}) 'workout':row})
except Workout.DoesNotExist: except Workout.DoesNotExist:
return HttpResponse("Workout doesn't exist") return HttpResponseNotFound("Workout doesn't exist")
@login_required() @login_required()
def workout_delete_view(request,id=0): def workout_delete_view(request,id=0):
@@ -4055,7 +4059,7 @@ def workout_delete_view(request,id=0):
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
except Workout.DoesNotExist: except Workout.DoesNotExist:
return HttpResponse("Workout doesn't exist") return HttpResponseNotFound("Workout doesn't exist")
@login_required() @login_required()
@@ -4071,7 +4075,7 @@ def graph_delete_confirm_view(request, id=0):
'graph':img}) 'graph':img})
except Workout.DoesNotExist: except Workout.DoesNotExist:
return HttpResponse("Workout doesn't exist") return HttpResponseNotFound("Workout doesn't exist")
@login_required() @login_required()
def graph_delete_view(request,id=0): def graph_delete_view(request,id=0):
@@ -4168,7 +4172,7 @@ def workout_summary_restore_view(request,id,message="",successmessage=""):
if (checkworkoutuser(request.user,row)==False): if (checkworkoutuser(request.user,row)==False):
return HttpResponse("You are not allowed to edit this workout") return HttpResponse("You are not allowed to edit this workout")
except Workout.DoesNotExist: except Workout.DoesNotExist:
return HttpResponse("Workout doesn't exist") return HttpResponseNotFound("Workout doesn't exist")
s = "" s = ""
# still here - this is a workout we may edit # still here - this is a workout we may edit
@@ -4216,7 +4220,7 @@ def workout_summary_edit_view(request,id,message="",successmessage=""
if (checkworkoutuser(request.user,row)==False): if (checkworkoutuser(request.user,row)==False):
return HttpResponse("You are not allowed to edit this workout") return HttpResponse("You are not allowed to edit this workout")
except Workout.DoesNotExist: except Workout.DoesNotExist:
return HttpResponse("Workout doesn't exist") return HttpResponseNotFound("Workout doesn't exist")
s = "" s = ""
# still here - this is a workout we may edit # still here - this is a workout we may edit
@@ -4524,13 +4528,13 @@ def strokedatajson(request,id):
try: try:
row = Workout.objects.get(id=id) row = Workout.objects.get(id=id)
if (checkworkoutuser(request.user,row)==False): if (checkworkoutuser(request.user,row)==False):
return HttpResponse("Permission error") return HttpResponseForbidden("Permission error")
except Workout.DoesNotExist: except Workout.DoesNotExist:
return HttpResponse("Workout doesn't exist") return HttpResponseNotFound("Workout doesn't exist")
try: try:
id = int(id) id = int(id)
except ValueError: except ValueError:
return HttpResponse("Not a valid workout number") return HttpResponse("Not a valid workout number",status=400)
if request.method == 'GET': if request.method == 'GET':
@@ -4541,7 +4545,7 @@ def strokedatajson(request,id):
if request.method == 'POST': if request.method == 'POST':
checkdata,r = dataprep.getrowdata_db(id=row.id) checkdata,r = dataprep.getrowdata_db(id=row.id)
if not checkdata.empty: if not checkdata.empty:
return "Not OK 1" return HttpResponse("Duplicate Error",409)
# strokedata = request.POST['strokedata'] # strokedata = request.POST['strokedata']
print request.body print request.body
received_json_data = json.loads(request.body) received_json_data = json.loads(request.body)
@@ -4549,7 +4553,7 @@ def strokedatajson(request,id):
try: try:
strokedata = json.loads(received_json_data['strokedata']) strokedata = json.loads(received_json_data['strokedata'])
except: except:
return HttpResponse("Not OK 2") return HttpResponse("No JSON object could be decoded",400)
df = pd.DataFrame(strokedata) df = pd.DataFrame(strokedata)
df.index = df.index.astype(int) df.index = df.index.astype(int)
@@ -4559,18 +4563,18 @@ def strokedatajson(request,id):
aantal = len(time) aantal = len(time)
pace = df['pseconds'] pace = df['pseconds']
if len(pace) != aantal: if len(pace) != aantal:
return "Not OK" return HttpResponse("Pace array has incorrect length",status=400)
distance = df['distance'] distance = df['distance']
if len(distance) != aantal: if len(distance) != aantal:
return "Not OK 3" return HttpResponse("Distance array has incorrect length",status=400)
spm = df['spm'] spm = df['spm']
if len(spm) != aantal: if len(spm) != aantal:
return "Not OK 4" return HttpResponse("SPM array has incorrect length",status=400)
res = dataprep.testdata(time,distance,pace,spm) res = dataprep.testdata(time,distance,pace,spm)
if not res: if not res:
return HttpResponse("Not OK 5") return HttpResponse("Data are not numerical",status=400)
power = trydf(df,aantal,'power') power = trydf(df,aantal,'power')
drivelength = trydf(df,aantal,'drivelength') drivelength = trydf(df,aantal,'drivelength')
@@ -4621,4 +4625,7 @@ def strokedatajson(request,id):
# mangling # mangling
# #
return HttpResponse("OK") return HttpResponse(row.id,status=201)
#Method not supported
return HttpResponseNotAllowed("Method not supported")

5
rowsandall_app/settings.py
View File

@@ -45,7 +45,7 @@ INSTALLED_APPS = [
'cvkbrno', 'cvkbrno',
'django_rq', 'django_rq',
'translation_manager', 'translation_manager',
'debug_toolbar', # 'debug_toolbar',
'django_mailbox', 'django_mailbox',
'rest_framework', 'rest_framework',
'rest_framework_swagger', 'rest_framework_swagger',
@@ -71,7 +71,7 @@ MIDDLEWARE_CLASSES = [
'oauth2_provider.middleware.OAuth2TokenMiddleware', 'oauth2_provider.middleware.OAuth2TokenMiddleware',
'django.contrib.messages.middleware.MessageMiddleware', 'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware',
'debug_toolbar.middleware.DebugToolbarMiddleware', # 'debug_toolbar.middleware.DebugToolbarMiddleware',
] ]
ROOT_URLCONF = 'rowsandall_app.urls' ROOT_URLCONF = 'rowsandall_app.urls'
@@ -267,3 +267,4 @@ REST_FRAMEWORK = {
), ),
'PAGE_SIZE': 20, 'PAGE_SIZE': 20,
} }