diff --git a/bakeup/templates/workshop/includes/production_plan_actions.html b/bakeup/templates/workshop/includes/production_plan_actions.html index 4b254d6..1e140fe 100644 --- a/bakeup/templates/workshop/includes/production_plan_actions.html +++ b/bakeup/templates/workshop/includes/production_plan_actions.html @@ -1,11 +1,59 @@ {% load i18n %} -{% if production_plan.is_planned %} -{% trans "Start" %} -{% elif production_plan.is_production %} -{% trans "Finish" %} -{% endif %} -{% if production_plan.is_canceled %} -{% trans "Reset" %} +
+{% if production_plan.is_planned or production_plan.is_production %} +
+ {% if production_plan.is_planned %} + {% trans "Start" %} + + {% elif production_plan.is_production %} + {% trans "Finish" %} + + {% endif %} + +
{% else %} -{% trans "Cancel" %} + {% endif %} +
+
+ +
diff --git a/bakeup/templates/workshop/includes/production_plan_table.html b/bakeup/templates/workshop/includes/production_plan_table.html index ba940d5..396594c 100644 --- a/bakeup/templates/workshop/includes/production_plan_table.html +++ b/bakeup/templates/workshop/includes/production_plan_table.html @@ -26,39 +26,36 @@ {{ production_plan.root.production_day.day_of_sale|date:'d.m.' }} {{ production_plan.root.quantity|floatformat }}x {{ production_plan.root.product }} ({{ production_plan.root.quantity|multiply:production_plan.root.product.weight|floatformat:0 }} g) {% include "workshop/includes/production_plan_state.html" with state_css_class=production_plan.root.get_state_css_class label=production_plan.root.get_state_display_value %} - - {% include "workshop/includes/production_plan_actions.html" with production_plan=production_plan.root btn_css="btn-sm" %} - + {% include "workshop/includes/production_plan_actions.html" with production_plan=production_plan.root btn_css="btn-sm" %}
- - - - - - - - - - - -
{% for child_plan in production_plan|get_item:'Hauptteig' %} - {% include "workshop/includes/production_plan_ingredients.html" with plan=child_plan %} - {% endfor %} - {% for child_plan in production_plan|get_item:'Vorteig' %} - {% include "workshop/includes/production_plan_ingredients.html" with plan=child_plan %} - {% endfor %} - {% for child_plan in production_plan|get_item:'Zubereitungen' %} - {% include "workshop/includes/production_plan_ingredients.html" with plan=child_plan %} - {% endfor %} -
- {% if not production_plan.root.is_locked %} - {% trans "Update plan" %} - {% endif %} -
+
+
+ {% for child_plan in production_plan|get_item:'Hauptteig' %} + {% include "workshop/includes/production_plan_ingredients.html" with plan=child_plan %} + {% endfor %} +
+
+ {% for child_plan in production_plan|get_item:'Vorteig' %} + {% include "workshop/includes/production_plan_ingredients.html" with plan=child_plan %} + {% endfor %} +
+
+ {% for child_plan in production_plan|get_item:'Zubereitungen' %} + {% include "workshop/includes/production_plan_ingredients.html" with plan=child_plan %} + {% endfor %} +
+
+
+
+ {% if not production_plan.root.is_locked %} + {% trans "Update plan" %} + {% endif %} +
+
diff --git a/locale/de_DE/LC_MESSAGES/django.mo b/locale/de_DE/LC_MESSAGES/django.mo index 02cd6f7..1cab749 100644 Binary files a/locale/de_DE/LC_MESSAGES/django.mo and b/locale/de_DE/LC_MESSAGES/django.mo differ diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po index b1cce54..2f95c3f 100644 --- a/locale/de_DE/LC_MESSAGES/django.po +++ b/locale/de_DE/LC_MESSAGES/django.po @@ -815,7 +815,7 @@ msgstr "Tag" #: bakeup/templates/workshop/includes/dashboard.html:33 #: bakeup/templates/workshop/includes/production_plan_table.html:12 msgid "Qty" -msgstr "Menge" +msgstr "Qty" #: bakeup/templates/workshop/includes/dashboard.html:46 msgid "Go to production plans" diff --git a/locale/de_DE@formal/LC_MESSAGES/django.mo b/locale/de_DE@formal/LC_MESSAGES/django.mo index 7e5b978..9f90992 100644 Binary files a/locale/de_DE@formal/LC_MESSAGES/django.mo and b/locale/de_DE@formal/LC_MESSAGES/django.mo differ diff --git a/locale/de_DE@formal/LC_MESSAGES/django.po b/locale/de_DE@formal/LC_MESSAGES/django.po index a02c7fa..cd81fee 100644 --- a/locale/de_DE@formal/LC_MESSAGES/django.po +++ b/locale/de_DE@formal/LC_MESSAGES/django.po @@ -850,7 +850,7 @@ msgstr "Tag" #: bakeup/templates/workshop/includes/dashboard.html:33 #: bakeup/templates/workshop/includes/production_plan_table.html:12 msgid "Qty" -msgstr "Menge" +msgstr "Qty" #: bakeup/templates/workshop/includes/dashboard.html:46 msgid "Go to production plans"