Add filter functionality for shelters

Author: rohitrp

client/src/app/_services/shelters.service.ts

@@ -28,13 +28,14 @@ export class SheltersService {
     );
   }
 
-  public getAllShelters(lat, lng): Observable<Shelter[]> {
+  public getAllShelters(lat, lng, radius): Observable<Shelter[]> {
     return this.http.get<Shelter[]>(
       `${this.apiBaseUrl}/shelters`,
       {
         params: {
           lat: lat,
-          lng: lng
+          lng: lng,
+          radius: radius
         }
       }
     );

client/src/app/shelters/shelter-card/shelter-card.component.html

@@ -7,6 +7,9 @@
       <div class="card-content">
         <div class="columns">
           <div class="column is-4">
+            <p *ngIf="shelter['official']" class="has-text-success">
+              <i class="fa fa-check"></i>&nbsp;Official Government Shelter
+            </p>
             <p class="title">
               {{ shelter.name }}
             </p>

client/src/app/shelters/shelters.component.html

@@ -17,6 +17,43 @@
         <div class="content has-text-centered" *ngIf="shelters.length === 0">
           <h1 class="has-text-grey-lighter">No shelters available</h1>
         </div>
+        <div class="columns has-text-centered">
+          <div class="column is-2">
+            <div class="field">
+              <div class="control">
+                <input class="input" type="number" placeholder="Radius (kms)" [(ngModel)]="radius" name="radius" required>
+              </div>
+            </div>
+          </div>
+          <div class="column is-2">
+            <div class="field">
+              <input class="is-checkradio" id="is-infant-friendly" type="checkbox" name="is-infant-friendly"
+                [(ngModel)]="infantFriendly">
+              <label for="is-infant-friendly">Infant Friendly</label>
+            </div>
+          </div>
+          <div class="column is-2">
+            <div class="field">
+              <input class="is-checkradio" id="is-elder-friendly" type="checkbox" name="is-elder-friendly" [(ngModel)]="elderFriendly">
+              <label for="is-elder-friendly">Elder Friendly</label>
+            </div>
+          </div>
+          <div class="column is-2">
+            <div class="field">
+              <input class="is-checkradio" id="is-official" type="checkbox" name="is-official" [(ngModel)]="official">
+              <label for="is-official">Official</label>
+            </div>
+          </div>
+          <div class="column is-2">
+            <div class="field">
+              <input class="is-checkradio" id="is-verified" type="checkbox" name="is-verified" [(ngModel)]="verified">
+              <label for="is-verified">Verified</label>
+            </div>
+          </div>
+          <div class="column is-2">
+            <a class="button is-primary" (click)="updateSearchResults()">Search</a>
+          </div>
+        </div>
         <div class="columns" *ngFor="let shelter of shelters">
           <div class="column">
             <app-shelter-card [shelter]="shelter" [user]="user" [zipcodeStatus]="zipcodeStatus" (updateUserDetails)="updateUserDetails($event)"></app-shelter-card>

client/src/app/shelters/shelters.component.ts

@@ -14,6 +14,12 @@ export class SheltersComponent implements OnInit {
   user: any;
   zipcodeStatus = {};
 
+  radius = 50;
+  infantFriendly: any;
+  elderFriendly: any;
+  official: any;
+  verified: any;
+
   constructor(
     private alertService: AlertService,
     private shelterService: SheltersService,
@@ -30,16 +36,17 @@ export class SheltersComponent implements OnInit {
     this.shelterService.getLatLng()
       .subscribe(
         (res) => {
-          this.shelterService.getAllShelters(res.lat, res.lon)
+          this.shelterService.getAllShelters(res.lat, res.lon, this.radius)
             .subscribe(
-              (res) => this.shelters = res,
+              (res) => {
+                res.sort(this.shelterSortFunc);
+                this.shelters = res;
+              },
               (err) => this.alertService.error(err)
             );
         }
       );
 
-
-
     this.shelterService.getZipcodeStatus()
       .subscribe(
         (res) => this.zipcodeStatus = res[0],
@@ -51,4 +58,56 @@ export class SheltersComponent implements OnInit {
     this.user = user;
   }
 
+  getShelterScore(shelter) {
+    var score = 0;
+
+    if (this.infantFriendly && shelter.infantFriendly === '1') score++;
+    if (this.elderFriendly && shelter.elderFriendly === '1') score++;
+    if (this.official && shelter.official) score++;
+    if (this.verified && shelter.verified) score++;
+
+    return score;
+  }
+
+  shelterSortFunc(a, b) {
+    var keyA = a['score'],
+      keyB = b['score'];
+
+    if (keyA < keyB) return 1;
+    if (keyA > keyB) return -1;
+
+    keyA = +a['distance'];
+    keyB = +b['distance'];
+
+    if (keyA < keyB) return -1;
+    if (keyA > keyB) return +1;
+
+    return 0;
+
+  }
+
+  updateSearchResults() {
+    this.shelterService.getLatLng()
+      .subscribe(
+        (res) => {
+          this.shelterService.getAllShelters(res.lat, res.lon, this.radius)
+            .subscribe(
+              (res) => {
+                for (let i = 0; i < res.length; i++) {
+                  res[i]['score'] = this.getShelterScore(res[i]);
+                  console.log(res[i]);
+                }
+
+                res.sort(this.shelterSortFunc);
+
+                this.shelters = res;
+                console.log(this.shelters);
+
+              },
+              (err) => this.alertService.error(err)
+            );
+        }
+      );
+  }
+
 }

server/api/shelters/routes/getShelters.js

@@ -33,6 +33,7 @@ module.exports = {
     handler: async (request, h) => {
       const userLat = +request.query.lat
       const userLng = +request.query.lng
+      const radius = +request.query.radius
 
       const shelters = await Shelter.find({}).lean()
 
@@ -45,7 +46,7 @@ module.exports = {
 
       for (let i = 0; i < shelters.length; i++) {
         const dist = distance(userLat, userLng, shelters[i]);
-        if ( dist < 50) {
+        if ( dist <= radius) {
           shelters[i]['distance'] = dist
           nearbyShelters.push(shelters[i])
         }