From 3700b1a1cee47fc33f38d812ac2ef9a5b8d71e19 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Fri, 20 Mar 2020 18:13:29 +0400 Subject: [PATCH 1/2] PHRAS-2978 fix on datepicker --- package.json | 2 +- templates/web/prod/WorkZone/Basket.html.twig | 18 +++++++++++------- yarn.lock | 16 ++++++---------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index 7ce6d01a66..72da160c5d 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.150-d", + "phraseanet-production-client": "0.34.154-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 9f9995d634..a307ba572b 100644 --- a/templates/web/prod/WorkZone/Basket.html.twig +++ b/templates/web/prod/WorkZone/Basket.html.twig @@ -111,7 +111,8 @@ - + +

{{ 'prod:workzone:basket:updated-message' | trans }}

@@ -150,13 +151,10 @@ basket_id: formData[0].value, date: formData[1].value }, - beforeSend: function() { - console.log(formData[0].value); - console.log(formData[1].value); - }, success: function (data) { $('.message').css('opacity',1); - $('.submit-validation').addClass('hidden'); + $('.submit-validation').addClass ('btn-not-shown'); + $('.cancel-date').addClass ('btn-not-shown'); setTimeout(function(){ $('.message').css('opacity',0); }, 2000); }, }); @@ -180,7 +178,13 @@ $(".feed-datepicker" ).datepicker( $.datepicker.regional[ 'default' ]); $(".feed-datepicker" ).change(function() { - $('.submit-validation').removeClass('hidden'); + $('.submit-validation').removeClass('btn-not-shown'); + $('.cancel-date').removeClass('btn-not-shown'); + }); + $(".cancel-date" ).click(function() { + $('.cancel-date').removeClass('btn-not-shown'); + $('.feed-datepicker').val('{{ dateExpired }}'); + setTimeout(function(){ $('.cancel-date').addClass('btn-not-shown');$('.submit-validation').addClass('btn-not-shown'); }, 1000); }) }) diff --git a/yarn.lock b/yarn.lock index 319e85d277..a3ddade4ad 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5305,14 +5305,10 @@ jquery-simplecolorpicker@^0.3.1: resolved "https://registry.yarnpkg.com/jquery-simplecolorpicker/-/jquery-simplecolorpicker-0.3.1.tgz#4f6befd380ab05470f585d5482e5180556e460eb" integrity sha1-T2vv04CrBUcPWF1UguUYBVbkYOs= -"jquery-treeview@git+https://github.com/alchemy-fr/jquery-treeview.git#1e9e5a49d2875b878801e904cd08c2d25e85af1e": - version "1.4.2" - resolved "git+https://github.com/alchemy-fr/jquery-treeview.git#1e9e5a49d2875b878801e904cd08c2d25e85af1e" - -"jquery-treeview@https://github.com/alchemy-fr/jquery-treeview.git": +"jquery-treeview@git+https://github.com/alchemy-fr/jquery-treeview.git", "jquery-treeview@git+https://github.com/alchemy-fr/jquery-treeview.git#1e9e5a49d2875b878801e904cd08c2d25e85af1e": version "1.4.2" uid "1e9e5a49d2875b878801e904cd08c2d25e85af1e" - resolved "https://github.com/alchemy-fr/jquery-treeview.git#1e9e5a49d2875b878801e904cd08c2d25e85af1e" + resolved "git+https://github.com/alchemy-fr/jquery-treeview.git#1e9e5a49d2875b878801e904cd08c2d25e85af1e" jquery-ui-datepicker-with-i18n@^1.10.4: version "1.10.4" @@ -7581,10 +7577,10 @@ phraseanet-common@^0.4.5-d: js-cookie "^2.1.0" pym.js "^1.3.1" -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== +phraseanet-production-client@0.34.154-d: + version "0.34.154-d" + resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.154-d.tgz#6a8da739582092b119ebc9bfb13b579387ad5022" + integrity sha512-X6eMwS6RYRYYSaEZVyhiIWjpGe+ko6eqrxGXqUOUN/F/TjCWcFTFZDL/e7gN59vSnz4nmtVYV31tX+j/V/0Dtw== dependencies: "@mapbox/mapbox-gl-language" "^0.9.2" "@turf/turf" "^5.1.6" From b6b2a4aae6b5d2030402282ff10887f903625d7b Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Mon, 23 Mar 2020 16:52:26 +0400 Subject: [PATCH 2/2] PHRAS-2978 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 72da160c5d..61e736233a 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.154-d", + "phraseanet-production-client": "0.34.156-d", "requirejs": "^2.3.5", "tinymce": "^4.0.28", "underscore": "^1.8.3", diff --git a/yarn.lock b/yarn.lock index a3ddade4ad..b2e5a90e77 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.154-d: - version "0.34.154-d" - resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.154-d.tgz#6a8da739582092b119ebc9bfb13b579387ad5022" - integrity sha512-X6eMwS6RYRYYSaEZVyhiIWjpGe+ko6eqrxGXqUOUN/F/TjCWcFTFZDL/e7gN59vSnz4nmtVYV31tX+j/V/0Dtw== +phraseanet-production-client@0.34.156-d: + version "0.34.156-d" + resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.156-d.tgz#a8a4773bf49eab663fd42b0e5bc41df039895292" + integrity sha512-bwlvQSnwB5GcCJYiQoXRUG2FAw3UYWC+q8/Bqa1/p65Wr8YZwUqVW0uzY20cctCnkUNLOxexa2wOPomjo4k9LQ== dependencies: "@mapbox/mapbox-gl-language" "^0.9.2" "@turf/turf" "^5.1.6"