------------------------------------------------------------
revno: 16296
committer: Tran Chau<tran.hispviet...@gmail.com>
branch nick: dhis2
timestamp: Mon 2014-08-04 00:33:17 +0700
message:
Fixed build fail
modified:
dhis-2/dhis-services/dhis-service-eventreporting/src/test/java/org/hisp/dhis/caseaggregation/CaseAggregationConditionServiceTest.java
dhis-2/dhis-services/dhis-service-eventreporting/src/test/java/org/hisp/dhis/caseaggregation/CaseAggregationConditionStoreTest.java
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseaggregation/CaseAggregationResultAction.java
--
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-services/dhis-service-eventreporting/src/test/java/org/hisp/dhis/caseaggregation/CaseAggregationConditionServiceTest.java'
--- dhis-2/dhis-services/dhis-service-eventreporting/src/test/java/org/hisp/dhis/caseaggregation/CaseAggregationConditionServiceTest.java 2014-07-26 14:38:39 +0000
+++ dhis-2/dhis-services/dhis-service-eventreporting/src/test/java/org/hisp/dhis/caseaggregation/CaseAggregationConditionServiceTest.java 2014-08-03 17:33:17 +0000
@@ -410,7 +410,7 @@
dataElements.add( dataElementC );
dataElements.add( dataElementD );
- assertTrue( equals( aggConditionServiceService.getCaseAggregationCondition( dataElements ), conditionA,
+ assertTrue( equals( aggConditionServiceService.getCaseAggregationConditions( dataElements , null, null, null ), conditionA,
conditionB ) );
}
=== modified file 'dhis-2/dhis-services/dhis-service-eventreporting/src/test/java/org/hisp/dhis/caseaggregation/CaseAggregationConditionStoreTest.java'
--- dhis-2/dhis-services/dhis-service-eventreporting/src/test/java/org/hisp/dhis/caseaggregation/CaseAggregationConditionStoreTest.java 2014-07-26 14:38:39 +0000
+++ dhis-2/dhis-services/dhis-service-eventreporting/src/test/java/org/hisp/dhis/caseaggregation/CaseAggregationConditionStoreTest.java 2014-08-03 17:33:17 +0000
@@ -335,7 +335,7 @@
dataElements.add( dataElementC );
dataElements.add( dataElementD );
- assertTrue( equals( aggConditionServiceStore.get( dataElements ), conditionA, conditionB ) );
+ assertTrue( equals( aggConditionServiceStore.get( dataElements, null, null, null ), conditionA, conditionB ) );
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseaggregation/CaseAggregationResultAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseaggregation/CaseAggregationResultAction.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseaggregation/CaseAggregationResultAction.java 2014-08-03 17:33:17 +0000
@@ -165,7 +165,7 @@
DataSet selectedDataSet = dataSetService.getDataSet( dataSetId );
Collection<CaseAggregationCondition> aggregationConditions = aggregationConditionService
- .getCaseAggregationCondition( selectedDataSet.getDataElements() );
+ .getCaseAggregationConditions( selectedDataSet.getDataElements(), null, null , null );
// ---------------------------------------------------------------------
// Get selected periods list
_______________________________________________
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
