=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js 2013-02-25 03:23:27 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js 2013-02-25 03:34:57 +0000 @@ -1501,13 +1501,6 @@ this.aggregateReport.getURLParams( type ); } }, - paramChanged: function() { - if(Ext.getCmp('reportTypeGroup').getValue().reportType=='true') - { - return this.caseBasedReport.isParamChanged(); - } - return true; - }, caseBasedReport: { generate: function( type, isSorted ) { @@ -1570,30 +1563,6 @@ } TR.util.notification.ok(); }, - filter: function() { - TR.util.mask.showMask(TR.cmp.region.center, TR.i18n.loading); - TR.state.isFilter = true; - var url = TR.conf.finals.ajax.path_root + TR.conf.finals.ajax.generatetabularreport_get; - Ext.Ajax.request({ - url: url, - method: "POST", - scope: this, - params: this.getParams(), - success: function(r) { - var json = Ext.JSON.decode(r.responseText); - TR.value.values = json.items; - TR.state.total = json.total; - TR.state.totalRecords = json.totalRecords - TR.value.columns = json.columns; - TR.store.datatable.loadData(TR.value.values,false); - - TR.datatable.setPagingToolbarStatus(); - - TR.util.notification.ok(); - TR.util.mask.hideMask(); - } - }); - }, getParams: function(isSorted) { var p = {}; p.startDate = TR.cmp.settings.startDate.rawValue; @@ -1722,43 +1691,6 @@ } return false; }, - isParamChanged: function() { - if( TR.store.datatable && TR.store.datatable.data.length > 0 ) - { - var orgUnitCols = TR.init.system.maxLevels + 1 - TR.cmp.settings.level.getValue(); - var orgUnitColsInTable = ( TR.datatable.datatable.columns.length - - TR.cmp.params.dataelement.selected.store.data.length - 2 ); - if( orgUnitCols!=orgUnitColsInTable ) - { - return true; - } - - var colNames=[]; - TR.cmp.params.dataelement.selected.store.each( function(r) { - colNames.push( r.data.id ); - }); - - var cols = TR.datatable.datatable.columns; - var colDataLen = 0; - for( var i=0; i