=== modified file 'local/vn/dhis-web-dataentry-hospital/src/main/resources/org/hisp/dhis/de/i18n_module.properties' --- local/vn/dhis-web-dataentry-hospital/src/main/resources/org/hisp/dhis/de/i18n_module.properties 2012-08-08 10:57:13 +0000 +++ local/vn/dhis-web-dataentry-hospital/src/main/resources/org/hisp/dhis/de/i18n_module.properties 2012-08-10 08:52:33 +0000 @@ -135,4 +135,5 @@ select_chapter = Select chapter explore_icd_report_result = Explore ICD report result collapse_icd_report_result = Collapse ICD report result -disease = Disease \ No newline at end of file +disease = Disease +dhis-web-dataentry-hospital = Data Entry \ No newline at end of file === modified file 'local/vn/dhis-web-dataentry-hospital/src/main/resources/org/hisp/dhis/de/i18n_module_vi_VN.properties' --- local/vn/dhis-web-dataentry-hospital/src/main/resources/org/hisp/dhis/de/i18n_module_vi_VN.properties 2012-08-08 10:57:13 +0000 +++ local/vn/dhis-web-dataentry-hospital/src/main/resources/org/hisp/dhis/de/i18n_module_vi_VN.properties 2012-08-10 08:52:33 +0000 @@ -141,4 +141,5 @@ select_chapter = Ch\u1ecdn ch\u01b0\u01a1ng explore_icd_report_result = Hi\u1ec3n th\u1ecb k\u1ebft qu\u1ea3 b\u00e1o c\u00e1o ICD collapse_icd_report_result = Thu nh\u1ecf k\u1ebft qu\u1ea3 b\u00e1o c\u00e1o ICD -disease = B\u1ec7nh \ No newline at end of file +disease = B\u1ec7nh +dhis-web-dataentry-hospital = Nh\u1eadp d\u1eef li\u1ec7u \ No newline at end of file === modified file 'local/vn/dhis-web-dataentry-hospital/src/main/webapp/dhis-web-dataentry-hospital/javascript/form.js' --- local/vn/dhis-web-dataentry-hospital/src/main/webapp/dhis-web-dataentry-hospital/javascript/form.js 2012-08-08 10:57:13 +0000 +++ local/vn/dhis-web-dataentry-hospital/src/main/webapp/dhis-web-dataentry-hospital/javascript/form.js 2012-08-10 08:52:33 +0000 @@ -134,8 +134,15 @@ } ); enable( 'selectedDataSetId' ); - var periodType = $( '#selectedDataSetId option:selected' ).attr( 'periodType' ); + + var periodId = $( '#selectedPeriodId option:selected' ).val(); + var periodType = ""; + if ( periodId && periodId != -1 ) + { + periodType = periodId.split( '_' )[0]; + } + if ( currentPeriodType && currentPeriodType != -1 && currentPeriodType == periodType ) { loadForm( currentDataSetId, getFieldValue( 'valueInput' ) );