dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #08726
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2166: Add function to select which static attribute of patient to be sent to mobile
------------------------------------------------------------
revno: 2166
committer: Tran Ng Minh Luan <Luan@MinhLuan-PC>
branch nick: dhis2
timestamp: Thu 2010-11-25 15:05:58 +0700
message:
Add function to select which static attribute of patient to be sent to mobile
Send static attribute of patient and patient identifier to mobile
added:
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/PatientIdentifier.java
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientMobileSetting.java
dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patient/hibernate/PatientMobileSetting.hbm.xml
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/ActivityReportingServiceImpl.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/mobilesetting/ShowMobileSettingFormAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/mobilesetting/UpdateMobileSettingAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/showPatientMobileSetting.vm
dhis-2/dhis-web/dhis-web-portal/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-api/src/main/java/org/hisp/dhis/patient/PatientMobileSetting.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientMobileSetting.java 2010-11-23 18:25:34 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientMobileSetting.java 2010-11-25 08:05:58 +0000
@@ -33,6 +33,8 @@
public class PatientMobileSetting extends IdentifiableObject
{
+ private Boolean gender, dobtype, birthdate, bloodgroup, registrationdate;
+
private List<PatientAttribute> patientAttributes;
public PatientMobileSetting()
@@ -48,4 +50,55 @@
{
this.patientAttributes = patientAttributes;
}
+
+ public Boolean getGender()
+ {
+ return gender;
+ }
+
+ public void setGender( Boolean gender )
+ {
+ this.gender = gender;
+ }
+
+ public Boolean getDobtype()
+ {
+ return dobtype;
+ }
+
+ public void setDobtype( Boolean dobtype )
+ {
+ this.dobtype = dobtype;
+ }
+
+ public Boolean getBirthdate()
+ {
+ return birthdate;
+ }
+
+ public void setBirthdate( Boolean birthdate )
+ {
+ this.birthdate = birthdate;
+ }
+
+ public Boolean getBloodgroup()
+ {
+ return bloodgroup;
+ }
+
+ public void setBloodgroup( Boolean bloodgroup )
+ {
+ this.bloodgroup = bloodgroup;
+ }
+
+ public Boolean getRegistrationdate()
+ {
+ return registrationdate;
+ }
+
+ public void setRegistrationdate( Boolean registrationdate )
+ {
+ this.registrationdate = registrationdate;
+ }
+
}
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patient/hibernate/PatientMobileSetting.hbm.xml'
--- dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patient/hibernate/PatientMobileSetting.hbm.xml 2010-11-23 07:16:02 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patient/hibernate/PatientMobileSetting.hbm.xml 2010-11-25 08:05:58 +0000
@@ -9,6 +9,16 @@
<generator class="native" />
</id>
+ <property name="gender" column="gender" not-null="true"/>
+
+ <property name="dobtype" column="dobtype" not-null="true"/>
+
+ <property name="birthdate" column="birthdate" not-null="true"/>
+
+ <property name="bloodgroup" column="bloodgroup" not-null="true"/>
+
+ <property name="registrationdate" column="registrationdate" not-null="true"/>
+
<list name="patientAttributes">
<key column="patientmobilesettingid" />
<list-index column="sort_order_patientattributename" base="0"/>
=== modified file '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/Beneficiary.java 2010-11-18 06:08:29 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/Beneficiary.java 2010-11-25 08:05:58 +0000
@@ -31,6 +31,7 @@
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
+import java.util.Date;
import java.util.List;
public class Beneficiary
@@ -49,12 +50,84 @@
private List<PatientAttribute> patientAttValues;
private PatientAttribute groupAttribute;
+
+ private List<PatientIdentifier> identifiers;
+
+ private String gender;
+
+ private Date birthDate;
+
+ private String bloodGroup;
+
+ private Date registrationDate;
+
+ private Character dobType;
+
+ public List<PatientIdentifier> getIdentifiers()
+ {
+ return identifiers;
+ }
+
+ public void setIdentifiers( List<PatientIdentifier> identifiers )
+ {
+ this.identifiers = identifiers;
+ }
public int getAge()
{
return age;
}
+ public String getGender()
+ {
+ return gender;
+ }
+
+ public void setGender( String gender )
+ {
+ this.gender = gender;
+ }
+
+ public Date getBirthDate()
+ {
+ return birthDate;
+ }
+
+ public void setBirthDate( Date birthDate )
+ {
+ this.birthDate = birthDate;
+ }
+
+ public String getBloodGroup()
+ {
+ return bloodGroup;
+ }
+
+ public void setBloodGroup( String bloodGroup )
+ {
+ this.bloodGroup = bloodGroup;
+ }
+
+ public Date getRegistrationDate()
+ {
+ return registrationDate;
+ }
+
+ public void setRegistrationDate( Date registrationDate )
+ {
+ this.registrationDate = registrationDate;
+ }
+
+ public Character getDobType()
+ {
+ return dobType;
+ }
+
+ public void setDobType( Character dobType )
+ {
+ this.dobType = dobType;
+ }
+
public void setAge( int age )
{
this.age = age;
@@ -132,6 +205,45 @@
dout.writeUTF( this.getMiddleName() );
dout.writeUTF( this.getLastName() );
dout.writeInt( this.getAge() );
+
+ // Write static attributes if it is required (gender, dobtype, birthdate, bloodgroup, registrationdate)
+ if(gender != null){
+ dout.writeBoolean( true );
+ dout.writeUTF(gender);
+ }else{
+ dout.writeBoolean( false );
+ }
+
+ if(dobType != null){
+ dout.writeBoolean( true );
+ dout.writeChar(dobType);
+ }else{
+ dout.writeBoolean( false );
+ }
+
+ if(birthDate != null){
+ dout.writeBoolean( true );
+ dout.writeLong(birthDate.getTime());
+ }else{
+ dout.writeBoolean( false );
+ }
+
+ if(bloodGroup != null){
+ dout.writeBoolean( true );
+ dout.writeUTF(bloodGroup);
+ }else{
+ dout.writeBoolean( false );
+ }
+
+ if(registrationDate != null){
+ dout.writeBoolean( true );
+ dout.writeLong(registrationDate.getTime());
+ }else{
+ dout.writeBoolean( false );
+ }
+ //End
+
+
// Write attribute which is used as group factor of beneficiary.
/*
* False: no group factor True: with group factor
@@ -152,6 +264,12 @@
{
dout.writeUTF( att.getName() + ":" + att.getValue() );
}
+
+ //Write PatientIdentifier
+ dout.writeInt( identifiers.size() );
+ for(PatientIdentifier each : identifiers){
+ each.serialize( dout );
+ }
bout.flush();
bout.writeTo( out );
=== added file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/PatientIdentifier.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/PatientIdentifier.java 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/model/PatientIdentifier.java 2010-11-25 08:05:58 +0000
@@ -0,0 +1,56 @@
+package org.hisp.dhis.web.api.model;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+public class PatientIdentifier implements DataStreamSerializable
+{
+ private String identifierType;
+
+ private String identifier;
+
+ public PatientIdentifier( String identifierType, String identifier )
+ {
+ this.identifierType = identifierType;
+ this.identifier = identifier;
+ }
+
+ public String getIdentifierType()
+ {
+ return identifierType;
+ }
+
+ public void setIdentifierType( String identifierType )
+ {
+ this.identifierType = identifierType;
+ }
+
+ public String getIdentifier()
+ {
+ return identifier;
+ }
+
+ public void setIdentifier( String identifier )
+ {
+ this.identifier = identifier;
+ }
+
+ @Override
+ public void serialize( DataOutputStream dataOutputStream )
+ throws IOException
+ {
+ dataOutputStream.writeUTF( identifierType );
+ dataOutputStream.writeUTF( identifier );
+ }
+
+ @Override
+ public void deSerialize( DataInputStream dataInputStream )
+ throws IOException
+ {
+
+ }
+
+
+
+}
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/ActivityReportingServiceImpl.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/ActivityReportingServiceImpl.java 2010-11-23 07:16:02 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/ActivityReportingServiceImpl.java 2010-11-25 08:05:58 +0000
@@ -7,6 +7,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import org.hisp.dhis.activityplan.Activity;
import org.hisp.dhis.activityplan.ActivityPlanService;
@@ -15,6 +16,8 @@
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.patient.Patient;
import org.hisp.dhis.patient.PatientAttributeService;
+import org.hisp.dhis.patient.PatientIdentifier;
+import org.hisp.dhis.patient.PatientIdentifierService;
import org.hisp.dhis.patient.PatientMobileSetting;
import org.hisp.dhis.patient.PatientMobileSettingService;
import org.hisp.dhis.patientattributevalue.PatientAttributeValue;
@@ -59,6 +62,8 @@
private CurrentUserService currentUserService;
private PatientMobileSettingService patientMobileSettingService;
+
+// private PatientIdentifierService patientIdentifierService;
// -------------------------------------------------------------------------
// MobileDataSetService
@@ -148,7 +153,8 @@
private org.hisp.dhis.web.api.model.Beneficiary getBeneficiaryModel( Patient patient )
{
-
+ PatientMobileSetting setting = patientMobileSettingService.getCurrentSetting()==null?null:patientMobileSettingService.getCurrentSetting().iterator().next();
+
Beneficiary beneficiary = new Beneficiary();
List<PatientAttribute> patientAtts = new ArrayList<PatientAttribute>();
@@ -160,6 +166,31 @@
int currentYear = new Date().getYear();
int age = currentYear - patient.getBirthDate().getYear();
beneficiary.setAge( age );
+
+ // Set static attributes if it is required (gender, dobtype, birthdate, bloodgroup, registrationdate)
+ if(setting != null){
+ if(setting.getGender()){
+ beneficiary.setGender( patient.getGender() );
+ }
+ if(setting.getDobtype()){
+ beneficiary.setDobType( patient.getDobType() );
+ }
+ if(setting.getBirthdate()){
+ beneficiary.setBirthDate( patient.getBirthDate() );
+ }
+ if(setting.getBloodgroup()){
+ beneficiary.setBloodGroup( patient.getBloodGroup() );
+ }
+ if(setting.getRegistrationdate()){
+ beneficiary.setRegistrationDate( patient.getRegistrationDate() );
+ }
+ }else{
+ beneficiary.setGender(null);
+ beneficiary.setBirthDate( null );
+ beneficiary.setDobType( null );
+ beneficiary.setBloodGroup( null );
+ beneficiary.setRegistrationDate( null );
+ }
// Set attribute which is used to group beneficiary on mobile (only if
// there is attribute which is set to be group factor)
@@ -177,7 +208,7 @@
patientAttribute = null;
// Set all attributes
- PatientMobileSetting setting = patientMobileSettingService.getCurrentSetting()==null?null:patientMobileSettingService.getCurrentSetting().iterator().next();
+
List<org.hisp.dhis.patient.PatientAttribute> atts;
if(setting != null){
atts = setting.getPatientAttributes();
@@ -189,49 +220,20 @@
}
}
}
-// org.hisp.dhis.patient.PatientAttribute houseName = patientAttService.getPatientAttributeByName( "House Name" );
-// org.hisp.dhis.patient.PatientAttribute houseNumber = patientAttService
-// .getPatientAttributeByName( "House Number" );
-// org.hisp.dhis.patient.PatientAttribute wardNumber = patientAttService.getPatientAttributeByName( "Ward Number" );
-// org.hisp.dhis.patient.PatientAttribute nearestContact = patientAttService
-// .getPatientAttributeByName( "Nearest Contact Person Name" );
-
-// PatientAttributeValue houseNameValue = patientAttValueService.getPatientAttributeValue( patient, houseName );
-// if ( houseNameValue != null )
-// {
-// patientAtts.add( new PatientAttribute( "House Name", houseNameValue.getValue() ) );
-// }
-//
-// PatientAttributeValue houseNumberValue = patientAttValueService.getPatientAttributeValue( patient, houseNumber );
-// if ( houseNumberValue != null )
-// {
-// patientAtts.add( new PatientAttribute( "House Number", houseNumberValue.getValue() ) );
-// }
-//
-// PatientAttributeValue wardNumberValue = patientAttValueService.getPatientAttributeValue( patient, wardNumber );
-// if ( wardNumberValue != null )
-// {
-// patientAtts.add( new PatientAttribute( "Ward Number", wardNumberValue.getValue() ) );
-// }
-//
-// PatientAttributeValue nearestContactValue = patientAttValueService.getPatientAttributeValue( patient,
-// nearestContact );
-// if ( nearestContactValue != null )
-// {
-// patientAtts.add( new PatientAttribute( "Nearest Contact", nearestContactValue.getValue() ) );
-// }
-
+
+ // Set all identifier
+ Set<PatientIdentifier> patientIdentifiers = patient.getIdentifiers();
+ List<org.hisp.dhis.web.api.model.PatientIdentifier> identifiers = new ArrayList<org.hisp.dhis.web.api.model.PatientIdentifier>();
+ if(patientIdentifiers.size() > 0){
+
+ for(PatientIdentifier each : patientIdentifiers){
+ identifiers.add( new org.hisp.dhis.web.api.model.PatientIdentifier(each.getIdentifierType().getName(), each.getIdentifier()) );
+ }
+
+ beneficiary.setIdentifiers( identifiers );
+ }
+
beneficiary.setPatientAttValues( patientAtts );
-
- // for ( PatientAttributeValue patientAttributeValue :
- // patientAttValueService.getPatientAttributeValues( patient ) )
- // {
- // patientAttValues.add(
- // patientAttributeValue.getPatientAttribute().getName() + " : "
- // + patientAttributeValue.getValue() );
- // }
- // beneficiary.setPatientAttValues( patientAttValues );
-
return beneficiary;
}
@@ -407,6 +409,14 @@
{
this.patientMobileSettingService = patientMobileSettingService;
}
+
+// @Required
+// public void setPatientIdentifierService( PatientIdentifierService patientIdentifierService )
+// {
+// this.patientIdentifierService = patientIdentifierService;
+// }
+
+
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/mobilesetting/ShowMobileSettingFormAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/mobilesetting/ShowMobileSettingFormAction.java 2010-11-23 07:16:02 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/mobilesetting/ShowMobileSettingFormAction.java 2010-11-25 08:05:58 +0000
@@ -71,6 +71,18 @@
{
this.attributes = attributes;
}
+
+ private PatientMobileSetting setting;
+
+ public PatientMobileSetting getSetting()
+ {
+ return setting;
+ }
+
+ public void setSetting( PatientMobileSetting setting )
+ {
+ this.setting = setting;
+ }
@Override
public String execute()
@@ -86,7 +98,7 @@
if ( settingsIt.hasNext() )
{
- PatientMobileSetting setting = settingsIt.next();
+ setting = settingsIt.next();
//Selected List
patientAtts = setting.getPatientAttributes();
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/mobilesetting/UpdateMobileSettingAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/mobilesetting/UpdateMobileSettingAction.java 2010-11-23 07:16:02 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/mobilesetting/UpdateMobileSettingAction.java 2010-11-25 08:05:58 +0000
@@ -51,10 +51,38 @@
this.selectedList = selectedList;
}
+ private String gender, dobtype, birthdate, bloodgroup, registrationdate;
+
+ public void setGender( String gender )
+ {
+ this.gender = gender;
+ }
+
+ public void setDobtype( String dobtype )
+ {
+ this.dobtype = dobtype;
+ }
+
+ public void setBirthdate( String birthdate )
+ {
+ this.birthdate = birthdate;
+ }
+
+ public void setBloodgroup( String bloodgroup )
+ {
+ this.bloodgroup = bloodgroup;
+ }
+
+ public void setRegistrationdate( String registrationdate )
+ {
+ this.registrationdate = registrationdate;
+ }
+
@Override
public String execute()
throws Exception
{
+
if(selectedList.size() > 0){
PatientMobileSetting setting;
if(patientMobileSettingService.getCurrentSetting().size()>0){
@@ -62,11 +90,21 @@
List<PatientAttribute> attributes = new ArrayList<PatientAttribute>();
setting.setPatientAttributes( attributes );
fillValues( attributes );
+ setting.setGender( Boolean.parseBoolean( gender ));
+ setting.setDobtype( Boolean.parseBoolean(dobtype ));
+ setting.setBirthdate( Boolean.parseBoolean(birthdate ));
+ setting.setBloodgroup( Boolean.parseBoolean(bloodgroup ));
+ setting.setRegistrationdate( Boolean.parseBoolean(registrationdate ));
patientMobileSettingService.updatePatientMobileSetting( setting );
}else{
setting = new PatientMobileSetting();
List<PatientAttribute> attributes = new ArrayList<PatientAttribute>();
setting.setPatientAttributes( attributes );
+ setting.setGender( Boolean.parseBoolean( gender ));
+ setting.setDobtype( Boolean.parseBoolean(dobtype ));
+ setting.setBirthdate( Boolean.parseBoolean(birthdate ));
+ setting.setBloodgroup( Boolean.parseBoolean(bloodgroup ));
+ setting.setRegistrationdate( Boolean.parseBoolean(registrationdate ));
fillValues( attributes );
patientMobileSettingService.savePatientMobileSetting( setting );
}
@@ -76,12 +114,22 @@
setting = patientMobileSettingService.getCurrentSetting().iterator().next();
List<PatientAttribute> attributes = new ArrayList<PatientAttribute>();
setting.setPatientAttributes( attributes );
+ setting.setGender( Boolean.parseBoolean( gender ));
+ setting.setDobtype( Boolean.parseBoolean(dobtype ));
+ setting.setBirthdate( Boolean.parseBoolean(birthdate ));
+ setting.setBloodgroup( Boolean.parseBoolean(bloodgroup ));
+ setting.setRegistrationdate( Boolean.parseBoolean(registrationdate ));
fillValues( attributes );
patientMobileSettingService.updatePatientMobileSetting( setting );
}else{
setting = new PatientMobileSetting();
List<PatientAttribute> attributes = new ArrayList<PatientAttribute>();
setting.setPatientAttributes( attributes );
+ setting.setGender( Boolean.parseBoolean( gender ));
+ setting.setDobtype( Boolean.parseBoolean(dobtype ));
+ setting.setBirthdate( Boolean.parseBoolean(birthdate ));
+ setting.setBloodgroup( Boolean.parseBoolean(bloodgroup ));
+ setting.setRegistrationdate( Boolean.parseBoolean(registrationdate ));
fillValues( attributes );
patientMobileSettingService.savePatientMobileSetting( setting );
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/showPatientMobileSetting.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/showPatientMobileSetting.vm 2010-11-22 10:23:44 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/showPatientMobileSetting.vm 2010-11-25 08:05:58 +0000
@@ -6,6 +6,29 @@
</script>
<h3>$i18n.getString( "patient_mobile_setting" )</h3>
<form id="editPatientMobileSetting" name="editPatientMobileSetting" action="editPatientMobileSetting.action" method="post" >
+ <table>
+ <tr>
+ <td>$i18n.getString( "gender" )</td>
+ <td><input type="checkbox" id="gender" name="gender" value="true" #if( $setting.gender == 'true' ) checked #end/></td>
+ </tr>
+ <tr>
+ <td>$i18n.getString( "dob_type" )</td>
+ <td><input type="checkbox" id="dobtype" name="dobtype" value="true" #if( $setting.dobtype == 'true' ) checked #end/></td>
+ </tr>
+ <tr>
+ <td>$i18n.getString( "date_of_birth" )</td>
+ <td><input type="checkbox" id="birthdate" name="birthdate" value="true" #if( $setting.birthdate == 'true' ) checked #end/></td>
+ </tr>
+ <tr>
+ <td>$i18n.getString( "blood_group" )</td>
+ <td><input type="checkbox" id="bloodgroup" name="bloodgroup" value="true" #if( $setting.bloodgroup == 'true' ) checked #end/></td>
+ </tr>
+ <tr>
+ <td>$i18n.getString( "registration_date" )</td>
+ <td><input type="checkbox" id="registrationdate" name="registrationdate" value="true" #if( $setting.registrationdate == 'true' ) checked #end/></td>
+ </tr>
+ </table>
+ <br/>
<table id="dataElementSelectionArea">
<col/> ## Available DataElements
<col/> ## Filter
=== modified file 'dhis-2/dhis-web/dhis-web-portal/pom.xml'
--- dhis-2/dhis-web/dhis-web-portal/pom.xml 2010-11-24 15:27:52 +0000
+++ dhis-2/dhis-web/dhis-web-portal/pom.xml 2010-11-25 08:05:58 +0000
@@ -138,6 +138,78 @@
<version>${project.version}</version>
<type>war</type>
</dependency>
+
+
+ <!-- India modules -->
+ <!--
+
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-web-dashboard</artifactId>
+ <version>${version}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-web-reports-national</artifactId>
+ <version>${version}</version>
+ <type>war</type>
+ </dependency>
+
+
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-web-dataentry-national</artifactId>
+ <version>${version}</version>
+ <type>war</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-web-excelimport</artifactId>
+ <version>${version}</version>
+ <type>war</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-web-maintenance-in</artifactId>
+ <version>${version}</version>
+ <type>war</type>
+ </dependency>
+ -->
+
+ <!-- Vietnam modules -->
+ <!--
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-web-gis</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+ -->
+ <!-- South Africa modules -->
+
+ <!--
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-web-jforum-integration</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+ -->
+
+ <!-- WHO modules -->
+
+ <!--
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-web-openhealth-integration</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+ -->
+
</dependencies>
<properties>
