dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2089
committer: Bharath <chbharathk@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2010-11-17 12:57:27 +0530
message:
  Fixed bug to import Text Data on SMS Application
modified:
  dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/api/DefaultMobileImportService.java
  dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/api/MobileImportParameters.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-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/api/DefaultMobileImportService.java'
--- dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/api/DefaultMobileImportService.java	2010-10-14 10:44:34 +0000
+++ dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/api/DefaultMobileImportService.java	2010-11-17 07:27:27 +0000
@@ -272,7 +272,7 @@
         String tempDeid;
         String tempDataValue;
 
-        Map<String, Integer> dataValues = new HashMap<String, Integer>();
+        Map<String, String> dataValues = new HashMap<String, String>();
 
         MobileImportParameters mobileImportParameters = new MobileImportParameters();
 
@@ -338,9 +338,9 @@
                     tempDataValue = textValueElementList.item( 0 ).getNodeValue();
 
                     String tempDeID = tempDeid;
-                    Integer tempDV = Integer.parseInt( tempDataValue );
+                    //Integer tempDV = Integer.parseInt( tempDataValue );
 
-                    dataValues.put( tempDeID, tempDV );
+                    dataValues.put( tempDeID, tempDataValue );
                 }
             }// end of for loop with s var
 
@@ -588,7 +588,7 @@
 
                     Date timeStamp = dateFormat.parse( mobImportParameters.getSmsTime() );
 
-                    Map<String, Integer> dataValueMap = new HashMap<String, Integer>( mobImportParameters
+                    Map<String, String> dataValueMap = new HashMap<String, String>( mobImportParameters
                         .getDataValues() );
 
                     if ( dataValueMap == null || dataValueMap.size() <= 0 )
@@ -857,7 +857,7 @@
 
                 java.sql.Date lastUpdatedDate = new java.sql.Date( t );
 
-                Map<String, Integer> dataValueMap = new HashMap<String, Integer>( mobImportParameters.getDataValues() );
+                Map<String, String> dataValueMap = new HashMap<String, String>( mobImportParameters.getDataValues() );
 
                 if( dataValueMap == null || dataValueMap.size() <= 0 )
                 {
@@ -1070,7 +1070,7 @@
 
                 java.sql.Date lastUpdatedDate = new java.sql.Date( t );
 
-                Map<String, Integer> dataValueMap = new HashMap<String, Integer>( mobImportParameters.getDataValues() );
+                Map<String, String> dataValueMap = new HashMap<String, String>( mobImportParameters.getDataValues() );
 
                 if ( dataValueMap == null || dataValueMap.size() <= 0 )
                 {

=== modified file 'dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/api/MobileImportParameters.java'
--- dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/api/MobileImportParameters.java	2010-10-14 10:44:34 +0000
+++ dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/api/MobileImportParameters.java	2010-11-17 07:27:27 +0000
@@ -42,7 +42,7 @@
 
     private String periodType;
 
-    private Map<String, Integer> dataValues;
+    private Map<String, String> dataValues;
 
     // -------------------------------------------------------------------------
     // Constructors
@@ -94,13 +94,14 @@
         return periodType;
     }
 
-    public Map<String, Integer> getDataValues()
+    public Map<String, String> getDataValues()
     {
         return dataValues;
     }
 
-    public void setDataValues( Map<String, Integer> dataValues )
+    public void setDataValues( Map<String, String> dataValues )
     {
         this.dataValues = dataValues;
     }
+    
 }