Show country name instead of country id on answers to map questions (#…

…1407)
globaleaks · May 21, 2019 · fa100f8 · fa100f8
1 parent ce272dc
commit fa100f8
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 15 deletions.
diff --git a/client/app/js/app.js b/client/app/js/app.js
@@ -642,6 +642,7 @@ var GLClient = angular.module("GLClient", [
         $rootScope.submission_statuses = result.submission_statuses;
 
         angular.forEach($rootScope.questionnaires_by_id, function(element, key) {
+          $rootScope.fieldUtilities.parseQuestionnaire($rootScope.questionnaires_by_id[key]);
           $rootScope.questionnaires_by_id[key].steps = $filter("orderBy")($rootScope.questionnaires_by_id[key].steps, "presentation_order");
         });
 

diff --git a/client/app/js/controllers/submission.js b/client/app/js/controllers/submission.js
@@ -541,8 +541,6 @@ controller("SubmissionFormFieldCtrl", ["$scope", "fieldUtilities",
       };
 
       d3.json($scope.field.attrs.topojson.value).then(function(topojson) {
-        $scope.field.attrs.topojson.geojson = fieldUtilities.topoToGeo(topojson);
-
         var projection = d3.geoMercator();
         var path = d3.geoPath();
 
@@ -607,18 +605,6 @@ controller("SubmissionFormFieldCtrl", ["$scope", "fieldUtilities",
              }
              $scope.$apply();
            });
-
-          svg.selectAll("text")
-          .data(topojson.features)
-          .enter()
-          .append("svg:circle")
-          .attr("fill", "#000").attr("r", 1.5)
-          .attr("cx", function(d){
-              return path.centroid(d)[0];
-          })
-          .attr("cy", function(d){
-              return  path.centroid(d)[1];
-          });
       });
     }
 }]).

diff --git a/client/app/js/controllers/tip.js b/client/app/js/controllers/tip.js
@@ -30,6 +30,8 @@ GLClient.controller("TipCtrl",
     };
 
     $scope.preprocessTipAnswers = function(tip) {
+      $scope.fieldUtilities.parseQuestionnaire(tip.questionnaires[0]);
+
       var i, j, k, step, child;
       for (i=0; i<tip.questionnaires[0].steps.length; i++) {
         step = tip.questionnaires[0].steps[i];

diff --git a/client/app/js/services.js b/client/app/js/services.js
@@ -1502,6 +1502,14 @@ factory("AdminUtils", ["AdminContextResource", "AdminQuestionnaireResource", "Ad
             field.children.forEach(function(field) {
               self.parseField(field, parsedFields);
             });
+          } else if (field.type === "map") {
+            d3.json(field.attrs.topojson.value).then(function(topojson) {
+             field.attrs.topojson.geojson = self.topoToGeo(topojson);
+             field.attrs.topojson.id_name_map = {};
+             field.attrs.topojson.geojson.features.forEach(function(feature) {
+               field.attrs.topojson.id_name_map[feature.id] = feature.properties.name;
+	     });
+            });
           }
         },
 

diff --git a/client/app/views/partials/tip_field_answer_entry.html b/client/app/views/partials/tip_field_answer_entry.html
@@ -16,7 +16,7 @@
     </div>
   </span>
 
-  <span data-ng-switch-when="map">{{entry['value']}}</span>
+  <span data-ng-switch-when="map">{{field.attrs.topojson.id_name_map[entry['value']]}}</span>
 
   <span data-ng-switch-when="date">{{entry['value'] | date:'dd-MM-yyyy'}}</span>