=== 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-09-13 13:49:39 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/report.js 2012-09-23 05:47:37 +0000 @@ -50,6 +50,8 @@ { jQuery( "[name=newEncounterBtn]" ).addClass("hidden"); jQuery( "[name=newEncounterBtn]" ).removeClass("show-new-event"); + jQuery( "[status=3]" ).attr("disabled", true); + jQuery( "[status=4]" ).attr("disabled", true); hideLoader(); hideById( 'message' ); showById( 'contentDiv' ); @@ -59,28 +61,19 @@ function loadDataEntry( programStageInstanceId ) { - setInnerHTML('viewRecordsDiv', '' ); + jQuery('#patientInforTB').val(''); jQuery('#viewRecordsDiv' ) .load( 'viewProgramStageRecords.action?programStageInstanceId=' + programStageInstanceId ,function(){ - jQuery( "#viewRecordsDiv :input").each(function(){ - disable(this.id); - }); + jQuery("#viewRecordsDiv :input" ).attr("disabled", true); + jQuery("#viewRecordsDiv :input" ).datepicker("destroy"); + jQuery(".ui-combobox" ).hide(); hideById('inputCriteriaDiv'); var programStageInstance = jQuery("#ps_" + programStageInstanceId); - var header = ""; - if( programStageInstance.attr("reportDate")=='') - { - header = "

" + i18n_no_records + "

"; - } - else - { - header = "

" + i18n_records_for + " " + programStageInstance.attr("orgunit") - + " " + i18n_at + " " + programStageInstance.attr("psname") - + " " + i18n_on_date + " " + programStageInstance.attr("reportDate") + "


"; - } - + var header = "

" + i18n_records_for + " " + programStageInstance.attr("orgunit") + + " " + i18n_at + " " + programStageInstance.attr("psname") + + " " + i18n_on_date + " " + programStageInstance.attr("reportDate") + "


"; setInnerHTML('patientInforTB', header ); }) .dialog({ @@ -89,7 +82,7 @@ closable: true, modal:false, overlay:{background:'#000000', opacity:0.1}, - width: 800, + width: 840, height: 400 }); }