=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java 2014-01-14 10:18:00 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java 2014-01-14 11:12:16 +0000 @@ -536,7 +536,7 @@ } event.setStatus( EventStatus.fromInt( programStageInstance.getStatus() ) ); - event.setEventDate( programStageInstance.getExecutionDate().toString() ); + event.setEventDate( DateUtils.getLongDateString( programStageInstance.getExecutionDate() ) ); event.setStoredBy( programStageInstance.getCompletedUser() ); event.setOrgUnit( programStageInstance.getOrganisationUnit().getUid() ); event.setProgram( programStageInstance.getProgramInstance().getProgram().getUid() ); @@ -775,7 +775,6 @@ { programStageInstance = createProgramStageInstance( programStage, programInstance, organisationUnit, eventDate, EventStatus.COMPLETED.equals( event.getStatus() ), event.getCoordinate(), storedBy ); - } else {