dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 9687
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2013-02-01 18:28:45 +0200
message:
  DHIS 1.4 file import. Importing saved calculated data elements. We cannot import the formula but getting the data is useful.
modified:
  dhis-2/dhis-services/dhis-service-importexport/src/main/resources/sqlmap/dataElement.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/resources/sqlmap/dataElement.sqlmap.xml'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/resources/sqlmap/dataElement.sqlmap.xml	2012-05-02 06:41:01 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/resources/sqlmap/dataElement.sqlmap.xml	2013-02-01 16:28:45 +0000
@@ -28,11 +28,11 @@
 	<!-- Statement -->
 	
 	<select id="getDataElement" resultMap="dataElementResultMap">
-		SELECT * FROM DataElement WHERE DataElementID = #value# AND Calculated = 0
+		SELECT * FROM DataElement WHERE DataElementID = #value# AND ( Calculated = 0 OR SaveCalculated = 1 )
 	</select>
 	
 	<select id="getDataElements" resultMap="dataElementResultMap">
-		SELECT * FROM DataElement  WHERE Calculated = 0
+		SELECT * FROM DataElement WHERE Calculated = 0 OR SaveCalculated = 1
 	</select>
 	
 	<select id="getDataElementName" parameterClass="java.lang.Integer" resultClass="java.lang.String">