------------------------------------------------------------
revno: 19930
committer: Lars Helge Overland <larshe...@gmail.com>
branch nick: dhis2
timestamp: Wed 2015-09-02 10:15:17 +0200
message:
Fix to TaskCategory / analytics
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/scheduling/TaskCategory.java
dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/notification/NotifierTest.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ResourceTableController.java
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/webapp/dhis-web-reporting/javascript/dataMart.js
--
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-api/src/main/java/org/hisp/dhis/scheduling/TaskCategory.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/scheduling/TaskCategory.java 2015-08-30 14:21:41 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/scheduling/TaskCategory.java 2015-09-02 08:15:17 +0000
@@ -33,7 +33,6 @@
*/
public enum TaskCategory
{
- ANALYTICS_TABLES,
RESOURCETABLE_UPDATE,
ANALYTICSTABLE_UPDATE,
MONITORING,
=== modified file 'dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/notification/NotifierTest.java'
--- dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/notification/NotifierTest.java 2015-08-30 14:21:41 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/notification/NotifierTest.java 2015-09-02 08:15:17 +0000
@@ -28,7 +28,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import static org.hisp.dhis.scheduling.TaskCategory.ANALYTICS_TABLES;
+import static org.hisp.dhis.scheduling.TaskCategory.ANALYTICSTABLE_UPDATE;
import static org.hisp.dhis.scheduling.TaskCategory.DATAVALUE_IMPORT;
import static org.hisp.dhis.scheduling.TaskCategory.METADATA_IMPORT;
import static org.junit.Assert.assertEquals;
@@ -54,7 +54,7 @@
private User user = createUser( 'A' );
private TaskId id1 = new TaskId( DATAVALUE_IMPORT, user );
- private TaskId id2 = new TaskId( ANALYTICS_TABLES, user );
+ private TaskId id2 = new TaskId( ANALYTICSTABLE_UPDATE, user );
private TaskId id3 = new TaskId( METADATA_IMPORT, user );
@Test
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ResourceTableController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ResourceTableController.java 2015-08-30 14:21:41 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ResourceTableController.java 2015-09-02 08:15:17 +0000
@@ -90,7 +90,7 @@
analyticsTableTask.setSkipAggregate( skipAggregate );
analyticsTableTask.setSkipEvents( skipEvents );
analyticsTableTask.setLastYears( lastYears );
- analyticsTableTask.setTaskId( new TaskId( TaskCategory.ANALYTICS_TABLES, currentUserService.getCurrentUser() ) );
+ analyticsTableTask.setTaskId( new TaskId( TaskCategory.ANALYTICSTABLE_UPDATE, currentUserService.getCurrentUser() ) );
scheduler.executeTask( analyticsTableTask );
=== 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 2015-08-30 14:21:41 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/datamart/action/StartExportAction.java 2015-09-02 08:15:17 +0000
@@ -81,7 +81,7 @@
public String execute()
throws Exception
{
- TaskId taskId = new TaskId( TaskCategory.ANALYTICS_TABLES, currentUserService.getCurrentUser() );
+ TaskId taskId = new TaskId( TaskCategory.ANALYTICSTABLE_UPDATE, currentUserService.getCurrentUser() );
notifier.clear( taskId );
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataMart.js'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataMart.js 2015-08-30 14:21:41 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataMart.js 2015-09-02 08:15:17 +0000
@@ -22,6 +22,6 @@
function pingNotificationsTimeout()
{
- pingNotifications( 'ANALYTICS_TABLES', 'notificationTable' );
+ pingNotifications( 'ANALYTICSTABLE_UPDATE', 'notificationTable' );
setTimeout( "pingNotificationsTimeout()", 2500 );
}
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
