diff --git a/messages.po b/messages.po index 92b6aa61d..ce85878dd 100644 --- a/messages.po +++ b/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2018-04-16 21:03-0400\n" +"POT-Creation-Date: 2018-04-18 16:29-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -336,7 +336,7 @@ msgstr "" msgid "Stops and Trims" msgstr "" -msgid "Estimated Time" +msgid "Notes" msgstr "" msgid "Unique Colors" @@ -360,6 +360,9 @@ msgstr "" msgid "Total nr trims" msgstr "" +msgid "Enter operator notes..." +msgstr "" + msgid "Job estimated time" msgstr "" diff --git a/print/templates/index.html b/print/templates/index.html index 21ca74ab4..0c9cedfdc 100644 --- a/print/templates/index.html +++ b/print/templates/index.html @@ -23,7 +23,7 @@
{% include 'operator_overview.html' %}
{# operator detailed view #} - {% for color_block_part in color_blocks | batch(13) %} + {% for color_block_part in color_blocks | batch(12) %} {% set outer_loop = loop %}
{% include 'operator_detailedview.html' %}
{% endfor %} diff --git a/print/templates/operator_detailedview.html b/print/templates/operator_detailedview.html index 92c3445f2..f78028d7c 100644 --- a/print/templates/operator_detailedview.html +++ b/print/templates/operator_detailedview.html @@ -10,7 +10,7 @@

{{ _('Color') }}

{{ _('Thread Consumption') }}

{{ _('Stops and Trims') }}

-

{{ _('Estimated Time') }}

+

{{ _('Notes') }}

{% if outer_loop.index == 1 %}
@@ -34,7 +34,7 @@ {{ _('Total nr trims') }}: {{ job.num_trims }}

- {{ job.estimated_time }} +

{% endif %} @@ -45,7 +45,7 @@ - #{{ loop.index + outer_loop.index0 * 13 }} + #{{ loop.index + outer_loop.index0 * 12 }}

@@ -65,7 +65,7 @@ {{ _('# trims') }}: {{ color_block.num_trims }}

- {{ color_block.estimatedtime }} +

{% endfor %}