From 98612eeae37ac5dee611f4607244da7c613c08e9 Mon Sep 17 00:00:00 2001
From: Kaalleen <36401965+kaalleen@users.noreply.github.com>
Date: Wed, 31 Oct 2018 01:06:31 +0100
Subject: Print Estimated Time (#341)

---
 print/templates/color_swatch.html          |  6 ++---
 print/templates/headline.html              |  2 +-
 print/templates/operator_detailedview.html | 23 ++++++++++--------
 print/templates/operator_overview.html     |  6 ++---
 print/templates/print_detail.html          |  6 ++---
 print/templates/print_overview.html        |  4 ++--
 print/templates/ui.html                    | 38 ++++++++++++++++++++++++++++--
 7 files changed, 61 insertions(+), 24 deletions(-)

(limited to 'print/templates')

diff --git a/print/templates/color_swatch.html b/print/templates/color_swatch.html
index 71022f6f..fe64c855 100644
--- a/print/templates/color_swatch.html
+++ b/print/templates/color_swatch.html
@@ -37,11 +37,11 @@
        </svg>
        <div class="color-info">
         <div>
-          <p><span class="color-name">{{ _('Color') }}:</span><span data-field-name="color-{{ color_block.color.hex_digits }}" contenteditable="true" data-placeholder="Enter thread name...">{{ color_block.color.name }}</span></p>
+          <p><span class="color-name">{{ _('Color') }}:</span><span data-field-name="color-{{ color_block.color.hex_digits }}" contenteditable="true" data-placeholder="{{ _('Enter thread name...') }}">{{ color_block.color.name }}</span></p>
           <p><span class="color-rgb">{{ _('rgb') }}:</span><span>{{ color_block.color.rgb }}</span></p>
           <p><span class="swatch-thread">{{ _('thread') }}:</span><span data-field-name="thread-{{ color_block.color.hex_digits }}" contenteditable="true">{{ color_block.color.manufacturer }} {{ "#" + color_block.color.number if color_block.color.number }}</span></p>
-          <p><span class="swatch-stitches">{{ _('# stitches') }}:</span><span>{{ color_block.num_stitches }}</span></p>
-          <p><span class="swatch-trims">{{ _('# trims') }}:</span><span>{{ color_block.num_trims }}</span></p>
+          <p><span class="swatch-stitches">{{ _('# stitches') }}:</span><span class="num-stitches">{{ color_block.num_stitches }}</span></p>
+          <p><span class="swatch-trims">{{ _('# trims') }}:</span><span class="num-trims">{{ color_block.num_trims }}</span></p>
           <p><span class="swatch-stops">{{ _('stop after?') }}:</span><span>{{ _("yes") if color_block.stop_after else _("no") }}</span></p>
         </div>
       </div>
diff --git a/print/templates/headline.html b/print/templates/headline.html
index 369c370e..bf112dea 100644
--- a/print/templates/headline.html
+++ b/print/templates/headline.html
@@ -12,5 +12,5 @@
       <p class="header-field" data-label="{{ _('PURCHASE ORDER #:') }}" contenteditable="true" data-placeholder="{{ _('Enter purchase order number...') }}" data-field-name="purchase-order"></p>
   </div>
 
-  <div class="currentDate">{{ date|datetimeformat(_('%Y.%m.%d')) }}</div>
+  <div class="currentDate">{{ date|datetimeformat(_('%m/%d/%Y')) }}</div>
 </div>
diff --git a/print/templates/operator_detailedview.html b/print/templates/operator_detailedview.html
index ae578d9d..608b3661 100644
--- a/print/templates/operator_detailedview.html
+++ b/print/templates/operator_detailedview.html
@@ -22,16 +22,17 @@
           </p>
           <p>
             <span>{{ _('Unique Colors') }}: {{ job.num_colors }}</span>
-            <span>{{ _('Color Blocks') }}: {{ job.num_color_blocks }}</span>
+            <span class="num-color-blocks">{{ _('Color Blocks') }}: {{ job.num_color_blocks }}</span>
           </p>
           <p>
             <span>{{ _('Design box size') }}: {{ "%0.1fmm X %0.1fmm" | format(*job.dimensions) }}</span>
-            <span>{{ _('Total thread used') }}: {{job.estimated_thread }}</span>
-            <span>{{ _('Total stitch count') }}: {{job.num_stitches }}</span>
+            <!-- <span>{{ _('Total thread used') }}: {{job.estimated_thread }}</span> -->
+            <span class="total-num-stitches">{{ _('Total stitch count') }}: {{job.num_stitches }}</span>
+            <span class="time-opd">{{ ('Estimated time') }}: <span class="total-estimated-time"></span></span>
           </p>
           <p>
-            <span>{{ _('Total stops') }}: {{ job.num_stops }}</span>
-            <span>{{ _('Total trims') }}: {{ job.num_trims }}</span>
+            <span class="total-stops">{{ _('Total stops') }}: {{ job.num_stops }}</span>
+            <span class="total-trims">{{ _('Total trims') }}: {{ job.num_trims }}</span>
           </p>
           <p>
             <span></span>
@@ -53,20 +54,22 @@
                 {{ color_block.svg_preview|safe }}
             </p>
             <p>
-              <span data-field-name="color-{{ color_block.color.hex_digits }}" contenteditable="true" data-placeholder="{{ _("Enter thread name...") }}">{{ color_block.color.name }}</span>
+              <span data-field-name="color-{{ color_block.color.hex_digits }}" contenteditable="true" data-placeholder="{{ _('Enter thread name...') }}">{{ color_block.color.name }}</span>
               <span>{{ color_block.color.rgb }}</span>
               <span data-field-name="thread-{{ color_block.color.hex_digits }}" contenteditable="true">{{ color_block.color.manufacturer }} {{ "#" + color_block.color.number if color_block.color.number }}</span>
             </p>
             <p>
-              <span>{{ _('thread used') }}:</span>
-              <span>{{ _('# stitches') }}: {{ color_block.num_stitches }}</span>
+              <!-- <span>{{ _('thread used') }}:</span> -->
+              <span class="num-stitches">{{ _('# stitches') }}: {{ color_block.num_stitches }}</span>
+              <span class="time-opd">{{ _('estimated time') }}: <span class="estimated-time"></span></span>
             </p>
             <p>
-              <span>{{ _('trims') }}: {{ color_block.num_trims }}</span>
+              <span class="num-trims">{{ _('trims') }}: {{ color_block.num_trims }}</span>
               <span>{{ _('stop after?') }}: {{ _("yes") if color_block.stop_after else _("no") }}</span>
+              <input type="hidden" class="num-stops" value="{{ '1' if color_block.stop_after else '0' }}" />
             </p>
             <p>
-              <span class="notes" contenteditable="true" data-field-name="operator-notes-block{{ loop.index }}" data-placeholder="{{ _("Enter operator notes...") }}"></span>
+              <span class="notes" contenteditable="true" data-field-name="operator-notes-block{{ loop.index }}" data-placeholder="{{ _('Enter operator notes...') }}"></span>
             </p>
           </div>
         {% endfor %}
diff --git a/print/templates/operator_overview.html b/print/templates/operator_overview.html
index 048fd58e..359d4f50 100644
--- a/print/templates/operator_overview.html
+++ b/print/templates/operator_overview.html
@@ -13,13 +13,13 @@
                     <div class="table">
                       <p><span>{{ _('Design box size') }}:</span><span>{{ "%0.1fmm X %0.1fmm" | format(*job.dimensions) }}</span></p>
                       <p><span>{{ _('Total stitch count') }}:</span><span>{{job.num_stitches }}</span></p>
-                      <p><span>{{ _('Total thread used') }}:</span><span>{{job.estimated_thread }}</span></p>
+                      <p><span>{{ _('Total thread used') }}:</span><span>{{job.total_thread_used }}</span></p>
                     </div>
                 </div>
                 <div>
-                    <div class="table">
+                    <div class="table time-opo">
                       <p><span>{{ _('Job estimated time') }}:</span></p>
-                      <p><span>{{ job.estimated_time }}</span></p>
+                      <p><span class="total-estimated-time"></span></p>
                     </div>
                 </div>
             </div>
diff --git a/print/templates/print_detail.html b/print/templates/print_detail.html
index 241ac88b..0c6bbefe 100644
--- a/print/templates/print_detail.html
+++ b/print/templates/print_detail.html
@@ -3,13 +3,13 @@
             <div class="job-details">
                 <div>
                     <div class="table">
-                      <p><span>{{ _('COLOR') }}:</span><span data-field-name="color-{{ color_block.color.hex_digits }}" contenteditable="true" data-placeholder="Enter thread name...">{{ color_block.color.thread_name }}</span></p>
+                      <p><span>{{ _('COLOR') }}:</span><span data-field-name="color-{{ color_block.color.hex_digits }}" contenteditable="true" data-placeholder="{{ _('Enter thread name...') }}">{{ color_block.color.thread_name }}</span></p>
                     </div>
                 </div>
                 <div>
-                    <div class="table">
+                    <div class="table time-cld">
                       <p><span>{{ _('Estimated time') }}:</span></p>
-                      <p><span>{{ color_block.estimatedtime }}</span></p>
+                      <p><span class="cld-estimated-time"></span></p>
                   </div>
                 </div>
             </div>
diff --git a/print/templates/print_overview.html b/print/templates/print_overview.html
index cfbb81d1..a2548070 100644
--- a/print/templates/print_overview.html
+++ b/print/templates/print_overview.html
@@ -17,9 +17,9 @@
                     </div>
                 </div>
                 <div>
-                    <div class="table">
+                    <div class="table time-clo">
                       <p><span>{{ _('Job estimated time') }}:</span></p>
-                      <p><span>{{ job.estimated_time }}</span></p>
+                      <p><span class="total-estimated-time"></span></p>
                     </div>
                 </div>
             </div>
diff --git a/print/templates/ui.html b/print/templates/ui.html
index bc6c57b9..5d565aba 100644
--- a/print/templates/ui.html
+++ b/print/templates/ui.html
@@ -16,6 +16,7 @@
       
       <div id="tabs">
         <button class="tab active">{{ _('Page Setup') }}</button>
+        <button class="tab">{{ _('Estimated Time') }}</button>
         <button class="tab">{{ _('Design') }}</button>
       </div>
       <div id="fieldsets-ui">
@@ -40,10 +41,43 @@
               <p style="text-indent: 1.5em;">{{ _('Thumbnail size') }}: <input type="range" min="15" max="110" value="15" step="5" id="operator-detailedview-thumbnail-size" data-field-name="operator-detailedview-thumbnail-size" style="vertical-align: middle;"> <span id="display-thumbnail-size">15mm</span>
                </p>
             </fieldset>
-            <button id="save-settings" title="{{ _("Includes these Page Setup settings and also the icon.") }}">{{ _("Save as defaults") }}</button>
+            <button class="save-settings" title="{{ _("Includes these Page Setup, estimated time settings and also the icon.") }}">{{ _("Save as defaults") }}</button>
           </div>
         </fieldset>
-        <fieldset id="ui-design">
+        <fieldset id="ui-time" class="ui-tab">
+          <legend>{{ _('Estimated Time') }}</legend>
+          <fieldset>
+            <legend>{{ _('Machine Settings') }}</legend>
+            <p>
+              <input class="view" type="number" id="machine-speed" data-field-name="machine-speed" min="0" value="700" title="{{ _('Average Machine Speed') }}" /> 
+              <label for="machine-speed">{{ _('stitches per minute ') }}</label>
+            </p>
+          </fieldset>
+          <fieldset>
+            <legend>{{ _('Time Factors') }}</legend>
+            <p>
+                <input type="number" id="time-additional" data-field-name="time-additional" min="0" value="0" />
+                <label for="time-additional" title="{{ _('Includes average time for preparing the machine, thread breaks and/or bobbin changes, etc.') }}">{{ _('seconds to add to total time*') }}</label>
+            </p>
+            <p>
+              <input type="number" id="time-color-change" data-field-name="time-color-change" min="0" value="10" />
+              <label for="time-color-change" title="{{ _('This will be added to the total time.') }}">{{ _('seconds needed for a color change*') }}</label></p>
+            <p>
+              <input type="number" id="time-trims" data-field-name="time-trims" min="0" value="10" />
+              <label for="time-trims">{{ _('seconds needed for trim') }}</label></p>
+          </fieldset>
+          <fieldset>
+            <legend>{{ _('Display Time On') }}</legend>
+            <p>
+              <p><input type="checkbox" class="time-display" id="time-clo" data-field-name="time-clo" /><label for="time-clo">{{ _('Client Overview') }}</label></p>
+              <p><input type="checkbox" class="time-display" id="time-cld" data-field-name="time-cld" /><label for="time-cld">{{ _('Client Detailed View') }}</label></p>
+              <p><input type="checkbox" class="time-display" id="time-opo" data-field-name="time-opo" CHECKED /><label for="time-opo">{{ _('Operator Overview') }}</label></p>
+              <p><input type="checkbox" class="time-display" id="time-opd" data-field-name="time-opd" CHECKED /><label for="time-opd">{{ _('Operator Detailed View') }}</label></p>
+            </p>
+          </fieldset>
+          <button class="save-settings" title="{{ _("Includes these Page Setup, estimated time settings and also the icon.") }}">{{ _("Save as defaults") }}</button>
+        </fieldset>
+        <fieldset id="ui-design" class="ui-tab">
           <legend>{{ _('Design') }}</legend>
           <p class="select-container"><label for="thread-palette">{{ _('Thread Palette') }}:</label>
             <select id="thread-palette" data-field-name="thread-palette">
-- 
cgit v1.3.1