← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 15754: Fixed bug - The show-events-up-to field in visit-schedule form is disable when to ALL status is s...

 

------------------------------------------------------------
revno: 15754
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2014-06-19 16:44:10 +0800
message:
  Fixed bug - The show-events-up-to field in visit-schedule form is disable when to ALL status is selected.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/activityPlan.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/activityPlan.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/activityPlan.js	2014-05-25 14:36:40 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/activityPlan.js	2014-06-19 08:44:10 +0000
@@ -367,14 +367,12 @@
 	{
 		var status = getFieldValue("status");
 
-		if( status == '1_2_3_4'
-			|| status == '3_4'
-			|| status == '2_3_4' ){
+		if( status == '' || status == 'SKIPPED' ){
 			enable('showEventSince');
 			enable('showEventUpTo');
 			setDateRange();
 		}
-		else if( status == '3' ){
+		else if( status == 'FUTURE_VISIT' ){
 			disable('showEventSince');
 			enable('showEventUpTo');
 			setDateRange();