Self hosted FLOSS fitness/workout, nutrition and weight tracker
Add views to delete nutrition log entries
Roland Geider09fa3687bb73
diff --git a/wger/nutrition/templates/log/detail.html b/wger/nutrition/templates/log/detail.htmlindex 3384bb007..4629d0425 100644--- a/wger/nutrition/templates/log/detail.html+++ b/wger/nutrition/templates/log/detail.html@@ -90,6 +90,9 @@<th>{% trans "Ingredient" %}</th><th class="align-right">{% trans "Amount" %}</th><th class="align-right">{% trans "Energy" %}</th>+ {% if is_owner %}+ <th class="align-right"></th>+ {% endif %}</tr></thead><tbody>@@ -108,6 +111,22 @@<td class="align-right">{{ entry.get_nutritional_values.energy }} {% trans "kcal" %}</td>+ {% if is_owner %}+ <td>+ <div class="btn-group pull-right">+ <button type="button" class="btn btn-default dropdown-toggle btn-xs" data-toggle="dropdown">+ <span class="glyphicon glyphicon-cog"></span>+ </button>+ <ul class="dropdown-menu" role="menu">+ <li>+ <a href="{% url 'nutrition:log:delete' entry.pk %}" class="wger-modal-dialog">+ {% trans 'Delete' %}+ </a>+ </li>+ </ul>+ </div>+ </td>+ {% endif %}</tr>{% endfor %}</tbody>diff --git a/wger/nutrition/tests/test_nutrition_diary.py b/wger/nutrition/tests/test_nutrition_diary.pyindex 73b1f7c5e..aaf95a62b 100644--- a/wger/nutrition/tests/test_nutrition_diary.py+++ b/wger/nutrition/tests/test_nutrition_diary.py@@ -19,10 +19,11 @@ from decimal import Decimalfrom django.core.urlresolvers import reverse-from wger.nutrition.models import NutritionPlan+from wger.nutrition.models import NutritionPlan, LogItemfrom wger.manager.tests.testcase import (WorkoutManagerTestCase,- WorkoutManagerAccessTestCase+ WorkoutManagerAccessTestCase,+ WorkoutManagerDeleteTestCase)logger = logging.getLogger(__name__)@@ -135,3 +136,24 @@ class NutritionDiaryTestCase(WorkoutManagerTestCase):'fat_saturated': Decimal('2.43'),'fibres': Decimal('0.00'),'sodium': Decimal('5.09')})+++class DeleteLogEntryTestCase(WorkoutManagerDeleteTestCase):+ '''+ Tests deleting an entry from a nutritional diary+ '''++ object_class = LogItem+ url = 'nutrition:log:delete'+ pk = 2+ user_success = 'test'+ user_success = ('admin',+ 'test',+ 'member1',+ 'member2',+ 'trainer2',+ 'trainer3',+ 'trainer4',+ 'manager3',+ 'general_manager1',+ 'general_manager2')diff --git a/wger/nutrition/urls.py b/wger/nutrition/urls.pyindex 7c326576d..d2984c52f 100644--- a/wger/nutrition/urls.py+++ b/wger/nutrition/urls.py@@ -189,6 +189,9 @@ patterns_diary = [url(r'^(?P<pk>\d+)/(?P<year>\d{4})-(?P<month>\d{1,2})-(?P<day>\d{1,2})$',log.detail,name='detail'),+ url(r'^entry/(?P<pk>\d+)/delete$',+ log.LogDeleteView.as_view(),+ name='delete'),]diff --git a/wger/nutrition/views/log.py b/wger/nutrition/views/log.pyindex dce9317f9..38e964f62 100644--- a/wger/nutrition/views/log.py+++ b/wger/nutrition/views/log.py@@ -17,7 +17,6 @@import datetimeimport logging-from django.contrib.auth.decorators import login_requiredfrom django.core.urlresolvers import reversefrom django.http import (HttpResponseRedirect,@@ -27,8 +26,17 @@ from django.shortcuts import (render,get_object_or_404)+from django.utils.translation import ugettext_lazy+from django.views.generic import DeleteView-from wger.nutrition.models import NutritionPlan+from wger.nutrition.models import (+ NutritionPlan,+ LogItem+)+from wger.utils.generic_views import (+ WgerDeleteMixin,+ WgerPermissionMixin+)logger = logging.getLogger(__name__)@@ -78,8 +86,29 @@ def detail(request, pk, year, month, day):context = {'plan': plan,'date': date,+ 'show_shariff': is_owner,+ 'is_owner': is_owner,'log_summary': plan.get_log_summary(date),'log_entries': plan.get_log_entries(date),'nutritional_data': plan.get_nutritional_values()}return render(request, 'log/detail.html', context)+++class LogDeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):+ '''+ Delete a nutrition diary entry+ '''+ model = LogItem+ title = ugettext_lazy('Delete?')+ form_action_urlname = 'nutrition:log:delete'+ login_required = True++ def get_success_url(self):+ '''+ Return to the nutrition diary detail page+ '''+ return reverse('nutrition:log:detail', kwargs={'pk': self.object.plan.pk,+ 'year': self.object.datetime.year,+ 'month': self.object.datetime.month,+ 'day': self.object.datetime.day})