dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3323
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2011-04-08 14:10:37 +0200
message:
  Reduced log level
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/minmax/validation/DefaultMinMaxValuesGenerationService.java
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/FacilityReportingServiceImpl.java
  dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/ValidationAction.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-services/dhis-service-core/src/main/java/org/hisp/dhis/minmax/validation/DefaultMinMaxValuesGenerationService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/minmax/validation/DefaultMinMaxValuesGenerationService.java	2010-04-29 04:33:47 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/minmax/validation/DefaultMinMaxValuesGenerationService.java	2011-04-08 12:10:37 +0000
@@ -108,7 +108,6 @@
     public Collection<DeflatedDataValue> findOutliers( OrganisationUnit organisationUnit, Collection<Period> periods,
         Collection<MinMaxDataElement> minMaxDataElements )
     {
-
         Set<DeflatedDataValue> result = new HashSet<DeflatedDataValue>();
 
         for ( MinMaxDataElement minMaxs : minMaxDataElements )

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/FacilityReportingServiceImpl.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/FacilityReportingServiceImpl.java	2011-04-03 10:25:42 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/FacilityReportingServiceImpl.java	2011-04-08 12:10:37 +0000
@@ -262,7 +262,6 @@
     public void saveDataSetValues( OrganisationUnit unit, DataSetValue dataSetValue )
         throws NotAllowedException
     {
-
         org.hisp.dhis.dataset.DataSet dataSet = dataSetService.getDataSet( dataSetValue.getId() );
 
         if ( !dataSetAssociatedWithOrgUnit( unit, dataSet ) )
@@ -297,7 +296,7 @@
 
             if ( emptyString( dataValue.getValue() ) )
             {
-                log.info( "Empty data value for data element " + dataValue.getId() + " not saved" );
+                log.debug( "Empty data value for data element " + dataValue.getId() + " not saved" );
                 continue;
             }
 
@@ -365,7 +364,6 @@
             dataValue.setTimestamp( new Date() );
             dataValueService.updateDataValue( dataValue );
         }
-
     }
 
     // -------------------------------------------------------------------------
@@ -374,9 +372,7 @@
 
     private boolean dataSetLocked( OrganisationUnit unit, org.hisp.dhis.dataset.DataSet dataSet, Period selectedPeriod )
     {
-        if ( dataSetLockService.getDataSetLockByDataSetPeriodAndSource( dataSet, selectedPeriod, unit ) != null )
-            return true;
-        return false;
+        return dataSetLockService.getDataSetLockByDataSetPeriodAndSource( dataSet, selectedPeriod, unit ) != null;
     }
 
     private boolean emptyString( String value )
@@ -455,5 +451,4 @@
     {
         this.registrationService = registrationService;
     }
-
 }

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/ValidationAction.java'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/ValidationAction.java	2011-02-01 20:58:31 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/ValidationAction.java	2011-04-08 12:10:37 +0000
@@ -192,8 +192,7 @@
             Collection<MinMaxDataElement> minmaxs = minMaxDataElementService.getMinMaxDataElements( orgUnit, dataSet.getDataElements() );
             
             if ( minmaxs == null )
-            {
-    
+            {    
                 Double factor = (Double) systemSettingManager.getSystemSetting(
                     SystemSettingManager.KEY_FACTOR_OF_DEVIATION, 2.0 );