=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/expressionBuilder.js' --- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/expressionBuilder.js 2015-09-08 15:56:00 +0000 +++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/expressionBuilder.js 2016-02-01 17:58:46 +0000 @@ -96,10 +96,10 @@ }, success: function( json, status, xhr ) { if ( 'OK' == json.status ) { - jQuery( "#formulaText").html( json.description ); + jQuery( "#formulaText" ).html( json.description ); } else { - jQuery( "#formulaText").html( json.message ); + jQuery( "#formulaText" ).html( json.message ); } } }); @@ -155,3 +155,19 @@ } }); } + +function clearRuleExpression() +{ + var description = $( "#leftSideDescription" ).val(); + $( "#leftSideExpression" ).val( "" ); + $( "#leftSideTextualExpression" ).val( "" ); + saveExpression( "left", description, "", "" ); + + description = $( "#rightSideDescription" ).val(); + $( "#rightSideExpression" ).val( "" ); + $( "#rightSideTextualExpression" ).val( "" ); + saveExpression( "right", description, "", "" ); + + enable( "ruleType" ); + enable( "periodTypeName" ); +}