=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/resourcetable/ResourceTableService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/resourcetable/ResourceTableService.java 2012-12-27 18:15:23 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/resourcetable/ResourceTableService.java 2013-03-01 17:59:05 +0000
@@ -36,6 +36,11 @@
String ID = ResourceTableService.class.getName();
/**
+ * Generates all resource tables.
+ */
+ void generateAll();
+
+ /**
* Generates a resource table containing the hierarchy graph for each
* OrganisationUnit.
*/
=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/DefaultResourceTableService.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/DefaultResourceTableService.java 2012-12-27 18:15:23 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/DefaultResourceTableService.java 2013-03-01 17:59:05 +0000
@@ -65,6 +65,7 @@
import org.hisp.dhis.resourcetable.statement.CreateDataElementGroupSetTableStatement;
import org.hisp.dhis.resourcetable.statement.CreateIndicatorGroupSetTableStatement;
import org.hisp.dhis.resourcetable.statement.CreateOrganisationUnitGroupSetTableStatement;
+import org.hisp.dhis.sqlview.SqlViewService;
/**
* @author Lars Helge Overland
@@ -125,6 +126,13 @@
this.periodService = periodService;
}
+ private SqlViewService sqlViewService;
+
+ public void setSqlViewService( SqlViewService sqlViewService )
+ {
+ this.sqlViewService = sqlViewService;
+ }
+
private BatchHandlerFactory batchHandlerFactory;
public void setBatchHandlerFactory( BatchHandlerFactory batchHandlerFactory )
@@ -133,6 +141,26 @@
}
// -------------------------------------------------------------------------
+ // All
+ // -------------------------------------------------------------------------
+
+ public void generateAll()
+ {
+ sqlViewService.dropAllSqlViewTables();
+
+ generateCategoryOptionComboNames();
+ generateCategoryTable();
+ generateDataElementGroupSetTable();
+ generateDataElementTable();
+ generateIndicatorGroupSetTable();
+ generateOrganisationUnitGroupSetTable();
+ generateOrganisationUnitStructures();
+ generatePeriodTable();
+
+ sqlViewService.createAllViewTables();
+ }
+
+ // -------------------------------------------------------------------------
// OrganisationUnitStructure
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-administration/src/main/resources/META-INF/dhis/beans.xml 2012-12-14 13:46:47 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/resources/META-INF/dhis/beans.xml 2013-03-01 17:59:05 +0000
@@ -16,6 +16,7 @@
+
@@ -52,7 +53,7 @@
-
+
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ResourceTableController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ResourceTableController.java 2013-01-25 10:33:17 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ResourceTableController.java 2013-03-01 17:59:05 +0000
@@ -63,7 +63,7 @@
@Autowired
private SqlViewService sqlViewService;
-
+
@RequestMapping( value = "/analytics", method = RequestMethod.PUT )
@PreAuthorize( "hasRole('ALL') or hasRole('F_DATA_MART_ADMIN')" )
public void analytics( HttpServletResponse response )
@@ -95,18 +95,7 @@
@PreAuthorize( "hasRole('ALL') or hasRole('F_PERFORM_MAINTENANCE')" )
public void resourceTables( HttpServletResponse response )
{
- sqlViewService.dropAllSqlViewTables();
-
- resourceTableService.generateCategoryOptionComboNames();
- resourceTableService.generateCategoryTable();
- resourceTableService.generateDataElementGroupSetTable();
- resourceTableService.generateDataElementTable();
- resourceTableService.generateIndicatorGroupSetTable();
- resourceTableService.generateOrganisationUnitGroupSetTable();
- resourceTableService.generateOrganisationUnitStructures();
- resourceTableService.generatePeriodTable();
-
- sqlViewService.createAllViewTables();
+ resourceTableService.generateAll();
ContextUtils.okResponse( response, "All resource tables updated" );
}