=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js' --- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js 2013-12-20 14:59:56 +0000 +++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js 2013-12-22 23:27:34 +0000 @@ -344,8 +344,7 @@ util.gui.window = util.gui.window || {}; util.gui.window.setPositionTopRight = function(window) { - var center = gis.viewport.centerRegion; - window.setPosition(gis.viewport.width - (window.width + 7), center.y + 8); + window.setPosition(gis.viewport.centerRegion.getWidth() - (window.getWidth() + 3), gis.viewport.centerRegion.y + 58); }; util.gui.window.setPositionTopLeft = function(window) { @@ -1228,7 +1227,7 @@ for (var i = 0; i < valueArray.length; i++) { valueArray[i] = Ext.String.trim(valueArray[i]); } - + return { id: this.dataElement.id, name: this.dataElement.name, @@ -1257,7 +1256,7 @@ data: [ {id: 'IN', name: 'One of'} ] - } + } }); this.valueStore = Ext.create('Ext.data.Store', { @@ -1320,8 +1319,8 @@ fn: function(cb) { var value = cb.getValue(), optionSetId = container.dataElement.optionSet.id; - - // search + + // search container.valueStore.loadOptionSet(optionSetId, value); // trigger @@ -1608,7 +1607,7 @@ GIS.app.WidgetWindow = function(layer, width, padding) { width = width || gis.conf.layout.widget.window_width; padding = padding || 5; - + return Ext.create('Ext.window.Window', { //autoShow: true, title: layer.name, @@ -4212,15 +4211,15 @@ }, hasDataElement: function(dataElementId) { var hasDataElement = false; - - this.items.each(function(item) { + + this.items.each(function(item) { if (item.dataElement.id === dataElementId) { hasDataElement = true; } }); return hasDataElement; - } + } }); addUxFromDataElement = function(element, index) { @@ -4270,7 +4269,7 @@ }; dataElementsByStageStore.removeAt(dataElementsByStageStore.findExact('id', element.id)); - }; + }; selectDataElements = function(items) { var dataElements = []; @@ -4278,7 +4277,7 @@ // data element objects for (var i = 0, item; i < items.length; i++) { item = items[i]; - + if (Ext.isString(item)) { dataElements.push(dataElementsByStageStore.getAt(dataElementsByStageStore.findExact('id', item)).data); } @@ -4329,8 +4328,7 @@ columnWidth: 0.5, style: 'margin-right: 1px', format: 'Y-m-d', - //value: new Date( (new Date()).setMonth( (new Date()).getMonth() - 3)) - value: new Date('2012-01-01') //todo + value: new Date( (new Date()).setMonth( (new Date()).getMonth() - 3)) }); endDate = Ext.create('Ext.form.field.Date', { @@ -4964,7 +4962,7 @@ view.dataElements.push(panel.getRecord()); } - + view.organisationUnits = treePanel.getDimension().items; return view; === modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/core.js' --- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/core.js 2013-12-20 15:44:08 +0000 +++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/core.js 2013-12-22 23:27:34 +0000 @@ -178,18 +178,20 @@ GIS.core.createSelectHandlers = function(gis, layer) { var isRelocate = !!GIS.app ? (gis.init.user.isAdmin ? true : false) : false, options = {}, - window, infrastructuralPeriod, - onHoverSelect, - onHoverUnselect, - onClickSelect, - dimConf = gis.conf.finals.dimension; + defaultHoverSelect, + defaultHoverUnselect, + defaultClickSelect, + selectHandlers, + dimConf = gis.conf.finals.dimension, + defaultHoverWindow, + eventWindow; - onHoverSelect = function fn(feature) { - if (window) { - window.destroy(); + defaultHoverSelect = function fn(feature) { + if (defaultHoverWindow) { + defaultHoverWindow.destroy(); } - window = Ext.create('Ext.window.Window', { + defaultHoverWindow = Ext.create('Ext.window.Window', { cls: 'gis-window-widget-feature gis-plugin', preventHeader: true, shadow: false, @@ -199,21 +201,21 @@ } }); - window.show(); + defaultHoverWindow.show(); var eastX = gis.viewport.eastRegion.getPosition()[0], centerX = gis.viewport.centerRegion.getPosition()[0], centerRegionCenterX = centerX + ((eastX - centerX) / 2), centerRegionY = gis.viewport.centerRegion.getPosition()[1] + (GIS.app ? 32 : 0); - window.setPosition(centerRegionCenterX - (window.getWidth() / 2), centerRegionY); - }; - - onHoverUnselect = function fn(feature) { - window.destroy(); - }; - - onClickSelect = function fn(feature) { + defaultHoverWindow.setPosition(centerRegionCenterX - (defaultHoverWindow.getWidth() / 2), centerRegionY); + }; + + defaultHoverUnselect = function fn(feature) { + defaultHoverWindow.destroy(); + }; + + defaultClickSelect = function fn(feature) { var showInfo, showRelocate, drill, @@ -524,11 +526,48 @@ menu.showAt([gis.olmap.mouseMove.x, gis.olmap.mouseMove.y]); }; - options.onHoverSelect = onHoverSelect; - options.onHoverUnselect = onHoverUnselect; - - if (layer.id !== 'event') { - options.onClickSelect = onClickSelect; + options = { + onHoverSelect: defaultHoverSelect, + onHoverUnselect: defaultHoverUnselect, + onClickSelect: defaultClickSelect + }; + + if (layer.id === 'event') { + options.onClickSelect = function fn(feature) { + var ignoreKeys = ['label', 'value', 'nameColumnMap', 'psi', 'ps', 'longitude', 'latitude', 'eventdate', 'ou', 'oucode', 'ouname'], + attributes = feature.attributes, + map = attributes.nameColumnMap, + html = '
' + map['ou'] + ' | ' + attributes['ouname'] + ' |
' + map['eventdate'] + ' | ' + attributes['eventdate'] + ' |
' + map['longitude'] + ' | ' + attributes['longitude'] + ' |
' + map['latitude'] + ' | ' + attributes['latitude'] + ' |
' + map[key] + ' | ' + attributes[key] + ' |