Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Revert "Changed nutrition journal chart type"

Kevin Antonio Rateni Iatauro551c6b873ef5
diff --git a/setup.py b/setup.py
index b18c45a95..c74c11fce 100644
--- a/setup.py
+++ b/setup.py
@@ -17,7 +17,7 @@ from setuptools import (
from wger import get_version
-with open('README.md', encoding="utf-8") as readme:
+with open('README.md') as readme:
long_description = readme.read()
with open('requirements.txt') as requirements_production:
diff --git a/wger/__main__.py b/wger/__main__.py
index 5492dce65..96cb41190 100644
--- a/wger/__main__.py
+++ b/wger/__main__.py
@@ -37,7 +37,7 @@ def main():
args = sys.argv[1:]
if len(args):
- run(invoke_cmd + ' '.join(args), pty=False)
+ run(invoke_cmd + ' '.join(args), pty=True)
else:
run(invoke_cmd + '--list')
diff --git a/wger/nutrition/static/js/nutrition.js b/wger/nutrition/static/js/nutrition.js
index 29a11e33e..f4aba0924 100644
--- a/wger/nutrition/static/js/nutrition.js
+++ b/wger/nutrition/static/js/nutrition.js
@@ -99,13 +99,15 @@ function wgerInitIngredientAutocompleter() {
}
function wgerDrawNutritionDiaryChart(planPk) {
+ var dataConverted;
d3.json('/api/v2/nutritionplan/' + planPk + '/get_log_overview/').then(function (data) {
if (data.length > 0) {
+ dataConverted = MG.convert.date(data, 'date');
$.getJSON('/api/v2/nutritionplan/' + planPk + '/nutritional_values/',
function (nutritionalValues) {
MG.data_graphic({
- data: data,
- chart_type: 'bar',
+ data: dataConverted,
+ //chart_type: 'bar',
y_accessor: 'energy',
x_accessor: 'date',
decimals: 0,