------------------------------------------------------------
revno: 10200
committer: Bharath <chbhara...@gmail.com>
branch nick: dhis2
timestamp: Thu 2013-03-14 09:01:14 +0100
message:
Local\in\mobile fixes
modified:
local/in/dhis-mobile/dhis-service-mobile/pom.xml
local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/api/DefaultMobileImportService.java
local/in/dhis-mobile/dhis-service-mobile/src/main/resources/META-INF/dhis/beans.xml
local/in/dhis-mobile/dhis-web-mobile/pom.xml
local/in/dhis-mobile/dhis-web-mobile/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 'local/in/dhis-mobile/dhis-service-mobile/pom.xml'
--- local/in/dhis-mobile/dhis-service-mobile/pom.xml 2013-03-06 07:11:59 +0000
+++ local/in/dhis-mobile/dhis-service-mobile/pom.xml 2013-03-14 08:01:14 +0000
@@ -33,6 +33,10 @@
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-service-patient</artifactId>
+ </dependency>
<!-- Other -->
=== modified file 'local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/api/DefaultMobileImportService.java'
--- local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/api/DefaultMobileImportService.java 2013-03-14 06:48:31 +0000
+++ local/in/dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/api/DefaultMobileImportService.java 2013-03-14 08:01:14 +0000
@@ -109,7 +109,7 @@
private static final Log LOG = LogFactory.getLog( DefaultMobileImportService.class );
-
+ public static final String ORGUNITAUTOFORMAT = "ORGUNITAUTOFORMAT";
// -------------------------------------------------------------------------
// Dependencies
@@ -1414,7 +1414,7 @@
}
- PatientIdentifierType patientIdentifierType = patientIdentifierTypeService.getPatientIdentifierType( PatientIdentifierType.ORGUNITAUTOFORMAT );
+ PatientIdentifierType patientIdentifierType = patientIdentifierTypeService.getPatientIdentifierType( ORGUNITAUTOFORMAT );
int fourDigitRunningNo = 1;
String fourDigitRunningNumber = "0001";
@@ -1590,7 +1590,7 @@
String[] elementIds = mappingString.split("\\,");
- PatientIdentifierType patientIdentifierType = patientIdentifierTypeService.getPatientIdentifierType( PatientIdentifierType.ORGUNITAUTOFORMAT );
+ PatientIdentifierType patientIdentifierType = patientIdentifierTypeService.getPatientIdentifierType( ORGUNITAUTOFORMAT );
Patient patient = patientIdentifierService.getPatient(patientIdentifierType, UID.trim());
=== modified file 'local/in/dhis-mobile/dhis-service-mobile/src/main/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-mobile/dhis-service-mobile/src/main/resources/META-INF/dhis/beans.xml 2013-03-14 06:48:31 +0000
+++ local/in/dhis-mobile/dhis-service-mobile/src/main/resources/META-INF/dhis/beans.xml 2013-03-14 08:01:14 +0000
@@ -27,8 +27,8 @@
<property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
<property name="batchHandlerFactory" ref="batchHandlerFactory"/>
<property name="jdbcTemplate" ref="jdbcTemplate"/>
- <property name="constantService" ref="org.hisp.dhis.constant.ConstantService" />
- <!-- <property name="patientIdentifierService" ref="org.hisp.dhis.patient.PatientIdentifierService"/>
+ <property name="constantService" ref="org.hisp.dhis.constant.ConstantService" />
+ <property name="patientIdentifierService" ref="org.hisp.dhis.patient.PatientIdentifierService"/>
<property name="patientIdentifierTypeService" ref="org.hisp.dhis.patient.PatientIdentifierTypeService"/>
<property name="patientAttributeService" ref="org.hisp.dhis.patient.PatientAttributeService"/>
<property name="programService" ref="org.hisp.dhis.program.ProgramService"/>
@@ -37,7 +37,7 @@
<property name="patientDataValueService" ref="org.hisp.dhis.patientdatavalue.PatientDataValueService"/>
<property name="patientAttributeValueService" ref="org.hisp.dhis.patientattributevalue.PatientAttributeValueService"/>
<property name="patientService" ref="org.hisp.dhis.patient.PatientService"/>
- -->
+
</bean>
<bean id="org.hisp.dhis.mobile.api.XmlCreatorService"
=== modified file 'local/in/dhis-mobile/dhis-web-mobile/pom.xml'
--- local/in/dhis-mobile/dhis-web-mobile/pom.xml 2013-03-06 07:11:59 +0000
+++ local/in/dhis-mobile/dhis-web-mobile/pom.xml 2013-03-14 08:01:14 +0000
@@ -36,7 +36,16 @@
<type>jar</type>
</dependency>
- <dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-service-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-service-patient</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
</dependency>
=== modified file 'local/in/dhis-mobile/dhis-web-mobile/src/main/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-mobile/dhis-web-mobile/src/main/resources/META-INF/dhis/beans.xml 2013-03-14 06:48:31 +0000
+++ local/in/dhis-mobile/dhis-web-mobile/src/main/resources/META-INF/dhis/beans.xml 2013-03-14 08:01:14 +0000
@@ -79,11 +79,11 @@
scope="prototype">
<property name="smsService" ref="org.hisp.dhis.mobile.SmsService" />
</bean>
-
+<!--
<bean id="org.hisp.dhis.mobile.action.TestSMSDataAction"
class="org.hisp.dhis.mobile.action.TestSMSDataAction"
scope="prototype">
<property name="mobileImportService" ref="org.hisp.dhis.mobile.api.MobileImportService"/>
</bean>
-
+-->
</beans>
_______________________________________________
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
