=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2012-10-31 07:27:43 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2012-10-31 16:02:05 +0000 @@ -464,4 +464,5 @@ failed_to_get_events = Failed to get events. Please generate resource tables before. single_event_with_registration_management = Single event with registration management multiple_individual_records_management = Multiple individual records management -manual_person_aggregation_form = Manual person aggregation \ No newline at end of file +manual_person_aggregation_form = Manual person aggregation +events = events \ No newline at end of file === 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-10-23 13:15:16 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js 2012-10-31 16:02:05 +0000 @@ -713,6 +713,7 @@ TR.state = { currentPage: 1, total: 1, + totalRecords: 0, orderByOrgunitAsc: true, orderByExecutionDateByAsc: true, orgunitIds: [], @@ -741,11 +742,11 @@ success: function(r) { var json = Ext.JSON.decode(r.responseText); if(json.message!=""){ - //TR.util.notification.warning(json.message); TR.util.notification.error(TR.i18n.error, json.message); } else{ TR.state.total = json.total; + TR.state.totalRecords = json.totalRecords TR.value.columns = json.columns; TR.value.values = json.items; @@ -1351,7 +1352,12 @@ handler: function() { TR.exe.paging( TR.cmp.settings.currentPage.rawValue ); } - } + }, + '->', + { + xtype: 'label', + text: TR.state.totalRecords + ' ' + TR.i18n.events + }, ], plugins: [this.cellEditing], store: TR.store.datatable @@ -2095,7 +2101,7 @@ name: 'availableDataelements', cls: 'tr-toolbar-multiselect-left', width: (TR.conf.layout.west_fieldset_width - TR.conf.layout.west_width_subtractor) / 2, - height: 215, + height: 240, displayField: 'name', valueField: 'id', queryMode: 'remote', @@ -2158,7 +2164,7 @@ name: 'selectedDataelements', cls: 'tr-toolbar-multiselect-right', width: (TR.conf.layout.west_fieldset_width - TR.conf.layout.west_width_subtractor) / 2, - height: 215, + height: 240, displayField: 'name', valueField: 'id', ddReorder: true, === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/i18n.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/i18n.vm 2012-10-06 04:54:55 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/i18n.vm 2012-10-31 16:02:05 +0000 @@ -92,5 +92,6 @@ value_is_invalid:'$encoder.jsEscape($i18n.getString( 'value_is_invalid' ) , "'")', value_is_valid:'$encoder.jsEscape($i18n.getString( 'value_is_valid' ) , "'")', em_no_program_stage: '$encoder.jsEscape($i18n.getString( 'em_no_program_stage' ) , "'")', -error: '$encoder.jsEscape($i18n.getString( 'error' ) , "'")' +error: '$encoder.jsEscape($i18n.getString( 'error' ) , "'")', +events: '$encoder.jsEscape($i18n.getString( 'events' ) , "'")' }; \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularReportResult.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularReportResult.vm 2012-10-06 04:54:55 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularReportResult.vm 2012-10-31 16:02:05 +0000 @@ -5,6 +5,7 @@ #set( $metaData = $noHeader - $valueTypes.size() ) "message": "$!message", "total": "$total", +"totalRecords": "$totalRecords", "columns":[ #set($index = 0) #foreach( $col in $grid.getHeaders() )