Fixed bugs where searchresult did not update, where searchlist got duplicated when...

diff --git a/src/components/search/livesearch.ts b/src/components/search/livesearch.ts
index 60c364f799fa0bdf9c1d3e7dddbca2771c5d6165..390a9035d8900e4dacff4773adb58d98eadd79ff 100644 (file)
--- a/src/components/search/livesearch.ts
+++ b/src/components/search/livesearch.ts
@@ -46,58 +46,5 @@ export class LiveSearch {
                 }
             )
     }
-
-    filterUnits(orgunits) {
-        var filteredOrgunits: Array<any> = [];
-        for (var i = 0; i < orgunits.length; i++) {
-            this.http.get(orgunits[i].href)
-                .map(res => res.json())
-                .subscribe(
-                    zone.bind(orgunits => {
-                        if (ownershipSelector.value == "" && typeSelector.value == "" && locationSelector.value == "") {
-                            filteredOrgunits.push(orgunits);
-                        }
-                        else {
-                            var os = false;
-                            var ls = false;
-                            var ts = false;
-                            for (var group in orgunits.organisationUnitGroups) {
-                                if (ownershipSelector.value != "") {
-                                    if (orgunits.organisationUnitGroups[group].name == ownershipSelector.value) {
-                                        os = true;
-                                    }
-                                }
-                                if (ownershipSelector.value == "") {
-                                    os = true;
-                                }
-                                if (typeSelector.value != "") {
-                                    if (orgunits.organisationUnitGroups[group].name == typeSelector.value) {
-                                        ts = true;
-                                    }
-                                }
-                                if (typeSelector.value == "") {
-                                    ts = true;
-                                }
-                                if (locationSelector.value != "") {
-                                    if (orgunits.organisationUnitGroups[group].name == locationSelector.value) {
-                                        ls = true;
-                                    }
-                                }
-                                if (locationSelector.value == "") {
-                                    ls = true;
-                                }
-                                if (os == true && ts == true && ls == true) {
-                                    filteredOrgunits.push(orgunits);
-                                    os = false;
-                                    ts = false;
-                                    ls = false;
-                                }
-                            }
-                        }
-                    })
-                )
-        }
-        return filteredOrgunits;
-    }
 }
 

diff --git a/src/components/search/search.html b/src/components/search/search.html
index 51028045cbb021471f6d349c1b4e5d30a8a6674b..57c19eb6a9a5ef6c9c18e09dfb70da9c5ff0d655 100644 (file)
--- a/src/components/search/search.html
+++ b/src/components/search/search.html
@@ -14,13 +14,13 @@
                     name="livesearch"
                     id="livesearch"
                     placeholder="Search"
-                    value=""/>
+                    value=""
+                    (change)="checkOrgunits()"/>
 
 
             <!--<button class="exitsearch" id="exitsearch" (click)="emptyByClick()">
           &cross; </button>-->
             <button type="button" class="knapp col-md-2" (click)="toggle()"
-                    onclick="$('#ownershipSelector, #typeSelector, #locationSelector').prop('selectedIndex',0);"
                     data-toggle="collapse" data-target="#dropdown-menu">
                 {{ visible ? '&xdtri;' : '&cross;' }}
             </button>

diff --git a/src/components/search/search.ts b/src/components/search/search.ts
index 28aad7a8e41a26fbba6f03753644a9c308752191..dc5d2a39e6bd0b3311d9bb88441e4c0e478d867b 100644 (file)
--- a/src/components/search/search.ts
+++ b/src/components/search/search.ts
@@ -51,7 +51,12 @@ export class Search {
 
     toggle() {
         this.visible = !this.visible;
-        //this.getUnitGroupSets();
+        if(this.visible){
+            this.ownershipSelector.selectedIndex = 0;
+            this.typeSelector.selectedIndex = 0;
+            this.locationSelector.selectedIndex = 0;
+            this.checkOrgunits();
+        }
     }
 
     hideDiv(){
@@ -117,9 +122,14 @@ export class Search {
     }
 
     checkOrgunits(){
-        if(!this.orgunits.length == false && !this.filterset){
+        if (this.ownershipSelector.value == "" && this.typeSelector.value == "" && this.locationSelector.value == "") {
+            this.filteredOrgunits = [];
+            for(var i = 0; i < this.orgunits.length; i++) {
+                this.filteredOrgunits.push(this.orgunits[i]);
+            }
+        }
+        else if(!this.orgunits.length == false && !this.filterset){
             this.setFilter();
-            this.filterset = true;
         }
         else if(!this.orgunits.length){
             this.filteredOrgunits = [];
@@ -134,7 +144,7 @@ export class Search {
 
     setFilter(){
         this.filteredOrgunits = [];
-
+        this.filterset = true;
         for (var i = 0; i < this.orgunits.length; i++) {
             this.http.get(this.orgunits[i].href)
                 .map(res => res.json())
@@ -145,9 +155,9 @@ export class Search {
                         }
                         else {
                             var os = false; var ls = false;var ts = false;
-                            for (var group in orgunits.organisationUnitGroups) {
+                            for (var j = 0; j < orgunits.organisationUnitGroups.length; j++) {
                                 if (this.ownershipSelector.value != "") {
-                                    if (orgunits.organisationUnitGroups[group].name == this.ownershipSelector.value) {
+                                    if (orgunits.organisationUnitGroups[j].name == this.ownershipSelector.value) {
                                         os = true;
                                     }
                                 }
@@ -155,7 +165,7 @@ export class Search {
                                     os = true;
                                 }
                                 if (this.typeSelector.value != "") {
-                                    if (orgunits.organisationUnitGroups[group].name == this.typeSelector.value) {
+                                    if (orgunits.organisationUnitGroups[j].name == this.typeSelector.value) {
                                         ts = true;
                                     }
                                 }
@@ -163,7 +173,7 @@ export class Search {
                                     ts = true;
                                 }
                                 if (this.locationSelector.value != "") {
-                                    if (orgunits.organisationUnitGroups[group].name == this.locationSelector.value) {
+                                    if (orgunits.organisationUnitGroups[j].name == this.locationSelector.value) {
                                         ls = true;
                                     }
                                 }
@@ -175,7 +185,6 @@ export class Search {
                                     os = false;
                                     ts = false;
                                     ls = false;
-
                                 }
                             }
                         }