dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 14650 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2014-04-04 09:53:20 +0200
message:
  ER, unselect all data items.
added:
  dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/images/arrowupdouble.png
modified:
  dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/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

=== added file 'dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/images/arrowupdouble.png'
Binary files dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/images/arrowupdouble.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/images/arrowupdouble.png	2014-04-04 07:52:30 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/app.js	2014-04-04 07:01:44 +0000
+++ dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/app.js	2014-04-04 07:52:30 +0000
@@ -2969,15 +2969,24 @@
 			width: accBaseWidth,
             height: 240,
             bodyStyle: 'padding:2px 0 5px 3px; overflow-y: scroll',
-            tbar: {
-                height: 27,
-                items: {
+            tbar: [
+				{
 					xtype: 'label',
                     text: 'Selected data items',
                     style: 'padding-left:6px; color:#222',
 					cls: 'ns-toolbar-multiselect-left-label'
+				},
+				'->',
+				{
+					xtype: 'button',
+					icon: 'images/arrowupdouble.png',
+					width: 22,
+					height: 22,
+					handler: function() {
+						dataElementSelected.removeAllDataElements();
+					}
 				}
-            },
+			],
             getChildIndex: function(child) {
 				var items = this.items.items;
 
@@ -2999,6 +3008,14 @@
 				});
 
 				return hasDataElement;
+			},
+			removeAllDataElements: function() {
+				var items = this.items.items,
+					len = items.length;
+
+				for (var i = 0; i < len; i++) {
+					items[0].removeDataElement();
+				}
 			}
         });