dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 5641
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2011-12-29 11:40:04 +0100
message:
  (mobile) validation fixes
modified:
  dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dataentry/action/SaveSectionFormAction.java
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dataEntryOverview.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/dataentry/action/SaveSectionFormAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dataentry/action/SaveSectionFormAction.java	2011-12-27 13:06:26 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dataentry/action/SaveSectionFormAction.java	2011-12-29 10:40:04 +0000
@@ -209,13 +209,6 @@
         return validationViolations;
     }
 
-    private List<String> validationRuleViolations = new ArrayList<String>();
-
-    public List<String> getValidationRuleViolations()
-    {
-        return validationRuleViolations;
-    }
-
     private Map<String, String> typeViolations = new HashMap<String, String>();
 
     public Map<String, String> getTypeViolations()
@@ -454,10 +447,8 @@
 
         validationViolations = formUtils.getValidationViolations( organisationUnit, dataElements, period );
 
-        validationRuleViolations = formUtils.getValidationRuleViolations( organisationUnit, dataSet, period );
-
         if ( needsValidation
-            && (!validationViolations.isEmpty() || !validationRuleViolations.isEmpty() || !typeViolations.isEmpty()) )
+            && (!validationViolations.isEmpty() || !typeViolations.isEmpty()) )
         {
             return ERROR;
         }

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dataEntryOverview.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dataEntryOverview.vm	2011-12-27 12:16:47 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dataEntryOverview.vm	2011-12-29 10:40:04 +0000
@@ -9,7 +9,7 @@
 
 #if( $validationRuleViolations.size() > 0 )
 <div class="header-box" align="center">
-    <h3 style="text-align: left; background-color: #990000; color: white;">$i18n.getString("validation_rule_violations")</h3>
+    <h3 style="text-align: left; background-color: #990000; color: white;">$i18n.getString("validation_rule_violation_warnings")</h3>
     <p style="text-align: left;">
         #foreach( $validationRuleViolation in $validationRuleViolations )
             $validationRuleViolation <br />