From b00da901a46b0710ad8bd29522e33bed2c4a1c77 Mon Sep 17 00:00:00 2001 From: "user@node5.net" Date: Sun, 7 Dec 2025 14:25:09 +0100 Subject: You can create drinks and they will be displayed --- web_interface/drinks/models.py | 12 ++++++- web_interface/drinks/templates/base.html | 23 ++++++++++++ .../drinks/templates/drinks_overview.html | 41 ++++++++++++++++++++++ web_interface/drinks/views.py | 11 +++--- 4 files changed, 82 insertions(+), 5 deletions(-) create mode 100644 web_interface/drinks/templates/base.html create mode 100644 web_interface/drinks/templates/drinks_overview.html (limited to 'web_interface/drinks') diff --git a/web_interface/drinks/models.py b/web_interface/drinks/models.py index bb4b48a..8f3fcf6 100644 --- a/web_interface/drinks/models.py +++ b/web_interface/drinks/models.py @@ -146,6 +146,16 @@ class Ingredient(models.Model): on_delete=models.CASCADE, ) + @property + def name(self) -> str: + """ + e.g: 3cl. Jägermeister + """ + return f"{self.amount}{self.unit} {self.bottle}" + def __str__(self) -> str: - return f"{self.drink} {self.amount}{self.unit} {self.bottle}" + """ + Name with drink context, for admin overview. E.g: Kung Fu 3cl. Jägermeister + """ + return f"{self.drink} {self.name}" diff --git a/web_interface/drinks/templates/base.html b/web_interface/drinks/templates/base.html new file mode 100644 index 0000000..8a60bab --- /dev/null +++ b/web_interface/drinks/templates/base.html @@ -0,0 +1,23 @@ +{% load static %} + + + + + + + + Drinks machine + + + + {% block head %} + {% endblock %} + + +
+ {% block content %} + {% endblock %} +
+ + + diff --git a/web_interface/drinks/templates/drinks_overview.html b/web_interface/drinks/templates/drinks_overview.html new file mode 100644 index 0000000..0de4504 --- /dev/null +++ b/web_interface/drinks/templates/drinks_overview.html @@ -0,0 +1,41 @@ +{% extends 'base.html' %} + +{% block content %} + +
+ + {% for drink in drinks %} + +
+ +
+
+
+ +
+
+
+

{{ drink.name }}

+

{{ drink.description }}

+ +
Ingredients
+
    + {% for ingredient in drink.ingredient_set.all %} +
  • {{ ingredient.name }}
    • + {% endfor %} +
+ +
+
+
+
+ +
+ + {% endfor %} + +
+ +{% endblock %} diff --git a/web_interface/drinks/views.py b/web_interface/drinks/views.py index 8c5ef2b..be87d8f 100644 --- a/web_interface/drinks/views.py +++ b/web_interface/drinks/views.py @@ -1,7 +1,10 @@ from django.shortcuts import render -from django.http import HttpResponse +from django.http import HttpRequest, HttpResponse -# Create your views here. +from .models import Drink + + +def index(request: HttpRequest) -> HttpResponse: + drinks = Drink.objects.all() + return render(request=request, template_name="drinks_overview.html", context={'drinks': drinks}) -def index(request): - return HttpResponse("🍺🍸🍻") -- cgit v1.3.1