Self hosted FLOSS fitness/workout, nutrition and weight tracker
Updating ingredient form layout
Harlene Samra675647bf8c1d
diff --git a/wger/nutrition/forms.py b/wger/nutrition/forms.pyindex 7dc05953c..a2ab136c3 100644--- a/wger/nutrition/forms.py+++ b/wger/nutrition/forms.py@@ -259,3 +259,41 @@ class MealLogItemForm(MealItemForm):fields = ['ingredient','weight_unit','amount']++class IngredientForm(forms.ModelForm):+ class Meta:+ model = Ingredient+ fields = ['name',+ 'energy',+ 'protein',+ 'carbohydrates',+ 'carbohydrates_sugar',+ 'fat',+ 'fat_saturated',+ 'fibres',+ 'sodium',+ 'license',+ 'license_author']++ def __init__(self, *args, **kwargs):+ super(IngredientForm, self).__init__(*args, **kwargs)+ self.helper = FormHelper()+ self.helper.layout = Layout(+ 'name',+ 'energy',+ 'protein',+ Row(+ Column('carbohydrates', css_class='form-group col-6 mb-0'),+ Column('carbohydrates_sugar', css_class='form-group col-6 mb-0'),+ css_class='form-row'+ ),+ Row(+ Column('fat', css_class='form-group col-6 mb-0'),+ Column('fat_saturated', css_class='form-group col-6 mb-0'),+ css_class='form-row'+ ),+ 'fibres',+ 'sodium',+ 'license',+ 'license_author'+ )\ No newline at end of filediff --git a/wger/nutrition/views/ingredient.py b/wger/nutrition/views/ingredient.pyindex c1f266447..07526c138 100644--- a/wger/nutrition/views/ingredient.py+++ b/wger/nutrition/views/ingredient.py@@ -46,7 +46,10 @@ from django.views.generic import ()# wger-from wger.nutrition.forms import UnitChooserForm+from wger.nutrition.forms import (+ UnitChooserForm,+ IngredientForm,+)from wger.nutrition.models import Ingredientfrom wger.utils.cache import cache_mapperfrom wger.utils.constants import PAGINATION_OBJECTS_PER_PAGE@@ -143,30 +146,14 @@ class IngredientDeleteView(WgerDeleteMixin,return context-class IngredientMixin(WgerFormMixin):- """- Manually set the order of the fields- """-- fields = ['name',- 'energy',- 'protein',- 'carbohydrates',- 'carbohydrates_sugar',- 'fat',- 'fat_saturated',- 'fibres',- 'sodium',- 'license',- 'license_author']---class IngredientEditView(IngredientMixin, LoginRequiredMixin, PermissionRequiredMixin, UpdateView):+class IngredientEditView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, UpdateView):"""Generic view to update an existing ingredient"""+ template_name = 'form.html'model = Ingredient+ form_class = IngredientFormpermission_required = 'nutrition.change_ingredient'def get_context_data(self, **kwargs):@@ -178,15 +165,14 @@ class IngredientEditView(IngredientMixin, LoginRequiredMixin, PermissionRequiredreturn context-class IngredientCreateView(IngredientMixin, CreateView):+class IngredientCreateView(WgerFormMixin, CreateView):"""Generic view to add a new ingredient"""-+ template_name = 'form.html'model = Ingredient+ form_class = IngredientFormtitle = ugettext_lazy('Add a new ingredient')- form_action = reverse_lazy('nutrition:ingredient:add')- sidebar = 'ingredient/form.html'def form_valid(self, form):@@ -201,6 +187,11 @@ class IngredientCreateView(IngredientMixin, CreateView):if request.user.userprofile.is_temporary:return HttpResponseForbidden()return super(IngredientCreateView, self).dispatch(request, *args, **kwargs)++ def get_context_data(self, **kwargs):+ context = super(IngredientCreateView, self).get_context_data(**kwargs)+ context['extend_template'] = 'base.html'+ return contextclass PendingIngredientListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):