← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 8440: Don't enroll person into program with displayIncidentDate as false.

 

------------------------------------------------------------
revno: 8440
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-10-09 09:31:56 +0700
message:
  Don't enroll person into program with displayIncidentDate as false.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js


--
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-10-07 05:32:03 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2012-10-09 02:31:56 +0000
@@ -1169,6 +1169,8 @@
 	if( programId==0){
 		hideById('enrollmentDateTR');
 		hideById('dateOfIncidentTR');
+		disable('enrollmentDateField');
+		disable('dateOfIncidentField');
 	}
 	else{
 		var type = jQuery('#enrollmentDiv [name=programId] option:selected').attr('programType')
@@ -1190,11 +1192,11 @@
 			var displayIncidentDate = jQuery('#enrollmentDiv [name=programId] option:selected').attr('displayIncidentDate');
 			if( displayIncidentDate=='true'){
 				showById('dateOfIncidentTR');
-				enable('enrollmentDateField');
+				enable('dateOfIncidentField');
 			}
 			else{
 				hideById('dateOfIncidentTR');
-				disable('enrollmentDateField');
+				disable('dateOfIncidentField');
 			}
 		}
 		var programId = jQuery('#programEnrollmentSelectDiv [id=programId] option:selected').val();