dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #14121
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 4673: Removed numeratorAggregationOperator and denominatorAggregationOperator properties from Indicator
------------------------------------------------------------
revno: 4673
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2011-09-24 13:35:11 +0200
message:
Removed numeratorAggregationOperator and denominatorAggregationOperator properties from Indicator
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/Indicator.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/indicator/hibernate/Indicator.hbm.xml
dhis-2/dhis-services/dhis-service-datamart-default/src/test/java/org/hisp/dhis/datamart/DataMartServiceMultiDimensionTest.java
dhis-2/dhis-services/dhis-service-datamart-default/src/test/java/org/hisp/dhis/datamart/DataMartServiceTest.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/IndicatorRowHandler.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/IndicatorConverter.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/IndicatorConverter.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/IndicatorImporter.java
dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfA.xml
dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfA.zip
dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfB.xml
dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfC.xml
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorBatchHandler.java
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ExcelUtils.java
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/PDFUtils.java
dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/AddIndicatorAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/UpdateIndicatorAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorForm.vm
--
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/indicator/Indicator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/Indicator.java 2011-09-06 11:52:18 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/Indicator.java 2011-09-24 11:35:11 +0000
@@ -55,16 +55,12 @@
private String numeratorDescription;
- private String numeratorAggregationOperator;
-
private String explodedNumerator;
private String denominator;
private String denominatorDescription;
- private String denominatorAggregationOperator;
-
private String explodedDenominator;
private Integer sortOrder;
@@ -202,16 +198,6 @@
this.numeratorDescription = numeratorDescription;
}
- public String getNumeratorAggregationOperator()
- {
- return numeratorAggregationOperator;
- }
-
- public void setNumeratorAggregationOperator( String numeratorAggregationOperator )
- {
- this.numeratorAggregationOperator = numeratorAggregationOperator;
- }
-
public String getExplodedNumerator()
{
return explodedNumerator;
@@ -242,16 +228,6 @@
this.denominatorDescription = denominatorDescription;
}
- public String getDenominatorAggregationOperator()
- {
- return denominatorAggregationOperator;
- }
-
- public void setDenominatorAggregationOperator( String denominatorAggregationOperator )
- {
- this.denominatorAggregationOperator = denominatorAggregationOperator;
- }
-
public String getExplodedDenominator()
{
return explodedDenominator;
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2011-09-16 04:30:16 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2011-09-24 11:35:11 +0000
@@ -103,7 +103,9 @@
executeSql( "ALTER TABLE section DROP COLUMN label" );
executeSql( "ALTER TABLE section DROP COLUMN title" );
executeSql( "ALTER TABLE organisationunit DROP COLUMN polygoncoordinates" );
- executeSql( "ALTER TABLE dataelementcategory DROP COLUMN conceptName" );
+ executeSql( "ALTER TABLE indicator DROP COLUMN extendeddataelementid" );
+ executeSql( "ALTER TABLE indicator DROP COLUMN numeratoraggregationtype" );
+ executeSql( "ALTER TABLE indicator DROP COLUMN denominatoraggregationtype" );
// remove relative period type
executeSql( "DELETE FROM period WHERE periodtypeid=(select periodtypeid from periodtype where name='Relative')" );
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/indicator/hibernate/Indicator.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/indicator/hibernate/Indicator.hbm.xml 2011-09-21 14:43:36 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/indicator/hibernate/Indicator.hbm.xml 2011-09-24 11:35:11 +0000
@@ -43,14 +43,10 @@
<property name="numeratorDescription" column="numeratordescription" type="text" />
- <property name="numeratorAggregationOperator" column="numeratoraggregationtype" length="16" />
-
<property name="denominator" column="denominator" type="text" />
<property name="denominatorDescription" column="denominatordescription" type="text" />
- <property name="denominatorAggregationOperator" column="denominatoraggregationtype" length="16" />
-
<property name="sortOrder" />
<property name="url" />
=== modified file 'dhis-2/dhis-services/dhis-service-datamart-default/src/test/java/org/hisp/dhis/datamart/DataMartServiceMultiDimensionTest.java'
--- dhis-2/dhis-services/dhis-service-datamart-default/src/test/java/org/hisp/dhis/datamart/DataMartServiceMultiDimensionTest.java 2010-12-07 17:02:27 +0000
+++ dhis-2/dhis-services/dhis-service-datamart-default/src/test/java/org/hisp/dhis/datamart/DataMartServiceMultiDimensionTest.java 2011-09-24 11:35:11 +0000
@@ -484,10 +484,8 @@
String suffixB = Expression.SEPARATOR + categoryOptionComboB.getId();
indicatorA.setNumerator( "[" + dataElementA.getId() + suffixA + "]*[" + dataElementA.getId() + suffixB + "]" );
- indicatorA.setNumeratorAggregationOperator( DataElement.AGGREGATION_OPERATOR_SUM );
indicatorA.setDenominator( "1" );
- indicatorA.setDenominatorAggregationOperator( DataElement.AGGREGATION_OPERATOR_SUM );
indicatorIds.add( indicatorService.addIndicator( indicatorA ) );
@@ -546,18 +544,14 @@
String suffixB = Expression.SEPARATOR + categoryOptionComboB.getId();
indicatorA.setNumerator( "[" + dataElementA.getId() + suffixA + "]+[" + dataElementA.getId() + suffixB + "]" );
- indicatorA.setNumeratorAggregationOperator( DataElement.AGGREGATION_OPERATOR_SUM );
indicatorA.setDenominator( "100" );
- indicatorA.setDenominatorAggregationOperator( DataElement.AGGREGATION_OPERATOR_SUM );
Indicator indicatorB = createIndicator( 'B', indicatorType );
indicatorB.setNumerator( "[" + dataElementA.getId() + "]" );
- indicatorB.setNumeratorAggregationOperator( DataElement.AGGREGATION_OPERATOR_SUM );
indicatorB.setDenominator( "100" );
- indicatorB.setDenominatorAggregationOperator( DataElement.AGGREGATION_OPERATOR_SUM );
indicatorIds.add( indicatorService.addIndicator( indicatorA ) );
indicatorIds.add( indicatorService.addIndicator( indicatorB ) );
@@ -631,10 +625,8 @@
String suffixB = Expression.SEPARATOR + categoryOptionComboB.getId();
indicatorA.setNumerator( "[" + dataElementA.getId() + suffixA + "]*[" + dataElementA.getId() + suffixB + "]" );
- indicatorA.setNumeratorAggregationOperator( DataElement.AGGREGATION_OPERATOR_SUM );
indicatorA.setDenominator( "1" );
- indicatorA.setDenominatorAggregationOperator( DataElement.AGGREGATION_OPERATOR_SUM );
indicatorIds.add( indicatorService.addIndicator( indicatorA ) );
=== modified file 'dhis-2/dhis-services/dhis-service-datamart-default/src/test/java/org/hisp/dhis/datamart/DataMartServiceTest.java'
--- dhis-2/dhis-services/dhis-service-datamart-default/src/test/java/org/hisp/dhis/datamart/DataMartServiceTest.java 2011-04-24 15:50:02 +0000
+++ dhis-2/dhis-services/dhis-service-datamart-default/src/test/java/org/hisp/dhis/datamart/DataMartServiceTest.java 2011-09-24 11:35:11 +0000
@@ -460,10 +460,8 @@
String suffix = "." + categoryOptionCombo.getId();
indicatorA.setNumerator( "[" + idC + suffix + "]*[" + idD + suffix + "]" );
- indicatorA.setNumeratorAggregationOperator( DataElement.AGGREGATION_OPERATOR_SUM );
indicatorA.setDenominator( "[" + idE + suffix + "]+[" + idF + suffix + "]" );
- indicatorA.setDenominatorAggregationOperator( DataElement.AGGREGATION_OPERATOR_AVERAGE );
indicatorIds.add( indicatorService.addIndicator( indicatorA ) );
@@ -548,10 +546,8 @@
String suffix = Expression.SEPARATOR + categoryOptionCombo.getId();
indicatorA.setNumerator( "[" + idC + suffix + "]*[" + idD + suffix + "]" );
- indicatorA.setNumeratorAggregationOperator( DataElement.AGGREGATION_OPERATOR_SUM );
indicatorA.setDenominator( "[" + idE + suffix + "]+[" + idF + suffix + "]" );
- indicatorA.setDenominatorAggregationOperator( DataElement.AGGREGATION_OPERATOR_AVERAGE );
indicatorIds.add( indicatorService.addIndicator( indicatorA ) );
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/IndicatorRowHandler.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/IndicatorRowHandler.java 2010-05-29 16:06:56 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/IndicatorRowHandler.java 2011-09-24 11:35:11 +0000
@@ -27,9 +27,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import static org.hisp.dhis.dataelement.DataElement.AGGREGATION_OPERATOR_SUM;
import static org.hisp.dhis.importexport.dhis14.util.Dhis14ExpressionConverter.convertExpressionFromDhis14;
-import static org.hisp.dhis.importexport.dhis14.util.Dhis14ExpressionConverter.getFirstDataElementId;
import java.util.Map;
@@ -39,7 +37,6 @@
import org.hisp.dhis.importexport.ImportParams;
import org.hisp.dhis.importexport.analysis.ImportAnalyser;
import org.hisp.dhis.importexport.importer.IndicatorImporter;
-import org.hisp.dhis.importexport.mapping.NameMappingUtil;
import org.hisp.dhis.indicator.Indicator;
import org.hisp.dhis.indicator.IndicatorService;
import org.hisp.dhis.system.util.UUIdUtils;
@@ -57,8 +54,6 @@
private Map<Object, Integer> dataElementMap;
- private Map<Object, String> dataElementAggregationOperatorMap;
-
private DataElementCategoryOptionCombo categoryOptionCombo;
private ImportParams params;
@@ -81,7 +76,6 @@
this.indicatorService = indicatorService;
this.indicatorTypeMap = indicatorTypeMap;
this.dataElementMap = dataElementMap;
- this.dataElementAggregationOperatorMap = NameMappingUtil.getDataElementAggregationOperatorMap();
this.categoryOptionCombo = categoryOptionCombo;
this.params = params;
this.importAnalyser = importAnalyser;
@@ -108,12 +102,6 @@
}
indicator.getIndicatorType().setId( indicatorTypeMap.get( indicator.getIndicatorType().getId() ) );
-
- final String numeratorAggregationOperator = dataElementAggregationOperatorMap.get( getFirstDataElementId( indicator.getNumerator() ) );
- final String denominatorAggregationOperator = dataElementAggregationOperatorMap.get( getFirstDataElementId( indicator.getDenominator() ) );
-
- indicator.setNumeratorAggregationOperator( numeratorAggregationOperator != null ? numeratorAggregationOperator : AGGREGATION_OPERATOR_SUM );
- indicator.setDenominatorAggregationOperator( denominatorAggregationOperator != null ? denominatorAggregationOperator : AGGREGATION_OPERATOR_SUM );
indicator.setNumerator( convertExpressionFromDhis14( indicator.getNumerator(), dataElementMap, categoryOptionCombo.getId(), indicator.getName() ) );
indicator.setDenominator( convertExpressionFromDhis14( indicator.getDenominator(), dataElementMap, categoryOptionCombo.getId(), indicator.getName() ) );
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/IndicatorConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/IndicatorConverter.java 2010-11-15 14:01:36 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/IndicatorConverter.java 2011-09-24 11:35:11 +0000
@@ -27,10 +27,8 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import static org.hisp.dhis.dataelement.DataElement.AGGREGATION_OPERATOR_SUM;
import static org.hisp.dhis.importexport.dhis14.util.Dhis14ExpressionConverter.convertExpressionFromDhis14;
import static org.hisp.dhis.importexport.dhis14.util.Dhis14ExpressionConverter.convertExpressionToDhis14;
-import static org.hisp.dhis.importexport.dhis14.util.Dhis14ExpressionConverter.getFirstDataElementId;
import static org.hisp.dhis.importexport.dhis14.util.Dhis14TypeHandler.convertBooleanFromDhis14;
import static org.hisp.dhis.system.util.ConversionUtils.parseInt;
@@ -97,7 +95,6 @@
private Map<Object, Integer> indicatorTypeMapping;
private Map<Object, Integer> dataElementMapping;
- private Map<Object, String> dataElementAggregationOperatorMap;
private DataElementCategoryOptionCombo categoryOptionCombo;
@@ -127,7 +124,6 @@
this.importObjectService = importObjectService;
this.indicatorTypeMapping = new MimicingHashMap<Object, Integer>();
this.dataElementMapping = new MimicingHashMap<Object, Integer>();
- this.dataElementAggregationOperatorMap = NameMappingUtil.getDataElementAggregationOperatorMap();
this.indicatorService = indicatorService;
this.importAnalyser = importAnalyser;
this.categoryOptionCombo = categoryOptionCombo;
@@ -195,12 +191,6 @@
indicator.setNumeratorDescription( values.get( FIELD_NUMERATOR_DESCRIPTION ) );
indicator.setDenominatorDescription( values.get( FIELD_DENOMINATOR_DESCRIPTION ) );
- final String numeratorAggregationOperator = dataElementAggregationOperatorMap.get( getFirstDataElementId( indicator.getNumerator() ) );
- final String denominatorAggregationOperator = dataElementAggregationOperatorMap.get( getFirstDataElementId( indicator.getDenominator() ) );
-
- indicator.setNumeratorAggregationOperator( numeratorAggregationOperator != null ? numeratorAggregationOperator : AGGREGATION_OPERATOR_SUM );
- indicator.setDenominatorAggregationOperator( denominatorAggregationOperator != null ? denominatorAggregationOperator : AGGREGATION_OPERATOR_SUM );
-
indicator.setNumerator( convertExpressionFromDhis14( values.get( FIELD_NUMERATOR ), dataElementMapping, categoryOptionCombo.getId(), indicator.getName() ) );
indicator.setDenominator( convertExpressionFromDhis14( values.get( FIELD_DENOMINATOR ), dataElementMapping, categoryOptionCombo.getId(), indicator.getName() ) );
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/IndicatorConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/IndicatorConverter.java 2010-12-05 17:38:27 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/IndicatorConverter.java 2011-09-24 11:35:11 +0000
@@ -66,10 +66,8 @@
private static final String FIELD_INDICATOR_TYPE = "indicatorType";
private static final String FIELD_NUMERATOR = "numerator";
private static final String FIELD_NUMERATOR_DESCRIPTION = "numeratorDescription";
- private static final String FIELD_NUMERATOR_AGGREGATION_OPERATOR = "numeratorAggregationOperator";
private static final String FIELD_DENOMINATOR = "denominator";
private static final String FIELD_DENOMINATOR_DESCRIPTION = "denominatorDescription";
- private static final String FIELD_DENOMINATOR_AGGREGATION_OPERATOR = "denominatorAggregationOperator";
private static final String FIELD_LAST_UPDATED = "lastUpdated";
// -------------------------------------------------------------------------
@@ -153,10 +151,8 @@
writer.writeElement( FIELD_INDICATOR_TYPE, String.valueOf( indicator.getIndicatorType().getId() ) );
writer.writeElement( FIELD_NUMERATOR, indicator.getNumerator() );
writer.writeElement( FIELD_NUMERATOR_DESCRIPTION, indicator.getNumeratorDescription() );
- writer.writeElement( FIELD_NUMERATOR_AGGREGATION_OPERATOR, indicator.getNumeratorAggregationOperator() );
writer.writeElement( FIELD_DENOMINATOR, indicator.getDenominator() );
writer.writeElement( FIELD_DENOMINATOR_DESCRIPTION, indicator.getDenominatorDescription() );
- writer.writeElement( FIELD_DENOMINATOR_AGGREGATION_OPERATOR, indicator.getDenominatorAggregationOperator() );
writer.writeElement( FIELD_LAST_UPDATED, DateUtils.getMediumDateString( indicator.getLastUpdated() ), EMPTY );
writer.closeElement();
@@ -187,10 +183,8 @@
indicator.getIndicatorType().setId( indicatorTypeMapping.get( Integer.parseInt( values.get( FIELD_INDICATOR_TYPE ) ) ) );
indicator.setNumerator( expressionService.convertExpression( values.get( FIELD_NUMERATOR ), dataElementMapping, categoryOptionComboMapping ) );
indicator.setNumeratorDescription( values.get( FIELD_NUMERATOR_DESCRIPTION ) );
- indicator.setNumeratorAggregationOperator( values.get( FIELD_NUMERATOR_AGGREGATION_OPERATOR ) );
indicator.setDenominator( expressionService.convertExpression( values.get( FIELD_DENOMINATOR ), dataElementMapping, categoryOptionComboMapping ) );
indicator.setDenominatorDescription( values.get( FIELD_DENOMINATOR_DESCRIPTION ) );
- indicator.setDenominatorAggregationOperator( values.get( FIELD_DENOMINATOR_AGGREGATION_OPERATOR ) );
indicator.setLastUpdated( DateUtils.getMediumDate( values.get( FIELD_LAST_UPDATED ) ) );
importObject( indicator, params );
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/IndicatorImporter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/IndicatorImporter.java 2011-01-17 17:03:05 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/IndicatorImporter.java 2011-09-24 11:35:11 +0000
@@ -80,10 +80,8 @@
match.setIndicatorType( object.getIndicatorType() );
match.setNumerator( object.getNumerator() );
match.setNumeratorDescription( object.getNumeratorDescription() );
- match.setNumeratorAggregationOperator( object.getNumeratorAggregationOperator() );
match.setDenominator( object.getDenominator() );
match.setDenominatorDescription( object.getDenominatorDescription() );
- match.setDenominatorAggregationOperator( object.getDenominatorAggregationOperator() );
match.setLastUpdated( object.getLastUpdated() );
indicatorService.updateIndicator( match );
@@ -133,19 +131,11 @@
{
return false;
}
- if ( !isSimiliar( object.getNumeratorAggregationOperator(), existing.getNumeratorAggregationOperator() ) || ( isNotNull( object.getNumeratorAggregationOperator(), existing.getNumeratorAggregationOperator() ) && !object.getNumeratorAggregationOperator().equals( existing.getNumeratorAggregationOperator() ) ) )
- {
- return false;
- }
if ( !isSimiliar( object.getDenominatorDescription(), existing.getDenominatorDescription() ) || ( isNotNull( object.getDenominatorDescription(), existing.getDenominatorDescription() ) && !object.getDenominatorDescription().equals( existing.getDenominatorDescription() ) ) )
{
return false;
}
- if ( !isSimiliar( object.getDenominatorAggregationOperator(), existing.getDenominatorAggregationOperator() ) || ( isNotNull( object.getDenominatorAggregationOperator(), existing.getDenominatorAggregationOperator() ) && !object.getDenominatorAggregationOperator().equals( existing.getDenominatorAggregationOperator() ) ) )
- {
- return false;
- }
-
+
return true;
}
}
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfA.xml'
--- dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfA.xml 2010-12-05 17:38:27 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfA.xml 2011-09-24 11:35:11 +0000
@@ -258,10 +258,8 @@
<indicatorType>65</indicatorType>
<numerator>Numerator</numerator>
<numeratorDescription>NumeratorDescription</numeratorDescription>
- <numeratorAggregationOperator>sum</numeratorAggregationOperator>
<denominator>Denominator</denominator>
<denominatorDescription>DenominatorDescription</denominatorDescription>
- <denominatorAggregationOperator>sum</denominatorAggregationOperator>
</indicator>
<indicator>
<id>66</id>
@@ -275,10 +273,8 @@
<indicatorType>65</indicatorType>
<numerator>Numerator</numerator>
<numeratorDescription>NumeratorDescription</numeratorDescription>
- <numeratorAggregationOperator>sum</numeratorAggregationOperator>
<denominator>Denominator</denominator>
<denominatorDescription>DenominatorDescription</denominatorDescription>
- <denominatorAggregationOperator>sum</denominatorAggregationOperator>
</indicator>
<indicator>
<id>67</id>
@@ -292,10 +288,8 @@
<indicatorType>65</indicatorType>
<numerator>Numerator</numerator>
<numeratorDescription>NumeratorDescription</numeratorDescription>
- <numeratorAggregationOperator>sum</numeratorAggregationOperator>
<denominator>Denominator</denominator>
<denominatorDescription>DenominatorDescription</denominatorDescription>
- <denominatorAggregationOperator>sum</denominatorAggregationOperator>
</indicator>
</indicators>
<indicatorGroups>
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfA.zip'
Binary files dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfA.zip 2010-12-05 17:38:27 +0000 and dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfA.zip 2011-09-24 11:35:11 +0000 differ
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfB.xml'
--- dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfB.xml 2010-12-05 17:38:27 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfB.xml 2011-09-24 11:35:11 +0000
@@ -368,10 +368,8 @@
<indicatorType>65</indicatorType>
<numerator>Numerator</numerator>
<numeratorDescription>NumeratorDescription</numeratorDescription>
- <numeratorAggregationOperator>sum</numeratorAggregationOperator>
<denominator>Denominator</denominator>
<denominatorDescription>DenominatorDescription</denominatorDescription>
- <denominatorAggregationOperator>sum</denominatorAggregationOperator>
</indicator>
<indicator>
<id>66</id>
@@ -402,10 +400,8 @@
<indicatorType>65</indicatorType>
<numerator>Numerator</numerator>
<numeratorDescription>NumeratorDescription</numeratorDescription>
- <numeratorAggregationOperator>sum</numeratorAggregationOperator>
<denominator>Denominator</denominator>
<denominatorDescription>DenominatorDescription</denominatorDescription>
- <denominatorAggregationOperator>sum</denominatorAggregationOperator>
</indicator>
<indicator>
<id>68</id>
@@ -419,10 +415,8 @@
<indicatorType>65</indicatorType>
<numerator>Numerator</numerator>
<numeratorDescription>NumeratorDescription</numeratorDescription>
- <numeratorAggregationOperator>sum</numeratorAggregationOperator>
<denominator>Denominator</denominator>
<denominatorDescription>DenominatorDescription</denominatorDescription>
- <denominatorAggregationOperator>sum</denominatorAggregationOperator>
</indicator>
<indicator>
<id>69</id>
@@ -436,10 +430,8 @@
<indicatorType>65</indicatorType>
<numerator>Numerator</numerator>
<numeratorDescription>NumeratorDescription</numeratorDescription>
- <numeratorAggregationOperator>sum</numeratorAggregationOperator>
<denominator>Denominator</denominator>
<denominatorDescription>DenominatorDescription</denominatorDescription>
- <denominatorAggregationOperator>sum</denominatorAggregationOperator>
</indicator>
</indicators>
<indicatorGroups>
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfC.xml'
--- dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfC.xml 2010-12-05 17:38:27 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfC.xml 2011-09-24 11:35:11 +0000
@@ -368,10 +368,8 @@
<indicatorType>65</indicatorType>
<numerator>Numerator</numerator>
<numeratorDescription>NumeratorDescription</numeratorDescription>
- <numeratorAggregationOperator>sum</numeratorAggregationOperator>
<denominator>Denominator</denominator>
<denominatorDescription>DenominatorDescription</denominatorDescription>
- <denominatorAggregationOperator>sum</denominatorAggregationOperator>
</indicator>
<indicator>
<id>66</id>
@@ -385,10 +383,8 @@
<indicatorType>65</indicatorType>
<numerator>Numerator</numerator>
<numeratorDescription>NumeratorDescription</numeratorDescription>
- <numeratorAggregationOperator>sum</numeratorAggregationOperator>
<denominator>Denominator</denominator>
<denominatorDescription>DenominatorDescription</denominatorDescription>
- <denominatorAggregationOperator>sum</denominatorAggregationOperator>
</indicator>
<indicator>
<id>67</id>
@@ -402,10 +398,8 @@
<indicatorType>65</indicatorType>
<numerator>Numerator</numerator>
<numeratorDescription>NumeratorDescription</numeratorDescription>
- <numeratorAggregationOperator>sum</numeratorAggregationOperator>
<denominator>Denominator</denominator>
<denominatorDescription>DenominatorDescription</denominatorDescription>
- <denominatorAggregationOperator>sum</denominatorAggregationOperator>
</indicator>
<indicator>
<id>68</id>
@@ -419,10 +413,8 @@
<indicatorType>65</indicatorType>
<numerator>Numerator</numerator>
<numeratorDescription>NumeratorDescription</numeratorDescription>
- <numeratorAggregationOperator>sum</numeratorAggregationOperator>
<denominator>Denominator</denominator>
<denominatorDescription>DenominatorDescription</denominatorDescription>
- <denominatorAggregationOperator>sum</denominatorAggregationOperator>
</indicator>
<indicator>
<id>69</id>
@@ -436,10 +428,8 @@
<indicatorType>65</indicatorType>
<numerator>Numerator</numerator>
<numeratorDescription>NumeratorDescription</numeratorDescription>
- <numeratorAggregationOperator>sum</numeratorAggregationOperator>
<denominator>Denominator</denominator>
<denominatorDescription>DenominatorDescription</denominatorDescription>
- <denominatorAggregationOperator>sum</denominatorAggregationOperator>
</indicator>
</indicators>
<indicatorGroups>
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorBatchHandler.java 2011-01-17 17:03:05 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorBatchHandler.java 2011-09-24 11:35:11 +0000
@@ -102,10 +102,8 @@
statementBuilder.setColumn( "indicatortypeid" );
statementBuilder.setColumn( "numerator" );
statementBuilder.setColumn( "numeratordescription" );
- statementBuilder.setColumn( "numeratoraggregationtype" );
statementBuilder.setColumn( "denominator" );
statementBuilder.setColumn( "denominatordescription" );
- statementBuilder.setColumn( "denominatoraggregationtype" );
statementBuilder.setColumn( "sortorder" );
statementBuilder.setColumn( "lastupdated" );
}
@@ -122,10 +120,8 @@
statementBuilder.setValue( indicator.getIndicatorType().getId() );
statementBuilder.setValue( indicator.getNumerator() );
statementBuilder.setValue( indicator.getNumeratorDescription() );
- statementBuilder.setValue( indicator.getNumeratorAggregationOperator() );
statementBuilder.setValue( indicator.getDenominator() );
statementBuilder.setValue( indicator.getDenominatorDescription() );
- statementBuilder.setValue( indicator.getDenominatorAggregationOperator() );
statementBuilder.setValue( indicator.getSortOrder() );
statementBuilder.setValue( indicator.getLastUpdated() );
}
=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ExcelUtils.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ExcelUtils.java 2011-03-12 10:25:49 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ExcelUtils.java 2011-09-24 11:35:11 +0000
@@ -143,14 +143,10 @@
sheet.addCell( new Label( column++, row, getType().get( indicator.getIndicatorType().getName() ), format ) );
sheet.addCell( new Label( column++, row, indicator.getNumeratorDescription(), format ) );
- sheet.addCell( new Label( column++, row, i18n.getString( getAggregationOperator().get(
- indicator.getNumeratorAggregationOperator() ) ), format ) );
sheet.addCell( new Label( column++, row,
expressionService.getExpressionDescription( indicator.getNumerator() ), format ) );
sheet.addCell( new Label( column++, row, indicator.getDenominatorDescription(), format ) );
- sheet.addCell( new Label( column++, row, i18n.getString( getAggregationOperator().get(
- indicator.getDenominatorAggregationOperator() ) ), format ) );
sheet.addCell( new Label( column++, row, expressionService
.getExpressionDescription( indicator.getDenominator() ), format ) );
}
=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/PDFUtils.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/PDFUtils.java 2011-09-14 03:44:56 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/PDFUtils.java 2011-09-24 11:35:11 +0000
@@ -473,24 +473,12 @@
table.addCell( getItalicCell( i18n.getString( "numerator_description" ) ) );
table.addCell( getTextCell( indicator.getNumeratorDescription() ) );
- if ( nullIfEmpty( indicator.getNumeratorAggregationOperator() ) != null )
- {
- table.addCell( getItalicCell( i18n.getString( "numerator_aggregation_operator" ) ) );
- table.addCell( getTextCell( i18n.getString( getAggregationOperator().get( indicator.getNumeratorAggregationOperator() ) ) ) );
- }
-
table.addCell( getItalicCell( i18n.getString( "numerator_formula" ) ) );
table.addCell( getTextCell( expressionService.getExpressionDescription( indicator.getNumerator() ) ) );
table.addCell( getItalicCell( i18n.getString( "denominator_description" ) ) );
table.addCell( getTextCell( indicator.getDenominatorDescription() ) );
- if ( nullIfEmpty( indicator.getDenominatorAggregationOperator() ) != null )
- {
- table.addCell( getItalicCell( i18n.getString( "denominator_aggregation_operator" ) ) );
- table.addCell( getTextCell( i18n.getString( getAggregationOperator().get( indicator.getDenominatorAggregationOperator() ) ) ) );
- }
-
table.addCell( getItalicCell( i18n.getString( "denominator_formula" ) ) );
table.addCell( getTextCell( expressionService.getExpressionDescription( indicator.getDenominator() ) ) );
=== modified file 'dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java'
--- dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java 2011-09-02 11:25:37 +0000
+++ dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java 2011-09-24 11:35:11 +0000
@@ -513,10 +513,8 @@
indicator.setIndicatorType( type );
indicator.setNumerator( "Numerator" );
indicator.setNumeratorDescription( "NumeratorDescription" );
- indicator.setNumeratorAggregationOperator( DataElement.AGGREGATION_OPERATOR_SUM );
indicator.setDenominator( "Denominator" );
indicator.setDenominatorDescription( "DenominatorDescription" );
- indicator.setDenominatorAggregationOperator( DataElement.AGGREGATION_OPERATOR_SUM );
return indicator;
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/AddIndicatorAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/AddIndicatorAction.java 2011-09-22 10:32:21 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/AddIndicatorAction.java 2011-09-24 11:35:11 +0000
@@ -135,13 +135,6 @@
this.numeratorDescription = numeratorDescription;
}
- private String numeratorAggregationOperator;
-
- public void setNumeratorAggregationOperator( String numeratorAggregationOperator )
- {
- this.numeratorAggregationOperator = numeratorAggregationOperator;
- }
-
private String denominator;
public void setDenominator( String denominator )
@@ -156,13 +149,6 @@
this.denominatorDescription = denominatorDescription;
}
- private String denominatorAggregationOperator;
-
- public void setDenominatorAggregationOperator( String denominatorAggregationOperator )
- {
- this.denominatorAggregationOperator = denominatorAggregationOperator;
- }
-
private List<String> jsonAttributeValues;
public void setJsonAttributeValues( List<String> jsonAttributeValues )
@@ -205,10 +191,8 @@
indicator.setUrl( url );
indicator.setNumerator( numerator );
indicator.setNumeratorDescription( numeratorDescription );
- indicator.setNumeratorAggregationOperator( numeratorAggregationOperator );
indicator.setDenominator( denominator );
indicator.setDenominatorDescription( denominatorDescription );
- indicator.setDenominatorAggregationOperator( denominatorAggregationOperator );
if ( jsonAttributeValues != null )
{
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/UpdateIndicatorAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/UpdateIndicatorAction.java 2011-09-22 10:32:21 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/UpdateIndicatorAction.java 2011-09-24 11:35:11 +0000
@@ -142,13 +142,6 @@
this.numeratorDescription = numeratorDescription;
}
- private String numeratorAggregationOperator;
-
- public void setNumeratorAggregationOperator( String numeratorAggregationOperator )
- {
- this.numeratorAggregationOperator = numeratorAggregationOperator;
- }
-
private String denominator;
public void setDenominator( String denominator )
@@ -163,13 +156,6 @@
this.denominatorDescription = denominatorDescription;
}
- private String denominatorAggregationOperator;
-
- public void setDenominatorAggregationOperator( String denominatorAggregationOperator )
- {
- this.denominatorAggregationOperator = denominatorAggregationOperator;
- }
-
private List<String> jsonAttributeValues;
public void setJsonAttributeValues( List<String> jsonAttributeValues )
@@ -212,10 +198,8 @@
indicator.setUrl( url );
indicator.setNumerator( numerator );
indicator.setNumeratorDescription( numeratorDescription );
- indicator.setNumeratorAggregationOperator( numeratorAggregationOperator );
indicator.setDenominator( denominator );
indicator.setDenominatorDescription( denominatorDescription );
- indicator.setDenominatorAggregationOperator( denominatorAggregationOperator );
if ( jsonAttributeValues != null )
{
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorForm.vm 2011-09-21 12:46:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorForm.vm 2011-09-24 11:35:11 +0000
@@ -23,14 +23,9 @@
<h3>$i18n.getString( "create_new_indicator" )</h3>
<form id="addIndicatorForm" action="addIndicator.action" method="post" >
-<div>
-
- <input type="hidden" id="numeratorDescription" name="numeratorDescription"/>
- <input type="hidden" id="numeratorAggregationOperator" name="numeratorAggregationOperator"/>
-
- <input type="hidden" id="denominatorDescription" name="denominatorDescription" value=""/>
- <input type="hidden" id="denominatorAggregationOperator" name="denominatorAggregationOperator" value="sum"/>
-</div>
+
+<input type="hidden" id="numeratorDescription" name="numeratorDescription"/>
+<input type="hidden" id="denominatorDescription" name="denominatorDescription" value=""/>
<table>
<tr>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorForm.vm 2011-09-21 12:46:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorForm.vm 2011-09-24 11:35:11 +0000
@@ -23,15 +23,9 @@
<form id="updateIndicatorForm" action="updateIndicator.action" method="post" >
-<div>
- <input type="hidden" id="id" name="id" value="$indicator.id"/>
-
- <input type="hidden" id="numeratorDescription" name="numeratorDescription" value="$!indicator.numeratorDescription"/>
- <input type="hidden" id="numeratorAggregationOperator" name="numeratorAggregationOperator" value="$!indicator.numeratorAggregationOperator"/>
-
- <input type="hidden" id="denominatorDescription" name="denominatorDescription" value="$!indicator.denominatorDescription"/>
- <input type="hidden" id="denominatorAggregationOperator" name="denominatorAggregationOperator" value="$!indicator.denominatorAggregationOperator"/>
-</div>
+<input type="hidden" id="id" name="id" value="$indicator.id"/>
+<input type="hidden" id="numeratorDescription" name="numeratorDescription" value="$!indicator.numeratorDescription"/>
+<input type="hidden" id="denominatorDescription" name="denominatorDescription" value="$!indicator.denominatorDescription"/>
<table>
<tr>
