=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml 2012-10-18 04:24:34 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml 2012-10-23 03:47:18 +0000 @@ -242,7 +242,7 @@ /content.vm - /dhis-web-caseentry/programStageDataEntryForm.vm + /dhis-web-caseentry/reportDataEntryForm.vm javascript/entry.js,../dhis-web-commons/javascripts/date.js style/style.css === 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 2012-10-07 03:12:47 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/report.js 2012-10-23 03:47:18 +0000 @@ -32,7 +32,6 @@ function loadDataEntry( programStageInstanceId ) { - jQuery('#patientInforTB').val(''); jQuery('#viewRecordsDiv' ) .load( 'viewProgramStageRecords.action?programStageInstanceId=' + programStageInstanceId ,function(){ @@ -40,12 +39,6 @@ jQuery("#viewRecordsDiv :input" ).datepicker("destroy"); jQuery(".ui-combobox" ).hide(); hideById('inputCriteriaDiv'); - - var programStageInstance = jQuery("#ps_" + programStageInstanceId); - var header = "

" + i18n_records_for + " " + getInnerHTML( 'org_' + programStageInstanceId ) - + " " + i18n_at + " " + programStageInstance.attr("psname") - + " " + i18n_on_date + " " + programStageInstance.attr("reportDate") + "


"; - setInnerHTML('patientInforTB', header ); }) .dialog({ title: i18n_reports, === added file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportDataEntryForm.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportDataEntryForm.vm 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportDataEntryForm.vm 2012-10-23 03:47:18 +0000 @@ -0,0 +1,5 @@ +

$i18n.getString('records_for') $organisationUnit.name $i18n.getString('at') $programStage.name $i18n.getString('on') $format.formatDate($programStageInstance.executionDate)

+
+
+ #parse( "dhis-web-caseentry/dataEntryForm.vm" ) +
\ No newline at end of file