dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #38117
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 19460: minor cleanup
------------------------------------------------------------
revno: 19460
committer: Markus Bekken <markus.bekken@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2015-06-19 08:01:29 +0200
message:
minor cleanup
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.services.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-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 22:58:05 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.services.js 2015-06-19 06:01:29 +0000
@@ -731,7 +731,7 @@
if(eval(variableValue)) {
variableValue = true;
}
- else {
+ else {
variableValue = false;
}
}
@@ -741,18 +741,6 @@
else{
$log.warn("unknown datatype:" + variableType);
}
-
-
- //Make sure that the variableValue does not contain a dollar sign anywhere
- //- this would potentially mess up later use of the variable:
-// if(angular.isDefined(variableValue)
-// && variableValue !== null
-// && variableValue.indexOf("$") !== -1 ) {
-// variableValue = variableValue.replace(/\\$/,"");
-// }
-
- //TODO:
- //Also clean away instructions that might be erroneusly evalutated in javascript
variables[variablename] = {
variableValue:variableValue,
@@ -763,7 +751,6 @@
TrackerRuleVariableFactory.getProgramRuleVariables(programid).then(function(programVariables){
- // The following section will need a different implementation for event capture:
var allEventsSorted = [];
var currentEvent = executingEvent;
var eventsSortedPerProgramStage = [];
@@ -781,12 +768,6 @@
allEventsSorted = orderByFilter(allEventsSorted, '-sortingDate').reverse();
var allDes = allDataElements;
-// angular.forEach($scope.programStages, function(programStage){
-// angular.forEach(programStage.programStageDataElements, function(dataElement) {
-// allDes[dataElement.dataElement.id] = dataElement;
-// });
-// });
- //End of region that neeeds specific implementation for event capture
angular.forEach(programVariables, function(programVariable) {
var valueFound = false;