dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 21409
committer: Abyot Asalefew Gizaw <abyota@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2015-12-10 13:54:13 +0100
message:
  minor
modified:
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/home.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/scripts/controllers.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js	2015-12-04 08:34:15 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js	2015-12-10 12:54:13 +0000
@@ -62,6 +62,7 @@
         $scope.teiFetched = false;        
         $scope.queryUrl = null;
         $scope.programUrl = null;
+        $scope.enrollmentStatus = 'ALL'; 
         $scope.attributeUrl = {url: null, hasValue: false};
         $scope.pager = {pageSize: 50, page: 1, toolBarDisplay: 5};
     }
@@ -75,7 +76,8 @@
             
             SessionStorageService.set('SELECTED_OU', $scope.selectedOrgUnit);
             
-            $scope.trackedEntityList = null;
+            $scope.trackedEntityList = null;            
+            $scope.searchText = null;
             
             $scope.optionSets = CurrentSelection.getOptionSets();
             
@@ -170,6 +172,7 @@
         resetParams();
         $scope.selectedProgram = program;
         $scope.trackedEntityList = null;
+        $scope.searchText = null;
         $scope.processAttributes();              
     };
     
@@ -211,7 +214,7 @@
     };
    
     //$scope.searchParam = {bools: []};
-    $scope.search = function(mode){  
+    $scope.search = function(mode){
         resetParams();
         var grid = TEIGridService.generateGridColumns($scope.attributes, $scope.selectedOuMode.name);
         $scope.gridColumns = grid.columns;

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/home.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/home.html	2015-12-04 10:22:25 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/home.html	2015-12-10 12:54:13 +0000
@@ -141,7 +141,7 @@
         <div class="row">
             <div class="col-sm-12">
                 <span ng-if='!showRegistrationDiv'>
-                    <span class="btn-group" ng-if="selectedProgram && trackedEntityList.rows.length > 0 ">
+                    <span class="btn-group" ng-if="selectedProgram && teiFetched">
                         <label class="btn btn-default" ng-model="enrollmentStatus" btn-radio="'ALL'" title="{{allEnrollmentsLabel}}" ng-click='filterByEnrollmentStatus("ALL")'><i class="fa fa-list mouse-pointer"></i></label>
                         <label class="btn btn-default" ng-model="enrollmentStatus" btn-radio="'ACTIVE'" title="{{activeEnrollmentsLabel}}" ng-click='filterByEnrollmentStatus("ACTIVE")'><i class="fa fa-circle-o mouse-pointer"></i></label>
                         <label class="btn btn-default" ng-model="enrollmentStatus" btn-radio="'COMPLETED'" title="{{completedEnrollmentsLabel}}" ng-click='filterByEnrollmentStatus("COMPLETED")'><i class="fa fa-check mouse-pointer"></i></label>