------------------------------------------------------------
revno: 8320
committer: Lars Helge Øverland <[email protected]>
branch nick: dhis2
timestamp: Mon 2012-10-01 15:09:49 +0200
message:
Minor fix to default data set reports
modified:
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/datasetreport/impl/DefaultDataSetReportService.java
resources/sql/integritychecks.sql
--
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-reporting/src/main/java/org/hisp/dhis/datasetreport/impl/DefaultDataSetReportService.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/datasetreport/impl/DefaultDataSetReportService.java 2012-07-19 19:20:26 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/datasetreport/impl/DefaultDataSetReportService.java 2012-10-01 13:09:49 +0000
@@ -282,7 +282,7 @@
value = valueMap.get( dataElement.getId() + SEPARATOR + optionCombo.getId() );
}
- grid.addValue( format.formatValue( value ) );
+ grid.addValue( value );
}
}
@@ -301,7 +301,7 @@
Double value = indicatorValueMap.get( String.valueOf( indicator.getId() ) );
- grid.addValue( format.formatValue( value ) );
+ grid.addValue( value );
for ( int i = 0; i < orderedOptionCombos.size() - 1; i++ )
{
=== modified file 'resources/sql/integritychecks.sql'
--- resources/sql/integritychecks.sql 2012-07-26 15:00:19 +0000
+++ resources/sql/integritychecks.sql 2012-10-01 13:09:49 +0000
@@ -91,9 +91,9 @@
drop index aggregateddatavalue_index;
drop index aggregatedindicatorvalue_index;
drop index aggregateddatasetcompleteness_index;
-create index aggregateddatavalue_index on aggregateddatavalue (dataelementid, categoryoptioncomboid, periodid, organisationunitid);
-create index aggregatedindicatorvalue_index on aggregatedindicatorvalue (indicatorid, periodid, organisationunitid);
-create index aggregateddatasetcompleteness_index on aggregateddatasetcompleteness (datasetid, periodid, organisationunitid);
+create index aggregateddatavalue_index on aggregateddatavalue (dataelementid, periodid, organisationunitid, categoryoptioncomboid, value);
+create index aggregatedindicatorvalue_index on aggregatedindicatorvalue (indicatorid, periodid, organisationunitid, value);
+create index aggregateddatasetcompleteness_index on aggregateddatasetcompleteness (datasetid, periodid, organisationunitid, value);
-- Get category option combos without category options
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
