dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 12813
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2013-10-24 13:03:46 +0200
message:
  Event analytics table, using programstageinstance instead of patientdatavalue to determine min and max data dates
modified:
  dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/DefaultAnalyticsTableService.java
  dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcEventAnalyticsTableManager.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-analytics/src/main/java/org/hisp/dhis/analytics/table/DefaultAnalyticsTableService.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/DefaultAnalyticsTableService.java	2013-09-24 08:11:36 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/DefaultAnalyticsTableService.java	2013-10-24 11:03:46 +0000
@@ -104,7 +104,7 @@
         
         clock.logTime( "Partition tables: " + tables + ", last 3 years: " + last3YearsOnly );
         
-        notifier.notify( taskId, "Creating analytics tables" );
+        notifier.notify( taskId, "Creating analytics tables: " + tables );
         
         createTables( tables );
         

=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcEventAnalyticsTableManager.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcEventAnalyticsTableManager.java	2013-10-23 22:56:04 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcEventAnalyticsTableManager.java	2013-10-24 11:03:46 +0000
@@ -242,14 +242,14 @@
     
     public Date getEarliestData()
     {
-        final String sql = "select min(pdv.timestamp) from patientdatavalue pdv";
+        final String sql = "select min(psi.executiondate) from programstageinstance psi;";
         
         return jdbcTemplate.queryForObject( sql, Date.class );
     }
 
     public Date getLatestData()
     {
-        final String sql = "select max(pdv.timestamp) from patientdatavalue pdv";
+        final String sql = "select max(psi.executiondate) from programstageinstance psi;";
         
         return jdbcTemplate.queryForObject( sql, Date.class );
     }