dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 19032 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2015-04-27 17:38:52 +0200
message:
  ER EV collapse data dimensions bug fixed.
modified:
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/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-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js	2015-04-27 13:33:58 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js	2015-04-27 15:38:17 +0000
@@ -1665,6 +1665,8 @@
                     store.add(record);
                 }
             }
+
+            onCollapseDataDimensionsChange(collapseDataDimensions.getValue());
         };
 
         removeDimension = function(id, excludedStores) {
@@ -1751,7 +1753,7 @@
 
         toggleDataItems = function(param) {
             var stores = [colStore, rowStore, filterStore, fixedFilterStore],
-                collapse = Ext.isObject(param) && param.collapseDataItems ? param.collapseDataItems : param,
+                collapse = Ext.isObject(param) && Ext.isDefined(param.collapseDataItems) ? param.collapseDataItems : param,
                 keys = ['ou', 'pe', 'dates'],
                 dy = ['dy'],
                 keys;
@@ -4562,7 +4564,7 @@
                 element.name = element.name || element.displayName;
                 recordMap[element.id] = element;
 
-                // dont add ux if dim is selected as value
+                // dont create ux if dim is selected as value
                 if (element.id !== aggWindow.value.getValue()) {
                     ux = addUxFromDataElement(element);
 

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js	2015-04-27 13:33:58 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js	2015-04-27 15:38:17 +0000
@@ -1699,6 +1699,8 @@
                     store.add(record);
                 }
             }
+
+            onCollapseDataDimensionsChange(collapseDataDimensions.getValue());
         };
 
         removeDimension = function(id, excludedStores) {
@@ -1785,7 +1787,7 @@
 
         toggleDataItems = function(param) {
             var stores = [colStore, rowStore, filterStore, fixedFilterStore],
-                collapse = Ext.isObject(param) && param.collapseDataItems ? param.collapseDataItems : param,
+                collapse = Ext.isObject(param) && Ext.isDefined(param.collapseDataItems) ? param.collapseDataItems : param,
                 keys = ['ou', 'pe', 'dates'],
                 dy = ['dy'],
                 keys;
@@ -4227,7 +4229,7 @@
                 element.name = element.name || element.displayName;
                 recordMap[element.id] = element;
 
-                // dont add ux if dim is selected as value
+                // dont create ux if dim is selected as value
                 if (element.id !== aggWindow.value.getValue()) {
                     ux = addUxFromDataElement(element);