dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7798
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-08-01 09:35:18 +0700
message:
  Fix bug: Don't select birthdate in representative form.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/underAgeForm.vm


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js	2012-07-27 03:53:01 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js	2012-08-01 02:35:18 +0000
@@ -223,14 +223,23 @@
 	if( jQuery(this_).is(":checked"))
 	{
 		jQuery('#representativeDiv').dialog('destroy').remove();
-		jQuery('<div id="representativeDiv">' ).load( 'showAddRepresentative.action' ).dialog({
+		jQuery('<div id="representativeDiv">' ).load( 'showAddRepresentative.action',{},
+			function(){
+				$('#patientForm [id=birthDate]').attr('id','birthDate_id');
+				$('#patientForm [id=birthDate_id]').attr('name','birthDate_id');
+			}).dialog({
 			title: i18n_child_representative,
 			maximize: true, 
 			closable: true,
 			modal:true,
 			overlay:{background:'#000000', opacity:0.1},
 			width: 800,
-			height: 450
+			height: 450,
+			close:function()
+			{
+				$('#patientForm [id=birthDate_id]').attr('id','birthDate');
+				$('#patientForm [id=birthDate]').attr('name','birthDate');
+			}
 		});
 	}else
 	{

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/underAgeForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/underAgeForm.vm	2012-07-31 14:38:56 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/underAgeForm.vm	2012-08-01 02:35:18 +0000
@@ -4,7 +4,9 @@
 		jQuery("#tabs").tabs();
 		hideById('addRepresentativeForm [id=underAgeDiv]');
 		addEventForPatientForm('addRepresentativeForm');
-		
+		$('#addRepresentativeForm [id=dobType]').removeAttr('onchange');
+		$('#addRepresentativeForm [id=dobType]').attr('onchange', 'dobTypeOnChange( "addRepresentativeForm" );');
+				
 		jQuery("#searchForm").validate({
 			meta:"validate"
 			,errorElement:"span"