=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/datamart/action/StartExportAction.java'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/datamart/action/StartExportAction.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/datamart/action/StartExportAction.java 2013-08-27 12:32:13 +0000
@@ -38,6 +38,7 @@
import org.hisp.dhis.period.CalendarPeriodType;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodType;
+import org.hisp.dhis.resourcetable.scheduling.ResourceTableTask;
import org.hisp.dhis.scheduling.DataMartTask;
import org.hisp.dhis.scheduling.ScheduledTasks;
import org.hisp.dhis.scheduling.TaskCategory;
@@ -74,6 +75,13 @@
this.scheduler = scheduler;
}
+ private ResourceTableTask resourceTableTask;
+
+ public void setResourceTableTask( ResourceTableTask resourceTableTask )
+ {
+ this.resourceTableTask = resourceTableTask;
+ }
+
private AnalyticsTableTask analyticsTableTask;
public void setAnalyticsTableTask( AnalyticsTableTask analyticsTableTask )
@@ -152,6 +160,7 @@
{
analyticsTableTask.setTaskId( taskId );
+ tasks.addTask( resourceTableTask );
tasks.addTask( analyticsTableTask );
}
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/resources/META-INF/dhis/beans.xml 2013-07-24 17:28:39 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/META-INF/dhis/beans.xml 2013-08-27 12:32:13 +0000
@@ -153,6 +153,7 @@
scope="prototype">
+