← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 10356: Change operator to Number-of-visit if selected program is anonymous.

 

------------------------------------------------------------
revno: 10356
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-03-20 21:22:22 +0700
message:
  Change operator to Number-of-visit if selected program is anonymous.
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/caseaggregation.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-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/caseaggregation.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/caseaggregation.js	2013-03-08 14:07:03 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/caseaggregation.js	2013-03-20 14:22:22 +0000
@@ -123,8 +123,13 @@
 		disable('programStageProperty');
 	}
 	
-	if(jQuery("#programStageId").attr("programType")==3){
+	if(jQuery('#programId option:selected').attr('programType')==3){
 		jQuery("[name=multiProgram]").remove();
+		if( jQuery("[value=times]").attr('checked')!=undefined
+			&& jQuery("[value=times]").attr('checked')!='true'  )
+		{
+			jQuery("[value=times]").attr('checked',true);
+		}
 	}
 	
 	jQuery.getJSON( 'getParamsByProgram.action',{ programId:programId }
@@ -150,7 +155,7 @@
 			getPatientDataElements();
 			
 			clearListById( 'caseProperty' );
-			var type = jQuery('#programId option:selected').attr('type');
+			var type = jQuery('#programId option:selected').attr('programType');
 			if( type!='3')
 			{
 				var caseProperty = jQuery( '#caseProperty' );