dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 13556 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2014-01-03 11:28:26 +0100
message:
  GIS, event layer, clear selected items when changing program.
modified:
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.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/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js	2014-01-02 19:53:20 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js	2014-01-03 10:19:10 +0000
@@ -3957,7 +3957,6 @@
 
             accBaseWidth = baseWidth - 6;
 
-
 		// stores
 
 		programStore = Ext.create('Ext.data.Store', {
@@ -4059,6 +4058,9 @@
 		onProgramSelect = function(programId) {
 			stage.clearValue();
 
+			dataElementsByStageStore.removeAll();
+			dataElementSelected.removeAll();			
+
 			stagesByProgramStore.proxy.url = gis.init.contextPath + '/api/programs/' + programId + '.json?viewClass=withoutOrganisationUnits&links=false&paging=false';
 			stagesByProgramStore.load({
 				callback: function(records) {
@@ -4088,11 +4090,9 @@
 			emptyText: 'Select stage',
 			queryMode: 'remote',
 			forceSelection: true,
-			//width: gis.conf.layout.widget.item_width,
 			columnWidth: 0.5,
 			style: 'margin:1px 0 2px 1px',
 			disabled: true,
-			//labelWidth: gis.conf.layout.widget.itemlabel_width,
 			listConfig: {loadMask: false},
 			store: stagesByProgramStore,
             getRecord: function() {
@@ -4141,8 +4141,7 @@
 			tbar: [
 				{
 					xtype: 'label',
-					//text: GIS.i18n.available,
-                    text: 'Available data elements',
+                    text: 'Available data items',
 					cls: 'ns-toolbar-multiselect-left-label'
 				},
 				'->',
@@ -4188,8 +4187,7 @@
                 height: 27,
                 items: {
 					xtype: 'label',
-					//text: GIS.i18n.available,
-                    text: 'Selected data elements',
+                    text: 'Selected data items',
                     style: 'padding-left:6px; color:#222',
 					cls: 'ns-toolbar-multiselect-left-label'
 				}
@@ -4292,7 +4290,7 @@
         };
 
         dataElement = Ext.create('Ext.panel.Panel', {
-            title: '<div class="gis-panel-title-data">Data elements</div>',
+            title: '<div class="gis-panel-title-data">Data</div>',
             bodyStyle: 'padding:2px',
             hideCollapseTool: true,
             items: [