dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1651
committer: Lars Helge Oeverland <larshelge@xxxxxxxxx>
branch nick: trunk
timestamp: Mon 2010-03-15 19:41:17 +0100
message:
  Validation errors will not prohibit the complete button
modified:
  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/resources/org/hisp/dhis/de/i18n_module.properties
  dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js


--
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-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	2010-03-15 12:08:51 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/ValidationAction.java	2010-03-15 18:41:17 +0000
@@ -179,7 +179,7 @@
         results = new ArrayList<ValidationResult>( validationRuleService.validate( dataSet, period, orgUnit ) );
 
         log.info( "Number of validation violations: " + results.size() );
-                
+        
         if ( results.size()> 0 )
         {
             leftsideFormulaMap = new HashMap<Integer, String>( results.size() );

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties	2010-03-15 12:08:51 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties	2010-03-15 18:41:17 +0000
@@ -79,7 +79,7 @@
 validation_result					= Validation Result
 expression							= Expression
 successful_validation				= The data entry screen successfully passed validation
-unsuccessful_validation				= The data entry screen has validation errors, please fix these errors before proceeding
+unsuccessful_validation				= The data entry screen has validation errors, please correct these before proceeding
 the_following_values_violates_rules = The following values violates validation rules
 the_following_values_are_outliers   = The following values are considered as outliers (min-max or std dev)
 value								= Value

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js	2009-12-23 07:35:17 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js	2010-03-15 18:41:17 +0000
@@ -276,20 +276,18 @@
 {
     var type = messageElement.getAttribute( 'type' );
     
-    if ( type == "none" )
-    {
-        var date = document.getElementById( "dateField" ).value;
-    
-        var url = "registerCompleteDataSet.action?date=" + date;
-    
-        var request = new Request();
-        request.setCallbackSuccess( registerReceived );
-        request.send( url );
-    }
-    else
-    {
-        window.open( 'validate.action', '_blank', 'width=800, height=400, scrollbars=yes, resizable=yes' );
-    }
+    if ( type != "none" )
+    {
+    	window.open( 'validate.action', '_blank', 'width=800, height=400, scrollbars=yes, resizable=yes' );
+    }
+    
+    var date = document.getElementById( "dateField" ).value;
+
+    var url = "registerCompleteDataSet.action?date=" + date;
+
+    var request = new Request();
+    request.setCallbackSuccess( registerReceived );
+    request.send( url );
 }
 
 function registerReceived( messageElement )