dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 22289
committer: Abyot Asalefew Gizaw <abyot@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2016-03-14 10:08:02 +0100
message:
  tracker-capture: show relative selection selection/adding menu only when relationship is selected
modified:
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/teiadd/tei-add-controller.js
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/teiadd/tei-add.html


--
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/teiadd/tei-add-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/teiadd/tei-add-controller.js	2016-02-15 09:46:27 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/teiadd/tei-add-controller.js	2016-03-14 09:08:02 +0000
@@ -66,7 +66,7 @@
     $scope.orgUnitLabel = $translate.instant('org_unit');
     
     $scope.selectedRelationship = {};
-    $scope.relationship = {};
+    $scope.relationship = {selected: null};
     
     var invalidTeis = [];
     invalidTeis.push($scope.mainTei.trackedEntityInstance);

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/teiadd/tei-add.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/teiadd/tei-add.html	2016-02-15 10:16:24 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/teiadd/tei-add.html	2016-03-14 09:08:02 +0000
@@ -13,7 +13,7 @@
         </div>
     </div>
 
-    <div class="row">
+    <div class="row" ng-if="addingRelationship && relationship.selected || addingTeiAssociate">
         <hr ng-if="addingRelationship">
         <h3 ng-if="!addingRelationship && selectedTeiForDisplay">
             <span class='col-sm-12'>