Merge pull request #589 from SEED-platform/553-fix-selected-buildings

Fix 'unseen selected buildings' issue after filters are updated
SEED-platform · Dec 17, 2015 · 477fb20 · 477fb20
2 parents 0a15537 + 61eb3ca
commit 477fb20
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/seed/static/seed/js/controllers/building_list_controller.js b/seed/static/seed/js/controllers/building_list_controller.js
@@ -65,14 +65,20 @@ angular.module('BE.seed.controller.building_list', [])
     * SEARCH CODE
     */
 
-     $scope.do_update_buildings_filters = function(){
+    /* Called by 'Update Filters' click in buildings list UI */
+    $scope.do_update_buildings_filters = function(){
+        $scope.search.deselect_all_buildings();
         refresh_search();
     };
 
-    $scope.do_update_projects_filters = function(){
+    /* Called by 'Update Filters' click in projects buildings list UI */
+    $scope.do_update_project_buildings_filters = function(){
+        $scope.search.deselect_all_buildings();
         refresh_search();
     };
 
+    /*  private function to refresh search, called by UI event handlers
+        or internal methods */
     var refresh_search = function() {
         $scope.search.search_buildings();
     };

diff --git a/seed/static/seed/js/services/search_service.js b/seed/static/seed/js/services/search_service.js
@@ -354,6 +354,19 @@ angular.module('BE.seed.service.search', [])
      * end checkbox logic
      */
 
+     /** deselect_all_buildings: Force a deselection of all buildings
+     * 
+     */
+    search_service.deselect_all_buildings = function() {
+      var len = this.buildings.length;
+      for (var bldg_index = 0; bldg_index < len; bldg_index++) {
+        this.buildings[bldg_index].checked = false;
+      }
+      this.selected_buildings = [];
+      this.select_all_checkbox = false;
+    };
+
+
     /**
      * table columns logic
      */

diff --git a/seed/static/seed/partials/project_detail.html b/seed/static/seed/partials/project_detail.html
@@ -41,7 +41,7 @@ <h1><i class="fa fa-folder-o"></i>  {$ project.name $} ({$ search.number_matchin
                 <div class="btn-group" style="margin-left:20px;">
                     <button type="button" 
                             class="btn btn-primary btn-sm"
-                            ng-click="do_update_projects_filters()"  >
+                            ng-click="do_update_project_buildings_filters()"  >
                         Update Filters
                     </button>
                 </div>