dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 2924 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2011-02-26 13:21:20 +0100
message:
  View history improvements.
modified:
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.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-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js	2011-02-25 19:04:17 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js	2011-02-26 12:19:23 +0000
@@ -2320,7 +2320,7 @@
                         items.unshift(items.pop());
                         keys.unshift(keys.pop());
 						
-						if (items.length > 3) {
+						if (items.length > 10) {
 							items[items.length-1].destroy();
 						}
                     },
@@ -2355,7 +2355,7 @@
             var mapView = scope.formValues.getAllValues.call(scope);
             mapView.widget = scope;
             mapView.timestamp = new Date();
-            mapView.label = G.date.getNowHMS(mapView.timestamp) + '&nbsp;&nbsp;&nbsp;' + mapView.parentOrganisationUnitName + ' (' + mapView.organisationUnitLevelName + ')';
+            mapView.label = G.date.getNowHMS(mapView.timestamp) + '&nbsp;&nbsp;&nbsp;' + mapView.parentOrganisationUnitName + ' (' + mapView.	organisationUnitLevelName + ')' + '&nbsp;&nbsp;&nbsp;' + (mapView.mapValueType == G.conf.map_value_type_indicator ? mapView.indicatorName : mapView.dataElementName);
 
             for (var i = 0; i < this.menu.items.items.length; i++) {
                 if (G.util.compareObjToObj(this.menu.items.items[i].mapView, mapView, ['longitude','latitude','zoom','widget','timestamp','label'])) {

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js	2011-02-25 14:14:20 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js	2011-02-26 12:19:23 +0000
@@ -1368,8 +1368,10 @@
                 mapValueType: this.form.findField('mapvaluetype').getValue(),
                 indicatorGroupId: this.form.findField('indicatorgroup').getValue(),
                 indicatorId: this.form.findField('indicator').getValue(),
+				indicatorName: this.form.findField('indicator').getRawValue(),
                 dataElementGroupId: this.form.findField('dataelementgroup').getValue(),
                 dataElementId: this.form.findField('dataelement').getValue(),
+				dataElementName: this.form.findField('dataelement').getRawValue(),
                 mapDateType: G.vars.mapDateType.value,
                 periodTypeId: this.form.findField('periodtype').getValue(),
                 periodId: this.form.findField('period').getValue(),

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js	2011-02-25 14:14:20 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js	2011-02-26 12:19:23 +0000
@@ -1357,8 +1357,10 @@
 				mapValueType: this.form.findField('mapvaluetype').getValue(),
 				indicatorGroupId: this.form.findField('indicatorgroup').getValue(),
 				indicatorId: this.form.findField('indicator').getValue(),
+				indicatorName: this.form.findField('indicator').getRawValue(),
 				dataElementGroupId: this.form.findField('dataelementgroup').getValue(),
 				dataElementId: this.form.findField('dataelement').getValue(),
+				dataElementName: this.form.findField('dataelement').getRawValue(),
                 mapDateType: G.vars.mapDateType.value,
 				periodTypeId: this.form.findField('periodtype').getValue(),
 				periodId: this.form.findField('period').getValue(),