diff --git a/app/templates/daily_plans/_print_day_badge.html.j2 b/app/templates/daily_plans/_print_day_badge.html.j2 index 4d77f032..480e3e05 100644 --- a/app/templates/daily_plans/_print_day_badge.html.j2 +++ b/app/templates/daily_plans/_print_day_badge.html.j2 @@ -17,22 +17,23 @@ {{ day.weekday }}
- - {% for meal, daily_recipes in day.daily_recipes | rejectattr("meal_type", "none") | groupby("meal_type") %} -
{{ meal }}:
- {{ daily_recipes | map(attribute="recipe") | join(", ", attribute="name") }} - {% endfor %} + # set recipes = day.daily_recipes | sort(attribute="order_index") - {% if day.daily_recipes_without_meal_type %} -
ostatní
- {{ day.daily_recipes_without_meal_type | map(attribute="recipe") | join(", ", attribute="name") }} - {% endif %} + {% for daily_recipe in recipes %} + # if not loop.previtem or daily_recipe.meal_type != loop.previtem.meal_type +
{{ daily_recipe.meal_type | default("ostatní", True) }}
+ # endif + + # if daily_recipe.meal_type != "nákup" +
{{ daily_recipe.recipe.name }}
+ # endif + {% endfor %} {% if day.all_tasks %}
- {% for task in day.all_tasks %} - {{ task }}
- {% endfor %} + {% for task in day.all_tasks %} + {{ task }}
+ {% endfor %} {% endif %} - \ No newline at end of file + diff --git a/app/templates/event_exporter/recipe_list_visual.html.j2 b/app/templates/event_exporter/recipe_list_visual.html.j2 deleted file mode 100644 index 451887eb..00000000 --- a/app/templates/event_exporter/recipe_list_visual.html.j2 +++ /dev/null @@ -1,19 +0,0 @@ -{% extends "base/base.html.j2" %} -{% block title %} jídelníček {% endblock %} - -{% block content %} - -

{{ link_or_name(event) }}

-

recepty

- -
- {% for daily_plan in daily_plans %} -
-

{{ human_format_date(daily_plan.date) }}

- {{ list_of_links(daily_plan.real_recipes) }} -
- {% endfor %} -
- - -{% endblock %} diff --git a/app/templates/events/_export.html.j2 b/app/templates/events/_export.html.j2 index 82c9ff26..672e4432 100644 --- a/app/templates/events/_export.html.j2 +++ b/app/templates/events/_export.html.j2 @@ -29,7 +29,7 @@ {{ icon("pdf") }} nákupní seznam s recepty
- {{ icon("pdf") }} jídelníček + {{ icon("pdf") }} jídelníček
{{ icon("pdf") }} kuchařka @@ -56,4 +56,4 @@
- \ No newline at end of file +