From 56f6eb83e3d52a654287d4214045c31f016026b7 Mon Sep 17 00:00:00 2001
From: Harrys Ravalomanana <hra@esokia.com>
Date: Mon, 16 Mar 2020 15:46:41 +0400
Subject: [PATCH] PHRAS-2978-add feedback creation date on workzone feedback

---
 package.json                                 |  2 +-
 templates/web/prod/WorkZone/Basket.html.twig | 32 +++++++++++++-------
 yarn.lock                                    |  8 ++---
 3 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/package.json b/package.json
index 70d1fbaddb..7ce6d01a66 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.149-d",
+    "phraseanet-production-client": "0.34.150-d",
     "requirejs": "^2.3.5",
     "tinymce": "^4.0.28",
     "underscore": "^1.8.3",
diff --git a/templates/web/prod/WorkZone/Basket.html.twig b/templates/web/prod/WorkZone/Basket.html.twig
index ef0f52f980..fb028812d5 100644
--- a/templates/web/prod/WorkZone/Basket.html.twig
+++ b/templates/web/prod/WorkZone/Basket.html.twig
@@ -90,18 +90,28 @@
         {% endif %}
     </div>
     {% if basket.getValidation() %}
-    {% set dateExpired = app['date-formatter'].getPrettyString(basket.getValidation().getExpires()) %}
-    <div class="expiredDate" style="float: right; padding: 8px;margin-top: -39px;">
-        {{ 'workzone:feedback:expiration' | trans }} :
-        <form class="update-feed-validation">
-            <input type="hidden" name="feedback-id" value={{ basket.getValidation().getId}} />
-            <input type="hidden" name="feedback-deadline-format" class="alternate" />
-        <input type="text" class="btn datepicker" name="feedback-deadline" value="{{ dateExpired }}">
-            <button type="submit" class="submit">{{ 'workzone:feedback:update' | trans }}</button>
-        </form>
-    </div>
+        <div class="feedback-info">
+            {% set nb_records = basket.getElements()|length %}
+            {% set date = app['date-formatter'].getPrettyString(basket.getUpdated()) %}
 
-    {% endif %}
+            <p class="create-date">
+                {{ 'prod:workzone:basket:creation-date' | trans }} : {{ date }}
+            </p>
+            <div class="record-number">  {% trans with {'%nb_records%' : nb_records} %}%nb_records% records{% endtrans %}</div>
+
+            {% set dateExpired = app['date-formatter'].getPrettyString(basket.getValidation().getExpires()) %}
+            <div class="expiredDate">
+                <span>{{ 'workzone:feedback:expiration' | trans }} :</span>
+                <form class="update-feed-validation">
+                    <input type="hidden" name="feedback-id" value={{ basket.getValidation().getId}} />
+                    <input type="hidden" name="feedback-deadline-format" class="alternate" />
+                <input type="text" class="btn datepicker" name="feedback-deadline" value="{{ dateExpired }}">
+                    <button type="submit" class="submit" title="{{ 'workzone:feedback:update' | trans }}"><i class="fa fa-save"></i></button>
+                </form>
+            </div>
+
+            {% endif %}
+        </div>
 </div>
     {% set basket_length = basket.getElements()|length %}
     <div class="alert_datas_changed ui-corner-all">{{ 'Certaines donnees du panier ont change' | trans }} <a class="basket_refresher" href="#">{{ 'rafraichir' | trans }}</a></div>
diff --git a/yarn.lock b/yarn.lock
index 98775d43a0..4af2ac395c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7577,10 +7577,10 @@ phraseanet-common@^0.4.5-d:
     js-cookie "^2.1.0"
     pym.js "^1.3.1"
 
-phraseanet-production-client@0.34.149-d:
-  version "0.34.149-d"
-  resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.149-d.tgz#e486bbe160861d259b005c7b549d8f1ea08cd82d"
-  integrity sha512-7aXn1WWcALhuruiz8dkLS67Z6MNkQZoxoehCE7iRdnIDRzKioYQ1wycia4MtxyL+4S5XZZb39HIunvdxGsgDSQ==
+phraseanet-production-client@0.34.150-d:
+  version "0.34.150-d"
+  resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.150-d.tgz#625ea96c045719b405fe9b707b632b1290aca285"
+  integrity sha512-JrtPq6dCTCBxX6kGViXZj4Sc26PMFIaifT3PVD1WHLUCNd/U3nnHzpzKUgVC0ibqOj4aVwA8JW/oMilGEe3cmg==
   dependencies:
     "@mapbox/mapbox-gl-language" "^0.9.2"
     "@turf/turf" "^5.1.6"