← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 12612: Validation rule. Displaying correct input fields according to rule type.

 

------------------------------------------------------------
revno: 12612
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2013-10-13 21:01:22 +0200
message:
  Validation rule. Displaying correct input fields according to rule type.
modified:
  dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/updateValidationRuleGroupForm.js
  dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/validationRule.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-validationrule/src/main/webapp/dhis-web-validationrule/javascript/updateValidationRuleGroupForm.js'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/updateValidationRuleGroupForm.js	2013-10-13 18:23:51 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/updateValidationRuleGroupForm.js	2013-10-13 19:01:22 +0000
@@ -1,6 +1,8 @@
 jQuery( document ).ready( function()
 {
     jQuery( "#name" ).focus();
+    
+    changeRuleType();
 
     validation2( 'updateValidationRuleGroupForm', function( form )
     {

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/validationRule.js'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/validationRule.js	2013-10-13 18:58:45 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/validationRule.js	2013-10-13 19:01:22 +0000
@@ -9,7 +9,8 @@
 		hideById( 'annualSampleCountTR');
 		hideById( 'highOutliersTR');
 		hideById( 'lowOutliersTR');
-	} else
+	} 
+	else
 	{
 		showById( 'organisationUnitLevelTR');
 		showById( 'sequentialSampleCountTR');