=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/controllers.js' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/controllers.js 2015-06-17 11:50:16 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/controllers.js 2015-06-17 22:58:05 +0000 @@ -466,6 +466,11 @@ }); $scope.currentEventOriginialValue = angular.copy($scope.currentEvent); + //Blank out rule effects, as there is no rules in effect before the first + //time the rules is run on a new page. + $rootScope.ruleeffects[$scope.currentEvent.event] = {}; + + $scope.executeRules(); }; $scope.switchDataEntryForm = function(){ @@ -922,7 +927,6 @@ //Blank out the value: affectedEvent[effect.dataElement.id] = ""; - $scope.saveDatavalueForEvent($scope.prStDes[effect.dataElement.id],null,affectedEvent); } $scope.hiddenFields[effect.dataElement.id] = effect.ineffect; === modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.services.js' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.services.js 2015-06-17 11:50:16 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.services.js 2015-06-17 22:58:05 +0000 @@ -1099,7 +1099,7 @@ dataElement:action.dataElement, content:action.content, data:action.data, - ineffect:false + ineffect:undefined }; }