dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #41502
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 21142: completness information for events and enrollments
------------------------------------------------------------
revno: 21142
committer: Abyot Asalefew Gizaw <abyota@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2015-11-20 12:38:58 +0100
message:
completness information for events and enrollments
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramInstance.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/ProgramInstance.hbm.xml
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/enrollment/AbstractEnrollmentService.java
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/enrollment/Enrollment.java
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/Event.java
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/JdbcEventStore.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-api/src/main/java/org/hisp/dhis/program/ProgramInstance.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramInstance.java 2015-10-05 17:45:17 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramInstance.java 2015-11-20 11:38:58 +0000
@@ -34,6 +34,7 @@
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+
import org.hisp.dhis.common.BaseIdentifiableObject;
import org.hisp.dhis.common.DxfNamespaces;
import org.hisp.dhis.common.view.DetailedView;
@@ -82,6 +83,8 @@
private Boolean followup = false;
private List<TrackedEntityComment> comments = new ArrayList<>();
+
+ private String completedUser;
// -------------------------------------------------------------------------
// Constructors
@@ -403,4 +406,14 @@
{
this.comments = comments;
}
+
+ public String getCompletedUser()
+ {
+ return completedUser;
+ }
+
+ public void setCompletedUser( String completedUser )
+ {
+ this.completedUser = completedUser;
+ }
}
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java 2015-11-03 01:45:13 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java 2015-11-20 11:38:58 +0000
@@ -570,6 +570,7 @@
programInstance.setStatus( ProgramStatus.COMPLETED );
programInstance.setEndDate( new Date() );
+ programInstance.setCompletedUser( currentUserService.getCurrentUsername() );
updateProgramInstance( programInstance );
}
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/ProgramInstance.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/ProgramInstance.hbm.xml 2015-09-24 08:32:10 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/ProgramInstance.hbm.xml 2015-11-20 11:38:58 +0000
@@ -23,6 +23,8 @@
<property name="endDate" column="enddate" />
<property name="followup" column="followup" />
+
+ <property name="completedUser" />
<property name="status" length="50">
<type name="org.hibernate.type.EnumType">
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/enrollment/AbstractEnrollmentService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/enrollment/AbstractEnrollmentService.java 2015-11-19 04:01:09 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/enrollment/AbstractEnrollmentService.java 2015-11-20 11:38:58 +0000
@@ -30,6 +30,7 @@
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
+
import org.hisp.dhis.common.IdentifiableObjectManager;
import org.hisp.dhis.common.OrganisationUnitSelectionMode;
import org.hisp.dhis.common.exception.InvalidIdentifierReferenceException;
@@ -171,6 +172,8 @@
enrollment.setEnrollmentDate( programInstance.getEnrollmentDate() );
enrollment.setIncidentDate( programInstance.getIncidentDate() );
enrollment.setFollowup( programInstance.getFollowup() );
+ enrollment.setCompletedDate( programInstance.getEndDate() );
+ enrollment.setCompletedUser( programInstance.getCompletedUser() );
List<TrackedEntityComment> comments = programInstance.getComments();
@@ -376,6 +379,7 @@
}
else if ( EnrollmentStatus.COMPLETED == enrollment.getStatus() )
{
+ System.out.println("It is completed...");
programInstanceService.completeProgramInstanceStatus( programInstance );
}
else
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/enrollment/Enrollment.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/enrollment/Enrollment.java 2015-09-11 15:53:13 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/enrollment/Enrollment.java 2015-11-20 11:38:58 +0000
@@ -31,6 +31,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+
import org.hisp.dhis.common.DxfNamespaces;
import org.hisp.dhis.dxf2.events.event.Note;
import org.hisp.dhis.dxf2.events.trackedentity.Attribute;
@@ -70,6 +71,10 @@
private List<Note> notes = new ArrayList<>();
private Boolean followup;
+
+ private String completedUser;
+
+ private Date completedDate;
public Enrollment()
{
@@ -231,6 +236,30 @@
this.followup = followup;
}
+ @JsonProperty
+ @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
+ public String getCompletedUser()
+ {
+ return completedUser;
+ }
+
+ public void setCompletedUser( String completedUser )
+ {
+ this.completedUser = completedUser;
+ }
+
+ @JsonProperty
+ @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
+ public Date getCompletedDate()
+ {
+ return completedDate;
+ }
+
+ public void setCompletedDate( Date completedDate )
+ {
+ this.completedDate = completedDate;
+ }
+
@Override
public boolean equals( Object o )
{
@@ -248,6 +277,8 @@
if ( program != null ? !program.equals( that.program ) : that.program != null ) return false;
if ( status != that.status ) return false;
if ( notes != null ? !notes.equals( that.notes ) : that.notes != null ) return false;
+ if ( completedUser != null ? !completedUser.equals( that.completedUser ) : that.completedUser != null ) return false;
+ if ( completedDate != null ? !completedDate.equals( that.completedDate ) : that.completedDate != null ) return false;
return true;
}
@@ -263,6 +294,8 @@
result = 31 * result + (incidentDate != null ? incidentDate.hashCode() : 0);
result = 31 * result + (attributes != null ? attributes.hashCode() : 0);
result = 31 * result + (notes != null ? notes.hashCode() : 0);
+ result = 31 * result + (completedUser != null ? completedUser.hashCode() : 0);
+ result = 31 * result + (completedDate != null ? completedDate.hashCode() : 0);
return result;
}
@@ -278,6 +311,8 @@
", incidentDate=" + incidentDate +
", attributes=" + attributes +
", notes=" + notes +
+ ", completedUser=" + completedUser +
+ ", completedDate=" + completedDate +
'}';
}
}
=== 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 2015-11-18 16:46:20 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java 2015-11-20 11:38:58 +0000
@@ -884,6 +884,7 @@
event.setEventDate( DateUtils.getLongDateString( programStageInstance.getExecutionDate() ) );
event.setDueDate( DateUtils.getLongDateString( programStageInstance.getDueDate() ) );
event.setStoredBy( programStageInstance.getCompletedUser() );
+ event.setCompletedDate( DateUtils.getLongDateString( programStageInstance.getCompletedDate() ) );
UserCredentials userCredentials = currentUserService.getCurrentUser().getUserCredentials();
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/Event.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/Event.java 2015-09-24 08:32:10 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/Event.java 2015-11-20 11:38:58 +0000
@@ -32,6 +32,7 @@
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+
import org.hisp.dhis.common.BaseLinkableObject;
import org.hisp.dhis.common.DxfNamespaces;
import org.hisp.dhis.dxf2.events.enrollment.EnrollmentStatus;
@@ -84,7 +85,11 @@
private String lastUpdated;
private String attributeCategoryOptions;
+
+ private String completedUser;
+ private String completedDate;
+
public Event()
{
}
@@ -317,7 +322,31 @@
public void setAttributeCategoryOptions( String attributeCategoryOptions )
{
this.attributeCategoryOptions = attributeCategoryOptions;
- }
+ }
+
+ @JsonProperty
+ @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
+ public String getCompletedUser()
+ {
+ return completedUser;
+ }
+
+ public void setCompletedUser( String completedUser )
+ {
+ this.completedUser = completedUser;
+ }
+
+ @JsonProperty
+ @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
+ public String getCompletedDate()
+ {
+ return completedDate;
+ }
+
+ public void setCompletedDate( String completedDate )
+ {
+ this.completedDate = completedDate;
+ }
@Override
public boolean equals( Object o )
@@ -354,6 +383,8 @@
", coordinate=" + coordinate +
", dataValues=" + dataValues +
", attributeCategoryOptions=" + attributeCategoryOptions +
+ ", completedUser=" + completedUser +
+ ", completedDate=" + completedDate +
'}';
}
}
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/JdbcEventStore.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/JdbcEventStore.java 2015-10-08 14:59:36 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/JdbcEventStore.java 2015-11-20 11:38:58 +0000
@@ -124,7 +124,10 @@
event.setDueDate( DateUtils.getLongGmtDateString( rowSet.getDate( "psi_duedate" ) ) );
event.setEventDate( DateUtils.getLongGmtDateString( rowSet.getDate( "psi_executiondate" ) ) );
event.setCreated( DateUtils.getLongGmtDateString( rowSet.getDate( "psi_created" ) ) );
- event.setLastUpdated( DateUtils.getLongGmtDateString( rowSet.getDate( "psi_lastupdated" ) ) );
+ event.setLastUpdated( DateUtils.getLongGmtDateString( rowSet.getDate( "psi_lastupdated" ) ) );
+
+ event.setCompletedUser( rowSet.getString( "psi_completeduser" ) );
+ event.setCompletedDate( DateUtils.getLongGmtDateString( rowSet.getDate( "psi_completeddate" ) ) );
if ( rowSet.getBoolean( "ps_capturecoordinates" ) )
{
@@ -337,7 +340,7 @@
String sql =
"select psi.programstageinstanceid as psi_id, psi.uid as psi_uid, psi.status as psi_status, psi.executiondate as psi_executiondate, psi.duedate as psi_duedate, psi.completeduser as psi_completeduser, " +
- "psi.longitude as psi_longitude, psi.latitude as psi_latitude, psi.created as psi_created, psi.lastupdated as psi_lastupdated, " +
+ "psi.longitude as psi_longitude, psi.latitude as psi_latitude, psi.created as psi_created, psi.lastupdated as psi_lastupdated, psi.completeduser as psi_completeduser, psi.completeddate as psi_completeddate, " +
"pi.uid as pi_uid, pi.status as pi_status, pi.followup as pi_followup, p.uid as p_uid, p.code as p_code, " +
"p.type as p_type, ps.uid as ps_uid, ps.code as ps_code, ps.capturecoordinates as ps_capturecoordinates, " +
"ou.uid as ou_uid, ou.code as ou_code, ou.name as ou_name, tei.trackedentityinstanceid as tei_id, tei.uid as tei_uid " +
