dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 10922
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-05-21 16:23:50 +0700
message:
  renamed executionDate => eventDate on event api
modified:
  dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/event/BaseEventService.java
  dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/event/Event.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-dxf2/src/main/java/org/hisp/dhis/dxf2/event/BaseEventService.java'
--- dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/event/BaseEventService.java	2013-05-18 06:07:28 +0000
+++ dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/event/BaseEventService.java	2013-05-21 09:23:50 +0000
@@ -173,17 +173,17 @@
             return new ImportSummary( ImportStatus.ERROR, ex.getMessage() );
         }
 
-        Date executionDate = format.parseDate( event.getExecutionDate() );
+        Date eventDate = format.parseDate( event.getEventDate() );
 
-        if ( executionDate == null )
+        if ( eventDate == null )
         {
-            return new ImportSummary( ImportStatus.ERROR, "Event executionDate is not in a valid format." );
+            return new ImportSummary( ImportStatus.ERROR, "Event eventDate is not in a valid format." );
         }
 
         ImportSummary importSummary = new ImportSummary();
         importSummary.setStatus( ImportStatus.SUCCESS );
 
-        ProgramStageInstance programStageInstance = saveExecutionDate( program, organisationUnit, executionDate,
+        ProgramStageInstance programStageInstance = saveEventDate( program, organisationUnit, eventDate,
             event.getCompleted(), event.getCoordinate() );
 
         String storedBy = event.getStoredBy();
@@ -244,7 +244,7 @@
         return new ImportSummary();
     }
 
-    private ProgramStageInstance saveExecutionDate( Program program, OrganisationUnit organisationUnit, Date date, Boolean completed,
+    private ProgramStageInstance saveEventDate( Program program, OrganisationUnit organisationUnit, Date date, Boolean completed,
         Coordinate coordinate )
     {
         ProgramStage programStage = program.getProgramStages().iterator().next();

=== modified file 'dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/event/Event.java'
--- dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/event/Event.java	2013-05-18 06:07:28 +0000
+++ dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/event/Event.java	2013-05-21 09:23:50 +0000
@@ -50,7 +50,7 @@
 
     private String patientId;
 
-    private String executionDate;
+    private String eventDate;
 
     private Boolean completed = false;
 
@@ -114,14 +114,14 @@
 
     @JsonProperty( required = true )
     @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0, isAttribute = true )
-    public String getExecutionDate()
+    public String getEventDate()
     {
-        return executionDate;
+        return eventDate;
     }
 
-    public void setExecutionDate( String executionDate )
+    public void setEventDate( String eventDate )
     {
-        this.executionDate = executionDate;
+        this.eventDate = eventDate;
     }
 
     @JsonProperty
@@ -181,7 +181,7 @@
             ", eventId='" + eventId + '\'' +
             ", organisationUnitId='" + organisationUnitId + '\'' +
             ", patientId='" + patientId + '\'' +
-            ", executionDate='" + executionDate + '\'' +
+            ", eventDate='" + eventDate + '\'' +
             ", completed=" + completed +
             ", storedBy='" + storedBy + '\'' +
             ", coordinate=" + coordinate +