=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/underAgeForm.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/underAgeForm.vm 2010-11-29 07:56:53 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/underAgeForm.vm 2010-11-29 08:15:17 +0000 @@ -35,12 +35,17 @@ birthDate :{required:false,dateISO:true,datelessthanequaltoday:true} },beforeValidateHandler: function(form) { - var birthDate = $('#birthDate').val(); - var age = $('#age').val(); - if(age !=''){ - $( "#memberValidator").val(age); + var dobType = $('#dobType').val(); + + if( dobType=='V' || dobType=='D' ) + { + var birthDate = $('#birthDate').val(); + if( birthDate != '' ){ + $("#memberValidator").val(birthDate); + } }else{ - $( "#memberValidator").val(birthDate); + var age = $('#age').val(); + $("#memberValidator").val(age); } } });