dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2010
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2010-11-08 14:02:47 +0100
message:
  Applied patch from Hieu, fixes nasty bug with period type of aggregatedindicatorvalues
modified:
  dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedIndicatorValueRowMapper.java
  resources/sql/integritychecks.sql


--
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-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedIndicatorValueRowMapper.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedIndicatorValueRowMapper.java	2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedIndicatorValueRowMapper.java	2010-11-08 13:02:47 +0000
@@ -48,7 +48,7 @@
         value.setIndicatorId( resultSet.getInt( 1 ) );
         value.setPeriodId( resultSet.getInt( 2 ) );
         value.setOrganisationUnitId( resultSet.getInt( 3 ) );
-        value.setPeriodTypeId( resultSet.getInt( resultSet.getInt( 4 ) ) );
+        value.setPeriodTypeId( resultSet.getInt( 4 ) );
         value.setLevel( resultSet.getInt( 5 ) );
         value.setAnnualized( resultSet.getString( 6 ) );
         value.setFactor( resultSet.getDouble( 7 ) );

=== modified file 'resources/sql/integritychecks.sql'
--- resources/sql/integritychecks.sql	2010-11-03 20:27:57 +0000
+++ resources/sql/integritychecks.sql	2010-11-08 13:02:47 +0000
@@ -34,5 +34,3 @@
   select dm.dataelementid from datasetmembers dm
   join dataset ds on(dm.datasetid=ds.datasetid)
   where sc.datasetid=ds.datasetid);
-
-