dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 11819
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-08-27 14:32:13 +0200
message:
  Analytics, running resource tables first during the ad-hoc analytics generation process
modified:
  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/resources/META-INF/dhis/beans.xml


--
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-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">
 	<property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService"/>
 	<property name="scheduler" ref="scheduler"/>
+	<property name="resourceTableTask" ref="resourceTableTask" />
 	<property name="analyticsTableTask" ref="analyticsAllTask" />
 	<property name="dataMartTask" ref="dataMartLast12MonthsTask"/>
   </bean>