Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 2929 [merge]
committer: Jan Henrik Overland <janhenrik.overl...@gmail.com>
branch nick: dhis2
timestamp: Mon 2011-02-28 16:07:08 +0100
message:
View history layout improved.
modified:
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css
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/css/style.css'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css 2011-02-25 19:04:17 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css 2011-02-28 15:04:59 +0000
@@ -429,3 +429,9 @@
.thematic-br {
padding:8px 0 0 0;
}
+.inline-span-color-black {
+ color:#111;
+}
+.inline-span-color-gray {
+ color:#444;
+}
=== 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-28 13:24:56 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js 2011-02-28 15:06:14 +0000
@@ -2355,10 +2355,16 @@
var mapView = scope.formValues.getAllValues.call(scope);
mapView.widget = scope;
mapView.timestamp = new Date();
- mapView.label = G.date.getNowHMS(mapView.timestamp) + ' ' + mapView.parentOrganisationUnitName + ' (' + mapView. organisationUnitLevelName + ')' + ' ' + (mapView.mapValueType == G.conf.map_value_type_indicator ? mapView.indicatorName : mapView.dataElementName);
+ var c1 = '<span class="inline-span-color-gray">';
+ var c2 = '<span class="inline-span-color-black">';
+ mapView.label = c1 + G.date.getNowHMS(mapView.timestamp) + '</span> ' +
+ c2 + mapView.parentOrganisationUnitName + '</span> ' +
+ c1 + mapView.organisationUnitLevelName + '</span> ' +
+ c2 + (mapView.mapValueType == G.conf.map_value_type_indicator ? mapView.indicatorName : mapView.dataElementName) + '</span> ' +
+ c1 + (mapView.mapDateType == G.conf.map_date_type_fixed ? mapView.periodName : (mapView.startDate + ' - ' + mapView.endDate)) + '</span>';
for (var i = 0; i < this.menu.items.items.length; i++) {
- if (G.util.compareObjToObj(mapView, this.menu.items.items[i].mapView, ['startdate','longitude','latitude','zoom','widget','timestamp','label'])) {
+ if (G.util.compareObjToObj(mapView, this.menu.items.items[i].mapView, ['longitude','latitude','zoom','widget','timestamp','label'])) {
this.menu.items.items[i].destroy();
}
}
=== 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-28 13:51:42 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js 2011-02-28 15:04:59 +0000
@@ -426,7 +426,7 @@
listeners: {
'select': {
scope: this,
- fn: function(cb) {
+ fn: function(cb) {2010
if (G.util.setCurrentValue.call(this, cb, 'mapview')) {
return;
}
@@ -490,6 +490,7 @@
'select': {
scope: this,
fn: function(cb) {
+ this.form.findField('period').clearValue();
G.stores.periodsByTypeStore.setBaseParam('name', cb.getValue());
G.stores.periodsByTypeStore.load();
}
@@ -1375,6 +1376,7 @@
mapDateType: G.vars.mapDateType.value,
periodTypeId: G.vars.mapDateType.isFixed() ? this.form.findField('periodtype').getValue() : null,
periodId: G.vars.mapDateType.isFixed() ? this.form.findField('period').getValue() : null,
+ periodName: G.vars.mapDateType.isFixed() ? this.form.findField('period').getRawValue() : null,
startDate: G.vars.mapDateType.isStartEnd() ? this.form.findField('startdate').getRawValue() : null,
endDate: G.vars.mapDateType.isStartEnd() ? this.form.findField('enddate').getRawValue() : null,
parentOrganisationUnitId: this.organisationUnitSelection.parent.id,
=== 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-28 13:51:42 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js 2011-02-28 15:04:59 +0000
@@ -489,6 +489,7 @@
'select': {
scope: this,
fn: function(cb) {
+ this.form.findField('period').clearValue();
G.stores.periodsByTypeStore.setBaseParam('name', cb.getValue());
G.stores.periodsByTypeStore.load();
}
@@ -1364,6 +1365,7 @@
mapDateType: G.vars.mapDateType.value,
periodTypeId: G.vars.mapDateType.isFixed() ? this.form.findField('periodtype').getValue() : null,
periodId: G.vars.mapDateType.isFixed() ? this.form.findField('period').getValue() : null,
+ periodName: G.vars.mapDateType.isFixed() ? this.form.findField('period').getRawValue() : null,
startDate: G.vars.mapDateType.isStartEnd() ? this.form.findField('startdate').getRawValue() : null,
endDate: G.vars.mapDateType.isStartEnd() ? this.form.findField('enddate').getRawValue() : null,
parentOrganisationUnitId: this.organisationUnitSelection.parent.id,
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
