← Back to branch summary

~mikeevolution/dhis2/conversion_trunk

« back to all changes in this revision

Viewing changes to dhis-2/dhis-services/dhis-service-importexport/src/main/resources/sqlmap/calculatedDataElementAsIndicator.sqlmap.xml

  • Committer: Mike Nelushi
  • Date: 2015-04-20 07:43:54 UTC
  • Revision ID: mikeevolution@gmail.com-20150420074354-p880ui1u4adbsxav
final conversion code

Show diffs side-by-side

added added

removed removed

Lines of Context:
dhis-2/dhis-services/dhis-service-importexport/src/main/resources/sqlmap/calculatedDataElementAsIndicator.sqlmap.xml
33
33
        <!-- Statement -->
34
34
        
35
35
        <select id="getcalculatedDataElementAsIndicator" resultMap="calculatedDataElementAsIndicatorsResultMap">
36
 
                SELECT * FROM DataElement WHERE DataElementID = #value# AND Calculated = 1
 
36
                SELECT * FROM DataElement WHERE DataElementID = #value# AND (Calculated = 1 AND CalculatedValidFrom is Null AND SaveCalculated = 1)
 
37
                OR (Calculated = 1 AND SaveCalculated = 0)
37
38
        </select>
38
39
        
39
40
        <select id="getcalculatedDataElementAsIndicators" resultMap="calculatedDataElementAsIndicatorsResultMap">
40
 
                SELECT * FROM DataElement  WHERE Calculated = 1 AND CalculatedValidFrom is Null
 
41
                SELECT * FROM DataElement  WHERE (Calculated = 1 AND CalculatedValidFrom is Null AND SaveCalculated = 1)
 
42
                OR (Calculated = 1 AND SaveCalculated = 0)
41
43
        </select>
42
44
        
43
45
        <!-- <select id="getcalculatedDataElementAsIndicators" resultMap="calculatedDataElementAsIndicatorsResultMap">