diff options
| -rw-r--r-- | messages.po | 7 | ||||
| -rw-r--r-- | print/templates/index.html | 2 | ||||
| -rw-r--r-- | print/templates/operator_detailedview.html | 8 |
3 files changed, 10 insertions, 7 deletions
diff --git a/messages.po b/messages.po index 92b6aa61..ce85878d 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 <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\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 21ca74ab..0c9cedfd 100644 --- a/print/templates/index.html +++ b/print/templates/index.html @@ -23,7 +23,7 @@ <div class="page operator-overview" style="display: {{ 'block' if view.operator_overview else 'none' }}">{% include 'operator_overview.html' %}</div> {# 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 %} <div class="page operator-detailedview" style="display: {{ 'block' if view.operator_detailedview else 'none' }}">{% include 'operator_detailedview.html' %}</div> {% endfor %} diff --git a/print/templates/operator_detailedview.html b/print/templates/operator_detailedview.html index 92c3445f..f78028d7 100644 --- a/print/templates/operator_detailedview.html +++ b/print/templates/operator_detailedview.html @@ -10,7 +10,7 @@ <p>{{ _('Color') }}</p> <p>{{ _('Thread Consumption') }}</p> <p>{{ _('Stops and Trims') }}</p> - <p>{{ _('Estimated Time') }}</p> + <p>{{ _('Notes') }}</p> </div> {% if outer_loop.index == 1 %} <div> @@ -34,7 +34,7 @@ <span>{{ _('Total nr trims') }}: {{ job.num_trims }}</span> </p> <p> - <span>{{ job.estimated_time }}</span> + <span></span> </p> </div> {% endif %} @@ -45,7 +45,7 @@ <svg xmlns="http://www.w3.org/2000/svg"> <rect fill="rgb{{ color_block.color.rgb }}" width="15mm" height="100%" /> <text fill="rgb{{ color_block.color.font_color }}"> - <tspan x="4mm" y="7.5mm" class="color-index">#{{ loop.index + outer_loop.index0 * 13 }}</tspan> + <tspan x="4mm" y="7.5mm" class="color-index">#{{ loop.index + outer_loop.index0 * 12 }}</tspan> </text> </svg> </p> @@ -65,7 +65,7 @@ <span>{{ _('# trims') }}: {{ color_block.num_trims }}</span> </p> <p> - <span>{{ color_block.estimatedtime }}</span> + <span class="notes" contenteditable="true" data-field-name="operator-notes-block{{ loop.index0 + outer_loop.index0 * 12 }}" data-placeholder="{{ _("Enter operator notes...") }}"></span> </p> </div> {% endfor %} |