dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1221
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Sat 2009-12-12 17:21:25 +0100
message:
  Removed import of the Comment field in dhis14 datavalue import.
modified:
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/RoutineDataValueRowHandler.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/SemiPermanentDataValueRowHandler.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/resources/sqlmap/routineDataValue.sqlmap.xml
  dhis-2/dhis-services/dhis-service-importexport/src/main/resources/sqlmap/semiPermanentDataValue.sqlmap.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-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/RoutineDataValueRowHandler.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/RoutineDataValueRowHandler.java	2009-11-23 17:06:09 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/RoutineDataValueRowHandler.java	2009-12-12 16:21:25 +0000
@@ -117,7 +117,6 @@
         value.setSource( source );
         value.setValue( String.valueOf( dhis14Value.getValue() ) );
         value.setStoredBy( dhis14Value.getStoredBy() );
-        value.setComment( dhis14Value.getComment() );
         
         if ( value.getDataElement() != null && value.getPeriod() != null && value.getSource() != null && value.getValue() != null )
         {

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/SemiPermanentDataValueRowHandler.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/SemiPermanentDataValueRowHandler.java	2009-11-23 17:06:09 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/SemiPermanentDataValueRowHandler.java	2009-12-12 16:21:25 +0000
@@ -119,7 +119,6 @@
         value.setPeriod( period );
         value.setSource( source );
         value.setValue( String.valueOf( dhis14Value.getValue() ) );
-        value.setComment( dhis14Value.getComment() );
 
         if ( value.getDataElement() != null && value.getPeriod() != null && value.getSource() != null && value.getValue() != null )
         {

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/resources/sqlmap/routineDataValue.sqlmap.xml'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/resources/sqlmap/routineDataValue.sqlmap.xml	2009-12-11 20:59:28 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/resources/sqlmap/routineDataValue.sqlmap.xml	2009-12-12 16:21:25 +0000
@@ -16,19 +16,18 @@
         <result property="dataElementId" column="DataElementID"/>
         <result property="periodId" column="DataPeriodID"/>
         <result property="organisationUnitId" column="OrgUnitID"/>
-        <result property="value" column="EntryNumber" nullValue="0"/>
+        <result property="value" column="EntryNumber" nullValue="0"/> <!-- use double?-->
         <result property="storedBy" column="LastUserID"/>
-        <result property="comment" column="Comment"/>
     </resultMap>
 	
     <!-- Statement -->
 	
     <select id="getRoutineDataValues" resultMap="routineDataValueResultMap">
-        SELECT DataElementID, DataPeriodID, OrgUnitID, EntryNumber, LastUserID, Comment FROM RoutineData
+        SELECT DataElementID, DataPeriodID, OrgUnitID, EntryNumber, LastUserID FROM RoutineData
     </select>
 
     <select id="getRoutineDataValuesLastUpdated" parameterClass="java.util.Date" resultMap="routineDataValueResultMap">
-        SELECT DataElementID, DataPeriodID, OrgUnitID, EntryNumber, LastUserID, Comment FROM RoutineData WHERE LastUpdated > #value#
+        SELECT DataElementID, DataPeriodID, OrgUnitID, EntryNumber, LastUserID FROM RoutineData WHERE LastUpdated > #value#
     </select>
 
     <select id="getDistinctPeriodIdentifiers" resultClass="java.lang.Integer">

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/resources/sqlmap/semiPermanentDataValue.sqlmap.xml'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/resources/sqlmap/semiPermanentDataValue.sqlmap.xml	2009-11-25 17:51:16 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/resources/sqlmap/semiPermanentDataValue.sqlmap.xml	2009-12-12 16:21:25 +0000
@@ -19,21 +19,20 @@
         <result property="endDate" column="ValidTo" typeHandler="dateTypeHandler"/>
 		<result property="organisationUnitId" column="OrgUnitID"/>
 		<result property="value" column="EntryNumber" nullValue="0"/>
-		<result property="comment" column="Comment"/>
     </resultMap>
 	
 	<!-- Statement -->
 	
 	<select id="getSemiPermanentDataValues" resultMap="semiPermanentDataValueResultMap">
 		SELECT SemiPermanentData.DataElementID, SemiPermanentData.ValidFrom, SemiPermanentData.ValidTo, 
-		SemiPermanentData.OrgUnitID, SemiPermanentData.EntryNumber, SemiPermanentData.Comment, DataElement.DataPeriodTypeID 
+		SemiPermanentData.OrgUnitID, SemiPermanentData.EntryNumber, DataElement.DataPeriodTypeID 
 		FROM SemiPermanentData, DataElement 
         WHERE SemiPermanentData.DataElementID = DataElement.DataElementID
 	</select>
   
     <select id="getSemiPermanentDataValuesLastUpdated" parameterClass="java.util.Date" resultMap="semiPermanentDataValueResultMap">
         SELECT SemiPermanentData.DataElementID, SemiPermanentData.ValidFrom, SemiPermanentData.ValidTo, 
-        SemiPermanentData.OrgUnitID, SemiPermanentData.EntryNumber, SemiPermanentData.Comment, DataElement.DataPeriodTypeID 
+        SemiPermanentData.OrgUnitID, SemiPermanentData.EntryNumber, DataElement.DataPeriodTypeID 
         FROM SemiPermanentData, DataElement 
         WHERE SemiPermanentData.DataElementID = DataElement.DataElementID 
         AND LastUpdated > #value#