dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 19115
committer: Abyot Asalefew Gizaw <abyota@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2015-05-08 22:12:05 +0200
message:
  minor: back button to tei list in relationship assignment
modified:
  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/relationship-controller.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/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-04-09 12:36:37 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/add-relationship.html	2015-05-08 20:12:05 +0000
@@ -47,6 +47,7 @@
                 <option>{{relationship.selected.bIsToA}}</option>
             </select>
             <div class='relationship-container' ng-show="teiForRelationship">
+                <button class="btn btn-warning" type="button" ng-click="back()">{{'back' | translate}}</button>
                 <table class="table table-striped table-compact table-borderless">
                     <tr ng-repeat="gridColumn in gridColumns">
                         <td>
@@ -56,7 +57,7 @@
                             {{teiForRelationship[gridColumn.id]}}                                                
                         </td> 
                     </tr>
-                </table>
+                </table>                
             </div>
             <div class='relationship-container' ng-show="!teiForRelationship">
 

=== 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-05-08 18:38:58 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/relationship-controller.js	2015-05-08 20:12:05 +0000
@@ -493,6 +493,12 @@
         $rootScope.showAddRelationshipDiv = !$rootScope.showAddRelationshipDiv;
     };
     
+    
+    $scope.back = function(){
+        $scope.teiForRelationship = null;
+        $rootScope.showAddRelationshipDiv = !$rootScope.showAddRelationshipDiv;
+    };
+    
     $scope.addRelationship = function(){
         if($scope.selectedTei && $scope.teiForRelationship && $scope.relationship.selected){            
             var tei = angular.copy($scope.selectedTei);