dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8258
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-09-25 21:39:35 +0700
message:
  Add validation for enrollment form in Dashboard.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentSelectForm.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/commons.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2012-09-24 14:44:12 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2012-09-25 14:39:35 +0000
@@ -1183,12 +1183,12 @@
 		if(type=='2'){
 			hideById('enrollmentDateTR');
 			hideById('dateOfIncidentTR');
-			disable('enrollmentDate');
-			disable('dateOfIncident');
+			disable('enrollmentDateField');
+			disable('dateOfIncidentField');
 		}
 		else{
-			showById( 'enrollmentDateTR');
-			enable('enrollmentDate');
+			showById('enrollmentDateTR');
+			enable('enrollmentDateField');
 			
 			var dateOfEnrollmentDescription = jQuery('#enrollmentDiv [name=programId] option:selected').attr('dateOfEnrollmentDescription');
 			var dateOfIncidentDescription = jQuery('#enrollmentDiv [name=programId] option:selected').attr('dateOfIncidentDescription');
@@ -1198,11 +1198,11 @@
 			var displayIncidentDate = jQuery('#enrollmentDiv [name=programId] option:selected').attr('displayIncidentDate');
 			if( displayIncidentDate=='true'){
 				showById('dateOfIncidentTR');
-				enable('dateOfIncident');
+				enable('enrollmentDateField');
 			}
 			else{
 				hideById('dateOfIncidentTR');
-				disable('dateOfIncident');
+				disable('enrollmentDateField');
 			}
 		}
 		var programId = jQuery('#programEnrollmentSelectDiv [id=programId] option:selected').val();
@@ -1215,7 +1215,7 @@
 	}
 }
 
-function saveEnrollment( patientId, programId )
+function saveEnrollment()
 {
 	var patientId = jQuery('#enrollmentDiv [id=patientId]').val();
 	var programId = jQuery('#enrollmentDiv [id=programId] option:selected').val();

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentSelectForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentSelectForm.vm	2012-09-20 13:04:02 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentSelectForm.vm	2012-09-25 14:39:35 +0000
@@ -8,7 +8,7 @@
 <script>
 	jQuery("#programEnrollmentSelectDiv").ready(function(){
 		validation( 'programEnrollmentSelectDiv', function(form){
-			form.submit();
+			saveEnrollment();
 		});
 		datePickerInRangeValid( 'dateOfIncidentField' , 'enrollmentDateField' );
 		setFieldValue("dateOfIncidentField", "");
@@ -16,7 +16,7 @@
 	});	
 </script>
 
-<form id='programEnrollmentSelectDiv' name='programEnrollmentSelectDiv' method='POST'>
+<form id='programEnrollmentSelectDiv' name='programEnrollmentSelectDiv' method='POST' action='saveProgramEnrollment.action'>
 	<input type="hidden" id="patientId" name="patientId" value="$patient.id">
 	<table>
 		<tr>
@@ -57,7 +57,7 @@
 		<tr>
 			<td></td>
 			<td colspan='2'>
-				<input type="button" class='button' value="$i18n.getString( 'enroll' )" onclick='saveEnrollment()'/>
+				<input type="submit" class='button' value="$i18n.getString( 'enroll' )" />
 				<input type="button" class='button' value="$i18n.getString( 'cancel' )" onclick="jQuery('#enrollmentDiv').dialog('close')"/>
 			</td>
 		</tr>