dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #29344
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 14802: Approval, using a high value for values with no approval in analytics tables.
------------------------------------------------------------
revno: 14802
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2014-04-11 17:00:47 +0200
message:
Approval, using a high value for values with no approval in analytics tables.
modified:
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcAnalyticsTableManager.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/JdbcAnalyticsTableManager.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcAnalyticsTableManager.java 2014-04-10 13:40:11 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcAnalyticsTableManager.java 2014-04-11 15:00:47 +0000
@@ -193,7 +193,7 @@
private String getApprovalSubquery( Collection<OrganisationUnitLevel> levels )
{
String sql = "(" +
- "select min(dal.level) " +
+ "select coalesce(min(dal.level),999) " +
"from dataapproval da " +
"inner join dataapprovallevel dal on da.dataapprovallevelid = dal.dataapprovallevelid " +
"inner join _dataelementstructure des on da.datasetid = des.datasetid and des.dataelementid = dv.dataelementid " +