dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 20585
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2015-10-08 16:37:41 +0300
message:
  ER render fix.
modified:
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/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-10-08 13:26:51 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js	2015-10-08 13:37:41 +0000
@@ -6454,7 +6454,7 @@
 			//}
 		};
 
-        setGui = function(layout, xLayout, response, updateGui, table) {
+        setGui = function(layout, response, updateGui) {
 			var dimensions = Ext.Array.clean([].concat(layout.columns || [], layout.rows || [], layout.filters || [])),
 				recMap = ns.core.service.layout.getObjectNameDimensionItemsMapFromDimensionArray(dimensions);
 
@@ -7222,8 +7222,6 @@
 					disableCaching: false,
 					scope: this,
 					failure: function(r) {
-						//ns.app.viewport.setGui(layout, xLayout, isUpdateGui);
-
 						web.mask.hide(ns.app.centerRegion);
 
                         ns.alert(r);
@@ -7233,8 +7231,6 @@
 
                         var response = api.response.Response(Ext.decode(r.responseText));
 
-                        //if (response) {
-
                         // add to dimConf, TODO
                         for (var i = 0, map = dimConf.objectNameMap, header; i < response.headers.length; i++) {
                             header = response.headers[i];
@@ -7245,7 +7241,6 @@
                                 name: header.column
                             };
                         }
-                        //}
 
                         web.mask.show(ns.app.centerRegion, 'Creating table..');
 
@@ -7350,9 +7345,9 @@
 
                         // after render
                         //ns.app.layout = layout;
-                        //ns.app.xLayout = xLayout;
+                        ns.app.xLayout = xLayout;
                         //ns.app.response = response;
-                        //ns.app.xResponse = xResponse;
+                        ns.app.xResponse = xResponse;
                         ns.app.xColAxis = xColAxis;
                         ns.app.xRowAxis = xRowAxis;
                         ns.app.uuidDimUuidsMap = table.uuidDimUuidsMap;
@@ -7364,8 +7359,6 @@
                             web.storage.session.set(layout, 'eventtable');
                         }
 
-                        ns.app.accordion.setGui(layout, xLayout, response, isUpdateGui, table);
-
                         web.mask.hide(ns.app.centerRegion);
 
                         if (NS.isDebug) {
@@ -7418,16 +7411,14 @@
                         ns.app.centerRegion.update(table.html);
 
                         // after render
-                        ns.app.layout = layout;
-                        ns.app.response = response;
+                        //ns.app.layout = layout;
+                        //ns.app.response = response;
                         ns.app.xResponse = xResponse;
 
                         if (NS.isSessionStorage) {
                             web.events.setColumnHeaderMouseHandlers(layout, response, xResponse);
                         }
 
-                        ns.app.accordion.setGui(layout, null, response, isUpdateGui, table);
-
                         web.mask.hide(ns.app.centerRegion);
                     };
 
@@ -7437,9 +7428,13 @@
                     getOptionSets(xResponse, getReport);
 				};
 
+                // success
                 ns.app.layout = layout;
-                ns.app.response = response;
-
+                ns.app.response = response;                
+
+                ns.app.accordion.setGui(layout, response, isUpdateGui);
+
+                // no data
                 if (!response.rows.length) {
                     ns.app.centerRegion.removeAll(true);
                     ns.app.centerRegion.update('');