From 101643b65ee90ed316ae879e2e6ef781f1b82ebf Mon Sep 17 00:00:00 2001
From: Armand Bahi <armand.bahi@veremes.com>
Date: Mon, 18 Feb 2019 12:27:28 +0100
Subject: [PATCH] =?UTF-8?q?Probl=C3=A8me=20d'affichage=20des=20images=20so?=
 =?UTF-8?q?us=20Firefox=20Charger=20l'image=20compl=C3=A8te=20uniquement?=
 =?UTF-8?q?=20au=20t=C3=A9l=C3=A9chargement?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../component/file_picker/file_picker.css     |  3 +++
 .../component/file_picker/file_picker.js      | 23 +------------------
 .../class/vmlib/files/Files_manager.class.inc |  8 +++++++
 src/vitis/vas/rest/conf/properties_server.inc |  2 ++
 4 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/src/vitis/client/javascript/externs/formReader/component/file_picker/file_picker.css b/src/vitis/client/javascript/externs/formReader/component/file_picker/file_picker.css
index a759ec8a..14bac1a0 100644
--- a/src/vitis/client/javascript/externs/formReader/component/file_picker/file_picker.css
+++ b/src/vitis/client/javascript/externs/formReader/component/file_picker/file_picker.css
@@ -81,12 +81,15 @@
     height: 90px !important;
 }
 .modal-image-zone {
+    text-align: center;
     max-height: 600px;
     overflow-y: auto;
 }
 .modal-image-zone > img {
     height: auto;
     width: 100%;
+    max-width: 350px;
+    max-height: 350px;
 }
 
 .file_picker .container {
diff --git a/src/vitis/client/javascript/externs/formReader/component/file_picker/file_picker.js b/src/vitis/client/javascript/externs/formReader/component/file_picker/file_picker.js
index b53261f0..d10ffff7 100644
--- a/src/vitis/client/javascript/externs/formReader/component/file_picker/file_picker.js
+++ b/src/vitis/client/javascript/externs/formReader/component/file_picker/file_picker.js
@@ -546,27 +546,6 @@ nsVitisComponent.FilePickerDirective = function ($timeout, $translate, propertie
             scope['showImageModal'] = function(oImage, oBlob) {
                 $log.log("formReader.FilePickerDirective.showImageModal");
 
-                // Téléchargement image grande si thumbnail
-                if (goog.isDefAndNotNull(oImage._url) && oImage._thumbnail === true) {
-                    scope['downloadFileBlob'](oImage._url, false, 3).then(function(oBlob){
-                        var picReader = new FileReader();
-                        picReader.addEventListener('load', angular.bind(this, function (oBlob, event) {
-                            var picFile = event.target;
-                            scope.$applyAsync(function(){
-                                scope['showImageModal']({
-                                    'name': oBlob['name'],
-                                    'src': picFile['result'],
-                                    _url: oBlob._url,
-                                    _thumbnail: oBlob._thumbnail
-                                }, oBlob);
-                            });
-                        }, oBlob));
-                        picReader.readAsDataURL(oBlob);
-
-                    });
-                    return 0;
-                }
-
                 var iImageIndex;
                 for (var i = 0; i < scope['aPreviewImages'].length; i++) {
                     if(scope['aPreviewImages'][i]['name'] === oImage['name']){
@@ -590,7 +569,7 @@ nsVitisComponent.FilePickerDirective = function ($timeout, $translate, propertie
                  * Téléchargement de l'image
                  */
                 $(domDownloadButton).click(function(){
-                    scope['downloadFile'](oImage, oBlob);
+                    scope['downloadDocument'](oImage);
                 });
 
                 /**
diff --git a/src/vitis/vas/rest/class/vmlib/files/Files_manager.class.inc b/src/vitis/vas/rest/class/vmlib/files/Files_manager.class.inc
index 81dbcc40..107b1f23 100644
--- a/src/vitis/vas/rest/class/vmlib/files/Files_manager.class.inc
+++ b/src/vitis/vas/rest/class/vmlib/files/Files_manager.class.inc
@@ -363,6 +363,14 @@ class Files_manager{
                 $aThumbnailFileStruct = $aFileStruct;
                 $aThumbnailFileStruct["width"] = 200;
                 $aThumbnailFileStruct["height"] = 200;
+
+                if (is_int($this->oProperties['filesystem_thumbnails_width'])) {
+                    $aThumbnailFileStruct["width"] = $this->oProperties['filesystem_thumbnails_width'];
+                }
+                if (is_int($this->oProperties['filesystem_thumbnails_height'])) {
+                    $aThumbnailFileStruct["height"] = $this->oProperties['filesystem_thumbnails_height'];
+                }
+
                 $aThumbnailFileStruct['tmp_name'] = $aThumbnailFileStruct['tmp_name'] . '.min';
                 $aDestPathExt = explode('.', $sDestPath);
 
diff --git a/src/vitis/vas/rest/conf/properties_server.inc b/src/vitis/vas/rest/conf/properties_server.inc
index 494c13e6..e14c4eb7 100644
--- a/src/vitis/vas/rest/conf/properties_server.inc
+++ b/src/vitis/vas/rest/conf/properties_server.inc
@@ -49,6 +49,8 @@ $properties["notifierAccessKeyAccount"] = "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 $properties["notifierSecretKeyAccount"] = "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX";
 // utilisation de s3 pour remplacer le système de Fichier
 $properties['filesystem'] = 'fs'; // s3
+$properties['filesystem_thumbnails_width'] = 350; // taille des images .min.jpg
+$properties['filesystem_thumbnails_height'] = 350; // taille des images .min.jpg
 $properties['AWSCredentialsFilePath'] = ""; // .../.aws/credentials
 $properties["fileS3UploaderProfil"] = "";
 $properties["fileS3UploaderBucket"] = "";
-- 
GitLab