date:20101025

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] 537 revisions removed

2010-10-25 Thread noreply

537 revisions were removed from the branch.

--
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

___
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

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1890: Bug fix in program stage sorting

2010-10-25 Thread noreply


revno: 1890
committer: Abyot Asalefew Gizaw 
branch nick: cbhis-mobile
timestamp: Thu 2010-08-05 12:48:44 +0200
message:
  Bug fix in program stage sorting
  New API for activityplan service
added:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/activityplan/
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/activityplan/Activity.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/activityplan/ActivityPlanService.java
  
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/activityplan/
  
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/activityplan/DefaultActivityPlanService.java
modified:
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageInstanceService.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageInstanceStore.java
  
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramStageInstanceService.java
  
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java
  
dhis-2/dhis-services/dhis-service-patient/src/main/resources/META-INF/dhis/beans.xml
  
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/visitplan/VisitPlanAction.java
  dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/SaveProgramStageSortOrderAction.java
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programStage.js
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/sortProgramStageForm.vm


--
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
=== added directory 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/activityplan'
=== added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/activityplan/Activity.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/activityplan/Activity.java	1970-01-01 00:00:00 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/activityplan/Activity.java	2010-08-05 10:48:44 +
@@ -0,0 +1,98 @@
+/**
+ * 
+ */
+package org.hisp.dhis.activityplan;
+
+import java.util.Date;
+
+import org.hisp.dhis.organisationunit.OrganisationUnit;
+import org.hisp.dhis.patient.Patient;
+import org.hisp.dhis.program.ProgramStageInstance;
+
+/**
+ * @author abyotag_adm
+ * 
+ */
+public class Activity
+{
+private OrganisationUnit provider;
+
+private Patient beneficiary;
+
+private ProgramStageInstance task;
+
+private Date dueDate;
+
+// -
+// Constructors
+// -
+
+public Activity()
+{
+}
+
+/**
+ * @return the provider
+ */
+public OrganisationUnit getProvider()
+{
+return provider;
+}
+
+/**
+ * @param provider the provider to set
+ */
+public void setProvider( OrganisationUnit provider )
+{
+this.provider = provider;
+}
+
+/**
+ * @return the beneficiary
+ */
+public Patient getBeneficiary()
+{
+return beneficiary;
+}
+
+/**
+ * @param beneficiary the beneficiary to set
+ */
+public void setBeneficiary( Patient beneficiary )
+{
+this.beneficiary = beneficiary;
+}
+
+/**
+ * @return the task
+ */
+public ProgramStageInstance getTask()
+{
+return task;
+}
+
+/**
+ * @param task the task to set
+ */
+public void setTask( ProgramStageInstance task )
+{
+this.task = task;
+}
+
+/**
+ * @param dueDate the dueDate to set
+ */
+public void setDueDate( Date dueDate )
+{
+this.dueDate = dueDate;
+}
+
+/**
+ * @return the dueDate
+ */
+public Date getDueDate()
+{
+return dueDate;
+}
+
+}

=== added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/activityplan/ActivityPlanService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/activityplan/ActivityPlanService.java	1970-01-01 00:00:00 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/activityplan/ActivityPlanService.java	2010-08-05 10:48:44 +
@@ -0,0 +1,31 @@
+/**
+ * 
+ */
+package org.hisp.dhis.activityplan;
+
+import java.util.Collection;
+import java.util.Date;
+
+import org.hisp.dhis.organisationunit.OrganisationUnit;
+import org.hisp.dhis.patient.Patient;
+import org.hisp.dhis.program.ProgramStageInstance;
+
+/**
+ * @author abyotag_adm
+ *
+ */
+public interface ActivityPlanService
+{
+Str

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1891: Experimental proof-of-concept of CBHIS API. Don't expect this to be stable..

2010-10-25 Thread noreply


revno: 1891
committer: Jo Størset 
branch nick: cbhis-mobile
timestamp: Mon 2010-08-09 13:40:55 +0200
message:
  Experimental proof-of-concept of CBHIS API. Don't expect this to be stable..
added:
  dhis-2/dhis-web/dhis-web-cbhis-api/
  dhis-2/dhis-web/dhis-web-cbhis-api/README.txt
  dhis-2/dhis-web/dhis-web-cbhis-api/pom.xml
  dhis-2/dhis-web/dhis-web-cbhis-api/src/
  dhis-2/dhis-web/dhis-web-cbhis-api/src/main/
  dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/
  dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/
  dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/
  dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/
  dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/
  dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/model/
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/model/ActivityPlan.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/model/ActivityPlanItem.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/model/Beneficiary.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/model/Link.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/model/OrgUnit.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/model/OrgUnits.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/model/Task.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/resources/
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/resources/ActivityPlanResource.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/resources/DhisMediaType.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/resources/MobileUserResource.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/resources/OrgUnitResource.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/resources/ProgramFormsResource.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/serialization/
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/serialization/ActivityListSerializer.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/serialization/DefaultXformSerializer.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/serialization/JavaObjectSerializer.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/serialization/Persistent.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/serialization/SerializationUtils.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/service/
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/service/AbstractEntitiyModelBeanMapper.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/service/ActivitiesWrapper.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/service/ActivityPlanItemMapper.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/service/ActivityPlanMapper.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/service/ActivityPlanModelService.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/service/BeneficiaryMapper.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/service/EntityMappingException.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/service/EntityModelBeanMapper.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/service/MappingManager.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/service/TaskMapper.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/support/
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/support/ActivityPlanSerializer.java
  dhis-2/dhis-web/dhis-web-cbhis-api/src/main/resources/
  dhis-2/dhis-web/dhis-web-cbhis-api/src/main/resources/META-INF/
  dhis-2/dhis-web/dhis-web-cbhis-api/src/main/resources/META-INF/dhis/
  dhis-2/dhis-web/dhis-web-cbhis-api/src/main/resources/META-INF/dhis/beans.xml
  dhis-2/dhis-web/dhis-web-cbhis-api/src/main/webapp/
  dhis-2/dhis-web/dhis-web-cbhis-api/src/main/webapp/WEB-INF/
  dhis-2/dhis-web/dhis-web-cbhis-api/src/main/webapp/WEB-INF/web.xml
  dhis-2/dhis-web/dhis-web-cbhis-api/src/main/webapp/dhis-web-case-api/
  dhis-2/dhis-web/dhis-web-cbhis-api/src/test/
  dhis-2/dhis-web/dhis-web-cbhis-api/src/test/java/
  dh

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1892: Some cleanup/obvious bug fixing

2010-10-25 Thread noreply


revno: 1892
committer: Jo Størset 
branch nick: cbhis-mobile
timestamp: Mon 2010-08-09 21:43:12 +0200
message:
  Some cleanup/obvious bug fixing
removed:
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/service/AbstractEntitiyModelBeanMapper.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/service/ActivityPlanItemMapper.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/service/ActivityPlanMapper.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/service/BeneficiaryMapper.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/service/EntityModelBeanMapper.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/service/MappingManager.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/service/TaskMapper.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/support/ActivityPlanSerializer.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/test/java/org/hisp/dhis/patient/api/service/MappingManagerTest.java
added:
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/service/MappingFactory.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/service/mapping/
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/service/mapping/ActivityPlanItemMapper.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/service/mapping/ActivityPlanMapper.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/service/mapping/BeanMapper.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/service/mapping/BeneficiaryMapper.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/service/mapping/TaskMapper.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/support/ActivityPlanSerializingWriter.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/test/java/org/hisp/dhis/patient/api/service/ModelMapperTest.java
modified:
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/model/Link.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/model/Task.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/resources/ActivityPlanResource.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/service/ActivityPlanModelService.java
  dhis-2/dhis-web/dhis-web-cbhis-api/src/main/resources/META-INF/dhis/beans.xml
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/test/java/org/hisp/dhis/patient/api/service/ActivityPlanModelServiceTest.java
  dhis-2/dhis-web/dhis-web-portal/pom.xml
  dhis-2/dhis-web/pom.xml
  dhis-2/pom.xml
The size of the diff (1272 lines) is larger than your specified limit of 1000 
lines

--
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

___
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

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1893: Trying to clean up somewhat.

2010-10-25 Thread noreply


revno: 1893
committer: Jo Størset 
branch nick: cbhis-mobile
timestamp: Tue 2010-08-10 00:50:29 +0200
message:
  Trying to clean up somewhat.
removed:
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/resources/ActivityPlanResource.java
added:
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/resources/ActivitiesResource.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/service/mapping/OrgUnitsMapper.java
modified:
  dhis-2/dhis-web/dhis-web-cbhis-api/pom.xml
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/model/Link.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/model/OrgUnit.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/model/OrgUnits.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/resources/DhisMediaType.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/resources/MobileUserResource.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/resources/OrgUnitResource.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/service/ActivityPlanModelService.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/service/MappingFactory.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/service/mapping/ActivityPlanItemMapper.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/service/mapping/ActivityPlanMapper.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/service/mapping/BeanMapper.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/service/mapping/BeneficiaryMapper.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/service/mapping/TaskMapper.java
  dhis-2/dhis-web/dhis-web-cbhis-api/src/main/resources/META-INF/dhis/beans.xml
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/test/java/org/hisp/dhis/patient/api/service/ActivityPlanModelServiceTest.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/test/java/org/hisp/dhis/patient/api/service/ModelMapperTest.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-web/dhis-web-cbhis-api/pom.xml'
--- dhis-2/dhis-web/dhis-web-cbhis-api/pom.xml	2010-08-09 11:40:55 +
+++ dhis-2/dhis-web/dhis-web-cbhis-api/pom.xml	2010-08-09 22:50:29 +
@@ -38,11 +38,8 @@
   jersey-server
   1.3
 
-
+
 
   com.sun.jersey.contribs
   jersey-spring
@@ -70,7 +67,11 @@
 
   
 
-
+
 
 
 

=== modified file 'dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/model/Link.java'
--- dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/model/Link.java	2010-08-09 19:43:12 +
+++ dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/model/Link.java	2010-08-09 22:50:29 +
@@ -20,12 +20,10 @@
 this.url = url;
 }
 
-public static Link create( UriInfo uriInfo, Class clazz, int id )
+public void setUrl( String url )
 {
-Link l = new Link();
-l.url = uriInfo.getBaseUriBuilder().path( clazz ).build( id ).toString();
-
-return l;
+this.url = url;
 }
-
+
+
 }

=== modified file 'dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/model/OrgUnit.java'
--- dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/model/OrgUnit.java	2010-08-09 11:40:55 +
+++ dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/model/OrgUnit.java	2010-08-09 22:50:29 +
@@ -1,14 +1,9 @@
 package org.hisp.dhis.patient.api.model;
 
-import javax.ws.rs.core.UriInfo;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import org.hisp.dhis.organisationunit.OrganisationUnit;
-import org.hisp.dhis.patient.api.resources.ActivityPlanResource;
-import org.hisp.dhis.patient.api.resources.ProgramFormsResource;
-
 @XmlRootElement(name="orgUnit")
 public class OrgUnit {
 
@@ -22,15 +17,26 @@
 
 @XmlElement(name="currentActivities")
 private Link activitiesLink;
+
+public void setId( int id )
+{
+this.id = id;
+}
+
+public void setName( String name )
+{
+this.name = name;
+}
+
+public void setProgramFormsLink( Link programFormsLink )
+{
+this.programFormsLink = programFormsLink;
+}
+
+public void setActivitiesLink( Link activitiesLink )
+{

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1894: merged with trunk.

2010-10-25 Thread noreply

Merge authors:
  Abyot Asalefew (abyot)
  Bharath (chbharathk)
  Bharath (chbharathk)
  Bob Jolliffe bobjolli...@gmail.com
  Hieu Duy Dang (hieu-hispvietnam)...


revno: 1894 [merge]
committer: Jo Størset 
branch nick: cbhis-mobile
timestamp: Tue 2010-08-10 09:12:18 +0200
message:
  merged with trunk.
removed:
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lock/DefineLockOnDataSetOrgunitAndPeriod.java
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lock/GetDataSetsForLockAction.java
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lock/GetExpandedTreeForLockAction.java
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lock/GetOrgUnitNameAction.java
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lock/LockSelectedOrganisationUnitAction.java
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lock/NoActionForDataLock.java
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lock/OrgUnitValidateAction.java
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lock/RemoveLockSelectedOrganisationUnitAction.java
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lock/SelectAllAction.java
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lock/SelectLevelAction.java
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lock/SetupAssociationsTreeAction.java
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lock/UnselectAllAction.java
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lock/UnselectLevelAction.java
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/locking.js
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/lockingForm.vm
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/noResponseInFrame.vm
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/responseExpand.vm
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/responseGetSelectedOrgUnitName.vm
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/responseOrgUnitSelectSuccess.vm
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/responseSelect.vm
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/responseTree.vm
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/selectionedTreeInFrame.vm
  
dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetOrganisationUnitsWithPolygonsAction.java
added:
  
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/GetDataRecordsAction.java
  
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/MultiDataEntrySelectAction.java
  
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/ProgramStageCustomDataEntryAction.java
  
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataentryRecords.vm
  
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/multiDataEntrySelect.vm
  
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageDataEntryForm.vm
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/GetResourcePropertiesAction.java
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/jquery.autocomplete.js
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/sqlViewData.js
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/jsonResourceProperties.vm

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1895: Cleanup/fixes/implemented tentative definition of current activity plan.

2010-10-25 Thread noreply


revno: 1895
committer: Jo Størset 
branch nick: cbhis-mobile
timestamp: Tue 2010-08-10 12:35:30 +0200
message:
  Cleanup/fixes/implemented tentative definition of current activity plan.
modified:
  
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java
  dhis-2/dhis-web/dhis-web-cbhis-api/README.txt
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/model/Link.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/model/OrgUnit.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/model/OrgUnits.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/serialization/ActivityListSerializer.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/service/ActivityPlanModelService.java
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/service/mapping/OrgUnitsMapper.java
  dhis-2/dhis-web/dhis-web-cbhis-api/src/main/webapp/WEB-INF/web.xml
  
dhis-2/dhis-web/dhis-web-cbhis-api/src/test/java/org/hisp/dhis/patient/api/service/ActivityPlanModelServiceTest.java
  dhis-2/dhis-web/dhis-web-portal/pom.xml
  dhis-2/dhis-web/dhis-web-portal/src/main/webapp/WEB-INF/web.xml
  dhis-2/dhis-web/pom.xml
  dhis-2/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-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java	2010-08-05 10:48:44 +
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java	2010-08-10 10:35:30 +
@@ -82,14 +82,15 @@
 public Collection getProgramStageInstances( Date startDate, Date endDate )
 {
 
-return (getCriteria( Restrictions.ge( "startDate", startDate ), Restrictions.le( "endDate", endDate ) )).list();
+return (getCriteria( Restrictions.ge( "dueDate", startDate ), Restrictions.le( "dueDate", endDate ) )).list();
 }
 
 @SuppressWarnings( "unchecked" )
 public Collection getProgramStageInstances( Date startDate, Date endDate, Boolean completed )
 {
 
-return (getCriteria( Restrictions.ge( "startDate", startDate ), Restrictions.le( "endDate", endDate ),
+return (getCriteria( Restrictions.ge( "dueDate", startDate ), Restrictions.le( "dueDate", endDate ),
 Restrictions.eq( "completed", completed ) )).list();
 }
+
 }

=== modified file 'dhis-2/dhis-web/dhis-web-cbhis-api/README.txt'
--- dhis-2/dhis-web/dhis-web-cbhis-api/README.txt	2010-08-09 11:40:55 +
+++ dhis-2/dhis-web/dhis-web-cbhis-api/README.txt	2010-08-10 10:35:30 +
@@ -4,7 +4,7 @@
 a experimental example of what a web api for the CBHIS module of DHIS2
 might look like.
 
-Requests to paths under /api/cbhis/ will be attempted mapped to the
+Requests to paths under /api/cbhis/v0.1/ will be attempted mapped to the
 resource classes in the package org.hisp.dhis2.cbhis.api.resources.
 
 The root resource handling /api/cbhis/ will resolve the logged in
@@ -21,15 +21,18 @@
 
 should give an xml with links to the orgunits activity plans, while
 
-curl -u test_user:Trivandrum1 http://localhost:8080/api/cbhis/v0.1/orgunits/2262/activityplan
-
-should result in an xml of the activity plan, and
-
-curl -u test_user:Trivandrum1 http://localhost:8080/api/cbhis/v0.1/orgunits/2262/activityplan -H "Accept: applicat
-ion/vnd.org.dhis2.casebased.v0.1.activityplan+serialized"
-
-should return a serialized like openxdata uses.
-
+curl -u test_user:Trivandrum1 http://localhost:8080/api/cbhis/v0.1/orgUnits/2256/activities/plan/current
+
+should result in an xml of the current activity plan*, and
+
+curl -u test_user:Trivandrum1 curl -u test_user:Trivandrum1 http://localhost:8080/api/cbhis/v0.1/orgunits/2262/activityplan -H "Accept: application/vnd.org.dhis2.cbhis.v0.1.activityplan+serialized"
+
+should return it in serialized form somewhat like openxdata uses.
+
+* Activity plan is tentatively defined as all activities in the
+  current month + earlier uncompleted activities.
+
+curl -u test_user:Trivandrum1 http://localhost:8080/api/cbhis/v0.1/orgUnits/2256/activities/all
 
 [1] https://jsr311.dev.java.net/
 [2] https://jersey.dev.java.net/

=== modified file 'dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/model/Link.java'
--- dhis-2/dhis-web/dhis-web-cbhis-api/src/main/java/org/hisp/dhis/patient/api/model/Link.java	2010-08-09 22:50:29 +
+++ dhis-2/dhis-web/dhis-web-c

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1896: CBHIS Mobile client ---- this code is not really ready for commit.... but...

2010-10-25 Thread noreply


revno: 1896
committer: Abyot Asalefew Gizaw 
branch nick: cbhis-mobile
timestamp: Mon 2010-08-16 20:51:32 +0200
message:
  CBHIS Mobile client  this code is not really ready for commit but...
added:
  CBHISMobileClient/
  CBHISMobileClient/build.xml
  CBHISMobileClient/nbproject/
  CBHISMobileClient/nbproject/build-impl.xml
  CBHISMobileClient/nbproject/genfiles.properties
  CBHISMobileClient/nbproject/private/
  CBHISMobileClient/nbproject/private/private.properties
  CBHISMobileClient/nbproject/private/private.xml
  CBHISMobileClient/nbproject/project.properties
  CBHISMobileClient/nbproject/project.xml
  CBHISMobileClient/src/
  CBHISMobileClient/src/org/
  CBHISMobileClient/src/org/hisp/
  CBHISMobileClient/src/org/hisp/dhis/
  CBHISMobileClient/src/org/hisp/dhis/cbhis/
  CBHISMobileClient/src/org/hisp/dhis/cbhis/connection/
  CBHISMobileClient/src/org/hisp/dhis/cbhis/connection/BasicAuth.java
  CBHISMobileClient/src/org/hisp/dhis/cbhis/connection/DownloadManager.java
  CBHISMobileClient/src/org/hisp/dhis/cbhis/db/
  CBHISMobileClient/src/org/hisp/dhis/cbhis/db/AbstractModelRecordFilter.java
  CBHISMobileClient/src/org/hisp/dhis/cbhis/db/AbstractRecordComparator.java
  CBHISMobileClient/src/org/hisp/dhis/cbhis/db/ComparableRecordComparator.java
  CBHISMobileClient/src/org/hisp/dhis/cbhis/db/ModelRecordStore.java
  CBHISMobileClient/src/org/hisp/dhis/cbhis/db/SettingsRectordStore.java
  CBHISMobileClient/src/org/hisp/dhis/cbhis/gui/
  CBHISMobileClient/src/org/hisp/dhis/cbhis/gui/CBHISMIDlet.java
  CBHISMobileClient/src/org/hisp/dhis/cbhis/gui/CBHISMIDlet.vmd
  CBHISMobileClient/src/org/hisp/dhis/cbhis/gui/SplashScreen.java
  CBHISMobileClient/src/org/hisp/dhis/cbhis/image/
  CBHISMobileClient/src/org/hisp/dhis/cbhis/image/dhis2_logo.PNG
  CBHISMobileClient/src/org/hisp/dhis/cbhis/model/
  CBHISMobileClient/src/org/hisp/dhis/cbhis/model/AbstractModel.java
  CBHISMobileClient/src/org/hisp/dhis/cbhis/model/DataElement.java
  CBHISMobileClient/src/org/hisp/dhis/cbhis/model/DataValue.java
  CBHISMobileClient/src/org/hisp/dhis/cbhis/model/ProgramStageForm.java
  dhis-2/dhis-web/dhis-web-cbhis-webservice/
  dhis-2/dhis-web/dhis-web-cbhis-webservice/pom.xml
  dhis-2/dhis-web/dhis-web-cbhis-webservice/src/
  dhis-2/dhis-web/dhis-web-cbhis-webservice/src/main/
  dhis-2/dhis-web/dhis-web-cbhis-webservice/src/main/java/
  dhis-2/dhis-web/dhis-web-cbhis-webservice/src/main/java/org/
  dhis-2/dhis-web/dhis-web-cbhis-webservice/src/main/java/org/hisp/
  dhis-2/dhis-web/dhis-web-cbhis-webservice/src/main/java/org/hisp/dhis/
  
dhis-2/dhis-web/dhis-web-cbhis-webservice/src/main/java/org/hisp/dhis/cbhiswebservice/
  
dhis-2/dhis-web/dhis-web-cbhis-webservice/src/main/java/org/hisp/dhis/cbhiswebservice/model/
  
dhis-2/dhis-web/dhis-web-cbhis-webservice/src/main/java/org/hisp/dhis/cbhiswebservice/model/Form.java
  
dhis-2/dhis-web/dhis-web-cbhis-webservice/src/main/java/org/hisp/dhis/cbhiswebservice/model/IDataElement.java
  
dhis-2/dhis-web/dhis-web-cbhis-webservice/src/main/java/org/hisp/dhis/cbhiswebservice/model/IProgramStage.java
  
dhis-2/dhis-web/dhis-web-cbhis-webservice/src/main/java/org/hisp/dhis/cbhiswebservice/resources/
  
dhis-2/dhis-web/dhis-web-cbhis-webservice/src/main/java/org/hisp/dhis/cbhiswebservice/resources/FormsResource.java
  
dhis-2/dhis-web/dhis-web-cbhis-webservice/src/main/java/org/hisp/dhis/cbhiswebservice/service/
  
dhis-2/dhis-web/dhis-web-cbhis-webservice/src/main/java/org/hisp/dhis/cbhiswebservice/service/IProgramStageService.java
  dhis-2/dhis-web/dhis-web-cbhis-webservice/src/main/resources/
  dhis-2/dhis-web/dhis-web-cbhis-webservice/src/main/resources/META-INF/
  dhis-2/dhis-web/dhis-web-cbhis-webservice/src/main/resources/META-INF/dhis/
  
dhis-2/dhis-web/dhis-web-cbhis-webservice/src/main/resources/META-INF/dhis/beans.xml
  dhis-2/dhis-web/dhis-web-cbhis-webservice/src/main/webapp/
  dhis-2/dhis-web/dhis-web-cbhis-webservice/src/main/webapp/WEB-INF/
  dhis-2/dhis-web/dhis-web-cbhis-webservice/src/main/webapp/WEB-INF/web.xml
  dhis-2/dhis-web/dhis-web-cbhis-webservice/src/main/webapp/index.jsp
modified:
  dhis-2/dhis-web/dhis-web-cbhis-api/src/main/webapp/WEB-INF/web.xml
  dhis-2/dhis-web/dhis-web-portal/pom.xml
  dhis-2/dhis-web/pom.xml
The size of the diff (4780 lines) is larger than your specified limit of 1000 
lines

--
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

___
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

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1897: after migrating to eclipse

2010-10-25 Thread noreply


revno: 1897
committer: Abyot Asalefew Gizaw 
branch nick: cbhis-mobile
timestamp: Tue 2010-08-17 16:10:43 +0200
message:
  after migrating to eclipse
removed:
  CBHISMobileClient/build.xml
  CBHISMobileClient/nbproject/
  CBHISMobileClient/nbproject/build-impl.xml
  CBHISMobileClient/nbproject/genfiles.properties
  CBHISMobileClient/nbproject/private/
  CBHISMobileClient/nbproject/private/private.properties
  CBHISMobileClient/nbproject/private/private.xml
  CBHISMobileClient/nbproject/project.properties
  CBHISMobileClient/nbproject/project.xml
  CBHISMobileClient/src/org/hisp/dhis/cbhis/db/ComparableRecordComparator.java
  CBHISMobileClient/src/org/hisp/dhis/cbhis/gui/CBHISMIDlet.vmd
added:
  CBHISMobileClient/.mtj
  CBHISMobileClient/.mtj.tmp/
  CBHISMobileClient/.mtj.tmp/emulation/
  CBHISMobileClient/.mtj.tmp/verified/
  CBHISMobileClient/.mtj.tmp/verified/classes/
  CBHISMobileClient/.mtj.tmp/verified/libs/
  CBHISMobileClient/.processed/
  CBHISMobileClient/Application Descriptor
  CBHISMobileClient/bin/
  CBHISMobileClient/build.properties
  CBHISMobileClient/deployed/
  CBHISMobileClient/deployed/DefaultColorPhone/
  CBHISMobileClient/deployed/DefaultColorPhone/CBHISMobileClient.jad
  CBHISMobileClient/deployed/DefaultColorPhone/CBHISMobileClient.jar
  CBHISMobileClient/deployed/pro_map.txt
  CBHISMobileClient/deployed/pro_seeds.txt
  CBHISMobileClient/deployed/proguard.cfg
  CBHISMobileClient/lib/
  CBHISMobileClient/lib/kxml2-min-2.3.0.jar
  CBHISMobileClient/mtj-build/
  CBHISMobileClient/mtj-build/DefaultColorPhone.symbols
  CBHISMobileClient/mtj-build/custom-tasks/
  CBHISMobileClient/mtj-build/mtj-build.properties
  CBHISMobileClient/mtj-build/mtj-build.xml
  CBHISMobileClient/res/
modified:
  CBHISMobileClient/src/org/hisp/dhis/cbhis/db/ModelRecordStore.java
  CBHISMobileClient/src/org/hisp/dhis/cbhis/gui/CBHISMIDlet.java
The size of the diff (2618 lines) is larger than your specified limit of 1000 
lines

--
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

___
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

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1898: Fix Login error with basic authentication

2010-10-25 Thread noreply


revno: 1898
committer: Tran Ng Minh Luan 
branch nick: cbhis-mobile
timestamp: Fri 2010-08-20 15:46:36 +0700
message:
  Fix Login error with basic authentication
  Add function download Activities, OrgUnit
added:
  CBHISMobileClient/.mtj.tmp/emulation/CBHISMobileClient.jad
  CBHISMobileClient/.mtj.tmp/emulation/CBHISMobileClient.jar
  CBHISMobileClient/.mtj.tmp/verified/classes/org/
  CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/
  CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/
  CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/
  CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/connection/
  
CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/connection/BasicAuth.class
  
CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/connection/DownloadManager.class
  CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/db/
  
CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/db/AbstractModelRecordFilter.class
  
CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/db/AbstractRecordComparator.class
  
CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/db/ModelRecordStore.class
  
CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/db/SettingsRectordStore.class
  CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/gui/
  
CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/gui/CBHISMIDlet.class
  
CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/gui/SplashScreen$CountDown.class
  
CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/gui/SplashScreen.class
  CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/model/
  
CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/model/AbstractModel.class
  
CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/model/Activity.class
  
CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/model/Beneficiary.class
  
CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/model/DataElement.class
  
CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/model/DataValue.class
  
CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/model/OrgUnit.class
  
CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/model/ProgramStageForm.class
  
CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/model/Task.class
  CBHISMobileClient/.mtj.tmp/verified/libs/kxml2-min-2.3.0.jar
  CBHISMobileClient/.processed/src/
  CBHISMobileClient/.processed/src/org/
  CBHISMobileClient/.processed/src/org/hisp/
  CBHISMobileClient/.processed/src/org/hisp/dhis/
  CBHISMobileClient/.processed/src/org/hisp/dhis/cbhis/
  CBHISMobileClient/.processed/src/org/hisp/dhis/cbhis/connection/
  CBHISMobileClient/.processed/src/org/hisp/dhis/cbhis/connection/BasicAuth.java
  
CBHISMobileClient/.processed/src/org/hisp/dhis/cbhis/connection/DownloadManager.java
  CBHISMobileClient/.processed/src/org/hisp/dhis/cbhis/db/
  
CBHISMobileClient/.processed/src/org/hisp/dhis/cbhis/db/AbstractModelRecordFilter.java
  
CBHISMobileClient/.processed/src/org/hisp/dhis/cbhis/db/AbstractRecordComparator.java
  CBHISMobileClient/.processed/src/org/hisp/dhis/cbhis/db/ModelRecordStore.java
  
CBHISMobileClient/.processed/src/org/hisp/dhis/cbhis/db/SettingsRectordStore.java
  CBHISMobileClient/.processed/src/org/hisp/dhis/cbhis/gui/
  CBHISMobileClient/.processed/src/org/hisp/dhis/cbhis/gui/CBHISMIDlet.java
  CBHISMobileClient/.processed/src/org/hisp/dhis/cbhis/gui/SplashScreen.java
  CBHISMobileClient/.processed/src/org/hisp/dhis/cbhis/model/
  CBHISMobileClient/.processed/src/org/hisp/dhis/cbhis/model/AbstractModel.java
  CBHISMobileClient/.processed/src/org/hisp/dhis/cbhis/model/Activity.java
  CBHISMobileClient/.processed/src/org/hisp/dhis/cbhis/model/Beneficiary.java
  CBHISMobileClient/.processed/src/org/hisp/dhis/cbhis/model/DataElement.java
  CBHISMobileClient/.processed/src/org/hisp/dhis/cbhis/model/DataValue.java
  CBHISMobileClient/.processed/src/org/hisp/dhis/cbhis/model/OrgUnit.java
  
CBHISMobileClient/.processed/src/org/hisp/dhis/cbhis/model/ProgramStageForm.java
  CBHISMobileClient/.processed/src/org/hisp/dhis/cbhis/model/Task.java
  CBHISMobileClient/bin/org/
  CBHISMobileClient/bin/org/hisp/
  CBHISMobileClient/bin/org/hisp/dhis/
  CBHISMobileClient/bin/org/hisp/dhis/cbhis/
  CBHISMobileClient/bin/org/hisp/dhis/cbhis/connection/
  CBHISMobileClient/bin/org/hisp/dhis/cbhis/connection/BasicAuth.class
  CBHISMobileClient/bin/org/hisp/dhis/cbhis/connection/DownloadManager.class
  CBHISMobileClient/bin/org/hisp/dhis/cbhis/db/
  CBHISMobileClient/bin/org/hisp/dhis/cbhis/db/AbstractModelRecordFilter.class
  CBHISMobileClient/bin/org/hisp/dhis/cbhis/db/AbstractRecordComparator.class
  CBHISMobileClient/bin/org/hisp/dhis/cbhis/db/ModelRecordStore.class
  CBHISMobileClient/bin/org/hisp/dhis/cbhis/d

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1899: Add one more screen to select downloaded Forms

2010-10-25 Thread noreply


revno: 1899
committer: Long 
branch nick: cbhis-mobile
timestamp: Mon 2010-08-23 10:18:53 +0700
message:
  Add one more screen to select downloaded Forms
modified:
  CBHISMobileClient/.mtj.tmp/emulation/CBHISMobileClient.jad
  CBHISMobileClient/.mtj.tmp/emulation/CBHISMobileClient.jar
  
CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/connection/BasicAuth.class
  
CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/connection/DownloadManager.class
  
CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/db/AbstractModelRecordFilter.class
  
CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/db/AbstractRecordComparator.class
  
CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/db/ModelRecordStore.class
  
CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/db/SettingsRectordStore.class
  
CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/gui/CBHISMIDlet.class
  
CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/gui/SplashScreen$CountDown.class
  
CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/gui/SplashScreen.class
  
CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/model/AbstractModel.class
  
CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/model/Activity.class
  
CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/model/Beneficiary.class
  
CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/model/DataElement.class
  
CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/model/DataValue.class
  
CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/model/OrgUnit.class
  
CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/model/ProgramStageForm.class
  
CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/model/Task.class
  CBHISMobileClient/.mtj.tmp/verified/libs/kxml2-min-2.3.0.jar
  CBHISMobileClient/.processed/src/org/hisp/dhis/cbhis/db/ModelRecordStore.java
  CBHISMobileClient/.processed/src/org/hisp/dhis/cbhis/gui/CBHISMIDlet.java
  CBHISMobileClient/bin/org/hisp/dhis/cbhis/connection/BasicAuth.class
  CBHISMobileClient/bin/org/hisp/dhis/cbhis/connection/DownloadManager.class
  CBHISMobileClient/bin/org/hisp/dhis/cbhis/db/AbstractModelRecordFilter.class
  CBHISMobileClient/bin/org/hisp/dhis/cbhis/db/AbstractRecordComparator.class
  CBHISMobileClient/bin/org/hisp/dhis/cbhis/db/ModelRecordStore.class
  CBHISMobileClient/bin/org/hisp/dhis/cbhis/db/SettingsRectordStore.class
  CBHISMobileClient/bin/org/hisp/dhis/cbhis/gui/CBHISMIDlet.class
  CBHISMobileClient/bin/org/hisp/dhis/cbhis/gui/SplashScreen$CountDown.class
  CBHISMobileClient/bin/org/hisp/dhis/cbhis/gui/SplashScreen.class
  CBHISMobileClient/bin/org/hisp/dhis/cbhis/model/AbstractModel.class
  CBHISMobileClient/bin/org/hisp/dhis/cbhis/model/Activity.class
  CBHISMobileClient/bin/org/hisp/dhis/cbhis/model/Beneficiary.class
  CBHISMobileClient/bin/org/hisp/dhis/cbhis/model/DataElement.class
  CBHISMobileClient/bin/org/hisp/dhis/cbhis/model/DataValue.class
  CBHISMobileClient/bin/org/hisp/dhis/cbhis/model/OrgUnit.class
  CBHISMobileClient/bin/org/hisp/dhis/cbhis/model/ProgramStageForm.class
  CBHISMobileClient/bin/org/hisp/dhis/cbhis/model/Task.class
  CBHISMobileClient/build.properties
  CBHISMobileClient/src/org/hisp/dhis/cbhis/db/ModelRecordStore.java
  CBHISMobileClient/src/org/hisp/dhis/cbhis/gui/CBHISMIDlet.java
The size of the diff (1347 lines) is larger than your specified limit of 1000 
lines

--
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

___
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

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1900: Trying to clean up

2010-10-25 Thread noreply


revno: 1900
committer: Jo Størset 
branch nick: cbhis-mobile
timestamp: Wed 2010-08-25 11:59:25 +0200
message:
  Trying to clean up
removed:
  CBHISMobileClient/
  CBHISMobileClient/.mtj
  CBHISMobileClient/.mtj.tmp/
  CBHISMobileClient/.mtj.tmp/emulation/
  CBHISMobileClient/.mtj.tmp/emulation/CBHISMobileClient.jad
  CBHISMobileClient/.mtj.tmp/emulation/CBHISMobileClient.jar
  CBHISMobileClient/.mtj.tmp/verified/
  CBHISMobileClient/.mtj.tmp/verified/classes/
  CBHISMobileClient/.mtj.tmp/verified/classes/org/
  CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/
  CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/
  CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/
  CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/connection/
  
CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/connection/BasicAuth.class
  
CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/connection/DownloadManager.class
  CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/db/
  
CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/db/AbstractModelRecordFilter.class
  
CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/db/AbstractRecordComparator.class
  
CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/db/ModelRecordStore.class
  
CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/db/SettingsRectordStore.class
  CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/gui/
  
CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/gui/CBHISMIDlet.class
  
CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/gui/SplashScreen$CountDown.class
  
CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/gui/SplashScreen.class
  CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/model/
  
CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/model/AbstractModel.class
  
CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/model/Activity.class
  
CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/model/Beneficiary.class
  
CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/model/DataElement.class
  
CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/model/DataValue.class
  
CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/model/OrgUnit.class
  
CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/model/ProgramStageForm.class
  
CBHISMobileClient/.mtj.tmp/verified/classes/org/hisp/dhis/cbhis/model/Task.class
  CBHISMobileClient/.mtj.tmp/verified/libs/
  CBHISMobileClient/.mtj.tmp/verified/libs/kxml2-min-2.3.0.jar
  CBHISMobileClient/.processed/
  CBHISMobileClient/.processed/src/
  CBHISMobileClient/.processed/src/org/
  CBHISMobileClient/.processed/src/org/hisp/
  CBHISMobileClient/.processed/src/org/hisp/dhis/
  CBHISMobileClient/.processed/src/org/hisp/dhis/cbhis/
  CBHISMobileClient/.processed/src/org/hisp/dhis/cbhis/connection/
  CBHISMobileClient/.processed/src/org/hisp/dhis/cbhis/connection/BasicAuth.java
  
CBHISMobileClient/.processed/src/org/hisp/dhis/cbhis/connection/DownloadManager.java
  CBHISMobileClient/.processed/src/org/hisp/dhis/cbhis/db/
  
CBHISMobileClient/.processed/src/org/hisp/dhis/cbhis/db/AbstractModelRecordFilter.java
  
CBHISMobileClient/.processed/src/org/hisp/dhis/cbhis/db/AbstractRecordComparator.java
  CBHISMobileClient/.processed/src/org/hisp/dhis/cbhis/db/ModelRecordStore.java
  
CBHISMobileClient/.processed/src/org/hisp/dhis/cbhis/db/SettingsRectordStore.java
  CBHISMobileClient/.processed/src/org/hisp/dhis/cbhis/gui/
  CBHISMobileClient/.processed/src/org/hisp/dhis/cbhis/gui/CBHISMIDlet.java
  CBHISMobileClient/.processed/src/org/hisp/dhis/cbhis/gui/SplashScreen.java
  CBHISMobileClient/.processed/src/org/hisp/dhis/cbhis/model/
  CBHISMobileClient/.processed/src/org/hisp/dhis/cbhis/model/AbstractModel.java
  CBHISMobileClient/.processed/src/org/hisp/dhis/cbhis/model/Activity.java
  CBHISMobileClient/.processed/src/org/hisp/dhis/cbhis/model/Beneficiary.java
  CBHISMobileClient/.processed/src/org/hisp/dhis/cbhis/model/DataElement.java
  CBHISMobileClient/.processed/src/org/hisp/dhis/cbhis/model/DataValue.java
  CBHISMobileClient/.processed/src/org/hisp/dhis/cbhis/model/OrgUnit.java
  
CBHISMobileClient/.processed/src/org/hisp/dhis/cbhis/model/ProgramStageForm.java
  CBHISMobileClient/.processed/src/org/hisp/dhis/cbhis/model/Task.java
  CBHISMobileClient/Application Descriptor
  CBHISMobileClient/bin/
  CBHISMobileClient/bin/org/
  CBHISMobileClient/bin/org/hisp/
  CBHISMobileClient/bin/org/hisp/dhis/
  CBHISMobileClient/bin/org/hisp/dhis/cbhis/
  CBHISMobileClient/bin/org/hisp/dhis/cbhis/connection/
  CBHISMobileClient/bin/org/hisp/dhis/cbhis/connection/BasicAuth.class
  CBHISMobileClient/bin/org/hisp/dhis/cbhis/connection/DownloadManager.class
  CBHISMobileClient/bin/org/hisp/dhis/cbhis/db

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1901: Cleaned up a bit more

2010-10-25 Thread noreply


revno: 1901
committer: Jo Størset 
branch nick: cbhis-mobile
timestamp: Wed 2010-08-25 14:09:15 +0200
message:
  Cleaned up a bit more
removed:
  mobile/dhis-mobile/src/org/hisp/dhis/cbhis/
  mobile/dhis-mobile/src/org/hisp/dhis/cbhis/connection/
  mobile/dhis-mobile/src/org/hisp/dhis/cbhis/connection/Base64.java
  mobile/dhis-mobile/src/org/hisp/dhis/cbhis/connection/DownloadManager.java
  mobile/dhis-mobile/src/org/hisp/dhis/cbhis/db/
  mobile/dhis-mobile/src/org/hisp/dhis/cbhis/db/AbstractModelRecordFilter.java
  mobile/dhis-mobile/src/org/hisp/dhis/cbhis/db/AbstractRecordComparator.java
  mobile/dhis-mobile/src/org/hisp/dhis/cbhis/db/ModelRecordStore.java
  mobile/dhis-mobile/src/org/hisp/dhis/cbhis/db/SettingsRectordStore.java
  mobile/dhis-mobile/src/org/hisp/dhis/cbhis/gui/
  mobile/dhis-mobile/src/org/hisp/dhis/cbhis/gui/DHISMIDlet.java
  mobile/dhis-mobile/src/org/hisp/dhis/cbhis/gui/SplashScreen.java
  mobile/dhis-mobile/src/org/hisp/dhis/cbhis/model/
  mobile/dhis-mobile/src/org/hisp/dhis/cbhis/model/AbstractModel.java
  mobile/dhis-mobile/src/org/hisp/dhis/cbhis/model/Activity.java
  mobile/dhis-mobile/src/org/hisp/dhis/cbhis/model/Beneficiary.java
  mobile/dhis-mobile/src/org/hisp/dhis/cbhis/model/DataElement.java
  mobile/dhis-mobile/src/org/hisp/dhis/cbhis/model/DataValue.java
  mobile/dhis-mobile/src/org/hisp/dhis/cbhis/model/OrgUnit.java
  mobile/dhis-mobile/src/org/hisp/dhis/cbhis/model/Persistent.java
  mobile/dhis-mobile/src/org/hisp/dhis/cbhis/model/ProgramStageForm.java
  mobile/dhis-mobile/src/org/hisp/dhis/cbhis/model/Task.java
  mobile/dhis-mobile/src/org/hisp/dhis/cbhis/model/User.java
added:
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/connection/
  
mobile/dhis-mobile/src/org/hisp/dhis/mobile/connection/AuthenticationException.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/connection/Base64.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/connection/DownloadManager.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/AbstractModelRecordFilter.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/AbstractRecordComparator.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/ModelRecordStore.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/SettingsRectordStore.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/model/
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/model/AbstractModel.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/model/Activity.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/model/Beneficiary.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/model/DataElement.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/model/DataValue.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/model/OrgUnit.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/model/Persistent.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/model/ProgramStageForm.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/model/Task.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/model/User.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/ui/
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/ui/DHISMIDlet.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/ui/SplashScreen.java
modified:
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/patient/api/resources/FormsResource.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/patient/api/service/IProgramStageService.java
  mobile/dhis-mobile/Application Descriptor
The size of the diff (6335 lines) is larger than your specified limit of 1000 
lines

--
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

___
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

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1902: Trying to clean up

2010-10-25 Thread noreply


revno: 1902
committer: Jo Størset 
branch nick: cbhis-mobile
timestamp: Wed 2010-08-25 19:40:56 +0200
message:
  Trying to clean up
removed:
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/patient/
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/patient/api/
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/patient/api/model/
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/patient/api/model/ActivityPlan.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/patient/api/model/ActivityPlanItem.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/patient/api/model/Beneficiary.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/patient/api/model/Form.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/patient/api/model/IDataElement.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/patient/api/model/IProgramStage.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/patient/api/model/Link.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/patient/api/model/OrgUnit.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/patient/api/model/OrgUnits.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/patient/api/model/Task.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/patient/api/resources/
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/patient/api/resources/ActivitiesResource.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/patient/api/resources/FormsResource.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/patient/api/resources/MobileUserResource.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/patient/api/resources/OrgUnitResource.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/patient/api/resources/ProgramFormsResource.java
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/patient/api/service/
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/patient/api/service/ActivitiesWrapper.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/patient/api/service/ActivityPlanModelService.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/patient/api/service/EntityMappingException.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/patient/api/service/IProgramStageService.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/patient/api/service/MappingFactory.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/patient/api/service/mapping/
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/patient/api/service/mapping/ActivityPlanItemMapper.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/patient/api/service/mapping/ActivityPlanMapper.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/patient/api/service/mapping/BeanMapper.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/patient/api/service/mapping/BeneficiaryMapper.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/patient/api/service/mapping/OrgUnitsMapper.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/patient/api/service/mapping/TaskMapper.java
  dhis-2/dhis-web/dhis-web-api/src/test/java/org/
  dhis-2/dhis-web/dhis-web-api/src/test/java/org/hisp/
  dhis-2/dhis-web/dhis-web-api/src/test/java/org/hisp/dhis/
  dhis-2/dhis-web/dhis-web-api/src/test/java/org/hisp/dhis/patient/
  dhis-2/dhis-web/dhis-web-api/src/test/java/org/hisp/dhis/patient/api/
  dhis-2/dhis-web/dhis-web-api/src/test/java/org/hisp/dhis/patient/api/service/
  
dhis-2/dhis-web/dhis-web-api/src/test/java/org/hisp/dhis/patient/api/service/ActivityPlanModelServiceTest.java
  
dhis-2/dhis-web/dhis-web-api/src/test/java/org/hisp/dhis/patient/api/service/ModelMapperTest.java
added:
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/Activity.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/ActivityPlan.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/Beneficiary.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/DataElement.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/Form.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/Link.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/OrgUnit.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/Task.java
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/resources/
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/resources/FormsResource.java

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1903: Cleaned up download ++

2010-10-25 Thread noreply


revno: 1903
committer: Jo Størset 
branch nick: cbhis-mobile
timestamp: Thu 2010-08-26 16:59:39 +0200
message:
  Cleaned up download ++
added:
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/parser/
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/parser/AbstractXmlParser.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/parser/ActivityPlanParser.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/parser/FormParser.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/parser/FormsParser.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/parser/OrgUnitParser.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/parser/Parser.java
modified:
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/resources/UserResource.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/connection/DownloadManager.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/model/Activity.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/model/Beneficiary.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/model/Task.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/ui/DHISMIDlet.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/ui/SplashScreen.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/util/StringUtil.java
The size of the diff (1253 lines) is larger than your specified limit of 1000 
lines

--
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

___
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

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1904: Tried to merge in changes (not all that easy)

2010-10-25 Thread noreply

Merge authors:
  Long 

revno: 1904 [merge]
committer: Jo Størset 
branch nick: cbhis-mobile
timestamp: Thu 2010-08-26 21:12:57 +0200
message:
  Tried to merge in changes (not all that easy)
added:
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/OrgUnitRecordFilter.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/OrgUnitRecordStore.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/util/AlertUtil.java
modified:
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/ui/DHISMIDlet.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/ui/SplashScreen.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
=== added file 'mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/OrgUnitRecordFilter.java'
--- mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/OrgUnitRecordFilter.java	1970-01-01 00:00:00 +
+++ mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/OrgUnitRecordFilter.java	2010-08-26 19:12:57 +
@@ -0,0 +1,19 @@
+package org.hisp.dhis.mobile.db;
+
+import org.hisp.dhis.mobile.model.AbstractModel;
+
+public class OrgUnitRecordFilter
+extends AbstractModelRecordFilter
+{
+
+public OrgUnitRecordFilter( AbstractModel model )
+{
+super( model );
+}
+
+public boolean matches( byte[] suspect )
+{
+return super.matches( suspect );
+}
+
+}

=== added file 'mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/OrgUnitRecordStore.java'
--- mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/OrgUnitRecordStore.java	1970-01-01 00:00:00 +
+++ mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/OrgUnitRecordStore.java	2010-08-26 19:12:57 +
@@ -0,0 +1,136 @@
+package org.hisp.dhis.mobile.db;
+
+import java.util.Enumeration;
+import java.util.Vector;
+
+import javax.microedition.rms.RecordEnumeration;
+import javax.microedition.rms.RecordFilter;
+import javax.microedition.rms.RecordStore;
+import javax.microedition.rms.RecordStoreException;
+import javax.microedition.rms.RecordStoreNotOpenException;
+
+import org.hisp.dhis.mobile.model.AbstractModel;
+import org.hisp.dhis.mobile.model.OrgUnit;
+
+/**
+ * @author Tran Ng Minh Luan
+ * 
+ */
+public class OrgUnitRecordStore {
+
+	private String dbName;
+
+	private Vector orgUnitsVector;
+
+	// Constructor
+	public OrgUnitRecordStore() {
+
+	}
+
+	// Getter & Setter
+	public void setOrgUnitsVector(Vector orgUnitsVector) {
+		this.orgUnitsVector = orgUnitsVector;
+	}
+	
+	// Getter & Setter
+
+	public String getDbName() {
+		return dbName;
+	}
+
+	public void setDbName(String dbName) {
+		this.dbName = dbName;
+	}
+
+	// Supportive Methods
+	public void save() {
+		clear();
+		RecordStore rs = null;
+		try {
+			rs = RecordStore.openRecordStore(dbName, true);
+			if (orgUnitsVector != null && orgUnitsVector.size() > 0) {
+Enumeration orgUnits = orgUnitsVector.elements();
+byte[] orgUnitByte;
+while (orgUnits.hasMoreElements()) {
+	orgUnitByte = OrgUnit.orgUnitToRecord((OrgUnit) orgUnits
+			.nextElement());
+	rs.addRecord(orgUnitByte, 0, orgUnitByte.length);
+}
+orgUnitByte = null;
+			}
+		} catch (RecordStoreException e) {
+			System.out.println(e.getMessage());
+		} finally {
+			if (rs != null)
+try {
+	rs.closeRecordStore();
+} catch (RecordStoreNotOpenException e) {
+	e.printStackTrace();
+} catch (RecordStoreException e) {
+	e.printStackTrace();
+}
+		}
+	}
+
+	public void update(AbstractModel model) {
+		RecordStore rs = null;
+		RecordEnumeration re = null;
+		try {
+			rs = RecordStore.openRecordStore(dbName, true);
+			RecordFilter rsFilter = new AbstractModelRecordFilter(model);
+			re = rs.enumerateRecords(rsFilter, null, false);
+			Integer id;
+			byte[] orgUnitByte;
+			while (re.hasNextElement()) {
+id = new Integer(re.nextRecordId());
+orgUnitByte = OrgUnit.orgUnitToRecord((OrgUnit) model);
+rs.setRecord(id.intValue(), orgUnitByte, 0, orgUnitByte.length);
+
+			}
+			// release variable
+			orgUnitByte = null;
+			id = null;
+		} catch (Exception e) {
+
+		} finally {
+			if (re != null)
+re.destroy();
+			if (rs != null)
+try {
+	rs.closeRecordStore();
+} catch (RecordStoreNotOpenException e) {
+	e.printStackTrace();
+} catch (RecordStoreException e) {
+	e.printStackTrace();
+}
+		}
+	}
+
+	public void clear() {
+		RecordStore rs = null;
+		RecordEnumeration re = null;
+		try {
+			rs = RecordStore.openRecordStore(dbName, true);
+			re = rs.enumerateRecords(null, null, false);
+			int id;
+			while (re.hasNextElement()) {
+id = re.nextRecordId();
+rs.deleteRecord(id);
+			}
+		} catch (Exception e) {
+
+		} finally {
+			if (re != null)
+re.destroy();
+			if (rs != null)
+try {
+	rs.closeRecordStore();
+} catch (RecordStoreNotOpenException e) {
+	e.printS

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1905: Moved storage stuff out of midlet

2010-10-25 Thread noreply


revno: 1905
committer: Jo Størset 
branch nick: cbhis-mobile
timestamp: Thu 2010-08-26 21:55:46 +0200
message:
  Moved storage stuff out of midlet
added:
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/Storage.java
modified:
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/ui/DHISMIDlet.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/util/StringUtil.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
=== added file 'mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/Storage.java'
--- mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/Storage.java	1970-01-01 00:00:00 +
+++ mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/Storage.java	2010-08-26 19:55:46 +
@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 2004-2010, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the HISP project nor the names of its contributors may
+ *   be used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.mobile.db;
+
+import java.util.Enumeration;
+import java.util.Vector;
+
+import javax.microedition.rms.RecordStoreException;
+
+import org.hisp.dhis.mobile.model.AbstractModel;
+import org.hisp.dhis.mobile.model.Activity;
+import org.hisp.dhis.mobile.model.OrgUnit;
+import org.hisp.dhis.mobile.model.ProgramStageForm;
+
+public class Storage
+{
+
+// Get all Form from RMS
+public static Vector getAllForm()
+{
+ModelRecordStore modelRecordStore = null;
+Vector downloadedFormVector = null;
+try
+{
+modelRecordStore = new ModelRecordStore( ModelRecordStore.FORM_DB );
+downloadedFormVector = modelRecordStore.getAllRecord();
+}
+catch ( RecordStoreException rse )
+{
+
+}
+return downloadedFormVector;
+}
+
+
+public static ProgramStageForm fetchForm( int formId )
+{
+ModelRecordStore modelRecordStore = null;
+ProgramStageForm frm = null;
+
+try
+{
+modelRecordStore = new ModelRecordStore( ModelRecordStore.FORM_DB );
+byte rec[] = modelRecordStore.getRecord( formId );
+if ( rec != null )
+frm = ProgramStageForm.recordToProgramStageForm( rec );
+}
+catch ( RecordStoreException rse )
+{
+}
+
+return frm;
+}
+
+
+public static AbstractModel getForm(int index) {
+return (AbstractModel) getAllForm().elementAt( index );
+}
+
+
+public static void storeActivities( Vector activitiesVector )
+{
+ModelRecordStore modelRecordStore = new ModelRecordStore( ModelRecordStore.ACTIVITY_DB );
+Enumeration activities = activitiesVector.elements();
+Activity activity = null;
+int i = 0;
+while ( activities.hasMoreElements() )
+{
+try
+{
+activity = (Activity) activities.nextElement();
+modelRecordStore.addRecord( Activity.activityToRecord( activity ) );
+i += 1;
+}
+catch ( RecordStoreException rse )
+{
+}
+}
+}
+
+
+public static void storeForm( ProgramStageForm programStageForm )
+{
+ModelRecordStore modelRecordStore;
+try
+{
+modelRecordStore = new ModelRecordStore( ModelRecordStore.FORM_DB );
+modelRecordStore.add

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1906: Change in login flow

2010-10-25 Thread noreply


revno: 1906
committer: Long 
branch nick: cbhis-mobile
timestamp: Fri 2010-08-27 16:43:40 +0700
message:
  Change in login flow
modified:
  dhis-2/dhis-services/pom.xml
  mobile/dhis-mobile/.mtj
  mobile/dhis-mobile/build.properties
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/connection/DownloadManager.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/ModelRecordStore.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/OrgUnitRecordStore.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/SettingsRectordStore.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/Storage.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/model/OrgUnit.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/model/User.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/ui/DHISMIDlet.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/ui/SplashScreen.java
The size of the diff (1288 lines) is larger than your specified limit of 1000 
lines

--
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

___
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

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1908: Add: Re-Download Activities

2010-10-25 Thread noreply


revno: 1908
committer: Tran Ng Minh Luan 
branch nick: cbhis-mobile
timestamp: Mon 2010-08-30 15:09:07 +0700
message:
  Add: Re-Download Activities
added:
  
mobile/dhis-mobile/src/org/hisp/dhis/mobile/util/DefaultAlertConfirmListener.java
  
mobile/dhis-mobile/src/org/hisp/dhis/mobile/util/DnlActivitiesConfirmAlertListener.java
modified:
  mobile/dhis-mobile/.mtj
  mobile/dhis-mobile/Application Descriptor
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/ui/DHISMIDlet.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/util/AlertConfirmListener.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/util/AlertUtil.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 'mobile/dhis-mobile/.mtj'
--- mobile/dhis-mobile/.mtj	2010-08-27 09:43:40 +
+++ mobile/dhis-mobile/.mtj	2010-08-30 08:09:07 +
@@ -8,8 +8,8 @@
   
  
  
+
 
-
 
 
 

=== modified file 'mobile/dhis-mobile/Application Descriptor'
--- mobile/dhis-mobile/Application Descriptor	2010-08-25 12:09:15 +
+++ mobile/dhis-mobile/Application Descriptor	2010-08-30 08:09:07 +
@@ -1,7 +1,7 @@
-MIDlet-Version: 0.1
-MIDlet-Vendor: HISP
-MIDlet-Jar-URL: dhis-mobile.jar
-MicroEdition-Configuration: CLDC-1.1
-MicroEdition-Profile: MIDP-2.1
-MIDlet-1: DHISMIDlet,/logos/dhis2.png,org.hisp.dhis.mobile.ui.DHISMIDlet
-MIDlet-Name: dhis-mobile
+MIDlet-Version: 0.1
+MIDlet-Vendor: HISP
+MIDlet-Jar-URL: dhis-mobile.jar
+MicroEdition-Configuration: CLDC-1.0
+MicroEdition-Profile: MIDP-2.0
+MIDlet-1: DHISMIDlet,/logos/dhis2.png,org.hisp.dhis.mobile.ui.DHISMIDlet
+MIDlet-Name: dhis-mobile

=== modified file 'mobile/dhis-mobile/src/org/hisp/dhis/mobile/ui/DHISMIDlet.java'
--- mobile/dhis-mobile/src/org/hisp/dhis/mobile/ui/DHISMIDlet.java	2010-08-28 10:25:49 +
+++ mobile/dhis-mobile/src/org/hisp/dhis/mobile/ui/DHISMIDlet.java	2010-08-30 08:09:07 +
@@ -28,6 +28,8 @@
 import org.hisp.dhis.mobile.model.ProgramStageForm;
 import org.hisp.dhis.mobile.model.User;
 import org.hisp.dhis.mobile.util.AlertUtil;
+import org.hisp.dhis.mobile.util.DefaultAlertConfirmListener;
+import org.hisp.dhis.mobile.util.DnlActivitiesConfirmAlertListener;
 
 public class DHISMIDlet
 extends MIDlet
@@ -85,6 +87,8 @@
 
 private Command mnuListDnldCmd;
 
+private Command mnuListSettingCmd;
+
 private Command mnuListExtCmd;
 
 private Command frmDnldCmd;
@@ -148,8 +152,8 @@
  */
 public void startMIDlet()
 {
-   getPinForm().addCommand(this.getPinFormExitCmd());
-
+getPinForm().addCommand( this.getPinFormExitCmd() );
+
 new SplashScreen( getLogo(), getDisplay(), (Displayable) getLoginForm(), (Displayable) getPinForm() );
 
 }
@@ -246,6 +250,19 @@
 {
 mainMenuListAction();
 }
+else if ( command == getMnuListSettingCmd() )
+{
+switchDisplayable( null, getSettingsForm() );
+}
+else if ( command == getMnuListDnldCmd() )
+{
+// clear DataValue
+
+this.getDisplay().setCurrent(
+AlertUtil.getConfirmAlert( "Warning",
+"All data which are not sent to the server will be clear, do you want to continue ?", new DnlActivitiesConfirmAlertListener(), this,
+getMainMenuList(), getWaitForm("Redownloading Activities", "Downloading.Please wait") ) );
+}
 else if ( command == mnuListExtCmd )
 {
 exitMIDlet();
@@ -257,10 +274,9 @@
 {
 switchDisplayable( null, getMainMenuList() );
 }
-else if ( command == setngsSaveCmd )
+else if ( command == stngsOkCmd )
 {
-// should try to save global parameters...
-saveSettings();
+//save new settings
 switchDisplayable( null, getMainMenuList() );
 }
 }
@@ -287,63 +303,74 @@
 SettingsRectordStore settingRs = null;
 if ( command == pinFormNextCmd )
 {
-//check empty pin textfield
-if(!getPinTextField().getString().equals( "" )){
- // case 1: Later Startup, User Information has not been
-// loaded
-
-try
-{
-settingRs = new SettingsRectordStore( "SETTINGS" );
-if ( this.user == null )
-{
-

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1907: Check PIN

2010-10-25 Thread noreply


revno: 1907
committer: Tran Ng Minh Luan 
branch nick: cbhis-mobile
timestamp: Sat 2010-08-28 17:25:49 +0700
message:
  Check PIN
  Download-Save Activities (First Startup)
  Load Activities (Later Startup)
  View Activities
added:
  
mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/ActivityRecordOrdUnitIdFilter.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/ActivityRecordStore.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/util/AlertConfirmListener.java
modified:
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/connection/DownloadManager.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/ModelRecordStore.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/OrgUnitRecordStore.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/Storage.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/ui/DHISMIDlet.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/ui/SplashScreen.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/util/AlertUtil.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 'mobile/dhis-mobile/src/org/hisp/dhis/mobile/connection/DownloadManager.java'
--- mobile/dhis-mobile/src/org/hisp/dhis/mobile/connection/DownloadManager.java	2010-08-27 09:43:40 +
+++ mobile/dhis-mobile/src/org/hisp/dhis/mobile/connection/DownloadManager.java	2010-08-28 10:25:49 +
@@ -85,7 +85,8 @@
 {
 Vector activitiesVector = (Vector) download( url, new ActivityPlanParser() );
 dhisMIDlet.saveActivities( activitiesVector );
-dhisMIDlet.displayCurActivities();
+dhisMIDlet.switchDisplayable( null, dhisMIDlet.getMainMenuList() );
+//dhisMIDlet.displayCurActivities();
 }
 else if ( task.equals( DOWNLOAD_ALL ) )
 {

=== added file 'mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/ActivityRecordOrdUnitIdFilter.java'
--- mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/ActivityRecordOrdUnitIdFilter.java	1970-01-01 00:00:00 +
+++ mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/ActivityRecordOrdUnitIdFilter.java	2010-08-28 10:25:49 +
@@ -0,0 +1,51 @@
+package org.hisp.dhis.mobile.db;
+
+import java.io.ByteArrayInputStream;
+import java.io.DataInputStream;
+import java.io.IOException;
+
+import javax.microedition.rms.RecordFilter;
+
+/**
+ * @author Tran Ng Minh Luan
+ *
+ */
+public class ActivityRecordOrdUnitIdFilter implements RecordFilter{
+	private int orgUnitId;
+	
+	public ActivityRecordOrdUnitIdFilter(int orgUnitId) {
+		this.orgUnitId = orgUnitId;
+	}
+
+	public int getOrgUnitId() {
+		return orgUnitId;
+	}
+
+	public void setOrgUnitId(int orgUnitId) {
+		this.orgUnitId = orgUnitId;
+	}
+
+	public boolean matches(byte[] candidate){
+		ByteArrayInputStream bis = new ByteArrayInputStream(candidate);
+		DataInputStream dis = new DataInputStream(bis);
+		try{
+		if(dis.readInt() == this.orgUnitId){
+			return true;
+		}else{
+			return false;
+		}
+		}catch(Exception e){
+			System.out.println("Activity Filter get exception");
+			return false;
+		}
+		finally{
+			try {
+bis.close();
+dis.close();
+			} catch (IOException e) {
+e.printStackTrace();
+			}
+			
+		}
+	}
+}

=== added file 'mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/ActivityRecordStore.java'
--- mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/ActivityRecordStore.java	1970-01-01 00:00:00 +
+++ mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/ActivityRecordStore.java	2010-08-28 10:25:49 +
@@ -0,0 +1,168 @@
+package org.hisp.dhis.mobile.db;
+
+import java.util.Enumeration;
+import java.util.Vector;
+import javax.microedition.rms.RecordEnumeration;
+import javax.microedition.rms.RecordStore;
+import javax.microedition.rms.RecordStoreException;
+import javax.microedition.rms.RecordStoreNotOpenException;
+import org.hisp.dhis.mobile.model.Activity;
+
+/**
+ * @author Tran Ng Minh Luan
+ *
+ */
+public class ActivityRecordStore {
+	private String dbName;
+	private Vector activityVector;
+
+	//Constructor
+	public ActivityRecordStore() {
+		this.dbName = ModelRecordStore.ACTIVITY_DB;
+	}
+	
+	//Getter & Setter
+	
+	public Vector getActivityVector() {
+		return activityVector;
+	}
+
+	public void setActivityVector(Vector activityVector) {
+		this.activityVector = activityVector;
+	}
+	
+	//Supportive methods
+	public void save() {
+		RecordStore rs = null;
+		clear();
+		try {
+			rs = RecordStore.openRecordStore(dbName, true);
+			
+			if (activityVector != null && activityVector.size() > 0) {
+
+Enumeration activities = activityVector.elements();
+byte[] activityByte;
+Activity activity;
+while (activities.hasMoreElements()) {
+	
+	activity = (Activity) activities.nextElement();
+	
+	activityByte =

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1909: Download all ProgramStageForm and display form for each Activity.

2010-10-25 Thread noreply


revno: 1909
committer: Long 
branch nick: cbhis-mobile
timestamp: Mon 2010-08-30 16:47:01 +0700
message:
  Download all ProgramStageForm and display form  for each Activity.
modified:
  mobile/dhis-mobile/.mtj
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/connection/DownloadManager.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/Storage.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/ui/DHISMIDlet.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 'mobile/dhis-mobile/.mtj'
--- mobile/dhis-mobile/.mtj	2010-08-30 08:09:07 +
+++ mobile/dhis-mobile/.mtj	2010-08-30 09:47:01 +
@@ -8,8 +8,8 @@
   
  
  
+
 
-
 
 
 

=== modified file 'mobile/dhis-mobile/src/org/hisp/dhis/mobile/connection/DownloadManager.java'
--- mobile/dhis-mobile/src/org/hisp/dhis/mobile/connection/DownloadManager.java	2010-08-28 10:25:49 +
+++ mobile/dhis-mobile/src/org/hisp/dhis/mobile/connection/DownloadManager.java	2010-08-30 09:47:01 +
@@ -65,8 +65,29 @@
 
 if ( task.equals( DOWNLOAD_FORMS ) )
 {
+// Vector programStagesVector = (Vector) download( url, new
+// FormsParser() );
+// dhisMIDlet.displayFormsForDownload( programStagesVector );
+
+// Get the ProgramStageForm vector (without dataelements)
 Vector programStagesVector = (Vector) download( url, new FormsParser() );
-dhisMIDlet.displayFormsForDownload( programStagesVector );
+
+ProgramStageForm form = null;
+ProgramStageForm completeForm = null;
+
+// for each form on the vector, set dataelement vector for it
+for ( int i = 0; i < programStagesVector.size(); i++ )
+{
+form = (ProgramStageForm) programStagesVector.elementAt( i );
+completeForm = (ProgramStageForm) download( url + form.getId(), new FormParser() );
+form.setDataElements( completeForm.getDataElements() );
+}
+form = null;
+completeForm = null;
+
+// now we have a completed form vector (each form has id, name
+// and dataelement vector). Then call the save method
+dhisMIDlet.saveForms( programStagesVector );
 }
 else if ( task.equals( DOWNLOAD_FORM ) )
 {
@@ -86,7 +107,7 @@
 Vector activitiesVector = (Vector) download( url, new ActivityPlanParser() );
 dhisMIDlet.saveActivities( activitiesVector );
 dhisMIDlet.switchDisplayable( null, dhisMIDlet.getMainMenuList() );
-//dhisMIDlet.displayCurActivities();
+// dhisMIDlet.displayCurActivities();
 }
 else if ( task.equals( DOWNLOAD_ALL ) )
 {
@@ -164,7 +185,7 @@
 throw new AuthenticationException();
 case HttpConnection.HTTP_NOT_FOUND:
 connection.close();
-throw new IOException("Server not found");
+throw new IOException( "Server not found" );
 default:
 // Error: throw exception
 connection.close();

=== modified file 'mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/Storage.java'
--- mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/Storage.java	2010-08-28 10:25:49 +
+++ mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/Storage.java	2010-08-30 09:47:01 +
@@ -81,17 +81,18 @@
 
 public static void storeActivities( Vector activityVector )
 {
-clear(ModelRecordStore.ACTIVITY_DB);
+clear( ModelRecordStore.ACTIVITY_DB );
 ActivityRecordStore activityRecordStore = new ActivityRecordStore();
 activityRecordStore.setActivityVector( activityVector );
 activityRecordStore.save();
 activityRecordStore = null;
 }
-
-public static Vector loadActivities(){
+
+public static Vector loadActivities()
+{
 ActivityRecordStore activityRecordStore = new ActivityRecordStore();
 return activityRecordStore.loadAll();
-
+
 }
 
 public static void storeForm( ProgramStageForm programStageForm )
@@ -116,9 +117,58 @@
 }
 }
 
+public static void storeForms( Vector programStageFormVector )
+{
+clear( ModelRecordStore.FORM_DB );
+clear( ModelRecordStore.DATAELEMENT_DB );
+ModelRecordStore modelRecordStore;
+for ( int i = 0; i < programStageFormVector.size(); i++ )
+{
+try
+{
+

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1910: Save and update DataValue

2010-10-25 Thread noreply


revno: 1910
committer: Long 
branch nick: cbhis-mobile
timestamp: Tue 2010-08-31 16:00:31 +0700
message:
  Save and update DataValue
added:
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/DataValueFilter.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/DataValueRecordStore.java
modified:
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/connection/DownloadManager.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/ModelRecordStore.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/OrgUnitRecordStore.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/Storage.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/model/DataValue.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/ui/DHISMIDlet.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 'mobile/dhis-mobile/src/org/hisp/dhis/mobile/connection/DownloadManager.java'
--- mobile/dhis-mobile/src/org/hisp/dhis/mobile/connection/DownloadManager.java	2010-08-30 09:47:01 +
+++ mobile/dhis-mobile/src/org/hisp/dhis/mobile/connection/DownloadManager.java	2010-08-31 09:00:31 +
@@ -79,7 +79,7 @@
 for ( int i = 0; i < programStagesVector.size(); i++ )
 {
 form = (ProgramStageForm) programStagesVector.elementAt( i );
-completeForm = (ProgramStageForm) download( url + form.getId(), new FormParser() );
+completeForm = (ProgramStageForm) download( "http://localhost:8080/api/forms/"; + form.getId(), new FormParser() );
 form.setDataElements( completeForm.getDataElements() );
 }
 form = null;

=== added file 'mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/DataValueFilter.java'
--- mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/DataValueFilter.java	1970-01-01 00:00:00 +
+++ mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/DataValueFilter.java	2010-08-31 09:00:31 +
@@ -0,0 +1,67 @@
+package org.hisp.dhis.mobile.db;
+
+import java.io.ByteArrayInputStream;
+import java.io.DataInputStream;
+import java.io.IOException;
+
+import javax.microedition.rms.RecordFilter;
+
+public class DataValueFilter
+implements RecordFilter
+{
+private int proStageInstanceID;
+
+private int dataElementID;
+
+public boolean matches( byte[] candidate )
+{
+
+ByteArrayInputStream bis = new ByteArrayInputStream( candidate );
+DataInputStream dis = new DataInputStream( bis );
+try
+{
+if ( dis.readInt() == this.proStageInstanceID && dis.readInt() == this.dataElementID )
+return true;
+else
+return false;
+}
+catch ( IOException e )
+{
+return false;
+}
+finally
+{
+try
+{
+bis.close();
+dis.close();
+}
+catch ( IOException e )
+{
+e.printStackTrace();
+}
+
+}
+}
+
+public int getProStageInstanceID()
+{
+return proStageInstanceID;
+}
+
+public void setProStageInstanceID( int proStageInstanceID )
+{
+this.proStageInstanceID = proStageInstanceID;
+}
+
+public int getDataElementID()
+{
+return dataElementID;
+}
+
+public void setDataElementID( int dataElementID )
+{
+this.dataElementID = dataElementID;
+}
+
+}

=== added file 'mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/DataValueRecordStore.java'
--- mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/DataValueRecordStore.java	1970-01-01 00:00:00 +
+++ mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/DataValueRecordStore.java	2010-08-31 09:00:31 +
@@ -0,0 +1,68 @@
+package org.hisp.dhis.mobile.db;
+
+import java.util.Hashtable;
+
+import javax.microedition.rms.RecordEnumeration;
+import javax.microedition.rms.RecordStore;
+import javax.microedition.rms.RecordStoreException;
+
+import org.hisp.dhis.mobile.model.Activity;
+import org.hisp.dhis.mobile.model.DataValue;
+
+public class DataValueRecordStore
+{
+
+private Hashtable dataValueRecordID;
+
+private String dataBaseName;
+
+public DataValueRecordStore()
+{
+this.dataBaseName = ModelRecordStore.DATAVALUE_DB;
+}
+
+public void saveDataValue( DataValue dataValue )
+{
+ModelRecordStore modelRecordStore;
+try
+{
+modelRecordStore = new ModelRecordStore( ModelRecordStore.DATAVALUE_DB );
+modelRecordStore.addRecord( DataValue.dataValueToRecord( dataValue ) );
+}
+catch ( RecordStoreException rse )
+{
+System.out.println( rse.getMessage() );
+}
+}
+
+public Hashtable

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1911: Wait Form for login and delete datavalue method

2010-10-25 Thread noreply


revno: 1911
committer: Long 
branch nick: cbhis-mobile
timestamp: Mon 2010-09-06 10:04:35 +0700
message:
  Wait Form for login and delete datavalue method
modified:
  mobile/dhis-mobile/.mtj
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/Storage.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/ui/DHISMIDlet.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 'mobile/dhis-mobile/.mtj'
--- mobile/dhis-mobile/.mtj	2010-08-30 09:47:01 +
+++ mobile/dhis-mobile/.mtj	2010-09-06 03:04:35 +
@@ -8,8 +8,8 @@
   
  
  
+
 
-
 
 
 

=== modified file 'mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/Storage.java'
--- mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/Storage.java	2010-08-31 09:00:31 +
+++ mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/Storage.java	2010-09-06 03:04:35 +
@@ -238,6 +238,35 @@
 rse.printStackTrace();
 }
 }
+
+public static void deleteDataValue( Activity activity, DataValue newDataValue )
+{
+RecordStore rs = null;
+RecordEnumeration re = null;
+try
+{
+DataValueFilter filter = new DataValueFilter();
+filter.setDataElementID( newDataValue.getDataElementId() );
+filter.setProStageInstanceID( activity.getTask().getProgStageInstId() );
+rs = RecordStore.openRecordStore( ModelRecordStore.DATAVALUE_DB, true );
+re = rs.enumerateRecords( filter, null, false );
+while ( re.hasNextElement() )
+{
+if ( re.numRecords() == 1 )
+{
+int id = re.nextRecordId();
+rs.deleteRecord( id );
+}
+}
+filter = null;
+re = null;
+rs = null;
+}
+catch ( RecordStoreException rse )
+{
+rse.printStackTrace();
+}
+}
 
 public static void saveOrgUnit( OrgUnit orgUnit )
 {

=== modified file 'mobile/dhis-mobile/src/org/hisp/dhis/mobile/ui/DHISMIDlet.java'
--- mobile/dhis-mobile/src/org/hisp/dhis/mobile/ui/DHISMIDlet.java	2010-08-31 09:00:31 +
+++ mobile/dhis-mobile/src/org/hisp/dhis/mobile/ui/DHISMIDlet.java	2010-09-06 03:04:35 +
@@ -465,6 +465,13 @@
 getDataValue( selectedActivity.getTask().getProgStageInstId(), de.getId(), txtField.getString() ) );
 System.out.println( "Updating: " + de.getName() );
 }
+else
+{
+Storage.deleteDataValue( selectedActivity,
+getDataValue( selectedActivity.getTask().getProgStageInstId(), de.getId(), txtField.getString() ) );
+System.out.println( "Deleting: " + de.getName() );
+
+}
 }
 
 }
@@ -943,7 +950,7 @@
 
 // This is just for test .
 ProgramStageForm frm = Storage.fetchForm( 1 );
-//renderForm( frm, form );
+// renderForm( frm, form );
 }
 return form;
 }
@@ -1193,6 +1200,7 @@
 DownloadManager downloadManager = new DownloadManager( this, getUrl().getString() + "user", user,
 DownloadManager.DOWNLOAD_ORGUNIT );
 downloadManager.start();
+switchDisplayable( null, getWaitForm( "Connecting", "Please wait..." ) );
 
 }
 else
@@ -1341,7 +1349,7 @@
 Date date = new Date();
 date.setTime( Long.parseLong( (String) dataValueTable.get( String.valueOf( de.getId() ) ) ) );
 dateField.setDate( date );
-System.out.println("Date in db is: " + date.toString());
+System.out.println( "Date in db is: " + date.toString() );
 }
 form.append( dateField );
 formElements.put( de, dateField );

___
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

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1912: store url in SETTING_DB

2010-10-25 Thread noreply


revno: 1912
committer: Tran Ng Minh Luan 
branch nick: cbhis-mobile
timestamp: Mon 2010-09-06 15:24:48 +0700
message:
  store url in SETTING_DB
  now URL is available to change if api's address change (later uses).
modified:
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/connection/DownloadManager.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/ui/DHISMIDlet.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/util/AlertConfirmListener.java
  
mobile/dhis-mobile/src/org/hisp/dhis/mobile/util/DefaultAlertConfirmListener.java
  
mobile/dhis-mobile/src/org/hisp/dhis/mobile/util/DnlActivitiesConfirmAlertListener.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 'mobile/dhis-mobile/src/org/hisp/dhis/mobile/connection/DownloadManager.java'
--- mobile/dhis-mobile/src/org/hisp/dhis/mobile/connection/DownloadManager.java	2010-08-31 09:00:31 +
+++ mobile/dhis-mobile/src/org/hisp/dhis/mobile/connection/DownloadManager.java	2010-09-06 08:24:48 +
@@ -79,7 +79,7 @@
 for ( int i = 0; i < programStagesVector.size(); i++ )
 {
 form = (ProgramStageForm) programStagesVector.elementAt( i );
-completeForm = (ProgramStageForm) download( "http://localhost:8080/api/forms/"; + form.getId(), new FormParser() );
+completeForm = (ProgramStageForm) download( dhisMIDlet.getUrl().getString() + "forms/" + form.getId(), new FormParser() );
 form.setDataElements( completeForm.getDataElements() );
 }
 form = null;

=== modified file 'mobile/dhis-mobile/src/org/hisp/dhis/mobile/ui/DHISMIDlet.java'
--- mobile/dhis-mobile/src/org/hisp/dhis/mobile/ui/DHISMIDlet.java	2010-09-06 03:04:35 +
+++ mobile/dhis-mobile/src/org/hisp/dhis/mobile/ui/DHISMIDlet.java	2010-09-06 08:24:48 +
@@ -18,9 +18,7 @@
 import javax.microedition.lcdui.TextField;
 import javax.microedition.midlet.MIDlet;
 import javax.microedition.rms.RecordStoreException;
-
 import org.hisp.dhis.mobile.connection.DownloadManager;
-import org.hisp.dhis.mobile.db.ActivityRecordStore;
 import org.hisp.dhis.mobile.db.SettingsRectordStore;
 import org.hisp.dhis.mobile.db.Storage;
 import org.hisp.dhis.mobile.model.AbstractModel;
@@ -70,8 +68,6 @@
 
 private TextField url;
 
-private TextField adminPass;
-
 private Form dataEntryForm;
 
 private Form form;
@@ -82,7 +78,6 @@
 
 private Form waitForm;
 
-// add one more form to handle downloaded form list
 private List downloadedFormsList;
 
 private TextField userName;
@@ -140,6 +135,8 @@
 
 private TextField pinTextField;
 
+private TextField urlInSetting;
+
 /**
  * The DHISMIDlet constructor.
  */
@@ -269,8 +266,6 @@
 }
 else if ( command == getMnuListDnldCmd() )
 {
-// clear DataValue
-
 this.getDisplay().setCurrent(
 AlertUtil.getConfirmAlert( "Warning",
 "All data which are not sent to the server will be clear, do you want to continue ?",
@@ -290,7 +285,7 @@
 }
 else if ( command == stngsOkCmd )
 {
-// save new settings
+saveSettings();
 switchDisplayable( null, getMainMenuList() );
 }
 }
@@ -341,6 +336,7 @@
 // Load Activities
 switchDisplayable( null,
 this.getWaitForm( "Load Activities", "Loading.please wait" ) );
+this.loadSettings();
 this.loadForms();
 this.loadActivities();
 
@@ -358,6 +354,9 @@
 }
 else
 {
+// Save URL
+System.out.println( "save url:" + getUrl().getString() );
+settingRs.put( "url", getUrl().getString() );
 // Save PIN
 settingRs.put( "pin", this.getPinTextField().getString() );
 settingRs.save();
@@ -480,7 +479,7 @@
 {
 selectedActivity = (Activity) activitiesVector.elementAt( getActivitiesList().getSelectedIndex() );
 ProgramStageForm formOfActivity = Storage.fetchForm( selectedActivity.getTask().getProgStageId() );
-this.renderForm( formOfActivity, getForm() );
+this.getForm( formOfActivity );
 }
 
 private DataValue getDataValue( int progStageId, int dataElementID, String value )
@@ -804,13 +803,10 @@
 if ( settingsForm == null )

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1913: added "Save successfully" message and ReinitConfirmListener.java

2010-10-25 Thread noreply


revno: 1913
committer: Long 
branch nick: cbhis-mobile
timestamp: Wed 2010-09-08 16:52:06 +0700
message:
  added "Save successfully" message and  ReinitConfirmListener.java
added:
  
mobile/dhis-mobile/src/org/hisp/dhis/mobile/connection/DataValueUploadManager.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/util/ReinitConfirmListener.java
modified:
  mobile/dhis-mobile/.mtj
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/Storage.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/ui/DHISMIDlet.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 'mobile/dhis-mobile/.mtj'
--- mobile/dhis-mobile/.mtj	2010-09-06 03:04:35 +
+++ mobile/dhis-mobile/.mtj	2010-09-08 09:52:06 +
@@ -8,8 +8,8 @@
   
  
  
+
 
-
 
 
 

=== added file 'mobile/dhis-mobile/src/org/hisp/dhis/mobile/connection/DataValueUploadManager.java'
--- mobile/dhis-mobile/src/org/hisp/dhis/mobile/connection/DataValueUploadManager.java	1970-01-01 00:00:00 +
+++ mobile/dhis-mobile/src/org/hisp/dhis/mobile/connection/DataValueUploadManager.java	2010-09-08 09:52:06 +
@@ -0,0 +1,116 @@
+package org.hisp.dhis.mobile.connection;
+
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Enumeration;
+import java.util.Hashtable;
+
+import javax.microedition.io.Connector;
+import javax.microedition.io.HttpConnection;
+
+import org.hisp.dhis.mobile.model.DataValue;
+import org.hisp.dhis.mobile.model.OrgUnit;
+import org.hisp.dhis.mobile.model.User;
+
+public class DataValueUploadManager
+extends Thread
+{
+
+private Hashtable dataValueTable;
+
+private String url;
+
+private OrgUnit orgUnit;
+
+private User user;
+
+public DataValueUploadManager( Hashtable dataValueTable, String url, OrgUnit orgUnit, User user )
+{
+this.dataValueTable = dataValueTable;
+this.url = url;
+this.orgUnit = orgUnit;
+this.user = user;
+}
+
+public void run()
+
+{
+HttpConnection connection = null;
+OutputStream opt = null;
+DataOutputStream dos = null;
+Enumeration en = null;
+try
+{
+for ( int redirectTimes = 0; redirectTimes < 5; redirectTimes++ )
+{
+connection = (HttpConnection) Connector.open( url );
+configureConnection( connection );
+int status = connection.getResponseCode();
+switch ( status )
+{
+case HttpConnection.HTTP_SEE_OTHER:
+case HttpConnection.HTTP_TEMP_REDIRECT:
+case HttpConnection.HTTP_MOVED_TEMP:
+case HttpConnection.HTTP_MOVED_PERM:
+url = connection.getHeaderField( "location" );
+default:
+break;
+}
+System.out.println("Status: " + connection.getResponseCode());
+}
+
+ int numOfDataValue = dataValueTable.size();
+ opt = connection.openOutputStream();
+ dos = new DataOutputStream( opt );
+
+ dos.writeInt( numOfDataValue );
+ dos.writeInt( orgUnit.getId() );
+ en = dataValueTable.elements();
+ while ( en.hasMoreElements() )
+ {
+ DataValue dataValue = (DataValue) en.nextElement();
+ dos.writeInt( dataValue.getDataElementId() );
+ dos.writeInt( dataValue.getProgramInstanceId() );
+ dos.writeUTF( dataValue.getValue() );
+ }
+}
+catch ( Exception e )
+{
+System.out.println( e.getMessage() );
+}
+finally
+{
+try
+{
+dos.close();
+opt.close();
+connection.close();
+}
+catch ( IOException e )
+{
+System.out.println( e.getMessage() );
+}
+
+}
+
+}
+
+private void configureConnection( HttpConnection connection )
+throws IOException
+{
+String ua = "Profile/" + System.getProperty( "microedition.profiles" ) + " Configuration/"
++ System.getProperty( "microedition.configuration" );
+String locale = System.getProperty( "microedition.locale" );
+
+connection.setRequestProperty( "User-Agent", ua );
+connection.setRequestProperty( "Accept-Language", locale );
+connection.setRequestMethod( HttpConnection.GET );
+
+connection.setRequestProperty( "Content-Type", "application/x-www-form-urlencoded" );
+String ha

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1915: Pull "Send record data" from Input Form Screen to MainMenu Screen: all data will be sent at once

2010-10-25 Thread noreply


revno: 1915
committer: Tran Ng Minh Luan 
branch nick: cbhis-mobile
timestamp: Thu 2010-09-16 10:34:37 +0700
message:
  Pull "Send record data" from Input Form Screen to MainMenu Screen: all data 
will be sent at once
  
  Add Complete button into Input Form Screen: after filingl all required data, 
this activity will be marked completed and will not be loaded.
added:
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/ActivityRecordFilter.java
modified:
  
mobile/dhis-mobile/src/org/hisp/dhis/mobile/connection/DataValueUploadManager.java
  
mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/ActivityRecordOrdUnitIdFilter.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/ActivityRecordStore.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/DataValueRecordStore.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/Storage.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/ui/DHISMIDlet.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/util/StringUtil.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 'mobile/dhis-mobile/src/org/hisp/dhis/mobile/connection/DataValueUploadManager.java'
--- mobile/dhis-mobile/src/org/hisp/dhis/mobile/connection/DataValueUploadManager.java	2010-09-13 03:48:16 +
+++ mobile/dhis-mobile/src/org/hisp/dhis/mobile/connection/DataValueUploadManager.java	2010-09-16 03:34:37 +
@@ -6,6 +6,7 @@
 import java.io.OutputStream;
 import java.util.Enumeration;
 import java.util.Hashtable;
+import java.util.Vector;
 
 import javax.microedition.io.Connector;
 import javax.microedition.io.HttpConnection;
@@ -22,7 +23,7 @@
 {
 private DHISMIDlet dhisMidlet;
 
-private Hashtable dataValueTable;
+private Vector dataValueVector;
 
 private String url;
 
@@ -30,10 +31,10 @@
 
 private User user;
 
-public DataValueUploadManager( DHISMIDlet dhisMidlet, Hashtable dataValueTable, String url, OrgUnit orgUnit,
+public DataValueUploadManager( DHISMIDlet dhisMidlet, Vector dataValueVector, String url, OrgUnit orgUnit,
 User user )
 {
-this.dataValueTable = dataValueTable;
+this.dataValueVector = dataValueVector;
 this.url = url;
 this.orgUnit = orgUnit;
 this.user = user;
@@ -86,13 +87,13 @@
 // System.out.println( "Status: " + connection.getResponseCode() );
 // }
 
-int numOfDataValue = dataValueTable.size();
+int numOfDataValue = dataValueVector.size();
 System.out.println( "No of DataValues: " + numOfDataValue );
 dos = new DataOutputStream( opt );
 
 dos.writeInt( numOfDataValue );
 dos.writeInt( orgUnit.getId() );
-en = dataValueTable.elements();
+en = dataValueVector.elements();
 while ( en.hasMoreElements() )
 {
 DataValue dataValue = (DataValue) en.nextElement();
@@ -111,7 +112,7 @@
 }
 System.out.println( buffer.toString() );
 dhisMidlet.switchDisplayable( AlertUtil.getInfoAlert( "Result", buffer.toString() ),
-dhisMidlet.getActivitiesList() );
+dhisMidlet.getMainMenuList() );
 }
 catch ( Exception e )
 {

=== added file 'mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/ActivityRecordFilter.java'
--- mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/ActivityRecordFilter.java	1970-01-01 00:00:00 +
+++ mobile/dhis-mobile/src/org/hisp/dhis/mobile/db/ActivityRecordFilter.java	2010-09-16 03:34:37 +
@@ -0,0 +1,165 @@
+package org.hisp.dhis.mobile.db;
+
+import java.io.ByteArrayInputStream;
+import java.io.DataInputStream;
+import java.io.IOException;
+
+import javax.microedition.rms.RecordFilter;
+
+/**
+ * @author Tran Ng Minh Luan
+ *
+ */
+public class ActivityRecordFilter implements RecordFilter{
+public static final String filterByOrgUnitId = "FILTER_BY_ORGUNIT";
+
+public static final String filterByProgStageInstId = "FILTER_BY_PROGSTAGEINSTID";
+
+public static final String filterByStatusComplete = "FILTER_BY_STATUS_COMPLETE";
+
+public static final String filterByStatusIncomplete = "FILTER_BY_STATUS_INCOMPLETE";
+
+private int orgUnitId;
+
+private int progStageInstId;
+
+private String filter;
+
+public ActivityRecordFilter(String filter) {
+this.filter = filter;
+}
+
+
+
+public int getProgStageInstId()
+{
+return progStageInstId;
+}
+
+public void setProgStageInstId( int progStageInstId )
+{
+this.progStageInstId = progStageInstId;
+}
+
+

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1916: work in progress....

2010-10-25 Thread noreply

Merge authors:
  Long 

revno: 1916 [merge]
committer: Abyot Asalefew Gizaw 
branch nick: cbhis-mobile
timestamp: Fri 2010-09-24 13:12:49 +0200
message:
  work in progress
  - server side for gprs mobile reporting
  - activity exchange with mobiles in serialized format
removed:
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/resources/FormsResource.java
added:
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/consumer/
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/consumer/ActivityValueConsumer.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/consumer/DataSetValueConsumer.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/AbstractModel.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/AbstractModelList.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/ActivityValue.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/DataSet.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/DataSetValue.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/DataValue.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/ISerializable.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/Program.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/ProgramStage.java
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/provider/
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/provider/AbstractModelListProvider.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/provider/ActivityPlanProvider.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/provider/DataSetProvider.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/provider/ProgramProvider.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/resources/ActivityPlanResource.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/resources/DataSetResource.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/resources/FormResource.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/resources/ProgramResource.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/DefaultActivityPlanService.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/DefaultActivityValueService.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/DefaultDataSetService.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/DefaultDataValueService.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/DefaultPeriodService.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/DefaultProgramService.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/IActivityPlanService.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/IActivityValueService.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/IDataSetService.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/IDataValueService.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/IPeriodService.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/IProgramService.java
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/utils/
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/utils/LocaleUtil.java
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/activityplan/Activity.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/activityplan/ActivityPlanService.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSet.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSetService.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSetStore.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/i18n/I18nFormat.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/Period.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/PeriodService.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/WeeklyPeriodType.java
  dhis-2/dhis-services/dhis-service-core/pom.xml
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DefaultDataSetService.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/hibernate/HibernateDataSetStore.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/DefaultI18nService.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/I18nService.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1917: DHIS mobile client for both dataset reporting community module data entry. work in progress ...

2010-10-25 Thread noreply


revno: 1917
committer: Abyot Asalefew Gizaw 
branch nick: cbhis-mobile
timestamp: Fri 2010-09-24 16:08:46 +0200
message:
  DHIS mobile client for both dataset reporting community module data entry. 
work in progress ...
added:
  DHISMobile/
  DHISMobile/.mtj
  DHISMobile/.mtj.tmp/
  DHISMobile/.mtj.tmp/emulation/
  DHISMobile/.mtj.tmp/verified/
  DHISMobile/.mtj.tmp/verified/classes/
  DHISMobile/.mtj.tmp/verified/libs/
  DHISMobile/Application Descriptor
  DHISMobile/bin/
  DHISMobile/build.properties
  DHISMobile/deployed/
  DHISMobile/deployed/AmharicColorPhone/
  DHISMobile/deployed/AmharicColorPhone/DHISMobile.jad
  DHISMobile/deployed/AmharicColorPhone/DHISMobile.jar
  DHISMobile/deployed/pro_map.txt
  DHISMobile/deployed/pro_seeds.txt
  DHISMobile/deployed/proguard.cfg
  DHISMobile/lib/
  DHISMobile/lib/jzlib-1.0.7.jar
  DHISMobile/res/
  DHISMobile/src/
  DHISMobile/src/org/
  DHISMobile/src/org/hisp/
  DHISMobile/src/org/hisp/dhis/
  DHISMobile/src/org/hisp/dhis/mobile/
  DHISMobile/src/org/hisp/dhis/mobile/reporting/
  DHISMobile/src/org/hisp/dhis/mobile/reporting/connection/
  DHISMobile/src/org/hisp/dhis/mobile/reporting/connection/Base64.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/connection/BasicAuth.java
  
DHISMobile/src/org/hisp/dhis/mobile/reporting/connection/ConnectionManager.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/db/
  DHISMobile/src/org/hisp/dhis/mobile/reporting/db/AbstractModelComparator.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/db/AbstractModelFilter.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/db/ActivityRecordFilter.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/db/ActivityRecordStore.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/db/ModelRecordStore.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/db/SettingsRecordStore.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/db/ValueRecordStore.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/gui/
  DHISMobile/src/org/hisp/dhis/mobile/reporting/gui/CalendarCanvas.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/gui/CalendarWidget.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/gui/DHISMIDlet.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/gui/SplashScreen.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/image/
  DHISMobile/src/org/hisp/dhis/mobile/reporting/image/dhis2_logo.PNG
  DHISMobile/src/org/hisp/dhis/mobile/reporting/model/
  DHISMobile/src/org/hisp/dhis/mobile/reporting/model/AbstractModel.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/model/AbstractModelList.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/model/Activity.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/model/ActivityPlan.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/model/ActivityValue.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/model/Beneficiary.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/model/DataElement.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/model/DataSet.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/model/DataSetValue.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/model/DataValue.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/model/ISerializable.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/model/Period.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/model/Program.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/model/ProgramStage.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/model/Task.java
The size of the diff (6137 lines) is larger than your specified limit of 1000 
lines

--
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

___
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

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1918: Fix login error with password containing number.

2010-10-25 Thread noreply


revno: 1918
committer: Tran Ng Minh Luan 
branch nick: cbhis-mobile
timestamp: Tue 2010-10-05 16:14:30 +0700
message:
  Fix login error with password containing number.
  Make relation of Program_DB and ProgramStage_DB in RMS
  Add "Delete Program"
  Add "Delete Activity"
added:
  DHISMobile/src/org/hisp/dhis/mobile/reporting/db/ProgramStageRecordFilter.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/db/ProgramStageRecordStore.java
modified:
  DHISMobile/.mtj
  DHISMobile/build.properties
  
DHISMobile/src/org/hisp/dhis/mobile/reporting/connection/ConnectionManager.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/db/AbstractModelFilter.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/db/ActivityRecordStore.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/gui/DHISMIDlet.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/model/Activity.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/model/ProgramStage.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/resources/UserResource.java
  mobile/dhis-mobile/src/org/hisp/dhis/mobile/parser/FormParser.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 'DHISMobile/.mtj'
--- DHISMobile/.mtj	2010-09-24 14:08:46 +
+++ DHISMobile/.mtj	2010-10-05 09:14:30 +
@@ -1,15 +1,15 @@
 
 
-   
+   

   


-  
- 
+  
+ 
  
+
 
-
 
 
 
@@ -18,8 +18,8 @@
 
 
 
+
 
-
 
 
 

=== modified file 'DHISMobile/build.properties'
--- DHISMobile/build.properties	2010-09-24 14:08:46 +
+++ DHISMobile/build.properties	2010-10-05 09:14:30 +
@@ -1,34 +1,6 @@
 # MTJ Build Properties
-AmharicColorPhone.includes=src/org/hisp/dhis/mobile/reporting/connection/Base64.java\
-,src/org/hisp/dhis/mobile/reporting/connection/BasicAuth.java\
-,src/org/hisp/dhis/mobile/reporting/connection/ConnectionManager.java\
-,src/org/hisp/dhis/mobile/reporting/db/AbstractModelComparator.java\
-,src/org/hisp/dhis/mobile/reporting/db/AbstractModelFilter.java\
-,src/org/hisp/dhis/mobile/reporting/db/ActivityRecordFilter.java\
-,src/org/hisp/dhis/mobile/reporting/db/ActivityRecordStore.java\
-,src/org/hisp/dhis/mobile/reporting/db/ModelRecordStore.java\
-,src/org/hisp/dhis/mobile/reporting/db/SettingsRecordStore.java\
-,src/org/hisp/dhis/mobile/reporting/db/ValueRecordStore.java\
-,src/org/hisp/dhis/mobile/reporting/gui/CalendarCanvas.java\
-,src/org/hisp/dhis/mobile/reporting/gui/CalendarWidget.java\
-,src/org/hisp/dhis/mobile/reporting/gui/DHISMIDlet.java\
-,src/org/hisp/dhis/mobile/reporting/gui/SplashScreen.java\
-,src/org/hisp/dhis/mobile/reporting/image/dhis2_logo.PNG\
-,src/org/hisp/dhis/mobile/reporting/model/AbstractModel.java\
-,src/org/hisp/dhis/mobile/reporting/model/AbstractModelList.java\
-,src/org/hisp/dhis/mobile/reporting/model/Activity.java\
-,src/org/hisp/dhis/mobile/reporting/model/ActivityPlan.java\
-,src/org/hisp/dhis/mobile/reporting/model/ActivityValue.java\
-,src/org/hisp/dhis/mobile/reporting/model/Beneficiary.java\
-,src/org/hisp/dhis/mobile/reporting/model/DataElement.java\
-,src/org/hisp/dhis/mobile/reporting/model/DataSet.java\
-,src/org/hisp/dhis/mobile/reporting/model/DataSetValue.java\
-,src/org/hisp/dhis/mobile/reporting/model/DataValue.java\
-,src/org/hisp/dhis/mobile/reporting/model/ISerializable.java\
-,src/org/hisp/dhis/mobile/reporting/model/Period.java\
-,src/org/hisp/dhis/mobile/reporting/model/Program.java\
-,src/org/hisp/dhis/mobile/reporting/model/ProgramStage.java\
-,src/org/hisp/dhis/mobile/reporting/model/Task.java\
+DefaultColorPhone.includes=src\
+,res\
 
-AmharicColorPhone.excludes=\
+DefaultColorPhone.excludes=\
 

=== modified file 'DHISMobile/src/org/hisp/dhis/mobile/reporting/connection/ConnectionManager.java'
--- DHISMobile/src/org/hisp/dhis/mobile/reporting/connection/ConnectionManager.java	2010-09-24 14:08:46 +
+++ DHISMobile/src/org/hisp/dhis/mobile/reporting/connection/ConnectionManager.java	2010-10-05 09:14:30 +
@@ -1,6 +1,8 @@
 package org.hisp.dhis.mobile.reporting.connection;
 
 import com.jcraft.jzlib.ZInputStream;
+import com.sun.midp.io.Base64;
+
 import java.io.*;
 import java.util.Vector;
 import javax.microedition.io.*;
@@ -119,8 +121,10 @@
 
 		// set HTTP basic authentication
 		if (userName != null && password != null) {
-			conn.setRequestProperty("Authorization",
-	"Basic " + BasicAuth.encode(userName,password));
+//			conn.setRequestProperty("Authorization",
+//	"Basic " + BasicAuth.encode(userName,password));
+		byte[] auth = (userName+":"+password).getBytes();
+		conn

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1919: Add Reinit (delete all record, start from beginning) + Pin Form

2010-10-25 Thread noreply


revno: 1919
committer: Long 
branch nick: cbhis-mobile
timestamp: Wed 2010-10-06 11:47:32 +0700
message:
  Add Reinit (delete all record, start from beginning) + Pin Form
added:
  DHISMobile/src/org/hisp/dhis/mobile/reporting/util/
  DHISMobile/src/org/hisp/dhis/mobile/reporting/util/AlertConfirmListener.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/util/AlertUtil.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/util/ReinitConfirmListener.java
modified:
  DHISMobile/.mtj
  DHISMobile/build.properties
  
DHISMobile/src/org/hisp/dhis/mobile/reporting/connection/ConnectionManager.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/db/ModelRecordStore.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/gui/DHISMIDlet.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/gui/SplashScreen.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 'DHISMobile/.mtj'
--- DHISMobile/.mtj	2010-10-05 09:14:30 +
+++ DHISMobile/.mtj	2010-10-06 04:47:32 +
@@ -38,5 +38,31 @@
 
  
   
+  
+ 
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+  

 
\ No newline at end of file

=== modified file 'DHISMobile/build.properties'
--- DHISMobile/build.properties	2010-10-05 09:14:30 +
+++ DHISMobile/build.properties	2010-10-06 04:47:32 +
@@ -4,3 +4,8 @@
 
 DefaultColorPhone.excludes=\
 
+S40_5th_Edition_SDK_Feature_Pack_1_Lite.includes=src\
+,res\
+
+S40_5th_Edition_SDK_Feature_Pack_1_Lite.excludes=\
+

=== modified file 'DHISMobile/src/org/hisp/dhis/mobile/reporting/connection/ConnectionManager.java'
--- DHISMobile/src/org/hisp/dhis/mobile/reporting/connection/ConnectionManager.java	2010-10-05 09:14:30 +
+++ DHISMobile/src/org/hisp/dhis/mobile/reporting/connection/ConnectionManager.java	2010-10-06 04:47:32 +
@@ -6,6 +6,9 @@
 import java.io.*;
 import java.util.Vector;
 import javax.microedition.io.*;
+import javax.microedition.rms.RecordStoreException;
+
+import org.hisp.dhis.mobile.reporting.db.SettingsRecordStore;
 import org.hisp.dhis.mobile.reporting.gui.DHISMIDlet;
 import org.hisp.dhis.mobile.reporting.model.AbstractModel;
 import org.hisp.dhis.mobile.reporting.model.AbstractModelList;
@@ -14,6 +17,7 @@
 import org.hisp.dhis.mobile.reporting.model.DataSet;
 import org.hisp.dhis.mobile.reporting.model.DataSetValue;
 import org.hisp.dhis.mobile.reporting.model.Program;
+import org.hisp.dhis.mobile.reporting.util.AlertUtil;
 
 public class ConnectionManager extends Thread {
 
@@ -24,6 +28,7 @@
 	public static final String DOWNLOAD_PROGRAM = "program";
 	public static final String DOWNLOAD_ACTIVITYPLAN = "activityplan";
 	public static final String UPLOAD_ACTIVITY_VALUES = "uploadactivityvalue";
+	public static final String AUTHENTICATE = "authenticate";
 
 	Vector abstractModelListVector = new Vector();
 	private DataSet dataSet = null;
@@ -187,6 +192,78 @@
 // TODO Auto-generated catch block
 e.printStackTrace();
 			}	
+		} else if (task.equals(ConnectionManager.AUTHENTICATE)) {
+			authenticate(rootUrl + "user");
+		}
+	}
+	
+	private void authenticate(String url) {
+		HttpConnection hcon = null;
+
+		try {
+			int redirectTimes = 0;
+			boolean redirect;
+			do {
+redirect = false;
+hcon = (HttpConnection) Connector.open(url);
+configureConnection(hcon);
+
+int status = hcon.getResponseCode();
+switch (status) {
+case HttpConnection.HTTP_OK:
+	dhisMIDlet.setLogin(true);
+	saveInitSetting();
+	dhisMIDlet.switchDisplayable(null, dhisMIDlet.getPinForm());
+	break;
+case HttpConnection.HTTP_SEE_OTHER:
+case HttpConnection.HTTP_TEMP_REDIRECT:
+case HttpConnection.HTTP_MOVED_TEMP:
+case HttpConnection.HTTP_MOVED_PERM:
+	url = hcon.getHeaderField("location");
+	if (hcon != null)
+		hcon.close();
+
+	hcon = null;
+	redirectTimes++;
+	redirect = true;
+	break;
+default:
+	hcon.close();
+	throw new IOException("Response status not OK:" + status);
+}
+
+			} while (redirect == true && redirectTimes < 5);
+			if (redirectTimes == 5) {
+throw new IOException("Too much redirects");
+			}
+		} catch (SecurityException e) {
+			dhisMIDlet.switchDisplayable(AlertUtil.getErrorAlert("Error", e.getMessage()), dhisMIDlet.getLoginForm());
+			e.printStackTrace();
+		} catch (Exception e) {
+			dhisMIDlet.switchDisplayable(AlertUtil.getErrorAlert("Error", e.getMessage()), dhisMID

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1920: Fixed issue with Base64 encoding for Basic Authentication

2010-10-25 Thread noreply


revno: 1920
committer: Saptarshi 
branch nick: cbhis-mobile
timestamp: Sat 2010-10-16 01:33:33 +0530
message:
  Fixed issue with Base64 encoding for Basic Authentication
removed:
  DHISMobile/deployed/
  DHISMobile/deployed/AmharicColorPhone/
  DHISMobile/deployed/AmharicColorPhone/DHISMobile.jad
  DHISMobile/deployed/AmharicColorPhone/DHISMobile.jar
  DHISMobile/deployed/pro_map.txt
  DHISMobile/deployed/pro_seeds.txt
  DHISMobile/deployed/proguard.cfg
  DHISMobile/src/org/hisp/dhis/mobile/reporting/connection/BasicAuth.java
added:
  DHISMobile/.classpath
  DHISMobile/.project
modified:
  .bzrignore
  DHISMobile/.mtj
  DHISMobile/Application Descriptor
  DHISMobile/build.properties
  DHISMobile/src/org/hisp/dhis/mobile/reporting/connection/Base64.java
  
DHISMobile/src/org/hisp/dhis/mobile/reporting/connection/ConnectionManager.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/db/ActivityRecordFilter.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/db/ActivityRecordStore.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/db/ModelRecordStore.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/db/ProgramStageRecordFilter.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/db/ProgramStageRecordStore.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/db/SettingsRecordStore.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/db/ValueRecordStore.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/gui/DHISMIDlet.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/gui/SplashScreen.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/model/AbstractModel.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/model/Activity.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/model/ActivityPlan.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/model/ActivityValue.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/model/Beneficiary.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/model/DataElement.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/model/Program.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/model/ProgramStage.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/model/Task.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/util/AlertConfirmListener.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/util/AlertUtil.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/util/ReinitConfirmListener.java
The size of the diff (5167 lines) is larger than your specified limit of 1000 
lines

--
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

___
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

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1921: Fixed blank login. Added LWUIT library

2010-10-25 Thread noreply


revno: 1921
committer: Saptarshi 
branch nick: cbhis-mobile
timestamp: Mon 2010-10-18 08:55:22 +0530
message:
  Fixed blank login. Added LWUIT library
modified:
  DHISMobile/.classpath
  DHISMobile/.mtj
  DHISMobile/build.properties
  DHISMobile/src/org/hisp/dhis/mobile/reporting/connection/Base64.java
  
DHISMobile/src/org/hisp/dhis/mobile/reporting/connection/ConnectionManager.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/db/SettingsRecordStore.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/gui/DHISMIDlet.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/gui/SplashScreen.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/util/AlertUtil.java
The size of the diff (1643 lines) is larger than your specified limit of 1000 
lines

--
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

___
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

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1922: Added missing LWUIT

2010-10-25 Thread noreply


revno: 1922
committer: Saptarshi 
branch nick: cbhis-mobile
timestamp: Mon 2010-10-18 09:19:58 +0530
message:
  Added missing LWUIT
added:
  DHISMobile/lib/LWUIT.jar


--
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
=== added file 'DHISMobile/lib/LWUIT.jar'
Binary files DHISMobile/lib/LWUIT.jar	1970-01-01 00:00:00 + and DHISMobile/lib/LWUIT.jar	2010-10-18 03:49:58 + differ
___
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

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1923: - Change the MainMenu Screen, SettingCommand and add 2 more method to ActivityRecordStore.

2010-10-25 Thread noreply


revno: 1923
committer: Long 
branch nick: cbhis-mobile
timestamp: Mon 2010-10-18 15:10:12 +0700
message:
  - Change the MainMenu Screen, SettingCommand and add 2 more method to 
ActivityRecordStore.
modified:
  DHISMobile/.classpath
  DHISMobile/.mtj
  DHISMobile/src/org/hisp/dhis/mobile/reporting/db/ActivityRecordStore.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/gui/DHISMIDlet.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 'DHISMobile/.classpath'
--- DHISMobile/.classpath	2010-10-18 03:25:22 +
+++ DHISMobile/.classpath	2010-10-18 08:10:12 +
@@ -2,7 +2,7 @@
 
 	
 	
-	
+	
 	
 	
 	

=== modified file 'DHISMobile/.mtj'
--- DHISMobile/.mtj	2010-10-18 03:25:22 +
+++ DHISMobile/.mtj	2010-10-18 08:10:12 +
@@ -1,15 +1,15 @@
 
-
-   
+
+   

   


   
- 
+ 
  
-
 
+
 
 
 
@@ -18,8 +18,8 @@
 
 
 
+
 
-
 
 
 
@@ -52,15 +52,15 @@
 
 
 
+
 
 
-
 
 
 
 
+
 
-
 
  
   

=== modified file 'DHISMobile/src/org/hisp/dhis/mobile/reporting/db/ActivityRecordStore.java'
--- DHISMobile/src/org/hisp/dhis/mobile/reporting/db/ActivityRecordStore.java	2010-10-15 20:03:33 +
+++ DHISMobile/src/org/hisp/dhis/mobile/reporting/db/ActivityRecordStore.java	2010-10-18 08:10:12 +
@@ -17,14 +17,19 @@
  * 
  */
 public class ActivityRecordStore implements Runnable {
+	public static final String LOAD_ALL_ACTIVITYPLAN = "loadall";
+	public static final String LOAD_CURRENT_ACTIVITYPLAN = "loadcurrent";
+	public static final String LOAD_COMPLETED_ACTIVITYPLAN = "loadcompleted";
 	private String dbName;
+	private String task;
 	private Vector activityVector;
 	private DHISMIDlet dhisMIDlet;
 
 	// Constructor
-	public ActivityRecordStore(DHISMIDlet dhisMIDlet) {
+	public ActivityRecordStore(DHISMIDlet dhisMIDlet, String task) {
 		this.dbName = ModelRecordStore.ACTIVITY_DB;
 		this.dhisMIDlet = dhisMIDlet;
+		this.task = task;
 	}
 
 	// Constructor
@@ -187,9 +192,69 @@
 }
 		}
 	}
+	
+	public void loadCurrentActivityPlan(){
+RecordStore rs = null;
+RecordEnumeration re = null;
+ActivityRecordFilter rf = new ActivityRecordFilter( ActivityRecordFilter.filterByStatusIncomplete ); 
+activityVector = new Vector();
+try {
+rs = RecordStore.openRecordStore(dbName, true);
+re = rs.enumerateRecords(rf, null, false);
+while (re.hasNextElement()) {
+	activityVector.addElement(Activity.recordToActivity(re.nextRecord()));
+}
+} catch (Exception e) {
+
+} finally {
+if (re != null)
+re.destroy();
+if (rs != null)
+try {
+rs.closeRecordStore();
+} catch (RecordStoreNotOpenException e) {
+e.printStackTrace();
+} catch (RecordStoreException e) {
+e.printStackTrace();
+}
+}
+	}
+	
+	public void loadCompletedActivityPlan(){
+RecordStore rs = null;
+RecordEnumeration re = null;
+ActivityRecordFilter rf = new ActivityRecordFilter( ActivityRecordFilter.filterByStatusComplete ); 
+activityVector = new Vector();
+try {
+rs = RecordStore.openRecordStore(dbName, true);
+re = rs.enumerateRecords(rf, null, false);
+while (re.hasNextElement()) {
+	activityVector.addElement(Activity.recordToActivity(re.nextRecord()));
+}
+} catch (Exception e) {
+
+} finally {
+if (re != null)
+re.destroy();
+if (rs != null)
+try {
+rs.closeRecordStore();
+} catch (RecordStoreNotOpenException e) {
+e.printStackTrace();
+} catch (RecordStoreException e) {
+e.printStackTrace();
+}
+}
+	}
 
 	public void run() {
+		if (task.equalsIgnoreCase(LOAD_ALL_ACTIVITYPLAN)){
 		loadAll();
 		dhisMIDlet.loadActivityPlan(getActivityVector());
+		} else if (task.equalsIgnoreCase(LOAD_COMPLETED_ACTIVITYPLAN)){
+			
+		}

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1924: More details in Activity View

2010-10-25 Thread noreply


revno: 1924
committer: Tran Ng Minh Luan 
branch nick: cbhis-mobile
timestamp: Tue 2010-10-19 16:32:21 +0700
message:
  More details in Activity View
  
  Server send more details
  Change View
modified:
  DHISMobile/.classpath
  DHISMobile/.mtj
  DHISMobile/build.properties
  
DHISMobile/src/org/hisp/dhis/mobile/reporting/connection/ConnectionManager.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/db/ActivityRecordFilter.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/db/ActivityRecordStore.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/gui/DHISMIDlet.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/model/Activity.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/model/ActivityPlan.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/model/Beneficiary.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/ActivityPlan.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/Beneficiary.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/DefaultActivityPlanService.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/mapping/BeneficiaryMapper.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 'DHISMobile/.classpath'
--- DHISMobile/.classpath	2010-10-18 08:10:12 +
+++ DHISMobile/.classpath	2010-10-19 09:32:21 +
@@ -2,7 +2,7 @@
 
 	
 	
-	
+	
 	
 	
 	

=== modified file 'DHISMobile/.mtj'
--- DHISMobile/.mtj	2010-10-18 08:10:12 +
+++ DHISMobile/.mtj	2010-10-19 09:32:21 +
@@ -5,11 +5,11 @@
   


-  
+  
  
  
+
 
-
 
 
 
@@ -18,8 +18,8 @@
 
 
 
+
 
-
 
 
 
@@ -52,17 +52,50 @@
 
 
 
+
 
 
-
 
 
 
 
-
 
+
 
  
   
+  
+ 
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+  

 
\ No newline at end of file

=== modified file 'DHISMobile/build.properties'
--- DHISMobile/build.properties	2010-10-18 03:25:22 +
+++ DHISMobile/build.properties	2010-10-19 09:32:21 +
@@ -9,3 +9,8 @@
 
 S40_5th_Edition_SDK_Feature_Pack_1_Lite.excludes=\
 
+DefaultColorPhone.includes=src\
+,res\
+
+DefaultColorPhone.excludes=\
+

=== modified file 'DHISMobile/src/org/hisp/dhis/mobile/reporting/connection/ConnectionManager.java'
--- DHISMobile/src/org/hisp/dhis/mobile/reporting/connection/ConnectionManager.java	2010-10-18 03:25:22 +
+++ DHISMobile/src/org/hisp/dhis/mobile/reporting/connection/ConnectionManager.java	2010-10-19 09:32:21 +
@@ -48,6 +48,7 @@
 import org.hisp.dhis.mobile.reporting.util.AlertUtil;
 
 import com.jcraft.jzlib.ZInputStream;
+import com.sun.midp.io.Base64;
 
 public class ConnectionManager extends Thread {
 
@@ -157,7 +158,7 @@
 		// set HTTP basic authentication
 		if (userName != null && password != null) {
 		byte[] auth = (userName+":"+password).getBytes();
-		conn.setRequestProperty( "Authorization", "Basic " + Base64.encode( auth, 0, auth.length ));
+		conn.setRequestProperty( "Authorization", "Basic " +  Base64.encode( auth, 0, auth.length ));
 		}
 	}
 
@@ -482,9 +483,9 @@
 throw new IOException("Too much redirects");
 			}
 		}catch (SecurityException e){	
-			//e.printStackTrace();
+			e.printStackTrace();
 		}catch (Exception e) {		
-			//e.printStackTrace();
+			e.printStackTrace();
 		} finally {
 			try {
 if (hcon != null)

=== modified file 'DHISMobile/src/org/hisp/dhis/mobile/reporting/db/ActivityRecordFilter.java'
--- DHISMobile/src/org/hisp/dhis/mobile/reporting/db/ActivityRecordFilter.java	2010-10-15 20:03:33 +
+++ DHISMobile/src/org/hisp/dhis/mobile/reporting/db/ActivityRecordFilter.java	2010-10-19 09:32:21 +
@@ -76,6 +76,10 @@
 dis.readUTF();
 dis.readUTF();
 dis.readUTF();
+int i = dis.readInt();
+for(int j = 0; j < i; j++){
+dis.readUTF();
+}
 dis.readLong();
 dis.readInt();
 dis.readInt();
@@ -104,6 +108,10 @@
 dis.readUTF();
 dis.readUTF();
 dis.readUTF();
+int i = dis.readInt();
+

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1925: - Load Current ActivityPlan and Completed ActivityPlan.

2010-10-25 Thread noreply


revno: 1925
committer: Long 
branch nick: cbhis-mobile
timestamp: Wed 2010-10-20 01:02:48 +0700
message:
  - Load Current ActivityPlan and Completed ActivityPlan.
  - Change status of ActivityPlan to "completed" when user select "Complete"
  - Save and Update ActivityValue.
added:
  DHISMobile/src/org/hisp/dhis/mobile/reporting/db/ActivityValueFilter.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/db/ActivityValueRecordStore.java
modified:
  DHISMobile/.classpath
  DHISMobile/.mtj
  
DHISMobile/src/org/hisp/dhis/mobile/reporting/connection/ConnectionManager.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/db/ActivityRecordStore.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/gui/DHISMIDlet.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/model/ActivityPlan.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/model/Period.java
The size of the diff (1433 lines) is larger than your specified limit of 1000 
lines

--
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

___
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

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1926: Checkbox for Boolean Values

2010-10-25 Thread noreply


revno: 1926
author: mayank 
committer: Saptarshi 
branch nick: cbhis-mobile
timestamp: Wed 2010-10-20 13:08:45 +0530
message:
  Checkbox for Boolean Values
added:
  DHISMobile/src/org/hisp/dhis/mobile/test/
  DHISMobile/src/org/hisp/dhis/mobile/test/AllTestSuite.java
  DHISMobile/src/org/hisp/dhis/mobile/test/Base64Test.java
modified:
  DHISMobile/.classpath
  DHISMobile/.mtj
  DHISMobile/src/org/hisp/dhis/mobile/reporting/gui/DHISMIDlet.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 'DHISMobile/.classpath'
--- DHISMobile/.classpath	2010-10-19 18:02:48 +
+++ DHISMobile/.classpath	2010-10-20 07:38:45 +
@@ -2,9 +2,9 @@
 
 	
 	
-	
+	
 	
+	
 	
-	
 	
 

=== modified file 'DHISMobile/.mtj'
--- DHISMobile/.mtj	2010-10-19 18:02:48 +
+++ DHISMobile/.mtj	2010-10-20 07:38:45 +
@@ -1,40 +1,38 @@
 
-
+


   


-  
- 
- 
-
+  
+ 
+ 
+
 
-
+
+
 
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
 
-
-
+
 
+
 
-
+
+
 
 
+
 
-
 
-
+
 
-
 
  
   
@@ -52,20 +50,20 @@
 
 
 
+
 
 
-
 
 
 
 
+
 
-
 
  
   
-  
- 
+  
+ 
  
 
 

=== modified file 'DHISMobile/src/org/hisp/dhis/mobile/reporting/gui/DHISMIDlet.java'
--- DHISMobile/src/org/hisp/dhis/mobile/reporting/gui/DHISMIDlet.java	2010-10-19 18:02:48 +
+++ DHISMobile/src/org/hisp/dhis/mobile/reporting/gui/DHISMIDlet.java	2010-10-20 07:38:45 +
@@ -83,6 +83,7 @@
 	private TextField serverURL;
 	private TextField pinTextField;
 	private ChoiceGroup periodChoice;
+	private ChoiceGroup choiceGroup;
 	private Alert successAlert;
 	private Alert errorAlert;
 	private Form activityEntryForm;
@@ -1179,6 +1180,12 @@
 		intField.setString(dataValue.getVal());
 		form.append(intField);
 		dataElements.put(de, intField);
+	} else if (de.getType().equals("bool")) {
+		choiceGroup = new ChoiceGroup("", Choice.MULTIPLE);
+		choiceGroup.append(de.getName(), null);
+		choiceGroup.setFitPolicy(Choice.TEXT_WRAP_ON);
+		form.append(choiceGroup);
+		dataElements.put(de, choiceGroup);
 	} else {
 		TextField txtField = new TextField(de.getName(), "",
 32, TextField.ANY);
@@ -2068,6 +2075,9 @@
 TextField intField = (TextField) dataElements.get(de);
 val = intField.getString();
 
+			} else if (de.getType().equals("bool")) {
+ChoiceGroup boolField = (ChoiceGroup) dataElements.get(de);
+val = boolField.isSelected(0) == true ? "true" : "false";
 			} else {
 TextField txtField = (TextField) dataElements.get(de);
 val = txtField.getString();

=== added directory 'DHISMobile/src/org/hisp/dhis/mobile/test'
=== added file 'DHISMobile/src/org/hisp/dhis/mobile/test/AllTestSuite.java'
--- DHISMobile/src/org/hisp/dhis/mobile/test/AllTestSuite.java	1970-01-01 00:00:00 +
+++ DHISMobile/src/org/hisp/dhis/mobile/test/AllTestSuite.java	2010-10-20 07:38:45 +
@@ -0,0 +1,24 @@
+package org.hisp.dhis.mobile.test;
+
+import jmunit.framework.cldc11.TestSuite;
+
+public class AllTestSuite extends TestSuite {
+
+	/**
+	 * TestSuite Class constructor initializes the test suite.
+	 */
+	public AllTestSuite() {
+		super("AllTestSuite");
+		this.setupSuite();
+	}
+
+	/**
+	 * This method adds all suite test cases to be run.
+	 */
+	private void setupSuite() {
+		//JMUnit-BEGIN
+		add(new Base64Test());
+		//JMUnit-END
+	}
+
+}

=== added file 'DHISMobile/src/org/hisp/dhis/mobile/test/Base64Test.java'
--- DHISMobile/src/org/hisp/dhis/mobile/test/Base64Test.java	1970-01-01 00:00:00 +
+++ DHISMobile/src/org/hisp/dhis/mobile/test/Base64Test.java	2010-10-20 07:38:45 +
@@ -0,0 +1,51 @@
+package org.hisp.dhis.mobile.test;
+import org.hisp.dhis.mobile.reporting.connection.Base64;
+
+import jmunit.framework.cldc11.AssertionFailedException;
+import jmunit.framework.cldc11.TestCase;
+
+/**
+ * A test case to look at the Base64 encoding and verifying it correctly
+ * generates characters
+ */
+public class Base64Test extends TestCase {
+
+	public Ba

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1927: Added "late" flag to activity

2010-10-25 Thread noreply


revno: 1927
committer: Jo Størset 
branch nick: cbhis-mobile
timestamp: Wed 2010-10-20 17:24:08 +0530
message:
  Added "late" flag to activity
modified:
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/Activity.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/ActivityPlan.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/DefaultActivityPlanService.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-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/Activity.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/Activity.java	2010-09-24 11:12:49 +
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/Activity.java	2010-10-20 11:54:08 +
@@ -14,6 +14,8 @@
 
 private Beneficiary beneficiary;
 
+private boolean late = false;
+
 private Task task;
 
 private Date dueDate;   
@@ -48,6 +50,16 @@
 this.dueDate = dueDate;
 }
 
+
+
+	public boolean isLate() {
+		return late;
+	}
+
+	public void setLate(boolean late) {
+		this.late = late;
+	}
+
 	@Override
 	public byte[] serialize() throws IOException {
 		// TODO Auto-generated method stub
@@ -70,6 +82,7 @@
 DataOutputStream dout = new DataOutputStream(bout);
 
 this.getBeneficiary().serialize(dout);
+dout.writeBoolean(late);
 this.getTask().serialize(dout);
 dout.writeLong(this.getDueDate().getTime());   
 
@@ -82,5 +95,6 @@
 	public void deSerialize(byte[] data) throws IOException {
 		// TODO Auto-generated method stub
 		
-	}	
+	}
+
 }

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/ActivityPlan.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/ActivityPlan.java	2010-10-19 09:32:21 +
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/ActivityPlan.java	2010-10-20 11:54:08 +
@@ -63,6 +63,7 @@
 	dout.writeUTF(b.getFirstName()); 
 	dout.writeUTF(b.getMiddleName()); 
 	dout.writeUTF(b.getLastName());
+	dout.writeBoolean(activity.isLate());
 	Set atts = b.getPatientAttValues();
 dout.writeInt( atts.size() );
 for(String att : atts){

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/DefaultActivityPlanService.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/DefaultActivityPlanService.java	2010-10-19 09:32:21 +
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/DefaultActivityPlanService.java	2010-10-20 11:54:08 +
@@ -66,58 +66,46 @@
 
 Collection allActivities = activityPlanService.getActivitiesByProvider( unit );
 Collection activities = new ArrayList();
+
+ActivityPlan plan = new ActivityPlan();
+
+if ( activities == null || activities.isEmpty() )
+{
+return plan;
+}
+
+List items = new ArrayList();
+plan.setActivitiesList( items );
+int i = 0;
+
+
 for ( Activity activity : allActivities )
 {
-long dueTime = activity.getDueDate().getTime();
+//there are error on db with patientattributeid 14, so I limit the patient to be downloaded
+if(i++>10){
+	break;
+}
+
+	long dueTime = activity.getDueDate().getTime();
 if ( to.isBefore( dueTime ) )
 {
 continue;
 }
 
-if (from.isBefore( dueTime ) || !activity.getTask().isCompleted()) {
-activities.add( activity );
+if (from.isBefore( dueTime )) {
+items.add( getActivityModel( activity) );
+} else if (!activity.getTask().isCompleted()) {
+	org.hisp.dhis.web.api.model.Activity a = getActivityModel( activity);
+	items.add( a );
+	a.setLate(true);
 }
 }
 
-//ActivityPlan plan = new ActivitiesMapper().getModel( activities );
-ActivityPlan plan = getActivityPlanModel(activities);
-
-
 return plan;
 	}
 	
-	
-	
-	
-	//method replace the Mappers
-private org.hisp.dhis.web.api.model.ActivityPlan getActivityPlanModel( Collection activities )
-{
-ActivityPlan plan = new ActivityPlan();
-
-if ( activities == null || activities.isEmpty() )
-{
-return plan;
-}
-
-List items = new ArrayList();
-plan.s

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1928: Too fast when refactoring, getting rid of NPE

2010-10-25 Thread noreply


revno: 1928
committer: Jo Størset 
branch nick: cbhis-mobile
timestamp: Wed 2010-10-20 18:24:53 +0530
message:
  Too fast when refactoring, getting rid of NPE
modified:
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/DefaultActivityPlanService.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-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/DefaultActivityPlanService.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/DefaultActivityPlanService.java	2010-10-20 11:54:08 +
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/DefaultActivityPlanService.java	2010-10-20 12:54:53 +
@@ -65,20 +65,12 @@
 DateMidnight to = from.plusMonths( 1 );
 
 Collection allActivities = activityPlanService.getActivitiesByProvider( unit );
-Collection activities = new ArrayList();
 
 ActivityPlan plan = new ActivityPlan();
 
-if ( activities == null || activities.isEmpty() )
-{
-return plan;
-}
-
 List items = new ArrayList();
-plan.setActivitiesList( items );
+
 int i = 0;
-
-
 for ( Activity activity : allActivities )
 {
 //there are error on db with patientattributeid 14, so I limit the patient to be downloaded
@@ -100,7 +92,10 @@
 	a.setLate(true);
 }
 }
-
+if (!items.isEmpty()) {
+	plan.setActivitiesList( items );
+}
+
 return plan;
 	}
 	

___
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

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1929: Date Format Changed

2010-10-25 Thread noreply


revno: 1929
committer: savinder-singh 
branch nick: cbhis-mobile
timestamp: Wed 2010-10-20 20:24:30 +0530
message:
  Date Format Changed
modified:
  DHISMobile/.mtj
  DHISMobile/build.properties
  DHISMobile/src/org/hisp/dhis/mobile/reporting/gui/DHISMIDlet.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 'DHISMobile/.mtj'
--- DHISMobile/.mtj	2010-10-20 07:38:45 +
+++ DHISMobile/.mtj	2010-10-20 14:54:30 +
@@ -1,14 +1,26 @@
 
+<<< TREE
+
+   
+===
 

+>>> MERGE-SOURCE

   


+<<< TREE
+  
+ 
+ 
+
+===
   
  
  
 
+>>> MERGE-SOURCE
 
 
 
@@ -36,8 +48,8 @@
 
  
   
-  
- 
+  
+ 
  
 
 
@@ -50,9 +62,17 @@
 
 
 
-
+<<< TREE
+
+
+===
+
+>>> MERGE-SOURCE
 
+<<< TREE
+===
 
+>>> MERGE-SOURCE
 
 
 
@@ -62,6 +82,56 @@
 
  
   
+<<< TREE
+  
+ 
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+  
+  
+ 
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+===
   
  
  
@@ -77,6 +147,7 @@
 
 
 
+>>> MERGE-SOURCE
 
 
 

=== modified file 'DHISMobile/build.properties'
--- DHISMobile/build.properties	2010-10-19 09:32:21 +
+++ DHISMobile/build.properties	2010-10-20 14:54:30 +
@@ -4,10 +4,15 @@
 
 S40_5th_Edition_SDK_Feature_Pack_1.excludes=\
 
-S40_5th_Edition_SDK_Feature_Pack_1_Lite.includes=src\
-,res\
-
-S40_5th_Edition_SDK_Feature_Pack_1_Lite.excludes=\
+S40_5th_Edition_SDK_Feature_Pack_1.includes=src\
+,res\
+
+S40_5th_Edition_SDK_Feature_Pack_1.excludes=\
+
+S40_5th_Edition_SDK_Feature_Pack_1.includes=src\
+,res\
+
+S40_5th_Edition_SDK_Feature_Pack_1.excludes=\
 
 DefaultColorPhone.includes=src\
 ,res\

=== modified file 'DHISMobile/src/org/hisp/dhis/mobile/reporting/gui/DHISMIDlet.java'
--- DHISMobile/src/org/hisp/dhis/mobile/reporting/gui/DHISMIDlet.java	2010-10-20 07:38:45 +
+++ DHISMobile/src/org/hisp/dhis/mobile/reporting/gui/DHISMIDlet.java	2010-10-20 14:54:30 +
@@ -54,6 +54,7 @@
 import org.hisp.dhis.mobile.reporting.util.AlertUtil;
 import org.hisp.dhis.mobile.reporting.util.ReinitConfirmListener;
 
+
 /**
  * @author abyotag_adm
  */
@@ -1644,15 +1645,18 @@
 
 		for (int i = 0; i < activities.size(); i++) {
 			Activity activity = (Activity) activities.elementAt(i);
-			getActivityPlanList().insert(i,
-	activity.getBeneficiary().getFullName(), null);
+			
+			getActivityPlanList().insert(
+	i,
+	activity.getBeneficiary().getFullName() + "\n"
+			+ Period.formatDailyPeriod(activity.getDueDate()), null);
+
 		}
 
 		switchDisplayable(null, getActivityPlanList());
 	}
 
 	private void populatePrograms(List list) {
-		programsVector.removeAllElements();
 		ModelRecordStore modelRecordStore = null;
 		Vector programs = null;
 		try {

___
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

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1930: Download Everything

2010-10-25 Thread noreply


revno: 1930
committer: Tran Ng Minh Luan 
branch nick: cbhis-mobile
timestamp: Wed 2010-10-20 22:56:07 +0700
message:
  Download Everything
modified:
  DHISMobile/.classpath
  DHISMobile/build.properties
  
DHISMobile/src/org/hisp/dhis/mobile/reporting/connection/ConnectionManager.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/db/ActivityRecordFilter.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/gui/DHISMIDlet.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/model/Activity.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/model/ActivityPlan.java
  dhis-2/dhis-web/dhis-web-api/pom.xml
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/ActivityPlan.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/Program.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/ProgramStage.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/resources/ProgramResource.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/DefaultProgramService.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/IProgramService.java
  dhis-2/dhis-web/dhis-web-api/src/main/resources/META-INF/dhis/beans.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 'DHISMobile/.classpath'
--- DHISMobile/.classpath	2010-10-20 07:38:45 +
+++ DHISMobile/.classpath	2010-10-20 15:56:07 +
@@ -2,7 +2,7 @@
 
 	
 	
-	
+	
 	
 	
 	

=== modified file 'DHISMobile/build.properties'
--- DHISMobile/build.properties	2010-10-20 14:54:30 +
+++ DHISMobile/build.properties	2010-10-20 15:56:07 +
@@ -1,8 +1,8 @@
 # MTJ Build Properties
-S40_5th_Edition_SDK_Feature_Pack_1.includes=src\
+DefaultColorPhone.includes=src\
 ,res\
 
-S40_5th_Edition_SDK_Feature_Pack_1.excludes=\
+DefaultColorPhone.excludes=\
 
 S40_5th_Edition_SDK_Feature_Pack_1.includes=src\
 ,res\

=== modified file 'DHISMobile/src/org/hisp/dhis/mobile/reporting/connection/ConnectionManager.java'
--- DHISMobile/src/org/hisp/dhis/mobile/reporting/connection/ConnectionManager.java	2010-10-19 18:02:48 +
+++ DHISMobile/src/org/hisp/dhis/mobile/reporting/connection/ConnectionManager.java	2010-10-20 15:56:07 +
@@ -42,6 +42,7 @@
 import org.hisp.dhis.mobile.reporting.model.AbstractModelList;
 import org.hisp.dhis.mobile.reporting.model.ActivityPlan;
 import org.hisp.dhis.mobile.reporting.model.ActivityValue;
+import org.hisp.dhis.mobile.reporting.model.ActivityWrapper;
 import org.hisp.dhis.mobile.reporting.model.DataSet;
 import org.hisp.dhis.mobile.reporting.model.DataSetValue;
 import org.hisp.dhis.mobile.reporting.model.Program;
@@ -59,7 +60,8 @@
 	public static final String DOWNLOAD_ACTIVITYPLAN = "activityplan";
 	public static final String UPLOAD_ACTIVITY_VALUES = "uploadactivityvalue";
 	public static final String AUTHENTICATE = "authenticate";
-
+	public static final String DOWNLOAD_ALL = "downloadall";
+	
 	Vector abstractModelListVector = new Vector();
 	private DataSet dataSet = null;
 	private Program program = null;
@@ -76,7 +78,7 @@
 	private int param;
 	private DataSetValue dataSetValue;
 	private ActivityValue activityValue;
-
+	private ActivityWrapper activityWrapper;
 	public ConnectionManager() {
 	}
 
@@ -219,7 +221,86 @@
 			}
 		} else if (task.equals(ConnectionManager.AUTHENTICATE)) {
 			authenticate(rootUrl + "user");
-		}
+		}else if(task.equals(ConnectionManager.DOWNLOAD_ALL)){
+			downloadAll(rootUrl + "download");
+			dhisMIDlet.saveActivityPlan(activityWrapper.getActivityPlan());
+			Vector progs = activityWrapper.getPrograms();
+			int numbProg = progs.size();			
+			for(int i = 0; i < numbProg; i++){
+dhisMIDlet.saveProgram((Program)progs.elementAt(i));
+			}
+			//save programs trong activity wrapper
+		}
+	}
+
+	private void downloadAll(String url) {
+		HttpConnection hcon = null;
+		DataInputStream dis = null;
+		System.out.println("Pro URL" + url);
+		try {
+			int redirectTimes = 0;
+			boolean redirect;
+			do {
+redirect = false;
+hcon = (HttpConnection) Connector.open(url);
+configureConnection(hcon);
+
+hcon.setRequestProperty("Accept",
+		"application/vnd.org.dhis2.activitywrapper+serialized");
+
+dis = new DataInputStream(hcon.openInputStream());
+dis = getDecompressedStream(dis);
+
+if (dis != null) {
+	activityWrapper = new ActivityWrapper();
+	activityWrapper.deSerialize(dis);
+}
+
+int status = hcon.getResponseCode();
+switch (status) {
+case HttpConnection.HTTP_OK:
+	break;
+case HttpConnection.HTTP_TEMP_REDIRECT:
+case HttpConnection.HTTP_MOVED_TEMP:
+case HttpConnection.HTTP_MOVED_PERM:
+
+	url = hcon.getHeaderField("location");
+

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1931: Add ActivityWrapper class and other related classes

2010-10-25 Thread noreply


revno: 1931
committer: Tran Ng Minh Luan 
branch nick: cbhis-mobile
timestamp: Wed 2010-10-20 23:19:40 +0700
message:
  Add ActivityWrapper class and other related classes
added:
  DHISMobile/src/org/hisp/dhis/mobile/reporting/model/ActivityWrapper.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/ActivityWrapper.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/provider/ActivityWrapperProvider.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/resources/ActivityWrapperResource.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
=== added file 'DHISMobile/src/org/hisp/dhis/mobile/reporting/model/ActivityWrapper.java'
--- DHISMobile/src/org/hisp/dhis/mobile/reporting/model/ActivityWrapper.java	1970-01-01 00:00:00 +
+++ DHISMobile/src/org/hisp/dhis/mobile/reporting/model/ActivityWrapper.java	2010-10-20 16:19:40 +
@@ -0,0 +1,56 @@
+package org.hisp.dhis.mobile.reporting.model;
+
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.util.Date;
+import java.util.Vector;
+
+/**
+ * @author Tran Ng Minh Luan
+ *
+ */
+public class ActivityWrapper {
+	private Vector programs;
+	private ActivityPlan activityPlan;
+	
+	public ActivityWrapper() {
+	}
+
+	public Vector getPrograms() {
+		return programs;
+	}
+
+	public void setPrograms(Vector programs) {
+		this.programs = programs;
+	}
+
+	public ActivityPlan getActivityPlan() {
+		return activityPlan;
+	}
+
+	public void setActivityPlan(ActivityPlan activityPlan) {
+		this.activityPlan = activityPlan;
+	}
+	
+	
+	
+	
+	public void deSerialize(DataInputStream din) throws IOException {
+		this.activityPlan = new ActivityPlan();
+		this.programs = new Vector();
+		
+		int numbProgram = din.readInt();
+		System.out.println("Deserialize of ActivityWrapper - Number of Programs:"+numbProgram);
+		activityPlan.deSerialize(din);
+		
+		for(int i=0; i programs;
+
+
+
+public ActivityPlan getActivityPlan()
+{
+return activityPlan;
+}
+
+public void setActivityPlan( ActivityPlan activityPlan )
+{
+this.activityPlan = activityPlan;
+}
+
+public List getPrograms()
+{
+return programs;
+}
+
+public void setPrograms( List programs )
+{
+this.programs = programs;
+}
+
+public ActivityWrapper()
+{
+
+}
+
+public void serialize(OutputStream out) throws IOException
+{
+ByteArrayOutputStream bout = new ByteArrayOutputStream();
+DataOutputStream dout = new DataOutputStream(bout);
+
+dout.writeInt(programs.size());
+
+this.activityPlan.serialize( dout );
+
+for(Program each : programs){
+each.serialize( dout );
+}
+bout.flush();
+bout.writeTo(out);
+}
+
+@Override
+public byte[] serialize()
+throws IOException
+{
+// TODO Auto-generated method stub
+return null;
+}
+
+@Override
+public void deSerialize( byte[] data )
+throws IOException
+{
+// TODO Auto-generated method stub
+
+}
+
+
+
+}

=== added file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/provider/ActivityWrapperProvider.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/provider/ActivityWrapperProvider.java	1970-01-01 00:00:00 +
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/provider/ActivityWrapperProvider.java	2010-10-20 16:19:40 +
@@ -0,0 +1,78 @@
+package org.hisp.dhis.web.api.provider;
+
+import java.io.ByteArrayOutputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+
+import javax.ws.rs.Produces;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyWriter;
+import javax.ws.rs.ext.Provider;
+
+import org.hisp.dhis.web.api.model.ActivityWrapper;
+
+import com.jcraft.jzlib.JZlib;
+import com.jcraft.jzlib.ZOutputStream;
+import com.sun.jersey.spi.resource.Singleton;
+
+...@provider
+...@singleton
+...@produces( "application/vnd.org.dhis2.activitywrapper+serialized" ) 
+public class ActivityWrapperProvider implements MessageBodyWriter
+{
+@Override
+public long getSize(ActivityWrapper arg0, Class arg1, Type arg2,
+Annotation[] arg3, MediaType arg4) {
+return -1;
+}
+
+@Override
+public boolean isWriteable(Class arg0, Type arg1, Annotation[] arg2,
+MediaType arg3) {
+return tr

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1932: added checkboxes for boolean values on saved forms

2010-10-25 Thread noreply


revno: 1932
author: mayank 
committer: Saptarshi 
branch nick: cbhis-mobile
timestamp: Wed 2010-10-20 23:10:52 +0530
message:
  added checkboxes for boolean values on saved forms
modified:
  DHISMobile/.classpath
  DHISMobile/.mtj
  DHISMobile/build.properties
  DHISMobile/src/org/hisp/dhis/mobile/reporting/gui/DHISMIDlet.java
  DHISMobile/src/org/hisp/dhis/mobile/test/Base64Test.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 'DHISMobile/.classpath'
--- DHISMobile/.classpath	2010-10-20 15:56:07 +
+++ DHISMobile/.classpath	2010-10-20 17:40:52 +
@@ -2,9 +2,9 @@
 
 	
 	
-	
+	
 	
+	
 	
-	
 	
 

=== modified file 'DHISMobile/.mtj'
--- DHISMobile/.mtj	2010-10-20 14:54:30 +
+++ DHISMobile/.mtj	2010-10-20 17:40:52 +
@@ -1,55 +1,45 @@
 
-<<< TREE
 

-===
-
-   
->>> MERGE-SOURCE

   


-<<< TREE
   
  
  
+
 
-===
-  
- 
- 
-
->>> MERGE-SOURCE
-
-
-
+
 
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
 
-
+
+
 
-
 
-
-
+
 
 
-
 
+
 
-
+
 
+
 
  
   
-  
- 
+  
+ 
  
 
 
@@ -62,17 +52,9 @@
 
 
 
-<<< TREE
-
-
-===
-
->>> MERGE-SOURCE
 
-<<< TREE
-===
 
->>> MERGE-SOURCE
+
 
 
 
@@ -82,89 +64,5 @@
 
  
   
-<<< TREE
-  
- 
- 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 
-  
-  
- 
- 
-
-
-
-
-
-
-
-
-
-
-
-
-===
-  
- 
- 
-
-
-
-
-
-
-
-
-
-
-
-
->>> MERGE-SOURCE
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 
-  

 
\ No newline at end of file

=== modified file 'DHISMobile/build.properties'
--- DHISMobile/build.properties	2010-10-20 15:56:07 +
+++ DHISMobile/build.properties	2010-10-20 17:40:52 +
@@ -1,21 +1,11 @@
 # MTJ Build Properties
-DefaultColorPhone.includes=src\
-,res\
-
-DefaultColorPhone.excludes=\
-
-S40_5th_Edition_SDK_Feature_Pack_1.includes=src\
-,res\
-
-S40_5th_Edition_SDK_Feature_Pack_1.excludes=\
-
-S40_5th_Edition_SDK_Feature_Pack_1.includes=src\
-,res\
-
-S40_5th_Edition_SDK_Feature_Pack_1.excludes=\
-
-DefaultColorPhone.includes=src\
-,res\
-
-DefaultColorPhone.excludes=\
+S40_5th_Edition_SDK_Feature_Pack_1.includes=src\
+,res\
+
+S40_5th_Edition_SDK_Feature_Pack_1.excludes=\
+
+S40_5th_Edition_SDK_Feature_Pack_1_Lite.includes=src\
+,res\
+
+S40_5th_Edition_SDK_Feature_Pack_1_Lite.excludes=\
 

=== modified file 'DHISMobile/src/org/hisp/dhis/mobile/reporting/gui/DHISMIDlet.java'
--- DHISMobile/src/org/hisp/dhis/mobile/reporting/gui/DHISMIDlet.java	2010-10-20 15:56:07 +
+++ DHISMobile/src/org/hisp/dhis/mobile/reporting/gui/DHISMIDlet.java	2010-10-20 17:40:52 +
@@ -54,7 +54,6 @@
 import org.hisp.dhis.mobile.reporting.util.AlertUtil;
 import org.hisp.dhis.mobile.reporting.util.ReinitConfirmListener;
 
-
 /**
  * @author abyotag_adm
  */
@@ -257,19 +256,18 @@
 		} else if (displayable == loginForm) {
 			if (command == lgnFrmExtCmd) {
 exitMIDlet();
-			} 
-			else if (command == lgnFrmLgnCmd) {
+			} else if (command == lgnFrmLgnCmd) {
 if (getUserName().getString().trim().length() == 0
 		|| getPassword().getString().trim().length() == 0)

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1933: Prevent commit of project files

2010-10-25 Thread noreply


revno: 1933
committer: Saptarshi 
branch nick: cbhis-mobile
timestamp: Wed 2010-10-20 23:12:20 +0530
message:
  Prevent commit of project files
modified:
  .bzrignore


--
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 '.bzrignore'
--- .bzrignore	2010-10-15 20:03:33 +
+++ .bzrignore	2010-10-20 17:42:20 +
@@ -10,3 +10,6 @@
 build.sh
 .springBeans
 nbactions.xml
+.classpath
+.project
+.mtj

___
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

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1934: Download all after PIN, update and save datavalues and asterix mark for the late activity

2010-10-25 Thread noreply


revno: 1934
committer: Tran Ng Minh Luan 
branch nick: cbhis-mobile
timestamp: Thu 2010-10-21 18:17:31 +0700
message:
  Download all after PIN, update and save datavalues and asterix mark for the 
late activity
modified:
  DHISMobile/.classpath
  DHISMobile/.mtj
  DHISMobile/build.properties
  
DHISMobile/src/org/hisp/dhis/mobile/reporting/connection/ConnectionManager.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/db/ModelRecordStore.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/gui/DHISMIDlet.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/model/ActivityWrapper.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/model/Program.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/model/ProgramStage.java
  DHISMobile/src/org/hisp/dhis/mobile/reporting/util/ReinitConfirmListener.java
  dhis-2/dhis-web/dhis-web-api/pom.xml
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/ProgramStage.java
The size of the diff (4845 lines) is larger than your specified limit of 1000 
lines

--
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

___
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

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1935: Merged r1955 from trunk

2010-10-25 Thread noreply

Merge authors:
  Abyot Asalefew (abyot)
  Bharath (chbharathk)
  Bob Jolliffe bobjolli...@gmail.com
  dev ratan 
  Hieu Duy Dang (hieu-hispvietnam)...


revno: 1935 [merge]
committer: Jo Størset 
branch nick: cbhis-mobile
timestamp: Fri 2010-10-22 10:23:09 +0530
message:
  Merged r1955 from trunk
removed:
  
dhis-2/dhis-services/dhis-service-administration/src/main/resources/org/hisp/dhis/resourcetable/SqlView.hbm.xml
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/validate/
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/validate/additional-methods.js
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/validate/jquery.validate.js
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/validate/message.vm
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/validate/messages_locale.js
  
local/in/dhis-in-api/src/main/java/org/hisp/dhis/linelisting/LineListDataElementMap.java
  
local/in/dhis-in-api/src/main/java/org/hisp/dhis/linelisting/linelistdataelementmapping/
  
local/in/dhis-in-api/src/main/java/org/hisp/dhis/linelisting/linelistdataelementmapping/LineListDataElementMapping.java
  
local/in/dhis-in-api/src/main/java/org/hisp/dhis/linelisting/linelistdataelementmapping/LineListDataElementMappingService.java
  
local/in/dhis-in-api/src/main/java/org/hisp/dhis/linelisting/linelistdataelementmapping/LineListDataElementMappingStore.java
  
local/in/dhis-in-api/src/main/java/org/hisp/dhis/linelisting/linelistdataelementmapping/LineListOperand.java
  
local/in/dhis-in-services/dhis-in-service-linelisting/src/main/java/org/hisp/dhis/linelisting/linelistdataelementmapping/
  
local/in/dhis-in-services/dhis-in-service-linelisting/src/main/java/org/hisp/dhis/linelisting/linelistdataelementmapping/DefaultLineListDataElementMappingService.java
  
local/in/dhis-in-services/dhis-in-service-linelisting/src/main/java/org/hisp/dhis/linelisting/linelistdataelementmapping/hibernate/
  
local/in/dhis-in-services/dhis-in-service-linelisting/src/main/java/org/hisp/dhis/linelisting/linelistdataelementmapping/hibernate/HibernateLineListDataElementMappingStore.java
  
local/in/dhis-in-services/dhis-in-service-linelisting/src/main/resources/org/hisp/dhis/linelisting/hibernate/LineListDataElementMap.hbm.xml
  
local/in/dhis-in-services/dhis-in-service-linelisting/src/main/resources/org/hisp/dhis/linelisting/linelistdataelementmapping/
  
local/in/dhis-in-services/dhis-in-service-linelisting/src/main/resources/org/hisp/dhis/linelisting/linelistdataelementmapping/hibernate/
  
local/in/dhis-in-services/dhis-in-service-linelisting/src/main/resources/org/hisp/dhis/linelisting/linelistdataelementmapping/hibernate/LineListDataElementMapping.hbm.xml
  
local/in/dhis-web-linelisting-in/src/main/java/org/hisp/dhis/ll/action/lldataelementmapping/
  
local/in/dhis-web-linelisting-in/src/main/java/org/hisp/dhis/ll/action/lldataelementmapping/AddLineListDataElementMapping.java
  
local/in/dhis-web-linelisting-in/src/main/java/org/hisp/dhis/ll/action/lldataelementmapping/DeleteLineListDataElementMapping.java
  
local/in/dhis-web-linelisting-in/src/main/java/org/hisp/dhis/ll/action/lldataelementmapping/GetAllLineListMappingsAction.java
  
local/in/dhis-web-linelisting-in/src/main/java/org/hisp/dhis/ll/action/lldataelementmapping/GetOptionCombosAction.java
  
local/in/dhis-web-linelisting-in/src/main/java/org/hisp/dhis/ll/action/lldataelementmapping/LineListDataElementMappingFrontAction.java
  
local/in/dhis-web-linelisting-in/src/main/java/org/hisp/dhis/ll/action/lldataelementmapping/LineListElementListAction.java
  
local/in/dhis-web-linelisting-in/src/main/java/org/hisp/dhis/ll/action/lldataelementmapping/LineListGroupListAction.java
  
local/in/dhis-web-linelisting-in/src/main/java/org/hisp/dhis/ll/action/lldataelementmapping/LineListOptionListAction.java
  
local/in/dhis-web-linelisting-in/src/main/java/org/hisp/dhis/ll/action/lldataelementmapping/SelectDataElementAction.java
  
local/in/dhis-web-linelisting-in/src/main/java/org/hisp/dhis/ll/action/lldataelementmapping/UpdateLineListDataElementMapping.java
  
local/in/dhis-web-linelisting-in/src/main/java/org/hisp/dhis/ll/action/lldataelementmapping/ValidateLineListDataElementMapping.java
  local/in/dhis-web-reports-national/java.exe.stackdump
added:
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataSetAssociation.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/PivotDataSetAssociationTable.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/PivotDataSetAssociationTableService.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/sqlview/SqlViewJoinLib.java
  
dhis-2/dhis-services/dhis-service-administration/src/main/resources/org/hisp/dhis/sqlview/
  
dhis-2/dhis-services/dhis-service-administration/src/main/resources/org/hisp/dh

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1936: Next trunk merge

2010-10-25 Thread noreply

Merge authors:
  Thu Tran (tran-hispvietnam)

revno: 1936 [merge]
committer: Jo Størset 
branch nick: cbhis-mobile
timestamp: Fri 2010-10-22 10:33:12 +0530
message:
  Next trunk merge
modified:
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DataElementDeletionHandler.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/indicator/IndicatorDeletionHandler.java
  
dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.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-core/src/main/java/org/hisp/dhis/dataelement/DataElementDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DataElementDeletionHandler.java	2010-04-12 21:23:33 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DataElementDeletionHandler.java	2010-08-24 01:48:02 +
@@ -27,8 +27,9 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+import static org.hisp.dhis.dataelement.DataElementCategoryCombo.DEFAULT_CATEGORY_COMBO_NAME;
+
 import org.hisp.dhis.system.deletion.DeletionHandler;
-import static org.hisp.dhis.dataelement.DataElementCategoryCombo.DEFAULT_CATEGORY_COMBO_NAME;
 
 /**
  * @author Lars Helge Overland
@@ -64,12 +65,13 @@
 {
 return DataElement.class.getSimpleName();
 }
-
+
 @Override
 public void deleteDataElementCategoryCombo( DataElementCategoryCombo categoryCombo )
 {
-DataElementCategoryCombo default_ = categoryService.getDataElementCategoryComboByName( DEFAULT_CATEGORY_COMBO_NAME );
-
+DataElementCategoryCombo default_ = categoryService
+.getDataElementCategoryComboByName( DEFAULT_CATEGORY_COMBO_NAME );
+
 for ( DataElement dataElement : dataElementService.getAllDataElements() )
 {
 if ( dataElement.getCategoryCombo().equals( categoryCombo ) )
@@ -80,4 +82,5 @@
 }
 }
 }
+
 }

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/indicator/IndicatorDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/indicator/IndicatorDeletionHandler.java	2010-05-17 22:46:17 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/indicator/IndicatorDeletionHandler.java	2010-08-24 01:48:02 +
@@ -27,6 +27,10 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+import java.util.Set;
+
+import org.hisp.dhis.dataelement.DataElement;
+import org.hisp.dhis.expression.ExpressionService;
 import org.hisp.dhis.system.deletion.DeletionHandler;
 
 /**
@@ -46,7 +50,14 @@
 {
 this.indicatorService = indicatorService;
 }
-
+
+private ExpressionService expressionService;
+
+public void setExpressionService( ExpressionService expressionService )
+{
+this.expressionService = expressionService;
+}
+
 // -
 // DeletionHandler implementation
 // -
@@ -56,7 +67,7 @@
 {
 return Indicator.class.getSimpleName();
 }
-
+
 @Override
 public boolean allowDeleteIndicatorType( IndicatorType indicatorType )
 {
@@ -65,12 +76,12 @@
 if ( indicator.getIndicatorType().equals( indicatorType ) )
 {
 return false;
-}   
+}
 }
-
+
 return true;
 }
-
+
 @Override
 public void deleteIndicatorType( IndicatorType indicatorType )
 {
@@ -79,7 +90,22 @@
 if ( indicator.getIndicatorType().equals( indicatorType ) )
 {
 indicatorService.deleteIndicator( indicator );
-}   
-}
-}
+}
+}
+}
+
+public boolean allowDeleteDataElement( DataElement dataElement )
+{
+for ( Indicator indicator : indicatorService.getAllIndicators() )
+{
+Set daels = expressionService.getDataElementsInExpression( indicator.getNumerator() );
+if ( daels != null && daels.contains( dataElement ) ) return false;
+
+daels = expressionService.getDataElementsInExpression( indicator.getDenominator() );
+if ( daels != null && daels.contains( dataElement ) ) return false;
+}
+
+return true;
+}
+
 }

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/bean

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1937: Hoping that r1967 from trunk is not overwriting any branch changes to

2010-10-25 Thread noreply

Merge authors:
  Hieu Duy Dang (hieu-hispvietnam)
  Jan Henrik Øverland (janhenrik-overland)
  Thu Tran (tran-hispvietnam)
  Tran Thanh Tri 

revno: 1937 [merge]
committer: Jo Størset 
branch nick: cbhis-mobile
timestamp: Fri 2010-10-22 11:10:36 +0530
message:
  Hoping that r1967 from trunk is not overwriting any branch changes to 
  
dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml
removed:
  
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/sqlview/hibernate/
  
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/sqlview/hibernate/HibernateSqlViewExpandStore.java
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/responseInput.vm
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/responseSuccess.vm
added:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/sqlview/ResourceTableNameMap.java
  
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/sqlview/jdbc/
  
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/sqlview/jdbc/JdbcSqlViewExpandStore.java
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/images/checked.gif
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/images/unchecked.gif
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/caseaggregation.png
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/Section.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/SectionService.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/SectionStore.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/sqlview/SqlViewExpandStore.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/sqlview/SqlViewJoinLib.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/sqlview/SqlViewService.java
  
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/sqlview/DefaultSqlViewService.java
  
dhis-2/dhis-services/dhis-service-administration/src/main/resources/META-INF/dhis/beans.xml
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DefaultSectionService.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/hibernate/HibernateSectionStore.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/DefaultOrganisationUnitService.java
  
dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml
  
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/Section.hbm.xml
  
dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties
  dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml
  
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm
  
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm
  
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataentryRecords.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/index.vm
  
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/dataEntry.js
  
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageDataEntryForm.vm
  
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportSelect.vm
  
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/patient.css
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/south_africa/south_africa.css
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vista/vista.css
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/commons.js
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/css/redmond/jquery-ui.css
  
dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_vi_VN.properties
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/NoAction.java
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/AutoJoinResourceTablesAction.java
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/DropAllSqlViewTablesAction.java
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1938: More merge from trunk

2010-10-25 Thread noreply

Merge authors:
  Hieu Duy Dang (hieu-hispvietnam)
  Jan Henrik Øverland (janhenrik-overland)
  Jo Størset (storset)
  Lars 
  Mithilesh Kumar Thakur (mithilesh-hisp)...


revno: 1938 [merge]
committer: Jo Størset 
branch nick: cbhis-mobile
timestamp: Fri 2010-10-22 11:27:43 +0530
message:
  More merge from trunk
removed:
  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/sl_facilities
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/api/
  
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/api/Chart.java
  
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/api/ChartStore.java
  
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/api/PivotTable.java
  
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/api/PivotTableService.java
  
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/api/Report.java
  
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/api/impl/
  
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/api/impl/DefaultPivotTableService.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/chart/
  
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/chart/action/
  
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/chart/action/CreateChartAction.java
  
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/chart/action/GenerateChartAction.java
  
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/chart/action/GetAllChartsAction.java
  
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/chart/action/GetChartAction.java
  
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/chart/action/GetChartOptionsAction.java
  
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/chart/action/RemoveChartAction.java
  
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/chart/action/SaveChartAction.java
  
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/chart/action/ValidateChartAction.java
  
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/chart/action/ViewChartAction.java
  
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/chart/impl/
  
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/chart/impl/DefaultChartService.java
  
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/completeness/
  
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/completeness/pdf/
  
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/completeness/pdf/DataCompletenessPDFGenerator.java
  
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/completeness/util/
  
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/completeness/util/OutputGenerator.java
  
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/completeness/util/OutputGeneratorPipeThread.java
  
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/
  
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/action/
  
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/action/AbstractAction.java
  
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/action/GenerateCustomDataSetReportAction.java
  
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/action/GenerateDataSetReportDataSourceAction.java
  
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/action/GenerateDefaultDataSetReportAction.java
  
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/action/GetAllDataSetsAction.java
  
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/action/GetDataSetReportTypeAction.java
  
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/action/GetViewFormStateAction.java
  
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/action/NextPeriodsAction.java
  
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/action/PreviewReportAction.java
  
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/action/PreviousPeriodsAction.java
  
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/action/SelectReportAction.java
  
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/dataaccess/
  
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/dataaccess/Dhis20ReportDataAccess.java
  
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/dataaccess/Repor

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1939: merge in r2005 from trunk

2010-10-25 Thread noreply

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
  Lars 
  Mithilesh Kumar Thakur (mithilesh-hisp)

revno: 1939 [merge]
committer: Jo Størset 
branch nick: cbhis-mobile
timestamp: Fri 2010-10-22 12:17:05 +0530
message:
  merge in r2005 from trunk
added:
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/meta/
  
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/meta/action/
  
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/meta/action/GenerateMetaDataReportAnalyserFormAction.java
  
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/meta/action/GenerateMetaDataReportResultAction.java
  
local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/menuWithmetaDataReports.vm
  
local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/metaDataReportAnalysisFront.vm
modified:
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/DefaultValidationRuleService.java
  
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/pdf/PdfService.java
  
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/pdf/impl/ItextPdfService.java
  
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/workbook/WorkbookService.java
  
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/workbook/impl/JExcelWorkbookService.java
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElement.vm
  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js
  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js
  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js
  
dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/GenerateValidationResultPDFAction.java
  
dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/GenerateValidationResultWorkbookAction.java
  
dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/RunValidationAction.java
  
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/runValidation.js
  
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/viewValidationResultForm.vm
  local/in/dhis-web-reports-national/src/main/resources/META-INF/dhis/beans.xml
  local/in/dhis-web-reports-national/src/main/resources/struts.xml
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/menu.vm
The size of the diff (3251 lines) is larger than your specified limit of 1000 
lines

--
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

___
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

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1940: Merge in r2006 from trunk

2010-10-25 Thread noreply

Merge authors:
  Lars 

revno: 1940 [merge]
committer: Jo Størset 
branch nick: cbhis-mobile
timestamp: Fri 2010-10-22 12:18:39 +0530
message:
  Merge in r2006 from trunk
modified:
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementService.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementStore.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSetStore.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementService.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/hibernate/HibernateDataElementStore.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DefaultDataSetService.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/hibernate/HibernateDataSetStore.java
  
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataelement/DataElementStoreTest.java
  
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/DataSetStoreTest.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/dataelement/DataElementService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementService.java	2010-05-04 06:47:28 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementService.java	2010-08-30 10:56:57 +
@@ -32,6 +32,7 @@
 import java.util.Map;
 import java.util.Set;
 
+import org.hisp.dhis.dataset.DataSet;
 import org.hisp.dhis.hierarchy.HierarchyViolationException;
 import org.hisp.dhis.period.PeriodType;
 
@@ -289,6 +290,8 @@
  */
 boolean dataElementCategoryOptionComboExists( int id );
 
+Collection getDataElementsByDataSets( Collection dataSets );
+
 // -
 // Calculated Data Elements
 // -

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementStore.java	2010-04-12 21:23:33 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementStore.java	2010-08-30 10:56:57 +
@@ -29,6 +29,7 @@
 
 import java.util.Collection;
 
+import org.hisp.dhis.dataset.DataSet;
 import org.hisp.dhis.hierarchy.HierarchyViolationException;
 
 /**
@@ -226,6 +227,8 @@
  * @return true or false.
  */
 boolean dataElementCategoryOptionComboExists( int id );
+
+Collection getDataElementsByDataSets( Collection dataSets );
 
 // -
 // Calculated Data Elements

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSetStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSetStore.java	2010-09-24 11:12:49 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSetStore.java	2010-10-22 06:48:39 +
@@ -119,6 +119,8 @@
  * Returns all DataSets that can be collected through mobile.
  */
 Collection getDataSetsForMobile();
+
+Collection getDataSetsBySources( Collection sources );
 
 // -
 // FrequencyOverrideAssociation

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementService.java	2010-06-03 08:13:33 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementService.java	2010-08-30 10:56:57 +
@@ -45,6 +45,7 @@
 
 import org.hisp.dhis.common.GenericIdentifiableObjectStore;
 import org.hisp.dhis.common.comparator.CategoryComboSizeComparator;
+import org.hisp.dhis.dataset.DataSet;
 import org.hisp.dhis.hierarchy.HierarchyViolationException;
 import org.hisp.dhis.i18n.I18nService;
 import org.hisp.dhis.period.PeriodType;
@@ -479,6 +480,11 @@
 return map;
 }
 
+public Collection getDataElementsByDataSets( Collection dataSets )
+{
+return i18n( i18nService, dataElementStore.getDataElementsByDataSets( dataSets ) );
+}
+
 // -
 // DataElementGroup
 // -

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/hibernate/HibernateDataElementStore.java'
--- dhis-2/dhis-

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1941: Merge trunk r2008

2010-10-25 Thread noreply

Merge authors:
  Bharath (chbharathk)
  Mithilesh Kumar Thakur (mithilesh-hisp)

revno: 1941 [merge]
committer: Jo Størset 
branch nick: cbhis-mobile
timestamp: Fri 2010-10-22 12:19:29 +0530
message:
  Merge trunk r2008
removed:
  
local/in/dhis-web-maintenance-in/src/main/webapp/dhis-web-maintenance-in/javascript/
  
local/in/dhis-web-maintenance-in/src/main/webapp/dhis-web-maintenance-in/takeMysqlBackupForm.vm
added:
  
local/in/dhis-web-maintenance-in/src/main/webapp/dhis-web-maintenance-in/images/
  
local/in/dhis-web-maintenance-in/src/main/webapp/dhis-web-maintenance-in/images/ajax-loader.gif
  
local/in/dhis-web-maintenance-in/src/main/webapp/dhis-web-maintenance-in/images/download-icon.jpg
modified:
  local/in/dhis-web-maintenance-in/pom.xml
  
local/in/dhis-web-maintenance-in/src/main/java/org/hisp/dhis/config/action/StreamMySqlBackupAction.java
  
local/in/dhis-web-maintenance-in/src/main/java/org/hisp/dhis/config/action/TakeMySqlBackupAction.java
  local/in/dhis-web-maintenance-in/src/main/resources/META-INF/dhis/beans.xml
  
local/in/dhis-web-maintenance-in/src/main/webapp/dhis-web-maintenance-in/configurationForm.vm
  
local/in/dhis-web-maintenance-in/src/main/webapp/dhis-web-maintenance-in/menu.vm
  
local/in/dhis-web-maintenance-in/src/main/webapp/dhis-web-maintenance-in/takeMysqlBackupResult.vm
  
local/in/dhis-web-maintenance-in/src/main/webapp/dhis-web-maintenance-in/welcome.vm
  
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/aggregation/action/GenerateAggregationReportAnalyserResultAction.java
  
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/upward/action/GenerateUpwardReportAnalyserResultAction.java
  local/in/dhis-web-reports-national/src/main/resources/META-INF/dhis/beans.xml
  
local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/javascript/reports.js
The size of the diff (7803 lines) is larger than your specified limit of 1000 
lines

--
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

___
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

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1942: Merge trunk r2009

2010-10-25 Thread noreply

Merge authors:
  Lars 

revno: 1942 [merge]
committer: Jo Størset 
branch nick: cbhis-mobile
timestamp: Fri 2010-10-22 12:20:26 +0530
message:
  Merge trunk r2009
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSetStore.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRuleService.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRuleStore.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DefaultDataSetService.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/hibernate/HibernateDataSetStore.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/DefaultValidationRuleService.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/hibernate/HibernateValidationRuleStore.java
  
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/DataSetServiceTest.java
  
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/validation/ValidationRuleStoreTest.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/dataset/DataSetStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSetStore.java	2010-10-22 06:48:39 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSetStore.java	2010-10-22 06:50:26 +
@@ -120,7 +120,7 @@
  */
 Collection getDataSetsForMobile();
 
-Collection getDataSetsBySources( Collection sources );
+Collection getDataSetsBySources( Collection sources );
 
 // -
 // FrequencyOverrideAssociation

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRuleService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRuleService.java	2010-05-28 19:17:07 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRuleService.java	2010-08-30 13:04:39 +
@@ -30,6 +30,7 @@
 import java.util.Collection;
 import java.util.Date;
 
+import org.hisp.dhis.dataelement.DataElement;
 import org.hisp.dhis.dataset.DataSet;
 import org.hisp.dhis.period.Period;
 import org.hisp.dhis.source.Source;
@@ -143,6 +144,8 @@
  */
 ValidationRule getValidationRuleByName( String name );
 
+Collection getValidationRulesByDataElements( Collection dataElements );
+
 // -
 // ValidationRuleGroup
 // -

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRuleStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRuleStore.java	2010-05-28 19:17:07 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRuleStore.java	2010-08-30 13:04:39 +
@@ -27,7 +27,10 @@
 
 package org.hisp.dhis.validation;
 
+import java.util.Collection;
+
 import org.hisp.dhis.common.GenericIdentifiableObjectStore;
+import org.hisp.dhis.dataelement.DataElement;
 
 /**
  * @author Chau Thu Tran
@@ -57,4 +60,6 @@
  * @return the generated unique identifier for the ValidationRule.
  */
 void updateValidationRule( ValidationRule validationRule );
+
+Collection getValidationRulesByDataElements( Collection dataElements );
 }

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DefaultDataSetService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DefaultDataSetService.java	2010-10-22 06:48:39 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DefaultDataSetService.java	2010-10-22 06:50:26 +
@@ -155,7 +155,7 @@
 
 public Collection getDataSetsBySources( Collection sources )
 {
-return getDataSetsBySources( sources );
+return i18n( i18nService, dataSetStore.getDataSetsBySources( sources ) );
 }
 
 public int getSourcesAssociatedWithDataSet( DataSet dataSet, Collection sources )

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/hibernate/HibernateDataSetStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/hibernate/HibernateDataSetStore.java	2010-10-22 06:48:39 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/hibernate/HibernateDataSetStore.java	2010-10-22 06:50:26 +
@@ -167,7 +167,7 @@
 }
 
 @SuppressWarnings( "unchecked" )
-public Collection getDataSetsBySources( Collection sources )
+pub

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1946: Merge with trunk r2342 (india-2.0.5)

2010-10-25 Thread noreply

Merge authors:
  Hieu Duy Dang (hieu-hispvietnam)
  jason-p-pickering
  Mithilesh Kumar Thakur (mithilesh-hisp)
  Thu Tran (tran-hispvietnam)
  Tran Thanh Tri ...


revno: 1946 [merge]
committer: Jo Størset 
branch nick: cbhis-mobile
timestamp: Fri 2010-10-22 13:18:18 +0530
message:
  Merge with trunk r2342 (india-2.0.5)
removed:
  
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/association/
  
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/association/action/
  
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/association/action/GetNumberOfLevelsAction.java
  
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/association/action/SelectLevelAction.java
  
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/association/action/UnselectAllAction.java
  
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/association/action/UnselectLevelAction.java
  
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/datasetcompleted/action/GetSelectedOrganisationUnitAction.java
  
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/chart.vm
  
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/dataSetCompleteReportSelect.vm
  
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/ext/
  
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/ext/adapter/
  
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/ext/adapter/ext/
  
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/ext/adapter/ext/ext-base.js
  
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/ext/dataElementChart.js
  
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/ext/ext-all.js
  
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/ext/index.js
  
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/ext/organisationChart.js
  
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/ext/periodChart.js
  
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/ext/resources/
  
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/ext/resources/charts.swf
  
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/ext/resources/css/
  
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/ext/resources/css/chart.css
  
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/ext/resources/css/ext-all.css
  
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/ext/resources/images/
  
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/ext/resources/images/default/
  
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/ext/resources/images/default/button/
  
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/ext/resources/images/default/button/arrow.gif
  
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/ext/resources/images/default/button/btn.gif
  
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/ext/resources/images/default/button/group-cs.gif
  
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/ext/resources/images/default/button/group-lr.gif
  
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/ext/resources/images/default/button/group-tb.gif
  
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/ext/resources/images/default/button/s-arrow-b-noline.gif
  
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/ext/resources/images/default/button/s-arrow-b.gif
  
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/ext/resources/images/default/button/s-arrow-bo.gif
  
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/ext/resources/images/default/button/s-arrow-noline.gif
  
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/ext/resources/images/default/button/s-arrow-o.gif
  
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/ext/resources/images/default/button/s-arrow.gif
  
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/ext/resources/images/default/form/
  
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/ext/resources/images/default/form/text-

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1948: merged with trunk

2010-10-25 Thread noreply

Merge authors:
  dev ratan 
  Hieu Duy Dang (hieu-hispvietnam)
  Jan Henrik Øverland (janhenrik-overland)
  Lars Helge Øverland (larshelge)
  Thu Tran (tran-hispvietnam)...


revno: 1948 [merge]
committer: Abyot Asalefew Gizaw 
branch nick: cbhis-mobile
timestamp: Mon 2010-10-25 09:05:55 +0200
message:
  merged with trunk
removed:
  
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramInstanceDeleteHandler.java
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/favorite_star2.png
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/ajax/
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/ajax/htmlDataElement.vm
added:
  
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientattributevalue/PatientAttributeValueDeletionHandler.java
  
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramDeletionHandler.java
  
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramInstanceDeletionHandler.java
  
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramStageDataElementDeletionHandler.java
  
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/relationship/RelationshipDeletionHandler.java
  
dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/mock/MockI18n.java
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/help2.png
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/dataarchive/ArchivePatientDataAction.java
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/dataarchive/GetNumberOfOverlapingPatientValuesAction.java
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/patientDataArchiveForm.vm
  dhis-live/util/launch4j/dhis2-icon.png
  
dhis-mobile/dhis-web-mobile/src/main/java/org/hisp/dhis/mobile/user/action/EditUserGroupFormAction.java
  
dhis-mobile/dhis-web-mobile/src/main/java/org/hisp/dhis/mobile/user/action/GetUserGroupAction.java
  
dhis-mobile/dhis-web-mobile/src/main/java/org/hisp/dhis/mobile/user/action/RemoveUserGroupAction.java
  
dhis-mobile/dhis-web-mobile/src/main/java/org/hisp/dhis/mobile/user/action/UpdateUserGroupAction.java
  
dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/editUserGroupForm.vm
  dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/javascript/user.js
  
dhis-mobile/dhis-web-mobile/src/main/webapp/dhis-web-mobile/responseUserGroup.vm
modified:
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataarchive/DataArchiveService.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataarchive/DataArchiveStore.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElement.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOptionCombo.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/Section.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValue.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/i18n/I18nFormat.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientService.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageDataElementValidationService.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageDataElementValidationStore.java
  
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataarchive/DefaultDataArchiveService.java
  
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataarchive/jdbc/JdbcDataArchiveStore.java
  
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/DefaultResourceTableService.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/hibernate/HibernateDataElementStore.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datavalue/DefaultDataValueService.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableCreator.java
  
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/hibernate/HibernateUserStore.java
  
dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/crosstab/DefaultCrossTabService.java
  
dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/engine/DefaultDataMartEngine.java
  dhis-2/dhis-services/dhis-service-options/src/main/resources/help_content.xml
  
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientIdentifierTypeService.java
  
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hi

[Dhis2-devs] [Bug 666186] [NEW] Summary data status report hangs

2010-10-25 Thread Hynek Kruzik

Public bug reported:

Data status report (view DataSummary) hangs, i.e. blank report screen
appears and no report populates on the screen even after long time.
"View data status" woks fine with the same selection of report
parameters.

** Affects: dhis2
 Importance: Undecided
 Status: New

-- 
Summary data status report hangs
https://bugs.launchpad.net/bugs/666186
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.

Status in DHIS 2 - District Health Information Software: New

Bug description:
Data status report (view DataSummary) hangs, i.e. blank report screen appears 
and no report populates on the screen even after long time. "View data status" 
woks fine with the same selection of report parameters.



___
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

dhis2-devs@lists.launchpad.net

2010-10-25 Thread noreply


revno: 1949
committer: Bharath 
branch nick: trunk
timestamp: Mon 2010-10-25 16:42:04 +0530
message:
  Added Service to get ProgramInstances by Orgunit; Changed accordingly in 
MultiDataEntry&SummaryReport
modified:
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramInstanceService.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramInstanceStore.java
  
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java
  
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramInstanceStore.java
  
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/GetDataRecordsAction.java
  
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GenerateReportAction.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/ProgramInstanceService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramInstanceService.java	2009-11-13 15:59:13 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramInstanceService.java	2010-10-25 11:12:04 +
@@ -28,6 +28,7 @@
 
 import java.util.Collection;
 
+import org.hisp.dhis.organisationunit.OrganisationUnit;
 import org.hisp.dhis.patient.Patient;
 
 /**
@@ -66,4 +67,5 @@
 
 Collection getProgramInstances( Patient patient, Program program, boolean completed );
 
+Collection getProgramInstances( Program program, OrganisationUnit organisationUnit );
 }

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramInstanceStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramInstanceStore.java	2009-10-29 16:22:42 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramInstanceStore.java	2010-10-25 11:12:04 +
@@ -29,6 +29,7 @@
 import java.util.Collection;
 
 import org.hisp.dhis.common.GenericStore;
+import org.hisp.dhis.organisationunit.OrganisationUnit;
 import org.hisp.dhis.patient.Patient;
 
 /**
@@ -57,4 +58,6 @@
 Collection get( Patient patient, Program program );
 
 Collection get( Patient patient, Program program, boolean completed );
+
+Collection get( Program program, OrganisationUnit organisationUnit );
 }

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java	2009-11-19 18:43:20 +
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java	2010-10-25 11:12:04 +
@@ -28,6 +28,7 @@
 
 import java.util.Collection;
 
+import org.hisp.dhis.organisationunit.OrganisationUnit;
 import org.hisp.dhis.patient.Patient;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -123,4 +124,10 @@
 {
 return programInstanceStore.get( patient, program, completed );
 }
+
+public Collection getProgramInstances( Program program, OrganisationUnit organisationUnit )
+{
+return programInstanceStore.get( program, organisationUnit );
+}
+
 }

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramInstanceStore.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramInstanceStore.java	2009-10-29 16:22:42 +
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramInstanceStore.java	2010-10-25 11:12:04 +
@@ -31,6 +31,7 @@
 
 import org.hibernate.criterion.Restrictions;
 import org.hisp.dhis.hibernate.HibernateGenericStore;
+import org.hisp.dhis.organisationunit.OrganisationUnit;
 import org.hisp.dhis.patient.Patient;
 import org.hisp.dhis.program.Program;
 import org.hisp.dhis.program.ProgramInstance;
@@ -98,4 +99,12 @@
 return getCriteria( Restrictions.eq( "patient", patient ), Restrictions.eq( "program", program ),
 Restrictions.eq( "completed", completed ) ).list();
 }
+
+@SuppressWarnings( "unchecked" )
+public Collection get( Program program, OrganisationUnit organisationUnit )
+{
+return getCriteria( Restrictions.eq( "program", program ), Restrictions.isNull( "endDate" ) ).createAlias( "patient", "patient" )
+.add( Restrictions.eq( "patient.organisationUnit", organisationUnit ) ).list();
+}
+
 }

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/GetDataRecordsAction.java'
--- dhis-2/

dhis2-devs@lists.launchpad.net

2010-10-25 Thread Abyot Gizaw

Just a question Bahrath,

Once you have a program can't you use  Collection
getProgramInstances( Program program, boolean completed );

Do you want to display status of programs per orgunit?

If so I think you can still use the existing API and do some sort of
mapping. Because I see you kind of hardcoding a bit ... "get
programInstances whose endData is null" - I think you can play around with
the completed attribute of programInstance.

Abyot.

On Mon, Oct 25, 2010 at 1:13 PM,  wrote:

> 
> revno: 1949
> committer: Bharath 
> branch nick: trunk
> timestamp: Mon 2010-10-25 16:42:04 +0530
> message:
>  Added Service to get ProgramInstances by Orgunit; Changed accordingly in
> MultiDataEntry&SummaryReport
> modified:
>
>  
> dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramInstanceService.java
>
>  dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramInstanceStore.java
>
>  
> dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java
>
>  
> dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramInstanceStore.java
>
>  
> dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/GetDataRecordsAction.java
>
>  
> dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GenerateReportAction.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/ProgramInstanceService.java'
> ---
> dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramInstanceService.java
> 2009-11-13 15:59:13 +
> +++
> dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramInstanceService.java
> 2010-10-25 11:12:04 +
> @@ -28,6 +28,7 @@
>
>  import java.util.Collection;
>
> +import org.hisp.dhis.organisationunit.OrganisationUnit;
>  import org.hisp.dhis.patient.Patient;
>
>  /**
> @@ -66,4 +67,5 @@
>
> Collection getProgramInstances( Patient patient,
> Program program, boolean completed );
>
> +Collection getProgramInstances( Program program,
> OrganisationUnit organisationUnit );
>  }
>
> === modified file
> 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramInstanceStore.java'
> ---
> dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramInstanceStore.java
>   2009-10-29 16:22:42 +
> +++
> dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramInstanceStore.java
>   2010-10-25 11:12:04 +
> @@ -29,6 +29,7 @@
>  import java.util.Collection;
>
>  import org.hisp.dhis.common.GenericStore;
> +import org.hisp.dhis.organisationunit.OrganisationUnit;
>  import org.hisp.dhis.patient.Patient;
>
>  /**
> @@ -57,4 +58,6 @@
> Collection get( Patient patient, Program program );
>
> Collection get( Patient patient, Program program,
> boolean completed );
> +
> +Collection get( Program program, OrganisationUnit
> organisationUnit );
>  }
>
> === modified file
> 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java'
> ---
> dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java
>2009-11-19 18:43:20 +
> +++
> dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java
>2010-10-25 11:12:04 +
> @@ -28,6 +28,7 @@
>
>  import java.util.Collection;
>
> +import org.hisp.dhis.organisationunit.OrganisationUnit;
>  import org.hisp.dhis.patient.Patient;
>  import org.springframework.transaction.annotation.Transactional;
>
> @@ -123,4 +124,10 @@
> {
> return programInstanceStore.get( patient, program, completed );
> }
> +
> +public Collection getProgramInstances( Program
> program, OrganisationUnit organisationUnit )
> +{
> +return programInstanceStore.get( program, organisationUnit );
> +}
> +
>  }
>
> === modified file
> 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramInstanceStore.java'
> ---
> dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramInstanceStore.java
>  2009-10-29 16:22:42 +
> +++
> dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramInstanceStore.java
>  2010-10-25 11:12:04 +
> @@ -31,6 +31,7 @@
>
>  import org.hibernate.criterion.Restrictions;
>  import org.hisp.dhis.hibernate.HibernateGenericStore;
> +import org.hisp.dhis.organisation

dhis2-devs@lists.launchpad.net

2010-10-25 Thread bharath kumar

On Mon, Oct 25, 2010 at 5:00 PM, Abyot Gizaw  wrote:

> Just a question Bahrath,
>
> Once you have a program can't you use  Collection
> getProgramInstances( Program program, boolean completed );
>
> Do you want to display status of programs per orgunit?
>

Yes.

>
> If so I think you can still use the existing API and do some sort of
> mapping. Because I see you kind of hardcoding a bit ... "get
> programInstances whose endData is null" - I think you can play around with
> the completed attribute of programInstance.
>
>
*completed *attribute is not setting some times where enddate is set, I am
not sure exactly in which case it is happening (may be when we enroll
,unenroll again enroll program to a person). Actually the method name should
be getActiveProgramInstances, but in store we are implementing GenericStore,
thats y i have given getProgramInstances to the method.

May be in service i can use getActiveProgramInstances which will call
getProgramInstances(program, orgunit) from store?

-- 

Regards,
Bharath Kumar. Ch
___
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

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1950: Added DataElement Wise Graphical Analysis Form Design in Dashboard

2010-10-25 Thread noreply


revno: 1950
committer: Mithilesh Kumar Thakur
branch nick: trunk
timestamp: Mon 2010-10-25 17:16:15 +0530
message:
  Added DataElement Wise Graphical Analysis Form Design in Dashboard
added:
  
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dashboard/ga/action/GenerateGraphicalAnalyserDataElementsFormAction.java
  
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dashboard/ga/action/charts/GenerateChartDataElementAction.java
  
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/graphicalAnalysisDataElementFront.vm
  
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/graphicalAnalysisDataElementResult.vm
  
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/gadataelement.js
  
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menuWithTreeForGADataElement.vm
modified:
  
local/bd/dhis-web-linelisting-bd/src/main/resources/org/hisp/dhis/ll/i18n_module.properties
  
local/bd/dhis-web-linelisting-bd/src/main/webapp/dhis-web-linelisting-bd/linelistAggForm.vm
  
local/bd/dhis-web-linelisting-manpower/src/main/java/org/hisp/dhis/ll/action/llValidation/GetFilteredLineListElementsAction.java
  
local/bd/dhis-web-linelisting-manpower/src/main/resources/org/hisp/dhis/ll/i18n_module.properties
  
local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/javascript/validationForm.js
  
local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/linelistAggForm.vm
  
local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/llAggQueryBuilderForm.vm
  
local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/responseLineListElement.vm
  
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dashboard/action/GetDataElementsAction.java
  
local/in/dhis-web-dashboard/src/main/java/org/hisp/dhis/dashboard/util/DashBoardService.java
  local/in/dhis-web-dashboard/src/main/resources/META-INF/dhis/beans.xml
  
local/in/dhis-web-dashboard/src/main/resources/org/hisp/dhis/dashboard/i18n_module.properties
  local/in/dhis-web-dashboard/src/main/resources/struts.xml
  
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/db.js
  
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/javascript/ga.js
  local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/menu.vm
  
local/in/dhis-web-dashboard/src/main/webapp/dhis-web-dashboard/tabularAnalysisFront.vm
The size of the diff (1829 lines) is larger than your specified limit of 1000 
lines

--
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

___
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

dhis2-devs@lists.launchpad.net

2010-10-25 Thread Abyot Gizaw

On Mon, Oct 25, 2010 at 1:44 PM, bharath kumar  wrote:

>
>
> On Mon, Oct 25, 2010 at 5:00 PM, Abyot Gizaw  wrote:
>
>> Just a question Bahrath,
>>
>> Once you have a program can't you use  Collection
>> getProgramInstances( Program program, boolean completed );
>>
>> Do you want to display status of programs per orgunit?
>>
>
> Yes.
>
>
>>
>> If so I think you can still use the existing API and do some sort of
>> mapping. Because I see you kind of hardcoding a bit ... "get
>> programInstances whose endData is null" - I think you can play around with
>> the completed attribute of programInstance.
>>
>>
> *completed *attribute is not setting some times where enddate is set, I am
> not sure exactly in which case it is happening (may be when we enroll
> ,unenroll again enroll program to a person). Actually the method name should
> be getActiveProgramInstances, but in store we are implementing GenericStore,
> thats y i have given getProgramInstances to the method.
>

Yes completed is set to true when we do program unenroll/enroll. I think, we
should also provide a menu in program maintenance to cleanup programs -
because it is very ideal that users follow a strict program enrollment and
the un-enrollment (like successful completion or termination).

What was that you wanted to display exactly ? all those active programs or
completed ones?

>
> May be in service i can use getActiveProgramInstances which will call
> getProgramInstances(program, orgunit) from store?
>
> --
>
> Regards,
> Bharath Kumar. Ch
>
___
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

dhis2-devs@lists.launchpad.net

2010-10-25 Thread bharath kumar

> What was that you wanted to display exactly ? all those active programs or
> completed ones?
>
>>
>>
In Namebased entry we added option Multiple DataEntry where we are
displaying all Active ProgramInstances for selected orgunit.

-- 

Regards,
Bharath Kumar. Ch
___
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

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1951: Merge Minh Luan's commit from branch:

2010-10-25 Thread noreply


revno: 1951
author: Minh Luan
committer: Jo Størset 
branch nick: trunk
timestamp: Mon 2010-10-25 17:54:24 +0530
message:
  Merge Minh Luan's commit from branch: 
  Add DataSets and DataElements to download all stream (Facility Report)
  URL for download all: /dhis-web-api/api/mobile
added:
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/MobileWrapper.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/provider/MobileWrapperProvider.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/resources/MobileResouce.java
modified:
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/ActivityWrapper.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/DataSet.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/resources/ActivityWrapperResource.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/resources/DataSetResource.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/DefaultDataSetService.java
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/IDataSetService.java
  dhis-2/dhis-web/dhis-web-api/src/main/resources/META-INF/dhis/beans.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-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/ActivityWrapper.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/ActivityWrapper.java	2010-10-20 16:19:40 +
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/ActivityWrapper.java	2010-10-25 12:24:24 +
@@ -15,8 +15,6 @@
 private ActivityPlan activityPlan;
 private List programs;
 
-
-
 public ActivityPlan getActivityPlan()
 {
 return activityPlan;

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/DataSet.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/DataSet.java	2010-09-24 11:12:49 +
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/DataSet.java	2010-10-25 12:24:24 +
@@ -104,7 +104,7 @@
 dout.writeUTF( de.getType() );
 }   
 
-//bout.flush();
+bout.flush();
 bout.writeTo(out);
 	
 }

=== added file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/MobileWrapper.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/MobileWrapper.java	1970-01-01 00:00:00 +
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/MobileWrapper.java	2010-10-25 12:24:24 +
@@ -0,0 +1,103 @@
+package org.hisp.dhis.web.api.model;
+import java.io.ByteArrayOutputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.List;
+
+/**
+ * @author Tran Ng Minh Luan
+ *
+ */
+public class MobileWrapper implements ISerializable{
+	private ActivityPlan activityPlan;
+private List programs;
+private List datasets;
+
+	public MobileWrapper() {
+	}
+
+	public ActivityPlan getActivityPlan() {
+		return activityPlan;
+	}
+
+	public void setActivityPlan(ActivityPlan activityPlan) {
+		this.activityPlan = activityPlan;
+	}
+
+	public List getPrograms() {
+		return programs;
+	}
+
+	public void setPrograms(List programs) {
+		this.programs = programs;
+	}
+
+	public List getDatasets() {
+		return datasets;
+	}
+
+	public void setDatasets(List datasets) {
+		this.datasets = datasets;
+	}
+
+	public void serialize(OutputStream out) throws IOException
+{
+		if(datasets == null){
+			System.out.println("Dataset list is null");
+		}
+		ByteArrayOutputStream bout = new ByteArrayOutputStream();
+DataOutputStream dout = new DataOutputStream(bout);
+
+dout.writeInt(programs.size());
+
+if(this.activityPlan == null){
+	dout.writeInt(0);
+}else{
+	this.activityPlan.serialize( dout );
+}
+
+if(programs.size() > 0){
+	dout.writeInt(programs.size());
+}else{
+	for(Program prog : programs){
+		prog.serialize( dout );
+	}
+}
+
+if(datasets != null){
+	dout.writeInt(datasets.size());
+}else{
+	dout.writeInt(0);
+}
+for(DataSet ds : datasets){
+	ds.serialize();
+}
+
+
+}
+
+@Override
+public byte[] serialize()
+throws IOException
+{
+// TODO Auto-generated method stub
+return null;
+}
+
+@Override
+public void deSerialize( byte[] data )
+thro

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1952: Applied patch from Hieu on centralizing pdf writing. Nice work.

2010-10-25 Thread noreply


revno: 1952
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Mon 2010-10-25 14:38:03 +0200
message:
  Applied patch from Hieu on centralizing pdf writing. Nice work.
removed:
  
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/pdf/util/
  
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/pdf/util/PDFPrintUtil.java
modified:
  
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/pdf/converter/DataElementConverter.java
  
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/pdf/converter/ExtendedDataElementConverter.java
  
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/pdf/converter/IndicatorConverter.java
  
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/pdf/converter/OrganisationUnitConverter.java
  
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/pdf/converter/OrganisationUnitHierarchyConverter.java
  
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/pdf/exporter/PDFPipeThread.java
  
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/pdf/PdfService.java
  
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/pdf/impl/ItextPdfService.java
  
dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/mock/MockI18nFormat.java
  
dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/pdf/PdfServiceTest.java
  
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/PDFUtils.java
  dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties
  
dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_vi_VN.properties
  
dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_vi_VN.properties
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties
  
dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module_vi_VN.properties
The size of the diff (1325 lines) is larger than your specified limit of 1000 
lines

--
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

___
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

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1954: Added Functionality to clear temporary files from output folder and mi folder; Added Option to do...

2010-10-25 Thread noreply


revno: 1954
committer: Bharath 
branch nick: trunk
timestamp: Mon 2010-10-25 18:34:36 +0530
message:
  Added Functionality to clear temporary files from output folder and mi 
folder; Added Option to download reports folder and mi folder
added:
  
local/in/dhis-web-maintenance-in/src/main/java/org/hisp/dhis/config/action/ClearFolderAction.java
  
local/in/dhis-web-maintenance-in/src/main/webapp/dhis-web-maintenance-in/javascript/
  
local/in/dhis-web-maintenance-in/src/main/webapp/dhis-web-maintenance-in/javascript/config.js
  
local/in/dhis-web-maintenance-in/src/main/webapp/dhis-web-maintenance-in/maintenanceForm.vm
  
local/in/dhis-web-maintenance-in/src/main/webapp/dhis-web-maintenance-in/responseStatus.vm
modified:
  
local/in/dhis-in-api/src/main/java/org/hisp/dhis/config/ConfigurationService.java
  
local/in/dhis-in-services/dhis-in-service-configuration/src/main/java/org/hisp/dhis/config/DefaultConfigurationService.java
  local/in/dhis-web-maintenance-in/src/main/resources/META-INF/dhis/beans.xml
  local/in/dhis-web-maintenance-in/src/main/resources/struts.xml
  
local/in/dhis-web-maintenance-in/src/main/webapp/dhis-web-maintenance-in/menu.vm


--
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 'local/in/dhis-in-api/src/main/java/org/hisp/dhis/config/ConfigurationService.java'
--- local/in/dhis-in-api/src/main/java/org/hisp/dhis/config/ConfigurationService.java	2010-06-04 11:50:05 +
+++ local/in/dhis-in-api/src/main/java/org/hisp/dhis/config/ConfigurationService.java	2010-10-25 13:04:36 +
@@ -45,5 +45,14 @@
 Configuration_IN getConfiguration( int id );
 
 Configuration_IN getConfigurationByKey( String ckey );
+
+// -
+// 
+// -
+
+boolean clearXfolder( String folderPath );
+
+String backupFolder( String folderPath );
+
 
 }

=== modified file 'local/in/dhis-in-services/dhis-in-service-configuration/src/main/java/org/hisp/dhis/config/DefaultConfigurationService.java'
--- local/in/dhis-in-services/dhis-in-service-configuration/src/main/java/org/hisp/dhis/config/DefaultConfigurationService.java	2010-06-04 11:50:05 +
+++ local/in/dhis-in-services/dhis-in-service-configuration/src/main/java/org/hisp/dhis/config/DefaultConfigurationService.java	2010-10-25 13:04:36 +
@@ -1,5 +1,15 @@
 package org.hisp.dhis.config;
 
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
 import org.springframework.transaction.annotation.Transactional;
 
 @Transactional
@@ -46,4 +56,136 @@
 {
 return configurationStore.getConfigurationByKey( ckey );
 }
+
+// -
+// 
+// -
+
+public boolean clearXfolder( String folderPath )
+{
+try
+{
+File dir = new File( folderPath );
+String[] files = dir.list();
+for ( String file : files )
+{
+file = folderPath + File.separator + file;
+File tempFile = new File(file);
+tempFile.delete();
+}
+
+return true;
+}
+catch(Exception e)
+{
+System.out.println(e.getMessage());
+return false;
+}
+}
+
+public String backupFolder( String folderPath )
+{
+   
+Calendar curDateTime = Calendar.getInstance();
+Date curDate = new Date();
+curDateTime.setTime( curDate );
+
+SimpleDateFormat simpleDateFormat = new SimpleDateFormat( "ddMMM-HHmmssSSS" );
+
+String tempFolderName = simpleDateFormat.format( curDate );
+
+String zipFilePath = getConfigurationByKey( Configuration_IN.KEY_BACKUPDATAPATH ).getValue();
+zipFilePath += tempFolderName;
+
+File newdir = new File( zipFilePath );
+if( !newdir.exists() )
+newdir.mkdirs();
+
+//zipFilePath = zipFilePath.substring( 0, zipFilePath.lastIndexOf( "/" ) );
+
+zipFilePath += "/mi.zip";
+
+System.out.println("zipFilePath: "+ zipFilePath );
+
+ZipOutputStream out = null;
+
+try
+{
+File inFolder = new File( folderPath );
+File ou

Re: [Dhis2-devs] Pivot tables

2010-10-25 Thread Lars Helge Øverland

Hi thanks for the nice update, interesting. The thinking sounds very
reasonable to me.

Ola and I will work a bit on the optimization of SQL view. One issue here is
that when writing "generic" sql queries for tables like
orgunitgroupsetstructure, one needs to select * (all) columns in order to be
portable because the table has each column per groupset, ie. its dynamic.
But I guess we can fix these things when generating the SQL from Java /
DHIS.

Re size, a good thing is that a typical pivot table won't contain the whole
database, rather the data for a district and its facilities. We want to be
able to compare with other districts (maybe inside the same province only)
but for those we only need the aggregated data at the district level (not
facility data) - which means a lot less data.

Its also interesting to see how excel uses a "minimal" xml ( etc). We could consider that for DXF 2 datavalues.
Size/performance vs readability.



Lars
___
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

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1955: Removed pfd print servlet

2010-10-25 Thread noreply


revno: 1955
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Mon 2010-10-25 19:13:43 +0200
message:
  Removed pfd print servlet
removed:
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/config.yaml
modified:
  dhis-2/dhis-web/dhis-web-mapping/pom.xml
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/WEB-INF/web.xml
  dhis-2/dhis-web/dhis-web-portal/pom.xml
  dhis-2/dhis-web/dhis-web-portal/src/main/webapp/WEB-INF/web.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-web/dhis-web-mapping/pom.xml'
--- dhis-2/dhis-web/dhis-web-mapping/pom.xml	2010-08-20 09:13:09 +
+++ dhis-2/dhis-web/dhis-web-mapping/pom.xml	2010-10-25 17:13:43 +
@@ -54,24 +54,6 @@
   dhis-web-commons-resources
   war
 
-
-	
-	  
-
-  org.mapfish.print
-  print-lib
-  1.2-SNAPSHOT
-	  
-
-  xalan
-  xalan
-
-
-  xerces
-  xercesImpl
-
-  
-
 	
 	
 
@@ -95,15 +77,6 @@
 	
   
 
-  	  	  
-
-
-  org.mapfish
-  http://dev.mapfish.org/maven/repository
-	  
-
-  
-
   
 ../../
   

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/WEB-INF/web.xml'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/WEB-INF/web.xml	2010-02-18 17:01:00 +
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/WEB-INF/web.xml	2010-10-25 17:13:43 +
@@ -58,17 +58,4 @@
 org.hisp.dhis.system.startup.StartupListener
   
 
-  
-mapfish.print
-org.mapfish.print.servlet.MapPrinterServlet
-
-  config
-  config.yaml
-
-  
-  
-mapfish.print
-/pdf/*
-  
-  
 

=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/config.yaml'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/config.yaml	2010-03-09 15:29:22 +
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/config.yaml	1970-01-01 00:00:00 +
@@ -1,72 +0,0 @@
- #===
-# allowed DPIs
-#===
-dpis:
-  - 254
-  - 190
-  - 127
-  - 56
-
-#===
-# the allowed scales
-#===
-scales:
-  - 25000
-  - 5
-  - 10
-  - 20
-  - 50
-  - 100
-  - 200
-  - 400
-  - 800
-  - 1600
-  - 3200
-  - 6400
-
-#===
-# the list of allowed hosts
-#===
-hosts:
-  - !localMatch
-dummy: true
-  - !ipMatch
-ip: www.camptocamp.org
-  - !dnsMatch
-host: labs.metacarta.com
-port: 80
-  - !dnsMatch
-host: demo.mapfish.org
-port: 80
-
-layouts:
-  #===
-  A4 portrait:
-  #===
-mainPage:
-  rotation: true
-  pageSize: A4
-  header:
-height: 50
-items:
-  - !text
-font: Helvetica
-fontSize: 30
-align: right
-text: '${mapTitle}'
-  items:
-- !map
-  spacingAfter: 30
-  width: 440
-  height: 483
-- !text
-  text: '${comment}'
-  spacingAfter: 30
-  footer:
-height: 30
-items:
-  - !columns
-items:
-  - !text
-align: right
-text: 'Page ${pageNum}'
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-portal/pom.xml'
--- dhis-2/dhis-web/dhis-web-portal/pom.xml	2010-10-22 09:23:05 +
+++ dhis-2/dhis-web/dhis-web-portal/pom.xml	2010-10-25 17:13:43 +
@@ -68,8 +68,7 @@
   dhis-web-maintenance-settings
   ${project.version}
   war
-	
-
+
 	
   org.hisp.dhis
   dhis-web-maintenance-patient
@@ -91,42 +90,36 @@
   ${project.version}
   war
 
-
 
   org.hisp.dhis
   dhis-web-validationrule
   ${project.version}
   war
-
-	
+	
 
   org.hisp.dhis
   dhis-web-dataentry
   ${project.version}
   war
 	
-	
 
   org.hisp.dhis
   dhis-web-reporting
   ${project.version}
   war
-
-	
+	
 
   org.hisp.dhis
   dhis-web-dashboard-integration
   ${project.version}
   war
 	
-	
 
   org.hisp.dhis
   dhis-web-mapping
   ${project.version}
   war
-
-	
+	
 
   org.hisp.dhis
   dhis-web-excel-reporting
@@ -146,48 +139,15

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1956: Add a dobType property, remove birthdateEstimated property of Patient object and Build a function...

2010-10-25 Thread noreply


revno: 1956
committer: Tran Chau 
branch nick: trunk
timestamp: Tue 2010-10-26 00:44:00 +0700
message:
  Add a dobType property, remove birthdateEstimated property of Patient object 
and Build a function to validate data when entering data into Identifier fields 
for a patient ( includes number of character and type (text, number, letter) ).
added:
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/commons.js
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/Patient.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientIdentifier.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientIdentifierType.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java
  
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/validation/ValidationCriteriaServiceTest.java
  
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/validation/ValidationCriteriaStoreTest.java
  
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/TableAlteror.java
  
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramInstanceStore.java
  
dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patient/hibernate/Patient.hbm.xml
  
dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patient/hibernate/PatientIdentifierType.hbm.xml
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/AddPatientAction.java
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/AddRepresentativeAction.java
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/ShowAddPatientFormAction.java
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/UpdatePatientAction.java
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/ValidatePatientAction.java
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientidentifiertype/AddPatientIdentifierTypeAction.java
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientidentifiertype/UpdatePatientIdentifierTypeAction.java
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/relationship/AddRelationshipPatientAction.java
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/relationship/ValidateAddRelationshipPatientAction.java
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/AddValidationCriteriaAction.java
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/UpdateValidationCriteriaAction.java
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientForm.vm
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientIdentifierTypeForm.vm
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addRelationshipPatientForm.vm
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addValidationCriteria.vm
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patient.js
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/relationshipPatient.js
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/underage.js
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/validationcriteria.js
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/underAgeForm.vm
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientForm.vm
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient

[Dhis2-devs] Build failed in Hudson: Dhis2 Web Trunk » DHIS Patient Management #1328

2010-10-25 Thread support

See 


Changes:

[Tran Chau] Add a dobType property, remove birthdateEstimated property of 
Patient object and Build a function to validate data when entering data into 
Identifier fields for a patient ( includes number of character and type (text, 
number, letter) ).

--
[INFO] 
[INFO] Building DHIS Patient Management
[INFO]task-segment: [clean, install, findbugs:findbugs]
[INFO] 
[INFO] [clean:clean {execution: default-clean}]
[INFO] Deleting directory 

[INFO] [resources:resources {execution: default-resources}]
[INFO] Using encoding: 'UTF-8' to copy filtered resources.
[INFO] [compiler:compile {execution: default-compile}]
[INFO] Compiling 115 source files to 

[HUDSON] Archiving 

 to /ifi/utgard/p01/dhis/projects/dhis-dev.ifi.uio.no/ci/home/jobs/Dhis2 Web 
Trunk/modules/org.hisp.dhis$dhis-web-maintenance-patient/builds/2010-10-25_19-48-38/archive/org.hisp.dhis/dhis-web-maintenance-patient/2.0.6-SNAPSHOT/pom.xml
[INFO] 
[ERROR] BUILD FAILURE
[INFO] 
[INFO] Compilation failure

:[84,26]
 cannot find symbol
symbol  : method setNoChars(java.lang.Integer)
location: class org.hisp.dhis.patient.PatientIdentifierType

:[85,26]
 cannot find symbol
symbol  : method setType(java.lang.String)
location: class org.hisp.dhis.patient.PatientIdentifierType

:[131,19]
 setBirthDateFromAge(int) in org.hisp.dhis.patient.Patient cannot be applied to 
(int,char)

:[134,15]
 cannot find symbol
symbol  : method setDobType(java.lang.Character)
location: class org.hisp.dhis.patient.Patient

:[248,13]
 setBirthDateFromAge(int) in org.hisp.dhis.patient.Patient cannot be applied to 
(int,char)

:[177,18]
 setBirthDateFromAge(int) in org.hisp.dhis.patient.Patient cannot be applied to 
(int,char)

:[180,15]
 cannot find symbol
symbol  : method setDobType(java.lang.Character)
location: class org.hisp.dhis.patient.Patient

:[152,19]
 setBirthDateFromAge(int) in org.hisp.dhis.patient.Patient cannot be applied to 
(int,char)

:[155,15]
 cannot find symbol
symbol  : method setDobType(java.lang.Character)
location: class org.hisp.dhis.patient.Patient

:[79,29]
 cannot find symbol
symbol  : method setNoChars(java.lang.Integer)
location: class org.hisp.dhis.patient.PatientIdentifierType

:[80,29]
 cannot find symbol
symbol  : method setType(java.lang.String)
location: class org.

[Dhis2-devs] Build failed in Hudson: Dhis2 Web Trunk #1328

2010-10-25 Thread support

See 

Changes:

[Tran Chau] Add a dobType property, remove birthdateEstimated property of 
Patient object and Build a function to validate data when entering data into 
Identifier fields for a patient ( includes number of character and type (text, 
number, letter) ).

[Lars Helge Overland] Removed pfd print servlet

--
[...truncated 434 lines...]
[INFO] Deleting directory 

[INFO] [resources:resources {execution: default-resources}]
[INFO] Using encoding: 'UTF-8' to copy filtered resources.
[INFO] [compiler:compile {execution: default-compile}]
[INFO] Compiling 15 source files to 

[INFO] [resources:testResources {execution: default-testResources}]
[INFO] Using encoding: 'UTF-8' to copy filtered resources.
[INFO] [compiler:testCompile {execution: default-testCompile}]
[INFO] No sources to compile
[INFO] [surefire:test {execution: default-test}]
[INFO] No tests to run.
[HUDSON] Recording test results
[INFO] [war:war {execution: default-war}]
[INFO] Exploding webapp...
[INFO] Assembling webapp dhis-web-maintenance-settings in 

[INFO] Copy webapp webResources to 

[INFO] Building jar: 

[INFO] Expanding: 

 into 

[INFO] Overlaying 1 war(s).
[INFO] Generating war 

[INFO] Building war: 

[INFO] [install:install {execution: default-install}]
[INFO] Installing 

 to 
/ifi/utgard/p01/dhis/.m2/repository/org/hisp/dhis/dhis-web-maintenance-settings/2.0.6-SNAPSHOT/dhis-web-maintenance-settings-2.0.6-SNAPSHOT.war
[INFO] Preparing findbugs:findbugs
[HUDSON] Archiving 

 to /ifi/utgard/p01/dhis/projects/dhis-dev.ifi.uio.no/ci/home/jobs/Dhis2 Web 
Trunk/modules/org.hisp.dhis$dhis-web-maintenance-settings/builds/2010-10-25_19-48-38/archive/org.hisp.dhis/dhis-web-maintenance-settings/2.0.6-SNAPSHOT/pom.xml
[HUDSON] Archiving 

 to /ifi/utgard/p01/dhis/projects/dhis-dev.ifi.uio.no/ci/home/jobs/Dhis2 Web 
Trunk/modules/org.hisp.dhis$dhis-web-maintenance-settings/builds/2010-10-25_19-48-38/archive/org.hisp.dhis/dhis-web-maintenance-settings/2.0.6-SNAPSHOT/dhis-web-maintenance-settings.war
[INFO] [resources:resources {execution: default-resources}]
[INFO] Using encoding: 'UTF-8' to copy filtered resources.
[INFO] [compiler:compile {execution: default-compile}]
[INFO] Nothing to compile - all classes are up to date
[INFO] [findbugs:findbugs {execution: default-cli}]
[INFO]   Using source root:
[INFO] 

[INFO]   Using test source root:
[INFO] 

[INFO]   No effort provided, using default effort.
[INFO]   Adding Source Directory: 

[INFO]   No threshold provided, using default threshold.
[INFO]   Using FindBugs Version: 1.3.8
[INFO]   No threshold provided, using default threshold.
[INFO]   No threshold provided, using defa

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1957: Improved equals on category and category option combo

2010-10-25 Thread noreply


revno: 1957
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Mon 2010-10-25 19:53:42 +0200
message:
  Improved equals on category and category option combo
modified:
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOption.java
  
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOptionCombo.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserStore.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/dataelement/DataElementCategoryOption.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOption.java	2010-04-12 21:23:33 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOption.java	2010-10-25 17:53:42 +
@@ -111,7 +111,7 @@
 return false;
 }
 
-if ( getClass() != object.getClass() )
+if ( !( object instanceof DataElementCategoryOption ) )
 {
 return false;
 }

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOptionCombo.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOptionCombo.java	2010-10-22 16:27:16 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOptionCombo.java	2010-10-25 17:53:42 +
@@ -109,7 +109,7 @@
 return false;
 }
 
-if ( getClass() != object.getClass() )
+if ( !( object instanceof DataElementCategoryOptionCombo ) )
 {
 return false;
 }

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserStore.java	2010-10-05 11:04:35 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserStore.java	2010-10-25 17:53:42 +
@@ -29,7 +29,6 @@
 
 import java.util.Collection;
 
-import org.hisp.dhis.dataelement.DataElement;
 import org.hisp.dhis.organisationunit.OrganisationUnit;
 
 /**

___
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

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1958: minor fix in serialize dataset and dataelement (download all to mobile)

2010-10-25 Thread noreply


revno: 1958
committer: Tran Ng Minh Luan 
branch nick: dhis2
timestamp: Tue 2010-10-26 01:03:14 +0700
message:
  minor fix in serialize dataset and dataelement (download all to mobile)
modified:
  
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/MobileWrapper.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-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/MobileWrapper.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/MobileWrapper.java	2010-10-25 12:24:24 +
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/MobileWrapper.java	2010-10-25 18:03:14 +
@@ -49,31 +49,38 @@
 		ByteArrayOutputStream bout = new ByteArrayOutputStream();
 DataOutputStream dout = new DataOutputStream(bout);
 
-dout.writeInt(programs.size());
+if(programs != null){
+	dout.writeInt(programs.size());
+}else{
+	dout.writeInt(0);
+}
 
+//Write ActivityPlans
 if(this.activityPlan == null){
 	dout.writeInt(0);
 }else{
 	this.activityPlan.serialize( dout );
 }
+System.out.println("finish serialize ActivityPlan");
 
-if(programs.size() > 0){
-	dout.writeInt(programs.size());
-}else{
+//Write Programs
 	for(Program prog : programs){
 		prog.serialize( dout );
 	}
-}
+System.out.println("finish serialize Programs");
 
+//Write DataSets
 if(datasets != null){
 	dout.writeInt(datasets.size());
 }else{
 	dout.writeInt(0);
 }
 for(DataSet ds : datasets){
-	ds.serialize();
+	ds.serialize(dout);
 }
-
+System.out.println("finish serialize Datasets");
+bout.flush();
+bout.writeTo(out);
 
 }
 

___
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

[Dhis2-devs] Hudson build is back to normal : Dhis2 W eb Trunk » DHIS Patient Management #1329

2010-10-25 Thread support

See 




___
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

[Dhis2-devs] Hudson build is back to normal : Dhis2 Web Trunk #1329

2010-10-25 Thread support

See 



___
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

Re: [Dhis2-devs] Pivot tables

2010-10-25 Thread Bob Jolliffe

2010/10/25 Lars Helge Øverland :
>
> Hi thanks for the nice update, interesting. The thinking sounds very
> reasonable to me.
> Ola and I will work a bit on the optimization of SQL view. One issue here is
> that when writing "generic" sql queries for tables like
> orgunitgroupsetstructure, one needs to select * (all) columns in order to be
> portable because the table has each column per groupset, ie. its dynamic.
> But I guess we can fix these things when generating the SQL from Java /
> DHIS.

Yes. The more we optimize these (in terms of number of fields) the
less enormous the excel file will be.  And given that excel holds all
in memory we must do the best we can.

> Re size, a good thing is that a typical pivot table won't contain the whole
> database, rather the data for a district and its facilities. We want to be
> able to compare with other districts (maybe inside the same province only)
> but for those we only need the aggregated data at the district level (not
> facility data) - which means a lot less data.

I'm trying to focus on the particular problems related to enormous
spreadsheets.  If they are small we don't really have much of a
problem either way.  But if we can deal with the really large ones
then we can maybe deal with medium large ones quite snappily.

> Its also interesting to see how excel uses a "minimal" xml ( v="0"/> etc). We could consider that for DXF 2 datavalues.
> Size/performance vs readability.

This is an OOXML "feature" which has been heavily criticized by almost
all in the xml world.  Not being religious, I am in two minds about
it.  I think it might be reasonable for the datavalues in dxf, but I'd
stick my heels in if we started doing the same thing for metadata.  In
fact I think there is just such a minimal syntax which I have
suggested to Jo some time back as being maybe useful for a lightweight
mobile version of sdmx.  I wouldn't have a problem with:

  

(I'd still like to see the other attributes, comment, createdby etc
being aggregated up to a 'datavalueset' but that's another story)

Regarding ooxml I think there is a better justification doing it for a
data oriented document format like a spreadsheet, than there is for
word docs and presentations.  Certainly M$ has achieved significant
performance benefits to Excel in terms of load times.  File size is
not that significant a benefit because the compressed files shouldn't
be that different.  What also really helps is the use of
sharedstrings.  You can see that they do a similar shared strings type
optimization in the pivotcache.  All of which allows us to stretch the
use of spreadsheets into domains where they shouldn't really go.

Cheers
Bob

>
>
> Lars
>

___
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

75 matches

Mail list logo