=== 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 2013-08-06 07:12:39 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/activityPlan.js 2013-10-07 13:22:32 +0000 @@ -36,40 +36,37 @@ { setFieldValue('listAll', "true"); hideById('listPatientDiv'); - contentDiv = 'listPatientDiv'; $('#contentDataRecord').html(''); var facilityLB = $('input[name=facilityLB]:checked').val(); var programId = getFieldValue('programIdAddPatient'); - var searchTexts = "stat_" + programId - + "_" + getFieldValue('startDueDate') - + "_" + getFieldValue('endDueDate'); - if(facilityLB=='selected') - { - searchTexts += "_" + getFieldValue('orgunitId'); - } - else if(facilityLB=='all') - { - searchTexts += "_0"; - } - else if(facilityLB=='childrenOnly'){ - searchTexts += "_-1"; - } - searchTexts += "_false_" + getFieldValue('statusEvent'); + var searchTexts = "stat_" + programId + + "_" + getFieldValue('startDueDate') + + "_" + getFieldValue('endDueDate'); + + if( facilityLB == 'selected' ) { + searchTexts += "_" + getFieldValue('orgunitId'); + } + else if( facilityLB == 'all' ) { + searchTexts += "_0"; + } + else if( facilityLB == 'childrenOnly' ) { + searchTexts += "_-1"; + } + + searchTexts += "_false_" + getFieldValue('statusEvent'); showLoader(); - jQuery('#listPatientDiv').load('getActivityPlanRecords.action', - { - programId:programId, - listAll:false, - searchTexts: searchTexts - }, - function() - { - showById('colorHelpLink'); - showById('listPatientDiv'); - setTableStyles(); - hideLoader(); - }); + + jQuery('#listPatientDiv').load('getActivityPlanRecords.action', { + programId: programId, + listAll: false, + searchTexts: searchTexts + }, function() { + showById('colorHelpLink'); + showById('listPatientDiv'); + setTableStyles(); + hideLoader(); + }); } function exportActitityList( type )