dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7424
committer: Jason P. Pickering <jason.p.pickering@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-06-27 11:14:59 +0200
message:
  More  minor fixes to DHIS 1.4 import export service.
modified:
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataValueConverter.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-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataValueConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataValueConverter.java	2012-06-27 09:03:06 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataValueConverter.java	2012-06-27 09:14:59 +0000
@@ -59,6 +59,7 @@
 import org.hisp.dhis.importexport.analysis.ImportAnalyser;
 import org.hisp.dhis.importexport.importer.DataValueImporter;
 import org.hisp.dhis.organisationunit.OrganisationUnit;
+import org.hisp.dhis.importexport.dhis14.util.Dhis14DateUtil;
 
 import org.hisp.dhis.system.util.DateUtils;
 import org.hisp.dhis.system.util.MimicingHashMap;
@@ -257,7 +258,7 @@
                 {
                     try
                     {
-                        value.setValue(  DateUtils.getDefaultDate( values[7] ).toString()  ); //TODO Check conversion
+                        value.setValue(   DateUtils.getDefaultDate( Dhis14DateUtil.getDate( values[7] ).toString() ).toString() ); 
                     }
                     catch ( Exception e )
                     {
@@ -277,7 +278,7 @@
                 }
 
                 value.setComment( values[13] );
-                value.setTimestamp( DateUtils.getDefaultDate( values[15] ) );
+                value.setTimestamp( DateUtils.getDefaultDate( Dhis14DateUtil.getDate( values[15] ).toString() ) );
                 value.setOptionCombo( proxyCategoryOptionCombo );
                 value.setStoredBy( owner );