dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #21870
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 10457: minor
------------------------------------------------------------
revno: 10457
committer: Lai <lai.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-04-03 11:16:53 +0700
message:
minor
modified:
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java
dhis-2/dhis-web/dhis-web-api-mobile/pom.xml
--
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-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java'
--- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java 2013-04-01 04:56:59 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java 2013-04-03 04:16:53 +0000
@@ -568,10 +568,6 @@
Program program = programService.getProgram( programId );
ProgramInstance programInstance = new ProgramInstance();
- // programInstance.setEnrollmentDate( sdf.parseDateTime( enrollmentDate
- // ).toDate() );
- // programInstance.setDateOfIncident( sdf.parseDateTime( incidentDate
- // ).toDate() );
programInstance.setEnrollmentDate( new Date() );
programInstance.setDateOfIncident( new Date() );
programInstance.setProgram( program );
@@ -587,9 +583,6 @@
ProgramStageInstance programStageInstance = new ProgramStageInstance();
programStageInstance.setProgramInstance( programInstance );
programStageInstance.setProgramStage( programStage );
-
- // Date dateCreatedEvent = sdf.parseDateTime( incidentDate
- // ).toDate();
Date dateCreatedEvent = new Date();
if ( program.getGeneratedByEnrollmentDate() )
{
=== modified file 'dhis-2/dhis-web/dhis-web-api-mobile/pom.xml'
--- dhis-2/dhis-web/dhis-web-api-mobile/pom.xml 2013-04-03 04:12:05 +0000
+++ dhis-2/dhis-web/dhis-web-api-mobile/pom.xml 2013-04-03 04:16:53 +0000
@@ -10,7 +10,7 @@
<artifactId>dhis-web-api-mobile</artifactId>
- <packaging>war</packaging>
+ <packaging>jar</packaging>
<name>DHIS Mobile API</name>
<dependencies>