dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7872
committer: Magnus Korvald <korvald@xxxxxxxxxxx>
branch nick: trunk
timestamp: Tue 2012-08-07 10:29:20 +0200
message:
  Removed code that was commented out...
modified:
  dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/utils/FormUtils.java
  dhis-2/dhis-web/dhis-web-sms/src/main/resources/META-INF/dhis/beans.xml


--
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-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/utils/FormUtils.java'
--- dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/utils/FormUtils.java	2012-08-07 06:42:24 +0000
+++ dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/utils/FormUtils.java	2012-08-07 08:29:20 +0000
@@ -35,7 +35,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.Validate;
 import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
 import org.hisp.dhis.dataanalysis.DataAnalysisService;
@@ -49,16 +48,14 @@
 import org.hisp.dhis.expression.ExpressionService;
 import org.hisp.dhis.minmax.MinMaxDataElement;
 import org.hisp.dhis.minmax.MinMaxDataElementService;
-//import org.hisp.dhis.minmax.validation.MinMaxValuesGenerationService;
-import org.hisp.dhis.setting.SystemSettingManager;
 import org.hisp.dhis.organisationunit.OrganisationUnit;
 import org.hisp.dhis.organisationunit.OrganisationUnitService;
 import org.hisp.dhis.period.CalendarPeriodType;
 import org.hisp.dhis.period.Period;
+import org.hisp.dhis.setting.SystemSettingManager;
 import org.hisp.dhis.system.filter.OrganisationUnitWithDataSetsFilter;
 import org.hisp.dhis.system.filter.PastAndCurrentPeriodFilter;
 import org.hisp.dhis.system.util.FilterUtils;
-import org.hisp.dhis.system.util.ListUtils;
 import org.hisp.dhis.user.CurrentUserService;
 import org.hisp.dhis.user.User;
 import org.hisp.dhis.user.UserCredentials;
@@ -128,13 +125,6 @@
         this.systemSettingManager = systemSettingManager;
     }
 
-//    private MinMaxValuesGenerationService minMaxValuesGenerationService;
-//
-//    public void setMinMaxValuesGenerationService( MinMaxValuesGenerationService minMaxValuesGenerationService )
-//    {
-//        this.minMaxValuesGenerationService = minMaxValuesGenerationService;
-//    }
-
     private MinMaxDataElementService minMaxDataElementService;
 
     public void setMinMaxDataElementService( MinMaxDataElementService minMaxDataElementService )
@@ -170,32 +160,6 @@
             dataElements );
         Collection<DeflatedDataValue> deflatedDataValues;
 
-        if ( minmaxs == null )
-        {
-            Double factor = (Double) systemSettingManager.getSystemSetting(
-                SystemSettingManager.KEY_FACTOR_OF_DEVIATION, 2.0 );
-
-//            Collection<DeflatedDataValue> stdDevs = stdDevOutlierAnalysisService.analyse( organisationUnit,
-//                dataElements, ListUtils.getCollection( period ), factor );
-//
-//            Collection<DeflatedDataValue> minMaxs = minMaxOutlierAnalysisService.analyse( organisationUnit,
-//                dataElements, ListUtils.getCollection( period ), null );
-
-//            deflatedDataValues = CollectionUtils.union( stdDevs, minMaxs );
-        }
-        else
-        {
-//            deflatedDataValues = minMaxValuesGenerationService.findOutliers( organisationUnit,
-//                ListUtils.getCollection( period ), minmaxs );
-        }
-
-//        for ( DeflatedDataValue deflatedDataValue : deflatedDataValues )
-//        {
-//            String key = String.format( "DE%dOC%d", deflatedDataValue.getDataElementId(),
-//                deflatedDataValue.getCategoryOptionComboId() );
-//            validationErrorMap.put( key, deflatedDataValue );
-//        }
-
         return validationErrorMap;
     }
 

=== modified file 'dhis-2/dhis-web/dhis-web-sms/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-sms/src/main/resources/META-INF/dhis/beans.xml	2012-08-07 07:09:10 +0000
+++ dhis-2/dhis-web/dhis-web-sms/src/main/resources/META-INF/dhis/beans.xml	2012-08-07 08:29:20 +0000
@@ -46,8 +46,6 @@
 			ref="org.hisp.dhis.dataanalysis.StdDevOutlierAnalysisService"/>
 		<property name="minMaxOutlierAnalysisService"
 			ref="org.hisp.dhis.dataanalysis.MinMaxOutlierAnalysisService"/>
-<!--		<property name="minMaxValuesGenerationService"
-			ref="org.hisp.dhis.minmax.validation.MinMaxValuesGenerationService"/> -->
 		<property name="minMaxDataElementService"
 			ref="org.hisp.dhis.minmax.MinMaxDataElementService"/>
 		<property name="systemSettingManager"