dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 18243 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2015-02-12 19:19:22 +0100
message:
  GIS event, booleans supported.
modified:
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/core.js


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/core.js	2015-02-05 15:57:08 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/core.js	2015-02-12 18:17:35 +0000
@@ -1273,13 +1273,17 @@
                     latIndex,
                     optionSetIndex,
                     optionSetHeader,
-                    map = Ext.clone(r.metaData.names),
+                    names = Ext.clone(r.metaData.names),
+                    booleanNames = {
+                        'true': GIS.i18n.yes || 'Yes',
+                        'false': GIS.i18n.no || 'No'
+                    },
                     updateFeatures;
 
                 updateFeatures = function() {
                     for (var i = 0, header; i < r.headers.length; i++) {
                         header = r.headers[i];
-                        map[header.name] = header.column;
+                        names[header.name] = header.column;
                     }
 
                     // events
@@ -1287,14 +1291,15 @@
                         row = rows[i];
                         obj = {};
 
-                        for (var j = 0; j < row.length; j++) {
-                            obj[r.headers[j].name] = j === optionSetIndex ? r.metaData.optionNames[row[j]] || map[row[j]] : row[j];
+                        for (var j = 0, value; j < row.length; j++) {
+                            value = row[j];
+                            obj[r.headers[j].name] = booleanNames[value] || r.metaData.optionNames[value] || names[value] || value;
                         }
 
                         obj[gis.conf.finals.widget.value] = 0;
                         obj.label = obj.ouname;
                         obj.popupText = obj.ouname;
-                        obj.nameColumnMap = map;
+                        obj.nameColumnMap = Ext.apply(names, r.metaData.optionNames, r.metaData.booleanNames);
 
                         events.push(obj);
                     }
@@ -1318,11 +1323,12 @@
                     if (!optionSetHeader) {
                         updateFeatures();
                     }
-
-                    dhis2.gis.store.get('optionSets', optionSetHeader.optionSet).done( function(obj) {
-                        Ext.apply(r.metaData.optionNames, gis.util.array.getObjectMap(obj.options, 'code', 'name'));
-                        updateFeatures();
-                    });
+                    else {
+                        dhis2.gis.store.get('optionSets', optionSetHeader.optionSet).done( function(obj) {
+                            Ext.apply(r.metaData.optionNames, gis.util.array.getObjectMap(obj.options, 'code', 'name'));
+                            updateFeatures();
+                        });
+                    }
                 };
 
                 r.metaData.optionNames = {};
@@ -1331,7 +1337,7 @@
                 for (var i = 0, header; i < r.headers.length; i++) {
                     header = r.headers[i];
 
-                    map[header.name] = header.column;
+                    names[header.name] = header.column;
 
                     if (header.name === 'longitude') {
                         lonIndex = i;