dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 967
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Tue 2009-11-03 14:58:21 +0100
message:
  Added lastUpdated field in Dhis 14 file import.
modified:
  dhis-2/dhis-services/dhis-service-importexport/src/main/resources/sqlmap/dataElement.sqlmap.xml
  dhis-2/dhis-services/dhis-service-importexport/src/main/resources/sqlmap/indicator.sqlmap.xml
  dhis-2/dhis-services/dhis-service-importexport/src/main/resources/sqlmap/indicatorType.sqlmap.xml
  dhis-2/dhis-services/dhis-service-importexport/src/main/resources/sqlmap/organisationUnit.sqlmap.xml
  dhis-2/dhis-services/dhis-service-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementBatchHandler.java
  dhis-2/dhis-services/dhis-service-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorBatchHandler.java
  dhis-2/dhis-services/dhis-service-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitBatchHandler.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/resources/sqlmap/dataElement.sqlmap.xml'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/resources/sqlmap/dataElement.sqlmap.xml	2009-11-02 15:55:44 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/resources/sqlmap/dataElement.sqlmap.xml	2009-11-03 13:58:21 +0000
@@ -22,6 +22,7 @@
 		<result property="type" column="DataTypeID" typeHandler="dataElementTypeTypeHandler"/>
 		<result property="aggregationOperator" column="AggregateOperator" typeHandler="aggregationOperatorTypeHandler"/>
 		<result property="sortOrder" column="SortOrder"/>
+		<result property="lastUpdated" column="LastUpdated"/>
 	</resultMap>
 	
 	<!-- Statement -->

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/resources/sqlmap/indicator.sqlmap.xml'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/resources/sqlmap/indicator.sqlmap.xml	2009-11-02 15:55:44 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/resources/sqlmap/indicator.sqlmap.xml	2009-11-03 13:58:21 +0000
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
 <!DOCTYPE sqlMap
 	PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN"
 	"http://ibatis.apache.org/dtd/sql-map-2.dtd";>
@@ -25,6 +27,7 @@
 		<result property="denominator" column="IndicatorDenominator"/>
 		<result property="denominatorDescription" column="IndicatorDenominatorDescription"/>
         <result property="sortOrder" column="SortOrder"/>
+        <result property="lastUpdated" column="LastUpdated"/>
 	</resultMap>
 	
 	<!-- Statement -->

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/resources/sqlmap/indicatorType.sqlmap.xml'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/resources/sqlmap/indicatorType.sqlmap.xml	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/resources/sqlmap/indicatorType.sqlmap.xml	2009-11-03 13:58:21 +0000
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
 <!DOCTYPE sqlMap
 	PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN"
 	"http://ibatis.apache.org/dtd/sql-map-2.dtd";>

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/resources/sqlmap/organisationUnit.sqlmap.xml'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/resources/sqlmap/organisationUnit.sqlmap.xml	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/resources/sqlmap/organisationUnit.sqlmap.xml	2009-11-03 13:58:21 +0000
@@ -21,6 +21,7 @@
         <result property="openingDate" column="ValidFrom" typeHandler="dateTypeHandler"/>
         <result property="active" column="Active" typeHandler="booleanTypeHandler"/>
         <result property="comment" column="Comment"/>
+        <result property="lastUpdated" column="LastUpdated"/>
     </resultMap>
 	
 	<!-- Statement -->

=== modified file 'dhis-2/dhis-services/dhis-service-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementBatchHandler.java'
--- dhis-2/dhis-services/dhis-service-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementBatchHandler.java	2009-11-02 15:55:44 +0000
+++ dhis-2/dhis-services/dhis-service-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementBatchHandler.java	2009-11-03 13:58:21 +0000
@@ -104,6 +104,7 @@
         statementBuilder.setColumn( "extendeddataelementid" );
         statementBuilder.setColumn( "categorycomboid" );
         statementBuilder.setColumn( "sortorder" );
+        statementBuilder.setColumn( "lastUpdated" );
     }
     
     protected void setValues( DataElement dataElement )
@@ -120,5 +121,6 @@
         statementBuilder.setValue( dataElement.getExtended() != null ? dataElement.getExtended().getId() : null );
         statementBuilder.setValue( dataElement.getCategoryCombo().getId() );
         statementBuilder.setValue( dataElement.getSortOrder() );
+        statementBuilder.setValue( dataElement.getLastUpdated() );
     }
 }

=== modified file 'dhis-2/dhis-services/dhis-service-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorBatchHandler.java'
--- dhis-2/dhis-services/dhis-service-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorBatchHandler.java	2009-11-02 15:55:44 +0000
+++ dhis-2/dhis-services/dhis-service-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorBatchHandler.java	2009-11-03 13:58:21 +0000
@@ -108,6 +108,7 @@
         statementBuilder.setColumn( "denominatoraggregationtype" );
         statementBuilder.setColumn( "extendeddataelementid" );
         statementBuilder.setColumn( "sortorder" );
+        statementBuilder.setColumn( "lastUpdated" );
     }
     
     protected void setValues( Indicator indicator )
@@ -128,5 +129,6 @@
         statementBuilder.setValue( indicator.getDenominatorAggregationOperator() );
         statementBuilder.setValue( indicator.getExtended() != null ? indicator.getExtended().getId() : null );
         statementBuilder.setValue( indicator.getSortOrder() );
+        statementBuilder.setValue( indicator.getLastUpdated() );
     }
 }

=== modified file 'dhis-2/dhis-services/dhis-service-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitBatchHandler.java'
--- dhis-2/dhis-services/dhis-service-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitBatchHandler.java	2009-08-12 21:06:37 +0000
+++ dhis-2/dhis-services/dhis-service-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitBatchHandler.java	2009-11-03 13:58:21 +0000
@@ -97,6 +97,7 @@
         statementBuilder.setColumn( "geocode" );
         statementBuilder.setColumn( "latitude" );
         statementBuilder.setColumn( "longitude" );
+        statementBuilder.setColumn( "lastUpdated" );
     }
     
     protected void setValues( OrganisationUnit unit )
@@ -114,5 +115,6 @@
         statementBuilder.setValue( unit.getGeoCode() );
         statementBuilder.setValue( unit.getLatitude() );
         statementBuilder.setValue( unit.getLongitude() );
+        statementBuilder.setValue( unit.getLastUpdated() );
     }
 }