dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #39143
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 19848: Event analytics, program indicator, current date variable
------------------------------------------------------------
revno: 19848
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2015-08-25 20:37:50 +0200
message:
Event analytics, program indicator, current date variable
modified:
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/DefaultProgramIndicatorService.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-core/src/main/java/org/hisp/dhis/program/DefaultProgramIndicatorService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/DefaultProgramIndicatorService.java 2015-08-25 14:09:25 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/DefaultProgramIndicatorService.java 2015-08-25 18:37:50 +0000
@@ -783,6 +783,10 @@
{
return "executiondate";
}
+ else if ( ProgramIndicator.VAR_CURRENT_DATE.equals( var ) )
+ {
+ return "'" + DateUtils.getLongDateString() + "'";
+ }
else if ( ProgramIndicator.VAR_VALUE_COUNT.equals( var ) )
{
String sql = "nullif((";