dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 14879
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2014-04-16 21:07:26 +0800
message:
  Fixed bug in Lost to follow up
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/smsReminder.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/smsReminder.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/smsReminder.js	2014-04-15 15:19:24 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/smsReminder.js	2014-04-16 13:07:26 +0000
@@ -77,7 +77,7 @@
 		data : params,
 		dataType : "json",
 		success : function(json) {
-			setInnerHTML('listEventDiv', displayEventList(json, page));
+			setInnerHTML('listEventDiv', displayevents(json, page));
 			showById('listEventDiv');
 			jQuery('#loaderDiv').hide();
 			setTableStyles();
@@ -86,7 +86,7 @@
 	
 }
 
-function displayEventList(json, page) {
+function displayevents(json, page) {
 	var table = "";
 	
 	// Header
@@ -113,8 +113,8 @@
 		table += "</tr></thead>";
 		
 		table += "<tbody id='list'>";
-		for ( var i in json.eventList) {
-			var row = json.eventList[i];
+		for ( var i in json.events) {
+			var row = json.events[i];
 			var uid = row.event;
 			var teiUid = row.trackedEntityInstance;
 			var no = eval(json.pager.page);
@@ -196,7 +196,7 @@
 }
 
 // --------------------------------------------------------------------
-// Search eventList
+// Search events
 // --------------------------------------------------------------------
 
 followup = true;
@@ -210,11 +210,11 @@
 	showLoader();
 	params += "&orgUnit=" + getFieldValue("orgunitId");
 	$.ajax({
-		url : '../api/eventList.json',
+		url : '../api/events.json',
 		type : "GET",
 		data : params,
 		success : function(json) {
-			setInnerHTML('listEventDiv', displayEventList(json, page));
+			setInnerHTML('listEventDiv', displayevents(json, page));
 			showById('listEventDiv');
 			jQuery('#loaderDiv').hide();
 			setTableStyles();
@@ -381,10 +381,10 @@
 	hideById('smsManagementDiv');
 	hideById('entityInstanceDashboard');
 	
-	if( eventList == 1){
+	if( events == 1){
 		listAllTrackedEntityInstance();
 	}
-	else if( eventList == 2){
+	else if( events == 2){
 		validateAdvancedSearch();
 	}
 }