dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1917
committer: Lars <larshelg@larshelg-laptop>
branch nick: trunk
timestamp: Thu 2010-05-27 18:23:11 +0200
message:
  Updated abstract converters with latest additions to model
modified:
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/converter/AbstractCalculatedDataElementConverter.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/converter/AbstractDataElementConverter.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/converter/AbstractExtendedDataElementConverter.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/converter/AbstractExtendedIndicatorConverter.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/converter/AbstractIndicatorConverter.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/converter/AbstractOrganisationUnitConverter.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/converter/AbstractCalculatedDataElementConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/converter/AbstractCalculatedDataElementConverter.java	2010-05-13 12:16:45 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/converter/AbstractCalculatedDataElementConverter.java	2010-05-27 16:23:11 +0000
@@ -60,6 +60,7 @@
         match.setActive( object.isActive() );
         match.setType( object.getType() );
         match.setAggregationOperator( object.getAggregationOperator() );
+        match.setLastUpdated( object.getLastUpdated() );
         match.setSaved( object.isSaved() );
         match.setExpression( object.getExpression() );
         

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/converter/AbstractDataElementConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/converter/AbstractDataElementConverter.java	2010-05-13 12:16:45 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/converter/AbstractDataElementConverter.java	2010-05-27 16:23:11 +0000
@@ -60,6 +60,7 @@
         match.setActive( object.isActive() );
         match.setType( object.getType() );
         match.setAggregationOperator( object.getAggregationOperator() );
+        match.setLastUpdated( object.getLastUpdated() );
                             
         dataElementService.updateDataElement( match );
     }

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/converter/AbstractExtendedDataElementConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/converter/AbstractExtendedDataElementConverter.java	2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/converter/AbstractExtendedDataElementConverter.java	2010-05-27 16:23:11 +0000
@@ -72,6 +72,7 @@
         match.setActive( object.isActive() );
         match.setType( object.getType() );
         match.setAggregationOperator( object.getAggregationOperator() );
+        match.setLastUpdated( object.getLastUpdated() );
 
         // ---------------------------------------------------------------------
         // Update matching if import object has extended dataelement

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/converter/AbstractExtendedIndicatorConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/converter/AbstractExtendedIndicatorConverter.java	2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/converter/AbstractExtendedIndicatorConverter.java	2010-05-27 16:23:11 +0000
@@ -76,6 +76,7 @@
         match.setDenominator( object.getDenominator() );
         match.setDenominatorDescription( object.getDenominatorDescription() );
         match.setDenominatorAggregationOperator( object.getDenominatorAggregationOperator() );
+        match.setLastUpdated( object.getLastUpdated() );
 
         // ---------------------------------------------------------------------
         // Update matching if import object has extended dataelement

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/converter/AbstractIndicatorConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/converter/AbstractIndicatorConverter.java	2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/converter/AbstractIndicatorConverter.java	2010-05-27 16:23:11 +0000
@@ -63,6 +63,7 @@
         match.setDenominator( object.getDenominator() );
         match.setDenominatorDescription( object.getDenominatorDescription() );
         match.setDenominatorAggregationOperator( object.getDenominatorAggregationOperator() );
+        match.setLastUpdated( object.getLastUpdated() );
         
         indicatorService.updateIndicator( match );                
     }

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/converter/AbstractOrganisationUnitConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/converter/AbstractOrganisationUnitConverter.java	2010-05-25 17:36:53 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/converter/AbstractOrganisationUnitConverter.java	2010-05-27 16:23:11 +0000
@@ -67,6 +67,9 @@
         match.setActive( object.isActive() );
         match.setComment( object.getComment() );
         match.setGeoCode( object.getGeoCode() );
+        match.setFeatureType( object.getFeatureType() );
+        match.setCoordinates( object.getCoordinates() );
+        match.setLastUpdated( object.getLastUpdated() );
         
         organisationUnitService.updateOrganisationUnit( match );
     }