=== 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 2011-09-29 04:50:21 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2011-09-29 06:14:57 +0000 @@ -428,4 +428,5 @@ identifier_type = Beneficiary Identifier Type choose_this_person = Choose this person format_date = Format Date -specify_search_criteria = Please specify search criteria \ No newline at end of file +specify_search_criteria = Please specify search criteria +patient_profile = Beneficiary profile \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/report.js' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/report.js 2011-09-28 04:18:15 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/report.js 2011-09-29 06:14:57 +0000 @@ -101,3 +101,16 @@ height: 400 }); } + +function patientDetails( patientId ) +{ + $('
' ).load( 'getPatientDetails.action?id=' + patientId ).dialog({ + title: i18n_patient_profile, + maximize: true, + closable: true, + modal:true, + overlay:{background:'#000000', opacity:0.1}, + width: 450, + height: 400 + }); +} === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/report.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/report.vm 2011-09-28 04:02:30 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/report.vm 2011-09-29 06:14:57 +0000 @@ -25,7 +25,7 @@ #set( $nr = ( ( $paging.getCurrentPage() - 1 ) * $paging.pageSize ) + $velocityCount ) $nr - $programInstance.patient.getFullName() + $programInstance.patient.getFullName() #foreach( $programStageInstance in $programInstance.programStageInstances ) #if( $programStageInstance.executionDate ) @@ -58,7 +58,4 @@ #end -

- - +

\ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportSelect.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportSelect.vm 2011-09-28 04:18:15 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportSelect.vm 2011-09-29 06:14:57 +0000 @@ -60,4 +60,5 @@ var i18n_report_generation_failed = '$encoder.jsEscape( $i18n.getString( "report_generation_failed" ), "'")'; var i18n_please_select_a_program = '[' + '$encoder.jsEscape( $i18n.getString( "please_select_a_program" ), "'")' + ']'; var i18n_reports = '$encoder.jsEscape( $i18n.getString( "reports" ), "'")'; + var i18n_patient_profile = '$encoder.jsEscape( $i18n.getString( "patient_profile" ), "'")';