Merge pull request #754 from GeotrekCE/suricate-add-file

LePetitTim · web-flow · commit f5a64ecf148b · 2020-07-01T15:52:06.000+02:00
Suricate add file
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,10 +1,16 @@
 2.24.1dev0
-===================
+==========
 
 **Enhancements**
 
+* Add support for Suricate options in warning form
+* Add activity and magnitude problem fields in warning form
+* Get options list (magnitude problem, activities, categories) from endpoint
+**Warning:** these features are only available for Geotrek-admin >= 2.32.12
+
 **Bug fixes**
 
+* 
 
 2.24.0 / 2020-04-28
 ===================
@@ -18,6 +24,12 @@
 * Add translation file for portugese
 * Fix some translation error
 
+* Add support for Suricate options in warning form
+    - add activity and magnitude problem fields
+    - get options list from endpoint
+    - display activity and magnitude only if options list is available from API
+    **Warning:** this feature is only available for Geotrek-admin >= 2.32.12
+
 **Bug fixes**
 
 * Fix open PDF from POI and detail page
diff --git a/docs/settings-custom-json-all-options.md b/docs/settings-custom-json-all-options.md
@@ -210,6 +210,7 @@ DEM_FILE | "dem.json" | DEM file
 PROFILE_FILE | "profile.json" | Profile file
 WARNING_CAT_DIR | "feedback" | Warning catefories dir file
 WARNING_CAT_FILE | "categories.json" | Warning categories file
+WARNING_OPT_FILE | "options.json" | Warning options file (for Suricate support)
 WARNING_SUBMIT_URL | "reports/report" | Warning submit URL
 STYLES_CONFIG_FILE | "styles.json" | Custom styles variables
 APPROVED_BIG | "images/approved-big.png" | Default big image for approved label (for detail page)
diff --git a/src/app/config/factories.js b/src/app/config/factories.js
@@ -19,6 +19,7 @@ function settingsFactory(globalSettings) {
         divesUrl =  globalSettings.API_URL + '/' + globalSettings.API_DIR + '/$lang/' + globalSettings.DIVES_FILE,
         flatUrl =  globalSettings.API_URL + '/' + globalSettings.API_DIR + '/$lang/' + globalSettings.FLAT_FILE,
         warningCategoriesUrl =  globalSettings.API_URL + '/' + globalSettings.API_DIR + '/$lang/' + globalSettings.WARNING_CAT_DIR + '/' + globalSettings.WARNING_CAT_FILE,
+        warningOptionsUrl =  globalSettings.API_URL + '/' + globalSettings.API_DIR + '/$lang/' + globalSettings.WARNING_CAT_DIR + '/' + globalSettings.WARNING_OPT_FILE,
         warningSubmitUrl =  globalSettings.BACKOFFICE_URL + '/' + globalSettings.API_DIR + '/$lang/' + globalSettings.WARNING_SUBMIT_URL,
         stylesConfigUrl = globalSettings.BACKOFFICE_URL + '/' + globalSettings.API_DIR + '/$lang/' + globalSettings.STYLES_CONFIG_FILE,
         sensitiveUrl = globalSettings.API_URL + '/' + globalSettings.API_DIR + '/$lang/' + globalSettings.SENSITIVE_FILE,
@@ -54,6 +55,7 @@ function settingsFactory(globalSettings) {
         divesUrl: divesUrl,
         flatUrl: flatUrl,
         warningCategoriesUrl: warningCategoriesUrl,
+        warningOptionsUrl: warningOptionsUrl,
         warningSubmitUrl: warningSubmitUrl,
         stylesConfigUrl: stylesConfigUrl,
         sensitiveUrl: sensitiveUrl,
diff --git a/src/app/config/settings.default.json b/src/app/config/settings.default.json
@@ -139,6 +139,7 @@
     "PROFILE_FILE": "profile.json",
     "WARNING_CAT_DIR": "feedback",
     "WARNING_CAT_FILE": "categories.json",
+    "WARNING_OPT_FILE": "options.json",
     "WARNING_SUBMIT_URL": "reports/report",
     "STYLES_CONFIG_FILE": "styles.json",
     "APPROVED_BIG": "images/approved-big.png",
diff --git a/src/app/translation/po/ca.po b/src/app/translation/po/ca.po
@@ -323,9 +323,15 @@ msgstr ""
 msgid "FORM_EMAIL"
 msgstr "Correu electrònic"
 
+msgid "FORM_ACTIVITY"
+msgstr "Activitia"
+
 msgid "FORM_CATEGORY"
 msgstr "Categoria"
 
+msgid "FORM_MAGNITUDE_PROBLEM"
+msgstr ""
+
 msgid "FORM_COMMENT"
 msgstr "Comentari"
 
diff --git a/src/app/translation/po/de.po b/src/app/translation/po/de.po
@@ -357,9 +357,15 @@ msgstr ""
 msgid "FORM_EMAIL"
 msgstr "Email"
 
+msgid "FORM_ACTIVITY"
+msgstr "Aktivität"
+
 msgid "FORM_CATEGORY"
 msgstr "Kategorie"
 
+msgid "FORM_MAGNITUDE_PROBLEM"
+msgstr "Ausmaß des Problems"
+
 msgid "FORM_COMMENT"
 msgstr "Kommentar"
 
diff --git a/src/app/translation/po/en.po b/src/app/translation/po/en.po
@@ -371,9 +371,15 @@ msgstr "These information will be used by {{ organisation }}, "
 msgid "FORM_EMAIL"
 msgstr "Email"
 
+msgid "FORM_ACTIVITY"
+msgstr "Activity"
+
 msgid "FORM_CATEGORY"
 msgstr "Category"
 
+msgid "FORM_MAGNITUDE_PROBLEM"
+msgstr "Magnitude of the problem"
+
 msgid "FORM_COMMENT"
 msgstr "Comment"
 
@@ -383,6 +389,9 @@ msgstr "Location (clic on map to place the mark)"
 msgid "FORM_SEND"
 msgstr "Send"
 
+msgid "FORM_PICTURES"
+msgstr "Photography"
+
 msgid "KML"
 msgstr "Download the KML file"
 
diff --git a/src/app/translation/po/es.po b/src/app/translation/po/es.po
@@ -332,9 +332,15 @@ msgstr ""
 msgid "FORM_EMAIL"
 msgstr "Correo electrónico"
 
+msgid "FORM_ACTIVITY"
+msgstr "Actividad"
+
 msgid "FORM_CATEGORY"
 msgstr "Categoría"
 
+msgid "FORM_MAGNITUDE_PROBLEM"
+msgstr "Magnitud del problema"
+
 msgid "FORM_COMMENT"
 msgstr "Comentario"
 
@@ -344,6 +350,9 @@ msgstr "Paradero (hacer clic sobre la mapa para posicionar el cursor)"
 msgid "FORM_SEND"
 msgstr "Informar"
 
+msgid "FORM_PICTURES"
+msgstr "Fotografía"
+
 msgid "KML"
 msgstr "Descargar fichero KML"
 
diff --git a/src/app/translation/po/fr.po b/src/app/translation/po/fr.po
@@ -357,9 +357,15 @@ msgstr ""
 msgid "FORM_EMAIL"
 msgstr "Email"
 
+msgid "FORM_ACTIVITY"
+msgstr "Activité"
+
 msgid "FORM_CATEGORY"
 msgstr "Catégorie"
 
+msgid "FORM_MAGNITUDE_PROBLEM"
+msgstr "Ampleur du problème"
+
 msgid "FORM_COMMENT"
 msgstr "Commentaire"
 
@@ -369,6 +375,9 @@ msgstr "Emplacement (cliquez sur la carte pour positionner le marqueur)"
 msgid "FORM_SEND"
 msgstr "Signaler"
 
+msgid "FORM_PICTURES"
+msgstr "Photographies"
+
 msgid "KML"
 msgstr "Télécharger la fiche KML"
 
diff --git a/src/app/translation/po/it.po b/src/app/translation/po/it.po
@@ -357,8 +357,17 @@ msgstr ""
 msgid "FORM_EMAIL"
 msgstr ""
 
+msgid "FORM_PICTURES"
+msgstr "Fotografia"
+
+msgid "FORM_ACTIVITY"
+msgstr "Attività"
+
 msgid "FORM_CATEGORY"
-msgstr ""
+msgstr "Categoria"
+
+msgid "FORM_MAGNITUDE_PROBLEM"
+msgstr "Entità del problema"
 
 msgid "FORM_COMMENT"
 msgstr ""
diff --git a/src/app/translation/po/nl.po b/src/app/translation/po/nl.po
@@ -357,9 +357,15 @@ msgstr ""
 msgid "FORM_EMAIL"
 msgstr "E-mail"
 
+msgid "FORM_ACTIVITY"
+msgstr "Activiteit"
+
 msgid "FORM_CATEGORY"
 msgstr "Categorie"
 
+msgid "FORM_MAGNITUDE_PROBLEM"
+msgstr "Omvang van het probleem"
+
 msgid "FORM_COMMENT"
 msgstr "Commentaar"
 
diff --git a/src/app/warning/controllers.js b/src/app/warning/controllers.js
@@ -1,6 +1,6 @@
 'use strict';
 
-function WarningPanelController($scope, $rootScope, $q, resultsService, WarningService, WarningMapService, utilsFactory) {
+function WarningPanelController($scope, $rootScope, $q, resultsService, WarningService, WarningMapService, utilsFactory, globalSettings) {
 
     var onMap = false;
 
@@ -65,18 +65,46 @@ function WarningPanelController($scope, $rootScope, $q, resultsService, WarningS
                 });
         }
     };
+
+    $scope.sendWarningPictures = function sendWarningPictures () {
+        if ($scope.warningForm.$valid) {
+            WarningService.sendWarningPictures($scope.warning)
+                .then(function (answer) {
+                    $scope.warningStatus = 'success';
+                })
+                .catch(function (err) {
+                    $scope.warningStatus = 'error';
+                });
+        }
+    };
     var rootScopeEvents = [];
 
     rootScopeEvents.push(
         $rootScope.$on('showWarningPanel', function (event, args) {
+            var options = {};
             $scope.result = args.result;
+            $scope.warningStatus = null;
+            $scope.warning = {};
+            $scope.warning.location = utilsFactory.getStartPoint($scope.result);
             WarningService.getWarningCategories()
                 .then(function (categories) {
-                    $scope.warningStatus = null;
-                    $scope.warning = {};
-                    $scope.warning.location = utilsFactory.getStartPoint($scope.result);
-                    $scope.warningCategories = categories;
-                    $scope.warning.category = categories[0].id.toString();
+                    $scope.hasAllOptions = categories.hasOwnProperty('activities')
+                    if ($scope.hasAllOptions) {
+                        options = categories;
+                        $scope.warningCategories = options.categories;
+                        $scope.warning.category = options.categories[0].id.toString();
+                        $scope.warningActivities = options.activities;
+                        if (options.activities.length !== 0) {
+                            $scope.warning.activity = options.activities[0].id.toString();
+                        }
+                        $scope.warningMagnitudeProblems = options.magnitudeProblems;
+                        if (options.magnitudeProblems.length !== 0) {
+                            $scope.warning.magnitudeProblem = options.magnitudeProblems[0].id.toString();
+                        }
+                    } else {
+                        $scope.warningCategories = categories;
+                        $scope.warning.category = categories[0].id.toString();
+                    }
                     WarningMapService.getMap('warning-map', $scope.result);
                     WarningMapService.addCallback(updateLocation);
                     updateMapWithDetails(true);
diff --git a/src/app/warning/directives.js b/src/app/warning/directives.js
@@ -10,6 +10,22 @@ function warningPanelDirective() {
     };
 }
 
+function fileReadDirective() {
+    return {
+        scope: {
+            fileread: "="
+        },
+        link: function (scope, element, attributes) {
+            element.bind("change", function (changeEvent) {
+                scope.$apply(function () {
+                    scope.fileread = changeEvent.target.files[0];
+                });
+            });
+        }
+    }
+}
+
 module.exports = {
-    warningPanelDirective: warningPanelDirective
+    warningPanelDirective: warningPanelDirective,
+    fileReadDirective: fileReadDirective
 };
diff --git a/src/app/warning/index.js b/src/app/warning/index.js
@@ -2,6 +2,7 @@
 
 angular.module('rando.warning', [])
     .controller('WarningPanelController', require('./controllers').WarningPanelController)
+    .directive('fileread', require('./directives').fileReadDirective)
     .directive('warningPanel', require('./directives').warningPanelDirective)
     .service('WarningService', require('./services').WarningService)
     .service('WarningMapService', require('./services').WarningMapService);
diff --git a/src/app/warning/services.js b/src/app/warning/services.js
@@ -1,6 +1,6 @@
 'use strict';
 
-function WarningService(translationService, settingsFactory, $resource, $http, $q) {
+function WarningService(translationService, settingsFactory, globalSettings, $resource, $http, $q) {
     var self = this;
 
     this.getWarningCategories = function getWarningCategories (forceRefresh) {
@@ -12,11 +12,12 @@ function WarningService(translationService, settingsFactory, $resource, $http, $
 
         } else {
             var currentLang = translationService.getCurrentLang();
-            var url = settingsFactory.warningCategoriesUrl.replace(/\$lang/, currentLang);
-            var requests = $resource(url, {}, {
+            var urlOptions = settingsFactory.warningOptionsUrl.replace(/\$lang/, currentLang);
+            var urlCategories = settingsFactory.warningCategoriesUrl.replace(/\$lang/, currentLang);
+            var requests = $resource(urlOptions, {}, {
                 query: {
                     method: 'GET',
-                    isArray: true,
+                    isArray: false,
                     cache: true
                 }
             }, {stripTrailingSlashes: false});
@@ -26,6 +27,21 @@ function WarningService(translationService, settingsFactory, $resource, $http, $
                     var categories = angular.fromJson(data);
                     self._warningCategories = categories;
                     deferred.resolve(categories);
+                }, function() {
+                    var requests = $resource(urlCategories, {}, {
+                        query: {
+                            method: 'GET',
+                            isArray: true,
+                            cache: true
+                        }
+                    }, {stripTrailingSlashes: false});
+
+                    requests.query().$promise
+                        .then(function (data) {
+                            var categories = angular.fromJson(data);
+                            self._warningCategories = categories;
+                            deferred.resolve(categories);
+                        });
                 });
 
         }
@@ -37,26 +53,23 @@ function WarningService(translationService, settingsFactory, $resource, $http, $
 
         var currentLang = translationService.getCurrentLang();
         var url = settingsFactory.warningSubmitUrl.replace(/\$lang/, currentLang);
-
-        return $http({
-            method: 'POST',
-            url: url,
-            headers: {'Content-Type': 'application/x-www-form-urlencoded'},
-            transformRequest: function(obj) {
-                var str = [];
-                for(var p in obj) {
-                    str.push(encodeURIComponent(p) + "=" + encodeURIComponent(obj[p]));
-                }
-                return str.join("&");
-            },
-            data: {
-                name: "Anonymous", // keep compatibility with Geotrek-admin <= 2.32.11, with name field required
-                email: formData.email,
-                category: formData.category,
-                comment: formData.comment,
-                geom: '{"type": "Point", "coordinates": [' + formData.location.lng + ',' + formData.location.lat + ']}'
-            }
+        var data = new FormData();
+        data.append("file1", formData.file1);
+        data.append("file2", formData.file2);
+        data.append("file3", formData.file3);
+        data.append("name", "Anonymous");
+        data.append("email", formData.email)
+        data.append("problem_magnitude", formData.magnitudeProblem || '');
+        data.append("activity", formData.activity || '');
+        data.append("category", formData.category);
+        data.append("comment", formData.comment);
+        data.append("geom", '{"type": "Point", "coordinates": [' + formData.location.lng + ',' + formData.location.lat + ']}');
+
+        return $http.post(url, data, {
+        transformRequest: angular.identity,
+        headers: { "Content-Type": undefined }
         });
+
     };
 }
 
diff --git a/src/app/warning/templates/warning-panel.html b/src/app/warning/templates/warning-panel.html
diff --git a/src/app/warning/tests/e2e/warning-panel.spec.js b/src/app/warning/tests/e2e/warning-panel.spec.js
diff --git a/tests/dataset/api/en/feedback/categories.json b/tests/dataset/api/en/feedback/categories.json
diff --git a/tests/dataset/api/en/feedback/options.json b/tests/dataset/api/en/feedback/options.json
diff --git a/tests/dataset/api/fr/feedback/options.json b/tests/dataset/api/fr/feedback/options.json
