hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 09:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

PHRAS-2978-add feedback creation date on workzone feedback

Browse Source
This commit is contained in:
Harrys Ravalomanana
2020-03-16 15:46:41 +04:00
parent 947bc734ac
commit 56f6eb83e3
3 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -65,7 +65,7 @@
"normalize-css": "^2.1.0", "normalize-css": "^2.1.0",
"npm": "^6.0.0", "npm": "^6.0.0",
"npm-modernizr": "^2.8.3", "npm-modernizr": "^2.8.3",
"phraseanet-production-client": "0.34.149-d", "phraseanet-production-client": "0.34.150-d",
"requirejs": "^2.3.5", "requirejs": "^2.3.5",
"tinymce": "^4.0.28", "tinymce": "^4.0.28",
"underscore": "^1.8.3", "underscore": "^1.8.3",

32
templates/web/prod/WorkZone/Basket.html.twig
View File

@@ -90,18 +90,28 @@
{% endif %} {% endif %}
</div> </div>
{% if basket.getValidation() %} {% if basket.getValidation() %}
{% set dateExpired = app['date-formatter'].getPrettyString(basket.getValidation().getExpires()) %} <div class="feedback-info">
<div class="expiredDate" style="float: right; padding: 8px;margin-top: -39px;"> {% set nb_records = basket.getElements()|length %}
{{ 'workzone:feedback:expiration' | trans }} : {% set date = app['date-formatter'].getPrettyString(basket.getUpdated()) %}
<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>
{% 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> </div>
{% set basket_length = basket.getElements()|length %} {% 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> <div class="alert_datas_changed ui-corner-all">{{ 'Certaines donnees du panier ont change' | trans }} <a class="basket_refresher" href="#">{{ 'rafraichir' | trans }}</a></div>

8
yarn.lock
View File

@@ -7577,10 +7577,10 @@ phraseanet-common@^0.4.5-d:
js-cookie "^2.1.0" js-cookie "^2.1.0"
pym.js "^1.3.1" pym.js "^1.3.1"
phraseanet-production-client@0.34.149-d: phraseanet-production-client@0.34.150-d:
version "0.34.149-d" version "0.34.150-d"
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.149-d.tgz#e486bbe160861d259b005c7b549d8f1ea08cd82d" resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.150-d.tgz#625ea96c045719b405fe9b707b632b1290aca285"
integrity sha512-7aXn1WWcALhuruiz8dkLS67Z6MNkQZoxoehCE7iRdnIDRzKioYQ1wycia4MtxyL+4S5XZZb39HIunvdxGsgDSQ== integrity sha512-JrtPq6dCTCBxX6kGViXZj4Sc26PMFIaifT3PVD1WHLUCNd/U3nnHzpzKUgVC0ibqOj4aVwA8JW/oMilGEe3cmg==
dependencies: dependencies:
"@mapbox/mapbox-gl-language" "^0.9.2" "@mapbox/mapbox-gl-language" "^0.9.2"
"@turf/turf" "^5.1.6" "@turf/turf" "^5.1.6"