Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Add UI for vegan/vegetarian dietary fields on ingredient views

Sambe47c4085c43
diff --git a/wger/nutrition/templates/ingredient/overview.html b/wger/nutrition/templates/ingredient/overview.html
index dc3a67b07..895d2a9cc 100644
--- a/wger/nutrition/templates/ingredient/overview.html
+++ b/wger/nutrition/templates/ingredient/overview.html
@@ -28,6 +28,11 @@
{% endif %}
</span>
{{ ingredient.name }}
+ {% if ingredient.is_vegan %}
+ <span class="badge bg-success ms-2">{% translate "Vegan" %}</span>
+ {% elif ingredient.is_vegetarian %}
+ <span class="badge bg-info ms-2">{% translate "Vegetarian" %}</span>
+ {% endif %}
</a>
{% endfor %}
</div>
@@ -49,6 +54,39 @@
<h4>{% translate "Search" %}</h4>
<div id="react-ingredient-search"></div>
+ <h4 class="mt-4">{% translate "Filter" %}</h4>
+ <form method="GET" action="">
+ <div class="mb-3">
+ <label class="form-label">{% translate "Dietary" %}</label>
+ <div class="form-check">
+ <input class="form-check-input"
+ type="checkbox"
+ name="is_vegan"
+ id="filter-vegan"
+ value="1"
+ {% if request.GET.is_vegan %}checked{% endif %}>
+ <label class="form-check-label" for="filter-vegan">
+ {% translate "Vegan only" %}
+ </label>
+ </div>
+ <div class="form-check">
+ <input class="form-check-input"
+ type="checkbox"
+ name="is_vegetarian"
+ id="filter-vegetarian"
+ value="1"
+ {% if request.GET.is_vegetarian %}checked{% endif %}>
+ <label class="form-check-label" for="filter-vegetarian">
+ {% translate "Vegetarian only" %}
+ </label>
+ </div>
+ </div>
+ <button type="submit" class="btn btn-light btn-sm">{% translate "Apply" %}</button>
+ {% if request.GET.is_vegan or request.GET.is_vegetarian %}
+ <a href="{% url 'nutrition:ingredient:list' %}" class="btn btn-outline-secondary btn-sm">{% translate "Reset" %}</a>
+ {% endif %}
+ </form>
+
{% endblock %}
diff --git a/wger/nutrition/templates/ingredient/view.html b/wger/nutrition/templates/ingredient/view.html
index f177dcdfd..72e0eb91b 100644
--- a/wger/nutrition/templates/ingredient/view.html
+++ b/wger/nutrition/templates/ingredient/view.html
@@ -127,6 +127,44 @@ $(document).ready(function() {
</tr>
</tbody>
</table>
+
+{% if ingredient.is_vegan is not None or ingredient.is_vegetarian is not None %}
+<table class="table table-hover">
+ <thead>
+ <tr>
+ <th colspan="2">
+ {% translate "Dietary information" %}
+ </th>
+ </tr>
+ </thead>
+ <tbody>
+ {% if ingredient.is_vegan is not None %}
+ <tr>
+ <td>{% translate "Vegan" %}</td>
+ <td class="text-right">
+ {% if ingredient.is_vegan %}
+ <span class="badge bg-success">{% translate "Yes" %}</span>
+ {% else %}
+ <span class="badge bg-danger">{% translate "No" %}</span>
+ {% endif %}
+ </td>
+ </tr>
+ {% endif %}
+ {% if ingredient.is_vegetarian is not None %}
+ <tr>
+ <td>{% translate "Vegetarian" %}</td>
+ <td class="text-right">
+ {% if ingredient.is_vegetarian %}
+ <span class="badge bg-success">{% translate "Yes" %}</span>
+ {% else %}
+ <span class="badge bg-danger">{% translate "No" %}</span>
+ {% endif %}
+ </td>
+ </tr>
+ {% endif %}
+ </tbody>
+</table>
+{% endif %}
</div>
<small>
diff --git a/wger/nutrition/views/ingredient.py b/wger/nutrition/views/ingredient.py
index 489918d03..5ab990976 100644
--- a/wger/nutrition/views/ingredient.py
+++ b/wger/nutrition/views/ingredient.py
@@ -77,10 +77,28 @@ class IngredientListView(ListView):
def get_queryset(self):
"""
- Filter the ingredients the user will see by its language
+ Filter the ingredients the user will see by its language, optionally
+ also filtering by dietary properties (is_vegan, is_vegetarian).
"""
language = load_language()
- return Ingredient.objects.filter(language=language)
+ queryset = Ingredient.objects.filter(language=language)
+
+ if self.request.GET.get('is_vegan'):
+ queryset = queryset.filter(is_vegan=True)
+
+ if self.request.GET.get('is_vegetarian'):
+ queryset = queryset.filter(is_vegetarian=True)
+
+ return queryset
+
+ def dispatch(self, request, *args, **kwargs):
+ """
+ Bypass the page-level cache when dietary filters are active so that
+ filtered results are always fresh.
+ """
+ if request.GET.get('is_vegan') or request.GET.get('is_vegetarian'):
+ return super(ListView, self).dispatch(request, *args, **kwargs)
+ return super().dispatch(request, *args, **kwargs)
def view(request, pk, slug=None):