PHRAS-2961 #comment Add: Prod workzone feedback : ending date #time 3h

resources/locales/validators.de.xlf

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
-  <file date="2020-02-27T14:59:20Z" source-language="en" target-language="de" datatype="plaintext" original="not.available">
+  <file date="2020-03-04T14:02:22Z" source-language="en" target-language="de" datatype="plaintext" original="not.available">
     <header>
       <tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
       <note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>

resources/locales/validators.en.xlf

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
-  <file date="2020-02-27T15:00:00Z" source-language="en" target-language="en" datatype="plaintext" original="not.available">
+  <file date="2020-03-04T14:02:31Z" source-language="en" target-language="en" datatype="plaintext" original="not.available">
     <header>
       <tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
       <note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>

resources/locales/validators.fr.xlf

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
-  <file date="2020-02-27T15:00:28Z" source-language="en" target-language="fr" datatype="plaintext" original="not.available">
+  <file date="2020-03-04T14:02:43Z" source-language="en" target-language="fr" datatype="plaintext" original="not.available">
     <header>
       <tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
       <note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>

resources/locales/validators.nl.xlf

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
-  <file date="2020-02-27T15:00:57Z" source-language="en" target-language="nl" datatype="plaintext" original="not.available">
+  <file date="2020-03-04T14:02:56Z" source-language="en" target-language="nl" datatype="plaintext" original="not.available">
     <header>
       <tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
       <note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>

templates/web/prod/Tooltip/Basket.html.twig

@@ -11,11 +11,19 @@
     <div style="margin:5px 0;max-height:160px;overflow:hidden;text-overflow:ellipsis;">
         {{ basket.getDescription()|nl2br }}
     </div>
-    <div style="margin:5px 0;text-align:right;font-style:italic;position:relative;">
+    <div style="margin:5px 0;font-style:italic;position:relative;width: 100%">
         {% set nb_records = basket.getElements()|length %}
         {% set date = app['date-formatter'].getPrettyString(basket.getUpdated()) %}
+        <span class="expiredDate" style="width: 40%; display: inline-block">
+        {% if basket.getValidation() %}
+        {% set dateExpired = app['date-formatter'].getPrettyString(basket.getValidation().getExpires()) %}
+                {{ 'workzone:feedback:expiration' | trans }} : {{ dateExpired }}
+        {% endif %}
+              </span>
+        <div style="text-align:right;width: 50%;display: inline-block">
             {% trans with {'%nb_records%' : nb_records} %}%nb_records% records{% endtrans %}
             - {{ date }}
+        </div>
         <hr/>
         <div style="position:relative;float:left;width:470px;">
         {% for element in basket.getElements() %}

templates/web/prod/WorkZone/Basket.html.twig

@@ -88,8 +88,12 @@
             {% endfor %}
         {% endif %}
     </div>
+    {% if basket.getValidation() %}
+    {% set dateExpired = app['date-formatter'].getPrettyString(basket.getValidation().getExpires()) %}
+    <span class="expiredDate" style="float: right; padding: 8px;margin-top: -39px;">
+        {{ 'workzone:feedback:expiration' | trans }} : {{ dateExpired }}</span>
+    {% endif %}
 </div>
-<div class="basket-content">
     {% 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>
 {% if basket_length == 0 %}
@@ -102,6 +106,7 @@
 
     {% if basket.getValidation() %}
         {{ Macros.display_validation(app, basket, ordre) }}
+
 {% else %}
     {{ Macros.display_basket(app, basket) }}
 {% endif %}

templates/web/prod/WorkZone/Macros.html.twig

@@ -37,10 +37,11 @@
     {% set content = WorkZone.getContent(srt) %}
       <div id="validations-block" class="validations-block">
     {% for basket in content.get(constant('\\Alchemy\\Phrasea\\Helper\\WorkZone::VALIDATIONS')) %}
+
         <div tooltipsrc="{{ path('prod_tooltip_basket', { 'basket' : basket.getId() }) }}"
              id="SSTT_{{basket.getId()}}"
              class="basketTips ui-accordion-header ui-state-default
-                    ui-corner-all header SSTT basket {% if not basket.isRead() %}unread{% endif %}
+                    ui-corner-all header SSTT basket {% if not basket.getId() %}unread{% endif %}
                     {% if basket.getId() == selected_id and selected_type == 'basket' %}active{% endif %}">
           <a class="workzone-menu-title" href="{{ path('prod_baskets_basket', { 'basket' : basket.getId() }) }}">
             <span>
@@ -52,6 +53,7 @@
               {{basket.getName()|e}}
             </span>
           </a>
+
           <div class="menu">
               <table>
                   <tr>
@@ -113,6 +115,7 @@
       </div>
       <div id="all_baskets-block" class="all_baskets-block">
     {% for basket in content.get(constant('\\Alchemy\\Phrasea\\Helper\\WorkZone::BASKETS')) %}
+
         <div tooltipsrc="{{ path('prod_tooltip_basket', { 'basket' : basket.getId() }) }}"
              id="SSTT_{{basket.getId()}}"
              class="basketTips ui-accordion-header ui-state-default