From 1f6166dfab6b40530dc43fa357ab9ef9297af627 Mon Sep 17 00:00:00 2001
From: Harrys Ravalomanana <hra@esokia-webagency.com>
Date: Tue, 16 Jun 2020 18:34:50 +0400
Subject: [PATCH] PHRAS-3116

---
 .../Phrasea/Controller/Prod/ToolsController.php     |  6 ++++++
 package.json                                        |  2 +-
 .../web/prod/actions/Tools/videoEditor.html.twig    | 13 +++++++++++--
 yarn.lock                                           |  8 ++++----
 4 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/lib/Alchemy/Phrasea/Controller/Prod/ToolsController.php b/lib/Alchemy/Phrasea/Controller/Prod/ToolsController.php
index 7672ff9190..3343a05438 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/ToolsController.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/ToolsController.php
@@ -485,6 +485,12 @@ class ToolsController extends Controller
                 if (preg_match('/^VideoTextTrack(.*)$/iu', $meta->get_name(), $matches) && !empty($matches[1]) && strlen($matches[1]) == 2 ) {
                     $field['label'] = $matches[1];
                     $field['meta_struct_id'] = $meta->get_id();
+                    $field['value'] = '';
+                    if ($record->get_caption()->has_field($meta->get_name())) {
+                        $fieldValues = $record->get_caption()->get_field($meta->get_name())->get_values();
+                        $fieldValue = array_pop($fieldValues);
+                        $field['value'] = $fieldValue->getValue();
+                    }
                     $videoTextTrackFields[] = $field;
                     unset($field);
                 }
diff --git a/package.json b/package.json
index 8bb7fe4937..f75570979b 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,7 @@
     "normalize-css": "^2.1.0",
     "npm": "^6.0.0",
     "npm-modernizr": "^2.8.3",
-    "phraseanet-production-client": "0.34.226-d",
+    "phraseanet-production-client": "0.34.228-d",
     "requirejs": "^2.3.5",
     "tinymce": "^4.0.28",
     "underscore": "^1.8.3",
diff --git a/templates/web/prod/actions/Tools/videoEditor.html.twig b/templates/web/prod/actions/Tools/videoEditor.html.twig
index fd9e86f6a8..97f1bfe6f3 100644
--- a/templates/web/prod/actions/Tools/videoEditor.html.twig
+++ b/templates/web/prod/actions/Tools/videoEditor.html.twig
@@ -176,7 +176,7 @@
                                 <div class='item-field start-time' ><label>Start time</label><input class='time startTime' type='text' name='startTime' size='12' value="00:00:00.000"/></div>
                                 <div class='item-field end-time'><label>End time</label><input class='time endTime' type='text' name='endTime'  size='12'value="00:00:02.000" /></div>
                                 <div class='item-field show-for-time'><label>Show for</label><input class='showForTime' readonly type='text' size='12' value="00:00:02.000"/></div>
-                                <div class='item-field caption-text'><textarea name='captionText' placeholder='Caption' rows='2' ></textarea></div>
+                                <div class='item-field caption-text'><textarea class="captionText" name='captionText' placeholder='Caption' rows='2' ></textarea></div>
                                 <div class='remove-item'><i class='fa fa-times-circle'></i></div>
                             </fieldset>
                         </div>
@@ -189,7 +189,11 @@
                                     {% endfor %}
                                 </select>
 
+                                {% for videoTextTrackField in videoTextTrackFields %}
+                                    <input type="hidden" id="caption_{{ videoTextTrackField.meta_struct_id}}" value='{{ videoTextTrackField.value}}' name='databox_id'>
+                                {% endfor %}
                             </div>
+
                             <input type="hidden" value='{{ record.get_sbas_id() }}' name='databox_id'>
                             <input type="hidden" value='{{ record.get_record_id() }}' name='record_id'>
                         </form>
@@ -291,7 +295,12 @@
     >
     </iframe>
 </div>
-
+<style>
+    .editing>p {
+        color: #fff;
+        position: relative;
+    }
+</style>
 <script type="text/javascript">
     var toolsConfig = {
         selectionLength: {{ selectionLength }},
diff --git a/yarn.lock b/yarn.lock
index 45502fa2c7..eb4ea03d90 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7578,10 +7578,10 @@ phraseanet-common@^0.4.5-d:
     js-cookie "^2.1.0"
     pym.js "^1.3.1"
 
-phraseanet-production-client@0.34.226-d:
-  version "0.34.226-d"
-  resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.226-d.tgz#318e2f9170f43c8abe84b25c2229e575a2115026"
-  integrity sha512-T9B/Jj7S5/Ljt7tUEg4rklEi9tl75Mudiwn6yhJzKxfCdvZ/iy9QH4OwqVJ2ekGYKi4H8SBkhcra4q9CK5Vrjg==
+phraseanet-production-client@0.34.228-d:
+  version "0.34.228-d"
+  resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.228-d.tgz#91617c7d003b4fae508dee9990af05aad05a0ef9"
+  integrity sha512-Bxe3o8kRgsP3Ra3JStvING59b0Jxr9PiJ2CktogWJecAm4X1nx0UrnGY7gA01WalC+KJboT6r4Y8CbMdZr6MQw==
   dependencies:
     "@mapbox/mapbox-gl-language" "^0.9.2"
     "@turf/turf" "^5.1.6"