Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Fix response for Daily calories calculator

Ayush Kumar4b96d8eaad8c
diff --git a/AUTHORS.rst b/AUTHORS.rst
index 5f345d15b..fc77bdb68 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -58,6 +58,7 @@ Developers
* Jack Mulligan - https://github.com/jackmulligan-ire
* Kristopher Newsome - https://github.com/sysadmin75
* Leninux - https://github.com/RedRudeBoy
+* Ayush Kumar - https://github.com/gr8ayu
Translators
-----------
diff --git a/wger/nutrition/views/calculator.py b/wger/nutrition/views/calculator.py
index d1fdd0268..6112435ae 100644
--- a/wger/nutrition/views/calculator.py
+++ b/wger/nutrition/views/calculator.py
@@ -68,7 +68,7 @@ def calculate_bmr(request):
Currently only the Mifflin-St.Jeor-Formel is supported
"""
- data = []
+ data = {}
form = BmrForm(data=request.POST, instance=request.user.userprofile)
if form.is_valid():
@@ -82,6 +82,10 @@ def calculate_bmr(request):
data = json.dumps(result)
else:
logger.debug(form.errors)
+ data['bmr'] = str(form.errors)
+ data = json.dumps(data)
+ # print(form.errors)
+ # print(form.is_valid())
# Return the results to the client
return HttpResponse(data, 'application/json')
@@ -93,7 +97,7 @@ def calculate_activities(request):
Calculates the calories needed by additional physical activities
"""
- data = []
+ data = {}
form = PhysicalActivitiesForm(data=request.POST, instance=request.user.userprofile)
if form.is_valid():
@@ -107,6 +111,8 @@ def calculate_activities(request):
else:
logger.debug(form.errors)
+ data['activities'] = str(form.errors)
+ data = json.dumps(data)
# Return the results to the client
return HttpResponse(data, 'application/json')