=== 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 2014-04-13 14:11:24 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js 2014-04-13 14:27:06 +0000 @@ -337,7 +337,7 @@ var program = getFieldValue('program'); if (registration == undefined || !registration) { if (program != '') { - enable('statusEvent'); + enable('status'); enable('listEntityInstanceBtn'); enable('addEntityInstanceBtn'); enable('advancedSearchBtn'); @@ -346,7 +346,7 @@ enable(this.id); }); } else { - disable('statusEvent'); + disable('status'); disable('listEntityInstanceBtn'); disable('addEntityInstanceBtn'); disable('advancedSearchBtn'); === 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-11 00:54:51 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/smsReminder.js 2014-04-13 14:27:06 +0000 @@ -33,7 +33,7 @@ for ( i in json.programs ) { if(json.programs[i].type==1){ count++; - jQuery( '#program').append( '' ); + jQuery( '#program').append( '' ); } } if(count==0){ @@ -86,9 +86,7 @@ } - function displayEventList(json, page) { - var table = ""; // Header @@ -113,6 +111,7 @@ table += "#"; table += "" + i18n_event_date + ""; + for(var i in json.events[0].dataValues ){ table += "" + json.events[0].dataValues[i].dataElement + ""; } @@ -162,6 +161,11 @@ // Paging function paging(json, page) { + var searchMethod = "listAllTrackedEntityInstance"; + if( isAdvancedSearch ){ + searchMethod = "validateAdvancedSearch"; + } + var table = "
"; table += "
"; @@ -173,7 +177,7 @@ + i + ""; } else { table += "" + i + ""; } table += "|"; === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingSelect.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingSelect.vm 2014-04-12 02:37:13 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingSelect.vm 2014-04-13 14:27:06 +0000 @@ -174,6 +174,7 @@ var i18n_page = '$encoder.jsEscape( $i18n.getString( "page" ) , "'")'; var i18n_next = '$encoder.jsEscape( $i18n.getString( "next" ) , "'")'; var i18n_last = '$encoder.jsEscape( $i18n.getString( "last" ) , "'")'; + var i18n_no_result_found = '$encoder.jsEscape( $i18n.getString( "no_result_found" ) , "'")'; var checkedDuplicate = false; var registration = false;