=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/plugin.js' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/plugin.js 2012-05-19 11:33:16 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/plugin.js 2012-05-19 17:08:08 +0000 @@ -1138,7 +1138,7 @@ DHIS.table.tables[el].destroy(); } }, - getDataQuery: function(conf,url) { + getDataQuery: function(conf, url) { Ext.Array.each(conf.indicators, function(item) { url = Ext.String.urlAppend(url, 'in=' + item); }); @@ -1179,7 +1179,7 @@ }); return headers; }, - getColumnArray: function(conf,data) { + getColumnArray: function(conf, data) { var columns = []; Ext.Array.each(data.headers, function(header, index) { if (!Ext.Array.contains(conf.hiddenCols, index) && !Ext.Array.contains(conf.hiddenCols, header)) { @@ -1212,14 +1212,16 @@ }; DHIS.table.plain = { - getMarkup: function(data) { + getMarkup: function(conf, data) { var html = ''; var classMap = []; /* Col index -> class markup */ Ext.Array.each(data.headers, function(header, index) { - var clazz = !header.meta ? ' class=\"val\"' : ''; - classMap[index] = clazz; - html += '' + header.name + '<\/th>'; + if (!Ext.Array.contains(conf.hiddenCols, index)) { + var clazz = !header.meta ? ' class=\"val\"' : ''; + classMap[index] = clazz; + html += '' + header.name + '<\/th>'; + } }); html += '<\/tr>'; @@ -1227,8 +1229,10 @@ Ext.Array.each(data.rows, function(row) { html += ''; Ext.Array.each(row, function(field, index) { - var clazz = classMap[index]; - html += '' + field + '<\/td>'; + if (!Ext.Array.contains(conf.hiddenCols, index)) { + var clazz = classMap[index]; + html += '' + field + '<\/td>'; + } }); html += '<\/tr>'; }); @@ -1241,7 +1245,7 @@ url: DHIS.table.utils.getTableDataUrl(conf), disableCaching: false, success: function(data) { - var html = DHIS.table.plain.getMarkup(data); + var html = DHIS.table.plain.getMarkup(conf, data); Ext.get(conf.el).update(html); } }); === modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/plugin/index.html' --- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/plugin/index.html 2012-05-19 16:34:10 +0000 +++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/plugin/index.html 2012-05-19 17:08:08 +0000 @@ -2,7 +2,7 @@ - +