();
+ list.add( elementA );
+ list.add( elementB );
+ list.add( elementC );
+ list.add( elementD );
+
+ FilterUtils.filter( list, new DataElementWithAggregationFilter() );
+
+ assertEquals( 2, list.size() );
+ assertTrue( list.contains( elementA ) );
+ assertTrue( list.contains( elementC ) );
+ }
+}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/AddDataSetAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/AddDataSetAction.java 2012-06-25 20:39:32 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/AddDataSetAction.java 2012-07-12 09:32:15 +0000
@@ -127,6 +127,13 @@
{
this.expiryDays = expiryDays;
}
+
+ private boolean skipAggregation;
+
+ public void setSkipAggregation( boolean skipAggregation )
+ {
+ this.skipAggregation = skipAggregation;
+ }
private String frequencySelect;
@@ -176,6 +183,7 @@
DataSet dataSet = new DataSet( name, shortName, code, periodType );
dataSet.setExpiryDays( expiryDays );
+ dataSet.setSkipAggregation( skipAggregation );
for ( String id : dataElementsSelectedList )
{
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/UpdateDataSetAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/UpdateDataSetAction.java 2012-06-25 20:39:32 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/UpdateDataSetAction.java 2012-07-12 09:32:15 +0000
@@ -139,6 +139,13 @@
this.expiryDays = expiryDays;
}
+ private boolean skipAggregation;
+
+ public void setSkipAggregation( boolean skipAggregation )
+ {
+ this.skipAggregation = skipAggregation;
+ }
+
private String frequencySelect;
public void setFrequencySelect( String frequencySelect )
@@ -201,6 +208,7 @@
DataSet dataSet = dataSetService.getDataSet( dataSetId );
dataSet.setExpiryDays( expiryDays );
+ dataSet.setSkipAggregation( skipAggregation );
if ( !(equalsNullSafe( name, dataSet.getName() ) && periodType.equals( dataSet.getPeriodType() )
&& dataElements.equals( dataSet.getDataElements() ) && indicators.equals( dataSet.getIndicators() )) )
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties 2012-06-25 20:39:32 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties 2012-07-12 09:32:15 +0000
@@ -87,4 +87,5 @@
regular=Regular
compact=Compact
none=None
-allow_future_periods=Allow future periods
\ No newline at end of file
+allow_future_periods=Allow future periods
+skip_aggregation=Skip aggregation
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm 2012-06-25 20:39:32 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm 2012-07-12 09:32:15 +0000
@@ -91,13 +91,22 @@
|
- |
+
+ |
+
+
+
+
+
+ |
+
$i18n.getString("available_for_mobile_reporting") |
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm 2012-06-25 20:39:32 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm 2012-07-12 09:32:15 +0000
@@ -91,13 +91,22 @@
|
-
+
#foreach ( $periodType in $periodTypes )
#end
|
+
+ |
+
+
+
+
+
+ |
+
| |