------------------------------------------------------------
revno: 13720
committer: Lars Helge Øverland <larshe...@gmail.com>
branch nick: dhis2
timestamp: Tue 2014-01-14 12:12:16 +0100
message:
Event service, date fix
modified:
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== 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
{
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
