$i18n.getString('program') | @@ -54,4 +54,7 @@ var i18n_date_is_greater_then_or_equals_due_date = '$encoder.jsEscape( $i18n.getString( "date_is_greater_then_or_equals_due_date" ) , "'")'; var i18n_violate_validation = '$encoder.jsEscape( $i18n.getString( "violate_validation" ) , "'")'; + + var i18n_delete_current_event_success = '$encoder.jsEscape( $i18n.getString( "delete_current_event_success" ) , "'")'; + var i18n_please_enter_report_date = '$encoder.jsEscape( $i18n.getString( "please_enter_report_date" ) , "'")'; \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm 2011-11-21 12:44:20 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm 2011-12-15 06:47:36 +0000 @@ -22,6 +22,7 @@ + === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/anonymousRegistration.js' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/anonymousRegistration.js 2011-12-15 04:13:03 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/anonymousRegistration.js 2011-12-15 06:47:36 +0000 @@ -3,6 +3,11 @@ { disable('executionDate'); setFieldValue('executionDate', ''); + $('#executionDate').unbind('change'); + + disable('createEventBtn'); + disable('deleteCurrentEventBtn'); + $.postJSON( 'loadAnonymousPrograms.action',{} , function( json ) @@ -23,10 +28,10 @@ function showEventForm() { + setFieldValue('executionDate', ''); + if( getFieldValue('programId') == '' ) { - disable('executionDate'); - setFieldValue('executionDate', ''); hideById('dataEntryFormDiv'); return; } @@ -55,5 +60,59 @@ enable('executionDate'); hideById('loaderDiv'); showById('dataEntryFormDiv'); + + var programStageInstanceId = getFieldValue('programStageInstanceId'); + + if( programStageInstanceId == '' ) + { + $('#executionDate').unbind('change'); + disable('deleteCurrentEventBtn'); + enable('createEventBtn'); + } + else + { + disable('createEventBtn'); + enable('deleteCurrentEventBtn'); + } + } ); +} + +function createNewEvent() +{ + saveExecutionDate( getFieldValue('programStageId'), getFieldValue('executionDate') ); + loadEventRegistrationForm(); + + disable('createEventBtn'); + enable('deleteCurrentEventBtn'); + + $('#executionDate').change(function() { + saveExecutionDate( getFieldValue('programStageId'), getFieldValue('executionDate') ); + }); +} + +function deleteCurrentEvent() +{ + jQuery.postJSON( "removeCurrentEncounter.action", + { + programInstanceId: getFieldValue('programInstanceId') + }, + function( json ) + { + var type = json.response; + + if( type == 'success' ) + { + showSuccessMessage( i18n_delete_current_event_success ); + hideById('dataEntryFormDiv'); + setFieldValue('executionDate',''); + $('#executionDate').unbind('change'); + disable('deleteCurrentEventBtn'); + enable('createEventBtn'); + } + else if( type == 'input' ) + { + showWarningMessage( json.message ); + } + }); } \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js 2011-11-21 12:44:20 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js 2011-12-15 06:47:36 +0000 @@ -655,11 +655,12 @@ if( executionDate != "") { markValue( ERROR ); - window.alert( i18n_invalid_date ); + showWarningMessage( i18n_invalid_date ); } else { - markValue( resultColor ); + markValue( ERROR ); + showWarningMessage( i18n_please_enter_report_date ); } hideById('dataEntryFormDiv'); }