dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 13690
committer: Mithilesh Kumar Thakur <mithilesh.hisp@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2014-01-10 09:18:34 +0000
message:
  local/in CCEI work in progress
modified:
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/aggregation/action/RunAggregationQueryAction.java
  local/in/dhis-web-maintenance-ccem/src/main/resources/org/hisp/dhis/ccem/i18n_module.properties


--
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 'local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/aggregation/action/RunAggregationQueryAction.java'
--- local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/aggregation/action/RunAggregationQueryAction.java	2014-01-09 12:43:23 +0000
+++ local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/aggregation/action/RunAggregationQueryAction.java	2014-01-10 09:18:34 +0000
@@ -145,7 +145,7 @@
             System.out.println( key + " -- " + aggregationResultMap.get(  key ) );
         }
         
-        //importStatus = cceiAggregationService.importData( aggregationResultMap, period );
+        importStatus = cceiAggregationService.importData( aggregationResultMap, period );
 
         return SUCCESS;
     }

=== modified file 'local/in/dhis-web-maintenance-ccem/src/main/resources/org/hisp/dhis/ccem/i18n_module.properties'
--- local/in/dhis-web-maintenance-ccem/src/main/resources/org/hisp/dhis/ccem/i18n_module.properties	2014-01-10 07:08:30 +0000
+++ local/in/dhis-web-maintenance-ccem/src/main/resources/org/hisp/dhis/ccem/i18n_module.properties	2014-01-10 09:18:34 +0000
@@ -170,3 +170,5 @@
 manual_aggregation = Manual Aggregation
 aggregation_query_builder_detail = Aggregation Query Builder Detail
 ccei_aggregation_query_builder_management = CCEI Aggregation Query Builder Management
+manual_aggregation = Manual Aggregation
+aggregate_values = Aggregate Values