Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Add form to input custom ingredient values

Roland Geider8dc7887bd415
diff --git a/wger/nutrition/forms.py b/wger/nutrition/forms.py
index b546110f7..56a3d4d5c 100644
--- a/wger/nutrition/forms.py
+++ b/wger/nutrition/forms.py
@@ -41,6 +41,7 @@ from wger.core.models import UserProfile
from wger.nutrition.models import (
Ingredient,
IngredientWeightUnit,
+ LogItem,
MealItem
)
from wger.utils.widgets import Html5NumberInput
@@ -249,3 +250,12 @@ class MealItemForm(forms.ModelForm):
css_class='form-row'
)
)
+
+
+class MealLogItemForm(MealItemForm):
+
+ class Meta:
+ model = LogItem
+ fields = ['ingredient',
+ 'weight_unit',
+ 'amount']
diff --git a/wger/nutrition/templates/log/detail.html b/wger/nutrition/templates/log/detail.html
index 25708f5bd..529ae96b4 100644
--- a/wger/nutrition/templates/log/detail.html
+++ b/wger/nutrition/templates/log/detail.html
@@ -50,7 +50,7 @@
<td class="align-right">{{ log_summary.carbohydrates|floatformat }} {% trans_weight_unit 'g' owner_user %}</td>
</tr>
<tr>
- <td style="padding-left: 2em;">{% trans "Sugar content in carbohydrates" %}</td>
+ <td class="pl-4">{% trans "Sugar content in carbohydrates" %}</td>
<td class="align-right">{{ nutritional_data.total.carbohydrates_sugar|floatformat }} {% trans_weight_unit 'g' owner_user %}</td>
<td class="align-right">{{ log_summary.carbohydrates_sugar|floatformat }} {% trans_weight_unit 'g' owner_user %}</td>
</tr>
@@ -60,7 +60,7 @@
<td class="align-right">{{ log_summary.fat|floatformat }} {% trans_weight_unit 'g' owner_user %}</td>
</tr>
<tr>
- <td style="padding-left: 2em;">{% trans "Saturated fat content in fats" %}</td>
+ <td class="pl-4">{% trans "Saturated fat content in fats" %}</td>
<td class="align-right">{{ nutritional_data.total.fat_saturated|floatformat }} {% trans_weight_unit 'g' owner_user %}</td>
<td class="align-right">{{ log_summary.fat_saturated|floatformat }} {% trans_weight_unit 'g' owner_user %}</td>
</tr>
diff --git a/wger/nutrition/templates/plan/view.html b/wger/nutrition/templates/plan/view.html
index 31278d25a..1cec2694d 100644
--- a/wger/nutrition/templates/plan/view.html
+++ b/wger/nutrition/templates/plan/view.html
@@ -75,22 +75,27 @@ function wgerCustomModalInit()
</strong>
{% if is_owner %}
- <div class="editoptions">
- <a href="{% url 'nutrition:meal:delete' meal.id %}"
- title="{% trans 'Delete' %}">
- <span class="{% fa_class 'trash' %}"></span></a>
- <a href="{% url 'nutrition:meal:edit' meal.id %}"
- title="{% trans 'Edit' %}"
- class="wger-modal-dialog">
- <span class="{% fa_class 'edit' %}"></span></a>
- <a href="{% url 'nutrition:meal_item:add' meal.id %}"
- title="{% trans 'Add' %}"
- class="wger-modal-dialog edit-meal">
- <span class="{% fa_class 'plus' %}"></span></a>
- <a href="{% url 'nutrition:log:log_meal' meal.id %}"
- title="{% trans 'Log this meal' %}"
- class="">
- <span class="{% fa_class 'chart-line' %}"></span></a>
+ <div class="dropdown">
+ <button type="button" class="btn btn-link btn-block dropdown-toggle btn-xs" data-toggle="dropdown"></button>
+ <div class="dropdown-menu dropdown-menu-right" role="menu">
+ <a href="{% url 'nutrition:log:log_meal' meal.id %}" class="dropdown-item">
+ <span class="{% fa_class 'chart-line' %}"></span>
+ {% trans 'Log this meal' %}
+ </a>
+ <a href="{% url 'nutrition:meal_item:add' meal.id %}" class="wger-modal-dialog edit-meal dropdown-item">
+ <span class="{% fa_class 'plus' %}"></span>
+ {% trans 'Add' %}
+ </a>
+ <a href="{% url 'nutrition:meal:edit' meal.id %}" class="wger-modal-dialog dropdown-item">
+ <span class="{% fa_class 'edit' %}"></span>
+ {% trans 'Edit' %}
+ </a>
+ <div class="dropdown-divider"></div>
+ <a href="{% url 'nutrition:meal:delete' meal.id %}" class="dropdown-item">
+ <span class="{% fa_class 'trash' %}"></span>
+ {% trans 'Delete' %}
+ </a>
+ </div>
</div>
{% endif %}
</td>
@@ -103,15 +108,22 @@ function wgerCustomModalInit()
{{ item.ingredient.name }}
{% if is_owner %}
+ <div class="dropdown float-right">
+ <button type="button" class="btn btn-link dropdown-toggle btn-xs" data-toggle="dropdown"></button>
+ <div class="dropdown-menu dropdown-menu-right" role="menu">
+ <a href="{% url 'nutrition:meal_item:edit' item.id %}" class="wger-modal-dialog edit-meal edit-mealitem dropdown-item">
+ <span class="{% fa_class 'edit' %}"></span>
+ {% trans 'Edit' %}
+ </a>
+ <div class="dropdown-divider"></div>
+ <a href="{% url 'nutrition:meal_item:delete' item.id %}" class="delete-mealitem dropdown-item">
+ <span class="{% fa_class 'trash' %}"></span>
+ {% trans 'Delete' %}
+ </a>
+ </div>
+ </div>
<span class="editoptions float-right">
- <a href="{% url 'nutrition:meal_item:delete' item.id %}"
- title="{% trans 'Delete' %}"
- class="delete-mealitem">
- <span class="{% fa_class 'trash' %}"></span></a>
- <a href="{% url 'nutrition:meal_item:edit' item.id %}"
- title="{% trans 'Edit' %}"
- class="wger-modal-dialog edit-meal edit-mealitem">
- <span class="{% fa_class 'edit' %}"></span></a>
+
</span>
{% endif %}
</td>
@@ -203,7 +215,7 @@ function wgerCustomModalInit()
<td class="align-right">{{nutritional_data.per_kg.carbohydrates|floatformat:2}}</td>
</tr>
<tr>
- <td style="padding-left: 2em;">{% trans "Sugar content in carbohydrates" %}</td>
+ <td class="pl-4">{% trans "Sugar content in carbohydrates" %}</td>
<td class="align-right">{{nutritional_data.total.carbohydrates_sugar|floatformat:1}} {% trans_weight_unit 'g' owner_user %}</td>
<td></td>
<td></td>
@@ -215,7 +227,7 @@ function wgerCustomModalInit()
<td class="align-right">{{nutritional_data.per_kg.fat|floatformat:2}}</td>
</tr>
<tr>
- <td style="padding-left: 2em;">{% trans "Saturated fat content in fats" %}</td>
+ <td class="pl-4">{% trans "Saturated fat content in fats" %}</td>
<td class="align-right">{{nutritional_data.total.fat_saturated|floatformat:1}} {% trans_weight_unit 'g' owner_user %}</td>
<td></td>
<td></td>
@@ -242,7 +254,6 @@ function wgerCustomModalInit()
<h4>{% trans "Nutrition diary" %}</h4>
-
<div id="nutrition_diary_chart"></div>
<table class="table table-condensed">
@@ -282,14 +293,14 @@ function wgerCustomModalInit()
{% if log_data %}
<tr>
<td colspan="4">
- <a href="{% url 'nutrition:log:overview' plan.pk %}">{% trans "View details" %}</a>
+ <a href="{% url 'nutrition:log:overview' plan.pk %}" class="btn btn-link btn-block">{% trans "View details" %}</a>
</td>
</tr>
{% endif %}
</tbody>
</table>
<p>
- <a href="{% url 'nutrition:log:overview' plan.pk %}" class="btn btn-success btn-sm">{% trans "Add diary entry" %}</a>
+ <a href="{% url 'nutrition:log:add' plan.pk %}" class="btn btn-success btn-sm wger-modal-dialog">{% trans "Add custom diary entry" %}</a>
</p>
{% endblock %}
diff --git a/wger/nutrition/tests/test_nutrition_diary.py b/wger/nutrition/tests/test_nutrition_diary.py
index 64fde94cc..f1403d904 100644
--- a/wger/nutrition/tests/test_nutrition_diary.py
+++ b/wger/nutrition/tests/test_nutrition_diary.py
@@ -24,6 +24,7 @@ from django.urls import reverse
# wger
from wger.core.tests.base_testcase import (
WgerAccessTestCase,
+ WgerAddTestCase,
WgerDeleteTestCase,
WgerTestCase
)
@@ -181,6 +182,20 @@ class NutritionDiaryTestCase(WgerTestCase):
self.assertEqual(LogItem.objects.filter(plan=plan).count(), 0)
+class AddMealItemUnitTestCase(WgerAddTestCase):
+ """
+ Tests adding a meal, set the amount using a unit
+ """
+
+ user_success = 'test'
+ user_fail = 'admin'
+ object_class = LogItem
+ url = reverse('nutrition:log:add', kwargs={'plan_pk': 1})
+ data = {'amount': 1,
+ 'ingredient': 1,
+ 'weight_unit': 1}
+
+
class DeleteLogEntryTestCase(WgerDeleteTestCase):
"""
Tests deleting an entry from a nutritional diary
diff --git a/wger/nutrition/urls.py b/wger/nutrition/urls.py
index 26edc750c..aafac4454 100644
--- a/wger/nutrition/urls.py
+++ b/wger/nutrition/urls.py
@@ -194,6 +194,9 @@ patterns_diary = [
url(r'^entry/(?P<pk>\d+)/delete$',
log.LogDeleteView.as_view(),
name='delete'),
+ url(r'^plan/(?P<plan_pk>\d+)/add',
+ log.LogCreateView.as_view(),
+ name='add'),
url(r'^log-meal/(?P<meal_pk>\d+)$',
log.log_meal,
name='log_meal'),
diff --git a/wger/nutrition/views/log.py b/wger/nutrition/views/log.py
index 85335c63d..5ee240db2 100644
--- a/wger/nutrition/views/log.py
+++ b/wger/nutrition/views/log.py
@@ -29,9 +29,13 @@ from django.shortcuts import (
)
from django.urls import reverse
from django.utils.translation import ugettext_lazy
-from django.views.generic import DeleteView
+from django.views.generic import (
+ CreateView,
+ DeleteView
+)
# wger
+from wger.nutrition.forms import MealLogItemForm
from wger.nutrition.models import (
LogItem,
Meal,
@@ -39,6 +43,7 @@ from wger.nutrition.models import (
)
from wger.utils.generic_views import (
WgerDeleteMixin,
+ WgerFormMixin,
WgerPermissionMixin
)
@@ -138,6 +143,46 @@ def log_meal(request, meal_pk):
}))
+class LogCreateView(WgerFormMixin, CreateView):
+ """
+ Generic view to create a new meal diary entry
+ """
+
+ model = LogItem
+ form_class = MealLogItemForm
+ custom_js = 'wgerInitIngredientAutocompleter();'
+ plan = None
+
+ def dispatch(self, request, *args, **kwargs):
+ """
+ Check that the user owns the meal
+ """
+ plan = get_object_or_404(NutritionPlan, pk=kwargs['plan_pk'])
+ if plan.user == request.user:
+ self.plan = plan
+ return super(LogCreateView, self).dispatch(request, *args, **kwargs)
+ else:
+ return HttpResponseForbidden()
+
+ def get_success_url(self):
+ return reverse('nutrition:plan:view', kwargs={'id': self.plan.id})
+
+ def get_context_data(self, **kwargs):
+ """
+ Send some additional data to the template
+ """
+ context = super(LogCreateView, self).get_context_data(**kwargs)
+ context['ingredient_searchfield'] = self.request.POST.get('ingredient_searchfield', '')
+ return context
+
+ def form_valid(self, form):
+ """
+ Manually set the corresponding meal
+ """
+ form.instance.plan = self.plan
+ return super(LogCreateView, self).form_valid(form)
+
+
class LogDeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):
"""
Delete a nutrition diary entry