=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js' --- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js 2014-05-20 15:56:10 +0000 +++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js 2014-05-21 10:05:20 +0000 @@ -745,25 +745,26 @@ if(event){ - $scope.currentEvent = event; + $scope.currentEvent = event; + $scope.currentEvent.providedElsewhere = []; $scope.currentEvent.dataValues = []; $scope.currentStage = storage.get($scope.currentEvent.programStage); angular.forEach($scope.currentStage.programStageDataElements, function(prStDe){ $scope.currentStage.programStageDataElements[prStDe.dataElement.id] = prStDe.dataElement; - //$scope.currentEvent.dataValues.push({value: '', dataElement: prStDe.dataElement.id, providedElsewhere: ''}); + if(prStDe.allowProvidedElsewhere){ + $scope.currentEvent.providedElsewhere[prStDe.dataElement.id] = ''; + } }); angular.forEach($scope.currentEvent.dataValues, function(dataValue){ var val = dataValue.value; var de = $scope.currentStage.programStageDataElements[dataValue.dataElement]; - if( de && de.type == 'int' && val){ + if( de && de.type === 'int' && val){ val = parseInt(val); dataValue.value = val; - } - - //$scope.currentEvent[dataValue.dataElement] = val; - }); + } + }); } }; }) === modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/dataentry.html' --- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/dataentry.html 2014-05-20 15:56:10 +0000 +++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/dataentry.html 2014-05-21 10:05:20 +0000 @@ -89,7 +89,7 @@ - +