[ADD] Adding local image support

Nikhil-Pahwa · Dec 19, 2017 · 7ffe1cf · 7ffe1cf
1 parent 2e06a37
commit 7ffe1cf
Show file tree

Hide file tree

Showing 6 changed files with 228 additions and 14 deletions.
diff --git a/src/app/modules/flights/flight-search/flight-search.component.html b/src/app/modules/flights/flight-search/flight-search.component.html
@@ -38,8 +38,9 @@ <h2>{{ 'PICK_YOUR_DESTINATION' | translate:lang }}</h2>
 <!-- banner END-->
 <app-flight-filter *ngIf="filteredList" [flights]=filteredList (selectionChanged)="filterSearch($event)"></app-flight-filter>
 <!-- Flight Listing -->
-<section class="col">
+<section class="col" *ngIf="filteredList">
   <div class="flight-listing-container">
+    <span>{{filteredList?.length}} records found</span>
     <ul class="results-list">
       <li class="offer-listing" *ngFor="let flight of filteredList">
         <div class="flex-content">

diff --git a/src/app/modules/flights/flight-search/flight-search.component.ts b/src/app/modules/flights/flight-search/flight-search.component.ts
@@ -39,11 +39,15 @@ export class FlightSearchComponent implements OnInit {
     this.filteredList = [];
     filters.forEach((filter: Filter) => {
       let items = this.flightsList.filter(function (flight) {
-        console.log(flight);
         return (filter.selected && (flight.carrierId === filter.id));
       });
-      console.log(items);
+
       this.filteredList = this.filteredList.concat(items);
+
+      this.filteredList.sort(function (a, b) {
+        return a.fare - b.fare;
+      });
+
     });
   }
 }
diff --git a/src/app/shared/resources/flights.ts b/src/app/shared/resources/flights.ts
@@ -1,5 +1,5 @@
 export interface RemoteFare {
-    grossamount: string;
+    grossamount: number;
 }
 
 export interface RemoteFlight {
@@ -30,7 +30,7 @@ export interface Flight {
     flightId: string;
     destination: string;
     styleUrl: string;
-    fare: string;
+    fare: number;
     carrierId: string;
 }
 
@@ -47,7 +47,7 @@ export class Flight implements Flight {
         public flightId: string,
         public destination: string,
         public styleUrl: string,
-        public fare: string,
+        public fare: number,
         public carrierId: string
     ) {
     }

diff --git a/src/assets/images/airlines/AI_sq.svg b/src/assets/images/airlines/AI_sq.svg
diff --git a/src/assets/images/airlines/JA_sq.svg b/src/assets/images/airlines/JA_sq.svg
diff --git a/src/assets/json/flight-search-results.json b/src/assets/json/flight-search-results.json
@@ -1,4 +1,5 @@
 {
+  "_comment": "Logos are placed locally for demo purpose",
   "data": {
     "returnflights": [],
     "onwardflights": [{
@@ -29,7 +30,7 @@
         "PromotionId": "",
         "fid": 4,
         "styleUrl": "assets/css/external_domain_styles/air_india.css",
-        "logoUrl": "//images.trvl-media.com/media/content/expus/graphics/static_content/fusion/v0.1b/images/airlines/vector/s/AI_sq.svg",
+        "logoUrl": "assets/images/airlines/AI_sq.svg",
         "fare": {
           "grossamount": 4886,
           "totalbasefare": 4425,
@@ -76,7 +77,7 @@
         "duration": "20h 35m",
         "platingcarrier": "",
         "qtype": "",
-        "logoUrl": "//images.trvl-media.com/media/content/expus/graphics/static_content/fusion/v0.1b/images/airlines/vector/s/9W_sq.svg",
+        "logoUrl": "assets/images/airlines/JA_sq.svg",
         "arrterminal": "",
         "flightno": "768",
         "destination": "HYD",
@@ -239,7 +240,7 @@
         "carrierId": "AI",
         "airline": "Air India",
         "styleUrl": "assets/css/external_domain_styles/air_india.css",
-        "logoUrl": "//images.trvl-media.com/media/content/expus/graphics/static_content/fusion/v0.1b/images/airlines/vector/s/AI_sq.svg",
+        "logoUrl": "assets/images/airlines/AI_sq.svg",
         "provider": "",
         "PromotionId": "",
         "fare": {
@@ -331,7 +332,7 @@
             "styleUrl": "assets/css/external_domain_styles/jet_airways.css",
             "provider": "",
             "PromotionId": "",
-            "logoUrl": "//images.trvl-media.com/media/content/expus/graphics/static_content/fusion/v0.1b/images/airlines/vector/s/9W_sq.svg",
+            "logoUrl": "assets/images/airlines/JA_sq.svg",
             "fare": {
               "totalsurcharge": 0,
               "totalfare": 0,
@@ -393,7 +394,7 @@
         "stops": "2",
         "seatsavailable": "1",
         "carrierId": "JA",
-        "logoUrl": "//images.trvl-media.com/media/content/expus/graphics/static_content/fusion/v0.1b/images/airlines/vector/s/9W_sq.svg",
+        "logoUrl": "assets/images/airlines/JA_sq.svg",
         "airline": "Jet Airways",
         "styleUrl": "assets/css/external_domain_styles/jet_airways.css",
         "provider": "",
@@ -485,7 +486,7 @@
             "carrierId": "JA",
             "airline": "Jet Airways",
             "styleUrl": "assets/css/external_domain_styles/jet_airways.css",
-            "logoUrl": "//images.trvl-media.com/media/content/expus/graphics/static_content/fusion/v0.1b/images/airlines/vector/s/9W_sq.svg",
+            "logoUrl": "assets/images/airlines/JA_sq.svg",
             "provider": "",
             "PromotionId": "",
             "fare": {
@@ -549,7 +550,7 @@
         "stops": "2",
         "seatsavailable": "1",
         "carrierId": "JA",
-        "logoUrl": "//images.trvl-media.com/media/content/expus/graphics/static_content/fusion/v0.1b/images/airlines/vector/s/9W_sq.svg",
+        "logoUrl": "assets/images/airlines/JA_sq.svg",
         "airline": "Jet Airways",
         "styleUrl": "assets/css/external_domain_styles/jet_airways.css",
         "provider": "",
@@ -706,7 +707,7 @@
         "carrierId": "AI",
         "airline": "Air India",
         "styleUrl": "assets/css/external_domain_styles/air_india.css",
-        "logoUrl": "//images.trvl-media.com/media/content/expus/graphics/static_content/fusion/v0.1b/images/airlines/vector/s/AI_sq.svg",
+        "logoUrl": "assets/images/airlines/AI_sq.svg",
         "provider": "",
         "PromotionId": "",
         "fare": {