From 28ccc0efe55c4b1321dcb3c5ac2a13161b313649 Mon Sep 17 00:00:00 2001 From: Warren Wong Date: Fri, 15 Feb 2019 01:17:28 +0800 Subject: [PATCH 01/12] Added build status badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ba478ab9..5de8f77f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ - +[![Build Status](https://dev.azure.com/wawong/MSReadyContosoAir/_apis/build/status/warrenwwc.ContosoAir?branchName=master)](https://dev.azure.com/wawong/MSReadyContosoAir/_build/latest?definitionId=6&branchName=master) # Microsoft.Github CI Demo From dd0744709961576c5d39f7f0edb07b3c3bdc152e Mon Sep 17 00:00:00 2001 From: warrenwwc Date: Fri, 15 Feb 2019 01:50:07 +0800 Subject: [PATCH 02/12] Added build status badge --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index ba478ab9..a256250c 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,7 @@ - - +[![Build Status](https://dev.azure.com/wawong/MSReadyContosoAir/_apis/build/status/warrenwwc.ContosoAir?branchName=master)](https://dev.azure.com/wawong/MSReadyContosoAir/_build/latest?definitionId=6&branchName=master) # Microsoft.Github CI Demo -Demo website application for Contoso Air. Runs a nodejs server (Express v4.16) that stores customer booked flights in a CosmosDb database. ## Requirements From 1cc73925c8086fdaa8d7d8f9e101d5bd94cedcc2 Mon Sep 17 00:00:00 2001 From: warrenwwc Date: Fri, 15 Feb 2019 01:51:05 +0800 Subject: [PATCH 03/12] Added build status badge --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index ba478ab9..2f7b6cb7 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ - - +[![Build Status](https://dev.azure.com/wawong/MSReadyContosoAir/_apis/build/status/warrenwwc.ContosoAir?branchName=master)](https://dev.azure.com/wawong/MSReadyContosoAir/_build/latest?definitionId=6&branchName=master) # Microsoft.Github CI Demo From b930929e16fd521b03f98714693c139114ebe532 Mon Sep 17 00:00:00 2001 From: warrenwwc Date: Tue, 19 Feb 2019 07:56:29 +0800 Subject: [PATCH 04/12] Changes airport sorting. Fixes AB#3464. --- src/services/book.form.service.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/services/book.form.service.js b/src/services/book.form.service.js index c0e00b35..a9af6257 100644 --- a/src/services/book.form.service.js +++ b/src/services/book.form.service.js @@ -17,6 +17,11 @@ class BookFormService { airports: this._airports.getAll() }; } + + getAll(){ + return this._airports.filter(a => a.code).map(avoidEmptyCity).sort((a, b) => (a.city > b.city) ? 1 : -1); + } + } module.exports = BookFormService; From d871c8609e7fc839c11a1eeb7eb4e62ff326380e Mon Sep 17 00:00:00 2001 From: warrenwwc Date: Tue, 19 Feb 2019 08:17:51 +0800 Subject: [PATCH 05/12] Changes airport sorting. Fixes AB#203 --- src/services/book.form.service.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/services/book.form.service.js b/src/services/book.form.service.js index a9af6257..1d4bc902 100644 --- a/src/services/book.form.service.js +++ b/src/services/book.form.service.js @@ -14,11 +14,11 @@ class BookFormService { ], today: moment().toDate(), passengers: [1, 2, 3, 4, 5], - airports: this._airports.getAll() + airports: this._airports.getAll2() }; } - getAll(){ + getAll2(){ return this._airports.filter(a => a.code).map(avoidEmptyCity).sort((a, b) => (a.city > b.city) ? 1 : -1); } From d706061a6a26b81019271c7159fa6741ddfd6e5d Mon Sep 17 00:00:00 2001 From: warrenwwc Date: Tue, 19 Feb 2019 08:32:35 +0800 Subject: [PATCH 06/12] #203 --- src/services/book.form.service.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/services/book.form.service.js b/src/services/book.form.service.js index 1d4bc902..619dd9bd 100644 --- a/src/services/book.form.service.js +++ b/src/services/book.form.service.js @@ -14,14 +14,13 @@ class BookFormService { ], today: moment().toDate(), passengers: [1, 2, 3, 4, 5], - airports: this._airports.getAll2() + airports: this._airports.getAll() }; - } - getAll2(){ - return this._airports.filter(a => a.code).map(avoidEmptyCity).sort((a, b) => (a.city > b.city) ? 1 : -1); + getAll(){ + return this._airports.filter(a => a.code).map(avoidEmptyCity).sort((a, b) => (a.city > b.city) ? 1 : -1); + } } - } module.exports = BookFormService; From bfbb459b02f616de1899c358382bd76750b58ef2 Mon Sep 17 00:00:00 2001 From: warrenwwc Date: Tue, 19 Feb 2019 08:34:09 +0800 Subject: [PATCH 07/12] #203 --- src/services/book.form.service.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/services/book.form.service.js b/src/services/book.form.service.js index 619dd9bd..47199d78 100644 --- a/src/services/book.form.service.js +++ b/src/services/book.form.service.js @@ -16,10 +16,10 @@ class BookFormService { passengers: [1, 2, 3, 4, 5], airports: this._airports.getAll() }; + } - getAll(){ - return this._airports.filter(a => a.code).map(avoidEmptyCity).sort((a, b) => (a.city > b.city) ? 1 : -1); - } + getAll(){ + return this._airports.filter(a => a.code).map(avoidEmptyCity).sort((a, b) => (a.city > b.city) ? 1 : -1); } } From 1e7b72a125d87e966c8b0b6fe42fbf9fd4a2b6e1 Mon Sep 17 00:00:00 2001 From: warrenwwc Date: Tue, 2 Apr 2019 15:24:11 +0800 Subject: [PATCH 08/12] Deleted build status badge --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index 5de8f77f..e98d53fc 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,3 @@ -[![Build Status](https://dev.azure.com/wawong/MSReadyContosoAir/_apis/build/status/warrenwwc.ContosoAir?branchName=master)](https://dev.azure.com/wawong/MSReadyContosoAir/_build/latest?definitionId=6&branchName=master) - - # Microsoft.Github CI Demo Demo website application for Contoso Air. From 0ce5f21807e39b6bfe5099310ca1a2a10a3cc99b Mon Sep 17 00:00:00 2001 From: warrenwwc Date: Tue, 2 Apr 2019 15:27:36 +0800 Subject: [PATCH 09/12] Added build status badge --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index d989430d..bd7a6485 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,6 @@ -<<<<<<< HEAD ======= [![Build Status](https://dev.azure.com/wawong/MSReadyContosoAir/_apis/build/status/warrenwwc.ContosoAir?branchName=master)](https://dev.azure.com/wawong/MSReadyContosoAir/_build/latest?definitionId=6&branchName=master) ->>>>>>> 606925a95634310ae8c8f612563afa81bc0e4571 # Microsoft.Github CI Demo Runs a nodejs server (Express v4.16) that stores customer booked flights in a CosmosDb database. From 022d351f601d756c92f1a40c6045de2fac3ff737 Mon Sep 17 00:00:00 2001 From: warrenwwc Date: Wed, 3 Apr 2019 16:05:57 +0800 Subject: [PATCH 10/12] Changes airport sorting. Fixes AB#1 --- src/services/airports.service.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/services/airports.service.js b/src/services/airports.service.js index f9af6ab4..3017251a 100644 --- a/src/services/airports.service.js +++ b/src/services/airports.service.js @@ -7,8 +7,12 @@ class AirportsService { this._airports = airports; } + // getAll(){ + // return this._airports.filter(a => a.code).map(avoidEmptyCity); + // } + getAll(){ - return this._airports.filter(a => a.code).map(avoidEmptyCity); + return this._airports.filter(a => a.code).map(avoidEmptyCity).sort((a, b) => (a.city > b.city) ? 1 : -1); } getByCode(code) { From 9dec89407cfdd36c4ecfc7db483da8387eb5d9fe Mon Sep 17 00:00:00 2001 From: warrenwwc Date: Wed, 3 Apr 2019 17:53:39 +0800 Subject: [PATCH 11/12] getAll desc --- src/services/airports.service.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/airports.service.js b/src/services/airports.service.js index 3017251a..ae540f0f 100644 --- a/src/services/airports.service.js +++ b/src/services/airports.service.js @@ -12,7 +12,7 @@ class AirportsService { // } getAll(){ - return this._airports.filter(a => a.code).map(avoidEmptyCity).sort((a, b) => (a.city > b.city) ? 1 : -1); + return this._airports.filter(a => a.code).map(avoidEmptyCity).sort((a, b) => (a.city < b.city) ? 1 : -1); } getByCode(code) { From faac43317826e18599298feb36c5fe2c865c7780 Mon Sep 17 00:00:00 2001 From: warrenwwc Date: Wed, 3 Apr 2019 18:24:35 +0800 Subject: [PATCH 12/12] Changes airport sorting. Fixes AB#2 --- src/services/airports.service.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/airports.service.js b/src/services/airports.service.js index ae540f0f..3017251a 100644 --- a/src/services/airports.service.js +++ b/src/services/airports.service.js @@ -12,7 +12,7 @@ class AirportsService { // } getAll(){ - return this._airports.filter(a => a.code).map(avoidEmptyCity).sort((a, b) => (a.city < b.city) ? 1 : -1); + return this._airports.filter(a => a.code).map(avoidEmptyCity).sort((a, b) => (a.city > b.city) ? 1 : -1); } getByCode(code) {