diff --git a/templates/macros/rezept.html b/templates/macros/rezept.html
index 2272b09..ea636a2 100644
--- a/templates/macros/rezept.html
+++ b/templates/macros/rezept.html
@@ -55,6 +55,7 @@
{%- if ing.ingredient is defined and ing.ingredient != "" -%}
{%- if ing.amounts is defined and ing.amounts != "" and ing.amounts.blocks is defined and ing.amounts.blocks != "" -%}
{%- if ing.amounts.blocks != [] -%}
+ {%- set ingredient_counter = loop.index -%}
{%- for amt in ing.amounts.blocks -%}
{%- if loop.index == prt_loop -%}
{%- if amt.amount is defined and amt.amount != "" and amt.amount != 0 and amt.amount != '0' -%}
@@ -66,52 +67,15 @@
>{{ ing.ingredient }}: {{ amt.amount }} {{ amt.unit | default('each') }}
{%- if ing.processing is defined and ing.processing != "" and ing.processing.blocks is defined and ing.processing.blocks != "" -%}
{%- if ing.processing.blocks != [] -%}
- {{- '\n ' -}}
- {{- '\n ' -}} -
- {{- '\n ' -}}
- Verarbeitungshinweis
- {%- for tmp_prc in ing.processing.blocks -%}
- {%- if loop.index == 2 -%}
- {{- 'e' -}}
- {%- endif -%}
- {%- endfor -%}
- :
- {{- '\n ' -}}
-
- {%- for prc in ing.processing.blocks -%}
- {{- '\n ' -}} -
- {{- '\n ' -}}
- {{ prc.process }}
- {{- '\n ' -}}
- {%- endfor -%}
- {{- '\n ' -}}
- {{- '\n ' -}}
- {{- '\n ' -}}
+ {{- ' | ' -}}
+ Verarbeitungshinweis #{{- ingredient_counter | string -}}
{%- endif -%}
{%- endif -%}
{%- if ing.notes is defined and ing.notes != "" and ing.notes.blocks is defined and ing.notes.blocks != "" -%}
{%- if ing.notes.blocks != [] -%}
- {{- '\n ' -}}
- {{- '\n ' -}} -
+ {{- ' | ' -}}
+ Notiz #{{- ingredient_counter | string -}}
{{- '\n ' -}}
- Notiz
- {%- for tmp_nde in ing.notes.blocks -%}
- {%- if loop.index == 2 -%}
- {{- 'en' -}}
- {%- endif -%}
- {%- endfor -%}
- :
- {{- '\n ' -}}
-
- {%- for nde in ing.notes.blocks -%}
- {{- '\n ' -}} -
- {{- '\n ' -}}
- {{ nde.note }}
- {{- '\n ' -}}
- {%- endfor -%}
- {{- '\n ' -}}
- {{- '\n ' -}}
- {{- '\n ' -}}
{%- endif -%}
{%- endif -%}
{%- if ing.substitutions is defined and ing.substitutions != "" -%}
@@ -205,22 +169,106 @@
{%- endif -%}
{%- endfor -%}
{{- '\n ' -}}
+ {%- else -%}
+ {{- '\n ' -}}
+ {{- '\n ' -}} Keine Zutaten definiert
+ {{- '\n ' -}}
+ {%- endif -%}
+ {%- else -%}
+ {{- '\n ' -}}
+ {{- '\n ' -}} Keine Zutaten definiert
+ {{- '\n ' -}}
+ {%- endif -%}
+
+
+
+
+ {%- if child.ingredients is defined and child.ingredients != "" %}
+ {%- if child.ingredients.blocks != [] -%}
+ {{- '\n ' -}}
+ {%- for ing1 in child.ingredients.blocks %}
+ {%- if ing1.ingredient is defined and ing1.ingredient != "" -%}
+ {%- if ing1.amounts is defined and ing1.amounts != "" and ing1.amounts.blocks is defined and ing1.amounts.blocks != "" -%}
+ {%- if ing1.amounts.blocks != [] -%}
+ {%- set ingredient_counter = loop.index -%}
+ {%- for amt in ing1.amounts.blocks -%}
+ {%- if loop.index == prt_loop -%}
+ {%- if amt.amount is defined and amt.amount != "" and amt.amount != 0 and amt.amount != '0' -%}
+ {%- if ing1.processing is defined and ing1.processing != "" and ing1.processing.blocks is defined and ing1.processing.blocks != "" -%}
+ {%- if ing1.processing.blocks != [] -%}
+ {{- '\n ' -}} -
+ {{- '\n ' -}}
+ Verarbeitungshinweis
+ {%- for tmp_prc in ing1.processing.blocks -%}
+ {%- if loop.index == 2 -%}
+ {{- 'e' -}}
+ {%- endif -%}
+ {%- endfor -%}
+ {{- ' #' -}}
+ {{- ingredient_counter | string -}}:
+ {{- '\n ' -}}
+
+ {%- for prc in ing1.processing.blocks -%}
+ {{- '\n ' -}} -
+ {{- '\n ' -}}
+ {{ prc.process }}
+ {{- '\n ' -}}
+ {%- endfor -%}
+ {{- '\n ' -}}
+ {{- '\n ' -}}
+ {{- '\n ' -}}
+ {%- endif -%}
+ {%- endif -%}
+ {%- if ing1.notes is defined and ing1.notes != "" and ing1.notes.blocks is defined and ing1.notes.blocks != "" -%}
+ {%- if ing1.notes.blocks != [] -%}
+ {{- '\n ' -}}
+ {{- '\n ' -}} -
+ {{- '\n ' -}}
+ Notiz
+ {%- for tmp_nde in ing1.notes.blocks -%}
+ {%- if loop.index == 2 -%}
+ {{- 'en' -}}
+ {%- endif -%}
+ {%- endfor -%}
+ {{- ' #' -}} {{- ingredient_counter | string -}}:
+ {{- '\n ' -}}
+
+ {%- for nde in ing1.notes.blocks -%}
+ {{- '\n ' -}} -
+ {{- '\n ' -}}
+ {{ nde.note }}
+ {{- '\n ' -}}
+ {%- endfor -%}
+ {{- '\n ' -}}
+ {{- '\n ' -}}
+ {{- '\n ' -}}
+ {%- endif -%}
+ {%- endif -%}
+ {{- '\n ' -}}
+ {%- endif -%}
+ {%- endif -%}
+ {%- endfor -%}
+ {%- endif -%}
+ {%- endif -%}
+ {%- endif -%}
+ {%- endfor -%}
+ {{- '\n ' -}}
{%- else -%}
{{- '\n ' -}}
{{- '\n ' -}} Keine Zutaten definiert
{{- '\n ' -}}
+ {%- endif -%}
+ {%- else -%}
+ {{- '\n ' -}}
+ {{- '\n ' -}} Keine Zutaten definiert
+ {{- '\n ' -}}
{%- endif -%}
- {%- else -%}
- {{- '\n ' -}}
- {{- '\n ' -}} Keine Zutaten definiert
- {{- '\n ' -}}
- {%- endif -%}
- {%- endfor -%}
+ {%- endfor -%}
+ {%- endif -%}
{%- endif -%}
+ {{- '\n ' -}}
+ {{- '\n ' -}}
{%- endif -%}
- {{- '\n ' -}}
- {{- '\n ' -}}
- {%- endif -%}
{#-
Rezept Schritte...