dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 6443
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-03-30 08:28:12 +0700
message:
  (patient) Minor fix for add/update patient form
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addPatientForm.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.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/addPatientForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addPatientForm.vm	2012-03-29 08:04:10 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addPatientForm.vm	2012-03-30 01:28:12 +0000
@@ -25,8 +25,8 @@
 						if( birthDate != '' && age!='' )
 						{
 							$("#patientForm [id=memberValidator]").val("birthDate");
-							alert( i18n_please_fill_out_only_one_of_these_fields );
-							jQuery('#birthDate').focus();
+							showById( 'validateBirthdate' );
+							jQuery('#age').focus();
 							isSubmit = false;
 							return;
 						}

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm	2012-03-29 08:04:10 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm	2012-03-30 01:28:12 +0000
@@ -54,6 +54,7 @@
 <tr>
 	<td></td>
 	<td class="input-column" >
+		<span id='validateBirthdate' class="hidden" style='color:red'><i>$i18n.getString('please_fill_out_only_one_of_these_fields')</i></span>
 		<input id="memberValidator" class="hidden {validate:{required:true}}"/>
 	</td>
 </tr>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm	2012-03-29 08:04:10 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm	2012-03-30 01:28:12 +0000
@@ -36,8 +36,8 @@
 						if( birthDate != '' && age!='' )
 						{
 							$("#patientForm [id=memberValidator]").val("birthDate");
-							alert( i18n_please_fill_out_only_one_of_these_fields );
-							jQuery('#birthDate').focus();
+							showById( 'validateBirthdate' );
+							jQuery('#age').focus();
 							isSubmit = false;
 							return;
 						}
@@ -119,7 +119,7 @@
 	<tr>
 		<td></td>
 		<td class="input-column" >
-			<span id='validateBirthdate' class="hidden"><i>$i18n.getString('please_fill_out_only_one_of_these_fields')</i></span>
+			<span id='validateBirthdate' class="hidden" style='color:red'><i>$i18n.getString('please_fill_out_only_one_of_these_fields')</i></span>
 			<input id="memberValidator" class="hidden {validate:{required:true}}"/>
 		</td>
 	</tr>