+
+{% endblock %}
\ No newline at end of file
diff --git a/apps/food/urls.py b/apps/food/urls.py
index 4c4ffe2d..92a21e9f 100644
--- a/apps/food/urls.py
+++ b/apps/food/urls.py
@@ -28,5 +28,5 @@ urlpatterns = [
path('activity//order/', views.OrderCreateView.as_view(), name='order_create'),
path('activity//orders/', views.OrderListView.as_view(), name='order_list'),
path('activity//orders/served', views.ServedOrderListView.as_view(), name='served_order_list'),
- path('activity/orders//delete/', views.OrderDeleteView.as_view(), name='order_delete'),
+ path('activity//kitchen/', views.KitchenView.as_view(), name='kitchen'),
]
diff --git a/apps/food/views.py b/apps/food/views.py
index 2ffbbd4b..7e6bde15 100644
--- a/apps/food/views.py
+++ b/apps/food/views.py
@@ -8,7 +8,7 @@ from crispy_forms.helper import FormHelper
from django_tables2.views import SingleTableView, MultiTableMixin
from django.core.exceptions import PermissionDenied
from django.db import transaction
-from django.db.models import Q
+from django.db.models import Q, Count
from django.http import HttpResponseRedirect, Http404
from django.views.generic import DetailView, UpdateView, CreateView
from django.views.generic.list import ListView
@@ -22,7 +22,7 @@ from activity.models import Activity
from permission.backends import PermissionBackend
from permission.views import ProtectQuerysetMixin, ProtectedCreateView, LoginRequiredMixin
-from .models import Food, BasicFood, TransformedFood, QRCode, Order, Dish
+from .models import Food, BasicFood, TransformedFood, QRCode, Order, Dish, Supplement
from .forms import QRCodeForms, BasicFoodForms, TransformedFoodForms, \
ManageIngredientsForm, ManageIngredientsFormSet, AddIngredientForms, \
BasicFoodUpdateForms, TransformedFoodUpdateForms, \
@@ -591,7 +591,8 @@ class DishCreateView(ProtectQuerysetMixin, ProtectedCreateView):
formset = SupplementFormSet(self.request.POST, instance=form.instance)
if formset.is_valid():
for f in formset:
- if f.is_valid():
+ # We don't save the product if the price is not entered, ie. if the line is empty
+ if f.is_valid() and f.instance.price:
f.save()
f.instance.save()
else:
@@ -656,12 +657,54 @@ class DishUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
form_class = DishForm
extra_context = {"title": _("Update a dish")}
- def get_form(self, **kwargs):
- form = super().get_form(**kwargs)
+ def get_context_data(self, **kwargs):
+ context = super().get_context_data(**kwargs)
+
+ form = context['form']
+ form.helper = FormHelper()
+ # Remove form tag on the generation of the form in the template (already present on the template)
+ form.helper.form_tag = False
+ # The formset handles the set of the supplements
+ form_set = SupplementFormSet(instance=form.instance)
+ context['formset'] = form_set
+ context['helper'] = SupplementFormSetHelper()
+
+ return context
+
+ def get_form(self, form_class=None):
+ form = super().get_form(form_class)
if 'main' in form.fields:
del form.fields["main"]
return form
+ @transaction.atomic
+ def form_valid(self, form):
+ activity = Activity.objects.get(pk=self.kwargs["activity_pk"])
+
+ form.instance.activity = activity
+
+ ret = super().form_valid(form)
+
+ # For each supplement, we save it
+ formset = SupplementFormSet(self.request.POST, instance=form.instance)
+ saved = []
+ if formset.is_valid():
+ for f in formset:
+ # We don't save the product if the price is not entered, ie. if the line is empty
+ if f.is_valid() and f.instance.price:
+ f.save()
+ f.instance.save()
+ saved.append(f.instance.pk)
+ else:
+ f.instance = None
+ # Remove old supplements that weren't given in the form
+ Supplement.objects.filter(~Q(pk__in=saved), dish=form.instance).delete()
+
+ return ret
+
+ def get_success_url(self):
+ return reverse_lazy('food:dish_detail', kwargs={"activity_pk": self.kwargs["activity_pk"], "pk": self.kwargs["pk"]})
+
class DishDeleteView(ProtectQuerysetMixin, LoginRequiredMixin, DeleteView):
"""
@@ -787,17 +830,32 @@ class ServedOrderListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableV
return context
-class OrderDeleteView(ProtectQuerysetMixin, LoginRequiredMixin, DeleteView):
+class KitchenView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView):
"""
- Delete an order
+ The view to display useful information for the kitchen
"""
model = Order
- extra_context = {"title": _('Delete dish')}
+ table_class = OrderTable
+ template_name = 'food/kitchen.html'
+ extra_context = {'title': _('Kitchen')}
- def delete(self, request, *args, **kwargs):
- if self.get_object().served:
- raise PermissionDenied(_("This order cannot be deleted because it has already been served"))
- return super().delete(request, *args, **kwargs)
+ def get_queryset(self):
+ return super().get_queryset().filter(~Q(supplements__isnull=True, request=''), activity__pk=self.kwargs["activity_pk"])
- def get_success_url(self):
- return reverse_lazy('food:order_list', kwargs={"activity_pk": self.kwargs["activity_pk"]})
+ def get_context_data(self, **kwargs):
+ context = super().get_context_data(**kwargs)
+
+ orders_count = Order.objects.values('dish__main__name').annotate(quantity=Count('id'))
+
+ context["orders"] = {o['dish__main__name']: o['quantity'] for o in orders_count}
+
+ return context
+
+ def get_table(self, **kwargs):
+ table = super().get_table(**kwargs)
+
+ hide = ["ordered_at", "serve", "delete"]
+ for field in hide:
+ table.columns.hide(field)
+
+ return table