dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 21652
committer: Markus Bekken <markus.bekken@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2016-01-07 20:39:37 +0100
message:
  Do not automatically run rules again as an effect of rule update
modified:
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.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-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js	2016-01-07 10:59:31 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js	2016-01-07 19:39:37 +0000
@@ -180,7 +180,7 @@
 
                             //Blank out the value:
                             affectedEvent[effect.dataElement.id] = "";
-                            $scope.saveDatavalueForEvent($scope.prStDes[effect.dataElement.id], null, affectedEvent);
+                            $scope.saveDataValueForEvent($scope.prStDes[effect.dataElement.id], null, affectedEvent, true);
                         }
 
                         if(effect.ineffect) {
@@ -238,7 +238,7 @@
                         var processedValue = $filter('trimquotes')(effect.data);
                         affectedEvent[effect.dataElement.id] = processedValue;
                         $scope.assignedFields[event][effect.dataElement.id] = true;
-                        $scope.saveDatavalueForEvent($scope.prStDes[effect.dataElement.id], null, affectedEvent);
+                        $scope.saveDataValueForEvent($scope.prStDes[effect.dataElement.id], null, affectedEvent, true);
                     }
                 }
             }
@@ -828,7 +828,7 @@
     };
 
     $scope.saveDatavalue = function (prStDe, field) {        
-        $scope.saveDatavalueForEvent(prStDe, field, $scope.currentEvent);
+        $scope.saveDataValueForEvent(prStDe, field, $scope.currentEvent, false);
     };
     
     $scope.saveDataValueForRadio = function(prStDe, event, value){
@@ -837,7 +837,7 @@
         
         event[prStDe.dataElement.id] = value;
         
-        var saveReturn = $scope.saveDatavalueForEvent(prStDe, null, event);
+        var saveReturn = $scope.saveDataValueForEvent(prStDe, null, event, false);
         if(angular.isDefined(saveReturn)){
             if(saveReturn === true){
                 def.resolve("saved");                
@@ -909,7 +909,7 @@
         var i = item;
     };
     
-    $scope.saveDatavalueForEvent = function (prStDe, field, eventToSave) {
+    $scope.saveDataValueForEvent = function (prStDe, field, eventToSave, suppressRulesExecution) {
         //Blank out the input-saved class on the last saved due date:
         $scope.eventDateSaved = false;
         $scope.currentElement = {id: prStDe.dataElement.id, pending: true, saved: false, failed: false, event: eventToSave.event};
@@ -962,8 +962,13 @@
 
                 $scope.currentStageEventsOriginal = angular.copy($scope.currentStageEvents);
 
-                //Run rules on updated data:
-                $scope.executeRules();                
+                //In some cases, the rules execution should be suppressed to avoid the 
+                //possibility of infinite loops(rules updating datavalues, that triggers a new 
+                //rule execution)
+                if(!suppressRulesExecution) {
+                    //Run rules on updated data:
+                    $scope.executeRules();
+                }
             });
 
         }