From d1d1181a69d86ed3861147bfc3d740a35819dc9f Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Tue, 17 Mar 2020 16:52:03 +0400 Subject: [PATCH 1/7] PHRAS-2989 #comment Fix on Prod detailled view basket #time 3h --- package.json | 2 +- templates/web/prod/preview/appears_in.html.twig | 8 ++++---- yarn.lock | 16 ++++++---------- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index 7ce6d01a66..a989fc4cec 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.152-d", "requirejs": "^2.3.5", "tinymce": "^4.0.28", "underscore": "^1.8.3", diff --git a/templates/web/prod/preview/appears_in.html.twig b/templates/web/prod/preview/appears_in.html.twig index e6087d49ab..7ebf3e5aaa 100644 --- a/templates/web/prod/preview/appears_in.html.twig +++ b/templates/web/prod/preview/appears_in.html.twig @@ -27,15 +27,15 @@ {##} {% if basket.getValidation() %} - + {% elseif basket.getPusher() %} {% if not basket.isRead() %} - + {% else %} - + {% endif %} {% else %} - + {% endif %} {{basket.getName()}} diff --git a/yarn.lock b/yarn.lock index 319e85d277..e34a5585e5 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.152-d: + version "0.34.152-d" + resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.152-d.tgz#ac2165ee1173e61789847c2b578e479bde737e86" + integrity sha512-e1+cskYWg+qNc4OSs/M9NOnBkJJpeceOGv7a6wyvw1PK/Cezv4Fp9I7apVNJov4G9agyptndzFeQfmM3fQm6YA== dependencies: "@mapbox/mapbox-gl-language" "^0.9.2" "@turf/turf" "^5.1.6" From 28766799be70371296b92339ff79a5263071cf70 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Thu, 19 Mar 2020 17:23:24 +0400 Subject: [PATCH 2/7] PHRAS-2989 fix dblclick on view details --- package.json | 2 +- templates/web/prod/preview/appears_in.html.twig | 2 +- yarn.lock | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index a989fc4cec..77a463333a 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.152-d", + "phraseanet-production-client": "0.34.153-d", "requirejs": "^2.3.5", "tinymce": "^4.0.28", "underscore": "^1.8.3", diff --git a/templates/web/prod/preview/appears_in.html.twig b/templates/web/prod/preview/appears_in.html.twig index 7ebf3e5aaa..988bcde86d 100644 --- a/templates/web/prod/preview/appears_in.html.twig +++ b/templates/web/prod/preview/appears_in.html.twig @@ -23,7 +23,7 @@ data-position="0" data-id="{{basket.getId()}}" data-reload="true" - class="otherBaskToolTip open-preview-action" title="{{basket.getDescription()}}"> + class="otherBaskToolTip to-open-preview-action" title="{{basket.getDescription()}}"> {##} {% if basket.getValidation() %} diff --git a/yarn.lock b/yarn.lock index e34a5585e5..442ca700e1 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.152-d: - version "0.34.152-d" - resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.152-d.tgz#ac2165ee1173e61789847c2b578e479bde737e86" - integrity sha512-e1+cskYWg+qNc4OSs/M9NOnBkJJpeceOGv7a6wyvw1PK/Cezv4Fp9I7apVNJov4G9agyptndzFeQfmM3fQm6YA== +phraseanet-production-client@0.34.153-d: + version "0.34.153-d" + resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.153-d.tgz#3014c7345cad2f3f106975805e5b8db5e8db3d56" + integrity sha512-IX5oVB4MmI/PE9iDkeuuXdjfoJd4q4SdFxHuGLswyT0PWxZhIzLT7D2zNc77ULpcnX9KnvCs6wIEIn4UbKC0pQ== dependencies: "@mapbox/mapbox-gl-language" "^0.9.2" "@turf/turf" "^5.1.6" From 3700b1a1cee47fc33f38d812ac2ef9a5b8d71e19 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Fri, 20 Mar 2020 18:13:29 +0400 Subject: [PATCH 3/7] 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 769185952c35afdd8d0a1658da5a5736adb2ee6f Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Mon, 23 Mar 2020 15:52:25 +0400 Subject: [PATCH 4/7] PHRAS-2989 Fix on detailled view --- package.json | 2 +- templates/web/prod/preview/short_history.html.twig | 6 ++---- yarn.lock | 8 ++++---- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 77a463333a..ee2864e6dc 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.153-d", + "phraseanet-production-client": "0.34.155-d", "requirejs": "^2.3.5", "tinymce": "^4.0.28", "underscore": "^1.8.3", diff --git a/templates/web/prod/preview/short_history.html.twig b/templates/web/prod/preview/short_history.html.twig index 646192e60a..d1c701f2f0 100644 --- a/templates/web/prod/preview/short_history.html.twig +++ b/templates/web/prod/preview/short_history.html.twig @@ -8,7 +8,7 @@
{% set appbox = '' %} -
+
{% if action == 'push' %} {% set n_user = done['final']|length %} {% set appbox = '' ~ site %} @@ -63,11 +63,9 @@ {% endif %} +

{{hour}}

-
{{hour}}
- - {% endfor %} {% endfor %} {% endfor %} diff --git a/yarn.lock b/yarn.lock index 442ca700e1..cfe7f9b1a1 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.153-d: - version "0.34.153-d" - resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.153-d.tgz#3014c7345cad2f3f106975805e5b8db5e8db3d56" - integrity sha512-IX5oVB4MmI/PE9iDkeuuXdjfoJd4q4SdFxHuGLswyT0PWxZhIzLT7D2zNc77ULpcnX9KnvCs6wIEIn4UbKC0pQ== +phraseanet-production-client@0.34.155-d: + version "0.34.155-d" + resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.155-d.tgz#1d02a0843de96190b2fc49c2b45bfd2b33f415e5" + integrity sha512-wL6DnJIYLbQ67bZiZitQruYEeVbPo0Ks1kddMBjCMB7Qe+bhK+RO/XmVYL1k+xNVr++gx5xQB6EDtKR9DIXM9A== 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 5/7] 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" From dc312296fe29f09731a1c0262fd9ec4ff446244e Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Mon, 23 Mar 2020 17:00:47 +0400 Subject: [PATCH 6/7] PHRAS-2989 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index ee2864e6dc..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.155-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 cfe7f9b1a1..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.155-d: - version "0.34.155-d" - resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.155-d.tgz#1d02a0843de96190b2fc49c2b45bfd2b33f415e5" - integrity sha512-wL6DnJIYLbQ67bZiZitQruYEeVbPo0Ks1kddMBjCMB7Qe+bhK+RO/XmVYL1k+xNVr++gx5xQB6EDtKR9DIXM9A== +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" From 30f2d2824f0b431960c6a61d53bc79278d5a47dd Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Mon, 23 Mar 2020 18:20:56 +0400 Subject: [PATCH 7/7] PHRAS-2978 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 61e736233a..2feaa7872f 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.156-d", + "phraseanet-production-client": "0.34.157-d", "requirejs": "^2.3.5", "tinymce": "^4.0.28", "underscore": "^1.8.3", diff --git a/yarn.lock b/yarn.lock index b2e5a90e77..6fe2b00b43 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.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== +phraseanet-production-client@0.34.157-d: + version "0.34.157-d" + resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.157-d.tgz#c304fe249da95361efedaa1f54925af72a3edd16" + integrity sha512-cNqm/VFyeEhEtCfYt9/xaxHjGoBVs/Q7OMMKdrIrC4WIuzZoRnBUQxDnaUAhwbmz6WrzG8bjQnUiG4IIqiqlRQ== dependencies: "@mapbox/mapbox-gl-language" "^0.9.2" "@turf/turf" "^5.1.6"