From 36c1e002995a3c0a398e6b44dcf8143705834d95 Mon Sep 17 00:00:00 2001 From: wantero Date: Tue, 5 Feb 2019 01:09:40 -0200 Subject: [PATCH 1/5] Adicionado status CANCELED no ENUM --- src/app/core/models/BookDonationStatus.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/core/models/BookDonationStatus.ts b/src/app/core/models/BookDonationStatus.ts index b2a5772b..65fd59b4 100644 --- a/src/app/core/models/BookDonationStatus.ts +++ b/src/app/core/models/BookDonationStatus.ts @@ -3,5 +3,6 @@ export enum BookDonationStatus { WAITING_APPROVAL = 'Aguardando aprovação', AVAILABLE = 'Disponível', INVISIBLE = 'Invisível', - DONATED = 'Doado' + DONATED = 'Doado', + CANCELED = 'Cancelado' } From d126b419176fab10eb1b7ec784940ad77490cc0a Mon Sep 17 00:00:00 2001 From: wantero Date: Tue, 5 Feb 2019 01:11:02 -0200 Subject: [PATCH 2/5] =?UTF-8?q?Adicionado=20m=C3=A9todo=20cancelDonation?= =?UTF-8?q?=20para=20endpoint=20api/book/cancel/{id}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/core/services/book/book.service.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/app/core/services/book/book.service.ts b/src/app/core/services/book/book.service.ts index 258cfac9..50615294 100644 --- a/src/app/core/services/book/book.service.ts +++ b/src/app/core/services/book/book.service.ts @@ -47,6 +47,10 @@ export class BookService { return this._http.delete(`${this.config.apiEndpoint}/book/${bookId}`); } + public cancelDonation(bookId: number) { + return this._http.post(`${this.config.apiEndpoint}/book/cancel/${bookId}`, null); + } + public getFreightOptions() { return this._http.get(`${this.config.apiEndpoint}/book/freightOptions`).pipe( map(response => { From 4d14040833033e4f5f2f4eceed3e2f52c3883c58 Mon Sep 17 00:00:00 2001 From: wantero Date: Tue, 5 Feb 2019 01:12:08 -0200 Subject: [PATCH 3/5] =?UTF-8?q?Substituido=20eliminar=20livro=20pelo=20can?= =?UTF-8?q?celar=20doa=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/components/book/list/list.component.ts | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/app/components/book/list/list.component.ts b/src/app/components/book/list/list.component.ts index 46ce0a04..f4522a42 100644 --- a/src/app/components/book/list/list.component.ts +++ b/src/app/components/book/list/list.component.ts @@ -95,7 +95,7 @@ export class ListComponent implements OnInit { myBookDonationStatus.push({value: BookDonationStatus[key], title: BookDonationStatus[key]}); }); - const btnDelete = '' + + const btnCancelDonation = '' + '  '; const btnEdit = '' + '  '; @@ -163,8 +163,8 @@ export class ListComponent implements OnInit { title: btnEdit }, { - name: 'delete', - title: btnDelete + name: 'CancelDonation', + title: btnCancelDonation }, { name: 'donate', @@ -180,18 +180,18 @@ export class ListComponent implements OnInit { } onCustom(event) { - if (event.action === 'delete') { - // chamada do modal de confirmação antes de efetuar a ação do delete + if (event.action === 'CancelDonation') { + // chamada do modal de confirmação antes de efetuar a ação do btnCancelDonation if (event.data.donated) { alert('Livro já doado!'); } else { - this.confirmationDialogService.confirm('Atenção!', 'Confirma a exclusão do Livro?') + this.confirmationDialogService.confirm('Atenção!', 'Confirma o cancelamento da doação?') .then((confirmed) => { if (confirmed) { - this._scBook.delete(event.data.id).subscribe(resp => { + this._scBook.cancelDonation(event.data.id).subscribe(resp => { if (resp['success']) { - this.books.remove(event.data); - this._scAlert.success('Registro removido com sucesso.'); + this._scAlert.success('Doação cancelada com sucesso.'); + this.reloadData(); } }); } From 99a46672e714efded7056ee048920bf045c73012 Mon Sep 17 00:00:00 2001 From: wantero Date: Tue, 5 Feb 2019 13:25:43 -0200 Subject: [PATCH 4/5] Adicionado campo estado na tela --- .../components/account/account.component.html | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/app/components/account/account.component.html b/src/app/components/account/account.component.html index f9cbfd92..ba772ce1 100644 --- a/src/app/components/account/account.component.html +++ b/src/app/components/account/account.component.html @@ -173,6 +173,22 @@

Editar Perfil

+
+ +
+ +
+ +
+
+ +
+ + Estado obrigatório. + +
+
+
From 21770ddb36921ae5dd4b6d8e77d5a1b77b08f111 Mon Sep 17 00:00:00 2001 From: wantero Date: Tue, 5 Feb 2019 13:26:57 -0200 Subject: [PATCH 5/5] =?UTF-8?q?Removido=20complemento=20na=20busca=20do=20?= =?UTF-8?q?CEP,=20pois=20apaga=20o=20valor=20j=C3=A1=20informado.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/components/account/account.component.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/app/components/account/account.component.ts b/src/app/components/account/account.component.ts index eda74ce9..fb4da38e 100644 --- a/src/app/components/account/account.component.ts +++ b/src/app/components/account/account.component.ts @@ -101,7 +101,6 @@ export class AccountComponent implements OnInit { this.address = address; this.address.country = 'Brasil'; this.formGroup['controls'].Address['controls'].street.setValue(this.address.street); - this.formGroup['controls'].Address['controls'].complement.setValue(this.address.complement); this.formGroup['controls'].Address['controls'].neighborhood.setValue(this.address.neighborhood); this.formGroup['controls'].Address['controls'].city.setValue(this.address.city); this.formGroup['controls'].Address['controls'].state.setValue(this.address.state);