=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/statisticalReport.js' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/statisticalReport.js 2012-12-17 02:42:30 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/statisticalReport.js 2012-12-17 03:12:41 +0000 @@ -73,3 +73,28 @@ showById('reportTbl'); hideById('detailsDiv'); } + +function loadDataEntry( programStageInstanceId ) +{ + jQuery('#viewRecordsDiv' ) + .load( 'viewProgramStageRecords.action?programStageInstanceId=' + programStageInstanceId + ,function(){ + jQuery("#viewRecordsDiv :input" ).attr("disabled", true); + jQuery("#viewRecordsDiv :input" ).datepicker("destroy"); + showById("reportTitle"); + hideById("patientInforTB"); + jQuery(".ui-combobox" ).hide(); + hideById('inputCriteriaDiv'); + }) + .dialog({ + title: i18n_reports, + maximize: true, + closable: true, + modal:false, + overlay:{background:'#000000', opacity:0.1}, + width: 840, + height: 400 + }); +} + +function entryFormContainerOnReady(){} \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/statisticalProgramDetailsReport.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/statisticalProgramDetailsReport.vm 2012-12-17 02:46:17 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/statisticalProgramDetailsReport.vm 2012-12-17 03:12:41 +0000 @@ -7,11 +7,10 @@ - +
- @@ -19,16 +18,18 @@ - + + - + + @@ -39,12 +40,18 @@ #set( $nr = ( ( $paging.getCurrentPage() - 1 ) * $paging.pageSize ) + $velocityCount ) $nr + - + + #end @@ -61,6 +68,8 @@
#$i18n.getString( "orgunit" ) $i18n.getString('full_name') $i18n.getString( "gender" ) $i18n.getString( "date_of_birth" ) $i18n.getString( "age" ) $i18n.getString( "phone_number" )$i18n.getString( "orgunit" )$i18n.getString( "due_date" )$i18n.getString( "report_date" )
$!encoder.htmlEncode($!patient.organisationUnit.name) $!encoder.htmlEncode($patient.getFullName()) $i18n.getString($!patient.gender) $format.formatDate( $!patient.birthDate) $!patient.getAge() $!patient.phoneNumber$!encoder.htmlEncode($!patient.organisationUnit.name)$format.formatDate($!programStageInstance.dueDate) + #if($programStageInstance.executionDate) + $format.formatDate($programStageInstance.executionDate) + #end +
+
+ === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css 2012-12-17 02:42:30 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css 2012-12-17 03:12:41 +0000 @@ -500,6 +500,5 @@ .gridTable th, .gridTable td { line-height: 170%; - width: 150px; }