=== 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 2012-10-17 03:44:58 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js 2012-10-17 05:06:03 +0000 @@ -784,12 +784,12 @@ jQuery.postUTF8( 'setEventStatus.action', { programStageInstanceId:programStageInstanceId, - status:field.value + status:status }, function ( json ) { var eventBox = jQuery('#ps_' + programStageInstanceId); - eventBox.attr('status',field.value); - setEventColorStatus( programStageInstanceId, field.value ); + eventBox.attr('status',status); + setEventColorStatus( programStageInstanceId, status ); resetActiveEvent( eventBox.attr("pi") ); if( status==1){ hideById('del_' + programStageInstanceId); === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitSchedule.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitSchedule.vm 2012-10-17 04:17:37 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitSchedule.vm 2012-10-17 05:06:03 +0000 @@ -23,19 +23,20 @@ #if( $programStageInstances.size() > 0 )
$i18n.getString( "nr" ) | $i18n.getString( "program_stage" ) | $i18n.getString( "reschedule_due_date" ) | $i18n.getString( "status" ) | -$i18n.getString( "message" ) | +$i18n.getString( "message" ) | #if( $auth.hasAccess( "dhis-web-caseentry", "removeCurrentEncounter" ) )$i18n.getString( "remove" ) | #end @@ -55,7 +56,7 @@ #set( $duedateId = "value_" + $programStageInstance.id + "_date" ) #set($status = $programStageInstance.getEventStatus())- + | - | - + + | +
---|