dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #37273
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 19078: Minor
------------------------------------------------------------
revno: 19078
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2015-05-03 15:14:28 +0200
message:
Minor
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataanalysis/MinMaxDataAnalysisService.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataanalysis/MinMaxOutlierAnalysisService.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-api/src/main/java/org/hisp/dhis/dataanalysis/MinMaxDataAnalysisService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataanalysis/MinMaxDataAnalysisService.java 2015-05-03 12:08:13 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataanalysis/MinMaxDataAnalysisService.java 2015-05-03 13:14:28 +0000
@@ -38,5 +38,5 @@
extends DataAnalysisService
{
void generateMinMaxValues( Collection<OrganisationUnit> organisationUnits,
- Collection<DataElement> dataElements, Double stdDevFactor, Date from );
+ Collection<DataElement> dataElements, Double stdDevFactor );
}
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataanalysis/MinMaxOutlierAnalysisService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataanalysis/MinMaxOutlierAnalysisService.java 2015-05-03 12:08:13 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataanalysis/MinMaxOutlierAnalysisService.java 2015-05-03 13:14:28 +0000
@@ -51,6 +51,7 @@
import org.hisp.dhis.system.util.Filter;
import org.hisp.dhis.system.util.FilterUtils;
import org.hisp.dhis.system.util.MathUtils;
+import org.joda.time.DateTime;
import static org.hisp.dhis.dataelement.DataElement.*;
@@ -115,12 +116,14 @@
@Override
public void generateMinMaxValues( Collection<OrganisationUnit> organisationUnits,
- Collection<DataElement> dataElements, Double stdDevFactor, Date from )
+ Collection<DataElement> dataElements, Double stdDevFactor )
{
log.info( "Starting min-max value generation, no of data elements: " + dataElements.size() + ", no of org units: " + organisationUnits.size() );
Set<Integer> orgUnitIds = new HashSet<>( ConversionUtils.getIdentifiers( OrganisationUnit.class, organisationUnits ) );
+ Date from = new DateTime( 1, 1, 1, 1, 1 ).toDate();
+
minMaxDataElementService.removeMinMaxDataElements( dataElements, organisationUnits );
log.debug( "Deleted existing min-max values" );