=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/add-relationship.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/add-relationship.html 2015-02-24 13:10:51 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/add-relationship.html 2015-03-10 08:57:34 +0000
@@ -61,6 +61,7 @@
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/relationship-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/relationship-controller.js 2015-03-06 14:43:54 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/relationship-controller.js 2015-03-10 08:57:34 +0000
@@ -206,6 +206,7 @@
//set attributes as per selected program
$scope.setAttributesForSearch = function(program){
+
$scope.selectedProgramForRelative = program;
if( angular.isObject($scope.selectedProgramForRelative)){
AttributesFactory.getByProgram($scope.selectedProgramForRelative).then(function(atts){
@@ -251,8 +252,7 @@
$scope.teiForRelationship = relationshipInfo.tei;
});
- $scope.search = function(mode){
-
+ var resetFields = function(){
$scope.teiForRelationship = null;
$scope.teiFetched = false;
$scope.emptySearchText = false;
@@ -266,6 +266,20 @@
$scope.queryUrl = null;
$scope.programUrl = null;
$scope.attributeUrl = {url: null, hasValue: false};
+ };
+
+ $scope.getRelative = function(){
+
+ resetFields();
+
+ if($scope.selectedRelationshipSource.value === $scope.relationshipSources[0]){
+ $scope.search($scope.searchMode.listAll);
+ }
+ };
+
+ $scope.search = function(mode){
+
+ resetFields();
$scope.selectedSearchMode = mode;