Added live filtering of search

diff --git a/src/components/search/livesearch.ts b/src/components/search/livesearch.ts
index 256780205c245b09004976928bcce7d19ef871f8..60c364f799fa0bdf9c1d3e7dddbca2771c5d6165 100644 (file)
--- a/src/components/search/livesearch.ts
+++ b/src/components/search/livesearch.ts
@@ -35,7 +35,7 @@ export class LiveSearch {
             .subscribe(
                 zone.bind(orgunits => {
                     //this.filterUnits(orgunits)
-                    this.results.next(this.filterUnits(orgunits));
+                    this.results.next(orgunits/*this.filterUnits(orgunits)*/);
                 }),
                 zone.bind(err => {
                     console.log(err);
@@ -97,7 +97,6 @@ export class LiveSearch {
                     })
                 )
         }
-        console.log(filteredOrgunits);
         return filteredOrgunits;
     }
 }

diff --git a/src/components/search/search.html b/src/components/search/search.html
index 242625ded35d8514c2e681e17fff4a2f4a36e98c..eba08561dbdf981cc1ea55f0d3d27ccd22d6f7c4 100644 (file)
--- a/src/components/search/search.html
+++ b/src/components/search/search.html
@@ -16,9 +16,10 @@
          src="https://www.brown.edu/sites/default/themes/pawtuxet/img/loader-larger.gif">
 
 
-    <div  class="divresult" id="divresult" [hidden]="!orgunits.length">
-        <ul class="dropdown-menu result"  >
-            <li *ng-for="#orgunit of orgunits" (click)="getMoreInfo(orgunit)">
+
+    <div class="divresult" id="divresult" [hidden]="checkOrgunits()" >
+        <ul class="dropdown-menu result">
+            <li *ng-for="#orgunit of filteredOrgunits" id="orglist" (click)="getMoreInfo(orgunit)" >
                 <a href="#">{{orgunit.name}}<br/><span>{{orgunit.lastUpdated}}</span></a>
             </li>
         </ul>
@@ -26,6 +27,13 @@
 
 
 
+<!--
+<a var-unit id="testunit" (click)="getMoreInfo(unit.id)" href="#"></a>
+*ng-for="#orgunit of filteredOrgunits"
+<a href="#">{{orgunit.name}}<br/><span>{{orgunit.lastUpdated}}</span></a>
+(click)="getMoreInfo(orgunit)"
+-->
+
 </div>
 
 <button type="button" class="knapp" data-toggle="collapse" data-target="#dropdown-menu">

diff --git a/src/components/search/search.ts b/src/components/search/search.ts
index 10a50b73547504831cd8d42ee4b9bcf0a3c1b24a..a50872b2fdb9aa11d8dd46eb95d8fcb4018650a7 100644 (file)
--- a/src/components/search/search.ts
+++ b/src/components/search/search.ts
@@ -14,15 +14,18 @@ declare var zone: Zone;
 })
 export class Search {
     orgunits: Array<any> = [];
+    filteredOrgunits: Array<any> = [];
     loading: boolean = false;
     groups: Array<any> = [];
     groupSet: Array<any> = [];
-    counter: number = 0;
     ownershipSelector: any;
     typeSelector: any;
     locationSelector: any;
     option: any;
     searchBar: any;
+    filterset: boolean = false;
+
+
 
     constructor(public http:Http) {
         this.newsearch = new EventEmitter();
@@ -32,10 +35,12 @@ export class Search {
         this.typeSelector = document.getElementById("typeSelector");
         this.locationSelector = document.getElementById("locationSelector");
         this.searchBar = document.getElementById("livesearch");
+        this.orglist = document.getElementById("orglist");
+        this.a = document.getElementById("testunit");
     }
 
     getMoreInfo(orgunit) {
-        console.log("yolo");
+        console.log();
         this.newsearch.next(orgunit.id);
     }
 
@@ -97,20 +102,72 @@ export class Search {
         selector.appendChild(this.option);
     }
 
-    setFilter(){
-        console.log("Dette er setFilter");
-        console.log(this.ownershipSelector.value);
-        var text = livesearch.value;
+    checkOrgunits(){
+        if(!this.orgunits.length == false && !this.filterset){
+            this.setFilter();
+            this.filterset = true;
+        }
+        else if(!this.orgunits.length){
+            this.filteredOrgunits = [];
+            if(this.filterset) {
+                this.filterset = false;
+            }
+
+        }
+        return !this.orgunits.length;
+    }
 
-        //livesearch.value = "";
-        //console.log(this.searchBar.key);
 
-        /*for(var i = 0; i < text.length; i++){
-            livesearch.value += text.charAt(i);
-        }*/
-        //this.searchBar.createEvent('keyup');
+    setFilter(){
+        this.filteredOrgunits = [];
+
+        for (var i = 0; i < this.orgunits.length; i++) {
+            this.http.get(this.orgunits[i].href)
+                .map(res => res.json())
+                .subscribe(
+                    zone.bind(orgunits => {
+                        if (this.ownershipSelector.value == "" && this.typeSelector.value == "" && this.locationSelector.value == "") {
+                            this.filteredOrgunits.push(orgunits);
+                        }
+                        else {
+                            var os = false; var ls = false;var ts = false;
+                            for (var group in orgunits.organisationUnitGroups) {
+                                if (this.ownershipSelector.value != "") {
+                                    if (orgunits.organisationUnitGroups[group].name == this.ownershipSelector.value) {
+                                        os = true;
+                                    }
+                                }
+                                if (this.ownershipSelector.value == "") {
+                                    os = true;
+                                }
+                                if (this.typeSelector.value != "") {
+                                    if (orgunits.organisationUnitGroups[group].name == this.typeSelector.value) {
+                                        ts = true;
+                                    }
+                                }
+                                if (this.typeSelector.value == "") {
+                                    ts = true;
+                                }
+                                if (this.locationSelector.value != "") {
+                                    if (orgunits.organisationUnitGroups[group].name == this.locationSelector.value) {
+                                        ls = true;
+                                    }
+                                }
+                                if (this.locationSelector.value == "") {
+                                    ls = true;
+                                }
+                                if (os == true && ts == true && ls == true) {
+                                    this.filteredOrgunits.push(orgunits);
+                                    os = false;
+                                    ts = false;
+                                    ls = false;
 
-        this.searchBar.focus(true);
+                                }
+                            }
+                        }
+                    })
+                )
+        }
     }
 }