dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 4692
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2011-09-26 20:53:05 +0200
message:
  minor changes in section form (mobile)
modified:
  dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/action/GetSectionFormAction.java
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dataEntry.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-web/dhis-web-light/src/main/java/org/hisp/dhis/light/action/GetSectionFormAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/action/GetSectionFormAction.java	2011-09-26 12:56:17 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/action/GetSectionFormAction.java	2011-09-26 18:53:05 +0000
@@ -29,7 +29,6 @@
 
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Map;
 
 import org.apache.commons.collections.CollectionUtils;
@@ -237,7 +236,8 @@
                     if ( dataValue != null )
                     {
                         value = dataValue.getValue();
-//                        validateDataElement( organisationUnit, dataElement, optionCombo, period, value );
+                        // validateDataElement( organisationUnit, dataElement,
+                        // optionCombo, period, value );
                     }
 
                     dataValues.put( key, value );
@@ -253,11 +253,10 @@
         return SUCCESS;
     }
 
+    @SuppressWarnings( "unchecked" )
     public void validateDataElement( OrganisationUnit organisationUnit, DataElement dataElement,
         DataElementCategoryOptionCombo optionCombo, Period period, String value )
     {
-        System.err.println( "====[ " + dataElement.getName() + " ]====" );
-
         Collection<DeflatedDataValue> outliers;
 
         MinMaxDataElement minMaxDataElement = minMaxDataElementService.getMinMaxDataElement( organisationUnit,
@@ -278,21 +277,14 @@
         }
         else
         {
-            System.err.println( "max: " + minMaxDataElement.getMax() );
-            System.err.println( "min: " + minMaxDataElement.getMin() );
-
             outliers = minMaxValuesGenerationService.findOutliers( organisationUnit, ListUtils.getCollection( period ),
                 ListUtils.getCollection( minMaxDataElement ) );
         }
 
-        System.out.println( "Found " + outliers.size() + " outliers." );
-
         for ( DeflatedDataValue deflatedDataValue : outliers )
         {
             System.err.println( "max: " + deflatedDataValue.getMax() );
             System.err.println( "min: " + deflatedDataValue.getMin() );
         }
-
-        System.err.println( "value: " + value );
     }
 }

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dataEntry.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dataEntry.vm	2011-09-26 12:56:17 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dataEntry.vm	2011-09-26 18:53:05 +0000
@@ -24,9 +24,6 @@
 
 <div class="header-box">
 	<p>
-		$complete
-		$validated
-
 		<input type="checkbox" id="complete" name="complete" value="true" #if($complete)checked="true"#end style="width: 15px;" />
 		<label for="complete">DataSet is complete</label>
 	</p>