=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js 2015-02-24 14:54:57 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js 2015-02-24 15:35:20 +0000 @@ -327,7 +327,7 @@ container.rangeSearchCmp.show(); container.rangeValueCmp.show(); - ranges = Ext.clone(ns.core.init.idLegendSetMap[id].mapLegends); + ranges = Ext.clone(ns.core.init.idLegendSetMap[id].legends); // display name for (var i = 0; i < ranges.length; i++) { @@ -8068,9 +8068,9 @@ // legend sets requests.push({ - url: contextPath + '/api/mapLegendSets.json?fields=id,name,mapLegends[id,name,startValue,endValue,color]&paging=false', + url: contextPath + '/api/legendSets.json?fields=id,name,legends[id,name,startValue,endValue,color]&paging=false', success: function(r) { - init.legendSets = Ext.decode(r.responseText).mapLegendSets || []; + init.legendSets = Ext.decode(r.responseText).legendSets || []; fn(); } }); === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/core.js' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/core.js 2015-02-24 10:48:21 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/core.js 2015-02-24 15:35:20 +0000 @@ -1154,9 +1154,9 @@ // legend set xLayout.legendSet = layout.legendSet ? init.idLegendSetMap[layout.legendSet.id] : null; - if (layout.legendSet && layout.legendSet.mapLegends) { + if (layout.legendSet && layout.legendSet.legends) { xLayout.legendSet = init.idLegendSetMap[layout.legendSet.id]; - support.prototype.array.sort(xLayout.legendSet.mapLegends, 'ASC', 'startValue'); + support.prototype.array.sort(xLayout.legendSet.legends, 'ASC', 'startValue'); } // unique dimension names @@ -2235,7 +2235,7 @@ valueObjects = [], totalColObjects = [], uuidDimUuidsMap = {}, - isLegendSet = Ext.isObject(xLayout.legendSet) && Ext.isArray(xLayout.legendSet.mapLegends) && xLayout.legendSet.mapLegends.length, + isLegendSet = Ext.isObject(xLayout.legendSet) && Ext.isArray(xLayout.legendSet.legends) && xLayout.legendSet.legends.length, tdCount = 0, htmlArray; @@ -2248,7 +2248,7 @@ getTdHtml = function(config, metaDataId) { var bgColor, - mapLegends, + legends, colSpan, rowSpan, htmlValue, @@ -2273,11 +2273,11 @@ // background color from legend set if (isNumeric && xLayout.legendSet) { var value = parseFloat(config.value); - mapLegends = xLayout.legendSet.mapLegends; + legends = xLayout.legendSet.legends; - for (var i = 0; i < mapLegends.length; i++) { - if (Ext.Number.constrain(value, mapLegends[i].startValue, mapLegends[i].endValue) === value) { - bgColor = mapLegends[i].color; + for (var i = 0; i < legends.length; i++) { + if (Ext.Number.constrain(value, legends[i].startValue, legends[i].endValue) === value) { + bgColor = legends[i].color; } } } === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/core.js' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/core.js 2015-02-19 17:03:12 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/core.js 2015-02-24 15:35:20 +0000 @@ -1184,9 +1184,9 @@ // legend set xLayout.legendSet = layout.legendSet ? init.idLegendSetMap[layout.legendSet.id] : null; - if (layout.legendSet && layout.legendSet.mapLegends) { + if (layout.legendSet && layout.legendSet.legends) { xLayout.legendSet = init.idLegendSetMap[layout.legendSet.id]; - support.prototype.array.sort(xLayout.legendSet.mapLegends, 'ASC', 'startValue'); + support.prototype.array.sort(xLayout.legendSet.legends, 'ASC', 'startValue'); } // unique dimension names === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/eventchart.js' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/eventchart.js 2015-02-06 12:11:21 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/eventchart.js 2015-02-24 15:35:20 +0000 @@ -1727,9 +1727,9 @@ // legend set xLayout.legendSet = layout.legendSet ? init.idLegendSetMap[layout.legendSet.id] : null; - if (layout.legendSet && layout.legendSet.mapLegends) { + if (layout.legendSet && layout.legendSet.legends) { xLayout.legendSet = init.idLegendSetMap[layout.legendSet.id]; - support.prototype.array.sort(xLayout.legendSet.mapLegends, 'ASC', 'startValue'); + support.prototype.array.sort(xLayout.legendSet.legends, 'ASC', 'startValue'); } // unique dimension names @@ -4107,7 +4107,7 @@ // series, legendset if (legendSet) { - valueColor = service.mapLegend.getColorByValue(legendSet, store.getRange()[0].data[failSafeColumnIds[0]]) || valueColor; + valueColor = service.legend.getColorByValue(legendSet, store.getRange()[0].data[failSafeColumnIds[0]]) || valueColor; } series = { === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js 2015-02-11 16:47:37 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js 2015-02-24 15:35:20 +0000 @@ -611,10 +611,10 @@ fields: ['id', 'name'], proxy: { type: 'ajax', - url: gis.init.contextPath + '/api/mapLegendSets.json?fields=id,name&paging=false', + url: gis.init.contextPath + '/api/legendSets.json?fields=id,name&paging=false', reader: { type: 'json', - root: 'mapLegendSets' + root: 'legendSets' } }, isLoaded: false, @@ -3222,10 +3222,10 @@ fields: ['id', 'name'], proxy: { type: 'ajax', - url: gis.init.contextPath + '/api/mapLegendSets.json?fields=id,name&paging=false', + url: gis.init.contextPath + '/api/legendSets.json?fields=id,name&paging=false', reader: { type: 'json', - root: 'mapLegendSets' + root: 'legendSets' }, pageParam: false, startParam: false, @@ -3247,7 +3247,7 @@ url: '', reader: { type: 'json', - root: 'mapLegends' + root: 'legends' } }, deleteLegend: deleteLegend, @@ -3665,7 +3665,7 @@ }); if (id) { - legendStore.proxy.url = gis.init.contextPath + '/api/mapLegendSets/' + id + '.json?fields=mapLegends[id,name,startValue,endValue,color]'; + legendStore.proxy.url = gis.init.contextPath + '/api/legendSets/' + id + '.json?fields=legends[id,name,startValue,endValue,color]'; legendStore.load(); legendSetName.setValue(legendSetStore.getById(id).data.name); @@ -3692,7 +3692,7 @@ deleteLegendSet = function(id) { if (id) { Ext.Ajax.request({ - url: gis.init.contextPath + '/api/mapLegendSets/' + id, + url: gis.init.contextPath + '/api/legendSets/' + id, method: 'DELETE', success: function() { legendSetStore.load(); @@ -3713,12 +3713,12 @@ body = { name: legendSetName.getValue(), symbolizer: gis.conf.finals.widget.symbolizer_color, - mapLegends: [] + legends: [] }; for (var i = 0; i < items.length; i++) { var item = items[i]; - body.mapLegends.push({ + body.legends.push({ name: item.data.name, startValue: item.data.startValue, endValue: item.data.endValue, @@ -3791,7 +3791,7 @@ var body = Ext.encode(getRequestBody()); Ext.Ajax.request({ - url: gis.init.contextPath + '/api/mapLegendSets/', + url: gis.init.contextPath + '/api/legendSets/', method: 'POST', headers: {'Content-Type': 'application/json'}, params: body, @@ -3815,7 +3815,7 @@ body = Ext.encode(getRequestBody()); Ext.Ajax.request({ - url: gis.init.contextPath + '/api/mapLegendSets/' + id, + url: gis.init.contextPath + '/api/legendSets/' + id, method: 'PUT', headers: {'Content-Type': 'application/json'}, params: body, @@ -7039,7 +7039,7 @@ url: '', reader: { type: 'json', - root: 'mapLegends' + root: 'legends' } }, isLoaded: false, === 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-12 18:54:09 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/core.js 2015-02-24 15:35:20 +0000 @@ -2446,11 +2446,11 @@ legends = []; Ext.Ajax.request({ - url: gis.init.contextPath + '/api/mapLegendSets/' + view.legendSet.id + '.json?fields=' + gis.conf.url.mapLegendSetFields.join(','), + url: gis.init.contextPath + '/api/legendSets/' + view.legendSet.id + '.json?fields=' + gis.conf.url.legendSetFields.join(','), scope: this, disableCaching: false, success: function(r) { - legends = Ext.decode(r.responseText).mapLegends; + legends = Ext.decode(r.responseText).legends; Ext.Array.sort(legends, function (a, b) { return a.startValue - b.startValue; @@ -2820,7 +2820,7 @@ 'mapViews[' + conf.url.analysisFields.join(',') + ']' ]; - conf.url.mapLegendFields = [ + conf.url.legendFields = [ '*', '!created', '!lastUpdated', @@ -2830,8 +2830,8 @@ '!userGroupAccesses' ]; - conf.url.mapLegendSetFields = [ - 'id,name,mapLegends[' + conf.url.mapLegendFields.join(',') + ']' + conf.url.legendSetFields = [ + 'id,name,legends[' + conf.url.legendFields.join(',') + ']' ]; }()); === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js 2015-02-11 16:47:37 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js 2015-02-24 15:35:20 +0000 @@ -6658,9 +6658,9 @@ // legend sets requests.push({ - url: contextPath + '/api/mapLegendSets.json?fields=id,name,mapLegends[id,name,startValue,endValue,color]&paging=false', + url: contextPath + '/api/legendSets.json?fields=id,name,legends[id,name,startValue,endValue,color]&paging=false', success: function(r) { - init.legendSets = Ext.decode(r.responseText).mapLegendSets || []; + init.legendSets = Ext.decode(r.responseText).legendSets || []; fn(); } }); === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/core.js' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/core.js 2015-02-24 10:48:21 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/core.js 2015-02-24 15:35:20 +0000 @@ -1038,7 +1038,7 @@ if (layout.legendSet) { xLayout.legendSet = init.idLegendSetMap[layout.legendSet.id]; - support.prototype.array.sort(xLayout.legendSet.mapLegends, 'ASC', 'startValue'); + support.prototype.array.sort(xLayout.legendSet.legends, 'ASC', 'startValue'); } // unique dimension names @@ -2089,7 +2089,7 @@ valueObjects = [], totalColObjects = [], uuidDimUuidsMap = {}, - isLegendSet = Ext.isObject(xLayout.legendSet) && Ext.isArray(xLayout.legendSet.mapLegends) && xLayout.legendSet.mapLegends.length, + isLegendSet = Ext.isObject(xLayout.legendSet) && Ext.isArray(xLayout.legendSet.legends) && xLayout.legendSet.legends.length, tdCount = 0, htmlArray; @@ -2102,7 +2102,7 @@ getTdHtml = function(config, metaDataId) { var bgColor, - mapLegends, + legends, colSpan, rowSpan, htmlValue, @@ -2152,11 +2152,11 @@ // background color from legend set if (isValue && xLayout.legendSet) { var value = parseFloat(config.value); - mapLegends = xLayout.legendSet.mapLegends; + legends = xLayout.legendSet.legends; - for (var i = 0; i < mapLegends.length; i++) { - if (Ext.Number.constrain(value, mapLegends[i].startValue, mapLegends[i].endValue) === value) { - bgColor = mapLegends[i].color; + for (var i = 0; i < legends.length; i++) { + if (Ext.Number.constrain(value, legends[i].startValue, legends[i].endValue) === value) { + bgColor = legends[i].color; } } } === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js 2015-02-11 17:02:00 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js 2015-02-24 15:35:20 +0000 @@ -2460,7 +2460,7 @@ // legend set if (xLayout.type === 'gauge' && Ext.Array.contains(xLayout.axisObjectNames, ind) && xLayout.objectNameIdsMap[ind].length) { Ext.Ajax.request({ - url: ns.core.init.contextPath + '/api/indicators/' + xLayout.objectNameIdsMap[ind][0] + '.json?fields=legendSet[mapLegends[id,name,startValue,endValue,color]]', + url: ns.core.init.contextPath + '/api/indicators/' + xLayout.objectNameIdsMap[ind][0] + '.json?fields=legendSet[legends[id,name,startValue,endValue,color]]', disableCaching: false, success: function(r) { legendSet = Ext.decode(r.responseText).legendSet; === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/chart.js' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/chart.js 2015-02-06 12:11:21 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/chart.js 2015-02-24 15:35:20 +0000 @@ -1644,9 +1644,9 @@ // legend set xLayout.legendSet = layout.legendSet ? init.idLegendSetMap[layout.legendSet.id] : null; - if (layout.legendSet && layout.legendSet.mapLegends) { + if (layout.legendSet && layout.legendSet.legends) { xLayout.legendSet = init.idLegendSetMap[layout.legendSet.id]; - support.prototype.array.sort(xLayout.legendSet.mapLegends, 'ASC', 'startValue'); + support.prototype.array.sort(xLayout.legendSet.legends, 'ASC', 'startValue'); } // unique dimension names @@ -2120,17 +2120,17 @@ }; // legend set - service.mapLegend = {}; + service.legend = {}; - service.mapLegend.getColorByValue = function(legendSet, value) { + service.legend.getColorByValue = function(legendSet, value) { var color; if (!(legendSet && value)) { return; } - for (var i = 0, legend; i < legendSet.mapLegends.length; i++) { - legend = legendSet.mapLegends[i]; + for (var i = 0, legend; i < legendSet.legends.length; i++) { + legend = legendSet.legends[i]; if (value >= parseFloat(legend.startValue) && value < parseFloat(legend.endValue)) { return legend.color; @@ -3669,7 +3669,7 @@ // series, legendset if (legendSet) { - valueColor = service.mapLegend.getColorByValue(legendSet, store.getRange()[0].data[failSafeColumnIds[0]]) || valueColor; + valueColor = service.legend.getColorByValue(legendSet, store.getRange()[0].data[failSafeColumnIds[0]]) || valueColor; } series = { @@ -4137,7 +4137,7 @@ // legend set if (xLayout.type === 'gauge' && Ext.Array.contains(xLayout.axisObjectNames, ind) && xLayout.objectNameIdsMap[ind].length) { Ext.Ajax.request({ - url: ns.core.init.contextPath + '/api/indicators/' + xLayout.objectNameIdsMap[ind][0] + '.json?fields=legendSet[mapLegends[id,name,startValue,endValue,color]]', + url: ns.core.init.contextPath + '/api/indicators/' + xLayout.objectNameIdsMap[ind][0] + '.json?fields=legendSet[legends[id,name,startValue,endValue,color]]', disableCaching: false, success: function(r) { legendSet = Ext.decode(r.responseText).legendSet; === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/core.js' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/core.js 2015-02-03 13:35:17 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/core.js 2015-02-24 15:35:20 +0000 @@ -1105,9 +1105,9 @@ // legend set xLayout.legendSet = layout.legendSet ? init.idLegendSetMap[layout.legendSet.id] : null; - if (layout.legendSet && layout.legendSet.mapLegends) { + if (layout.legendSet && layout.legendSet.legends) { xLayout.legendSet = init.idLegendSetMap[layout.legendSet.id]; - support.prototype.array.sort(xLayout.legendSet.mapLegends, 'ASC', 'startValue'); + support.prototype.array.sort(xLayout.legendSet.legends, 'ASC', 'startValue'); } // unique dimension names @@ -1581,17 +1581,17 @@ }; // legend set - service.mapLegend = {}; + service.legend = {}; - service.mapLegend.getColorByValue = function(legendSet, value) { + service.legend.getColorByValue = function(legendSet, value) { var color; if (!(legendSet && value)) { return; } - for (var i = 0, legend; i < legendSet.mapLegends.length; i++) { - legend = legendSet.mapLegends[i]; + for (var i = 0, legend; i < legendSet.legends.length; i++) { + legend = legendSet.legends[i]; if (value >= parseFloat(legend.startValue) && value < parseFloat(legend.endValue)) { return legend.color; @@ -2998,7 +2998,7 @@ // series, legendset if (legendSet) { - valueColor = service.mapLegend.getColorByValue(legendSet, store.getRange()[0].data[failSafeColumnIds[0]]) || valueColor; + valueColor = service.legend.getColorByValue(legendSet, store.getRange()[0].data[failSafeColumnIds[0]]) || valueColor; } series = {