------------------------------------------------------------
revno: 5895
committer: Lars Helge Overland <[email protected]>
branch nick: dhis2
timestamp: Wed 2012-02-08 22:32:42 +0100
message:
Data mart task, fixed issue, no need to aggregate data for current month
modified:
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/scheduling/DataMartTask.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-support/dhis-support-system/src/main/java/org/hisp/dhis/system/scheduling/DataMartTask.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/scheduling/DataMartTask.java 2012-02-07 19:52:19 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/scheduling/DataMartTask.java 2012-02-08 21:32:42 +0000
@@ -147,11 +147,11 @@
*/
private List<Period> getPeriods( Set<String> periodTypes )
{
- List<Period> periods = new RelativePeriods().getRelativePeriods( periodTypes ).getRelativePeriods( 0 );
+ List<Period> periods = new RelativePeriods().getRelativePeriods( periodTypes ).getRelativePeriods( 1 );
if ( periodTypes.contains( YearlyPeriodType.NAME ) ) // Add last year
{
- periods.addAll( new RelativePeriods().setLastYear( true ).getRelativePeriods( 0 ) );
+ periods.addAll( new RelativePeriods().setLastYear( true ).getRelativePeriods( 1 ) );
}
final Date date = new Cal().now().subtract( Calendar.MONTH, 6 ).time();
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
