From 70960471bbd63a7a52e7d3faa6c8f957758e7460 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 29 Sep 2021 15:17:21 +0100 Subject: [PATCH] Fix --- .../publication-detail/publication-detail.page.html | 2 +- .../publication-detail/publication-detail.page.ts | 6 ++++++ src/app/services/events.service.ts | 3 +-- .../edit-event-to-approve/edit-event.page.html | 2 +- .../edit-event-to-approve/edit-event.page.ts | 5 ++--- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html index 6b3c0436e..2a6ccdc22 100644 --- a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html +++ b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html @@ -62,7 +62,7 @@ diff --git a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts index aae0b7732..335bce83b 100644 --- a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts +++ b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts @@ -95,6 +95,7 @@ export class PublicationDetailPage implements OnInit { if(this.isModal) { this.close() } else { + alert('go back') this.location.back(); } @@ -107,6 +108,11 @@ export class PublicationDetailPage implements OnInit { try { await this.publications.DeletePublication(this.folderId, this.publicationId).toPromise(); this.toastService.successMessage('Publicação eliminada') + + if(window['app-view-publications-page-doRefresh']) { + window['app-view-publications-page-doRefresh']() + } + this.goBack(); } catch (error) { this.toastService.badRequest('Publicaçao não eliminada') diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts index 0794423b6..da3343530 100644 --- a/src/app/services/events.service.ts +++ b/src/app/services/events.service.ts @@ -4,7 +4,7 @@ import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http'; import { Observable } from 'rxjs'; import { environment } from 'src/environments/environment'; import { AuthService } from '../services/auth.service'; -import { LoginUserRespose, UserSession } from '../models/user.model'; +import { UserSession } from '../models/user.model'; import { EventList } from '../models/agenda/AgendaEventList'; import { ChangeProfileService } from './change-profile.service'; @@ -26,7 +26,6 @@ export class EventsService { headersSharedOficial: HttpHeaders; headersSharedPessoal: HttpHeaders; - //lastloadedevent: Event; constructor( private http: HttpClient, diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html index 22d37ee80..a09ca1d31 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html @@ -8,7 +8,7 @@
- Editar evento por aprovar + Editar evento por aprovar::.
diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts index 169268a04..066fc16c0 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts @@ -330,12 +330,11 @@ export class EditEventToApproveComponent implements OnInit { } } - setIntervenient(data){ + setIntervenient(data = []){ this.taskParticipants = data; - this.postEvent.Attendees = data; } - setIntervenientCC(data) { + setIntervenientCC(data = []) { this.taskParticipantsCc = data; }