=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientStore.java' --- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientStore.java 2012-07-13 02:46:02 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientStore.java 2012-07-19 03:26:16 +0000 @@ -379,7 +379,7 @@ { sql += statementBuilder.limitRecord( min, max ); } -System.out.println("\n\n === \n SQL : " + sql ); + return sql; } === 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 2012-07-12 09:01:49 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js 2012-07-19 03:26:16 +0000 @@ -748,7 +748,7 @@ var json = Ext.JSON.decode(r.responseText); TR.state.total = json.total; TR.value.columns = json.columns; - TR.value.values=json.items; + TR.value.values = json.items; // Get fields var fields = []; @@ -800,7 +800,14 @@ params: this.getParams(), success: function(r) { var json = Ext.JSON.decode(r.responseText); - TR.store.datatable.loadData(json.items,false); + TR.value.values = json.items; + var record = new Array(); + for( var index=1; index < TR.value.columns.length; index++ ){ + record.push(''); + } + TR.value.values.unshift(record); + + TR.store.datatable.loadData(TR.value.values,false); if ( json.items.length > 1 ) { Ext.getCmp('btnClean').enable(); @@ -1167,7 +1174,7 @@ Ext.Msg.confirm( TR.i18n.confirmation, TR.i18n.are_you_sure, function(btn){ if (btn == 'yes') { - var params = 'programStageInstanceId=' + psiId; + var params = 'id=' + psiId; Ext.Ajax.request({ url: TR.conf.finals.ajax.path_commons + TR.conf.finals.ajax.datavalue_delete, method: 'GET',