dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #43952
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 22295: minor
------------------------------------------------------------
revno: 22295
committer: Abyot Asalefew Gizaw <abyot@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2016-03-14 13:46:34 +0100
message:
minor
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/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-apps/src/main/webapp/dhis-web-tracker-capture/scripts/services.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/services.js 2016-03-10 17:04:25 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/services.js 2016-03-14 12:46:34 +0000
@@ -1553,7 +1553,7 @@
var entityList = {own: [], other: []};
- var attributes = CurrentSelection.getAttributesById();
+ var attributesById = CurrentSelection.getAttributesById();
angular.forEach(grid.rows, function(row){
if(invalidTeis.indexOf(row[0]) === -1 ){
@@ -1574,14 +1574,14 @@
isEmpty = false;
var val = row[i];
- if(attributes[grid.headers[i].name] &&
- attributes[grid.headers[i].name].optionSetValue &&
+ if(attributesById[grid.headers[i].name] &&
+ attributesById[grid.headers[i].name].optionSetValue &&
optionSets &&
- attributes[grid.headers[i].name].optionSet &&
- optionSets[attributes[grid.headers[i].name].optionSet.id] ){
- val = OptionSetService.getName(optionSets[attributes[grid.headers[i].name].optionSet.id].options, val);
+ attributesById[grid.headers[i].name].optionSet &&
+ optionSets[attributesById[grid.headers[i].name].optionSet.id] ){
+ val = OptionSetService.getName(optionSets[attributesById[grid.headers[i].name].optionSet.id].options, val);
}
- if(attributes[grid.headers[i].name] && attributes[grid.headers[i].name].valueType === 'date'){
+ if(attributesById[grid.headers[i].name] && attributesById[grid.headers[i].name].valueType === 'date'){
val = DateUtils.formatFromApiToUser( val );
}