dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7567
committer: Magnus Korvald <korvald@xxxxxxxxxxx>
branch nick: trunk
timestamp: Tue 2012-07-10 16:57:33 +0200
message:
  Updated dhis-web-sms code to 2.9-SNAPSHOT
modified:
  dhis-2/dhis-web/dhis-web-sms/pom.xml
  dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/beneficiaryenrollment/action/SearchBeneficiaryAction.java
  dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/beneficiaryregistration/action/SaveBeneficiaryAction.java
  dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/input/SMSInput.java
  dhis-2/dhis-web/dhis-web-sms/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-sms/pom.xml'
--- dhis-2/dhis-web/dhis-web-sms/pom.xml	2012-06-18 06:14:19 +0000
+++ dhis-2/dhis-web/dhis-web-sms/pom.xml	2012-07-10 14:57:33 +0000
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.hisp.dhis</groupId>
     <artifactId>dhis-web</artifactId>
-    <version>2.8-SNAPSHOT</version>
+    <version>2.9-SNAPSHOT</version>
   </parent>
 
   <artifactId>dhis-web-sms</artifactId>
@@ -60,20 +60,18 @@
     </dependency>
 	    
 		<!-- Put in by us -->
-    <dependency>
+     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-service-sms</artifactId>
+    <version>2.9-SNAPSHOT</version>      
     </dependency>
-    
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-web-maintenance-mobile</artifactId>
-      <version>2.8-SNAPSHOT</version> <!-- TODO fix this hack -->
+      <version>2.9-SNAPSHOT</version>
       <type>war</type>
     </dependency>
     
-
-    
   </dependencies>
 
   <properties>

=== modified file 'dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/beneficiaryenrollment/action/SearchBeneficiaryAction.java'
--- dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/beneficiaryenrollment/action/SearchBeneficiaryAction.java	2012-06-18 06:14:19 +0000
+++ dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/beneficiaryenrollment/action/SearchBeneficiaryAction.java	2012-07-10 14:57:33 +0000
@@ -86,7 +86,7 @@
     public String execute()
         throws Exception
     {
-        patientList = new ArrayList<Patient>( patientService.getPatientsByNames( keyword ) );
+        patientList = new ArrayList<Patient>( patientService.getPatientsByNames( keyword, 0, Integer.MAX_VALUE) );
         return SUCCESS;
     }
 

=== modified file 'dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/beneficiaryregistration/action/SaveBeneficiaryAction.java'
--- dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/beneficiaryregistration/action/SaveBeneficiaryAction.java	2012-06-18 06:14:19 +0000
+++ dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/beneficiaryregistration/action/SaveBeneficiaryAction.java	2012-07-10 14:57:33 +0000
@@ -200,7 +200,8 @@
         }
 
         patient.setGender( gender );
-        patient.setBloodGroup( bloodGroup );
+       // TODO: is this replaced by somting else???? 
+       // patient.setBloodGroup( bloodGroup );
 
         try
         {

=== modified file 'dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/input/SMSInput.java'
--- dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/input/SMSInput.java	2012-06-18 06:14:19 +0000
+++ dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/input/SMSInput.java	2012-07-10 14:57:33 +0000
@@ -7,7 +7,6 @@
 import java.util.Map;
 import org.apache.commons.lang.StringUtils;
 import org.exolab.castor.types.Date;
-import org.hisp.dhis.dataelement.DataElementCategoryOption;
 import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
 import org.hisp.dhis.dataelement.DataElementCategoryService;
 import org.hisp.dhis.datavalue.DataValue;
@@ -16,8 +15,10 @@
 import org.hisp.dhis.organisationunit.OrganisationUnitService;
 import org.hisp.dhis.period.CalendarPeriodType;
 import org.hisp.dhis.period.Period;
-import org.hisp.dhis.sms.incoming.HibernateIncomingSmsStore;
+
+import org.hisp.dhis.sms.inbound.HibernateIncomingSmsStore;
 import org.hisp.dhis.sms.incoming.IncomingSms;
+import org.hisp.dhis.sms.incoming.IncomingSmsStore;
 import org.hisp.dhis.sms.incoming.SmsMessageEncoding;
 import org.hisp.dhis.sms.incoming.SmsMessageStatus;
 import org.hisp.dhis.smscommand.SMSCode;
@@ -38,7 +39,8 @@
     private String source_id; // Probably like message id and should be an int
     private int msg_id; // unique for each sms
     private IncomingSms sms;
-    private org.hisp.dhis.sms.incoming.HibernateIncomingSmsStore smsStore;
+    private IncomingSmsStore smsStore;
+    
     // Services
     private CurrentUserService currentUserService;
     private DataValueService dataValueService;
@@ -47,6 +49,8 @@
     private SMSCommandService smsCommandService;
     @Autowired
     private DataElementCategoryService dataElementCategoryService;
+    
+    private String test;
 
     public SMSInput() {
     }
@@ -188,8 +192,8 @@
         this.dataValueService = dataValueService;
     }
 
-    public void setSmsStore(HibernateIncomingSmsStore smsStore) {
-        //System.out.println("Setting SMSStore: " + smsStore);
+    public void setSmsStore(IncomingSmsStore smsStore) {
+        System.out.println("Setting SMSStore: " + smsStore);
         this.smsStore = smsStore;
     }
 
@@ -304,4 +308,15 @@
     public void setSource_id(String source_id) {
         this.source_id = source_id;
     }
+
+    public String getTest() {
+        return test;
+    }
+
+    public void setTest(String test) {
+        System.out.println("\n\n\n test: " + test + " \n\n\n");
+        this.test = test;
+    }
+
+
 }

=== modified file 'dhis-2/dhis-web/dhis-web-sms/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-sms/src/main/resources/META-INF/dhis/beans.xml	2012-06-18 06:14:19 +0000
+++ dhis-2/dhis-web/dhis-web-sms/src/main/resources/META-INF/dhis/beans.xml	2012-07-10 14:57:33 +0000
@@ -20,7 +20,7 @@
 	
         <!-- added by Chris -->
         <bean id="org.hisp.dhis.sms.input.SMSInput" class="org.hisp.dhis.sms.input.SMSInput">
-            <property name="smsStore" ref="org.hisp.dhis.sms.incoming.HibernateIncomingSmsStore"/>
+            <property name="smsStore" ref="org.hisp.dhis.sms.incoming.IncomingSmsStore"/>
             <property name="userService" ref="org.hisp.dhis.user.UserService"/>
             <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
             <property name="smsCommandService" ref="smsCommandService" />