=== 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 2013-12-29 17:27:07 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java 2013-12-29 17:54:54 +0000 @@ -57,6 +57,7 @@ import org.hisp.dhis.program.ProgramStageInstance; import org.hisp.dhis.program.ProgramStageInstanceService; import org.hisp.dhis.program.ProgramStageService; +import org.hisp.dhis.system.util.DateUtils; import org.hisp.dhis.user.CurrentUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.Assert; @@ -747,7 +748,7 @@ importSummary.setStatus( ImportStatus.SUCCESS ); boolean dryRun = importOptions != null && importOptions.isDryRun(); - Date eventDate = getFormat().parseDate( event.getEventDate() ); + Date eventDate = DateUtils.getMediumDate( event.getEventDate() ); if ( eventDate == null ) { === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/NoRegistrationSingleEventServiceTest.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/NoRegistrationSingleEventServiceTest.java 2013-12-27 12:47:38 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/NoRegistrationSingleEventServiceTest.java 2013-12-29 17:54:54 +0000 @@ -264,6 +264,7 @@ Event event = new Event(); event.setProgram( program ); event.setOrgUnit( orgUnit ); + event.setEventDate( "2013-01-01" ); event.getDataValues().add( new DataValue( dataElementA.getUid(), "10" ) ); === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/RegistrationMultiEventsServiceTest.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/RegistrationMultiEventsServiceTest.java 2013-12-27 12:47:38 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/RegistrationMultiEventsServiceTest.java 2013-12-29 17:54:54 +0000 @@ -317,6 +317,7 @@ event.setProgramStage( programStage ); event.setOrgUnit( orgUnit ); event.setPerson( person ); + event.setEventDate( "2013-01-01" ); event.getDataValues().add( new DataValue( dataElement, "10" ) ); === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/RegistrationSingleEventServiceTest.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/RegistrationSingleEventServiceTest.java 2013-12-27 12:47:38 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/RegistrationSingleEventServiceTest.java 2013-12-29 17:54:54 +0000 @@ -248,6 +248,7 @@ event.setProgram( program ); event.setOrgUnit( orgUnit ); event.setPerson( person ); + event.setEventDate( "2013-01-01" ); event.getDataValues().add( new DataValue( dataElementA.getUid(), "10" ) );